Merge lp:~raoul-snyman/openlp/bug-1018855 into lp:openlp

[Raoul Snyman]

Fixed bug #1018855: Set the WM_CLASS property in X11.

Fixed bug #1018855 by adding a simple string property to the Qt arguments which sets the Window Manager class name (WM_CLASS) in X11.

[Tim Bentley (trb143)]

Traceback (most recent call last):
  File "./openlp.pyw", line 44, in <module>
    main()
  File "/home/tim/Projects/openlp/bug-1018855/openlp/core/__init__.py", line 272, in main
    qt_Args.append('OpenLP')
NameError: global name 'qt_Args' is not defined

review: Needs Fixing

[Raoul Snyman (raoul-snyman)]

meh. that's what you get for trying stuff in trunk!

[Tim Bentley (trb143)]

Testing does help ;-)

review: Approve

[lp:~raoul-snyman/openlp/bug-1018855]

2049. By Raoul Snyman on 2012-08-31

Fixed bug #1018855: Set the WM_CLASS property in X11.

=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py	2012-07-19 17:26:04 +0000
+++ openlp/core/__init__.py	2012-08-31 08:44:51 +0000
@@ -35,6 +35,7 @@
 
 import os
 import sys
+import platform
 import logging
 from optparse import OptionParser
 from traceback import format_exception
@@ -266,6 +267,9 @@
         qt_args.extend(['-style', options.style])
     # Throw the rest of the arguments at Qt, just in case.
     qt_args.extend(args)
+    # Bug #1018855: Set the WM_CLASS property in X11
+    if platform.system() not in ['Windows', 'Darwin']:
+        qt_args.append('OpenLP')
     # Initialise the resources
     qInitResources()
     # Now create and actually run the application.