openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #634771 in OpenLP: "OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start"
  https://bugs.launchpad.net/openlp/+bug/634771
  Bug #646718 in OpenLP: "Songbook, Number will not loaded, Title will not be saved"
  https://bugs.launchpad.net/openlp/+bug/646718
  Bug #696013 in OpenLP: "song import from powerpoint crashes every second time"
  https://bugs.launchpad.net/openlp/+bug/696013
  Bug #696021 in OpenLP: "presentation loader does not work fine in Windows using Powerpoint Viewer 2007"
  https://bugs.launchpad.net/openlp/+bug/696021
  Bug #696637 in OpenLP: "Alert not positioned correctly in single screen"
  https://bugs.launchpad.net/openlp/+bug/696637
  Bug #727732 in OpenLP: "Openlp 1.9.?? crashes on start"
  https://bugs.launchpad.net/openlp/+bug/727732
  Bug #735039 in OpenLP: "Cannot import PowerPoint Presentations with PowerPoint 2010"
  https://bugs.launchpad.net/openlp/+bug/735039

For more details, see:
https://code.launchpad.net/~j-corwin/openlp/general/+merge/55231

1. Override <sup> so it doesn't adjust the line-spacing for Bible verses
2. Fix problem on Windows where it wasn't exiting properly due to QApplication reference being passed/stored on the mainwindow
3. Disable command-line loading of service files on Windows, since OpenLP isn't able to open executables
-- 
https://code.launchpad.net/~j-corwin/openlp/general/+merge/55231
Your team OpenLP Core is requested to review the proposed merge of lp:~j-corwin/openlp/general into lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2011-03-26 20:28:05 +0000
+++ openlp.pyw	2011-03-28 21:03:44 +0000
@@ -115,7 +115,8 @@
         # make sure Qt really display the splash screen
         self.processEvents()
         # start the main app window
-        self.mainWindow = MainWindow(screens, self)
+        self.mainWindow = MainWindow(screens, self.clipboard(),
+             self.arguments())
         self.mainWindow.show()
         if show_splash:
             # now kill the splashscreen

=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py	2011-03-24 19:04:02 +0000
+++ openlp/core/lib/htmlbuilder.py	2011-03-28 21:03:44 +0000
@@ -85,7 +85,12 @@
 }
 /* lyric css */
 %s
-
+sup {
+    font-size:0.6em;
+    vertical-align:top;
+    position:relative;
+    top:-0.3em;
+}
 </style>
 <script language="javascript">
     var timer = null;

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2011-03-26 19:00:47 +0000
+++ openlp/core/ui/mainwindow.py	2011-03-28 21:03:44 +0000
@@ -469,15 +469,15 @@
 
     actionList = ActionList()
 
-    def __init__(self, screens, application):
+    def __init__(self, screens, clipboard, arguments):
         """
         This constructor sets up the interface, the various managers, and the
         plugins.
         """
         QtGui.QMainWindow.__init__(self)
         self.screens = screens
-
-        self.application = application
+        self.clipboard = clipboard
+        self.arguments = arguments
         # Set up settings sections for the main application
         # (not for use by plugins)
         self.uiSettingsSection = u'user interface'
@@ -661,9 +661,13 @@
         if self.liveController.display.isVisible():
             self.liveController.display.setFocus()
         self.activateWindow()
-        if len(self.application.arguments()) > 0:
+        # On Windows, arguments contains the entire commandline
+        # So args[0]=='python' args[1]=='openlp.pyw'
+        # Therefore this approach is not going to work
+        # Bypass for now.
+        if len(self.arguments) and os.name != u'nt':
             args = []
-            for a in self.application.arguments():
+            for a in self.arguments:
                 args.extend([a])
             self.ServiceManagerContents.loadFile(unicode(args[0]))
         elif QtCore.QSettings().value(

=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py	2011-03-25 17:49:53 +0000
+++ openlp/core/ui/printserviceform.py	2011-03-28 21:03:44 +0000
@@ -184,14 +184,14 @@
         """
         Copies the display text to the clipboard as plain text
         """
-        self.mainWindow.application.clipboard.setText(
+        self.mainWindow.clipboard.setText(
             self.document.toPlainText())
 
     def copyHtmlText(self):
         """
         Copies the display text to the clipboard as Html
         """
-        self.mainWindow.application.clipboard.setText(self.document.toHtml())
+        self.mainWindow.clipboard.setText(self.document.toHtml())
 
     def printServiceOrder(self):
         """