used += instead

This commit is contained in:
Andreas Preikschat 2013-02-04 22:26:27 +01:00
parent 86912ec2c3
commit 3df730db09
12 changed files with 28 additions and 28 deletions

View File

@ -141,9 +141,9 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
u'pyUNO bridge: %s\n' % UNO_VERSION
if platform.system() == u'Linux':
if os.environ.get(u'KDE_FULL_SESSION') == u'true':
system = system + u'Desktop: KDE SC\n'
system += u'Desktop: KDE SC\n'
elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'):
system = system + u'Desktop: GNOME\n'
system += u'Desktop: GNOME\n'
return (openlp_version, description, traceback, system, libraries)
def onSaveReportButtonClicked(self):

View File

@ -369,7 +369,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
self.max_progress += size
if self.max_progress:
# Add on 2 for plugins status setting plus a "finished" point.
self.max_progress = self.max_progress + 2
self.max_progress += 2
self.progressBar.setValue(0)
self.progressBar.setMinimum(0)
self.progressBar.setMaximum(self.max_progress)

View File

@ -903,7 +903,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
return
# Make sure it's a .conf file.
if not export_file_name.endswith(u'conf'):
export_file_name = export_file_name + u'.conf'
export_file_name += u'.conf'
temp_file = os.path.join(unicode(gettempdir(),
get_filesystem_encoding()), u'openlp', u'exportConf.tmp')
self.saveSettings()

View File

@ -419,18 +419,18 @@ class CWExtract(object):
for part in verse.contents:
self.application.process_events()
if isinstance(part, NavigableString):
verse_text = verse_text + part
verse_text += part
elif part and part.attrMap and \
(part.attrMap[u'class'] == u'WordsOfChrist' or part.attrMap[u'class'] == u'strongs'):
for subpart in part.contents:
self.application.process_events()
if isinstance(subpart, NavigableString):
verse_text = verse_text + subpart
verse_text += subpart
elif subpart and subpart.attrMap and subpart.attrMap[u'class'] == u'strongs':
for subsub in subpart.contents:
self.application.process_events()
if isinstance(subsub, NavigableString):
verse_text = verse_text + subsub
verse_text += subsub
self.application.process_events()
# Fix up leading and trailing spaces, multiple spaces, and spaces
# between text and , and .

View File

@ -72,12 +72,12 @@ class VerseReferenceList(object):
prev = index - 1
if self.verse_list[prev][u'version'] != verse[u'version']:
result = u'%s (%s)' % (result, self.verse_list[prev][u'version'])
result = result + u', '
result += u', '
if self.verse_list[prev][u'book'] != verse[u'book']:
result = u'%s%s %s:' % (result, verse[u'book'], verse[u'chapter'])
elif self.verse_list[prev][u'chapter'] != verse[u'chapter']:
result = u'%s%s:' % (result, verse[u'chapter'])
result = result + str(verse[u'start'])
result += str(verse[u'start'])
if verse[u'start'] != verse[u'end']:
result = u'%s-%s' % (result, verse[u'end'])
if len(self.version_list) > 1:
@ -89,8 +89,8 @@ class VerseReferenceList(object):
for index, version in enumerate(self.version_list):
if index > 0:
if result[-1] not in [u';', u',', u'.']:
result = result + u';'
result = result + u' '
result += u';'
result += u' '
result = u'%s%s, %s' % (result, version[u'version'], version[u'copyright'])
if version[u'permission'].strip():
result = result + u', ' + version[u'permission']

View File

@ -189,7 +189,7 @@ class ImpressController(PresentationController):
while list.hasMoreElements():
doc = list.nextElement()
if doc.getImplementationName() != u'com.sun.star.comp.framework.BackingComp':
cnt = cnt + 1
cnt += 1
if cnt > 0:
log.debug(u'OpenOffice not terminated as docs are still open')
else:
@ -399,7 +399,7 @@ class ImpressDocument(PresentationDocument):
i = 1
while not self.control and i < 150:
time.sleep(0.1)
i = i + 1
i += 1
self.control = self.presentation.getController()
else:
self.control.activate()

View File

@ -269,7 +269,7 @@ class PresentationMediaItem(MediaManagerItem):
if img:
while img:
service_item.add_from_command(path, name, img)
i = i + 1
i += 1
img = doc.get_thumbnail_path(i, True)
doc.close_presentation()
return True

View File

@ -177,7 +177,7 @@ class Controller(object):
if not self.doc.is_active():
return
if self.doc.slidenumber < self.doc.get_slide_count():
self.doc.slidenumber = self.doc.slidenumber + 1
self.doc.slidenumber += 1
self.poll()
return
if not self.activate():
@ -203,7 +203,7 @@ class Controller(object):
if not self.doc.is_active():
return
if self.doc.slidenumber > 1:
self.doc.slidenumber = self.doc.slidenumber - 1
self.doc.slidenumber -= 1
self.poll()
return
if not self.activate():

View File

@ -71,35 +71,35 @@ class PPTViewer(QtGui.QWidget):
row = 0
grid.addWidget(folder_label, 0, 0)
grid.addWidget(self.folderEdit, 0, 1)
row = row + 1
row += 1
grid.addWidget(x_label, row, 0)
grid.addWidget(self.xEdit, row, 1)
grid.addWidget(y_label, row, 2)
grid.addWidget(self.yEdit, row, 3)
row = row + 1
row += 1
grid.addWidget(width_label, row, 0)
grid.addWidget(self.widthEdit, row, 1)
grid.addWidget(height_label, row, 2)
grid.addWidget(self.heightEdit, row, 3)
row = row + 1
row += 1
grid.addWidget(ppt_label, row, 0)
grid.addWidget(self.pptEdit, row, 1)
grid.addWidget(ppt_dlg_btn, row, 2)
grid.addWidget(ppt_btn, row, 3)
row = row + 1
row += 1
grid.addWidget(slide_label, row, 0)
grid.addWidget(self.slideEdit, row, 1)
grid.addWidget(slide_btn, row, 2)
row = row + 1
row += 1
grid.addWidget(prev, row, 0)
grid.addWidget(next, row, 1)
row = row + 1
row += 1
grid.addWidget(blank, row, 0)
grid.addWidget(unblank, row, 1)
row = row + 1
row += 1
grid.addWidget(restart, row, 0)
grid.addWidget(close, row, 1)
row = row + 1
row += 1
grid.addWidget(stop, row, 0)
grid.addWidget(resume, row, 1)
self.connect(ppt_btn, QtCore.SIGNAL(u'clicked()'), self.openClick)

View File

@ -133,7 +133,7 @@ class RemoteTab(SettingsTab):
ipAddress = self.addressEdit.text()
url = u'http://%s:%s/' % (ipAddress, self.portSpinBox.value())
self.remoteUrl.setText(u'<a href="%s">%s</a>' % (url, url))
url = url + u'stage'
url += u'stage'
self.stageUrl.setText(u'<a href="%s">%s</a>' % (url, url))
def load(self):

View File

@ -162,7 +162,7 @@ class EasySlidesImport(SongImport):
region = self._extractRegion(line)
regionlines[region] = 1 + regionlines.get(region, 0)
elif line[0] == u'[':
separatorlines = separatorlines + 1
separatorlines += 1
# if the song has separators
separators = (separatorlines > 0)
# the number of different regions in song - 1
@ -200,7 +200,7 @@ class EasySlidesImport(SongImport):
# separators are used, so empty line means slide break
# inside verse
if self._listHas(verses, [reg, vt, vn, inst]):
inst = inst + 1
inst += 1
else:
# separators are not used, so empty line starts a new verse
vt = u'V'

View File

@ -203,7 +203,7 @@ class SongShowPlusImport(SongImport):
if verse_name not in self.otherList:
if ignore_unique:
return None
self.otherCount = self.otherCount + 1
self.otherCount += 1
self.otherList[verse_name] = str(self.otherCount)
verse_tag = VerseType.Tags[VerseType.Other]
verse_number = self.otherList[verse_name]