diff --git a/.eric4project/openlp.org 2.0.e4q b/.eric4project/openlp.org 2.0.e4q index ac912a6e7..4a92dfa4d 100644 --- a/.eric4project/openlp.org 2.0.e4q +++ b/.eric4project/openlp.org 2.0.e4q @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/.eric4project/openlp.org 2.0.e4t b/.eric4project/openlp.org 2.0.e4t index a9570b35d..48ea174cf 100644 --- a/.eric4project/openlp.org 2.0.e4t +++ b/.eric4project/openlp.org 2.0.e4t @@ -1,7 +1,7 @@ - + TODO: what is the tags for bridge, pre-chorus? diff --git a/openlp.org 2.0.e4p b/openlp.org 2.0.e4p index f1426e2f7..7225ae572 100644 --- a/openlp.org 2.0.e4p +++ b/openlp.org 2.0.e4p @@ -1,7 +1,7 @@ - + Python @@ -116,6 +116,11 @@ openlp/core/test/testplugins/deeper/__init__.py openlp/core/test/testplugins/deeper/toodeep/__init__.py openlp/core/test/testplugins/deeper/toodeep/plugin3toodeep.py + openlp/core/lib/serviceitem.py + openlp/core/ui/slidecontroller.py + openlp/core/lib/ImageServiceItem.py + openlp/core/lib/eventreceiver.py + openlp/core/lib/imageserviceitem.py
resources/forms/openlpexportform.ui
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index f7c67cdff..d6b7eb923 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -463,279 +463,3 @@ class MainWindow(object): def onOptionsSettingsItemClicked(self): self.settings_form.show() - -# self.CustomSlidePage = QtGui.QWidget() -# self.CustomSlidePage.setGeometry(QtCore.QRect(0, 0, 267, 609)) -# self.CustomSlidePage.setObjectName("CustomSlidePage") -# self.verticalLayout = QtGui.QVBoxLayout(self.CustomSlidePage) -# self.verticalLayout.setSpacing(0) -# self.verticalLayout.setMargin(0) -# self.verticalLayout.setObjectName("verticalLayout") -# self.CustomSlideToolbar = QtGui.QWidget(self.CustomSlidePage) -# self.CustomSlideToolbar.setObjectName("CustomSlideToolbar") -# self.horizontalLayout_2 = QtGui.QHBoxLayout(self.CustomSlideToolbar) -# self.horizontalLayout_2.setSpacing(0) -# self.horizontalLayout_2.setContentsMargins(0, 2, 0, 0) -# self.horizontalLayout_2.setObjectName("horizontalLayout_2") -# self.CustomNewButton = QtGui.QToolButton(self.CustomSlideToolbar) -# icon9 = QtGui.QIcon() -# icon9.addPixmap(QtGui.QPixmap(":/custom/custom_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.CustomNewButton.setIcon(icon9) -# self.CustomNewButton.setIconSize(QtCore.QSize(20, 20)) -# self.CustomNewButton.setAutoRaise(True) -# self.CustomNewButton.setObjectName("CustomNewButton") -# self.horizontalLayout_2.addWidget(self.CustomNewButton) -# self.CustomEditButton = QtGui.QToolButton(self.CustomSlideToolbar) -# icon10 = QtGui.QIcon() -# icon10.addPixmap(QtGui.QPixmap(":/custom/custom_edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.CustomEditButton.setIcon(icon10) -# self.CustomEditButton.setIconSize(QtCore.QSize(20, 20)) -# self.CustomEditButton.setAutoRaise(True) -# self.CustomEditButton.setObjectName("CustomEditButton") -# self.horizontalLayout_2.addWidget(self.CustomEditButton) -# self.CustomDeleteButton = QtGui.QToolButton(self.CustomSlideToolbar) -# icon11 = QtGui.QIcon() -# icon11.addPixmap(QtGui.QPixmap(":/custom/custom_delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.CustomDeleteButton.setIcon(icon11) -# self.CustomDeleteButton.setIconSize(QtCore.QSize(20, 20)) -# self.CustomDeleteButton.setAutoRaise(True) -# self.CustomDeleteButton.setObjectName("CustomDeleteButton") -# self.horizontalLayout_2.addWidget(self.CustomDeleteButton) -# self.CustomToolbarLine = QtGui.QFrame(self.CustomSlideToolbar) -# self.CustomToolbarLine.setFrameShape(QtGui.QFrame.VLine) -# self.CustomToolbarLine.setFrameShadow(QtGui.QFrame.Sunken) -# self.CustomToolbarLine.setObjectName("CustomToolbarLine") -# self.horizontalLayout_2.addWidget(self.CustomToolbarLine) -# self.CustomPreviewButton = QtGui.QToolButton(self.CustomSlideToolbar) -# self.CustomPreviewButton.setIcon(icon4) -# self.CustomPreviewButton.setIconSize(QtCore.QSize(20, 20)) -# self.CustomPreviewButton.setAutoRaise(True) -# self.CustomPreviewButton.setObjectName("CustomPreviewButton") -# self.horizontalLayout_2.addWidget(self.CustomPreviewButton) -# self.CustomLiveButton = QtGui.QToolButton(self.CustomSlideToolbar) -# self.CustomLiveButton.setIcon(icon5) -# self.CustomLiveButton.setIconSize(QtCore.QSize(20, 20)) -# self.CustomLiveButton.setAutoRaise(True) -# self.CustomLiveButton.setObjectName("CustomLiveButton") -# self.horizontalLayout_2.addWidget(self.CustomLiveButton) -# self.CustomAddButton = QtGui.QToolButton(self.CustomSlideToolbar) -# self.CustomAddButton.setIcon(icon6) -# self.CustomAddButton.setIconSize(QtCore.QSize(20, 20)) -# self.CustomAddButton.setAutoRaise(True) -# self.CustomAddButton.setObjectName("CustomAddButton") -# self.horizontalLayout_2.addWidget(self.CustomAddButton) -# spacerItem3 = QtGui.QSpacerItem(84, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) -# self.horizontalLayout_2.addItem(spacerItem3) -# self.verticalLayout.addWidget(self.CustomSlideToolbar) -# self.CustomSlideList = QtGui.QListWidget(self.CustomSlidePage) -# self.CustomSlideList.setObjectName("CustomSlideList") -# self.verticalLayout.addWidget(self.CustomSlideList) -# icon12 = QtGui.QIcon() -# icon12.addPixmap(QtGui.QPixmap(":/media/media_custom.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.MediaToolBox.addItem(self.CustomSlidePage, icon12, "") -# self.PresentationPage = QtGui.QWidget() -# self.PresentationPage.setGeometry(QtCore.QRect(0, 0, 267, 609)) -# self.PresentationPage.setObjectName("PresentationPage") -# self.PresentationsLayout = QtGui.QVBoxLayout(self.PresentationPage) -# self.PresentationsLayout.setSpacing(0) -# self.PresentationsLayout.setMargin(0) -# self.PresentationsLayout.setObjectName("PresentationsLayout") -# self.PresentationToolbar = QtGui.QWidget(self.PresentationPage) -# self.PresentationToolbar.setObjectName("PresentationToolbar") -# self.PresentationToolbarLayout = QtGui.QHBoxLayout(self.PresentationToolbar) -# self.PresentationToolbarLayout.setSpacing(0) -# self.PresentationToolbarLayout.setMargin(0) -# self.PresentationToolbarLayout.setObjectName("PresentationToolbarLayout") -# self.PresentationLoadItem = QtGui.QToolButton(self.PresentationToolbar) -# icon13 = QtGui.QIcon() -# icon13.addPixmap(QtGui.QPixmap(":/videos/video_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.PresentationLoadItem.setIcon(icon13) -# self.PresentationLoadItem.setIconSize(QtCore.QSize(20, 20)) -# self.PresentationLoadItem.setAutoRaise(True) -# self.PresentationLoadItem.setObjectName("PresentationLoadItem") -# self.PresentationToolbarLayout.addWidget(self.PresentationLoadItem) -# self.PresentationDeleteItem = QtGui.QToolButton(self.PresentationToolbar) -# icon14 = QtGui.QIcon() -# icon14.addPixmap(QtGui.QPixmap(":/videos/video_delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.PresentationDeleteItem.setIcon(icon14) -# self.PresentationDeleteItem.setIconSize(QtCore.QSize(20, 20)) -# self.PresentationDeleteItem.setAutoRaise(True) -# self.PresentationDeleteItem.setObjectName("PresentationDeleteItem") -# self.PresentationToolbarLayout.addWidget(self.PresentationDeleteItem) -# self.PresentationLine = QtGui.QFrame(self.PresentationToolbar) -# self.PresentationLine.setFrameShape(QtGui.QFrame.VLine) -# self.PresentationLine.setFrameShadow(QtGui.QFrame.Sunken) -# self.PresentationLine.setObjectName("PresentationLine") -# self.PresentationToolbarLayout.addWidget(self.PresentationLine) -# self.PresentationLiveItem = QtGui.QToolButton(self.PresentationToolbar) -# self.PresentationLiveItem.setIcon(icon5) -# self.PresentationLiveItem.setIconSize(QtCore.QSize(20, 20)) -# self.PresentationLiveItem.setAutoRaise(True) -# self.PresentationLiveItem.setObjectName("PresentationLiveItem") -# self.PresentationToolbarLayout.addWidget(self.PresentationLiveItem) -# self.PresentationAddItem = QtGui.QToolButton(self.PresentationToolbar) -# self.PresentationAddItem.setIcon(icon6) -# self.PresentationAddItem.setIconSize(QtCore.QSize(20, 20)) -# self.PresentationAddItem.setAutoRaise(True) -# self.PresentationAddItem.setObjectName("PresentationAddItem") -# self.PresentationToolbarLayout.addWidget(self.PresentationAddItem) -# spacerItem4 = QtGui.QSpacerItem(166, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) -# self.PresentationToolbarLayout.addItem(spacerItem4) -# self.PresentationsLayout.addWidget(self.PresentationToolbar) -# self.listWidget_2 = QtGui.QListWidget(self.PresentationPage) -# self.listWidget_2.setObjectName("listWidget_2") -# self.PresentationsLayout.addWidget(self.listWidget_2) -# icon15 = QtGui.QIcon() -# icon15.addPixmap(QtGui.QPixmap(":/media/media_presentation.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.MediaToolBox.addItem(self.PresentationPage, icon15, "") -# self.VideoPage = QtGui.QWidget() -# self.VideoPage.setGeometry(QtCore.QRect(0, 0, 267, 609)) -# self.VideoPage.setObjectName("VideoPage") -# self.VideosLayout = QtGui.QVBoxLayout(self.VideoPage) -# self.VideosLayout.setSpacing(0) -# self.VideosLayout.setMargin(0) -# self.VideosLayout.setObjectName("VideosLayout") -# self.VideoToolbar = QtGui.QWidget(self.VideoPage) -# self.VideoToolbar.setObjectName("VideoToolbar") -# self.VideoToolbarLayout = QtGui.QHBoxLayout(self.VideoToolbar) -# self.VideoToolbarLayout.setSpacing(0) -# self.VideoToolbarLayout.setMargin(0) -# self.VideoToolbarLayout.setObjectName("VideoToolbarLayout") -# self.VideoLoadItem = QtGui.QToolButton(self.VideoToolbar) -# self.VideoLoadItem.setIcon(icon13) -# self.VideoLoadItem.setIconSize(QtCore.QSize(20, 20)) -# self.VideoLoadItem.setAutoRaise(True) -# self.VideoLoadItem.setObjectName("VideoLoadItem") -# self.VideoToolbarLayout.addWidget(self.VideoLoadItem) -# self.VideoDeleteItem = QtGui.QToolButton(self.VideoToolbar) -# self.VideoDeleteItem.setIcon(icon14) -# self.VideoDeleteItem.setIconSize(QtCore.QSize(20, 20)) -# self.VideoDeleteItem.setAutoRaise(True) -# self.VideoDeleteItem.setObjectName("VideoDeleteItem") -# self.VideoToolbarLayout.addWidget(self.VideoDeleteItem) -# self.VideoLine = QtGui.QFrame(self.VideoToolbar) -# self.VideoLine.setFrameShape(QtGui.QFrame.VLine) -# self.VideoLine.setFrameShadow(QtGui.QFrame.Sunken) -# self.VideoLine.setObjectName("VideoLine") -# self.VideoToolbarLayout.addWidget(self.VideoLine) -# self.VideoLiveItem = QtGui.QToolButton(self.VideoToolbar) -# self.VideoLiveItem.setIcon(icon5) -# self.VideoLiveItem.setIconSize(QtCore.QSize(20, 20)) -# self.VideoLiveItem.setAutoRaise(True) -# self.VideoLiveItem.setObjectName("VideoLiveItem") -# self.VideoToolbarLayout.addWidget(self.VideoLiveItem) -# self.VideoAddItem = QtGui.QToolButton(self.VideoToolbar) -# self.VideoAddItem.setIcon(icon6) -# self.VideoAddItem.setIconSize(QtCore.QSize(20, 20)) -# self.VideoAddItem.setAutoRaise(True) -# self.VideoAddItem.setObjectName("VideoAddItem") -# self.VideoToolbarLayout.addWidget(self.VideoAddItem) -# spacerItem5 = QtGui.QSpacerItem(166, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) -# self.VideoToolbarLayout.addItem(spacerItem5) -# self.VideosLayout.addWidget(self.VideoToolbar) -# self.listWidget = QtGui.QListWidget(self.VideoPage) -# self.listWidget.setObjectName("listWidget") -# self.VideosLayout.addWidget(self.listWidget) -# icon16 = QtGui.QIcon() -# icon16.addPixmap(QtGui.QPixmap(":/media/media_video.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.MediaToolBox.addItem(self.VideoPage, icon16, "") -# self.ImagePage = QtGui.QWidget() -# self.ImagePage.setGeometry(QtCore.QRect(0, 0, 267, 609)) -# self.ImagePage.setObjectName("ImagePage") -# self.ImagesLayout = QtGui.QVBoxLayout(self.ImagePage) -# self.ImagesLayout.setSpacing(0) -# self.ImagesLayout.setMargin(0) -# self.ImagesLayout.setObjectName("ImagesLayout") -# self.ImageToolbar = QtGui.QWidget(self.ImagePage) -# self.ImageToolbar.setObjectName("ImageToolbar") -# self.ImageToolbarLayout = QtGui.QHBoxLayout(self.ImageToolbar) -# self.ImageToolbarLayout.setSpacing(0) -# self.ImageToolbarLayout.setMargin(0) -# self.ImageToolbarLayout.setObjectName("ImageToolbarLayout") -# self.ImageLoadItem = QtGui.QToolButton(self.ImageToolbar) -# icon17 = QtGui.QIcon() -# icon17.addPixmap(QtGui.QPixmap(":/images/image_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.ImageLoadItem.setIcon(icon17) -# self.ImageLoadItem.setIconSize(QtCore.QSize(20, 20)) -# self.ImageLoadItem.setAutoRaise(True) -# self.ImageLoadItem.setObjectName("ImageLoadItem") -# self.ImageToolbarLayout.addWidget(self.ImageLoadItem) -# self.ImageDeleteItem = QtGui.QToolButton(self.ImageToolbar) -# icon18 = QtGui.QIcon() -# icon18.addPixmap(QtGui.QPixmap(":/images/image_delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.ImageDeleteItem.setIcon(icon18) -# self.ImageDeleteItem.setIconSize(QtCore.QSize(20, 20)) -# self.ImageDeleteItem.setAutoRaise(True) -# self.ImageDeleteItem.setObjectName("ImageDeleteItem") -# self.ImageToolbarLayout.addWidget(self.ImageDeleteItem) -# self.ImageLine = QtGui.QFrame(self.ImageToolbar) -# self.ImageLine.setFrameShape(QtGui.QFrame.VLine) -# self.ImageLine.setFrameShadow(QtGui.QFrame.Sunken) -# self.ImageLine.setObjectName("ImageLine") -# self.ImageToolbarLayout.addWidget(self.ImageLine) -# self.ImageLiveItem = QtGui.QToolButton(self.ImageToolbar) -# self.ImageLiveItem.setIcon(icon5) -# self.ImageLiveItem.setIconSize(QtCore.QSize(20, 20)) -# self.ImageLiveItem.setAutoRaise(True) -# self.ImageLiveItem.setObjectName("ImageLiveItem") -# self.ImageToolbarLayout.addWidget(self.ImageLiveItem) -# self.ImageAddItem = QtGui.QToolButton(self.ImageToolbar) -# self.ImageAddItem.setIcon(icon6) -# self.ImageAddItem.setIconSize(QtCore.QSize(20, 20)) -# self.ImageAddItem.setAutoRaise(True) -# self.ImageAddItem.setObjectName("ImageAddItem") -# self.ImageToolbarLayout.addWidget(self.ImageAddItem) -# spacerItem6 = QtGui.QSpacerItem(105, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) -# self.ImageToolbarLayout.addItem(spacerItem6) -# self.ImagesLayout.addWidget(self.ImageToolbar) -# self.ImageListView = QtGui.QListWidget(self.ImagePage) -# self.ImageListView.setObjectName("ImageListView") -# self.ImagesLayout.addWidget(self.ImageListView) -# icon19 = QtGui.QIcon() -# icon19.addPixmap(QtGui.QPixmap(":/media/media_image.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) -# self.MediaToolBox.addItem(self.ImagePage, icon19, "") -# self.SongNewItem.setText(QtGui.QApplication.translate("main_window", "New Song", None, QtGui.QApplication.UnicodeUTF8)) -# self.SongEditItem.setText(QtGui.QApplication.translate("main_window", "Edit Song", None, QtGui.QApplication.UnicodeUTF8)) -# self.SongDeleteItem.setText(QtGui.QApplication.translate("main_window", "Delete Song", None, QtGui.QApplication.UnicodeUTF8)) -# self.SongPreviewItem.setText(QtGui.QApplication.translate("main_window", "Send to Preview", None, QtGui.QApplication.UnicodeUTF8)) -# self.SongLiveItem.setText(QtGui.QApplication.translate("main_window", "Send to Live", None, QtGui.QApplication.UnicodeUTF8)) -# self.SongAddItem.setText(QtGui.QApplication.translate("main_window", "Add to Service", None, QtGui.QApplication.UnicodeUTF8)) -# self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.SongPage), QtGui.QApplication.translate("main_window", "Songs", None, QtGui.QApplication.UnicodeUTF8)) -# self.VersePreviewItem.setText(QtGui.QApplication.translate("main_window", "Send to Preview", None, QtGui.QApplication.UnicodeUTF8)) -# self.VerseLiveItem.setText(QtGui.QApplication.translate("main_window", "Send to Live", None, QtGui.QApplication.UnicodeUTF8)) -# self.VerseAddItem.setText(QtGui.QApplication.translate("main_window", "Add to Service", None, QtGui.QApplication.UnicodeUTF8)) -# self.label.setText(QtGui.QApplication.translate("main_window", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) -# self.label_2.setText(QtGui.QApplication.translate("main_window", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) -# self.pushButton.setText(QtGui.QApplication.translate("main_window", "Search", None, QtGui.QApplication.UnicodeUTF8)) -# self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.VersePage), QtGui.QApplication.translate("main_window", "Bible Verses", None, QtGui.QApplication.UnicodeUTF8)) -# self.CustomNewButton.setText(QtGui.QApplication.translate("main_window", "New Custom Slide", None, QtGui.QApplication.UnicodeUTF8)) -# self.CustomEditButton.setText(QtGui.QApplication.translate("main_window", "Edit Custom Slide", None, QtGui.QApplication.UnicodeUTF8)) -# self.CustomDeleteButton.setText(QtGui.QApplication.translate("main_window", "Delete Custom Slide", None, QtGui.QApplication.UnicodeUTF8)) -# self.CustomPreviewButton.setText(QtGui.QApplication.translate("main_window", "Preview Custom Slide", None, QtGui.QApplication.UnicodeUTF8)) -# self.CustomLiveButton.setText(QtGui.QApplication.translate("main_window", "Send Live", None, QtGui.QApplication.UnicodeUTF8)) -# self.CustomAddButton.setText(QtGui.QApplication.translate("main_window", "Add To Service", None, QtGui.QApplication.UnicodeUTF8)) -# self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.CustomSlidePage), QtGui.QApplication.translate("main_window", "Custom Slides", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationLoadItem.setToolTip(QtGui.QApplication.translate("main_window", "Load Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationLoadItem.setStatusTip(QtGui.QApplication.translate("main_window", "Load a video", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationLoadItem.setText(QtGui.QApplication.translate("main_window", "Load Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationDeleteItem.setToolTip(QtGui.QApplication.translate("main_window", "Remove Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationDeleteItem.setText(QtGui.QApplication.translate("main_window", "RI", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationLiveItem.setText(QtGui.QApplication.translate("main_window", "Send to Live", None, QtGui.QApplication.UnicodeUTF8)) -# self.PresentationAddItem.setText(QtGui.QApplication.translate("main_window", "Add to Service", None, QtGui.QApplication.UnicodeUTF8)) -# self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.PresentationPage), QtGui.QApplication.translate("main_window", "Presentations", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoLoadItem.setToolTip(QtGui.QApplication.translate("main_window", "Load Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoLoadItem.setStatusTip(QtGui.QApplication.translate("main_window", "Load a video", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoLoadItem.setText(QtGui.QApplication.translate("main_window", "Load Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoDeleteItem.setToolTip(QtGui.QApplication.translate("main_window", "Remove Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoDeleteItem.setText(QtGui.QApplication.translate("main_window", "RI", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoLiveItem.setToolTip(QtGui.QApplication.translate("main_window", "Go Live!", None, QtGui.QApplication.UnicodeUTF8)) -# self.VideoAddItem.setToolTip(QtGui.QApplication.translate("main_window", "Add to Order of Service", None, QtGui.QApplication.UnicodeUTF8)) -# self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.VideoPage), QtGui.QApplication.translate("main_window", "Videos", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageLoadItem.setToolTip(QtGui.QApplication.translate("main_window", "Load Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageLoadItem.setStatusTip(QtGui.QApplication.translate("main_window", "Load a video", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageLoadItem.setText(QtGui.QApplication.translate("main_window", "Load Image", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageDeleteItem.setToolTip(QtGui.QApplication.translate("main_window", "Remove Video", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageDeleteItem.setText(QtGui.QApplication.translate("main_window", "Delete Image", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageLiveItem.setToolTip(QtGui.QApplication.translate("main_window", "Go Live!", None, QtGui.QApplication.UnicodeUTF8)) -# self.ImageAddItem.setToolTip(QtGui.QApplication.translate("main_window", "Add to Order of Service", None, QtGui.QApplication.UnicodeUTF8)) -# self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(self.ImagePage), QtGui.QApplication.translate("main_window", "Images", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 47c55acf4..30544427b 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'editsongdialog.ui' +# Form implementation generated from reading ui file '/home/raoul/Projects/openlp-2/resources/forms/editsongdialog.ui' # -# Created: Fri Jan 9 18:44:05 2009 -# by: PyQt4 UI code generator 4.4.3 +# Created: Tue Feb 17 22:32:47 2009 +# by: PyQt4 UI code generator 4.4.4 # # WARNING! All changes made in this file will be lost! @@ -11,61 +11,98 @@ from PyQt4 import QtCore, QtGui class Ui_EditSongDialog(object): def setupUi(self, EditSongDialog): - EditSongDialog.setObjectName("EditSongDialog") - EditSongDialog.resize(734, 756) + EditSongDialog.setObjectName('EditSongDialog') + EditSongDialog.resize(786, 634) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + icon.addPixmap(QtGui.QPixmap(':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off) EditSongDialog.setWindowIcon(icon) + self.EditSongLayout = QtGui.QVBoxLayout(EditSongDialog) + self.EditSongLayout.setSpacing(8) + self.EditSongLayout.setMargin(8) + self.EditSongLayout.setObjectName('EditSongLayout') self.TopWidget = QtGui.QWidget(EditSongDialog) - self.TopWidget.setGeometry(QtCore.QRect(8, 8, 711, 721)) - self.TopWidget.setObjectName("TopWidget") + self.TopWidget.setObjectName('TopWidget') + self.TopLayout = QtGui.QHBoxLayout(self.TopWidget) + self.TopLayout.setSpacing(8) + self.TopLayout.setMargin(0) + self.TopLayout.setObjectName('TopLayout') self.TextWidget = QtGui.QWidget(self.TopWidget) - self.TextWidget.setGeometry(QtCore.QRect(0, 0, 331, 531)) - self.TextWidget.setObjectName("TextWidget") - self.gridLayout = QtGui.QGridLayout(self.TextWidget) - self.gridLayout.setObjectName("gridLayout") + self.TextWidget.setObjectName('TextWidget') + self.DetailsLayout = QtGui.QVBoxLayout(self.TextWidget) + self.DetailsLayout.setSpacing(8) + self.DetailsLayout.setMargin(0) + self.DetailsLayout.setObjectName('DetailsLayout') self.TitleLabel = QtGui.QLabel(self.TextWidget) - self.TitleLabel.setObjectName("TitleLabel") - self.gridLayout.addWidget(self.TitleLabel, 0, 0, 1, 1) + self.TitleLabel.setObjectName('TitleLabel') + self.DetailsLayout.addWidget(self.TitleLabel) self.TitleEditItem = QtGui.QLineEdit(self.TextWidget) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.TitleEditItem.sizePolicy().hasHeightForWidth()) self.TitleEditItem.setSizePolicy(sizePolicy) - self.TitleEditItem.setObjectName("TitleEditItem") - self.gridLayout.addWidget(self.TitleEditItem, 1, 0, 1, 1) + self.TitleEditItem.setObjectName('TitleEditItem') + self.DetailsLayout.addWidget(self.TitleEditItem) self.AlternativeTitleLabel = QtGui.QLabel(self.TextWidget) - self.AlternativeTitleLabel.setObjectName("AlternativeTitleLabel") - self.gridLayout.addWidget(self.AlternativeTitleLabel, 2, 0, 1, 1) + self.AlternativeTitleLabel.setObjectName('AlternativeTitleLabel') + self.DetailsLayout.addWidget(self.AlternativeTitleLabel) self.AlternativeEdit = QtGui.QLineEdit(self.TextWidget) - self.AlternativeEdit.setObjectName("AlternativeEdit") - self.gridLayout.addWidget(self.AlternativeEdit, 3, 0, 1, 1) + self.AlternativeEdit.setObjectName('AlternativeEdit') + self.DetailsLayout.addWidget(self.AlternativeEdit) self.LyricsLabel = QtGui.QLabel(self.TextWidget) - self.LyricsLabel.setObjectName("LyricsLabel") - self.gridLayout.addWidget(self.LyricsLabel, 6, 0, 1, 1) + self.LyricsLabel.setObjectName('LyricsLabel') + self.DetailsLayout.addWidget(self.LyricsLabel) self.LyricsTextEdit = QtGui.QTextEdit(self.TextWidget) self.LyricsTextEdit.setLineWrapMode(QtGui.QTextEdit.NoWrap) self.LyricsTextEdit.setAcceptRichText(False) - self.LyricsTextEdit.setObjectName("LyricsTextEdit") - self.gridLayout.addWidget(self.LyricsTextEdit, 7, 0, 1, 1) - self.VerseOrderEdit = QtGui.QLineEdit(self.TextWidget) - self.VerseOrderEdit.setObjectName("VerseOrderEdit") - self.gridLayout.addWidget(self.VerseOrderEdit, 5, 0, 1, 1) + self.LyricsTextEdit.setObjectName('LyricsTextEdit') + self.DetailsLayout.addWidget(self.LyricsTextEdit) self.VerseOrderLabel = QtGui.QLabel(self.TextWidget) - self.VerseOrderLabel.setObjectName("VerseOrderLabel") - self.gridLayout.addWidget(self.VerseOrderLabel, 4, 0, 1, 1) - self.Selectedroup = QtGui.QWidget(self.TopWidget) - self.Selectedroup.setGeometry(QtCore.QRect(329, 0, 381, 531)) - self.Selectedroup.setObjectName("Selectedroup") - self.AuthorsGroupBox = QtGui.QGroupBox(self.Selectedroup) - self.AuthorsGroupBox.setGeometry(QtCore.QRect(0, 0, 381, 66)) - self.AuthorsGroupBox.setObjectName("AuthorsGroupBox") - self.horizontalLayout = QtGui.QHBoxLayout(self.AuthorsGroupBox) - self.horizontalLayout.setSpacing(2) - self.horizontalLayout.setMargin(2) - self.horizontalLayout.setObjectName("horizontalLayout") - self.AuthorsSelectionComboItem = QtGui.QComboBox(self.AuthorsGroupBox) + self.VerseOrderLabel.setObjectName('VerseOrderLabel') + self.DetailsLayout.addWidget(self.VerseOrderLabel) + self.VerseOrderEdit = QtGui.QLineEdit(self.TextWidget) + self.VerseOrderEdit.setObjectName('VerseOrderEdit') + self.DetailsLayout.addWidget(self.VerseOrderEdit) + self.CommentsLabel = QtGui.QLabel(self.TextWidget) + self.CommentsLabel.setObjectName('CommentsLabel') + self.DetailsLayout.addWidget(self.CommentsLabel) + self.CommentsEdit = QtGui.QTextEdit(self.TextWidget) + self.CommentsEdit.setObjectName('CommentsEdit') + self.DetailsLayout.addWidget(self.CommentsEdit) + self.ThemeGroupBox = QtGui.QGroupBox(self.TextWidget) + self.ThemeGroupBox.setObjectName('ThemeGroupBox') + self.ThemeLayout = QtGui.QHBoxLayout(self.ThemeGroupBox) + self.ThemeLayout.setSpacing(8) + self.ThemeLayout.setMargin(8) + self.ThemeLayout.setObjectName('ThemeLayout') + self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox) + self.ThemeSelectionComboItem.setObjectName('ThemeSelectionComboItem') + self.ThemeLayout.addWidget(self.ThemeSelectionComboItem) + self.ThemeAddItem = QtGui.QPushButton(self.ThemeGroupBox) + self.ThemeAddItem.setMaximumSize(QtCore.QSize(110, 16777215)) + self.ThemeAddItem.setObjectName('ThemeAddItem') + self.ThemeLayout.addWidget(self.ThemeAddItem) + self.DetailsLayout.addWidget(self.ThemeGroupBox) + self.TopLayout.addWidget(self.TextWidget) + self.AdditionalWidget = QtGui.QWidget(self.TopWidget) + self.AdditionalWidget.setObjectName('AdditionalWidget') + self.AdditionalLayout = QtGui.QVBoxLayout(self.AdditionalWidget) + self.AdditionalLayout.setSpacing(8) + self.AdditionalLayout.setMargin(0) + self.AdditionalLayout.setObjectName('AdditionalLayout') + self.AuthorsGroupBox = QtGui.QGroupBox(self.AdditionalWidget) + self.AuthorsGroupBox.setObjectName('AuthorsGroupBox') + self.AuthorsLayout = QtGui.QVBoxLayout(self.AuthorsGroupBox) + self.AuthorsLayout.setSpacing(8) + self.AuthorsLayout.setMargin(8) + self.AuthorsLayout.setObjectName('AuthorsLayout') + self.AuthorAddWidget = QtGui.QWidget(self.AuthorsGroupBox) + self.AuthorAddWidget.setObjectName('AuthorAddWidget') + self.AddAuthorLayout = QtGui.QHBoxLayout(self.AuthorAddWidget) + self.AddAuthorLayout.setSpacing(8) + self.AddAuthorLayout.setMargin(0) + self.AddAuthorLayout.setObjectName('AddAuthorLayout') + self.AuthorsSelectionComboItem = QtGui.QComboBox(self.AuthorAddWidget) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) @@ -75,146 +112,181 @@ class Ui_EditSongDialog(object): self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically) self.AuthorsSelectionComboItem.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) self.AuthorsSelectionComboItem.setMinimumContentsLength(8) - self.AuthorsSelectionComboItem.setObjectName("AuthorsSelectionComboItem") - self.horizontalLayout.addWidget(self.AuthorsSelectionComboItem) - self.AuthorAddtoSongItem = QtGui.QPushButton(self.AuthorsGroupBox) + self.AuthorsSelectionComboItem.setObjectName('AuthorsSelectionComboItem') + self.AddAuthorLayout.addWidget(self.AuthorsSelectionComboItem) + self.AddAuthorsButton = QtGui.QPushButton(self.AuthorAddWidget) + self.AddAuthorsButton.setObjectName('AddAuthorsButton') + self.AddAuthorLayout.addWidget(self.AddAuthorsButton) + self.AuthorAddtoSongItem = QtGui.QPushButton(self.AuthorAddWidget) self.AuthorAddtoSongItem.setMaximumSize(QtCore.QSize(110, 16777215)) - self.AuthorAddtoSongItem.setObjectName("AuthorAddtoSongItem") - self.horizontalLayout.addWidget(self.AuthorAddtoSongItem) - self.AddAuthorsButton = QtGui.QPushButton(self.AuthorsGroupBox) - self.AddAuthorsButton.setObjectName("AddAuthorsButton") - self.horizontalLayout.addWidget(self.AddAuthorsButton) - self.SongBookGroup = QtGui.QGroupBox(self.Selectedroup) - self.SongBookGroup.setGeometry(QtCore.QRect(0, 65, 381, 61)) - self.SongBookGroup.setObjectName("SongBookGroup") - self.gridLayout_2 = QtGui.QGridLayout(self.SongBookGroup) - self.gridLayout_2.setMargin(2) - self.gridLayout_2.setSpacing(2) - self.gridLayout_2.setObjectName("gridLayout_2") - self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup) - self.SongbookCombo.setObjectName("SongbookCombo") - self.gridLayout_2.addWidget(self.SongbookCombo, 0, 0, 1, 1) - self.AddSongBookButton = QtGui.QPushButton(self.SongBookGroup) - self.AddSongBookButton.setObjectName("AddSongBookButton") - self.gridLayout_2.addWidget(self.AddSongBookButton, 0, 1, 1, 1) - self.TopicGroupBox = QtGui.QGroupBox(self.Selectedroup) - self.TopicGroupBox.setGeometry(QtCore.QRect(0, 130, 381, 66)) - self.TopicGroupBox.setObjectName("TopicGroupBox") - self.gridLayout_3 = QtGui.QGridLayout(self.TopicGroupBox) - self.gridLayout_3.setMargin(2) - self.gridLayout_3.setSpacing(2) - self.gridLayout_3.setObjectName("gridLayout_3") - self.SongTopicCombo = QtGui.QComboBox(self.TopicGroupBox) - self.SongTopicCombo.setObjectName("SongTopicCombo") - self.gridLayout_3.addWidget(self.SongTopicCombo, 0, 0, 1, 1) - self.AddTopicsToSongButton = QtGui.QPushButton(self.TopicGroupBox) - self.AddTopicsToSongButton.setObjectName("AddTopicsToSongButton") - self.gridLayout_3.addWidget(self.AddTopicsToSongButton, 0, 1, 1, 1) - self.AddTopicButton = QtGui.QPushButton(self.TopicGroupBox) - self.AddTopicButton.setObjectName("AddTopicButton") - self.gridLayout_3.addWidget(self.AddTopicButton, 0, 2, 1, 1) - self.SelectedAuthorGroupBox = QtGui.QGroupBox(self.Selectedroup) - self.SelectedAuthorGroupBox.setGeometry(QtCore.QRect(0, 200, 191, 231)) - self.SelectedAuthorGroupBox.setObjectName("SelectedAuthorGroupBox") - self.verticalLayout = QtGui.QVBoxLayout(self.SelectedAuthorGroupBox) - self.verticalLayout.setSpacing(2) - self.verticalLayout.setMargin(2) - self.verticalLayout.setObjectName("verticalLayout") - self.AuthorsListView = QtGui.QTableWidget(self.SelectedAuthorGroupBox) + self.AuthorAddtoSongItem.setObjectName('AuthorAddtoSongItem') + self.AddAuthorLayout.addWidget(self.AuthorAddtoSongItem) + self.AuthorsLayout.addWidget(self.AuthorAddWidget) + self.AuthorsListView = QtGui.QTableWidget(self.AuthorsGroupBox) self.AuthorsListView.setAlternatingRowColors(True) - self.AuthorsListView.setObjectName("AuthorsListView") + self.AuthorsListView.setObjectName('AuthorsListView') self.AuthorsListView.setColumnCount(0) self.AuthorsListView.setRowCount(0) - self.verticalLayout.addWidget(self.AuthorsListView) - self.AuthorRemoveItem = QtGui.QPushButton(self.SelectedAuthorGroupBox) - self.AuthorRemoveItem.setObjectName("AuthorRemoveItem") - self.verticalLayout.addWidget(self.AuthorRemoveItem) - self.SelectedTopicGroupBox = QtGui.QGroupBox(self.Selectedroup) - self.SelectedTopicGroupBox.setGeometry(QtCore.QRect(190, 200, 181, 231)) - self.SelectedTopicGroupBox.setObjectName("SelectedTopicGroupBox") - self.verticalLayout_2 = QtGui.QVBoxLayout(self.SelectedTopicGroupBox) - self.verticalLayout_2.setSpacing(2) - self.verticalLayout_2.setMargin(2) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.ToticsListView = QtGui.QTableWidget(self.SelectedTopicGroupBox) + self.AuthorsLayout.addWidget(self.AuthorsListView) + self.AuthorRemoveWidget = QtGui.QWidget(self.AuthorsGroupBox) + self.AuthorRemoveWidget.setObjectName('AuthorRemoveWidget') + self.AuthorRemoveLayout = QtGui.QHBoxLayout(self.AuthorRemoveWidget) + self.AuthorRemoveLayout.setSpacing(8) + self.AuthorRemoveLayout.setMargin(0) + self.AuthorRemoveLayout.setObjectName('AuthorRemoveLayout') + spacerItem = QtGui.QSpacerItem(263, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.AuthorRemoveLayout.addItem(spacerItem) + self.AuthorRemoveItem = QtGui.QPushButton(self.AuthorRemoveWidget) + self.AuthorRemoveItem.setObjectName('AuthorRemoveItem') + self.AuthorRemoveLayout.addWidget(self.AuthorRemoveItem) + self.AuthorsLayout.addWidget(self.AuthorRemoveWidget) + self.AdditionalLayout.addWidget(self.AuthorsGroupBox) + self.SongBookGroup = QtGui.QGroupBox(self.AdditionalWidget) + self.SongBookGroup.setObjectName('SongBookGroup') + self.SongbookLayout = QtGui.QGridLayout(self.SongBookGroup) + self.SongbookLayout.setMargin(8) + self.SongbookLayout.setSpacing(8) + self.SongbookLayout.setObjectName('SongbookLayout') + self.SongbookCombo = QtGui.QComboBox(self.SongBookGroup) + self.SongbookCombo.setObjectName('SongbookCombo') + self.SongbookLayout.addWidget(self.SongbookCombo, 0, 0, 1, 1) + self.AddSongBookButton = QtGui.QPushButton(self.SongBookGroup) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.AddSongBookButton.sizePolicy().hasHeightForWidth()) + self.AddSongBookButton.setSizePolicy(sizePolicy) + self.AddSongBookButton.setObjectName('AddSongBookButton') + self.SongbookLayout.addWidget(self.AddSongBookButton, 0, 1, 1, 1) + self.AdditionalLayout.addWidget(self.SongBookGroup) + self.TopicGroupBox = QtGui.QGroupBox(self.AdditionalWidget) + self.TopicGroupBox.setObjectName('TopicGroupBox') + self.TopicLayout = QtGui.QVBoxLayout(self.TopicGroupBox) + self.TopicLayout.setSpacing(8) + self.TopicLayout.setMargin(8) + self.TopicLayout.setObjectName('TopicLayout') + self.TopicAddWidget = QtGui.QWidget(self.TopicGroupBox) + self.TopicAddWidget.setObjectName('TopicAddWidget') + self.TopicAddLayout = QtGui.QHBoxLayout(self.TopicAddWidget) + self.TopicAddLayout.setSpacing(8) + self.TopicAddLayout.setMargin(0) + self.TopicAddLayout.setObjectName('TopicAddLayout') + self.SongTopicCombo = QtGui.QComboBox(self.TopicAddWidget) + self.SongTopicCombo.setObjectName('SongTopicCombo') + self.TopicAddLayout.addWidget(self.SongTopicCombo) + self.AddTopicsToSongButton = QtGui.QPushButton(self.TopicAddWidget) + self.AddTopicsToSongButton.setObjectName('AddTopicsToSongButton') + self.TopicAddLayout.addWidget(self.AddTopicsToSongButton) + self.AddTopicButton = QtGui.QPushButton(self.TopicAddWidget) + self.AddTopicButton.setObjectName('AddTopicButton') + self.TopicAddLayout.addWidget(self.AddTopicButton) + self.TopicLayout.addWidget(self.TopicAddWidget) + self.ToticsListView = QtGui.QTableWidget(self.TopicGroupBox) self.ToticsListView.setAlternatingRowColors(True) - self.ToticsListView.setObjectName("ToticsListView") + self.ToticsListView.setObjectName('ToticsListView') self.ToticsListView.setColumnCount(0) self.ToticsListView.setRowCount(0) - self.verticalLayout_2.addWidget(self.ToticsListView) - self.pushButton = QtGui.QPushButton(self.SelectedTopicGroupBox) - self.pushButton.setObjectName("pushButton") - self.verticalLayout_2.addWidget(self.pushButton) - self.CopyrightgroupBox = QtGui.QGroupBox(self.Selectedroup) - self.CopyrightgroupBox.setGeometry(QtCore.QRect(0, 430, 371, 95)) - self.CopyrightgroupBox.setObjectName("CopyrightgroupBox") - self.gridLayout_4 = QtGui.QGridLayout(self.CopyrightgroupBox) - self.gridLayout_4.setObjectName("gridLayout_4") - self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightgroupBox) - self.CopyrightEditItem.setObjectName("CopyrightEditItem") - self.gridLayout_4.addWidget(self.CopyrightEditItem, 0, 0, 1, 1) - self.CCLLabel = QtGui.QLabel(self.CopyrightgroupBox) - self.CCLLabel.setObjectName("CCLLabel") - self.gridLayout_4.addWidget(self.CCLLabel, 1, 0, 1, 1) - self.CCLNumberEdit = QtGui.QLineEdit(self.CopyrightgroupBox) - self.CCLNumberEdit.setObjectName("CCLNumberEdit") - self.gridLayout_4.addWidget(self.CCLNumberEdit, 1, 1, 1, 1) - self.CopyrightInsertItem = QtGui.QPushButton(self.CopyrightgroupBox) + self.TopicLayout.addWidget(self.ToticsListView) + self.TopicRemoveWidget = QtGui.QWidget(self.TopicGroupBox) + self.TopicRemoveWidget.setObjectName('TopicRemoveWidget') + self.TopicRemoveLayout = QtGui.QHBoxLayout(self.TopicRemoveWidget) + self.TopicRemoveLayout.setSpacing(8) + self.TopicRemoveLayout.setMargin(0) + self.TopicRemoveLayout.setObjectName('TopicRemoveLayout') + spacerItem1 = QtGui.QSpacerItem(263, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.TopicRemoveLayout.addItem(spacerItem1) + self.pushButton = QtGui.QPushButton(self.TopicRemoveWidget) + self.pushButton.setObjectName('pushButton') + self.TopicRemoveLayout.addWidget(self.pushButton) + self.TopicLayout.addWidget(self.TopicRemoveWidget) + self.AdditionalLayout.addWidget(self.TopicGroupBox) + self.CopyrightgroupBox = QtGui.QGroupBox(self.AdditionalWidget) + self.CopyrightgroupBox.setObjectName('CopyrightgroupBox') + self.CopyrightLayout = QtGui.QVBoxLayout(self.CopyrightgroupBox) + self.CopyrightLayout.setSpacing(8) + self.CopyrightLayout.setMargin(8) + self.CopyrightLayout.setObjectName('CopyrightLayout') + self.CopyrightWidget = QtGui.QWidget(self.CopyrightgroupBox) + self.CopyrightWidget.setObjectName('CopyrightWidget') + self.CopyLayout = QtGui.QHBoxLayout(self.CopyrightWidget) + self.CopyLayout.setSpacing(8) + self.CopyLayout.setMargin(0) + self.CopyLayout.setObjectName('CopyLayout') + self.CopyrightEditItem = QtGui.QLineEdit(self.CopyrightWidget) + self.CopyrightEditItem.setObjectName('CopyrightEditItem') + self.CopyLayout.addWidget(self.CopyrightEditItem) + self.CopyrightInsertItem = QtGui.QPushButton(self.CopyrightWidget) self.CopyrightInsertItem.setMaximumSize(QtCore.QSize(29, 16777215)) - self.CopyrightInsertItem.setObjectName("CopyrightInsertItem") - self.gridLayout_4.addWidget(self.CopyrightInsertItem, 0, 1, 1, 1) - self.ThemeGroupBox = QtGui.QGroupBox(self.TopWidget) - self.ThemeGroupBox.setGeometry(QtCore.QRect(0, 630, 711, 66)) - self.ThemeGroupBox.setObjectName("ThemeGroupBox") - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ThemeGroupBox) - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox) - self.ThemeSelectionComboItem.setObjectName("ThemeSelectionComboItem") - self.horizontalLayout_2.addWidget(self.ThemeSelectionComboItem) - self.ThemeAddItem = QtGui.QPushButton(self.ThemeGroupBox) - self.ThemeAddItem.setMaximumSize(QtCore.QSize(110, 16777215)) - self.ThemeAddItem.setObjectName("ThemeAddItem") - self.horizontalLayout_2.addWidget(self.ThemeAddItem) - self.CommentGroup = QtGui.QGroupBox(self.TopWidget) - self.CommentGroup.setGeometry(QtCore.QRect(10, 530, 701, 111)) - self.CommentGroup.setObjectName("CommentGroup") - self.gridLayout_5 = QtGui.QGridLayout(self.CommentGroup) - self.gridLayout_5.setObjectName("gridLayout_5") - self.CommentsEdit = QtGui.QTextEdit(self.CommentGroup) - self.CommentsEdit.setObjectName("CommentsEdit") - self.gridLayout_5.addWidget(self.CommentsEdit, 0, 0, 1, 1) + self.CopyrightInsertItem.setObjectName('CopyrightInsertItem') + self.CopyLayout.addWidget(self.CopyrightInsertItem) + self.CopyrightLayout.addWidget(self.CopyrightWidget) + self.CcliWidget = QtGui.QWidget(self.CopyrightgroupBox) + self.CcliWidget.setObjectName('CcliWidget') + self.CCLILayout = QtGui.QHBoxLayout(self.CcliWidget) + self.CCLILayout.setSpacing(8) + self.CCLILayout.setMargin(0) + self.CCLILayout.setObjectName('CCLILayout') + self.CCLILabel = QtGui.QLabel(self.CcliWidget) + self.CCLILabel.setObjectName('CCLILabel') + self.CCLILayout.addWidget(self.CCLILabel) + self.CCLNumberEdit = QtGui.QLineEdit(self.CcliWidget) + self.CCLNumberEdit.setObjectName('CCLNumberEdit') + self.CCLILayout.addWidget(self.CCLNumberEdit) + self.CopyrightLayout.addWidget(self.CcliWidget) + self.AdditionalLayout.addWidget(self.CopyrightgroupBox) + self.TopLayout.addWidget(self.AdditionalWidget) + self.EditSongLayout.addWidget(self.TopWidget) self.ButtonBox = QtGui.QDialogButtonBox(EditSongDialog) - self.ButtonBox.setGeometry(QtCore.QRect(570, 720, 156, 27)) self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) - self.ButtonBox.setObjectName("ButtonBox") + self.ButtonBox.setObjectName('ButtonBox') + self.EditSongLayout.addWidget(self.ButtonBox) self.retranslateUi(EditSongDialog) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("rejected()"), EditSongDialog.close) - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL("accepted()"), EditSongDialog.close) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL('rejected()'), EditSongDialog.close) + QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL('accepted()'), EditSongDialog.close) QtCore.QMetaObject.connectSlotsByName(EditSongDialog) + EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit) + EditSongDialog.setTabOrder(self.AlternativeEdit, self.LyricsTextEdit) + EditSongDialog.setTabOrder(self.LyricsTextEdit, self.VerseOrderEdit) + EditSongDialog.setTabOrder(self.VerseOrderEdit, self.CommentsEdit) + EditSongDialog.setTabOrder(self.CommentsEdit, self.ThemeSelectionComboItem) + EditSongDialog.setTabOrder(self.ThemeSelectionComboItem, self.ThemeAddItem) + EditSongDialog.setTabOrder(self.ThemeAddItem, self.AuthorsSelectionComboItem) + EditSongDialog.setTabOrder(self.AuthorsSelectionComboItem, self.AddAuthorsButton) + EditSongDialog.setTabOrder(self.AddAuthorsButton, self.AuthorAddtoSongItem) + EditSongDialog.setTabOrder(self.AuthorAddtoSongItem, self.AuthorsListView) + EditSongDialog.setTabOrder(self.AuthorsListView, self.AuthorRemoveItem) + EditSongDialog.setTabOrder(self.AuthorRemoveItem, self.SongbookCombo) + EditSongDialog.setTabOrder(self.SongbookCombo, self.AddSongBookButton) + EditSongDialog.setTabOrder(self.AddSongBookButton, self.SongTopicCombo) + EditSongDialog.setTabOrder(self.SongTopicCombo, self.AddTopicsToSongButton) + EditSongDialog.setTabOrder(self.AddTopicsToSongButton, self.AddTopicButton) + EditSongDialog.setTabOrder(self.AddTopicButton, self.ToticsListView) + EditSongDialog.setTabOrder(self.ToticsListView, self.pushButton) + EditSongDialog.setTabOrder(self.pushButton, self.CopyrightEditItem) + EditSongDialog.setTabOrder(self.CopyrightEditItem, self.CopyrightInsertItem) + EditSongDialog.setTabOrder(self.CopyrightInsertItem, self.CCLNumberEdit) + EditSongDialog.setTabOrder(self.CCLNumberEdit, self.ButtonBox) 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.VerseOrderLabel.setText(QtGui.QApplication.translate("EditSongDialog", "Verse Order:", None, QtGui.QApplication.UnicodeUTF8)) - self.AuthorsGroupBox.setTitle(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.SongBookGroup.setTitle(QtGui.QApplication.translate("EditSongDialog", "SongBook", None, QtGui.QApplication.UnicodeUTF8)) - self.AddSongBookButton.setText(QtGui.QApplication.translate("EditSongDialog", "Add Song Book", None, QtGui.QApplication.UnicodeUTF8)) - self.TopicGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Topic", 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.SelectedAuthorGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Selected Authors", None, QtGui.QApplication.UnicodeUTF8)) - self.AuthorRemoveItem.setText(QtGui.QApplication.translate("EditSongDialog", "Remove", None, QtGui.QApplication.UnicodeUTF8)) - self.SelectedTopicGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Selected Topics", None, QtGui.QApplication.UnicodeUTF8)) - self.pushButton.setText(QtGui.QApplication.translate("EditSongDialog", "Remove", None, QtGui.QApplication.UnicodeUTF8)) - self.CopyrightgroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Copyright Infomaton", None, QtGui.QApplication.UnicodeUTF8)) - self.CCLLabel.setText(QtGui.QApplication.translate("EditSongDialog", "CCL Number:", None, QtGui.QApplication.UnicodeUTF8)) - self.CopyrightInsertItem.setText(QtGui.QApplication.translate("EditSongDialog", "©", None, QtGui.QApplication.UnicodeUTF8)) - self.ThemeGroupBox.setTitle(QtGui.QApplication.translate("EditSongDialog", "Theme", None, QtGui.QApplication.UnicodeUTF8)) - self.ThemeAddItem.setText(QtGui.QApplication.translate("EditSongDialog", "Add a Theme", None, QtGui.QApplication.UnicodeUTF8)) - self.CommentGroup.setTitle(QtGui.QApplication.translate("EditSongDialog", "Comments", None, QtGui.QApplication.UnicodeUTF8)) - + 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.VerseOrderLabel.setText(QtGui.QApplication.translate('EditSongDialog', 'Verse Order:', None, QtGui.QApplication.UnicodeUTF8)) + self.CommentsLabel.setText(QtGui.QApplication.translate('EditSongDialog', 'Comments:', None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeGroupBox.setTitle(QtGui.QApplication.translate('EditSongDialog', 'Theme', None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeAddItem.setText(QtGui.QApplication.translate('EditSongDialog', 'Add a Theme', None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorsGroupBox.setTitle(QtGui.QApplication.translate('EditSongDialog', 'Authors', None, QtGui.QApplication.UnicodeUTF8)) + self.AddAuthorsButton.setText(QtGui.QApplication.translate('EditSongDialog', 'New Author', None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorAddtoSongItem.setText(QtGui.QApplication.translate('EditSongDialog', 'Add to Song', None, QtGui.QApplication.UnicodeUTF8)) + self.AuthorRemoveItem.setText(QtGui.QApplication.translate('EditSongDialog', 'Remove', None, QtGui.QApplication.UnicodeUTF8)) + self.SongBookGroup.setTitle(QtGui.QApplication.translate('EditSongDialog', 'Song Book', None, QtGui.QApplication.UnicodeUTF8)) + self.AddSongBookButton.setText(QtGui.QApplication.translate('EditSongDialog', 'Add Song Book', None, QtGui.QApplication.UnicodeUTF8)) + self.TopicGroupBox.setTitle(QtGui.QApplication.translate('EditSongDialog', 'Topic', 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.pushButton.setText(QtGui.QApplication.translate('EditSongDialog', 'Remove', None, QtGui.QApplication.UnicodeUTF8)) + self.CopyrightgroupBox.setTitle(QtGui.QApplication.translate('EditSongDialog', 'Copyright Infomaton', None, QtGui.QApplication.UnicodeUTF8)) + self.CopyrightInsertItem.setText(QtGui.QApplication.translate('EditSongDialog', '©', None, QtGui.QApplication.UnicodeUTF8)) + self.CCLILabel.setText(QtGui.QApplication.translate('EditSongDialog', 'CCLI Number:', None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index a1924a7b3..4f44139f1 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -18,7 +18,7 @@ this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from PyQt4 import Qt, QtCore, QtGui -from PyQt4.QtGui import QWidget +from PyQt4.QtGui import QDialog from PyQt4.QtCore import pyqtSignature from authorsform import AuthorsForm @@ -27,7 +27,7 @@ from songbookform import SongBookForm from editsongdialog import Ui_EditSongDialog -class EditSongForm(QWidget, Ui_EditSongDialog): +class EditSongForm(QDialog, Ui_EditSongDialog): """ Class documentation goes here. """ @@ -35,7 +35,7 @@ class EditSongForm(QWidget, Ui_EditSongDialog): """ Constructor """ - QWidget.__init__(self, parent) + QDialog.__init__(self, parent) self.setupUi(self) self.songmanager = songmanager self.authors_form = AuthorsForm(self.songmanager) @@ -51,7 +51,6 @@ class EditSongForm(QWidget, Ui_EditSongDialog): self.AuthorsListView.setAlternatingRowColors(True) self.savebutton = self.ButtonBox.button(QtGui.QDialogButtonBox.Save) - def initialise(self): list = self.songmanager.get_authors() self.AuthorsSelectionComboItem.clear() @@ -65,16 +64,18 @@ class EditSongForm(QWidget, Ui_EditSongDialog): self.CopyrightEditItem.setText(self.song.copyright) self.AuthorsListView.clear() # clear the results - self.AuthorsListView.setHorizontalHeaderLabels(QtCore.QStringList(["","Author"])) - self.AuthorsListView.setVerticalHeaderLabels(QtCore.QStringList([""])) + self.AuthorsListView.setHorizontalHeaderLabels(QtCore.QStringList(['', u'Author'])) + self.AuthorsListView.setVerticalHeaderLabels(QtCore.QStringList([''])) + self.AuthorsListView.horizontalHeader().setVisible(False) + self.AuthorsListView.verticalHeader().setVisible(False) self.AuthorsListView.setRowCount(0) for author in self.song.authors: c = self.AuthorsListView.rowCount() self.AuthorsListView.setRowCount(c+1) - twi = QtGui.QTableWidgetItem(str(author.id)) - self.AuthorsListView.setItem(c , 0, twi) - twi = QtGui.QTableWidgetItem(str(author.display_name)) - self.AuthorsListView.setItem(c , 1, twi) + author_id = QtGui.QTableWidgetItem(str(author.id)) + self.AuthorsListView.setItem(c , 0, author_id) + author_name = QtGui.QTableWidgetItem(str(author.display_name)) + self.AuthorsListView.setItem(c , 1, author_name) self.AuthorsListView.setRowHeight(c, 20) self._validate_song() @@ -93,8 +94,8 @@ class EditSongForm(QWidget, Ui_EditSongDialog): """ self.topics_form.load_form() self.topics_form.show() - @pyqtSignature("") + @pyqtSignature("") def on_AddSongBookButton_clicked(self): """ Slot documentation goes here. @@ -109,14 +110,14 @@ class EditSongForm(QWidget, Ui_EditSongDialog): valid = True # Lets be nice and assume the data is correct. if len(self.TitleEditItem.displayText()) == 0: #Song title missing valid = False - self._color_widget(self.TitleEditItem, True) - else: - self._color_widget(self.TitleEditItem, False) + #self._color_widget(self.TitleEditItem, True) + #else: + #self._color_widget(self.TitleEditItem, False) if len(self.CopyrightEditItem.displayText()) == 0: #Song title missing valid = False - self._color_widget(self.CopyrightEditItem, True) - else: - self._color_widget(self.CopyrightEditItem, False) + #self._color_widget(self.CopyrightEditItem, True) + #else: + #self._color_widget(self.CopyrightEditItem, False) if valid: self.ButtonBox.addButton(self.savebutton, QtGui.QDialogButtonBox.AcceptRole) # hide the save button tile screen is valid @@ -133,6 +134,9 @@ class EditSongForm(QWidget, Ui_EditSongDialog): slot.setAutoFillBackground(True) def on_TitleEditItem_lostFocus(self): - self._validate_song() + #self._validate_song() + pass + def on_CopyrightEditItem_lostFocus(self): - self._validate_song() + #self._validate_song() + pass diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index ae1e7b28b..66617d695 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -110,16 +110,19 @@ class SongsPlugin(Plugin, PluginUtils): # Add the song widget to the page layout self.MediaManagerItem.PageLayout.addWidget(self.SongWidget) self.SongListView = QtGui.QTableWidget() - self.SongListView.setColumnCount(3) + self.SongListView.setColumnCount(2) self.SongListView.setColumnHidden(0, True) - self.SongListView.setColumnWidth(1, 200) - self.SongListView.setColumnWidth(2, 80) + self.SongListView.setColumnWidth(1, 240) + #self.SongListView.setColumnWidth(2, 80) self.SongListView.setShowGrid(False) self.SongListView.setSortingEnabled(False) self.SongListView.setAlternatingRowColors(True) - self.SongListView.setHorizontalHeaderLabels(QtCore.QStringList(["","Song Name","Author"])) + self.SongListView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self.SongListView.setHorizontalHeaderLabels(QtCore.QStringList(['', u'Song Name'])) + self.SongListView.horizontalHeader().setVisible(False) + self.SongListView.verticalHeader().setVisible(False) self.SongListView.setGeometry(QtCore.QRect(10, 100, 256, 591)) - self.SongListView.setObjectName("listView") + self.SongListView.setObjectName('listView') self.MediaManagerItem.PageLayout.addWidget(self.SongListView) QtCore.QObject.connect(self.SearchTextButton, QtCore.SIGNAL("pressed()"), self.onSearchTextButtonClick) @@ -219,7 +222,7 @@ class SongsPlugin(Plugin, PluginUtils): search_results = self.songmanager.search_song_title(search_keywords) elif search_type == u'Lyrics': log.debug("Lyrics Search") - searchresults = self.songmanager.search_song_lyrics(search_keywords) + search_results = self.songmanager.search_song_lyrics(search_keywords) elif search_type == u'Authors': log.debug("Authors Search") #searchresults = self.songmanager.get_song_from_author(searchtext) @@ -229,13 +232,13 @@ class SongsPlugin(Plugin, PluginUtils): print item def onSongNewClick(self): - self.edit_song_form.show() + self.edit_song_form.exec_() def onSongEditClick(self): cr = self.SongListView.currentRow() id = int(self.SongListView.item(cr, 0).text()) self.edit_song_form.load_song(id) - self.edit_song_form.show() + self.edit_song_form.exec_() def onSongDeleteClick(self): pass @@ -264,19 +267,20 @@ class SongsPlugin(Plugin, PluginUtils): def _display_results(self, searchresults): log.debug("_search results") self.SongListView.clear() # clear the results - self.SongListView.setHorizontalHeaderLabels(QtCore.QStringList(["","Song Name","Author"])) - self.SongListView.setVerticalHeaderLabels(QtCore.QStringList([""])) + self.SongListView.setHorizontalHeaderLabels(QtCore.QStringList(['', u'Song Name'])) + self.SongListView.horizontalHeader().setVisible(False) + self.SongListView.verticalHeader().setVisible(False) self.SongListView.setRowCount(0) #log.debug("Records returned from search %s", len(searchresults)) for song in searchresults: for author in song.authors: c = self.SongListView.rowCount() - self.SongListView.setRowCount(c+1) - twi = QtGui.QTableWidgetItem(str(song.id)) - self.SongListView.setItem(c , 0, twi) - twi = QtGui.QTableWidgetItem(str(song.title)) - self.SongListView.setItem(c , 1, twi) - twi = QtGui.QTableWidgetItem(str(author.display_name)) - self.SongListView.setItem(c , 2, twi) + self.SongListView.setRowCount(c + 1) + song_index = QtGui.QTableWidgetItem(str(song.id)) + self.SongListView.setItem(c , 0, song_index) + song_detail = QtGui.QTableWidgetItem(u'%s (%s)' % (str(song.title), str(author.display_name))) + self.SongListView.setItem(c , 1, song_detail) + #twi = QtGui.QTableWidgetItem() + #self.SongListView.setItem(c , 2, twi) self.SongListView.setRowHeight(c, 20) diff --git a/resources/forms/editsongdialog.ui b/resources/forms/editsongdialog.ui index 6d731c2e3..43a72c600 100644 --- a/resources/forms/editsongdialog.ui +++ b/resources/forms/editsongdialog.ui @@ -1,424 +1,482 @@ - - + EditSongDialog - - + + 0 0 - 734 - 756 + 786 + 634 - + Song Editor - - + + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 8 - 8 - 711 - 721 - + + + 8 - - - - 0 - 0 - 331 - 531 - - - - - - - Title: - - - - - - - - 0 - 0 - - - - - - - - Alternative Title: - - - - - - - - - - Lyrics: - - - - - - - QTextEdit::NoWrap - - - false - - - - - - - - - - Verse Order: - - - - - TitleLabel - TitleEditItem - AlternativeTitleLabel - AlternativeEdit - LyricsLabel - LyricsTextEdit - VerseOrderEdit - VerseOrderLabel - - - - - 329 - 0 - 381 - 531 - - - - - - 0 - 0 - 381 - 66 - - - - Authors - - - - 2 - - - 2 - - - - - - 0 - 0 - - - - false - - - QComboBox::InsertAlphabetically - - - QComboBox::AdjustToMinimumContentsLength - - - 8 - - - - - - - - 110 - 16777215 - - - - Add to Song - - - - - - - Add Authors - - - - - - - - - 0 - 65 - 381 - 61 - - - - SongBook - - - - 2 - - - 2 - - - - - - - - Add Song Book - - - - - - - - - 0 - 130 - 381 - 66 - - - - Topic - - - - 2 - - - 2 - - - - - - - - Add to Song - - - - - - - Add Topic - - - - - - - - - 0 - 200 - 191 - 231 - - - - Selected Authors - - - - 2 - - - 2 - - - - - true - - - - - - - Remove - - - - - - - - - 190 - 200 - 181 - 231 - - - - Selected Topics - - - - 2 - - - 2 - - - - - true - - - - - - - Remove - - - - - - - - - 0 - 430 - 371 - 95 - - - - Copyright Infomaton - - - - - - - - - CCL Number: - - - - - - - - - - - 29 - 16777215 - - - - © - - - - - - - - - - 0 - 630 - 711 - 66 - - - - Theme - - - - - - - - - - 110 - 16777215 - - - - Add a Theme - - - - - - - - - 10 - 530 - 701 - 111 - - - - Comments - - - - - - - - - - - - 570 - 720 - 156 - 27 - + + 8 - - QDialogButtonBox::Cancel|QDialogButtonBox::Save - - + + + + + 8 + + + 0 + + + + + + 8 + + + 0 + + + + + Title: + + + + + + + + 0 + 0 + + + + + + + + Alternative Title: + + + + + + + + + + Lyrics: + + + + + + + QTextEdit::NoWrap + + + false + + + + + + + Verse Order: + + + + + + + + + + Comments: + + + + + + + + + + Theme + + + + 8 + + + 8 + + + + + + + + + 110 + 16777215 + + + + Add a Theme + + + + + + + + + + + + + + 8 + + + 0 + + + + + Authors + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + + 0 + 0 + + + + false + + + QComboBox::InsertAlphabetically + + + QComboBox::AdjustToMinimumContentsLength + + + 8 + + + + + + + New Author + + + + + + + + 110 + 16777215 + + + + Add to Song + + + + + + + + + + true + + + + + + + + 8 + + + 0 + + + + + Qt::Horizontal + + + + 263 + 20 + + + + + + + + Remove + + + + + + + + + + + + + Song Book + + + + 8 + + + 8 + + + + + + + + + 0 + 0 + + + + Add Song Book + + + + + + + + + + Topic + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + + + + Add to Song + + + + + + + Add Topic + + + + + + + + + + true + + + + + + + + 8 + + + 0 + + + + + Qt::Horizontal + + + + 263 + 20 + + + + + + + + Remove + + + + + + + + + + + + + Copyright Infomaton + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + + + + + 29 + 16777215 + + + + © + + + + + + + + + + + 8 + + + 0 + + + + + CCLI Number: + + + + + + + + + + + + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Save + + + + + + TitleEditItem + AlternativeEdit + LyricsTextEdit + VerseOrderEdit + CommentsEdit + ThemeSelectionComboItem + ThemeAddItem + AuthorsSelectionComboItem + AddAuthorsButton + AuthorAddtoSongItem + AuthorsListView + AuthorRemoveItem + SongbookCombo + AddSongBookButton + SongTopicCombo + AddTopicsToSongButton + AddTopicButton + ToticsListView + pushButton + CopyrightEditItem + CopyrightInsertItem + CCLNumberEdit + ButtonBox + - + @@ -427,11 +485,11 @@ EditSongDialog close() - + 607 456 - + 578 -15 @@ -443,11 +501,11 @@ EditSongDialog close() - + 549 461 - + 91 -50