openlp-core team mailing list archive

[Meinert Jordan <meinertjordan@xxxxxxxxxx>]

Meinert Jordan has proposed merging lp:~m2j/openlp/bug-960386 into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)
  Tim Bentley (trb143)

For more details, see:
https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100518

Bug #960386: string fixes
fix missalignment of theme level selection labels
change default theme level to song level

I didn't fix the variable names according to our naming conventions, as I don't know, if such changes are permitted ATM.
-- 
https://code.launchpad.net/~m2j/openlp/bug-960386/+merge/100518
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2012-03-17 21:30:53 +0000
+++ openlp/core/ui/advancedtab.py	2012-04-02 21:02:20 +0000
@@ -195,33 +195,20 @@
         # Service Item Slide Limits
         self.slideGroupBox = QtGui.QGroupBox(self.rightColumn)
         self.slideGroupBox.setObjectName(u'slideGroupBox')
-        self.slideLayout = QtGui.QFormLayout(self.slideGroupBox)
-        self.slideLayout.setLabelAlignment(
-            QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
-        self.slideLayout.setFormAlignment(
-            QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop)
+        self.slideLayout = QtGui.QVBoxLayout(self.slideGroupBox)
         self.slideLayout.setObjectName(u'slideLayout')
+        self.slideLabel = QtGui.QLabel(self.slideGroupBox)
+        self.slideLabel.setWordWrap(True)
+        self.slideLayout.addWidget(self.slideLabel)
         self.endSlideRadioButton = QtGui.QRadioButton(self.slideGroupBox)
         self.endSlideRadioButton.setObjectName(u'endSlideRadioButton')
-        self.endSlideLabel = QtGui.QLabel(self.slideGroupBox)
-        self.endSlideLabel.setWordWrap(True)
-        self.endSlideLabel.setObjectName(u'endSlideLabel')
-        self.slideLayout.addRow(self.endSlideRadioButton, self.endSlideLabel)
+        self.slideLayout.addWidget(self.endSlideRadioButton)
         self.wrapSlideRadioButton = QtGui.QRadioButton(self.slideGroupBox)
         self.wrapSlideRadioButton.setObjectName(u'wrapSlideRadioButton')
-        self.wrapSlideLabel = QtGui.QLabel(self.slideGroupBox)
-        self.wrapSlideLabel.setWordWrap(True)
-        self.wrapSlideLabel.setObjectName(u'wrapSlideLabel')
-        self.slideLayout.addRow(self.wrapSlideRadioButton,
-            self.wrapSlideLabel)
+        self.slideLayout.addWidget(self.wrapSlideRadioButton)
         self.nextItemRadioButton = QtGui.QRadioButton(self.slideGroupBox)
-        self.nextItemRadioButton.setChecked(True)
         self.nextItemRadioButton.setObjectName(u'nextItemRadioButton')
-        self.nextItemLabel = QtGui.QLabel(self.slideGroupBox)
-        self.nextItemLabel.setWordWrap(True)
-        self.nextItemLabel.setObjectName(u'nextItemLabel')
-        self.slideLayout.addRow(self.nextItemRadioButton,
-            self.nextItemLabel)
+        self.slideLayout.addWidget(self.nextItemRadioButton)
         self.rightLayout.addWidget(self.slideGroupBox)
         self.x11GroupBox = QtGui.QGroupBox(self.leftColumn)
         self.x11GroupBox.setObjectName(u'x11GroupBox')
@@ -340,22 +327,14 @@
         # Slide Limits
         self.slideGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'Service Item Slide Limits'))
