From 4d83753b107a606b3d5aab5d606a143b0ae59d8a Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sun, 18 Oct 2009 20:15:20 +0200 Subject: [PATCH] Tidied up the bible media manager item. --- openlp.pyw | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 120 +++++++++++++++---------- 2 files changed, 74 insertions(+), 48 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index 178ef6963..ebd449bf8 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -54,7 +54,7 @@ QDockWidget::title QToolBar { border: none; - /*margin: 0;*/ + margin: 0; padding: 0; } """ diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index e0725ea67..1ef176625 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -77,113 +77,135 @@ class BibleMediaItem(MediaManagerItem): # Add the Quick Search tab self.QuickTab = QtGui.QWidget() self.QuickTab.setObjectName(u'QuickTab') - self.QuickVerticalLayout = QtGui.QVBoxLayout(self.QuickTab) - self.QuickVerticalLayout.setObjectName("verticalLayout") - self.QuickLayout = QtGui.QGridLayout() - self.QuickLayout.setMargin(0) + self.QuickLayout = QtGui.QGridLayout(self.QuickTab) + self.QuickLayout.setMargin(2) self.QuickLayout.setSpacing(4) + self.QuickLayout.setVerticalSpacing(4) self.QuickLayout.setObjectName(u'QuickLayout') self.QuickVersionLabel = QtGui.QLabel(self.QuickTab) self.QuickVersionLabel.setObjectName(u'QuickVersionLabel') self.QuickLayout.addWidget(self.QuickVersionLabel, 0, 0, 1, 1) self.QuickVersionComboBox = QtGui.QComboBox(self.QuickTab) + self.QuickVersionComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) self.QuickVersionComboBox.setObjectName(u'VersionComboBox') self.QuickLayout.addWidget(self.QuickVersionComboBox, 0, 1, 1, 2) - self.QuickSearchLabel = QtGui.QLabel(self.QuickTab) - self.QuickSearchLabel.setObjectName(u'QuickSearchLabel') - self.QuickLayout.addWidget(self.QuickSearchLabel, 1, 0, 1, 1) - self.QuickSearchComboBox = QtGui.QComboBox(self.QuickTab) - self.QuickSearchComboBox.setObjectName(u'SearchComboBox') - self.QuickLayout.addWidget(self.QuickSearchComboBox, 1, 1, 1, 2) + self.QuickDualVersionLabel = QtGui.QLabel(self.QuickTab) + self.QuickDualVersionLabel.setObjectName(u'QuickDualVersionLabel') + self.QuickLayout.addWidget(self.QuickDualVersionLabel, 1, 0, 1, 1) + self.QuickSecondBibleComboBox = QtGui.QComboBox(self.QuickTab) + self.QuickSecondBibleComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) + self.QuickSecondBibleComboBox.setObjectName(u'SecondBible') + self.QuickLayout.addWidget(self.QuickSecondBibleComboBox, 1, 1, 1, 2) self.QuickSearchLabel = QtGui.QLabel(self.QuickTab) self.QuickSearchLabel.setObjectName(u'QuickSearchLabel') self.QuickLayout.addWidget(self.QuickSearchLabel, 2, 0, 1, 1) + self.QuickSearchComboBox = QtGui.QComboBox(self.QuickTab) + self.QuickSearchComboBox.setObjectName(u'SearchComboBox') + self.QuickLayout.addWidget(self.QuickSearchComboBox, 2, 1, 1, 2) + self.QuickSearchLabel = QtGui.QLabel(self.QuickTab) + self.QuickSearchLabel.setObjectName(u'QuickSearchLabel') + self.QuickLayout.addWidget(self.QuickSearchLabel, 3, 0, 1, 1) self.QuickSearchEdit = QtGui.QLineEdit(self.QuickTab) self.QuickSearchEdit.setObjectName(u'QuickSearchEdit') - self.QuickLayout.addWidget(self.QuickSearchEdit, 2, 1, 1, 2) - self.QuickSearchButton = QtGui.QPushButton(self.QuickTab) - self.QuickSearchButton.setObjectName(u'QuickSearchButton') - self.QuickLayout.addWidget(self.QuickSearchButton, 3, 2, 1, 1) + self.QuickLayout.addWidget(self.QuickSearchEdit, 3, 1, 1, 2) self.QuickClearLabel = QtGui.QLabel(self.QuickTab) self.QuickClearLabel.setObjectName(u'QuickSearchLabel') - self.QuickLayout.addWidget(self.QuickClearLabel, 3, 0, 1, 1) + self.QuickLayout.addWidget(self.QuickClearLabel, 4, 0, 1, 1) self.ClearQuickSearchComboBox = QtGui.QComboBox(self.QuickTab) self.ClearQuickSearchComboBox.setObjectName(u'ClearQuickSearchComboBox') - self.QuickLayout.addWidget(self.ClearQuickSearchComboBox, 3, 1, 1, 1) - self.QuickVerticalLayout.addLayout(self.QuickLayout) - self.QuickSecondBibleComboBox = QtGui.QComboBox(self.QuickTab) - self.QuickSecondBibleComboBox.setObjectName(u'SecondBible') - self.QuickVerticalLayout.addWidget(self.QuickSecondBibleComboBox) + self.QuickLayout.addWidget(self.ClearQuickSearchComboBox, 4, 1, 1, 2) + self.QuickSearchButtonLayout = QtGui.QHBoxLayout() + self.QuickSearchButtonLayout.setMargin(0) + self.QuickSearchButtonLayout.setSpacing(0) + self.QuickSearchButtonLayout.setObjectName(u'QuickSearchButtonLayout') + self.QuickSearchButtonSpacer = QtGui.QSpacerItem(40, 20, + QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.QuickSearchButtonLayout.addItem(self.QuickSearchButtonSpacer) + self.QuickSearchButton = QtGui.QPushButton(self.QuickTab) + self.QuickSearchButton.setObjectName(u'QuickSearchButton') + self.QuickSearchButtonLayout.addWidget(self.QuickSearchButton) + self.QuickLayout.addLayout(self.QuickSearchButtonLayout, 5, 0, 1, 3) self.QuickMessage = QtGui.QLabel(self.QuickTab) self.QuickMessage.setObjectName(u'QuickMessage') - self.QuickVerticalLayout.addWidget(self.QuickMessage) + self.QuickLayout.addWidget(self.QuickMessage, 5, 0, 1, 3) self.SearchTabWidget.addTab(self.QuickTab, 'Quick') QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.QuickLayout.addItem(QuickSpacerItem, 4, 2, 1, 1) + self.QuickLayout.addItem(QuickSpacerItem, 6, 2, 1, 1) # Add the Advanced Search tab self.AdvancedTab = QtGui.QWidget() self.AdvancedTab.setObjectName(u'AdvancedTab') - self.AdvancedVerticalLayout = QtGui.QVBoxLayout(self.AdvancedTab) - self.AdvancedVerticalLayout.setObjectName("verticalLayout") - self.AdvancedLayout = QtGui.QGridLayout() - self.AdvancedLayout.setMargin(0) + self.AdvancedLayout = QtGui.QGridLayout(self.AdvancedTab) + self.AdvancedLayout.setMargin(2) self.AdvancedLayout.setSpacing(4) + self.AdvancedLayout.setVerticalSpacing(4) self.AdvancedLayout.setObjectName(u'AdvancedLayout') self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedVersionLabel.setObjectName(u'AdvancedVersionLabel') self.AdvancedLayout.addWidget(self.AdvancedVersionLabel, 0, 0, 1, 1) self.AdvancedVersionComboBox = QtGui.QComboBox(self.AdvancedTab) + self.AdvancedVersionComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) self.AdvancedVersionComboBox.setObjectName(u'AdvancedVersionComboBox') - self.AdvancedLayout.addWidget(self.AdvancedVersionComboBox, 0, 2, 1, 2) + self.AdvancedLayout.addWidget(self.AdvancedVersionComboBox, 0, 1, 1, 2) + self.AdvancedSecondBibleLabel = QtGui.QLabel(self.AdvancedTab) + self.AdvancedSecondBibleLabel.setObjectName(u'AdvancedSecondBibleLabel') + self.AdvancedLayout.addWidget(self.AdvancedSecondBibleLabel, 1, 0, 1, 1) + self.AdvancedSecondBibleComboBox = QtGui.QComboBox(self.AdvancedTab) + self.AdvancedSecondBibleComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) + self.AdvancedSecondBibleComboBox.setObjectName(u'AdvancedSecondBibleComboBox') + self.AdvancedLayout.addWidget(self.AdvancedSecondBibleComboBox, 1, 1, 1, 2) self.AdvancedBookLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedBookLabel.setObjectName(u'AdvancedBookLabel') - self.AdvancedLayout.addWidget(self.AdvancedBookLabel, 1, 0, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedBookLabel, 2, 0, 1, 1) self.AdvancedBookComboBox = QtGui.QComboBox(self.AdvancedTab) self.AdvancedBookComboBox.setObjectName(u'AdvancedBookComboBox') - self.AdvancedLayout.addWidget(self.AdvancedBookComboBox, 1, 2, 1, 2) + self.AdvancedLayout.addWidget(self.AdvancedBookComboBox, 2, 1, 1, 2) self.AdvancedChapterLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedChapterLabel.setObjectName(u'AdvancedChapterLabel') - self.AdvancedLayout.addWidget(self.AdvancedChapterLabel, 2, 2, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedChapterLabel, 3, 1, 1, 1) self.AdvancedVerseLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedVerseLabel.setObjectName(u'AdvancedVerseLabel') - self.AdvancedLayout.addWidget(self.AdvancedVerseLabel, 2, 3, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedVerseLabel, 3, 2, 1, 1) self.AdvancedFromLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedFromLabel.setObjectName(u'AdvancedFromLabel') - self.AdvancedLayout.addWidget(self.AdvancedFromLabel, 3, 0, 1, 1) - self.AdvancedToLabel = QtGui.QLabel(self.AdvancedTab) - self.AdvancedToLabel.setObjectName(u'AdvancedToLabel') - self.AdvancedLayout.addWidget(self.AdvancedToLabel, 4, 0, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedFromLabel, 4, 0, 1, 1) self.AdvancedFromChapter = QtGui.QComboBox(self.AdvancedTab) self.AdvancedFromChapter.setObjectName(u'AdvancedFromChapter') - self.AdvancedLayout.addWidget(self.AdvancedFromChapter, 3, 2, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedFromChapter, 4, 1, 1, 1) self.AdvancedFromVerse = QtGui.QComboBox(self.AdvancedTab) self.AdvancedFromVerse.setObjectName(u'AdvancedFromVerse') - self.AdvancedLayout.addWidget(self.AdvancedFromVerse, 3, 3, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedFromVerse, 4, 2, 1, 1) + self.AdvancedToLabel = QtGui.QLabel(self.AdvancedTab) + self.AdvancedToLabel.setObjectName(u'AdvancedToLabel') + self.AdvancedLayout.addWidget(self.AdvancedToLabel, 5, 0, 1, 1) self.AdvancedToChapter = QtGui.QComboBox(self.AdvancedTab) self.AdvancedToChapter.setObjectName(u'AdvancedToChapter') - self.AdvancedLayout.addWidget(self.AdvancedToChapter, 4, 2, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedToChapter, 5, 1, 1, 1) self.AdvancedToVerse = QtGui.QComboBox(self.AdvancedTab) self.AdvancedToVerse.setObjectName(u'AdvancedToVerse') - self.AdvancedLayout.addWidget(self.AdvancedToVerse, 4, 3, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedToVerse, 5, 2, 1, 1) self.AdvancedClearLabel = QtGui.QLabel(self.QuickTab) self.AdvancedClearLabel.setObjectName(u'QuickSearchLabel') - self.AdvancedLayout.addWidget(self.AdvancedClearLabel, 5, 0, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedClearLabel, 6, 0, 1, 1) self.ClearAdvancedSearchComboBox = QtGui.QComboBox(self.QuickTab) self.ClearAdvancedSearchComboBox.setObjectName( u'ClearAdvancedSearchComboBox') self.AdvancedLayout.addWidget( - self.ClearAdvancedSearchComboBox, 5, 2, 1, 2) + self.ClearAdvancedSearchComboBox, 6, 1, 1, 2) + self.AdvancedSearchButtonLayout = QtGui.QHBoxLayout() + self.AdvancedSearchButtonLayout.setMargin(0) + self.AdvancedSearchButtonLayout.setSpacing(0) + self.AdvancedSearchButtonLayout.setObjectName(u'AdvancedSearchButtonLayout') + self.AdvancedSearchButtonSpacer = QtGui.QSpacerItem(40, 20, + QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.AdvancedSearchButtonLayout.addItem(self.AdvancedSearchButtonSpacer) self.AdvancedSearchButton = QtGui.QPushButton(self.AdvancedTab) self.AdvancedSearchButton.setObjectName(u'AdvancedSearchButton') - self.AdvancedLayout.addWidget(self.AdvancedSearchButton, 6, 3, 1, 1) - self.AdvancedVerticalLayout.addLayout(self.AdvancedLayout) - self.AdvancedSecondBibleComboBox = QtGui.QComboBox(self.AdvancedTab) - self.AdvancedSecondBibleComboBox.setObjectName(u'SecondBible') - self.AdvancedVerticalLayout.addWidget(self.AdvancedSecondBibleComboBox) + self.AdvancedSearchButtonLayout.addWidget(self.AdvancedSearchButton) + self.AdvancedLayout.addLayout(self.AdvancedSearchButtonLayout, 7, 0, 1, 3) self.AdvancedMessage = QtGui.QLabel(self.QuickTab) self.AdvancedMessage.setObjectName(u'AdvancedMessage') - self.AdvancedVerticalLayout.addWidget(self.AdvancedMessage) + self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3) self.SearchTabWidget.addTab(self.AdvancedTab, u'Advanced') # Add the search tab widget to the page layout self.PageLayout.addWidget(self.SearchTabWidget) @@ -208,6 +230,8 @@ class BibleMediaItem(MediaManagerItem): log.debug(u'retranslateUi') self.QuickVersionLabel.setText( translate(u'BibleMediaItem', u'Version:')) + self.QuickDualVersionLabel.setText( + translate(u'BibleMediaItem', u'Dual:')) self.QuickSearchLabel.setText( translate(u'BibleMediaItem', u'Search Type:')) self.QuickSearchLabel.setText(translate(u'BibleMediaItem', u'Find:')) @@ -215,6 +239,8 @@ class BibleMediaItem(MediaManagerItem): self.QuickClearLabel.setText(translate(u'BibleMediaItem', u'Results:')) self.AdvancedVersionLabel.setText( translate(u'BibleMediaItem', u'Version:')) + self.AdvancedSecondBibleLabel.setText( + translate(u'BibleMediaItem', u'Dual:')) self.AdvancedBookLabel.setText(translate(u'BibleMediaItem', u'Book:')) self.AdvancedChapterLabel.setText( translate(u'BibleMediaItem', u'Chapter:'))