raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove C-style semi-colons

This commit is contained in:
Jon Tibble 2010-02-26 23:47:59 +00:00
parent e0875fa90e
commit 2185f4e842
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/__init__.py
View File

@ -146,7 +146,7 @@ def resize_image(image, width, height):
preview = QtGui.QImage(image) preview = QtGui.QImage(image)
preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio, preview = preview.scaled(width, height, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation) QtCore.Qt.SmoothTransformation)
realw = preview.width(); realw = preview.width()
realh = preview.height() realh = preview.height()
# and move it to the centre of the preview space # and move it to the centre of the preview space
newImage = QtGui.QImage(width, height, QtGui.QImage.Format_ARGB32_Premultiplied) newImage = QtGui.QImage(width, height, QtGui.QImage.Format_ARGB32_Premultiplied)

10
openlp/core/lib/renderer.py
View File

@ -406,8 +406,8 @@ class Renderer(object):
Defaults to *False*. Whether or not this is a live screen. Defaults to *False*. Whether or not this is a live screen.
""" """
x, y = tlcorner x, y = tlcorner
maxx = self._rect.width(); maxx = self._rect.width()
maxy = self._rect.height(); maxy = self._rect.height()
lines = [] lines = []
lines.append(line) lines.append(line)
startx = x startx = x
@ -415,11 +415,11 @@ class Renderer(object):
rightextent = None rightextent = None
self.painter = QtGui.QPainter() self.painter = QtGui.QPainter()
self.painter.begin(self._frame) self.painter.begin(self._frame)
self.painter.setRenderHint(QtGui.QPainter.Antialiasing); self.painter.setRenderHint(QtGui.QPainter.Antialiasing)
if self._theme.display_slideTransition: if self._theme.display_slideTransition:
self.painter2 = QtGui.QPainter() self.painter2 = QtGui.QPainter()
self.painter2.begin(self._frameOp) self.painter2.begin(self._frameOp)
self.painter2.setRenderHint(QtGui.QPainter.Antialiasing); self.painter2.setRenderHint(QtGui.QPainter.Antialiasing)
self.painter2.setOpacity(0.7) self.painter2.setOpacity(0.7)
# dont allow alignment messing with footers # dont allow alignment messing with footers
if footer: if footer:
@ -458,7 +458,7 @@ class Renderer(object):
x = maxx - w x = maxx - w
# centre # centre
elif align == 2: elif align == 2:
x = (maxx - w) / 2; x = (maxx - w) / 2
rightextent = x + w rightextent = x + w
if live: if live:
# now draw the text, and any outlines/shadows # now draw the text, and any outlines/shadows

2
openlp/core/ui/maindisplay.py
View File

@ -65,7 +65,7 @@ class DisplayWidget(QtGui.QWidget):
Receiver.send_message(u'live_slidecontroller_last') Receiver.send_message(u'live_slidecontroller_last')
event.accept() event.accept()
elif event.key() in self.hotkey_map: 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() event.accept()
elif event.key() == QtCore.Qt.Key_Escape: elif event.key() == QtCore.Qt.Key_Escape:
self.resetDisplay() self.resetDisplay()

2
openlp/core/ui/slidecontroller.py
View File

@ -63,7 +63,7 @@ class SlideList(QtGui.QTableWidget):
self.parent.onSlideSelectedLast() self.parent.onSlideSelectedLast()
event.accept() event.accept()
elif event.key() in self.hotkey_map and self.parent.isLive: 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.accept()
event.ignore() event.ignore()
else: else:

8
openlp/migration/display.py
View File

@ -32,11 +32,11 @@ class Display():
@staticmethod @staticmethod
def output(string): def output(string):
log.debug(string); log.debug(string)
print (string) #print (string)
@staticmethod @staticmethod
def sub_output(string): def sub_output(string):
if not string is None: if not string is None:
log.debug(u' '+string); log.debug(u' '+string)
print (u' '+string) #print (u' '+string)

4
openlp/migration/migratebibles.py
View File

@ -28,5 +28,5 @@ class MigrateBibles():
self.display = display self.display = display
def process(self): def process(self):
self.display.output(u'Bible process started'); self.display.output(u'Bible process started')
self.display.output(u'Bible process finished'); self.display.output(u'Bible process finished')

18
openlp/migration/migratefiles.py
View File

@ -30,20 +30,20 @@ class MigrateFiles():
self.display = display self.display = display
def process(self): def process(self):
self.display.output(u'Files process started'); self.display.output(u'Files process started')
self._initial_setup() self._initial_setup()
self.display.output(u'Files process finished'); self.display.output(u'Files process finished')
def _initial_setup(self): def _initial_setup(self):
self.display.output(u'Initial Setup started'); self.display.output(u'Initial Setup started')
ConfigHelper.get_data_path() 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') 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') 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') 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') ConfigHelper.get_config(u'presentations', u'data path')
self.display.sub_output(u'presentations created'); self.display.sub_output(u'presentations created')
self.display.output(u'Initial Setup finished'); self.display.output(u'Initial Setup finished')

2
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -110,7 +110,7 @@ class PptviewController(PresentationController):
rendermanager = self.plugin.render_manager rendermanager = self.plugin.render_manager
rect = rendermanager.screens.current[u'size'] rect = rendermanager.screens.current[u'size']
rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom()) rect = RECT(rect.x(), rect.y(), rect.right(), rect.bottom())
filepath = str(presentation.replace(u'/', u'\\')); filepath = str(presentation.replace(u'/', u'\\'))
try: try:
self.pptid = self.process.OpenPPT(filepath, None, rect, self.pptid = self.process.OpenPPT(filepath, None, rect,
str(os.path.join(self.thumbnailpath, self.thumbnailprefix))) str(os.path.join(self.thumbnailpath, self.thumbnailprefix)))

8
openlp/plugins/songs/forms/songmaintenancedialog.py
View File

@ -51,10 +51,10 @@ class Ui_SongMaintenanceDialog(object):
self.TypeListWidget.sizePolicy().hasHeightForWidth()) self.TypeListWidget.sizePolicy().hasHeightForWidth())
self.TypeListWidget.setSizePolicy(sizePolicy) self.TypeListWidget.setSizePolicy(sizePolicy)
self.TypeListWidget.setViewMode(QtGui.QListView.IconMode) self.TypeListWidget.setViewMode(QtGui.QListView.IconMode)
self.TypeListWidget.setIconSize(QtCore.QSize(112, 100)); self.TypeListWidget.setIconSize(QtCore.QSize(112, 100))
self.TypeListWidget.setMovement(QtGui.QListView.Static); self.TypeListWidget.setMovement(QtGui.QListView.Static)
self.TypeListWidget.setMaximumWidth(118); self.TypeListWidget.setMaximumWidth(118)
self.TypeListWidget.setSpacing(0); self.TypeListWidget.setSpacing(0)
self.TypeListWidget.setSortingEnabled(False) self.TypeListWidget.setSortingEnabled(False)
self.TypeListWidget.setUniformItemSizes(True) self.TypeListWidget.setUniformItemSizes(True)
self.TypeListWidget.setObjectName(u'TypeListWidget') self.TypeListWidget.setObjectName(u'TypeListWidget')