+        self.slideLabel.setText(translate('OpenLP.GeneralTab',
+            'Behaviour of next/previous on the last/first slide:'))
         self.endSlideRadioButton.setText(
-            translate('OpenLP.GeneralTab', '&End Slide'))
-        self.endSlideLabel.setText(
-            translate('OpenLP.GeneralTab', 'Up and down arrow keys '
-            'stop at the top and bottom slides of each Service Item.'))
+            translate('OpenLP.GeneralTab', '&Remain on Slide'))
         self.wrapSlideRadioButton.setText(
-            translate('OpenLP.GeneralTab', '&Wrap Slide'))
-        self.wrapSlideLabel.setText(
-            translate('OpenLP.GeneralTab', 'Up and down arrow keys '
-            'wrap around at the top and bottom slides of each Service Item.'))
-        self.nextItemRadioButton.setText(
-            translate('OpenLP.GeneralTab', '&Next Item'))
-        self.nextItemLabel.setText(
-            translate('OpenLP.GeneralTab', 'Up and down arrow keys '
-            'advance to the next or previous Service Item from the '
-            'top and bottom slides of each Service Item.'))
+            translate('OpenLP.GeneralTab', '&Wrap around'))
+        self.nextItemRadioButton.setText(translate('OpenLP.GeneralTab',
+            '&Move to next/previous service item'))
 
     def load(self):
         """

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2012-03-17 16:42:53 +0000
+++ openlp/core/ui/slidecontroller.py	2012-04-02 21:02:20 +0000
@@ -291,7 +291,7 @@
             self.toolbar.widgetForAction(self.audioPauseItem).setPopupMode(
                 QtGui.QToolButton.MenuButtonPopup)
             self.nextTrackItem = create_action(self, u'nextTrackItem',
-                text=translate('OpenLP.SlideController', 'Next Track'),
+                text=UiStrings().NextTrack,
                 icon=u':/slides/media_playback_next.png', tooltip=translate(
                 'OpenLP.SlideController', 'Go to next audio track.'),
                 category=self.category, context=QtCore.Qt.WindowShortcut,

=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py	2012-03-04 14:52:09 +0000
+++ openlp/core/ui/themestab.py	2012-04-02 21:02:20 +0000
@@ -71,24 +71,28 @@
         self.SongLevelRadioButton = QtGui.QRadioButton(self.LevelGroupBox)
         self.SongLevelRadioButton.setObjectName(u'SongLevelRadioButton')
         self.SongLevelLabel = QtGui.QLabel(self.LevelGroupBox)
-        self.SongLevelLabel.setWordWrap(True)
         self.SongLevelLabel.setObjectName(u'SongLevelLabel')
         self.LevelLayout.addRow(self.SongLevelRadioButton, self.SongLevelLabel)
         self.ServiceLevelRadioButton = QtGui.QRadioButton(self.LevelGroupBox)
         self.ServiceLevelRadioButton.setObjectName(u'ServiceLevelRadioButton')
         self.ServiceLevelLabel = QtGui.QLabel(self.LevelGroupBox)
-        self.ServiceLevelLabel.setWordWrap(True)
         self.ServiceLevelLabel.setObjectName(u'ServiceLevelLabel')
         self.LevelLayout.addRow(self.ServiceLevelRadioButton,
             self.ServiceLevelLabel)
         self.GlobalLevelRadioButton = QtGui.QRadioButton(self.LevelGroupBox)
-        self.GlobalLevelRadioButton.setChecked(True)
         self.GlobalLevelRadioButton.setObjectName(u'GlobalLevelRadioButton')
         self.GlobalLevelLabel = QtGui.QLabel(self.LevelGroupBox)
-        self.GlobalLevelLabel.setWordWrap(True)
         self.GlobalLevelLabel.setObjectName(u'GlobalLevelLabel')
         self.LevelLayout.addRow(self.GlobalLevelRadioButton,
             self.GlobalLevelLabel)
+        label_top_margin = (self.SongLevelRadioButton.sizeHint().height() -
+            self.SongLevelLabel.sizeHint().height()) / 2
+        for label in [self.SongLevelLabel, self.ServiceLevelLabel,
+            self.GlobalLevelLabel]:
+            rect = label.rect()
+            rect.setTop(rect.top() + label_top_margin)
+            label.setFrameRect(rect)
+            label.setWordWrap(True)
         self.rightLayout.addWidget(self.LevelGroupBox)
         self.rightLayout.addStretch()
         QtCore.QObject.connect(self.SongLevelRadioButton,
@@ -131,9 +135,8 @@
         settings = QtCore.QSettings()
         settings.beginGroup(self.settingsSection)
         self.theme_level = settings.value(
-            u'theme level', QtCore.QVariant(ThemeLevel.Global)).toInt()[0]
-        self.global_theme = unicode(settings.value(
-            u'global theme', QtCore.QVariant(u'')).toString())
+            u'theme level', ThemeLevel.Song).toInt()[0]
+        self.global_theme = unicode(settings.value(u'global theme').toString())
         settings.endGroup()
         if self.theme_level == ThemeLevel.Global:
             self.GlobalLevelRadioButton.setChecked(True)

=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py	2012-03-10 19:12:03 +0000
+++ openlp/plugins/bibles/lib/biblestab.py	2012-04-02 21:02:20 +0000
@@ -276,11 +276,10 @@
                 'end marks may be defined.\nThey have to be separated by a '
                 'vertical bar "|".\nPlease clear this edit line to use the '
                 'default value.'))
-        self.languageSelectionGroupBox.setTitle(
-            translate('BiblesPlugin.BiblesTab', 'Preferred Bookname Language'))
+        self.languageSelectionGroupBox.setTitle(translate('BiblesPlugin.BiblesTab',
+            'Default Search Field Language'))
         self.languageSelectionLabel.setText(translate('BiblesPlugin.BiblesTab',
-            'Choose the language in which the book names of the\nBible should '
-            'be displayed in the Bible search:'))
+            'Book name language in search field:'))
         self.languageSelectionComboBox.setItemText(LanguageSelection.Bible,
             translate('BiblesPlugin.BiblesTab', 'Bible language'))
         self.languageSelectionComboBox.setItemText(
@@ -288,11 +287,6 @@
             translate('BiblesPlugin.BiblesTab', 'Application language'))
         self.languageSelectionComboBox.setItemText(LanguageSelection.English,
             translate('BiblesPlugin.BiblesTab', 'English'))
-        self.languageSelectionComboBox.setToolTip(
-            translate('BiblesPlugin.BiblesTab', 'Multiple options:\n '
-            'Bible language - the language in which the Bible book names '
-            'were imported\n Application language - the language you have '
-            'chosen for OpenLP\n English - always use English book names'))
 
     def onBibleThemeComboBoxChanged(self):
         self.bible_theme = self.bibleThemeComboBox.currentText()

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2011-12-27 10:33:55 +0000
+++ openlp/plugins/images/lib/imagetab.py	2012-04-02 21:02:20 +0000
@@ -53,6 +53,7 @@
         self.formLayout.addRow(self.colorLayout)
         self.informationLabel = QtGui.QLabel(self.bgColorGroupBox)
         self.informationLabel.setObjectName(u'InformationLabel')
+        self.informationLabel.setWordWrap(True)
         self.formLayout.addRow(self.informationLabel)
         self.leftLayout.addWidget(self.bgColorGroupBox)
         self.leftLayout.addStretch()
@@ -69,8 +70,8 @@
         self.backgroundColorLabel.setText(
             translate('ImagesPlugin.ImageTab', 'Default Color:'))
         self.informationLabel.setText(
-            translate('ImagesPlugin.ImageTab', 'Provides border where image '
-            'is not the correct dimensions for the screen when resized.'))
+            translate('ImagesPlugin.ImageTab', 'Visible background for images '
+            'with aspect ratio different to screen.'))
 
     def onbackgroundColorButtonClicked(self):
         new_color = QtGui.QColorDialog.getColor(

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2012-02-16 21:08:30 +0000
+++ openlp/plugins/songs/lib/songstab.py	2012-04-02 21:02:20 +0000
@@ -82,9 +82,8 @@
             'Display verses on live tool bar'))
         self.updateOnEditCheckBox.setText(
             translate('SongsPlugin.SongsTab', 'Update service from song edit'))
-        self.addFromServiceCheckBox.setText(
-            translate('SongsPlugin.SongsTab',
-            'Add missing songs when opening service'))
+        self.addFromServiceCheckBox.setText(translate('SongsPlugin.SongsTab',
+            'Import missing songs from service files'))
 
     def onSearchAsTypeCheckBoxChanged(self, check_state):
         self.song_search = False