openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Diff check
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/21502
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-03-14 17:05:50 +0000
+++ openlp/core/ui/mainwindow.py	2010-03-16 22:12:19 +0000
@@ -23,7 +23,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-import os
 import logging
 import time
 

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2010-03-13 15:11:31 +0000
+++ openlp/core/ui/settingsform.py	2010-03-16 22:12:19 +0000
@@ -28,7 +28,6 @@
 from PyQt4 import QtGui
 
 from openlp.core.ui import GeneralTab, ThemesTab
-from openlp.core.lib import Receiver
 from settingsdialog import Ui_SettingsDialog
 
 log = logging.getLogger(__name__)
@@ -45,7 +44,7 @@
         self.ThemesTab = ThemesTab(mainWindow)
         self.addTab(u'Themes', self.ThemesTab)
 
-    def addTab(self, name,  tab):
+    def addTab(self, name, tab):
         log.info(u'Adding %s tab' % tab.tabTitle)
         self.SettingsTabWidget.addTab(tab, tab.tabTitleVisible)
 

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2010-03-16 20:43:41 +0000
+++ openlp/plugins/bibles/lib/manager.py	2010-03-16 22:12:19 +0000
@@ -24,7 +24,6 @@
 ###############################################################################
 
 import logging
-import os
 
 from common import parse_reference
 from opensong import OpenSongBible

=== modified file 'resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py'
--- resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py	2010-02-24 18:55:34 +0000
+++ resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py	2010-03-16 22:12:19 +0000
@@ -1,3 +1,3 @@
-hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
+hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
                  'openlp.plugins.presentations.lib.powerpointcontroller',
                  'openlp.plugins.presentations.lib.pptviewcontroller']
\ No newline at end of file

=== modified file 'resources/pyinstaller/hook-openlp.py'
--- resources/pyinstaller/hook-openlp.py	2010-02-24 18:55:34 +0000
+++ resources/pyinstaller/hook-openlp.py	2010-03-16 22:12:19 +0000
@@ -1,4 +1,4 @@
-hiddenimports = ['plugins.songs.songsplugin',
+hiddenimports = ['plugins.songs.songsplugin',
                  'plugins.bibles.bibleplugin',
                  'plugins.presentations.presentationplugin',
                  'plugins.media.mediaplugin',