openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/bug-799941 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/bug-799941/+merge/65747

Well still an hour before the deadline!

1. Trap for some missing UNO constants on some systems - Bug 799941
2. Add missing MetaModifier key check in the shortcuts dialog, so hopefully better shortcuts can be set on OS X - Bug 743273

-- 
https://code.launchpad.net/~j-corwin/openlp/bug-799941/+merge/65747
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/bug-799941 into lp:openlp.

=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py	2011-06-12 16:02:52 +0000
+++ openlp/core/ui/shortcutlistform.py	2011-06-23 23:03:37 +0000
@@ -98,6 +98,9 @@
         if event.modifiers() & QtCore.Qt.ShiftModifier == \
             QtCore.Qt.ShiftModifier:
             key_string = u'Shift+' + key_string
+        if event.modifiers() & QtCore.Qt.MetaModifier == \
+            QtCore.Qt.MetaModifier:
+            key_string = u'Meta+' + key_string
         key_sequence = QtGui.QKeySequence(key_string)
         if self._validiate_shortcut(self._currentItemAction(), key_sequence):
             if self.primaryPushButton.isChecked():

=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/oooimport.py	2011-06-23 23:03:37 +0000
@@ -37,14 +37,16 @@
 
 if os.name == u'nt':
     from win32com.client import Dispatch
-    PAGE_BEFORE = 4
-    PAGE_AFTER = 5
-    PAGE_BOTH = 6
     NoConnectException = Exception
 else:
     import uno
     from com.sun.star.connection import NoConnectException
+try:
     from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH
+except ImportError:
+    PAGE_BEFORE = 4
+    PAGE_AFTER = 5
+    PAGE_BOTH = 6
 
 class OooImport(SongImport):
     """

=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/sofimport.py	2011-06-23 23:03:37 +0000
@@ -41,20 +41,23 @@
 log = logging.getLogger(__name__)
 
 if os.name == u'nt':
-    BOLD = 150.0
-    ITALIC = 2
     from oooimport import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH
     RuntimeException = Exception
 else:
     try:
-        from com.sun.star.awt.FontWeight import BOLD
-        from com.sun.star.awt.FontSlant import ITALIC
         from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, \
             PAGE_BOTH
         from com.sun.star.uno import RuntimeException
     except ImportError:
         pass
-
+try:
+    from com.sun.star.awt.FontWeight import BOLD
+except ImportError:
+    BOLD = 150.0
+try:
+    from com.sun.star.awt.FontSlant import ITALIC
+except ImportError:
+   ITALIC = 2
 
 class SofImport(OooImport):
     """