diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 93512f946..899b5cf73 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -146,7 +146,7 @@ def resize_image(image, width, height): preview = QtGui.QImage(image) preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) - realw = preview.width(); + realw = preview.width() realh = preview.height() # and move it to the centre of the preview space newImage = QtGui.QImage(width, height, QtGui.QImage.Format_ARGB32_Premultiplied) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index cc976dae5..03b53eca8 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -406,8 +406,8 @@ class Renderer(object): Defaults to *False*. Whether or not this is a live screen. """ x, y = tlcorner - maxx = self._rect.width(); - maxy = self._rect.height(); + maxx = self._rect.width() + maxy = self._rect.height() lines = [] lines.append(line) startx = x @@ -415,11 +415,11 @@ class Renderer(object): rightextent = None self.painter = QtGui.QPainter() self.painter.begin(self._frame) - self.painter.setRenderHint(QtGui.QPainter.Antialiasing); + self.painter.setRenderHint(QtGui.QPainter.Antialiasing) if self._theme.display_slideTransition: self.painter2 = QtGui.QPainter() self.painter2.begin(self._frameOp) - self.painter2.setRenderHint(QtGui.QPainter.Antialiasing); + self.painter2.setRenderHint(QtGui.QPainter.Antialiasing) self.painter2.setOpacity(0.7) # dont allow alignment messing with footers if footer: @@ -458,7 +458,7 @@ class Renderer(object): x = maxx - w # centre elif align == 2: - x = (maxx - w) / 2; + x = (maxx - w) / 2 rightextent = x + w if live: # now draw the text, and any outlines/shadows diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index bdb396498..2671732ec 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -65,7 +65,7 @@ class DisplayWidget(QtGui.QWidget): Receiver.send_message(u'live_slidecontroller_last') event.accept() elif event.key() in self.hotkey_map: - Receiver.send_message(self.hotkey_map[event.key()]); + Receiver.send_message(self.hotkey_map[event.key()]) event.accept() elif event.key() == QtCore.Qt.Key_Escape: self.resetDisplay() diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index e88699b71..c21afa4f5 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui from PyQt4.phonon import Phonon from openlp.core.lib import OpenLPToolbar, Receiver, str_to_bool, \ -PluginConfig, resize_image + PluginConfig, resize_image class SlideList(QtGui.QTableWidget): """ @@ -63,7 +63,7 @@ class SlideList(QtGui.QTableWidget): self.parent.onSlideSelectedLast() event.accept() elif event.key() in self.hotkey_map and self.parent.isLive: - Receiver.send_message(self.hotkey_map[event.key()]); + Receiver.send_message(self.hotkey_map[event.key()]) event.accept() event.ignore() else: diff --git a/openlp/migration/display.py b/openlp/migration/display.py index 9a3f6e44e..f427c5fb6 100644 --- a/openlp/migration/display.py +++ b/openlp/migration/display.py @@ -32,11 +32,11 @@ class Display(): @staticmethod def output(string): - log.debug(string); - print (string) + log.debug(string) + #print (string) @staticmethod def sub_output(string): if not string is None: - log.debug(u' '+string); - print (u' '+string) \ No newline at end of file + log.debug(u' '+string) + #print (u' '+string) diff --git a/openlp/migration/migratebibles.py b/openlp/migration/migratebibles.py index 92504e907..f9e10b756 100644 --- a/openlp/migration/migratebibles.py +++ b/openlp/migration/migratebibles.py @@ -28,5 +28,5 @@ class MigrateBibles(): self.display = display def process(self): - self.display.output(u'Bible process started'); - self.display.output(u'Bible process finished'); \ No newline at end of file + self.display.output(u'Bible process started') + self.display.output(u'Bible process finished') \ No newline at end of file diff --git a/openlp/migration/migratefiles.py b/openlp/migration/migratefiles.py index 9c38fbb88..f1c9435ab 100644 --- a/openlp/migration/migratefiles.py +++ b/openlp/migration/migratefiles.py @@ -30,20 +30,20 @@ class MigrateFiles(): self.display = display def process(self): - self.display.output(u'Files process started'); + self.display.output(u'Files process started') self._initial_setup() - self.display.output(u'Files process finished'); + self.display.output(u'Files process finished') def _initial_setup(self): - self.display.output(u'Initial Setup started'); + self.display.output(u'Initial Setup started') ConfigHelper.get_data_path() - self.display.sub_output(u'Config created'); + self.display.sub_output(u'Config created') ConfigHelper.get_config(u'bible', u'data path') - self.display.sub_output(u'Config created'); + self.display.sub_output(u'Config created') ConfigHelper.get_config(u'videos', u'data path') - self.display.sub_output(u'videos created'); + self.display.sub_output(u'videos created') ConfigHelper.get_config(u'images', u'data path') - self.display.sub_output(u'images created'); + self.display.sub_output(u'images created') ConfigHelper.get_config(u'presentations', u'data path') - self.display.sub_output(u'presentations created'); - self.display.output(u'Initial Setup finished'); \ No newline at end of file + self.display.sub_output(u'presentations created') + self.display.output(u'Initial Setup finished') \ No newline at end of file diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index 2ed457fc0..56372e352 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -110,7 +110,7 @@ class PptviewController(PresentationController): rendermanager = self.plugin.render_manager rect = rendermanager.screens.current[u'size'] rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom()) - filepath = str(presentation.replace(u'/', u'\\')); + filepath = str(presentation.replace(u'/', u'\\')) try: self.pptid = self.process.OpenPPT(filepath, None, rect, str(os.path.join(self.thumbnailpath, self.thumbnailprefix))) diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 5730e8c56..643676ff6 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -51,10 +51,10 @@ class Ui_SongMaintenanceDialog(object): self.TypeListWidget.sizePolicy().hasHeightForWidth()) self.TypeListWidget.setSizePolicy(sizePolicy) self.TypeListWidget.setViewMode(QtGui.QListView.IconMode) - self.TypeListWidget.setIconSize(QtCore.QSize(112, 100)); - self.TypeListWidget.setMovement(QtGui.QListView.Static); - self.TypeListWidget.setMaximumWidth(118); - self.TypeListWidget.setSpacing(0); + self.TypeListWidget.setIconSize(QtCore.QSize(112, 100)) + self.TypeListWidget.setMovement(QtGui.QListView.Static) + self.TypeListWidget.setMaximumWidth(118) + self.TypeListWidget.setSpacing(0) self.TypeListWidget.setSortingEnabled(False) self.TypeListWidget.setUniformItemSizes(True) self.TypeListWidget.setObjectName(u'TypeListWidget')