Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/47353 Fix NGU bible usage - website works fine with ASCII characters so no need to be fancy. Fix theme editing - gradient box was resetting on successive edit runs. - hack was needed because of extra signal handler, remove both the handler and the hack Cleanup a build_icon candidate. -- https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/47353 Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py' --- openlp/core/lib/mediamanageritem.py 2011-01-18 20:15:56 +0000 +++ openlp/core/lib/mediamanageritem.py 2011-01-25 04:46:58 +0000 @@ -98,13 +98,9 @@ visible_title = self.plugin.getString(StringContent.VisibleName) self.title = unicode(visible_title[u'title']) self.settingsSection = self.plugin.name.lower() - if isinstance(icon, QtGui.QIcon): - self.icon = icon - elif isinstance(icon, basestring): - self.icon.addPixmap(QtGui.QPixmap.fromImage(QtGui.QImage(icon)), - QtGui.QIcon.Normal, QtGui.QIcon.Off) - else: - self.icon = None + self.icon = None + if icon: + self.icon = build_icon(icon) self.toolbar = None self.remoteTriggered = None self.serviceItemIconName = None === modified file 'openlp/core/ui/themeform.py' --- openlp/core/ui/themeform.py 2011-01-23 08:25:21 +0000 +++ openlp/core/ui/themeform.py 2011-01-25 04:46:58 +0000 @@ -55,7 +55,6 @@ self.thememanager = parent self.setupUi(self) self.registerFields() - self.accepted = False self.updateThemeAllowed = True QtCore.QObject.connect(self.backgroundComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'), @@ -120,14 +119,12 @@ QtCore.QObject.connect(self.mainFontComboBox, QtCore.SIGNAL(u'activated(int)'), self.calculateLines) - QtCore.QObject.connect(self, QtCore.SIGNAL(u'accepted()'), self.accept) def setDefaults(self): """ Set up display at start of theme edit. """ self.restart() - self.accepted = False self.setBackgroundPageValues() self.setMainAreaPageValues() self.setFooterAreaPageValues() @@ -448,9 +445,10 @@ """ Background gradient Combo box has changed. """ - self.theme.background_direction = \ - BackgroundGradientType.to_string(index) - self.setBackgroundPageValues() + if self.updateThemeAllowed: + self.theme.background_direction = \ + BackgroundGradientType.to_string(index) + self.setBackgroundPageValues() def onColorButtonClicked(self): """ @@ -562,13 +560,8 @@ """ Lets save the them as Finish has been pressed """ - # Some reason getting double submission. - # Hack to stop it for now. - if self.accepted: - return # Save the theme name - self.theme.theme_name = \ - unicode(self.field(u'name').toString()) + self.theme.theme_name = unicode(self.field(u'name').toString()) if not self.theme.theme_name: criticalErrorMessageBox( translate('OpenLP.ThemeForm', 'Theme Name Missing'), @@ -592,7 +585,6 @@ if not self.edit_mode and \ not self.thememanager.checkIfThemeExists(self.theme.theme_name): return - self.accepted = True self.thememanager.saveTheme(self.theme, saveFrom, saveTo) return QtGui.QDialog.accept(self) === modified file 'openlp/plugins/bibles/resources/bibleserver.csv' --- openlp/plugins/bibles/resources/bibleserver.csv 2010-12-17 22:10:29 +0000 +++ openlp/plugins/bibles/resources/bibleserver.csv 2011-01-25 04:46:58 +0000 @@ -19,7 +19,7 @@ King James Version, KJV Luther 1984, LUT Septuaginta, LXX -Neue Genfer Ãbersetzung, NGÃ +Neue Genfer Ãbersetzung, NGU New International Readers Version, NIRV New International Version, NIV Neues Leben, NL
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp