diff -r 0a02c433f52d -r 5883ce99ee12 UI/UserInterface.py --- a/UI/UserInterface.py Fri Nov 01 15:48:48 2013 +0100 +++ b/UI/UserInterface.py Sun Nov 03 15:58:22 2013 +0100 @@ -1151,14 +1151,14 @@ self.setWindowTitle( self.trUtf8("{0} - Passive Mode").format(Program)) elif self.capProject and not self.capEditor: - self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode")\ + self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode") .format(self.capProject, Program)) elif not self.capProject and self.capEditor: - self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode")\ + self.setWindowTitle(self.trUtf8("{0} - {1} - Passive Mode") .format(self.capEditor, Program)) else: self.setWindowTitle( - self.trUtf8("{0} - {1} - {2} - Passive Mode")\ + self.trUtf8("{0} - {1} - {2} - Passive Mode") .format(self.capProject, self.capEditor, Program)) else: if not self.capProject and not self.capEditor: @@ -1593,7 +1593,7 @@ self.versionAct.setWhatsThis(self.trUtf8( """<b>Show Versions</b>""" """<p>Display version information.</p>""" - )) + )) self.versionAct.triggered[()].connect(self.__showVersions) self.actions.append(self.versionAct) @@ -1604,7 +1604,7 @@ self.checkUpdateAct.setWhatsThis(self.trUtf8( """<b>Check for Updates...</b>""" """<p>Checks the internet for updates of eric5.</p>""" - )) + )) self.checkUpdateAct.triggered[()].connect(self.performVersionCheck) self.actions.append(self.checkUpdateAct) @@ -1618,7 +1618,7 @@ """<b>Show downloadable versions...</b>""" """<p>Shows the eric5 versions available for download """ """from the internet.</p>""" - )) + )) self.showVersionsAct.triggered[()].connect( self.showAvailableVersionsInfo) self.actions.append(self.showVersionsAct) @@ -1631,7 +1631,7 @@ self.reportBugAct.setWhatsThis(self.trUtf8( """<b>Report Bug...</b>""" """<p>Opens a dialog to report a bug.</p>""" - )) + )) self.reportBugAct.triggered[()].connect(self.__reportBug) self.actions.append(self.reportBugAct) @@ -1644,7 +1644,7 @@ self.requestFeatureAct.setWhatsThis(self.trUtf8( """<b>Request Feature...</b>""" """<p>Opens a dialog to send a feature request.</p>""" - )) + )) self.requestFeatureAct.triggered[()].connect(self.__requestFeature) self.actions.append(self.requestFeatureAct) @@ -2915,7 +2915,7 @@ try: from PyQt4.QtWebKit import qWebKitVersion versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ - .format(qWebKitVersion()) + .format(qWebKitVersion()) except ImportError: pass versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\ @@ -4050,7 +4050,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: E5MessageBox.critical( @@ -4059,7 +4059,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if Utilities.isMacPlatform(): @@ -4117,7 +4117,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: E5MessageBox.critical( @@ -4126,7 +4126,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if Utilities.isMacPlatform(): @@ -4285,7 +4285,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: E5MessageBox.critical( @@ -4294,7 +4294,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if not os.path.isfile(viewer) or \ @@ -4336,7 +4336,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return except EnvironmentError: if not ignore: @@ -4346,7 +4346,7 @@ self.trUtf8( '<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') - .format(fn)) + .format(fn)) return if not os.path.isfile(viewer) or \ @@ -4458,7 +4458,7 @@ self, self.trUtf8("External Tools"), self.trUtf8("""No toolgroup entry '{0}' found.""") - .format(toolGroupName) + .format(toolGroupName) ) def __toolExecute(self, act): @@ -4514,7 +4514,7 @@ self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start the tool entry <b>{0}</b>.<br>' - 'Ensure that it is available as <b>{1}</b>.</p>')\ + 'Ensure that it is available as <b>{1}</b>.</p>') .format(tool['menutext'], tool['executable'])) else: self.toolProcs.append((program, proc, procData)) @@ -4623,8 +4623,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if not home.endswith(".chm"): @@ -4680,8 +4680,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if not home.endswith(".chm"): @@ -4749,8 +4749,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4791,7 +4791,7 @@ if pyqt4DocDir.startswith("file://"): pyqt4DocDir = pyqt4DocDir[7:] if not os.path.splitext(pyqt4DocDir)[1]: - possibleHomes = [\ + possibleHomes = [ Utilities.normjoinpath(pyqt4DocDir, 'index.html'), Utilities.normjoinpath(pyqt4DocDir, 'classes.html'), ] @@ -4807,8 +4807,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4869,8 +4869,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4905,8 +4905,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if Utilities.isWindowsPlatform(): @@ -4953,8 +4953,8 @@ self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" - """ "<b>{0}</b>" could not be found.</p>""")\ - .format(home)) + """ "<b>{0}</b>" could not be found.</p>""") + .format(home)) return if Utilities.isWindowsPlatform(): @@ -5380,7 +5380,7 @@ self.trUtf8("Save tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be written.</p>") - .format(fn)) + .format(fn)) return from E5XML.TasksWriter import TasksWriter @@ -5406,7 +5406,7 @@ self.trUtf8("Read tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be read.</p>") - .format(fn)) + .format(fn)) def __writeSession(self): """ @@ -5424,7 +5424,7 @@ self.trUtf8("Save session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be written.</p>") - .format(fn)) + .format(fn)) def __readSession(self): """ @@ -5436,8 +5436,8 @@ self, self.trUtf8("Read session"), self.trUtf8( - "<p>The session file <b>{0}</b> could not be read.</p>")\ - .format(fn)) + "<p>The session file <b>{0}</b> could not be read.</p>") + .format(fn)) return f = QFile(fn) @@ -5451,8 +5451,8 @@ self, self.trUtf8("Read session"), self.trUtf8( - "<p>The session file <b>{0}</b> could not be read.</p>")\ - .format(fn)) + "<p>The session file <b>{0}</b> could not be read.</p>") + .format(fn)) def showFindFileByNameDialog(self): """ @@ -5634,7 +5634,7 @@ self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") - .format(fname)) + .format(fname)) self.inDragDrop = False @@ -5773,7 +5773,7 @@ if self.__versionCheckProgress is None: self.__versionCheckProgress = \ QProgressDialog("", self.trUtf8("&Cancel"), - 0, len(self.__httpAlternatives), self) + 0, len(self.__httpAlternatives), self) self.__versionCheckProgress.setMinimumDuration(0) self.__versionCheckProgress.canceled.connect( self.__versionsDownloadCanceled) @@ -5889,8 +5889,8 @@ self.trUtf8( """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like to""" - """ get it?""")\ - .format(versions[2], versions[3]), + """ get it?""") + .format(versions[2], versions[3]), yesDefault=True) url = res and versions[3] or '' elif versions[0] > Version: @@ -5900,8 +5900,8 @@ self.trUtf8( """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like to""" - """ get it?""")\ - .format(versions[0], versions[1]), + """ get it?""") + .format(versions[0], versions[1]), yesDefault=True) url = res and versions[1] or '' else: @@ -5921,8 +5921,8 @@ self.trUtf8( """The update to <b>{0}</b> of eric5 is""" """ available at <b>{1}</b>. Would you like""" - """ to get it?""")\ - .format(versions[0], versions[1]), + """ to get it?""") + .format(versions[0], versions[1]), yesDefault=True) url = res and versions[1] or '' else: @@ -5968,8 +5968,8 @@ versionText += """<tr><td>{0}</td><td><a href="{1}">{2}</a>""" \ """</td></tr>""".format( versions[line], versions[line + 1], - 'sourceforge' in versions[line + 1] and \ - "SourceForge" or versions[line + 1]) + 'sourceforge' in versions[line + 1] and + "SourceForge" or versions[line + 1]) line += 2 versionText += self.trUtf8("""</table>""")