openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)


Fix up a couple of things Jon T found in my previous merge proposal, plus some strings I missed.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/trivial-fixes/+merge/30864
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/trivial-fixes into lp:openlp.

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2010-07-23 05:45:48 +0000
+++ openlp/core/ui/generaltab.py	2010-07-24 21:36:50 +0000
@@ -302,9 +302,9 @@
         self.SettingsGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'Application Settings'))
         self.SaveCheckServiceCheckBox.setText(translate('OpenLP.GeneralTab',
-            'Prompt to save Service before starting New'))
+            'Prompt to save before starting a new service'))
         self.AutoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
-            'Preview Next Song from Service Manager'))
+            'Automatically preview next item in service'))
         self.CCLIGroupBox.setTitle(
             translate('OpenLP.GeneralTab', 'CCLI Details'))
         self.NumberLabel.setText(
@@ -330,7 +330,8 @@
             'Override display position'))
         self.customXLabel.setText(translate('OpenLP.GeneralTab', 'X'))
         self.customYLabel.setText(translate('OpenLP.GeneralTab', 'Y'))
-        self.customHeightLabel.setText(translate('OpenLP.GeneralTab', 'Height'))
+        self.customHeightLabel.setText(
+            translate('OpenLP.GeneralTab', 'Height'))
         self.customWidthLabel.setText(translate('OpenLP.GeneralTab', 'Width'))
 
     def load(self):

=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py	2010-07-23 19:17:36 +0000
+++ openlp/core/ui/splashscreen.py	2010-07-24 21:36:50 +0000
@@ -25,8 +25,6 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon, translate
-
 class SplashScreen(object):
     def __init__(self, version):
         self.splash_screen = QtGui.QSplashScreen()

=== modified file 'openlp/plugins/custom/lib/customtab.py'
--- openlp/plugins/custom/lib/customtab.py	2010-07-06 15:54:15 +0000
+++ openlp/plugins/custom/lib/customtab.py	2010-07-24 21:36:50 +0000
@@ -38,6 +38,8 @@
         self.setObjectName(u'CustomTab')
         self.tabTitleVisible = translate('CustomPlugin.CustomTab', 'Custom')
         self.CustomLayout = QtGui.QFormLayout(self)
+        self.CustomLayout.setSpacing(8)
+        self.CustomLayout.setMargin(8)
         self.CustomLayout.setObjectName(u'CustomLayout')
         self.CustomModeGroupBox = QtGui.QGroupBox(self)
         self.CustomModeGroupBox.setObjectName(u'CustomModeGroupBox')

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2010-07-21 05:20:03 +0000
+++ openlp/plugins/images/lib/imagetab.py	2010-07-24 21:36:50 +0000
@@ -38,6 +38,8 @@
         self.setObjectName(u'ImageTab')
         self.tabTitleVisible = translate('ImagePlugin.ImageTab', 'Images')
         self.ImageLayout = QtGui.QFormLayout(self)
+        self.ImageLayout.setSpacing(8)
+        self.ImageLayout.setMargin(8)
         self.ImageLayout.setObjectName(u'ImageLayout')
         self.ImageSettingsGroupBox = QtGui.QGroupBox(self)
         self.ImageSettingsGroupBox.setObjectName(u'ImageSettingsGroupBox')

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2010-07-21 06:24:32 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2010-07-24 21:36:50 +0000
@@ -38,6 +38,8 @@
         self.setObjectName(u'RemoteTab')
         self.tabTitleVisible = translate('RemotePlugin.RemoteTab', 'Remotes')
         self.remoteLayout = QtGui.QFormLayout(self)
+        self.remoteLayout.setSpacing(8)
+        self.remoteLayout.setMargin(8)
         self.remoteLayout.setObjectName(u'remoteLayout')
         self.serverSettingsGroupBox = QtGui.QGroupBox(self)
         self.serverSettingsGroupBox.setObjectName(u'serverSettingsGroupBox')

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2010-07-23 19:17:36 +0000
+++ openlp/plugins/songs/lib/songstab.py	2010-07-24 21:36:50 +0000
@@ -38,6 +38,8 @@
         self.setObjectName(u'SongsTab')
         self.tabTitleVisible = translate('SongsPlugin.SongsTab', 'Songs')
         self.SongsLayout = QtGui.QFormLayout(self)
+        self.SongsLayout.setSpacing(8)
+        self.SongsLayout.setMargin(8)
         self.SongsLayout.setObjectName(u'SongsLayout')
         self.SongsModeGroupBox = QtGui.QGroupBox(self)
         self.SongsModeGroupBox.setObjectName(u'SongsModeGroupBox')

=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py	2010-07-23 18:03:19 +0000
+++ openlp/plugins/songusage/songusageplugin.py	2010-07-24 21:36:50 +0000
@@ -76,7 +76,6 @@
             translate('SongUsagePlugin', 'Generate a report on song usage.'))
         self.SongUsageReport.setObjectName(u'SongUsageReport')
         #SongUsage activation
-        SongUsageIcon = build_icon(u':/plugins/plugin_songusage.png')
         self.SongUsageStatus = QtGui.QAction(tools_menu)
         self.SongUsageStatus.setCheckable(True)
         self.SongUsageStatus.setChecked(False)