Merge lp:~googol-deactivatedaccount/openlp/bug-1146964-2.0 into lp:openlp/2.0

[Andreas Preikschat]

- fixed bug 1146964 ('Attach button on exception form does not work')

Please test this (and not just review the code)... Because I am not sure why that is broken! (I mean we do this in several places and it always worked.)

[Andreas Preikschat (googol-deactivatedaccount)]

I am not sure if the new PyQt/Qt versions cause this, because the 2.0.1 on XP works fine, but both 2.0 as well as trunk on arch linux do not work correctly.

[lp:~googol-deactivatedaccount/openlp/bug-1146964-2.0]

2141. By Andreas Preikschat on 2013-03-19

replaced other file masks

[Raoul Snyman (raoul-snyman)]

This is something I had to figure out by trial and error. Qt uses the last set of brackets plus glob to determine the filter. If you use "All files (*.*)", then in the dialog you see "All files" and *.* is used as the filter. If you use "All files (*.*) (*)", then you see "All files (*.*)" and * is used as the filter.

[Raoul Snyman (raoul-snyman)]

Maybe try changing this to "(*.*) (*.*)"?

[Andreas Preikschat (googol-deactivatedaccount)]

> Maybe try changing this to "(*.*) (*.*)"?

Neither "(*.*) (*.*)" nor "All Files (*.*) (*.*)" works.

[Raoul Snyman (raoul-snyman)]

Meh.

review: Approve

=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py	2012-12-30 19:41:40 +0000
+++ openlp/core/ui/advancedtab.py	2013-03-19 19:26:20 +0000
@@ -662,7 +662,7 @@
                 u'background-color: %s' % self.defaultColor)
 
     def onDefaultBrowseButtonClicked(self):
-        file_filters = u'%s;;%s (*.*) (*)' % (get_images_filter(),
+        file_filters = u'%s;;%s (*.*)' % (get_images_filter(),
             UiStrings().AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.AdvancedTab', 'Open File'), '',

=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/exceptionform.py	2013-03-19 19:26:20 +0000
@@ -219,7 +219,7 @@
             self,translate('ImagePlugin.ExceptionDialog',
             'Select Attachment'),
             SettingsManager.get_last_dir(u'exceptions'),
-            u'%s (*.*) (*)' % UiStrings().AllFiles)
+            u'%s (*.*)' % UiStrings().AllFiles)
         log.info(u'New files(s) %s', unicode(files))
         if files:
             self.fileAttachment = unicode(files)

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2012-12-30 19:41:24 +0000
+++ openlp/core/ui/themeform.py	2013-03-19 19:26:20 +0000
@@ -536,7 +536,7 @@
         Background Image button pushed.
         """
         images_filter = get_images_filter()
-        images_filter = u'%s;;%s (*.*) (*)' % (
+        images_filter = u'%s;;%s (*.*)' % (
             images_filter, UiStrings().AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.ThemeWizard', 'Select Image'), u'',

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2013-01-05 11:31:02 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2013-03-19 19:26:20 +0000
@@ -62,7 +62,7 @@
         self.onNewPrompt = translate('ImagePlugin.MediaItem',
             'Select Image(s)')
         file_formats = get_images_filter()
-        self.onNewFileMasks = u'%s;;%s (*.*) (*)' % (file_formats,
+        self.onNewFileMasks = u'%s;;%s (*.*)' % (file_formats,
             UiStrings().AllFiles)
         self.replaceAction.setText(UiStrings().ReplaceBG)
         self.replaceAction.setToolTip(UiStrings().ReplaceLiveBG)