openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxxxxxxx>]

Phill has proposed merging lp:~phill-ridout/openlp/1204629 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1204629 in OpenLP: "Typing a path for a theme background does not set background"
  https://bugs.launchpad.net/openlp/+bug/1204629

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/1204629/+merge/177032

Fixed #1204629 so that typing an image path actually changes the background.
Made the page validation more robust by including the fileDialog
-- 
https://code.launchpad.net/~phill-ridout/openlp/1204629/+merge/177032
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/1204629 into lp:openlp.

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2013-07-11 20:58:15 +0000
+++ openlp/core/ui/themeform.py	2013-07-25 20:19:30 +0000
@@ -71,6 +71,7 @@
         self.gradientStartButton.clicked.connect(self.onGradientStartButtonClicked)
         self.gradientEndButton.clicked.connect(self.onGradientEndButtonClicked)
         self.imageBrowseButton.clicked.connect(self.onImageBrowseButtonClicked)
+        self.imageFileEdit.editingFinished.connect(self.onImageFileEditEditingFinished)
         self.mainColorButton.clicked.connect(self.onMainColorButtonClicked)
         self.outlineColorButton.clicked.connect(self.onOutlineColorButtonClicked)
         self.shadowColorButton.clicked.connect(self.onShadowColorButtonClicked)
@@ -441,6 +442,12 @@
             self.theme.background_filename = unicode(filename)
         self.setBackgroundPageValues()
 
+    def onImageFileEditEditingFinished(self):
+        """
+        Background image path edited
+        """
+        self.theme.background_filename = unicode(self.imageFileEdit.text())
+
     def onMainColorButtonClicked(self):
         """
         Set the main colour value