Fix up review comments

openlp/core/lib/renderer.py

@@ -310,7 +310,7 @@ class Renderer(object):
 
     def get_main_rectangle(self, theme):
         """
-        Calculates the placement and size of the main rectangle
+        Calculates the placement and size of the main rectangle.
 
         ``theme``
             The theme information
@@ -323,7 +323,7 @@ class Renderer(object):
 
     def get_footer_rectangle(self, theme):
         """
-        Calculates the placement and size of the main rectangle
+        Calculates the placement and size of the footer rectangle.
 
         ``theme``
             The theme information

openlp/core/lib/serviceitem.py

@@ -364,9 +364,11 @@ class ServiceItem(object):
         """
         self._uuid = other._uuid
         self.notes = other.notes
-        # copy theme over if present.  Assumes overridden
+        # Copy theme over if present.
         if other.theme is not None:
-            self.update_theme(other.theme)
+            self.theme = other.theme
+            self._new_item()
+        self.render()
         if self.is_capable(ItemCapabilities.HasBackgroundAudio):
             log.debug(self.background_audio)
 

openlp/core/ui/themeform.py

@@ -247,8 +247,9 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
 
     def onCustom1ButtonClicked(self, number):
         """
-        Generate layout preview and display the form
+        Generate layout preview and display the form.
         """
+        self.updateTheme()
         width = self.thememanager.mainwindow.renderer.width
         height = self.thememanager.mainwindow.renderer.height
         pixmap = QtGui.QPixmap(width, height)

openlp/plugins/remotes/lib/remotetab.py

@@ -100,7 +100,7 @@ class RemoteTab(SettingsTab):
             'Stage view URL:'))
         self.twelveHourCheckBox.setText(
             translate('RemotePlugin.RemoteTab',
-            'Display stage time in 12hr format'))
+            'Display stage time in 12h format'))
 
     def setUrls(self):
         ipAddress = u'localhost'