openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/beta1 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #742636 in OpenLP: "Leading spaces in song titles are stripped"
  https://bugs.launchpad.net/openlp/+bug/742636
  Bug #775534 in OpenLP: "Display window is initially the same size as the primary screen, despite being on the secondary screen"
  https://bugs.launchpad.net/openlp/+bug/775534

For more details, see:
https://code.launchpad.net/~trb143/openlp/beta1/+merge/62403

add 2 more busy tags
sort the 3 missing plugs so list are in order.
-- 
https://code.launchpad.net/~trb143/openlp/beta1/+merge/62403
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/beta1 into lp:openlp.

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2011-05-24 20:47:05 +0000
+++ openlp/core/ui/servicemanager.py	2011-05-26 04:53:24 +0000
@@ -1109,6 +1109,7 @@
         """
         Send the current item to the Preview slide controller
         """
+        Receiver.send_message(u'cursor_busy')
         item, child = self.findServiceItem()
         if self.serviceItems[item][u'service_item'].is_valid:
             self.mainwindow.previewController.addServiceManagerItem(
@@ -1118,6 +1119,7 @@
                 translate('OpenLP.ServiceManager', 'Missing Display Handler'),
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
                 'displayed as there is no handler to display it'))
+        Receiver.send_message(u'cursor_normal')
 
     def getServiceItem(self):
         """
@@ -1150,6 +1152,7 @@
             return
         if row != -1:
             child = row
+        Receiver.send_message(u'cursor_busy')
         if self.serviceItems[item][u'service_item'].is_valid:
             self.mainwindow.liveController.addServiceManagerItem(
                 self.serviceItems[item][u'service_item'], child)
@@ -1169,6 +1172,7 @@
                 translate('OpenLP.ServiceManager', 'Your item cannot be '
                 'displayed as the plugin required to display it is missing '
                 'or inactive'))
+        Receiver.send_message(u'cursor_normal')
 
     def remoteEdit(self):
         """

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2011-05-24 20:47:05 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2011-05-26 04:53:24 +0000
@@ -27,6 +27,7 @@
 
 import logging
 import os
+import locale
 
 from PyQt4 import QtCore, QtGui
 
@@ -112,6 +113,10 @@
     def loadList(self, list, initialLoad=False):
         if not initialLoad:
             self.parent.formparent.displayProgressBar(len(list))
+        # Sort the themes by its filename considering language specific
+        # characters. lower() is needed for windows!
+        list.sort(cmp=locale.strcoll,
+            key=lambda filename: os.path.split(unicode(filename))[1].lower())
         for imageFile in list:
             if not initialLoad:
                 self.parent.formparent.incrementProgressBar()

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2011-05-24 20:47:05 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2011-05-26 04:53:24 +0000
@@ -28,6 +28,7 @@
 from datetime import datetime
 import logging
 import os
+import locale
 
 from PyQt4 import QtCore, QtGui
 
@@ -202,6 +203,10 @@
                 self.settingsSection, self.getFileList())
 
     def loadList(self, list):
+        # Sort the themes by its filename considering language specific
+        # characters. lower() is needed for windows!
+        list.sort(cmp=locale.strcoll,
+            key=lambda filename: os.path.split(unicode(filename))[1].lower())
         for file in list:
             filename = os.path.split(unicode(file))[1]
             item_name = QtGui.QListWidgetItem(filename)

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2011-05-24 20:53:41 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2011-05-26 04:53:24 +0000
@@ -27,6 +27,7 @@
 
 import logging
 import os
+import locale
 
 from PyQt4 import QtCore, QtGui
 
@@ -161,6 +162,10 @@
         Receiver.send_message(u'cursor_busy')
         if not initialLoad:
             self.parent.formparent.displayProgressBar(len(files))
+        # Sort the themes by its filename considering language specific
+        # characters. lower() is needed for windows!
+        files.sort(cmp=locale.strcoll,
+            key=lambda filename: os.path.split(unicode(filename))[1].lower())
         for file in files:
             if not initialLoad:
                 self.parent.formparent.incrementProgressBar()