openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/uifixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)

-- 
https://code.launchpad.net/~raoul-snyman/openlp/uifixes/+merge/13669
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2009-10-17 22:13:32 +0000
+++ openlp.pyw	2009-10-20 20:20:23 +0000
@@ -47,7 +47,15 @@
 QDockWidget::title
 {
   border: none;
-  padding-left: 2px;
+  padding-left: 5px;
+  padding-top: 3px;
+}
+
+QToolBar
+{
+  border: none;
+  margin: 0;
+  padding: 0;
 }
 """
 

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-10-19 17:31:02 +0000
+++ openlp/core/ui/mainwindow.py	2009-10-20 20:20:23 +0000
@@ -38,7 +38,7 @@
 media_manager_style = """
   QToolBox::tab {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 palette(midlight), stop: 1.0 palette(dark));
+        stop: 0 palette(midlight), stop: 1.0 palette(mid));
     border-width: 1px;
     border-style: outset;
     border-color: palette(midlight);
@@ -46,7 +46,7 @@
   }
   QToolBox::tab:selected {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 palette(light), stop: 1.0 palette(dark));
+        stop: 0 palette(light), stop: 1.0 palette(mid));
     border-color: palette(light);
   }
 """

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2009-10-18 06:26:36 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-10-20 20:20:24 +0000
@@ -77,113 +77,135 @@
         # 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.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, 1, 0, 1, 1)
+        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, 1, 1, 1, 2)
+        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, 2, 0, 1, 1)
+        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)
@@ -219,6 +241,8 @@
         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:'))
@@ -226,6 +250,8 @@
         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:'))

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2009-10-17 19:14:39 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2009-10-20 20:20:24 +0000
@@ -68,6 +68,7 @@
             u'Maintain the lists of authors, topics and books'),
             ':/songs/song_maintenance.png', self.onSongMaintenanceClick,
             'SongMaintenanceItem')
+        self.PageLayout.setSpacing(4)
         self.SearchLayout = QtGui.QFormLayout()
         self.SearchLayout.setMargin(0)
         self.SearchLayout.setSpacing(4)