From 81441f3e79e2a1dea035578c957a21561eca45e2 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 24 Jul 2010 23:20:02 +0200 Subject: [PATCH] Remove some unused imports. Remove an unused variable. Fix up a couple of strings I missed in the previous string fix merge. --- openlp/core/ui/generaltab.py | 7 ++++--- openlp/core/ui/splashscreen.py | 2 -- openlp/plugins/custom/lib/customtab.py | 2 ++ openlp/plugins/images/lib/imagetab.py | 2 ++ openlp/plugins/remotes/lib/remotetab.py | 2 ++ openlp/plugins/songs/lib/songstab.py | 2 ++ openlp/plugins/songusage/songusageplugin.py | 1 - 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 5f0fbf566..f1b235812 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -302,9 +302,9 @@ class GeneralTab(SettingsTab): 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 @@ class GeneralTab(SettingsTab): '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): diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py index bd87bcb12..650aa4640 100644 --- a/openlp/core/ui/splashscreen.py +++ b/openlp/core/ui/splashscreen.py @@ -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() diff --git a/openlp/plugins/custom/lib/customtab.py b/openlp/plugins/custom/lib/customtab.py index c860ece5d..b62b5e071 100644 --- a/openlp/plugins/custom/lib/customtab.py +++ b/openlp/plugins/custom/lib/customtab.py @@ -38,6 +38,8 @@ class CustomTab(SettingsTab): 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') diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py index 319ec7ac4..f62f97bf0 100644 --- a/openlp/plugins/images/lib/imagetab.py +++ b/openlp/plugins/images/lib/imagetab.py @@ -38,6 +38,8 @@ class ImageTab(SettingsTab): 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') diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 7400875ee..1e8839833 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -38,6 +38,8 @@ class RemoteTab(SettingsTab): 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') diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index e9579aa7f..8cf94bb57 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -38,6 +38,8 @@ class SongsTab(SettingsTab): 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') diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index a11e61605..deeb46569 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -76,7 +76,6 @@ class SongUsagePlugin(Plugin): 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)