← Back to team overview

openlp-core team mailing list archive

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

 

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-1018855 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1018855 in OpenLP: "Locking OpenLP to KDE-Plasma Task Manager"
  https://bugs.launchpad.net/openlp/+bug/1018855

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-1018855/+merge/122129

Fixed bug #1018855 by adding a simple string property to the Qt arguments which sets the Window Manager class name (WM_CLASS) in X11.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-1018855/+merge/122129
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-1018855 into lp:openlp.
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py	2012-07-19 17:26:04 +0000
+++ openlp/core/__init__.py	2012-08-30 19:32:19 +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.


Follow ups