Merge lp:~j-corwin/openlp/bug-1094198 into lp:openlp/2.0

[Jonathan Corwin]

** 2.0 **

Attempt to successfully import the settings we can now export.

* QSettings exports the 'general' group as '%General' but appears in some circumstances (Linux?) to struggle to import this again. Try and compensate.

* If you run 2.1, even if just the once, it'll create a [players] settings group. If you later go back to 2.0 it'll load this group (even if it doesn't use it) and so it'll be exported. However the import considers the group invalid so fails. I've therefore changed the import to be more forgiving and just ignore unknown groups. A basic sanity test is done earlier instead. (Using the same string to avoid translation problems)

Tim please can you see if this solves your problem? Ta.

[Raoul Snyman (raoul-snyman)]

16 + 'The file you selected does appear to be a valid OpenLP '
17 + 'settings file.\n\n'

Is this really necessary? Surely if it gets to the stage of parsing sections, then it is a valid OpenLP settings file? Or are you confused and need to rewrite that IF statement?

[Tim Bentley (trb143)]

This is a 2.0 change and a text change would break the translations. Or does this break them any way?

[Jonathan Corwin (j-corwin)]

Well a check was already in there so I figured someone did it for a reason. All I've done is move it and check something different. I didn't want to change the (incorrect) text since then we'd need to update the translation strings.

I don't know how lenient QSettings() is when loading a random text file, but I guess someone could try and open another apps settings file by mistake, so this just does a basic test to check for this.

[Tim Bentley (trb143)]

Approved.
Can you roll a fix (may be with text changes for 2.1)

review: Approve

[Raoul Snyman (raoul-snyman)]

Ah, OK. I can live with that for now.

We must look into how Transifex recommends doing multiple versions of an app... of course we could always have another project for the 2.0 branch if all else fails.

review: Approve

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2012-11-11 21:16:14 +0000
+++ openlp/core/ui/mainwindow.py	2012-12-29 23:04:23 +0000
@@ -982,6 +982,22 @@
         settings = Settings()
         import_settings = Settings(import_file_name,
             Settings.IniFormat)
+        # Lets do a basic sanity check. If it contains this string we can
+        # assume it was created by OpenLP and so we'll load what we can
+        # from it, and just silently ignore anything we don't recognise
+        if import_settings.value(u'SettingsImport/type').toString() \
+            != u'OpenLP_settings_export':
+            QtGui.QMessageBox.critical(self,
+                translate('OpenLP.MainWindow', 'Import settings'),
+                translate('OpenLP.MainWindow',
+                    'The file you selected does appear to be a valid OpenLP '
+                    'settings file.\n\n'
+                    'Section [%s] is not valid \n\n'
+                    'Processing has terminated and no changed have been made.'
+                ).replace('%s', u'SettingsImport'),
+                QtGui.QMessageBox.StandardButtons(
+                    QtGui.QMessageBox.Ok))
+            return
         import_keys = import_settings.allKeys()
         for section_key in import_keys:
             # We need to handle the really bad files.
@@ -991,22 +1007,12 @@
                 section = u'unknown'
                 key = u''
             # Switch General back to lowercase.
-            if section == u'General':
+            if section == u'General' or section == u'%General':
                 section = u'general'
                 section_key = section + "/" + key
             # Make sure it's a valid section for us.
             if not section in setting_sections:
-                QtGui.QMessageBox.critical(self,
-                    translate('OpenLP.MainWindow', 'Import settings'),
-                    translate('OpenLP.MainWindow',
-                    'The file you selected does appear to be a valid OpenLP '
-                    'settings file.\n\n'
-                    'Section [%s] is not valid \n\n'
-                    'Processing has terminated and no changed have been made.'
-                    ).replace('%s', section),
-                    QtGui.QMessageBox.StandardButtons(
-                    QtGui.QMessageBox.Ok))
-                return
+                continue
         # We have a good file, import it.
         for section_key in import_keys:
             value = import_settings.value(section_key)