openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/theme-import into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/theme-import/+merge/49854

Amalgamated OpenLP theme file filters into one.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/theme-import/+merge/49854
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/theme-import into lp:openlp.

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2011-02-14 20:32:19 +0000
+++ openlp/core/ui/thememanager.py	2011-02-15 18:44:59 +0000
@@ -405,8 +405,8 @@
         files = QtGui.QFileDialog.getOpenFileNames(self,
             translate('OpenLP.ThemeManager', 'Select Theme Import File'),
             SettingsManager.get_last_dir(self.settingsSection),
-            unicode(translate('OpenLP.ThemeManager', 'Theme v1 (*.theme);;'
-            'Theme v2 (*.otz);;%s (*.*)')) % UiStrings.AllFiles)
+            unicode(translate('OpenLP.ThemeManager',
+            'OpenLP Themes (*.theme *.otz);;%s (*.*)')) % UiStrings.AllFiles)
         log.info(u'New Themes %s', unicode(files))
         if files:
             for file in files: