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/13498
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2009-10-14 18:27:44 +0000
+++ openlp/core/lib/mediamanageritem.py	2009-10-16 19:30:34 +0000
@@ -113,7 +113,7 @@
             self.title = title
         self.Toolbar = None
         self.PageLayout = QtGui.QVBoxLayout(self)
-        self.PageLayout.setSpacing(0)
+        self.PageLayout.setSpacing(4)
         self.PageLayout.setMargin(0)
         self.requiredIcons()
         self.setupUi()

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2009-10-14 16:27:46 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-10-16 19:30:34 +0000
@@ -80,7 +80,7 @@
         self.QuickVerticalLayout = QtGui.QVBoxLayout(self.QuickTab)
         self.QuickVerticalLayout.setObjectName("verticalLayout")
         self.QuickLayout = QtGui.QGridLayout()
-        self.QuickLayout.setMargin(5)
+        self.QuickLayout.setMargin(0)
         self.QuickLayout.setSpacing(4)
         self.QuickLayout.setObjectName(u'QuickLayout')
         self.QuickVersionLabel = QtGui.QLabel(self.QuickTab)
@@ -127,7 +127,7 @@
         self.AdvancedVerticalLayout = QtGui.QVBoxLayout(self.AdvancedTab)
         self.AdvancedVerticalLayout.setObjectName("verticalLayout")
         self.AdvancedLayout = QtGui.QGridLayout()
-        self.AdvancedLayout.setMargin(5)
+        self.AdvancedLayout.setMargin(0)
         self.AdvancedLayout.setSpacing(4)
         self.AdvancedLayout.setObjectName(u'AdvancedLayout')
         self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab)
@@ -173,10 +173,10 @@
         self.ClearAdvancedSearchComboBox.setObjectName(
             u'ClearAdvancedSearchComboBox')
         self.AdvancedLayout.addWidget(
-            self.ClearAdvancedSearchComboBox, 5, 2, 1, 1)
+            self.ClearAdvancedSearchComboBox, 5, 2, 1, 2)
         self.AdvancedSearchButton = QtGui.QPushButton(self.AdvancedTab)
         self.AdvancedSearchButton.setObjectName(u'AdvancedSearchButton')
-        self.AdvancedLayout.addWidget(self.AdvancedSearchButton, 5, 3, 1, 1)
+        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')

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2009-10-08 17:28:59 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2009-10-16 19:30:34 +0000
@@ -68,42 +68,48 @@
             u'Maintain the lists of authors, topics and books'),
             ':/songs/song_maintenance.png', self.onSongMaintenanceClick,
             'SongMaintenanceItem')
