diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py index e7615f0fb..7d4825c7b 100644 --- a/openlp/plugins/songs/forms/songbookdialog.py +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'songbookdialog.ui' # -# Created: Thu Jan 1 09:44:21 2009 +# Created: Sun Jan 4 08:43:12 2009 # by: PyQt4 UI code generator 4.4.3 # # WARNING! All changes made in this file will be lost! @@ -29,13 +29,13 @@ class Ui_SongBookDialog(object): self.gridLayout.addWidget(self.NameLabel, 0, 0, 1, 1) self.NameEdit = QtGui.QLineEdit(self.SongBookGroup) self.NameEdit.setObjectName("NameEdit") - self.gridLayout.addWidget(self.NameEdit, 0, 1, 1, 3) + self.gridLayout.addWidget(self.NameEdit, 0, 1, 1, 4) self.PublisherLabel = QtGui.QLabel(self.SongBookGroup) self.PublisherLabel.setObjectName("PublisherLabel") self.gridLayout.addWidget(self.PublisherLabel, 1, 0, 1, 1) self.PublisherEdit = QtGui.QLineEdit(self.SongBookGroup) self.PublisherEdit.setObjectName("PublisherEdit") - self.gridLayout.addWidget(self.PublisherEdit, 1, 1, 1, 3) + self.gridLayout.addWidget(self.PublisherEdit, 1, 1, 1, 4) spacerItem = QtGui.QSpacerItem(198, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.gridLayout.addItem(spacerItem, 2, 0, 1, 2) self.DeleteButton = QtGui.QPushButton(self.SongBookGroup) @@ -43,13 +43,19 @@ class Ui_SongBookDialog(object): icon.addPixmap(QtGui.QPixmap(":/services/service_delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.DeleteButton.setIcon(icon) self.DeleteButton.setObjectName("DeleteButton") - self.gridLayout.addWidget(self.DeleteButton, 2, 2, 1, 1) + self.gridLayout.addWidget(self.DeleteButton, 2, 3, 1, 1) self.AddUpdateButton = QtGui.QPushButton(self.SongBookGroup) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(":/system/system_settings.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.AddUpdateButton.setIcon(icon1) self.AddUpdateButton.setObjectName("AddUpdateButton") - self.gridLayout.addWidget(self.AddUpdateButton, 2, 3, 1, 1) + self.gridLayout.addWidget(self.AddUpdateButton, 2, 4, 1, 1) + self.ClearButton = QtGui.QPushButton(self.SongBookGroup) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/songs/song_edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ClearButton.setIcon(icon2) + self.ClearButton.setObjectName("ClearButton") + self.gridLayout.addWidget(self.ClearButton, 2, 2, 1, 1) self.gridLayout_2.addWidget(self.SongBookGroup, 1, 0, 1, 2) self.MessageLabel = QtGui.QLabel(SongBookDialog) self.MessageLabel.setObjectName("MessageLabel") @@ -72,4 +78,4 @@ class Ui_SongBookDialog(object): self.PublisherLabel.setText(QtGui.QApplication.translate("SongBookDialog", "Publisher:", None, QtGui.QApplication.UnicodeUTF8)) self.DeleteButton.setToolTip(QtGui.QApplication.translate("SongBookDialog", "Delete Author", None, QtGui.QApplication.UnicodeUTF8)) self.AddUpdateButton.setToolTip(QtGui.QApplication.translate("SongBookDialog", "Add Update Author", None, QtGui.QApplication.UnicodeUTF8)) - + self.ClearButton.setToolTip(QtGui.QApplication.translate("SongBookDialog", "Clear Selection", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py index 35fa655d0..b6f51d003 100644 --- a/openlp/plugins/songs/forms/topicsdialog.py +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'topicsdialog.ui' # -# Created: Thu Jan 1 09:41:22 2009 +# Created: Sun Jan 4 08:42:59 2009 # by: PyQt4 UI code generator 4.4.3 # # WARNING! All changes made in this file will be lost! @@ -15,11 +15,6 @@ class Ui_TopicsDialog(object): TopicsDialog.resize(387, 463) self.gridLayout_2 = QtGui.QGridLayout(TopicsDialog) self.gridLayout_2.setObjectName("gridLayout_2") - self.TopicsListView = QtGui.QTableWidget(TopicsDialog) - self.TopicsListView.setObjectName("TopicsListView") - self.TopicsListView.setColumnCount(0) - self.TopicsListView.setRowCount(0) - self.gridLayout_2.addWidget(self.TopicsListView, 0, 0, 1, 1) self.TopicGroupBox = QtGui.QGroupBox(TopicsDialog) self.TopicGroupBox.setObjectName("TopicGroupBox") self.gridLayout = QtGui.QGridLayout(self.TopicGroupBox) @@ -29,7 +24,7 @@ class Ui_TopicsDialog(object): self.gridLayout.addWidget(self.TopicNameLabel, 0, 0, 1, 1) self.TopicNameEdit = QtGui.QLineEdit(self.TopicGroupBox) self.TopicNameEdit.setObjectName("TopicNameEdit") - self.gridLayout.addWidget(self.TopicNameEdit, 0, 1, 1, 3) + self.gridLayout.addWidget(self.TopicNameEdit, 0, 1, 1, 4) spacerItem = QtGui.QSpacerItem(198, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.gridLayout.addItem(spacerItem, 1, 0, 1, 2) self.DeleteButton = QtGui.QPushButton(self.TopicGroupBox) @@ -37,22 +32,33 @@ class Ui_TopicsDialog(object): icon.addPixmap(QtGui.QPixmap(":/services/service_delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.DeleteButton.setIcon(icon) self.DeleteButton.setObjectName("DeleteButton") - self.gridLayout.addWidget(self.DeleteButton, 1, 2, 1, 1) + self.gridLayout.addWidget(self.DeleteButton, 1, 3, 1, 1) self.AddUpdateButton = QtGui.QPushButton(self.TopicGroupBox) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap(":/system/system_settings.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.AddUpdateButton.setIcon(icon1) self.AddUpdateButton.setObjectName("AddUpdateButton") - self.gridLayout.addWidget(self.AddUpdateButton, 1, 3, 1, 1) + self.gridLayout.addWidget(self.AddUpdateButton, 1, 4, 1, 1) + self.ClearButton = QtGui.QPushButton(self.TopicGroupBox) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/songs/song_edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ClearButton.setIcon(icon2) + self.ClearButton.setObjectName("ClearButton") + self.gridLayout.addWidget(self.ClearButton, 1, 2, 1, 1) self.gridLayout_2.addWidget(self.TopicGroupBox, 1, 0, 1, 1) + self.MessageLabel = QtGui.QLabel(TopicsDialog) + self.MessageLabel.setObjectName("MessageLabel") + self.gridLayout_2.addWidget(self.MessageLabel, 3, 0, 1, 1) + self.TopicsListView = QtGui.QTableWidget(TopicsDialog) + self.TopicsListView.setObjectName("TopicsListView") + self.TopicsListView.setColumnCount(0) + self.TopicsListView.setRowCount(0) + self.gridLayout_2.addWidget(self.TopicsListView, 0, 0, 1, 1) self.ButtonBox = QtGui.QDialogButtonBox(TopicsDialog) self.ButtonBox.setOrientation(QtCore.Qt.Horizontal) self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) self.ButtonBox.setObjectName("ButtonBox") self.gridLayout_2.addWidget(self.ButtonBox, 2, 0, 1, 1) - self.MessageLabel = QtGui.QLabel(TopicsDialog) - self.MessageLabel.setObjectName("MessageLabel") - self.gridLayout_2.addWidget(self.MessageLabel, 3, 0, 1, 1) self.retranslateUi(TopicsDialog) QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), TopicsDialog.accept) @@ -65,4 +71,6 @@ class Ui_TopicsDialog(object): self.TopicNameLabel.setText(QtGui.QApplication.translate("TopicsDialog", "Topic Name:", None, QtGui.QApplication.UnicodeUTF8)) self.DeleteButton.setToolTip(QtGui.QApplication.translate("TopicsDialog", "Delete Author", None, QtGui.QApplication.UnicodeUTF8)) self.AddUpdateButton.setToolTip(QtGui.QApplication.translate("TopicsDialog", "Add Update Author", None, QtGui.QApplication.UnicodeUTF8)) + self.ClearButton.setToolTip(QtGui.QApplication.translate("TopicsDialog", "Clear Selection", None, QtGui.QApplication.UnicodeUTF8)) + diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py index 7858a797f..5e6f06d8a 100644 --- a/openlp/plugins/songs/lib/__init__.py +++ b/openlp/plugins/songs/lib/__init__.py @@ -19,6 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA """ from songmanager import SongManager +from songtable import Author -__all__ = ['SongManager'] +__all__ = ['SongManager', 'Author']