openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/theme into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/theme/+merge/110691

Hello,

    fixed wrong image being kept in cache when aborting the themeform
-- 
https://code.launchpad.net/~googol/openlp/theme/+merge/110691
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/theme into lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2012-06-10 13:39:45 +0000
+++ openlp/core/lib/renderer.py	2012-06-17 16:29:25 +0000
@@ -134,6 +134,7 @@
         else:
             theme_data, main_rect, footer_rect = \
                 self._theme_dimensions[theme_name]
+        self.image_manager.deleteImage(theme_data.theme_name)
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.theme_name,

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2012-06-04 10:47:36 +0000
+++ openlp/core/ui/themeform.py	2012-06-17 16:29:25 +0000
@@ -54,6 +54,7 @@
             The QWidget-derived parent of the wizard.
         """
         QtGui.QWizard.__init__(self, parent)
+        #FIXME: remove self.thememanager and use self.parent() instead.
         self.thememanager = parent
         self.setupUi(self)
         self.registerFields()

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2012-06-15 16:19:46 +0000
+++ openlp/core/ui/thememanager.py	2012-06-17 16:29:25 +0000
@@ -138,13 +138,17 @@
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.configUpdated)
         # Variables
+        #FIXME: convert to camelCase.
         self.theme_list = []
         self.path = AppLocation.get_section_data_path(self.settingsSection)
         check_directory_exists(self.path)
+        #FIXME: convert to camelCase.
         self.thumb_path = os.path.join(self.path, u'thumbnails')
         check_directory_exists(self.thumb_path)
         self.themeForm.path = self.path
+        #FIXME: convert to camelCase.
         self.old_background_image = None
+        #FIXME: convert to camelCase.
         self.bad_v1_name_chars = re.compile(r'[%+\[\]]')
         # Last little bits of setting up
         self.configUpdated()