r1649

openlp/core/lib/htmlbuilder.py

@@ -486,11 +486,11 @@ def build_lyrics_css(item, webkitvers):
         # Before 533.3 the webkit-text-fill colour wasn't displayed, only the
         # stroke (outline) color. So put stroke layer underneath the main text.
         #
-        # Before 534.4 the webkit-text-stroke was sometimes out of alignment
+        # Up to 534.3 the webkit-text-stroke was sometimes out of alignment
         # with the fill, or normal text. letter-spacing=1 is workaround
         # https://bugs.webkit.org/show_bug.cgi?id=44403
         #
-        # Before 534.4 the text-shadow didn't get displayed when
+        # Up to 534.3 the text-shadow didn't get displayed when
         # webkit-text-stroke was used. So use an offset text layer underneath.
         # https://bugs.webkit.org/show_bug.cgi?id=19728
         if webkitvers >= 533.3:
@@ -498,7 +498,7 @@ def build_lyrics_css(item, webkitvers):
         else:
             outline = build_lyrics_outline_css(theme)
         if theme.font_main_shadow:
-            if theme.font_main_outline and webkitvers < 534.3:
+            if theme.font_main_outline and webkitvers <= 534.3:
                 shadow = u'padding-left: %spx; padding-top: %spx;' % \
                     (int(theme.font_main_shadow_size) +
                     (int(theme.font_main_outline_size) * 2),
@@ -564,7 +564,7 @@ def build_lyrics_format_css(theme, width, height):
         theme.font_main_color, 100 + int(theme.font_main_line_adjustment),
         left_margin, width, height)
     if theme.font_main_outline:
-        if webkit_version() < 534.3:
+        if webkit_version() <= 534.3:
             lyrics += u' letter-spacing: 1px;'
     if theme.font_main_italics:
         lyrics += u' font-style:italic; '
@@ -588,7 +588,7 @@ def build_lyrics_html(item, webkitvers):
     # display:table/display:table-cell are required for each lyric block.
     lyrics = u''
     theme = item.themedata
-    if webkitvers < 534.4 and theme and theme.font_main_outline:
+    if webkitvers <= 534.3 and theme and theme.font_main_outline:
         lyrics += u'<div class="lyricstable">' \
             u'<div id="lyricsshadow" style="opacity:1" ' \
             u'class="lyricscell lyricsshadow"></div></div>'

openlp/core/ui/maindisplay.py

@@ -62,7 +62,8 @@ class MainDisplay(QtGui.QGraphicsView):
         self.firstTime = True
         self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
         self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
-            QtCore.Qt.WindowStaysOnTopHint)
+            QtCore.Qt.WindowStaysOnTopHint |
+            QtCore.Qt.X11BypassWindowManagerHint)
         self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
         if self.isLive:
             QtCore.QObject.connect(Receiver.get_receiver(),

openlp/core/ui/mainwindow.py

@@ -27,6 +27,7 @@
 
 import logging
 import os
+import sys
 from tempfile import gettempdir
 
 from PyQt4 import QtCore, QtGui
@@ -291,10 +292,18 @@ class Ui_MainWindow(object):
         # i18n add Language Actions
         add_actions(self.settingsLanguageMenu, (self.autoLanguageItem, None))
         add_actions(self.settingsLanguageMenu, self.languageGroup.actions())
-        add_actions(self.settingsMenu, (self.settingsPluginListItem,
-            self.settingsLanguageMenu.menuAction(), None,
-            self.displayTagItem, self.settingsShortcutsItem,
-            self.settingsConfigureItem))
+        # Order things differently in OS X so that Preferences menu item in the
+        # app menu is correct (this gets picked up automatically by Qt).
+        if sys.platform == u'darwin':
+            add_actions(self.settingsMenu, (self.settingsPluginListItem,
+                self.settingsLanguageMenu.menuAction(), None,
+                self.settingsConfigureItem, self.settingsShortcutsItem,
+                self.displayTagItem))
+        else:
+            add_actions(self.settingsMenu, (self.settingsPluginListItem,
+                self.settingsLanguageMenu.menuAction(), None,
+                self.displayTagItem, self.settingsShortcutsItem,
+                self.settingsConfigureItem))
         add_actions(self.toolsMenu, (self.toolsAddToolItem, None))
         add_actions(self.toolsMenu, (self.toolsOpenDataFolder, None))
         add_actions(self.toolsMenu, [self.updateThemeImages])