From c83207838d1896983b0ceb841d3668b3cb4ae119 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 1 Jan 2009 10:03:09 +0000 Subject: [PATCH] Add new dialogs to songs for extra data requirements bzr-revno: 260 --- openlp/plugins/songs/forms/__init__.py | 4 + openlp/plugins/songs/forms/authorsdialog.py | 83 ++++++ openlp/plugins/songs/forms/authorsform.py | 93 +++++++ openlp/plugins/songs/forms/editsongdialog.py | 262 +++++++++++-------- openlp/plugins/songs/forms/editsongform.py | 44 +++- openlp/plugins/songs/forms/songbookdialog.py | 75 ++++++ openlp/plugins/songs/forms/songbookform.py | 48 ++++ openlp/plugins/songs/forms/topicsdialog.py | 68 +++++ openlp/plugins/songs/forms/topicsform.py | 42 +++ openlp/plugins/songs/lib/songDBimpl.py | 2 - 10 files changed, 611 insertions(+), 110 deletions(-) create mode 100644 openlp/plugins/songs/forms/authorsdialog.py create mode 100644 openlp/plugins/songs/forms/authorsform.py create mode 100644 openlp/plugins/songs/forms/songbookdialog.py create mode 100644 openlp/plugins/songs/forms/songbookform.py create mode 100644 openlp/plugins/songs/forms/topicsdialog.py create mode 100644 openlp/plugins/songs/forms/topicsform.py diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py index 30887968b..a646d95fc 100644 --- a/openlp/plugins/songs/forms/__init__.py +++ b/openlp/plugins/songs/forms/__init__.py @@ -19,6 +19,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA """ from editsongform import EditSongForm +from authorsform import AuthorsForm +from topicsform import TopicsForm +from songbookform import SongBookForm + from openlpexportform import OpenLPExportForm from openlpimportform import OpenLPImportForm from opensongexportform import OpenSongExportForm diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py new file mode 100644 index 000000000..5433aa1a8 --- /dev/null +++ b/openlp/plugins/songs/forms/authorsdialog.py @@ -0,0 +1,83 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'authorsdialog.ui' +# +# Created: Thu Jan 1 09:41:26 2009 +# by: PyQt4 UI code generator 4.4.3 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_AuthorsDialog(object): + def setupUi(self, AuthorsDialog): + AuthorsDialog.setObjectName("AuthorsDialog") + AuthorsDialog.resize(387, 532) + self.buttonBox = QtGui.QDialogButtonBox(AuthorsDialog) + self.buttonBox.setGeometry(QtCore.QRect(40, 490, 341, 32)) + self.buttonBox.setOrientation(QtCore.Qt.Horizontal) + self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) + self.buttonBox.setObjectName("buttonBox") + self.AuthorDetails = QtGui.QGroupBox(AuthorsDialog) + self.AuthorDetails.setGeometry(QtCore.QRect(20, 330, 341, 158)) + self.AuthorDetails.setObjectName("AuthorDetails") + self.gridLayout = QtGui.QGridLayout(self.AuthorDetails) + self.gridLayout.setObjectName("gridLayout") + self.DisplayLabel = QtGui.QLabel(self.AuthorDetails) + self.DisplayLabel.setObjectName("DisplayLabel") + self.gridLayout.addWidget(self.DisplayLabel, 0, 0, 1, 1) + self.DisplayEdit = QtGui.QLineEdit(self.AuthorDetails) + self.DisplayEdit.setObjectName("DisplayEdit") + self.gridLayout.addWidget(self.DisplayEdit, 0, 1, 1, 3) + self.FirstNameLabel = QtGui.QLabel(self.AuthorDetails) + self.FirstNameLabel.setObjectName("FirstNameLabel") + self.gridLayout.addWidget(self.FirstNameLabel, 1, 0, 1, 1) + self.FirstNameEdit = QtGui.QLineEdit(self.AuthorDetails) + self.FirstNameEdit.setObjectName("FirstNameEdit") + self.gridLayout.addWidget(self.FirstNameEdit, 1, 1, 1, 3) + self.LastNameLabel = QtGui.QLabel(self.AuthorDetails) + self.LastNameLabel.setObjectName("LastNameLabel") + self.gridLayout.addWidget(self.LastNameLabel, 2, 0, 1, 1) + self.LastNameEdit = QtGui.QLineEdit(self.AuthorDetails) + self.LastNameEdit.setObjectName("LastNameEdit") + self.gridLayout.addWidget(self.LastNameEdit, 2, 1, 1, 3) + spacerItem = QtGui.QSpacerItem(198, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.gridLayout.addItem(spacerItem, 3, 0, 1, 2) + self.DeleteButton = QtGui.QPushButton(self.AuthorDetails) + icon = QtGui.QIcon() + 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, 3, 2, 1, 1) + self.AddUpdateButton = QtGui.QPushButton(self.AuthorDetails) + 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, 3, 3, 1, 1) + self.MessageLabel = QtGui.QLabel(AuthorsDialog) + self.MessageLabel.setGeometry(QtCore.QRect(20, 500, 261, 17)) + self.MessageLabel.setObjectName("MessageLabel") + self.AuthorListView = QtGui.QTableWidget(AuthorsDialog) + self.AuthorListView.setGeometry(QtCore.QRect(20, 20, 341, 301)) + self.AuthorListView.setAlternatingRowColors(True) + self.AuthorListView.setColumnCount(2) + self.AuthorListView.setObjectName("AuthorListView") + self.AuthorListView.setColumnCount(2) + self.AuthorListView.setRowCount(0) + + self.retranslateUi(AuthorsDialog) + QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), AuthorsDialog.accept) + QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), AuthorsDialog.reject) + QtCore.QMetaObject.connectSlotsByName(AuthorsDialog) + + def retranslateUi(self, AuthorsDialog): + AuthorsDialog.setWindowTitle(QtGui.QApplication.translate("AuthorsDialog", "Author Maintenance", None, QtGui.QApplication.UnicodeUTF8)) + self.buttonBox.setToolTip(QtGui.QApplication.translate("AuthorsDialog", "Exit Screen", None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorDetails.setTitle(QtGui.QApplication.translate("AuthorsDialog", "Author Details", None, QtGui.QApplication.UnicodeUTF8)) + self.DisplayLabel.setText(QtGui.QApplication.translate("AuthorsDialog", "Display Name:", None, QtGui.QApplication.UnicodeUTF8)) + self.FirstNameLabel.setText(QtGui.QApplication.translate("AuthorsDialog", "First Name:", None, QtGui.QApplication.UnicodeUTF8)) + self.LastNameLabel.setText(QtGui.QApplication.translate("AuthorsDialog", "Last Name:", None, QtGui.QApplication.UnicodeUTF8)) + self.DeleteButton.setToolTip(QtGui.QApplication.translate("AuthorsDialog", "Delete Author", None, QtGui.QApplication.UnicodeUTF8)) + self.AddUpdateButton.setToolTip(QtGui.QApplication.translate("AuthorsDialog", "Add Update Author", None, QtGui.QApplication.UnicodeUTF8)) + diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py new file mode 100644 index 000000000..8157f1a8f --- /dev/null +++ b/openlp/plugins/songs/forms/authorsform.py @@ -0,0 +1,93 @@ +# -*- coding: utf-8 -*- + +""" +Module implementing AuthorsForm. +""" + +from openlp.core.resources import * + +from PyQt4 import QtGui, QtCore +from PyQt4.QtGui import QDialog +from PyQt4.QtCore import pyqtSignature + +from authorsdialog import Ui_AuthorsDialog + +class AuthorsForm(QDialog, Ui_AuthorsDialog): + """ + Class documentation goes here. + """ + def __init__(self, songmanager, parent = None): + """ + Constructor + """ + QDialog.__init__(self, parent) + self.setupUi(self) + self.AuthorListView.setColumnCount(2) + self.AuthorListView.setColumnHidden(0, True) + self.AuthorListView.setColumnWidth(1, 300) + self.AuthorListView.setHorizontalHeaderLabels(QtCore.QStringList([" ","Author"])) + + self.songmanager = songmanager + + def load_form(self): + list = self.songmanager.get_authors() + self.AuthorListView.clear() # clear the results + self.AuthorListView.setHorizontalHeaderLabels(QtCore.QStringList([" ","Author"])) + self.AuthorListView.setRowCount(0) + for id, txt in list: + c = self.AuthorListView.rowCount() + self.AuthorListView.setRowCount(c+1) + twi = QtGui.QTableWidgetItem(str(id)) + self.AuthorListView.setItem(c , 0, twi) + twi = QtGui.QTableWidgetItem(str(txt)) + self.AuthorListView.setItem(c , 1, twi) + self.AuthorListView.setRowHeight(c, 20) + + @pyqtSignature("") + def on_buttonBox_accepted(self): + """ + Slot documentation goes here. + """ + print "bb acc" + + @pyqtSignature("") + def on_buttonBox_rejected(self): + """ + Slot documentation goes here. + """ + print "bb rej" + + @pyqtSignature("") + def on_FirstNameEdit_lostFocus(self): + """ + Slot documentation goes here. + """ + print "fm lf" + + @pyqtSignature("") + def on_LastNameEdit_lostFocus(self): + """ + Slot documentation goes here. + """ + print "ln lf" + + @pyqtSignature("") + def on_DeleteButton_clicked(self): + """ + Slot documentation goes here. + """ + print "db clicked" + + @pyqtSignature("") + def on_AddUpdateButton_clicked(self): + """ + Slot documentation goes here. + """ + print "au cli" + + @pyqtSignature("QTableWidgetItem*") + def on_AuthorListView_itemClicked(self, item): + """ + Slot documentation goes here. + """ + print "alv ic " + str(item) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 64a9ea396..940618a9f 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -1,42 +1,32 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'editsongform.ui' +# Form implementation generated from reading ui file 'editsongdialog.ui' # -# Created: Wed Dec 24 06:24:02 2008 +# Created: Thu Jan 1 09:56:53 2009 # by: PyQt4 UI code generator 4.4.3 # # WARNING! All changes made in this file will be lost! -#import openlp-2_rc - from PyQt4 import QtCore, QtGui class Ui_EditSongDialog(object): - def setupUi(self, EditSongForm): - EditSongForm.setObjectName("EditSongForm") - EditSongForm.resize(665, 481) + def setupUi(self, EditSongDialog): + EditSongDialog.setObjectName("EditSongDialog") + EditSongDialog.resize(734, 602) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - EditSongForm.setWindowIcon(icon) - self.EditSongFormLayout = QtGui.QVBoxLayout(EditSongForm) - self.EditSongFormLayout.setSpacing(8) - self.EditSongFormLayout.setMargin(8) - self.EditSongFormLayout.setObjectName("EditSongFormLayout") - self.TopWidget = QtGui.QWidget(EditSongForm) + EditSongDialog.setWindowIcon(icon) + self.TopWidget = QtGui.QWidget(EditSongDialog) + self.TopWidget.setGeometry(QtCore.QRect(8, 8, 711, 461)) self.TopWidget.setObjectName("TopWidget") - self.TopWidgetLayout = QtGui.QHBoxLayout(self.TopWidget) - self.TopWidgetLayout.setSpacing(8) - self.TopWidgetLayout.setMargin(0) - self.TopWidgetLayout.setObjectName("TopWidgetLayout") self.TextWidget = QtGui.QWidget(self.TopWidget) + self.TextWidget.setGeometry(QtCore.QRect(0, 0, 321, 461)) self.TextWidget.setObjectName("TextWidget") - self.TextWidgetLayout = QtGui.QVBoxLayout(self.TextWidget) - self.TextWidgetLayout.setSpacing(8) - self.TextWidgetLayout.setMargin(0) - self.TextWidgetLayout.setObjectName("TextWidgetLayout") + self.gridLayout = QtGui.QGridLayout(self.TextWidget) + self.gridLayout.setObjectName("gridLayout") self.TitleLabel = QtGui.QLabel(self.TextWidget) self.TitleLabel.setObjectName("TitleLabel") - self.TextWidgetLayout.addWidget(self.TitleLabel) + self.gridLayout.addWidget(self.TitleLabel, 0, 0, 1, 1) self.TitleEditItem = QtGui.QLineEdit(self.TextWidget) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -44,26 +34,29 @@ class Ui_EditSongDialog(object): sizePolicy.setHeightForWidth(self.TitleEditItem.sizePolicy().hasHeightForWidth()) self.TitleEditItem.setSizePolicy(sizePolicy) self.TitleEditItem.setObjectName("TitleEditItem") - self.TextWidgetLayout.addWidget(self.TitleEditItem) + self.gridLayout.addWidget(self.TitleEditItem, 1, 0, 1, 1) + self.AlternativeTitleLabel = QtGui.QLabel(self.TextWidget) + self.AlternativeTitleLabel.setObjectName("AlternativeTitleLabel") + self.gridLayout.addWidget(self.AlternativeTitleLabel, 2, 0, 1, 1) + self.AlternativeEdit = QtGui.QLineEdit(self.TextWidget) + self.AlternativeEdit.setObjectName("AlternativeEdit") + self.gridLayout.addWidget(self.AlternativeEdit, 3, 0, 1, 1) self.LyricsLabel = QtGui.QLabel(self.TextWidget) self.LyricsLabel.setObjectName("LyricsLabel") - self.TextWidgetLayout.addWidget(self.LyricsLabel) + self.gridLayout.addWidget(self.LyricsLabel, 4, 0, 1, 1) self.LyricsTextEdit = QtGui.QTextEdit(self.TextWidget) self.LyricsTextEdit.setLineWrapMode(QtGui.QTextEdit.NoWrap) self.LyricsTextEdit.setAcceptRichText(False) self.LyricsTextEdit.setObjectName("LyricsTextEdit") - self.TextWidgetLayout.addWidget(self.LyricsTextEdit) - self.TopWidgetLayout.addWidget(self.TextWidget) + self.gridLayout.addWidget(self.LyricsTextEdit, 5, 0, 1, 1) self.AuthorWidget = QtGui.QWidget(self.TopWidget) + self.AuthorWidget.setGeometry(QtCore.QRect(329, 0, 381, 431)) self.AuthorWidget.setObjectName("AuthorWidget") - self.AuthorWidgetLayout = QtGui.QVBoxLayout(self.AuthorWidget) - self.AuthorWidgetLayout.setSpacing(8) - self.AuthorWidgetLayout.setMargin(0) - self.AuthorWidgetLayout.setObjectName("AuthorWidgetLayout") self.AuthorsLabel = QtGui.QLabel(self.AuthorWidget) + self.AuthorsLabel.setGeometry(QtCore.QRect(0, 10, 45, 17)) self.AuthorsLabel.setObjectName("AuthorsLabel") - self.AuthorWidgetLayout.addWidget(self.AuthorsLabel) self.AuthorSelectWidget = QtGui.QWidget(self.AuthorWidget) + self.AuthorSelectWidget.setGeometry(QtCore.QRect(0, 25, 361, 27)) self.AuthorSelectWidget.setObjectName("AuthorSelectWidget") self.AuthorSelectWidgetLayout = QtGui.QHBoxLayout(self.AuthorSelectWidget) self.AuthorSelectWidgetLayout.setSpacing(8) @@ -85,100 +78,155 @@ class Ui_EditSongDialog(object): self.AuthorAddtoSongItem.setMaximumSize(QtCore.QSize(110, 16777215)) self.AuthorAddtoSongItem.setObjectName("AuthorAddtoSongItem") self.AuthorSelectWidgetLayout.addWidget(self.AuthorAddtoSongItem) - self.AuthorWidgetLayout.addWidget(self.AuthorSelectWidget) - self.AuthorManagementWidget = QtGui.QWidget(self.AuthorWidget) - self.AuthorManagementWidget.setObjectName("AuthorManagementWidget") - self.AuthorManagementWidgetLayout = QtGui.QHBoxLayout(self.AuthorManagementWidget) - self.AuthorManagementWidgetLayout.setSpacing(8) - self.AuthorManagementWidgetLayout.setMargin(0) - self.AuthorManagementWidgetLayout.setObjectName("AuthorManagementWidgetLayout") - self.NewAuthorButton = QtGui.QPushButton(self.AuthorManagementWidget) - self.NewAuthorButton.setObjectName("NewAuthorButton") - self.AuthorManagementWidgetLayout.addWidget(self.NewAuthorButton) - self.AuthorDeleteItem = QtGui.QPushButton(self.AuthorManagementWidget) - self.AuthorDeleteItem.setObjectName("AuthorDeleteItem") - self.AuthorManagementWidgetLayout.addWidget(self.AuthorDeleteItem) - self.AuthorWidgetLayout.addWidget(self.AuthorManagementWidget) + self.AddAuthorsButton = QtGui.QPushButton(self.AuthorSelectWidget) + self.AddAuthorsButton.setObjectName("AddAuthorsButton") + self.AuthorSelectWidgetLayout.addWidget(self.AddAuthorsButton) + self.SongBookGroup = QtGui.QWidget(self.AuthorWidget) + self.SongBookGroup.setGeometry(QtCore.QRect(0, 85, 351, 27)) + self.SongBookGroup.setObjectName("SongBookGroup") + self.layoutWidget = QtGui.QWidget(self.SongBookGroup) + self.layoutWidget.setGeometry(QtCore.QRect(0, 0, 351, 29)) + self.layoutWidget.setObjectName("layoutWidget") + self.SongBookLayout = QtGui.QHBoxLayout(self.layoutWidget) + self.SongBookLayout.setObjectName("SongBookLayout") + self.SongbookCombo = QtGui.QComboBox(self.layoutWidget) + self.SongbookCombo.setObjectName("SongbookCombo") + self.SongBookLayout.addWidget(self.SongbookCombo) + self.AddSongBookButton = QtGui.QPushButton(self.layoutWidget) + self.AddSongBookButton.setObjectName("AddSongBookButton") + self.SongBookLayout.addWidget(self.AddSongBookButton) self.SelectedAuthorsLabel = QtGui.QLabel(self.AuthorWidget) + self.SelectedAuthorsLabel.setGeometry(QtCore.QRect(10, 160, 96, 17)) self.SelectedAuthorsLabel.setObjectName("SelectedAuthorsLabel") - self.AuthorWidgetLayout.addWidget(self.SelectedAuthorsLabel) - self.AuthorsListItem = QtGui.QListView(self.AuthorWidget) - self.AuthorsListItem.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers) - self.AuthorsListItem.setSelectionRectVisible(True) - self.AuthorsListItem.setObjectName("AuthorsListItem") - self.AuthorWidgetLayout.addWidget(self.AuthorsListItem) - self.RemoveAuthorWidget = QtGui.QWidget(self.AuthorWidget) - self.RemoveAuthorWidget.setObjectName("RemoveAuthorWidget") - self.RemoveAuthorWidgetLayout = QtGui.QHBoxLayout(self.RemoveAuthorWidget) - self.RemoveAuthorWidgetLayout.setSpacing(8) - self.RemoveAuthorWidgetLayout.setMargin(0) - self.RemoveAuthorWidgetLayout.setObjectName("RemoveAuthorWidgetLayout") - spacerItem = QtGui.QSpacerItem(122, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.RemoveAuthorWidgetLayout.addItem(spacerItem) - self.AuthorRemoveItem = QtGui.QPushButton(self.RemoveAuthorWidget) - self.AuthorRemoveItem.setObjectName("AuthorRemoveItem") - self.RemoveAuthorWidgetLayout.addWidget(self.AuthorRemoveItem) - self.AuthorWidgetLayout.addWidget(self.RemoveAuthorWidget) - self.CopyrightInfoLabel = QtGui.QLabel(self.AuthorWidget) - self.CopyrightInfoLabel.setObjectName("CopyrightInfoLabel") - self.AuthorWidgetLayout.addWidget(self.CopyrightInfoLabel) self.CopyrightWidget = QtGui.QWidget(self.AuthorWidget) + self.CopyrightWidget.setGeometry(QtCore.QRect(0, 368, 147, 27)) self.CopyrightWidget.setObjectName("CopyrightWidget") self.CopyrightWidgetLayout = QtGui.QHBoxLayout(self.CopyrightWidget) self.CopyrightWidgetLayout.setSpacing(8) self.CopyrightWidgetLayout.setMargin(0) self.CopyrightWidgetLayout.setObjectName("CopyrightWidgetLayout") - self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightWidget) - self.CopyrightEditItem.setObjectName("CopyrightEditItem") - self.CopyrightWidgetLayout.addWidget(self.CopyrightEditItem) - self.CopyrightInsertItem = QtGui.QPushButton(self.CopyrightWidget) - self.CopyrightInsertItem.setMaximumSize(QtCore.QSize(29, 16777215)) - self.CopyrightInsertItem.setObjectName("CopyrightInsertItem") - self.CopyrightWidgetLayout.addWidget(self.CopyrightInsertItem) - self.AuthorWidgetLayout.addWidget(self.CopyrightWidget) - self.TopWidgetLayout.addWidget(self.AuthorWidget) - self.EditSongFormLayout.addWidget(self.TopWidget) - self.ThemeWidget = QtGui.QWidget(EditSongForm) + self.SongBookLabel = QtGui.QLabel(self.AuthorWidget) + self.SongBookLabel.setGeometry(QtCore.QRect(0, 50, 57, 27)) + self.SongBookLabel.setObjectName("SongBookLabel") + self.Topiclabel = QtGui.QLabel(self.AuthorWidget) + self.Topiclabel.setGeometry(QtCore.QRect(0, 110, 242, 27)) + self.Topiclabel.setObjectName("Topiclabel") + self.SelectedTopicsLabel = QtGui.QLabel(self.AuthorWidget) + self.SelectedTopicsLabel.setGeometry(QtCore.QRect(180, 160, 96, 17)) + self.SelectedTopicsLabel.setObjectName("SelectedTopicsLabel") + self.layoutWidget1 = QtGui.QWidget(self.AuthorWidget) + self.layoutWidget1.setGeometry(QtCore.QRect(10, 180, 341, 191)) + self.layoutWidget1.setObjectName("layoutWidget1") + self.SelectedAuthorsGroup = QtGui.QHBoxLayout(self.layoutWidget1) + self.SelectedAuthorsGroup.setObjectName("SelectedAuthorsGroup") + self.AuthorsListView = QtGui.QTableWidget(self.layoutWidget1) + self.AuthorsListView.setAlternatingRowColors(True) + self.AuthorsListView.setObjectName("AuthorsListView") + self.AuthorsListView.setColumnCount(0) + self.AuthorsListView.setRowCount(0) + self.SelectedAuthorsGroup.addWidget(self.AuthorsListView) + self.ToticsListView = QtGui.QTableWidget(self.layoutWidget1) + self.ToticsListView.setAlternatingRowColors(True) + self.ToticsListView.setObjectName("ToticsListView") + self.ToticsListView.setColumnCount(0) + self.ToticsListView.setRowCount(0) + self.SelectedAuthorsGroup.addWidget(self.ToticsListView) + self.layoutWidget2 = QtGui.QWidget(self.AuthorWidget) + self.layoutWidget2.setGeometry(QtCore.QRect(3, 130, 341, 29)) + self.layoutWidget2.setObjectName("layoutWidget2") + self.SongTopicLayout = QtGui.QHBoxLayout(self.layoutWidget2) + self.SongTopicLayout.setObjectName("SongTopicLayout") + self.comboBox = QtGui.QComboBox(self.layoutWidget2) + self.comboBox.setObjectName("comboBox") + self.SongTopicLayout.addWidget(self.comboBox) + self.AddTopicsToSongButton = QtGui.QPushButton(self.layoutWidget2) + self.AddTopicsToSongButton.setObjectName("AddTopicsToSongButton") + self.SongTopicLayout.addWidget(self.AddTopicsToSongButton) + self.AddTopicButton = QtGui.QPushButton(self.layoutWidget2) + self.AddTopicButton.setObjectName("AddTopicButton") + self.SongTopicLayout.addWidget(self.AddTopicButton) + self.layoutWidget3 = QtGui.QWidget(self.AuthorWidget) + self.layoutWidget3.setGeometry(QtCore.QRect(10, 380, 341, 29)) + self.layoutWidget3.setObjectName("layoutWidget3") + self.RemoveAuthorsLayout = QtGui.QHBoxLayout(self.layoutWidget3) + self.RemoveAuthorsLayout.setObjectName("RemoveAuthorsLayout") + self.AuthorRemoveItem = QtGui.QPushButton(self.layoutWidget3) + self.AuthorRemoveItem.setObjectName("AuthorRemoveItem") + self.RemoveAuthorsLayout.addWidget(self.AuthorRemoveItem) + self.pushButton = QtGui.QPushButton(self.layoutWidget3) + self.pushButton.setObjectName("pushButton") + self.RemoveAuthorsLayout.addWidget(self.pushButton) + self.ThemeWidget = QtGui.QWidget(EditSongDialog) + self.ThemeWidget.setGeometry(QtCore.QRect(10, 520, 641, 45)) self.ThemeWidget.setObjectName("ThemeWidget") - self.ThemeWidgetLayout = QtGui.QHBoxLayout(self.ThemeWidget) - self.ThemeWidgetLayout.setSpacing(8) - self.ThemeWidgetLayout.setMargin(0) - self.ThemeWidgetLayout.setObjectName("ThemeWidgetLayout") + self.horizontalLayout_5 = QtGui.QHBoxLayout(self.ThemeWidget) + self.horizontalLayout_5.setObjectName("horizontalLayout_5") self.ThemeLabel = QtGui.QLabel(self.ThemeWidget) self.ThemeLabel.setMaximumSize(QtCore.QSize(70, 16777215)) self.ThemeLabel.setObjectName("ThemeLabel") - self.ThemeWidgetLayout.addWidget(self.ThemeLabel) + self.horizontalLayout_5.addWidget(self.ThemeLabel) self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeWidget) self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem") - self.ThemeWidgetLayout.addWidget(self.ThemeSelectionComboItem) + self.horizontalLayout_5.addWidget(self.ThemeSelectionComboItem) self.ThemeAddItem = QtGui.QPushButton(self.ThemeWidget) self.ThemeAddItem.setMaximumSize(QtCore.QSize(110, 16777215)) self.ThemeAddItem.setObjectName("ThemeAddItem") - self.ThemeWidgetLayout.addWidget(self.ThemeAddItem) - self.EditSongFormLayout.addWidget(self.ThemeWidget) - self.ButtonBox = QtGui.QDialogButtonBox(EditSongForm) + self.horizontalLayout_5.addWidget(self.ThemeAddItem) + self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog) + self.ButtonBox.setGeometry(QtCore.QRect(500, 570, 156, 27)) self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) self.ButtonBox.setObjectName("ButtonBox") - self.EditSongFormLayout.addWidget(self.ButtonBox) - - self.retranslateUi(EditSongForm) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongForm.close) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditSongForm.close) - QtCore.QMetaObject.connectSlotsByName(EditSongForm) - - def retranslateUi(self, EditSongForm): - EditSongForm.setWindowTitle(QtGui.QApplication.translate("EditSongForm", "Song Editor", None, QtGui.QApplication.UnicodeUTF8)) - self.TitleLabel.setText(QtGui.QApplication.translate("EditSongForm", "Title:", None, QtGui.QApplication.UnicodeUTF8)) - self.LyricsLabel.setText(QtGui.QApplication.translate("EditSongForm", "Lyrics:", None, QtGui.QApplication.UnicodeUTF8)) - self.AuthorsLabel.setText(QtGui.QApplication.translate("EditSongForm", "Authors:", None, QtGui.QApplication.UnicodeUTF8)) - self.AuthorAddtoSongItem.setText(QtGui.QApplication.translate("EditSongForm", "Add to Song", None, QtGui.QApplication.UnicodeUTF8)) - self.NewAuthorButton.setText(QtGui.QApplication.translate("EditSongForm", "Add a New Author", None, QtGui.QApplication.UnicodeUTF8)) - self.AuthorDeleteItem.setText(QtGui.QApplication.translate("EditSongForm", "Delete Author", None, QtGui.QApplication.UnicodeUTF8)) - self.SelectedAuthorsLabel.setText(QtGui.QApplication.translate("EditSongForm", "Selected Authors:", None, QtGui.QApplication.UnicodeUTF8)) - self.AuthorRemoveItem.setText(QtGui.QApplication.translate("EditSongForm", "Remove Selected Author(s)", None, QtGui.QApplication.UnicodeUTF8)) - self.CopyrightInfoLabel.setText(QtGui.QApplication.translate("EditSongForm", "Copyright Info:", None, QtGui.QApplication.UnicodeUTF8)) - self.CopyrightInsertItem.setText(QtGui.QApplication.translate("EditSongForm", "©", None, QtGui.QApplication.UnicodeUTF8)) - self.ThemeLabel.setText(QtGui.QApplication.translate("EditSongForm", "Theme", None, QtGui.QApplication.UnicodeUTF8)) - self.ThemeAddItem.setText(QtGui.QApplication.translate("EditSongForm", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8)) + self.layoutWidget4 = QtGui.QWidget(EditSongDialog) + self.layoutWidget4.setGeometry(QtCore.QRect(20, 490, 311, 25)) + self.layoutWidget4.setObjectName("layoutWidget4") + self.VerseOrderLayout = QtGui.QHBoxLayout(self.layoutWidget4) + self.VerseOrderLayout.setObjectName("VerseOrderLayout") + self.VerseOrderLabel = QtGui.QLabel(self.layoutWidget4) + self.VerseOrderLabel.setObjectName("VerseOrderLabel") + self.VerseOrderLayout.addWidget(self.VerseOrderLabel) + self.VerseOrderEdit = QtGui.QLineEdit(self.layoutWidget4) + self.VerseOrderEdit.setObjectName("VerseOrderEdit") + self.VerseOrderLayout.addWidget(self.VerseOrderEdit) + self.layoutWidget5 = QtGui.QWidget(EditSongDialog) + self.layoutWidget5.setGeometry(QtCore.QRect(341, 461, 371, 52)) + self.layoutWidget5.setObjectName("layoutWidget5") + self.CopyrightLayout = QtGui.QGridLayout(self.layoutWidget5) + self.CopyrightLayout.setObjectName("CopyrightLayout") + self.CopyrightInfoLabel = QtGui.QLabel(self.layoutWidget5) + self.CopyrightInfoLabel.setObjectName("CopyrightInfoLabel") + self.CopyrightLayout.addWidget(self.CopyrightInfoLabel, 0, 0, 1, 1) + self.CopyrightEditItem = QtGui.QLineEdit(self.layoutWidget5) + self.CopyrightEditItem.setObjectName("CopyrightEditItem") + self.CopyrightLayout.addWidget(self.CopyrightEditItem, 1, 0, 1, 1) + self.CopyrightInsertItem = QtGui.QPushButton(self.layoutWidget5) + self.CopyrightInsertItem.setMaximumSize(QtCore.QSize(29, 16777215)) + self.CopyrightInsertItem.setObjectName("CopyrightInsertItem") + self.CopyrightLayout.addWidget(self.CopyrightInsertItem, 1, 1, 1, 1) + self.retranslateUi(EditSongDialog) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongDialog.close) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditSongDialog.close) + QtCore.QMetaObject.connectSlotsByName(EditSongDialog) + def retranslateUi(self, EditSongDialog): + EditSongDialog.setWindowTitle(QtGui.QApplication.translate("EditSongDialog", "Song Editor", None, QtGui.QApplication.UnicodeUTF8)) + self.TitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Title:", None, QtGui.QApplication.UnicodeUTF8)) + self.AlternativeTitleLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Alternative Title:", None, QtGui.QApplication.UnicodeUTF8)) + self.LyricsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Lyrics:", None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Authors:", None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorAddtoSongItem.setText(QtGui.QApplication.translate("EditSongDialog", "Add to Song", None, QtGui.QApplication.UnicodeUTF8)) + self.AddAuthorsButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add Authors", None, QtGui.QApplication.UnicodeUTF8)) + self.AddSongBookButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add Song Book", None, QtGui.QApplication.UnicodeUTF8)) + self.SelectedAuthorsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Selected Authors:", None, QtGui.QApplication.UnicodeUTF8)) + self.SongBookLabel.setText(QtGui.QApplication.translate("EditSongDialog", "SongBook", None, QtGui.QApplication.UnicodeUTF8)) + self.Topiclabel.setText(QtGui.QApplication.translate("EditSongDialog", "SongTopic", None, QtGui.QApplication.UnicodeUTF8)) + self.SelectedTopicsLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Selected Topics:", None, QtGui.QApplication.UnicodeUTF8)) + self.AddTopicsToSongButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add to Song", None, QtGui.QApplication.UnicodeUTF8)) + self.AddTopicButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add Topic", None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorRemoveItem.setText(QtGui.QApplication.translate("EditSongDialog", "Remove Selected Author(s)", None, QtGui.QApplication.UnicodeUTF8)) + self.pushButton.setText(QtGui.QApplication.translate("EditSongDialog", "Remove Selected Topics", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeAddItem.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8)) + self.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8)) + self.CopyrightInfoLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Copyright Info:", None, QtGui.QApplication.UnicodeUTF8)) + self.CopyrightInsertItem.setText(QtGui.QApplication.translate("EditSongDialog", "©", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 84d65846b..a9498df61 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -21,6 +21,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4.QtGui import QWidget from PyQt4.QtCore import pyqtSignature +from authorsform import AuthorsForm +from topicsform import TopicsForm +from songbookform import SongBookForm + from editsongdialog import Ui_EditSongDialog class EditSongForm(QWidget, Ui_EditSongDialog): @@ -34,6 +38,9 @@ class EditSongForm(QWidget, Ui_EditSongDialog): QWidget.__init__(self, parent) self.setupUi(self) self.songmanager = songmanager + self.authors_form = AuthorsForm(self.songmanager) + self.topics_form = TopicsForm(self.songmanager) + self.song_book_form = SongBookForm(self.songmanager) self.initialise() def initialise(self): @@ -46,8 +53,43 @@ class EditSongForm(QWidget, Ui_EditSongDialog): def load_song(self, songid): self.songid = songid song = self.songmanager.get_song(songid) + print song + #print song[2].encode('hex') #print song + lyrics = song[2] + if lyrics.find("\x0a0d0a0d"): + print "new line" + lyrics = lyrics.replace("\x0a0d0a0d","\x23200a0d") + if lyrics.find("\xa0"): + print "Alt" + lyrics = lyrics.replace("\xa0","\x20") + + print lyrics + self.TitleEditItem.setText(song[1]) - self.LyricsTextEdit.setText(song[2]) + self.LyricsTextEdit.setText(lyrics) self.CopyrightEditItem.setText(song[3]) + @pyqtSignature("") + def on_AddAuthorsButton_clicked(self): + """ + Slot documentation goes here. + """ + self.authors_form.load_form() + self.authors_form.show() + + @pyqtSignature("") + def on_AddTopicButton_clicked(self): + """ + Slot documentation goes here. + """ + self.topics_form.load_form() + self.topics_form.show() + @pyqtSignature("") + + def on_AddSongBookButton_clicked(self): + """ + Slot documentation goes here. + """ + self.song_book_form.load_form() + self.song_book_form.show() diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py new file mode 100644 index 000000000..e7615f0fb --- /dev/null +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'songbookdialog.ui' +# +# Created: Thu Jan 1 09:44:21 2009 +# by: PyQt4 UI code generator 4.4.3 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_SongBookDialog(object): + def setupUi(self, SongBookDialog): + SongBookDialog.setObjectName("SongBookDialog") + SongBookDialog.resize(387, 500) + self.gridLayout_2 = QtGui.QGridLayout(SongBookDialog) + self.gridLayout_2.setObjectName("gridLayout_2") + self.BookSongListView = QtGui.QTableWidget(SongBookDialog) + self.BookSongListView.setObjectName("BookSongListView") + self.BookSongListView.setColumnCount(0) + self.BookSongListView.setRowCount(0) + self.gridLayout_2.addWidget(self.BookSongListView, 0, 0, 1, 2) + self.SongBookGroup = QtGui.QGroupBox(SongBookDialog) + self.SongBookGroup.setObjectName("SongBookGroup") + self.gridLayout = QtGui.QGridLayout(self.SongBookGroup) + self.gridLayout.setObjectName("gridLayout") + self.NameLabel = QtGui.QLabel(self.SongBookGroup) + self.NameLabel.setObjectName("NameLabel") + 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.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) + 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) + icon = QtGui.QIcon() + 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.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_2.addWidget(self.SongBookGroup, 1, 0, 1, 2) + self.MessageLabel = QtGui.QLabel(SongBookDialog) + self.MessageLabel.setObjectName("MessageLabel") + self.gridLayout_2.addWidget(self.MessageLabel, 2, 0, 1, 1) + self.ButtonBox = QtGui.QDialogButtonBox(SongBookDialog) + self.ButtonBox.setOrientation(QtCore.Qt.Horizontal) + self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) + self.ButtonBox.setObjectName("ButtonBox") + self.gridLayout_2.addWidget(self.ButtonBox, 2, 1, 1, 1) + + self.retranslateUi(SongBookDialog) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), SongBookDialog.accept) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), SongBookDialog.reject) + QtCore.QMetaObject.connectSlotsByName(SongBookDialog) + + def retranslateUi(self, SongBookDialog): + SongBookDialog.setWindowTitle(QtGui.QApplication.translate("SongBookDialog", "Book Song Maintenance", None, QtGui.QApplication.UnicodeUTF8)) + self.SongBookGroup.setTitle(QtGui.QApplication.translate("SongBookDialog", "Song Book", None, QtGui.QApplication.UnicodeUTF8)) + self.NameLabel.setText(QtGui.QApplication.translate("SongBookDialog", "Name:", None, QtGui.QApplication.UnicodeUTF8)) + 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)) + diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py new file mode 100644 index 000000000..8e5aabd7c --- /dev/null +++ b/openlp/plugins/songs/forms/songbookform.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- + +""" +Module implementing SongBookForm. +""" + +from openlp.core.resources import * + +from PyQt4 import QtGui, QtCore +from PyQt4.QtGui import QDialog +from PyQt4.QtCore import pyqtSignature +from songbookdialog import Ui_SongBookDialog + +class SongBookForm(QDialog, Ui_SongBookDialog): + """ + Class documentation goes here. + """ + def __init__(self,songmanager, parent = None): + """ + Constructor + """ + QDialog.__init__(self, parent) + self.setupUi(self) + self.songmanager = songmanager + + def load_form(self): + A = 1 + + @pyqtSignature("QTableWidgetItem*") + def on_BookSongListView_itemClicked(self, item): + """ + Slot documentation goes here. + """ + print "bslv ic " + str(item) + + @pyqtSignature("") + def on_DeleteButton_clicked(self): + """ + Slot documentation goes here. + """ + print "db c " + + @pyqtSignature("") + def on_AddUpdateButton_clicked(self): + """ + Slot documentation goes here. + """ + print "au c " diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py new file mode 100644 index 000000000..35fa655d0 --- /dev/null +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'topicsdialog.ui' +# +# Created: Thu Jan 1 09:41:22 2009 +# by: PyQt4 UI code generator 4.4.3 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_TopicsDialog(object): + def setupUi(self, TopicsDialog): + TopicsDialog.setObjectName("TopicsDialog") + 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) + self.gridLayout.setObjectName("gridLayout") + self.TopicNameLabel = QtGui.QLabel(self.TopicGroupBox) + self.TopicNameLabel.setObjectName("TopicNameLabel") + 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) + 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) + icon = QtGui.QIcon() + 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.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_2.addWidget(self.TopicGroupBox, 1, 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) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), TopicsDialog.reject) + QtCore.QMetaObject.connectSlotsByName(TopicsDialog) + + def retranslateUi(self, TopicsDialog): + TopicsDialog.setWindowTitle(QtGui.QApplication.translate("TopicsDialog", "Topic Maintenance", None, QtGui.QApplication.UnicodeUTF8)) + self.TopicGroupBox.setTitle(QtGui.QApplication.translate("TopicsDialog", "Topic", None, QtGui.QApplication.UnicodeUTF8)) + 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)) + diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py new file mode 100644 index 000000000..ccf20a2a5 --- /dev/null +++ b/openlp/plugins/songs/forms/topicsform.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- + +""" +Module implementing TopicsForm. +""" + +from openlp.core.resources import * + +from PyQt4 import QtGui, QtCore +from PyQt4.QtGui import QDialog +from PyQt4.QtCore import pyqtSignature + +from topicsdialog import Ui_TopicsDialog + +class TopicsForm(QDialog, Ui_TopicsDialog): + """ + Class documentation goes here. + """ + def __init__(self, songmanager, parent = None): + """ + Constructor + """ + QDialog.__init__(self, parent) + self.setupUi(self) + self.songmanager = songmanager + + def load_form(self): + A = 1 + + @pyqtSignature("") + def on_DeleteButton_clicked(self): + """ + Slot documentation goes here. + """ + print "db clicked" + + @pyqtSignature("") + def on_AddUpdateButton_clicked(self): + """ + Slot documentation goes here. + """ + print "au clicked" diff --git a/openlp/plugins/songs/lib/songDBimpl.py b/openlp/plugins/songs/lib/songDBimpl.py index 615c6281f..1fd99323c 100644 --- a/openlp/plugins/songs/lib/songDBimpl.py +++ b/openlp/plugins/songs/lib/songDBimpl.py @@ -49,8 +49,6 @@ class SongDBImpl(BibleCommon): self.songfile = os.path.join(songpath, "songs."+suffix) log.debug( "Load Song on path %s", self.songfile) - - #c = conn.cursor() if btype == 'sqlite': self.db = sqlite3.connect(self.songfile)