openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #692684 Theme Wizard not updating
  https://bugs.launchpad.net/bugs/692684

-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/44279
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.

=== modified file 'openlp/core/lib/imagemanager.py'
--- openlp/core/lib/imagemanager.py	2010-12-02 14:37:38 +0000
+++ openlp/core/lib/imagemanager.py	2010-12-20 20:34:55 +0000
@@ -113,6 +113,14 @@
                 time.sleep(0.1)
         return self._cache[name].image_bytes
 
+    def del_image(self, name):
+        """
+        Delete the Image from the Cache
+        """
+        log.debug(u'del_image %s' % name)
+        if name in self._cache:
+            del self._cache[name]
+
     def add_image(self, name, path):
         """
         Add image to cache if it is not already there
@@ -125,6 +133,8 @@
             image.image = resize_image(path,
                 self.width, self.height)
             self._cache[name] = image
+        else:
+            log.debug(u'Image in cache %s:%s' % (name, path))
         self._cache_dirty = True
         # only one thread please
         if not self._thread_running:

=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py	2010-11-24 21:50:51 +0000
+++ openlp/core/lib/rendermanager.py	2010-12-20 20:34:55 +0000
@@ -213,6 +213,8 @@
         # make big page for theme edit dialog to get line count
         if self.force_page:
             verse = verse + verse + verse
+        else:
+            self.image_manager.del_image(self.theme_data.theme_name)
         footer = []
         footer.append(u'Arky Arky (Unknown)' )
         footer.append(u'Public Domain')

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-12-11 20:49:50 +0000
+++ openlp/core/ui/slidecontroller.py	2010-12-20 20:34:55 +0000
@@ -560,7 +560,7 @@
             [serviceItem, self.isLive, blanked, slideno])
         self.slideList = {}
         width = self.parent.ControlSplitter.sizes()[self.split]
-        # Set pointing cursor when we have somthing to point at
+        # Set pointing cursor when we have something to point at
         self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor)
         self.serviceItem = serviceItem
         self.PreviewListWidget.clear()

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2010-12-07 17:28:46 +0000
+++ openlp/core/ui/themeform.py	2010-12-20 20:34:55 +0000
@@ -444,7 +444,7 @@
 
     def setPreviewTabValues(self):
         self.setField(u'name', QtCore.QVariant(self.theme.theme_name))
-        if len(self.theme.theme_name) > 1:
+        if len(self.theme.theme_name) > 0:
             self.themeNameEdit.setEnabled(False)
         else:
             self.themeNameEdit.setEnabled(True)

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2010-11-27 15:25:00 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2010-12-20 20:34:55 +0000
@@ -31,7 +31,7 @@
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
     context_menu_action, ItemCapabilities, SettingsManager, translate, \
-    check_item_selected
+    check_item_selected, Receiver
 from openlp.core.utils import AppLocation, get_images_filter
 
 log = logging.getLogger(__name__)
@@ -139,6 +139,8 @@
                 self.settingsSection, self.getFileList())
 
     def loadList(self, list):
+        self.listView.setCursor(QtCore.Qt.BusyCursor)
+        Receiver.send_message(u'openlp_process_events')
         for file in list:
             filename = os.path.split(unicode(file))[1]
             thumb = os.path.join(self.servicePath, filename)
@@ -153,6 +155,8 @@
             item_name.setIcon(icon)
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
             self.listView.addItem(item_name)
+        self.listView.setCursor(QtCore.Qt.ArrowCursor)
+        Receiver.send_message(u'openlp_process_events')
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False):
         items = self.listView.selectedIndexes()