From 4ce960d0cc433a3c1165423313e56e3d546a3d64 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 07:42:56 +0200 Subject: [PATCH 1/7] do not override the file class --- openlp/core/ui/exceptionform.py | 18 +++++++++--------- openlp/plugins/songs/forms/songimportform.py | 6 +++--- openlp/plugins/songs/lib/easislidesimport.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index ab61ef24d..2521ebaba 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -106,7 +106,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog): """ Saving exception log and system informations to a file. """ - report = unicode(translate('OpenLP.ExceptionForm', + report_text = unicode(translate('OpenLP.ExceptionForm', '**OpenLP Bug Report**\n' 'Version: %s\n\n' '--- Details of the Exception. ---\n\n%s\n\n ' @@ -122,21 +122,21 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog): filename = unicode(QtCore.QDir.toNativeSeparators(filename)) SettingsManager.set_last_dir(self.settingsSection, os.path.dirname( filename)) - report = report % self._createReport() + report_text = report_text % self._createReport() try: - file = open(filename, u'w') + report_file = open(filename, u'w') try: - file.write(report) + report_file.write(report_text) except UnicodeError: - file.close() - file = open(filename, u'wb') - file.write(report.encode(u'utf-8')) + report_file.close() + report_file = open(filename, u'wb') + report_file.write(report_text.encode(u'utf-8')) finally: - file.close() + report_file.close() except IOError: log.exception(u'Failed to write crash report') finally: - file.close() + report_file.close() def onSendReportButtonPressed(self): """ diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 61e9fc7c8..7ef494cf5 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -772,9 +772,9 @@ class SongImportForm(OpenLPWizard): SettingsManager.get_last_dir(self.plugin.settingsSection, 1)) if not filename: return - file = codecs.open(filename, u'w', u'utf-8') - file.write(self.errorReportTextEdit.toPlainText()) - file.close() + report_file = codecs.open(filename, u'w', u'utf-8') + report_file.write(self.errorReportTextEdit.toPlainText()) + report_file.close() def addFileSelectItem(self, prefix, obj_prefix=None, can_disable=False, single_select=False): diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py index 7a370534d..373eb7c42 100644 --- a/openlp/plugins/songs/lib/easislidesimport.py +++ b/openlp/plugins/songs/lib/easislidesimport.py @@ -61,8 +61,8 @@ class EasiSlidesImport(SongImport): """ log.info(u'Importing EasiSlides XML file %s', self.import_source) parser = etree.XMLParser(remove_blank_text=True) - file = etree.parse(self.import_source, parser) - xml = unicode(etree.tostring(file)) + parsed_file = etree.parse(self.import_source, parser) + xml = unicode(etree.tostring(parsed_file)) song_xml = objectify.fromstring(xml) self.import_wizard.progressBar.setMaximum(len(song_xml.Item)) for song in song_xml.Item: From 9a81e8dbe60dc5d43c00a26c430f28706018e584 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 07:46:34 +0200 Subject: [PATCH 2/7] added blank line --- openlp/plugins/songs/lib/importer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py index ab92033c4..8fbbdbeaf 100644 --- a/openlp/plugins/songs/lib/importer.py +++ b/openlp/plugins/songs/lib/importer.py @@ -28,6 +28,7 @@ The :mod:`importer` modules provides the general song import functionality. """ import logging + from opensongimport import OpenSongImport from easislidesimport import EasiSlidesImport from olpimport import OpenLPSongImport From d7ebb73fd1a2a6d12395aaa614ee3f08cb11d30d Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 08:24:35 +0200 Subject: [PATCH 3/7] - do not show an error message when the directory does not exist, instead create items - trivial clean ups --- .../plugins/bibles/forms/bibleupgradeform.py | 43 +++++++++---------- openlp/plugins/bibles/forms/booknameform.py | 8 ++-- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index 0fdcdfd11..9ba7e36d3 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -33,7 +33,8 @@ import shutil from PyQt4 import QtCore, QtGui -from openlp.core.lib import Receiver, SettingsManager, translate +from openlp.core.lib import Receiver, SettingsManager, translate, \ + check_directory_exists from openlp.core.lib.db import delete_database from openlp.core.lib.ui import UiStrings, critical_error_message_box from openlp.core.ui.wizard import OpenLPWizard, WizardStrings @@ -94,7 +95,7 @@ class BibleUpgradeForm(OpenLPWizard): def onCheckBoxIndexChanged(self, index): """ - Show/ Hide warnings if CheckBox state has changed + Show/Hide warnings if CheckBox state has changed """ for number, filename in enumerate(self.files): if not self.checkBox[number].checkState() == QtCore.Qt.Checked: @@ -154,17 +155,19 @@ class BibleUpgradeForm(OpenLPWizard): self.backupDirectoryEdit.setEnabled(not checked) self.backupBrowseButton.setEnabled(not checked) - def backupOldBibles(self, backupdirectory): + def backupOldBibles(self, backup_directory): """ Backup old bible databases in a given folder. """ + check_directory_exists(backup_directory) + success = True for filename in self.files: try: - shutil.copy(os.path.join(self.path, filename[0]), - backupdirectory) + shutil.copy(os.path.join(self.path, filename[0]), + backup_directory) except: - return False - return True + success = False + return success def customInit(self): """ @@ -318,7 +321,7 @@ class BibleUpgradeForm(OpenLPWizard): QtGui.QFormLayout.FieldRole, self.versionNameEdit[number]) self.versionNameEdit[number].setText(bible.get_name()) self.formLayout.addWidget(self.formWidget[number]) - #Set up the Signal for the checkbox + # Set up the Signal for the checkbox. QtCore.QObject.connect(self.checkBox[number], QtCore.SIGNAL(u'stateChanged(int)'), self.onCheckBoxIndexChanged) @@ -414,29 +417,23 @@ class BibleUpgradeForm(OpenLPWizard): return True elif self.currentPage() == self.backupPage: if not self.noBackupCheckBox.checkState() == QtCore.Qt.Checked: - if not unicode(self.backupDirectoryEdit.text()): + backup_path = unicode(self.backupDirectoryEdit.text()) + if not backup_path: critical_error_message_box(UiStrings().EmptyField, translate('BiblesPlugin.UpgradeWizardForm', 'You need to specify a Backup Directory for your ' 'Bibles.')) self.backupDirectoryEdit.setFocus() return False - elif not os.path.exists(unicode( - self.backupDirectoryEdit.text())): - critical_error_message_box(UiStrings().Error, - translate('BiblesPlugin.UpgradeWizardForm', - 'The given path is not an existing directory.')) - self.backupDirectoryEdit.setFocus() - return False else: - if not self.backupOldBibles(unicode( - self.backupDirectoryEdit.text())): + if not self.backupOldBibles(backup_path): critical_error_message_box(UiStrings().Error, - translate('BiblesPlugin.UpgradeWizardForm', - 'The backup was not successfull.\nTo backup your ' - 'Bibles you need the permission to write in the given ' - 'directory. If you have a permissions to write and ' - 'this error still occurs, please report a bug.')) + translate('BiblesPlugin.UpgradeWizardForm', + 'The backup was not successfull.\nTo backup your ' + 'Bibles you need the permission to write in the ' + 'given directory. If you have a permissions to ' + 'write and this error still occurs, please report ' + 'a bug.')) return False return True elif self.currentPage() == self.selectPage: diff --git a/openlp/plugins/bibles/forms/booknameform.py b/openlp/plugins/bibles/forms/booknameform.py index 28e4c9df1..b07f28bf1 100644 --- a/openlp/plugins/bibles/forms/booknameform.py +++ b/openlp/plugins/bibles/forms/booknameform.py @@ -70,15 +70,15 @@ class BookNameForm(QDialog, Ui_BookNameDialog): self.onCheckBoxIndexChanged) def onCheckBoxIndexChanged(self, index): - ''' + """ Reload Combobox if CheckBox state has changed - ''' + """ self.reloadComboBox() def reloadComboBox(self): - ''' + """ Reload the Combobox items - ''' + """ self.correspondingComboBox.clear() items = BiblesResourcesDB.get_books() for item in items: From 5494b20805c6d26261571443853ee5d9a15506fe Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 08:31:22 +0200 Subject: [PATCH 4/7] added more debug --- openlp/core/ui/screen.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py index 2b6e10644..68d4c37ae 100644 --- a/openlp/core/ui/screen.py +++ b/openlp/core/ui/screen.py @@ -79,7 +79,7 @@ class ScreenList(object): ``number`` The number of the screen, which size has changed. """ - log.info(u'screenResolutionChanged %d' % number) + log.info(u'screen_resolution_changed %d' % number) for screen in self.screen_list: if number == screen[u'number']: newScreen = { @@ -104,6 +104,9 @@ class ScreenList(object): ``changed_screen`` The screen's number which has been (un)plugged. """ + # Do not log at start up. + if changed_screen != -1: + log.info(u'screen_count_changed %d' % number) # Remove unplugged screens. for screen in copy.deepcopy(self.screen_list): if screen[u'number'] == self.desktop.numScreens(): @@ -116,8 +119,7 @@ class ScreenList(object): u'size': self.desktop.screenGeometry(number), u'primary': (self.desktop.primaryScreen() == number) }) - # We do not want to send this message, when the method is called the - # first time. + # We do not want to send this message at start up. if changed_screen != -1: # Reload setting tabs to apply possible changes. Receiver.send_message(u'config_screen_changed') From 91718326ea28865305cf1b788f40019351ebddaf Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 08:47:19 +0200 Subject: [PATCH 5/7] removed dangling list --- openlp/plugins/bibles/lib/mediaitem.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 8158465c7..15f5e7bee 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -845,7 +845,8 @@ class BibleMediaItem(MediaManagerItem): service_item.theme = None else: service_item.theme = self.settings.bible_theme - [service_item.add_from_text(slide[:30], slide) for slide in raw_slides] + for slide in raw_slides: + service_item.add_from_text(slide[:30], slide) return True def formatTitle(self, start_bitem, old_bitem): From 6b1f8f36f2623b47a37a14e07a38311becb28cb7 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 11:35:08 +0200 Subject: [PATCH 6/7] fixed spelling --- openlp/plugins/bibles/forms/bibleupgradeform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index 9ba7e36d3..a60fbec8f 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -429,7 +429,7 @@ class BibleUpgradeForm(OpenLPWizard): if not self.backupOldBibles(backup_path): critical_error_message_box(UiStrings().Error, translate('BiblesPlugin.UpgradeWizardForm', - 'The backup was not successfull.\nTo backup your ' + 'The backup was not successful.\nTo backup your ' 'Bibles you need the permission to write in the ' 'given directory. If you have a permissions to ' 'write and this error still occurs, please report ' From b9dfd1f7d22510855782c6c0fcaf6926b4511030 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 1 Jun 2011 14:08:40 +0200 Subject: [PATCH 7/7] more spelling fixes --- openlp/plugins/bibles/forms/bibleupgradeform.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index a60fbec8f..a29ef25d0 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -430,10 +430,9 @@ class BibleUpgradeForm(OpenLPWizard): critical_error_message_box(UiStrings().Error, translate('BiblesPlugin.UpgradeWizardForm', 'The backup was not successful.\nTo backup your ' - 'Bibles you need the permission to write in the ' - 'given directory. If you have a permissions to ' - 'write and this error still occurs, please report ' - 'a bug.')) + 'Bibles you need permission to write to the given ' + 'directory. If you have write permissions and this ' + 'error still occurs, please report a bug.')) return False return True elif self.currentPage() == self.selectPage: