openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #693150 Custom Slide Display footer option
  https://bugs.launchpad.net/bugs/693150
  #693202 delete theme
  https://bugs.launchpad.net/bugs/693202

For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/45650

Small fixes from last merge
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/45650
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2011-01-09 18:51:06 +0000
+++ openlp/core/ui/themeform.py	2011-01-09 20:36:10 +0000
@@ -592,7 +592,7 @@
             saveFrom = self.theme.background_filename
         if not self.edit_mode and \
             not self.thememanager.checkIfThemeExists(self.theme.theme_name):
-                return
+            return
         self.accepted = True
         self.thememanager.saveTheme(self.theme, saveFrom, saveTo)
         return QtGui.QDialog.accept(self)

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2011-01-09 08:17:17 +0000
+++ openlp/core/ui/thememanager.py	2011-01-09 20:36:10 +0000
@@ -388,7 +388,8 @@
         files = QtGui.QFileDialog.getOpenFileNames(self,
             translate('OpenLP.ThemeManager', 'Select Theme Import File'),
             SettingsManager.get_last_dir(self.settingsSection),
-            translate('OpenLP.ThemeManager', 'Theme (*.*)'))
+            translate('OpenLP.ThemeManager', 'Theme v1 (*.theme);;'
+            'Theme v2 (*.otz);;All Files (*.*)'))
         log.info(u'New Themes %s', unicode(files))
         if files:
             for file in files: