openlp-core team mailing list archive

[rimach <crichter@xxxxxx>]

rimach has proposed merging lp:~crichter/openlp/bugfixing into lp:openlp.

Requested reviews:
  Jon Tibble (meths)

For more details, see:
https://code.launchpad.net/~crichter/openlp/bugfixing/+merge/49865

- change call for openoffice to soffice (additionally " are necessary for libreoffice")
-> so hopefully it will work for all versions of OpenOffice and also LibreOffice
- add alternate shortcut display
- little correction for shortcut addition

- correct indentation
- replace thumbnail creation for powerpoint slides, because of at other languages of Powerpoint the export function creates other titles for slides (eg. in german: "Folie1.png" instead of "slide1.png"
- check that PptView exist when docs shall be removed.
-- 
https://code.launchpad.net/~crichter/openlp/bugfixing/+merge/49865
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/shortcutlistdialog.py'
--- openlp/core/ui/shortcutlistdialog.py	2011-01-16 20:54:31 +0000
+++ openlp/core/ui/shortcutlistdialog.py	2011-02-15 19:49:13 +0000
@@ -36,7 +36,7 @@
         self.treeWidget = QtGui.QTreeWidget(shortcutListDialog)
         self.treeWidget.setAlternatingRowColors(True)
         self.treeWidget.setObjectName(u'treeWidget')
-        self.treeWidget.setColumnCount(2)
+        self.treeWidget.setColumnCount(3)
         self.dialogLayout.addWidget(self.treeWidget)
         self.defaultButton = QtGui.QRadioButton(shortcutListDialog)
         self.defaultButton.setChecked(True)
@@ -78,7 +78,8 @@
             translate('OpenLP.ShortcutListDialog', 'Customize Shortcuts'))
         self.treeWidget.setHeaderLabels([
             translate('OpenLP.ShortcutListDialog', 'Action'),
-            translate('OpenLP.ShortcutListDialog', 'Shortcut')])
+            translate('OpenLP.ShortcutListDialog', 'Shortcut'), 
+            translate('OpenLP.ShortcutListDialog', 'Alternate')])
         self.defaultButton.setText(
             translate('OpenLP.ShortcutListDialog', 'Default: %s'))
         self.customButton.setText(

=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py	2011-01-15 22:50:25 +0000
+++ openlp/core/ui/shortcutlistform.py	2011-02-15 19:49:13 +0000
@@ -95,8 +95,13 @@
             item = QtGui.QTreeWidgetItem([category.name])
             for action in category.actions:
                 actionText = REMOVE_AMPERSAND.sub('', unicode(action.text()))
-                shortcutText = action.shortcut().toString()
-                actionItem = QtGui.QTreeWidgetItem([actionText, shortcutText])
+                if (len(action.shortcuts()) == 2):
+                    shortcutText = action.shortcuts()[0].toString()
+                    alternateText = action.shortcuts()[1].toString()
+                else:
+                    shortcutText = action.shortcut().toString()
+                    alternateText = u''
+                actionItem = QtGui.QTreeWidgetItem([actionText, shortcutText, alternateText])
                 actionItem.setIcon(0, action.icon())
                 item.addChild(actionItem)
             item.setExpanded(True)

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-02-12 16:07:11 +0000
+++ openlp/core/ui/slidecontroller.py	2011-02-15 19:49:13 +0000
@@ -380,7 +380,7 @@
         self.previousItem.setShortcuts([QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp])
         self.previousItem.setShortcutContext(
             QtCore.Qt.WidgetWithChildrenShortcut)
-        actionList.add_action(self.nextItem, u'Live')
+        actionList.add_action(self.previousItem, u'Live')
         self.nextItem.setShortcuts([QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown])
         self.nextItem.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)
         actionList.add_action(self.nextItem, u'Live')

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2011-02-15 18:56:40 +0000
+++ openlp/core/utils/__init__.py	2011-02-15 19:49:13 +0000
@@ -382,13 +382,13 @@
     """
     Returns the UNO command to launch an openoffice.org instance.
     """
+    COMMAND = u'soffice'
+    OPTIONS = u'-nologo -norestore -minimized -invisible -nofirststartwizard'
     if UNO_CONNECTION_TYPE == u'pipe':
-        return u'openoffice.org -nologo -norestore -minimized -invisible ' \
-            + u'-nofirststartwizard -accept=pipe,name=openlp_pipe;urp;'
+        CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
     else:
-        return u'openoffice.org -nologo -norestore -minimized ' \
-            + u'-invisible -nofirststartwizard ' \
-            + u'-accept=socket,host=localhost,port=2002;urp;'
+        CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"' 
+    return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION)
 
 def get_uno_instance(resolver):
     """

=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py	2011-02-07 19:37:07 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py	2011-02-15 19:49:13 +0000
@@ -147,8 +147,10 @@
         """
         if self.check_thumbnails():
             return
-        self.presentation.Export(os.path.join(self.get_thumbnail_folder(), ''),
-            'png', 320, 240)
+        for num in range(0, self.presentation.Slides.Count):
+            self.presentation.Slides(num + 1).Export(os.path.join(
+                self.get_thumbnail_folder(), 'slide%d.png' % (num + 1)),
+                'png', 320, 240)
 
     def close_presentation(self):
         """

=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py	2011-02-07 19:37:07 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py	2011-02-15 19:49:13 +0000
@@ -154,8 +154,9 @@
         being shut down
         """
         log.debug(u'ClosePresentation')
-        self.controller.process.ClosePPT(self.pptid)
-        self.pptid = -1
+        if self.controller.process:
+            self.controller.process.ClosePPT(self.pptid)
+            self.pptid = -1
         self.controller.remove_doc(self)
 
     def is_loaded(self):