fixed layout problem for long bible names (or long presentation controller names)

unified the linebreak in setSizePolicy() calls

bzr-revno: 1201

openlp/core/ui/servicemanager.py

@@ -144,8 +144,10 @@ class ServiceManager(QtGui.QWidget):
         self.themeComboBox = QtGui.QComboBox(self.toolbar)
         self.themeComboBox.setToolTip(translate('OpenLP.ServiceManager',
             'Select a theme for the service'))
-        self.themeComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.themeComboBox.setSizeAdjustPolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
+        self.themeComboBox.setSizePolicy(
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.themeComboBox.setObjectName(u'themeComboBox')
         self.toolbar.addToolbarWidget(u'ThemeWidget', self.themeComboBox)
         self.toolbar.setObjectName(u'toolbar')

openlp/core/ui/themestab.py

@@ -46,8 +46,8 @@ class ThemesTab(SettingsTab):
         self.DefaultComboBox = QtGui.QComboBox(self.GlobalGroupBox)
         self.DefaultComboBox.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.DefaultComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.DefaultComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.DefaultComboBox.setObjectName(u'DefaultComboBox')
         self.GlobalGroupBoxLayout.addWidget(self.DefaultComboBox)
         self.DefaultListView = QtGui.QLabel(self.GlobalGroupBox)

openlp/plugins/bibles/lib/biblestab.py

@@ -76,8 +76,8 @@ class BiblesTab(SettingsTab):
         self.BibleThemeComboBox = QtGui.QComboBox(self.VerseDisplayGroupBox)
         self.BibleThemeComboBox.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.BibleThemeComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.BibleThemeComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.BibleThemeComboBox.addItem(u'')
         self.BibleThemeComboBox.setObjectName(u'BibleThemeComboBox')
         self.VerseDisplayLayout.addRow(self.BibleThemeLabel,
@@ -88,8 +88,8 @@ class BiblesTab(SettingsTab):
         self.VerseDisplayLayout.addRow(self.ChangeNoteLabel)
         self.leftLayout.addWidget(self.VerseDisplayGroupBox)
         self.leftLayout.addStretch()
-        self.rightColumn.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.rightColumn.setSizePolicy(
-            QtGui.QSizePolicy.Preferred)
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
         self.rightLayout.addStretch()
         # Signals and slots
         QtCore.QObject.connect(

openlp/plugins/bibles/lib/mediaitem.py

@@ -86,6 +86,8 @@ class BibleMediaItem(MediaManagerItem):
         self.quickVersionLabel = QtGui.QLabel(self.quickTab)
         self.quickVersionLabel.setObjectName(u'quickVersionLabel')
         self.quickVersionComboBox = QtGui.QComboBox(self.quickTab)
+        self.quickVersionComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.quickVersionComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.quickVersionComboBox.setObjectName(u'quickVersionComboBox')
@@ -95,6 +97,8 @@ class BibleMediaItem(MediaManagerItem):
         self.quickSecondLabel = QtGui.QLabel(self.quickTab)
         self.quickSecondLabel.setObjectName(u'quickSecondLabel')
         self.quickSecondComboBox = QtGui.QComboBox(self.quickTab)
+        self.quickSecondComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.quickSecondComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.quickSecondComboBox.setObjectName(u'quickSecondComboBox')
@@ -103,6 +107,8 @@ class BibleMediaItem(MediaManagerItem):
         self.quickSearchTypeLabel = QtGui.QLabel(self.quickTab)
         self.quickSearchTypeLabel.setObjectName(u'quickSearchTypeLabel')
         self.quickSearchComboBox = QtGui.QComboBox(self.quickTab)
+        self.quickSearchComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.quickSearchComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.quickSearchComboBox.setObjectName(u'quickSearchComboBox')
@@ -118,6 +124,8 @@ class BibleMediaItem(MediaManagerItem):
         self.quickClearLabel = QtGui.QLabel(self.quickTab)
         self.quickClearLabel.setObjectName(u'quickClearLabel')
         self.quickClearComboBox = QtGui.QComboBox(self.quickTab)
+        self.quickClearComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.quickClearComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.quickClearComboBox.setObjectName(u'quickClearComboBox')
@@ -144,6 +152,8 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedLayout.addWidget(self.advancedVersionLabel, 0, 0,
             QtCore.Qt.AlignRight)
         self.advancedVersionComboBox = QtGui.QComboBox(self.advancedTab)
+        self.advancedVersionComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.advancedVersionComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.advancedVersionComboBox.setObjectName(u'advancedVersionComboBox')
@@ -154,6 +164,8 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedLayout.addWidget(self.advancedSecondLabel, 1, 0,
             QtCore.Qt.AlignRight)
         self.advancedSecondComboBox = QtGui.QComboBox(self.advancedTab)
+        self.advancedSecondComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.advancedSecondComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.advancedSecondComboBox.setObjectName(u'advancedSecondComboBox')
@@ -164,6 +176,8 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedLayout.addWidget(self.advancedBookLabel, 2, 0,
             QtCore.Qt.AlignRight)
         self.advancedBookComboBox = QtGui.QComboBox(self.advancedTab)
+        self.advancedBookComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.advancedBookComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.advancedBookComboBox.setObjectName(u'advancedBookComboBox')
@@ -201,6 +215,8 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedLayout.addWidget(self.advancedClearLabel, 6, 0,
             QtCore.Qt.AlignRight)
         self.advancedClearComboBox = QtGui.QComboBox(self.quickTab)
+        self.advancedClearComboBox.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.advancedClearComboBox.setSizePolicy(
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.advancedClearComboBox.setObjectName(u'advancedClearComboBox')

openlp/plugins/presentations/lib/mediaitem.py

@@ -116,8 +116,10 @@ class PresentationMediaItem(MediaManagerItem):
         self.displayTypeLabel = QtGui.QLabel(self.presentationWidget)
         self.displayTypeLabel.setObjectName(u'displayTypeLabel')
         self.displayTypeComboBox = QtGui.QComboBox(self.presentationWidget)
-        self.displayTypeComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.displayTypeComboBox.setSizeAdjustPolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
+        self.displayTypeComboBox.setSizePolicy(
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.displayTypeComboBox.setObjectName(u'displayTypeComboBox')
         self.displayTypeLabel.setBuddy(self.displayTypeComboBox)
         self.displayLayout.addRow(self.displayTypeLabel,

openlp/plugins/remotes/lib/remotetab.py

@@ -46,8 +46,8 @@ class RemoteTab(SettingsTab):
         self.addressLabel = QtGui.QLabel(self.serverSettingsGroupBox)
         self.addressLabel.setObjectName(u'addressLabel')
         self.addressEdit = QtGui.QLineEdit(self.serverSettingsGroupBox)
-        self.addressEdit.setSizePolicy(QtGui.QSizePolicy.Preferred,
+        self.addressEdit.setSizePolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
         self.addressEdit.setValidator(QtGui.QRegExpValidator(QtCore.QRegExp(
             u'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'), self))
         self.addressEdit.setObjectName(u'addressEdit')

openlp/plugins/songs/forms/editsongdialog.py

@@ -114,8 +114,8 @@ class Ui_EditSongDialog(object):
         self.authorsComboBox = QtGui.QComboBox(self.authorsGroupBox)
         self.authorsComboBox.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.authorsComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.authorsComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.authorsComboBox.setEditable(True)
         self.authorsComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.authorsComboBox.setObjectName(u'authorsComboBox')
@@ -155,8 +155,8 @@ class Ui_EditSongDialog(object):
         self.topicsComboBox = QtGui.QComboBox(self.topicsGroupBox)
         self.topicsComboBox.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.topicsComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.topicsComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.topicsComboBox.setEditable(True)
         self.topicsComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.topicsComboBox.setObjectName(u'topicsComboBox')
@@ -184,8 +184,10 @@ class Ui_EditSongDialog(object):
         self.songBookNameLabel = QtGui.QLabel(self.songBookGroupBox)
         self.songBookNameLabel.setObjectName(u'songBookNameLabel')
         self.songBookComboBox = QtGui.QComboBox(self.songBookGroupBox)
-        self.songBookComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.songBookComboBox.setSizeAdjustPolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QComboBox.AdjustToMinimumContentsLength)
+        self.songBookComboBox.setSizePolicy(
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.songBookComboBox.setEditable(True)
         self.songBookComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.songBookComboBox.setObjectName(u'songBookComboBox')
@@ -216,8 +218,8 @@ class Ui_EditSongDialog(object):
         self.themeComboBox = QtGui.QComboBox(self.themeGroupBox)
         self.themeComboBox.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
-        self.themeComboBox.setSizePolicy(QtGui.QSizePolicy.Expanding,
+        self.themeComboBox.setSizePolicy(
-            QtGui.QSizePolicy.Fixed)
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         self.themeComboBox.setEditable(True)
         self.themeComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.themeComboBox.setObjectName(u'themeComboBox')