From 47edd31b58b46ef847dba47610b01b3d07644476 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 24 Oct 2009 13:12:10 +0200 Subject: [PATCH 1/3] Let's try fix the version check message. --- openlp/core/ui/mainwindow.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index c768210a0..a9d86155d 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -529,10 +529,11 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595') version = check_latest_version(self.generalConfig, applicationVersion) if applicationVersion != version: + version_text = self.trUtf8(u'OpenLP version %s has been updated ' + u'to version %s') QtGui.QMessageBox.question(None, - self.trUtf8(u'OpenLP version Updated'), - self.trUtf8(u'OpenLP version %s has been updated to version %s') - % (applicationVersion, version), + self.trUtf8(u'OpenLP Version Updated'), + version_text % (applicationVersion, version), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.Ok) self.generalConfig.set_config(u'Application version', version) From 803987d40289fcaebaab59eaccac9d59121eafda Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 24 Oct 2009 13:14:26 +0200 Subject: [PATCH 2/3] Not quite - I needed to cast it to unicode. --- openlp/core/ui/mainwindow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index a9d86155d..7d00e9890 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -529,8 +529,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595') version = check_latest_version(self.generalConfig, applicationVersion) if applicationVersion != version: - version_text = self.trUtf8(u'OpenLP version %s has been updated ' - u'to version %s') + version_text = unicode(self.trUtf8(u'OpenLP version %s has been updated ' + u'to version %s')) QtGui.QMessageBox.question(None, self.trUtf8(u'OpenLP Version Updated'), version_text % (applicationVersion, version), From 08c852f8eec17aa8998e31d33f5d9fb2259005bf Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 24 Oct 2009 13:46:57 +0200 Subject: [PATCH 3/3] Fixed problem in "AmendThemForm" --- openlp/core/ui/amendthemeform.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index 82afbd332..115f4d522 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -674,7 +674,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.theme.font_main_italics)# italic metrics = QtGui.QFontMetrics(mainFont) page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2) - 1 - self.FontMainLinesPageLabel.setText( - self.trUtf8(u'Slide Height is %s rows') % page_length) + page_length_text = unicode(self.trUtf8(u'Slide Height is %s rows')) + self.FontMainLinesPageLabel.setText(page_length_text % page_length) frame = self.thememanager.generateImage(theme) self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))