openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/testing into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~meths/openlp/testing/+merge/49507

Typo
Fix overzealous alertTab refactoring.
-- 
https://code.launchpad.net/~meths/openlp/testing/+merge/49507
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/testing into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-02-11 04:04:05 +0000
+++ openlp/core/ui/maindisplay.py	2011-02-12 16:16:14 +0000
@@ -65,6 +65,7 @@
         self.parent = parent
         self.screens = screens
         self.isLive = live
+        self.alertTab = None
         self.hideMode = None
         self.override = {}
         mainIcon = build_icon(u':/icon/openlp-logo-16x16.png')
@@ -144,7 +145,7 @@
             serviceItem = ServiceItem()
             serviceItem.bg_image_bytes = image_to_byte(initialFrame)
             self.webView.setHtml(build_html(serviceItem, self.screen,
-                self.parent.alertTab, self.isLive, None))
+                self.alertTab, self.isLive, None))
             self.initialFrame = True
             # To display or not to display?
             if not self.screen[u'primary']:
@@ -405,7 +406,7 @@
         if self.serviceItem.themedata.background_filename:
             self.serviceItem.bg_image_bytes = self.imageManager. \
                 get_image_bytes(self.serviceItem.themedata.theme_name)
-        html = build_html(self.serviceItem, self.screen, self.parent.alertTab,
+        html = build_html(self.serviceItem, self.screen, self.alertTab,
             self.isLive, background)
         log.debug(u'buildHtml - pre setHtml')
         self.webView.setHtml(html)

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-02-11 17:28:14 +0000
+++ openlp/core/ui/slidecontroller.py	2011-02-12 16:16:14 +0000
@@ -415,6 +415,7 @@
         # rebuild display as screen size changed
         self.display = MainDisplay(self, self.screens, self.isLive)
         self.display.imageManager = self.parent.renderManager.image_manager
+        self.display.alertTab = self.alertTab
         self.display.setup()
         if self.isLive:
             self.__addActionsToWidget(self.display)

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2011-02-11 17:55:41 +0000
+++ openlp/core/utils/__init__.py	2011-02-12 16:16:14 +0000
@@ -184,7 +184,7 @@
             elif dir_type == AppLocation.CacheDir:
                 return os.path.join(BaseDirectory.xdg_cache_home, u'openlp')
         if dir_type == AppLocation.DataDir:
-            return os.path.join(os.getenv(u'HOME'), u'openlp', u'data')
+            return os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
         return os.path.join(os.getenv(u'HOME'), u'.openlp')
 
 def _get_frozen_path(frozen_option, non_frozen_option):