-        ## Add the SongListView widget ##
-        # Create the tab widget
-        self.SongWidget = QtGui.QWidget(self)
-        sizePolicy = QtGui.QSizePolicy(
-            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(
-            self.SongWidget.sizePolicy().hasHeightForWidth())
-        self.SongWidget.setSizePolicy(sizePolicy)
-        self.SongWidget.setObjectName(u'SongWidget')
-        self.SearchLayout = QtGui.QGridLayout(self.SongWidget)
-        self.SearchLayout.setMargin(5)
+        self.SearchLayout = QtGui.QFormLayout()
+        self.SearchLayout.setMargin(0)
         self.SearchLayout.setSpacing(4)
         self.SearchLayout.setObjectName(u'SearchLayout')
-        self.SearchTypeComboBox = QtGui.QComboBox(self.SongWidget)
-        self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox')
-        self.SearchLayout.addWidget(self.SearchTypeComboBox, 0, 1, 1, 2)
-        self.SearchTypeLabel = QtGui.QLabel(self.SongWidget)
-        self.SearchTypeLabel.setObjectName(u'SearchTypeLabel')
-        self.SearchLayout.addWidget(self.SearchTypeLabel, 0, 0, 1, 1)
-        self.SearchTextLabel = QtGui.QLabel(self.SongWidget)
+        self.SearchTextLabel = QtGui.QLabel(self)
+        self.SearchTextLabel.setAlignment(
+            QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft)
         self.SearchTextLabel.setObjectName(u'SearchTextLabel')
-        self.SearchLayout.addWidget(self.SearchTextLabel, 2, 0, 1, 1)
-        self.SearchTextEdit = QtGui.QLineEdit(self.SongWidget)
+        self.SearchLayout.setWidget(
+            0, QtGui.QFormLayout.LabelRole, self.SearchTextLabel)
+        self.SearchTextEdit = QtGui.QLineEdit(self)
         self.SearchTextEdit.setObjectName(u'SearchTextEdit')
-        self.SearchLayout.addWidget(self.SearchTextEdit, 2, 1, 1, 2)
-        self.ClearTextButton = QtGui.QPushButton(self.SongWidget)
+        self.SearchLayout.setWidget(
+            0, QtGui.QFormLayout.FieldRole, self.SearchTextEdit)
+        self.SearchTypeLabel = QtGui.QLabel(self)
+        self.SearchTypeLabel.setAlignment(
+            QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft)
+        self.SearchTypeLabel.setObjectName(u'SearchTypeLabel')
+        self.SearchLayout.setWidget(
+            1, QtGui.QFormLayout.LabelRole, self.SearchTypeLabel)
+        self.SearchTypeComboBox = QtGui.QComboBox(self)
+        self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox')
+        self.SearchLayout.setWidget(
+            1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox)
+        self.PageLayout.addLayout(self.SearchLayout)
+        self.SearchButtonLayout = QtGui.QHBoxLayout(self)
+        self.SearchButtonLayout.setMargin(0)
+        self.SearchButtonLayout.setSpacing(4)
+        self.SearchButtonLayout.setObjectName(u'SearchButtonLayout')
+        self.SearchButtonSpacer = QtGui.QSpacerItem(40, 20,
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.SearchButtonLayout.addItem(self.SearchButtonSpacer)
+        self.SearchTextButton = QtGui.QPushButton(self)
+        self.SearchTextButton.setObjectName(u'SearchTextButton')
+        self.SearchButtonLayout.addWidget(self.SearchTextButton)
+        self.ClearTextButton = QtGui.QPushButton(self)
         self.ClearTextButton.setObjectName(u'ClearTextButton')
-        self.SearchLayout.addWidget(self.ClearTextButton, 3, 1, 1, 1)
-        self.SearchTextButton = QtGui.QPushButton(self.SongWidget)
-        self.SearchTextButton.setObjectName(u'SearchTextButton')
-        self.SearchLayout.addWidget(self.SearchTextButton, 3, 2, 1, 1)
-        # Add the song widget to the page layout
-        self.PageLayout.addWidget(self.SongWidget)
+        self.SearchButtonLayout.addWidget(self.ClearTextButton)
+        self.PageLayout.addLayout(self.SearchButtonLayout)
         # Signals and slots
+        QtCore.QObject.connect(self.SearchTextEdit,
+            QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick)
         QtCore.QObject.connect(self.SearchTextButton,
             QtCore.SIGNAL(u'pressed()'), self.onSearchTextButtonClick)
         QtCore.QObject.connect(self.ClearTextButton,
@@ -115,10 +121,8 @@
             QtCore.SIGNAL(u'load_song_list'), self.onSearchTextButtonClick)
 
     def retranslateUi(self):
-        self.SearchTypeLabel.setText(
-            translate(u'SongMediaItem', u'Search Type:'))
-        self.SearchTextLabel.setText(
-            translate(u'SongMediaItem', u'Search Text:'))
+        self.SearchTextLabel.setText(translate(u'SongMediaItem', u'Search:'))
+        self.SearchTypeLabel.setText(translate(u'SongMediaItem', u'Type:'))
         self.ClearTextButton.setText(translate(u'SongMediaItem', u'Clear'))
         self.SearchTextButton.setText(translate(u'SongMediaItem', u'Search'))