Mercurial Repositories > eric / changeset
changeset
Fixed a bunch of visible indentation issues.
Mon, 14 Oct 2013 19:30:36 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 14 Oct 2013 19:30:36 +0200
- changeset 3020
- 542e97d4ecb3
- parent 3019
- 7912530a33e2
- child 3021
- 801289962f4e
Fixed a bunch of visible indentation issues.
--- a/Cooperation/ChatWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Cooperation/ChatWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -565,7 +565,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Chat"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -579,7 +580,8 @@ f.write(txt) f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving Chat"), self.trUtf8("""<p>The chat contents could not be""" """ written to <b>{0}</b></p>"""
--- a/Cooperation/Connection.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Cooperation/Connection.py Mon Oct 14 19:30:36 2013 +0200 @@ -208,7 +208,8 @@ not Preferences.getCooperation("AutoAcceptConnections"): # don't ask for reverse connections or # if we shall accept automatically - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("New Connection"), self.trUtf8("""<p>Accept connection from """ """<strong>{0}@{1}</strong>?</p>""").format(
--- a/DataViews/PyCoverageDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/DataViews/PyCoverageDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -237,7 +237,8 @@ self.summaryGroup.hide() if total_exceptions: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Parse Error"), self.trUtf8("""%n file(s) could not be parsed. Coverage""" """ info for these is not available.""", "",
--- a/DataViews/PyProfileDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/DataViews/PyProfileDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -227,7 +227,8 @@ fname = "{0}.profile".format(self.basename) if not os.path.exists(fname): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Profile Results"), self.trUtf8("""<p>There is no profiling data""" """ available for <b>{0}</b>.</p>""") @@ -239,7 +240,8 @@ self.stats = pickle.load(f) f.close() except (EnvironmentError, pickle.PickleError, EOFError): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Loading Profiling Data"), self.trUtf8("""<p>The profiling data could not be""" """ read from file <b>{0}</b>.</p>""")
--- a/Debugger/CallStackViewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/CallStackViewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -166,7 +166,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Call Stack Info"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -184,7 +185,8 @@ itm = self.itemBelow(itm) f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving Call Stack Info"), self.trUtf8("""<p>The call stack info could not be""" """ written to <b>{0}</b></p>"""
--- a/Debugger/CallTraceViewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/CallTraceViewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -132,7 +132,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Call Trace Info"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -155,7 +156,8 @@ itm = self.callTrace.itemBelow(itm) f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving Call Trace Info"), self.trUtf8("""<p>The call trace info could not""" """ be written to <b>{0}</b></p>"""
--- a/Debugger/DebugServer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/DebugServer.py Mon Oct 14 19:30:36 2013 +0200 @@ -632,7 +632,8 @@ peerAddress = sock.peerAddress().toString() if peerAddress not in Preferences.getDebugger("AllowedHosts"): # the peer is not allowed to connect - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Connection from illegal host"), self.trUtf8( """<p>A connection was attempted by the illegal host"""
--- a/Debugger/DebugUI.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/DebugUI.py Mon Oct 14 19:30:36 2013 +0200 @@ -982,11 +982,13 @@ if not Preferences.getDebugger("SuppressClientExit") or status != 0: if self.ui.currentProg is None: - E5MessageBox.information(self.ui, Program, + E5MessageBox.information( + self.ui, Program, self.trUtf8('<p>The program has terminated with an exit' ' status of {0}.</p>').format(status)) else: - E5MessageBox.information(self.ui, Program, + E5MessageBox.information( + self.ui, Program, self.trUtf8('<p><b>{0}</b> has terminated with an exit' ' status of {1}.</p>') .format(Utilities.normabspath(self.ui.currentProg), @@ -1032,7 +1034,8 @@ self.ui.activateWindow() if message is None: - E5MessageBox.critical(self.ui, Program, + E5MessageBox.critical( + self.ui, Program, self.trUtf8( 'The program being debugged contains an unspecified' ' syntax error.')) @@ -1049,7 +1052,8 @@ if os.path.exists(os.path.join(d, filename)): filename = os.path.join(d, filename) self.viewmanager.setFileLine(filename, lineNo, True, True) - E5MessageBox.critical(self.ui, Program, + E5MessageBox.critical( + self.ui, Program, self.trUtf8('<p>The file <b>{0}</b> contains the syntax error' ' <b>{1}</b> at line <b>{2}</b>, character <b>{3}</b>.' '</p>') @@ -1067,7 +1071,8 @@ self.ui.activateWindow() QApplication.processEvents() if exceptionType is None: - E5MessageBox.critical(self.ui, Program, + E5MessageBox.critical( + self.ui, Program, self.trUtf8('An unhandled exception occured.' ' See the shell window for details.')) return @@ -1106,7 +1111,8 @@ E5MessageBox.No | \ E5MessageBox.Yes | \ E5MessageBox.Ignore) - res = E5MessageBox.critical(self.ui, Program, + res = E5MessageBox.critical( + self.ui, Program, self.trUtf8( '<p>The debugged program raised the exception' ' <b>{0}</b><br>"<b>{1}</b>"<br>' @@ -1120,7 +1126,8 @@ buttons, E5MessageBox.No) else: - res = E5MessageBox.critical(self.ui, Program, + res = E5MessageBox.critical( + self.ui, Program, self.trUtf8( '<p>The debugged program raised the exception' ' <b>{0}</b><br>"<b>{1}</b>"</p>') @@ -1156,7 +1163,8 @@ """ self.__resetUI() if unplanned: - E5MessageBox.information(self.ui, Program, + E5MessageBox.information( + self.ui, Program, self.trUtf8('The program being debugged has terminated' ' unexpectedly.')) @@ -1228,7 +1236,8 @@ @param filename filename of the breakpoint (string) @param lineno linenumber of the breakpoint (integer) """ - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Breakpoint Condition Error"), self.trUtf8( """<p>The condition of the breakpoint <b>{0}, {1}</b>""" @@ -1262,7 +1271,8 @@ @param cond expression of the watch expression (string) """ - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Watch Expression Error"), self.trUtf8("""<p>The watch expression <b>{0}</b>""" """ contains a syntax error.</p>""")\ @@ -1300,7 +1310,8 @@ """ exists.</p>""")\ .format(special, Utilities.html_encode(cond)) - E5MessageBox.warning(self, + E5MessageBox.warning( + self.ui, self.trUtf8("Watch expression already exists"), msg) model.deleteWatchPointByIndex(index) @@ -1462,7 +1473,8 @@ if runProject: fn = self.project.getMainScript(1) if fn is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Coverage of Project"), self.trUtf8("There is no main script defined for the" " current project. Aborting")) @@ -1576,7 +1588,8 @@ if runProject: fn = self.project.getMainScript(1) if fn is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Profile of Project"), self.trUtf8("There is no main script defined for the" " current project. Aborting")) @@ -1692,7 +1705,8 @@ if runProject: fn = self.project.getMainScript(1) if fn is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Run Project"), self.trUtf8("There is no main script defined for the" " current project. Aborting")) @@ -1809,7 +1823,8 @@ if debugProject: fn = self.project.getMainScript(True) if fn is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Debug Project"), self.trUtf8("There is no main script defined for the" " current project. No debugging possible."))
--- a/Debugger/DebuggerInterfacePython.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/DebuggerInterfacePython.py Mon Oct 14 19:30:36 2013 +0200 @@ -155,7 +155,8 @@ """ interpreter = Preferences.getDebugger("PythonInterpreter") if interpreter == "": - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>No Python2 interpreter configured.</p>""")) @@ -194,7 +195,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:]) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -240,7 +242,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -251,7 +254,8 @@ [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be started.</p>""")) @@ -292,7 +296,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:]) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -338,7 +343,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -349,7 +355,8 @@ [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be started.</p>"""))
--- a/Debugger/DebuggerInterfacePython3.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Mon Oct 14 19:30:36 2013 +0200 @@ -190,7 +190,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:]) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -236,7 +237,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -247,7 +249,8 @@ [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be started.</p>""")) @@ -288,7 +291,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:]) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -334,7 +338,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -345,7 +350,8 @@ [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be started.</p>"""))
--- a/Debugger/DebuggerInterfaceRuby.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/DebuggerInterfaceRuby.py Mon Oct 14 19:30:36 2013 +0200 @@ -162,7 +162,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:]) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -208,7 +209,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -219,7 +221,8 @@ [debugClient, str(port), redirect, ipaddr], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be started.</p>""")) @@ -258,7 +261,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:]) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -304,7 +308,8 @@ args[0] = Utilities.getExecutablePath(args[0]) process = self.__startProcess(args[0], args[1:], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be""" @@ -315,7 +320,8 @@ [debugClient, str(port), redirect, ipaddr], clientEnv) if process is None: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Start Debugger"), self.trUtf8( """<p>The debugger backend could not be started.</p>"""))
--- a/Debugger/WatchPointViewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Debugger/WatchPointViewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -243,7 +243,8 @@ """<p>A watch expression '<b>{0}</b>'""" """ for the variable <b>{1}</b> already exists.</p>""")\ .format(special, Utilities.html_encode(cond)) - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Watch expression already exists"), msg)
--- a/E5Gui/E5MainWindow.py Mon Oct 14 18:26:25 2013 +0200 +++ b/E5Gui/E5MainWindow.py Mon Oct 14 19:30:36 2013 +0200 @@ -51,7 +51,8 @@ styleSheet = f.read() f.close() except (IOError, OSError) as msg: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Loading Style Sheet"), self.trUtf8( """<p>The Qt Style Sheet file <b>{0}</b> could"""
--- a/E5Gui/E5ToolBarDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/E5Gui/E5ToolBarDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -139,11 +139,13 @@ if ok and name: if self.toolbarComboBox.findText(name) != -1: # toolbar with this name already exists - E5MessageBox.critical(self, - self.trUtf8("New Toolbar"), - self.trUtf8( - """A toolbar with the name <b>{0}</b> already exists.""") - .format(name)) + E5MessageBox.critical( + self, + self.trUtf8("New Toolbar"), + self.trUtf8( + """A toolbar with the name <b>{0}</b> already""" + """ exists.""") + .format(name)) return tbItem = E5ToolBarItem(None, [], False) @@ -162,7 +164,8 @@ Private slot to remove a custom toolbar. """ name = self.toolbarComboBox.currentText() - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Remove Toolbar"), self.trUtf8( """Should the toolbar <b>{0}</b> really be removed?""") @@ -197,11 +200,13 @@ return if self.toolbarComboBox.findText(newName) != -1: # toolbar with this name already exists - E5MessageBox.critical(self, - self.trUtf8("Rename Toolbar"), - self.trUtf8( - """A toolbar with the name <b>{0}</b> already exists.""") - .format(newName)) + E5MessageBox.critical( + self, + self.trUtf8("Rename Toolbar"), + self.trUtf8( + """A toolbar with the name <b>{0}</b> already""" + """ exists.""") + .format(newName)) return index = self.toolbarComboBox.currentIndex() self.toolbarComboBox.setItemText(index, newName)
--- a/E5Network/E5NetworkProxyFactory.py Mon Oct 14 18:26:25 2013 +0200 +++ b/E5Network/E5NetworkProxyFactory.py Mon Oct 14 19:30:36 2013 +0200 @@ -133,7 +133,8 @@ protocolKey = query.protocolTag().capitalize() host = Preferences.getUI("ProxyHost/{0}".format(protocolKey)) if not host: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, QCoreApplication.translate("E5NetworkProxyFactory", "Proxy Configuration Error"), QCoreApplication.translate("E5NetworkProxyFactory",
--- a/E5Network/E5SslCertificatesDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/E5Network/E5SslCertificatesDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -147,7 +147,8 @@ Private slot to delete the selected server certificate. """ itm = self.serversCertificatesTree.currentItem() - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete Server Certificate"), self.trUtf8("""<p>Shall the server certificate really be""" """ deleted?</p><p>{0}</p>""" @@ -213,7 +214,8 @@ else: commonStr = cert.subjectInfo( QSslCertificate.CommonName) - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Import Certificate"), self.trUtf8( """<p>The certificate <b>{0}</b> already exists.""" @@ -351,7 +353,8 @@ Private slot to delete the selected CA certificate. """ itm = self.caCertificatesTree.currentItem() - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete CA Certificate"), self.trUtf8( """<p>Shall the CA certificate really be deleted?</p>""" @@ -399,7 +402,8 @@ else: commonStr = cert.subjectInfo( QSslCertificate.CommonName) - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Import Certificate"), self.trUtf8( """<p>The certificate <b>{0}</b> already exists.""" @@ -453,7 +457,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Export Certificate"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -463,7 +468,8 @@ f = QFile(fname) if not f.open(QIODevice.WriteOnly): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export Certificate"), self.trUtf8( """<p>The certificate could not be written""" @@ -494,7 +500,8 @@ if fname: f = QFile(fname) if not f.open(QIODevice.ReadOnly): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export Certificate"), self.trUtf8( """<p>The certificate could not be read from file"""
--- a/E5Network/E5SslErrorHandler.py Mon Oct 14 18:26:25 2013 +0200 +++ b/E5Network/E5SslErrorHandler.py Mon Oct 14 19:30:36 2013 +0200 @@ -128,7 +128,8 @@ return E5SslErrorHandler.SystemIgnored, False errorString = '.</li><li>'.join(errorStrings) - ret = E5MessageBox.yesNo(None, + ret = E5MessageBox.yesNo( + None, self.trUtf8("SSL Errors"), self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" """<ul><li>{1}</li></ul></p>""" @@ -142,7 +143,8 @@ certinfos = [] for cert in caNew: certinfos.append(self.__certToString(cert)) - caRet = E5MessageBox.yesNo(None, + caRet = E5MessageBox.yesNo( + None, self.trUtf8("Certificates"), self.trUtf8( """<p>Certificates:<br/>{0}<br/>"""
--- a/E5XML/XMLStreamReaderBase.py Mon Oct 14 18:26:25 2013 +0200 +++ b/E5XML/XMLStreamReaderBase.py Mon Oct 14 19:30:36 2013 +0200 @@ -54,7 +54,8 @@ self.device().fileName(), self.lineNumber(), self.columnNumber(), self.errorString()) - E5MessageBox.warning(None, + E5MessageBox.warning( + None, QCoreApplication.translate( "XMLStreamReaderBase", "XML parse error"), msg)
--- a/Graphics/ApplicationDiagramBuilder.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Graphics/ApplicationDiagramBuilder.py Mon Oct 14 19:30:36 2013 +0200 @@ -274,7 +274,8 @@ projectFile = parts[0].split("=", 1)[1].strip() if projectFile != self.project.getProjectFile(): - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Load Diagram"), self.trUtf8( """<p>The diagram belongs to the project <b>{0}</b>."""
--- a/Graphics/PixmapDiagram.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Graphics/PixmapDiagram.py Mon Oct 14 19:30:36 2013 +0200 @@ -149,7 +149,8 @@ """ image = QImage(filename) if image.isNull(): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Pixmap-Viewer"), self.trUtf8("""<p>The file <b>{0}</b> cannot be displayed.""" """ The format is not supported.</p>""").format(filename))
--- a/Graphics/UMLDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Graphics/UMLDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -230,7 +230,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Diagram"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -256,7 +257,8 @@ f.write("\n".join(lines)) f.close() except (IOError, OSError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Diagram"), self.trUtf8( """<p>The file <b>{0}</b> could not be saved.</p>""" @@ -285,7 +287,8 @@ data = f.read() f.close() except (IOError, OSError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Load Diagram"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>"""
--- a/Graphics/UMLGraphicsView.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Graphics/UMLGraphicsView.py Mon Oct 14 19:30:36 2013 +0200 @@ -341,7 +341,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Diagram"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -352,7 +353,8 @@ success = super().saveImage( fname, QFileInfo(fname).suffix().upper()) if not success: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Diagram"), self.trUtf8( """<p>The file <b>{0}</b> could not be saved.</p>""")
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py Mon Oct 14 19:30:36 2013 +0200 @@ -41,7 +41,8 @@ title = QUrl.fromPercentEncoding(url.encodedQueryItemValue("title")) if not title: return None - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Subscribe?"), self.trUtf8( """<p>Subscribe to this AdBlock subscription?</p>"""
--- a/Helpviewer/AdBlock/AdBlockDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -218,7 +218,8 @@ message = self.trUtf8( "<p>Do you really want to remove subscription" " <b>{0}</b>?</p>").format(self.__currentSubscription.title()) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Remove Subscription"), message)
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Mon Oct 14 19:30:36 2013 +0200 @@ -265,7 +265,8 @@ f = QFile(fileName) if f.exists(): if not f.open(QIODevice.ReadOnly): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Load subscription rules"), self.trUtf8( """Unable to open adblock file '{0}' for reading.""")\ @@ -274,7 +275,8 @@ textStream = QTextStream(f) header = textStream.readLine(1024) if not header.startswith("[Adblock"): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Load subscription rules"), self.trUtf8("""AdBlock file '{0}' does not start""" """ with [Adblock.""")\ @@ -370,7 +372,8 @@ if reply.error() != QNetworkReply.NoError: if not self.__defaultSubscription: # don't show error if we try to load the default - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8( """<p>Subscription rules could not be""" @@ -382,7 +385,8 @@ return if response.isEmpty(): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8("""Got empty subscription rules.""")) return @@ -391,7 +395,8 @@ QFile.remove(fileName) f = QFile(fileName) if not f.open(QIODevice.ReadWrite): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8( """Unable to open adblock file '{0}' for writing.""")\ @@ -442,7 +447,8 @@ if calculatedChecksum == expectedChecksum: return True else: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8( """<p>AdBlock subscription <b>{0}</b> has a wrong""" @@ -464,7 +470,8 @@ f = QFile(fileName) if not f.open(QIODevice.ReadWrite | QIODevice.Truncate): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Saving subscription rules"), self.trUtf8( """Unable to open adblock file '{0}' for writing.""")\
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -140,7 +140,8 @@ if importer.open(): self.__topLevelBookmarkNode = importer.importedBookmarks() if importer.error(): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error importing bookmarks"), importer.errorString()) return
--- a/Helpviewer/Bookmarks/BookmarksManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -134,7 +134,8 @@ reader = XbelReader() self.__bookmarkRootNode = reader.read(bookmarkFile) if reader.error() != QXmlStreamReader.NoError: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Loading Bookmarks"), self.trUtf8( """Error when loading bookmarks on line {0},""" @@ -200,7 +201,8 @@ self.__menu.title = BOOKMARKMENU self.__toolbar.title = BOOKMARKBAR if not writer.write(bookmarkFile, self.__bookmarkRootNode): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Saving Bookmarks"), self.trUtf8("""Error saving bookmarks to <b>{0}</b>.""")\ .format(bookmarkFile)) @@ -385,7 +387,8 @@ from .XbelWriter import XbelWriter writer = XbelWriter() if not writer.write(fileName, self.__bookmarkRootNode): - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Exporting Bookmarks"), self.trUtf8("""Error exporting bookmarks to <b>{0}</b>.""")\ .format(fileName))
--- a/Helpviewer/Download/DownloadManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Download/DownloadManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -138,7 +138,8 @@ @return flag indicating allowance to quit (boolean) """ if self.activeDownloads() > 0: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8(""), self.trUtf8("""There are %n downloads in progress.\n""" """Do you want to quit anyway?""", "",
--- a/Helpviewer/Feeds/FeedsDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Feeds/FeedsDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -83,11 +83,13 @@ self.trUtf8("Add RSS Feed"), self.trUtf8("""The feed was added successfully.""")) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Add RSS Feed"), self.trUtf8("""The feed was added successfully.""")) else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Add RSS Feed"), self.trUtf8("""The feed was already added before."""))
--- a/Helpviewer/Feeds/FeedsManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Feeds/FeedsManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -172,7 +172,8 @@ urlString, title = dlg.getData() for feed in self.__feeds: if feed[0] == urlString: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Duplicate Feed URL"), self.trUtf8( """A feed with the URL {0} exists already.""" @@ -193,7 +194,8 @@ """ itm = self.feedsTree.selectedItems()[0] title = itm.text(0) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete Feed"), self.trUtf8( """<p>Do you really want to delete the feed""" @@ -422,6 +424,7 @@ errorStr = itm.data(0, FeedsManager.ErrorDataRole) if errorStr: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error loading feed"), "{0}".format(errorStr))
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -98,6 +98,7 @@ self.trUtf8("GreaseMonkey Script Installation"), msg) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("GreaseMonkey Script Installation"), msg)
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -141,7 +141,8 @@ if script is None: return - removeIt = E5MessageBox.yesNo(self, + removeIt = E5MessageBox.yesNo( + self, self.trUtf8("Remove Script"), self.trUtf8( """<p>Are you sure you want to remove <b>{0}</b>?</p>""")
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py Mon Oct 14 19:30:36 2013 +0200 @@ -64,7 +64,8 @@ try: f = open(self.__fileName, "w", encoding="utf-8") except (IOError, OSError) as err: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("GreaseMonkey Download"), self.trUtf8( """<p>The file <b>{0}</b> could not be opened""" @@ -114,7 +115,8 @@ try: f = open(fileName, "w", encoding="utf-8") except (IOError, OSError) as err: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("GreaseMonkey Download"), self.trUtf8( """<p>The file <b>{0}</b> could not be opened""" @@ -157,7 +159,8 @@ dlg = GreaseMonkeyAddScriptDialog(self.__manager, script) deleteScript = dlg.exec_() != QDialog.Accepted else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("GreaseMonkey Download"), self.trUtf8( """<p><b>{0}</b> is already installed.</p>""")
--- a/Helpviewer/HelpBrowserWV.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/HelpBrowserWV.py Mon Oct 14 19:30:36 2013 +0200 @@ -199,7 +199,8 @@ return False if type_ == QWebPage.NavigationTypeFormResubmitted: - res = E5MessageBox.yesNo(self.view(), + res = E5MessageBox.yesNo( + self.view(), self.trUtf8("Resending POST request"), self.trUtf8( """In order to display the site, the request along with""" @@ -534,7 +535,8 @@ self.mainFrame().url(), self.__sslConfiguration, self.view()) widget.showAt(pos) else: - E5MessageBox.warning(self.view(), + E5MessageBox.warning( + self.view(), self.trUtf8("SSL Info"), self.trUtf8("""This site does not contain SSL information.""")) @@ -813,7 +815,8 @@ name = QUrl.fromLocalFile(name.toString()) if not QFileInfo(name.toLocalFile()).exists(): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>The file <b>{0}</b> does not exist.</p>""")\ @@ -826,7 +829,8 @@ name.toLocalFile().endswith(".CHM"): started = QDesktopServices.openUrl(name) if not started: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8("""<p>Could not start a viewer""" """ for file <b>{0}</b>.</p>""").format(name.path())) @@ -834,7 +838,8 @@ elif name.scheme() in ["mailto"]: started = QDesktopServices.openUrl(name) if not started: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8("""<p>Could not start an application""" """ for URL <b>{0}</b>.</p>""").format(name.toString())) @@ -851,7 +856,8 @@ name.toString().endswith(".CHM"): started = QDesktopServices.openUrl(name) if not started: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8("""<p>Could not start a viewer""" """ for file <b>{0}</b>.</p>""").format(name.path())) @@ -1466,7 +1472,8 @@ method = formElement.attribute("method", "get").lower() if method != "get": - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Method not supported"), self.trUtf8( """{0} method is not supported.""").format(method.upper())) @@ -1954,7 +1961,8 @@ # accessed for the first time return - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Web Database Quota"), self.trUtf8( """<p>The database quota of <strong>{0}</strong> has""" @@ -2266,7 +2274,8 @@ try: self.__clickedFrame.print_(printer) except AttributeError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>Printing is not available due to a bug in""" @@ -2309,7 +2318,8 @@ try: self.__clickedFrame.print_(printer) except AttributeError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>Printing is not available due to a bug in PyQt4.""" @@ -2338,7 +2348,8 @@ try: self.__clickedFrame.print_(printer) except AttributeError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>Printing is not available due to a bug in"""
--- a/Helpviewer/HelpTabWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/HelpTabWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -519,7 +519,8 @@ try: frame.print_(printer) except AttributeError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>Printing is not available due to a bug in""" @@ -561,7 +562,8 @@ try: frame.print_(printer) except AttributeError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>Printing is not available due to a bug in""" @@ -611,7 +613,8 @@ try: self.__printPreviewBrowser.print_(printer) except AttributeError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<p>Printing is not available due to a bug in PyQt4.""" @@ -773,7 +776,8 @@ @return flag indicating a shut down (boolean) """ if self.count() > 1 and Preferences.getHelp("WarnOnMultipleClose"): - mb = E5MessageBox.E5MessageBox(E5MessageBox.Information, + mb = E5MessageBox.E5MessageBox( + E5MessageBox.Information, self.trUtf8("Are you sure you want to close the window?"), self.trUtf8("""Are you sure you want to close the window?\n""" """You have %n tab(s) open.""", "", self.count()), @@ -787,8 +791,8 @@ quitButton = mb.addButton( self.trUtf8("&Quit"), E5MessageBox.AcceptRole) quitButton.setIcon(UI.PixmapCache.getIcon("exit.png")) - closeTabButton = mb.addButton(self.trUtf8("C&lose Current Tab"), - E5MessageBox.AcceptRole) + closeTabButton = mb.addButton( + self.trUtf8("C&lose Current Tab"), E5MessageBox.AcceptRole) closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose.png")) mb.addButton(E5MessageBox.Cancel) mb.exec_()
--- a/Helpviewer/HelpWindow.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/HelpWindow.py Mon Oct 14 19:30:36 2013 +0200 @@ -1970,11 +1970,15 @@ """ Private slot to show the about information. """ - E5MessageBox.about(self, self.trUtf8("eric5 Web Browser"), self.trUtf8( - """<b>eric5 Web Browser - {0}</b>""" - """<p>The eric5 Web Browser is a combined help file and HTML""" - """ browser. It is part of the eric5 development toolset.</p>""" - ).format(Version)) + E5MessageBox.about( + self, + self.trUtf8("eric5 Web Browser"), + self.trUtf8( + """<b>eric5 Web Browser - {0}</b>""" + """<p>The eric5 Web Browser is a combined help file and HTML""" + """ browser. It is part of the eric5 development""" + """ toolset.</p>""" + ).format(Version)) def __aboutQt(self): """ @@ -2767,7 +2771,8 @@ @param message message to be shown (string) """ - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("eric5 Web Browser"), message) @@ -2810,7 +2815,8 @@ @param msg message sent by the help engine (string) """ - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Help Engine"), msg) def __aboutToShowSettingsMenu(self): @@ -3524,7 +3530,8 @@ @param msg error message (str) """ - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("VirusTotal Scan"), self.trUtf8("""<p>The VirusTotal scan could not be""" """ scheduled.<p>\n<p>Reason: {0}</p>""").format(msg))
--- a/Helpviewer/History/HistoryManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/History/HistoryManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -382,7 +382,8 @@ if not historyFile.exists(): return if not historyFile.open(QIODevice.ReadOnly): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Loading History"), self.trUtf8( """<p>Unable to open history file <b>{0}</b>.<br/>""" @@ -461,7 +462,8 @@ opened = f.open(QIODevice.Append) if not opened: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Saving History"), self.trUtf8( """<p>Unable to open history file <b>{0}</b>.<br/>""" @@ -483,7 +485,8 @@ f.close() if saveAll: if historyFile.exists() and not historyFile.remove(): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Saving History"), self.trUtf8( """<p>Error removing old history file <b>{0}</b>.""" @@ -491,7 +494,8 @@ .format(historyFile.fileName(), historyFile.errorString())) if not f.copy(historyFile.fileName()): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Saving History"), self.trUtf8( """<p>Error moving new history file over old one """
--- a/Helpviewer/History/HistoryMenu.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/History/HistoryMenu.py Mon Oct 14 19:30:36 2013 +0200 @@ -374,8 +374,8 @@ """ Private slot to clear the history. """ - if self.__historyManager is not None and \ - E5MessageBox.yesNo(self, + if self.__historyManager is not None and E5MessageBox.yesNo( + self, self.trUtf8("Clear History"), self.trUtf8("""Do you want to clear the history?""")): self.__historyManager.clear()
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -61,7 +61,8 @@ osm = self.__mw.openSearchManager() for fileName in fileNames: if not osm.addEngine(fileName): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add search engine"), self.trUtf8( """{0} is not a valid OpenSearch 1.1 description or""" @@ -73,7 +74,8 @@ Private slot to delete the selected search engines. """ if self.enginesTable.model().rowCount() == 1: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Delete selected engines"), self.trUtf8("""You must have at least one search engine."""))
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -397,7 +397,8 @@ host = QUrl(engine.searchUrlTemplate()).host() - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, "", self.trUtf8( """<p>Do you want to add the following engine to your"""
--- a/Helpviewer/PageScreenDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/PageScreenDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -74,7 +74,8 @@ return False if QFileInfo(fileName).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Page Screen"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fileName), @@ -84,7 +85,9 @@ file = QFile(fileName) if not file.open(QFile.WriteOnly): - E5MessageBox.warning(self, self.trUtf8("Save Page Screen"), + E5MessageBox.warning( + self, + self.trUtf8("Save Page Screen"), self.trUtf8("Cannot write file '{0}:\n{1}.")\ .format(fileName, file.errorString())) return False @@ -93,7 +96,9 @@ file.close() if not res: - E5MessageBox.warning(self, self.trUtf8("Save Page Screen"), + E5MessageBox.warning( + self, + self.trUtf8("Save Page Screen"), self.trUtf8("Cannot write file '{0}:\n{1}.")\ .format(fileName, file.errorString())) return False
--- a/Helpviewer/Passwords/PasswordManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Passwords/PasswordManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -140,7 +140,8 @@ writer = PasswordWriter() if not writer.write( loginFile, self.__logins, self.__loginForms, self.__never): - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Saving login data"), self.trUtf8( """<p>Login data could not be saved to <b>{0}</b></p>""" @@ -161,7 +162,8 @@ self.__logins, self.__loginForms, self.__never = \ reader.read(loginFile) if reader.error() != QXmlStreamReader.NoError: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Loading login data"), self.trUtf8("""Error when loading login data on""" """ line {0}, column {1}:\n{2}""")\ @@ -186,7 +188,8 @@ lines = f.read() f.close() except IOError as err: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Loading login data"), self.trUtf8("""<p>Login data could not be loaded """ """from <b>{0}</b></p>""" @@ -210,7 +213,8 @@ data.append(line) else: if len(data) != 3: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Loading login data"), self.trUtf8( """<p>Login data could not be loaded """ @@ -377,7 +381,8 @@ # prompt, if the form has never be seen key = self.__createKey(url, "") if key not in self.__loginForms: - mb = E5MessageBox.E5MessageBox(E5MessageBox.Question, + mb = E5MessageBox.E5MessageBox( + E5MessageBox.Question, self.trUtf8("Save password"), self.trUtf8( """<b>Would you like to save this password?</b><br/>"""
--- a/Helpviewer/Passwords/PasswordsDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/Passwords/PasswordsDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -84,7 +84,8 @@ self.__passwordModel.setShowPasswords(False) self.passwordsButton.setText(self.__showPasswordsText) else: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Saved Passwords"), self.trUtf8("""Do you really want to show passwords?""")) if res:
--- a/Helpviewer/QtHelpDocumentationDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/QtHelpDocumentationDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -66,7 +66,8 @@ for fileName in fileNames: ns = QHelpEngineCore.namespaceName(fileName) if not ns: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Add Documentation"), self.trUtf8( """The file <b>{0}</b> is not a valid""" @@ -75,7 +76,8 @@ continue if len(self.documentsList.findItems(ns, Qt.MatchFixedString)): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Add Documentation"), self.trUtf8( """The namespace <b>{0}</b> is already registered.""")\ @@ -94,7 +96,8 @@ """ Private slot to remove a document from the help database. """ - res = E5MessageBox.question(self, + res = E5MessageBox.question( + self, self.trUtf8("Remove Documentation"), self.trUtf8( """Do you really want to remove the selected documentation """ @@ -108,7 +111,8 @@ for item in items: ns = item.text() if ns in list(openedDocs.values()): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Remove Documentation"), self.trUtf8( """Some documents currently opened reference the """
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/SiteInfo/SiteInfoDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -244,7 +244,8 @@ else: cacheData = None if not cacheData: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Image"), self.trUtf8("""This image is not available.""")) return @@ -264,7 +265,8 @@ f = QFile(filename) if not f.open(QFile.WriteOnly): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Image"), self.trUtf8( """<p>Cannot write to file <b>{0}</b>.</p>""")
--- a/Helpviewer/SpeedDial/SpeedDial.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/SpeedDial/SpeedDial.py Mon Oct 14 19:30:36 2013 +0200 @@ -201,7 +201,8 @@ writer = SpeedDialWriter() if not writer.write(speedDialFile, self.__webPages, self.__pagesPerRow, self.__speedDialSize): - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Saving Speed Dial data"), self.trUtf8( """<p>Speed Dial data could not be saved to"""
--- a/Helpviewer/UserAgent/UserAgentManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/UserAgent/UserAgentManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -63,7 +63,8 @@ agentFile = self.getFileName() writer = UserAgentWriter() if not writer.write(agentFile, self.__agents): - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Saving user agent data"), self.trUtf8( """<p>User agent data could not be saved to""" @@ -83,7 +84,8 @@ reader = UserAgentReader() self.__agents = reader.read(agentFile) if reader.error() != QXmlStreamReader.NoError: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Loading user agent data"), self.trUtf8("""Error when loading user agent data on""" """ line {0}, column {1}:\n{2}""")\ @@ -108,7 +110,8 @@ lines = f.read() f.close() except IOError as err: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, self.trUtf8("Loading user agent data"), self.trUtf8("""<p>User agent data could not be loaded """ """from <b>{0}</b></p>"""
--- a/Helpviewer/UserAgent/UserAgentMenu.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Helpviewer/UserAgent/UserAgentMenu.py Mon Oct 14 19:30:36 2013 +0200 @@ -177,7 +177,8 @@ menuStack.pop() if xml.hasError(): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Parsing default user agents"), self.trUtf8( """<p>Error parsing default user agents.</p><p>{0}</p>""")
--- a/IconEditor/IconEditorGrid.py Mon Oct 14 18:26:25 2013 +0200 +++ b/IconEditor/IconEditorGrid.py Mon Oct 14 19:30:36 2013 +0200 @@ -889,7 +889,8 @@ if ok: if img.width() > self.__image.width() or \ img.height() > self.__image.height(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Paste"), self.trUtf8( """<p>The clipboard image is larger than the""" @@ -919,7 +920,8 @@ self.__pasteRect.topLeft(), self.__pasteRect.bottomRight() + QPoint(1, 1)) else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Pasting Image"), self.trUtf8("""Invalid image data in clipboard."""))
--- a/IconEditor/IconEditorWindow.py Mon Oct 14 18:26:25 2013 +0200 +++ b/IconEditor/IconEditorWindow.py Mon Oct 14 19:30:36 2013 +0200 @@ -1051,7 +1051,8 @@ if ex: fileName += ex if QFileInfo(fileName).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save icon file"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fileName), @@ -1173,7 +1174,8 @@ @return flag indicating, if it is ok to continue (boolean) """ if self.__editor.isDirty(): - ret = E5MessageBox.okToClearData(self, + ret = E5MessageBox.okToClearData( + self, self.trUtf8("eric5 Icon Editor"), self.trUtf8("""The icon image has unsaved changes."""), self.__saveIcon)
--- a/MultiProject/MultiProject.py Mon Oct 14 18:26:25 2013 +0200 +++ b/MultiProject/MultiProject.py Mon Oct 14 19:30:36 2013 +0200 @@ -205,7 +205,8 @@ return False else: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read multiproject file"), self.trUtf8( "<p>The multiproject file <b>{0}</b> could not be" @@ -247,7 +248,8 @@ .writeXML() res = True else: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save multiproject file"), self.trUtf8("<p>The multiproject file <b>{0}</b> could not be " "written.</p>").format(fn)) @@ -488,7 +490,8 @@ if ex: fn += ex if QFileInfo(fn).exists(): - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Save File"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fn), @@ -512,7 +515,8 @@ @return flag indicating whether this operation was successful (boolean) """ if self.isDirty(): - res = E5MessageBox.okToClearData(self.parent(), + res = E5MessageBox.okToClearData( + self.parent(), self.trUtf8("Close Multiproject"), self.trUtf8("The current multiproject has unsaved changes."), self.saveMultiProject)
--- a/Network/IRC/IrcChannelWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Network/IRC/IrcChannelWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -353,7 +353,8 @@ ircTimestamp(), self.__userName, Utilities.html_encode(msg))) if msg.startswith("/"): if self.__private: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Send Message"), self.trUtf8( """Messages starting with a '/' are not allowed""" @@ -379,7 +380,8 @@ """ Public method to leave the channel. """ - ok = E5MessageBox.yesNo(self, + ok = E5MessageBox.yesNo( + self, self.trUtf8("Leave IRC channel"), self.trUtf8( """Do you really want to leave the IRC channel <b>{0}</b>?""") @@ -1191,7 +1193,8 @@ fname += ex ext = QFileInfo(fname).suffix() if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Messages"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -1209,7 +1212,8 @@ f.write(txt) f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving Messages"), self.trUtf8( """<p>The messages contents could not be written"""
--- a/Network/IRC/IrcIdentitiesEditDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Network/IRC/IrcIdentitiesEditDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -166,7 +166,8 @@ @return flag indicating a successful check (boolean) """ if self.nicknamesList.count() == 0: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Edit Identity"), self.trUtf8( """The identity must contain at least one nick name.""")) @@ -182,7 +183,8 @@ return False if not self.realnameEdit.text(): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Edit Identity"), self.trUtf8("""The identity must have a real name.""")) block = self.identitiesCombo.blockSignals(True) @@ -212,7 +214,8 @@ if ok: if name: if name in self.__identities: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add Identity"), self.trUtf8( """An identity named <b>{0}</b> already exists.""" @@ -228,7 +231,8 @@ self.identitiesCombo.setCurrentIndex( self.identitiesCombo.count() - 1) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add Identity"), self.trUtf8("""The identity has to have a name.""")) self.on_addButton_clicked() @@ -249,7 +253,8 @@ if ok: if name: if name in self.__identities: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Copy Identity"), self.trUtf8( """An identity named <b>{0}</b> already exists.""" @@ -264,7 +269,8 @@ self.identitiesCombo.setCurrentIndex( self.identitiesCombo.count() - 1) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Copy Identity"), self.trUtf8("""The identity has to have a name.""")) self.on_copyButton_clicked() @@ -285,7 +291,8 @@ if ok and name != currentIdentity: if name: if name in self.__identities: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Rename Identity"), self.trUtf8( """An identity named <b>{0}</b> already exists.""" @@ -299,7 +306,8 @@ self.identitiesCombo.setItemText( self.identitiesCombo.currentIndex(), name) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Copy Identity"), self.trUtf8("""The identity has to have a name.""")) self.on_renameButton_clicked() @@ -330,7 +338,8 @@ msg = self.trUtf8( """Do you really want to delete all information for""" """ this identity?""") - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete Identity"), msg, icon=E5MessageBox.Warning)
--- a/Network/IRC/IrcNetworkEditDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Network/IRC/IrcNetworkEditDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -181,7 +181,8 @@ """ itm = self.channelList.selectedItems()[0] if itm: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete Channel"), self.trUtf8( """Do you really want to delete channel <b>{0}</b>?""")
--- a/Network/IRC/IrcNetworkListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Network/IRC/IrcNetworkListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -154,7 +154,8 @@ itm = self.networksList.selectedItems()[0] if itm.parent() is None: networkName = itm.text(0) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete Irc Network"), self.trUtf8( """Do you really want to delete IRC network <b>{0}</b>?""")
--- a/Network/IRC/IrcNetworkWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Network/IRC/IrcNetworkWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -384,7 +384,8 @@ fname += ex ext = QFileInfo(fname).suffix() if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Messages"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -402,7 +403,8 @@ f.write(txt) f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving Messages"), self.trUtf8( """<p>The messages contents could not be written"""
--- a/Network/IRC/IrcWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Network/IRC/IrcWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -135,7 +135,8 @@ """ if self.__server: if Preferences.getIrc("AskOnShutdown"): - ok = E5MessageBox.yesNo(self, + ok = E5MessageBox.yesNo( + self, self.trUtf8("Disconnect from Server"), self.trUtf8( """<p>Do you really want to disconnect from""" @@ -184,7 +185,8 @@ if self.__server: useSSL = self.__server.useSSL() if useSSL and not SSL_AVAILABLE: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("SSL Connection"), self.trUtf8( """An encrypted connection to the IRC""" @@ -230,7 +232,8 @@ if silent: ok = True else: - ok = E5MessageBox.yesNo(self, + ok = E5MessageBox.yesNo( + self, self.trUtf8("Disconnect from Server"), self.trUtf8("""<p>Do you really want to disconnect from""" """ <b>{0}</b>?</p><p>All channels will be"""
--- a/PluginManager/PluginManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/PluginManager/PluginManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -992,7 +992,8 @@ try: os.mkdir(downloadDir, 0o755) except (OSError, IOError) as err: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Plugin Manager Error"), self.trUtf8( """<p>The plugin download directory"""
--- a/PluginManager/PluginRepositoryDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -278,7 +278,8 @@ self.closeAndInstall.emit() else: if ui is None or not ui.notificationsEnabled(): - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Download Plugin Files"), self.trUtf8("""The requested plugins were downloaded.""")) self.downloadProgress.setValue(0) @@ -320,14 +321,16 @@ url = Preferences.getUI("PluginRepositoryUrl5") if url != self.repositoryUrlEdit.text(): self.repositoryUrlEdit.setText(url) - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Plugins Repository URL Changed"), self.trUtf8( """The URL of the Plugins Repository has""" """ changed. Select the "Update" button to get""" """ the new repository file.""")) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Read plugins repository file"), self.trUtf8("<p>The plugins repository file <b>{0}</b> " "could not be read. Select Update</p>")\ @@ -385,7 +388,8 @@ if reply.error() != QNetworkReply.NoError: ok = False if not self.__downloadCancelled: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Error downloading file"), self.trUtf8( """<p>Could not download the requested file""" @@ -622,7 +626,8 @@ if not os.path.isfile(applPath) or \ not proc.startDetached(sys.executable, args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start the process.<br>'
--- a/PluginManager/PluginUninstallDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/PluginManager/PluginUninstallDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -101,7 +101,8 @@ .itemData(self.pluginNameCombo.currentIndex()) if not self.__pluginManager.unloadPlugin(pluginName): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Plugin Uninstallation"), self.trUtf8( """<p>The plugin <b>{0}</b> could not be unloaded.""" @@ -112,7 +113,8 @@ sys.path.insert(2, pluginDirectory) module = imp.load_source(pluginName, pluginFile) if not hasattr(module, "packageName"): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Plugin Uninstallation"), self.trUtf8( """<p>The plugin <b>{0}</b> has no 'packageName'""" @@ -164,7 +166,8 @@ os.remove(pluginFile) except OSError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Plugin Uninstallation"), self.trUtf8( """<p>The plugin package <b>{0}</b> could not be""" @@ -183,7 +186,8 @@ .format(pluginName, pluginDirectory)) return True - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Plugin Uninstallation"), self.trUtf8( """<p>The plugin <b>{0}</b> was uninstalled successfully"""
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -84,7 +84,8 @@ self.process.start(program, args) procStarted = self.process.waitForStarted(5000) if not procStarted: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -84,7 +84,8 @@ self.process.start(program, args) procStarted = self.process.waitForStarted(5000) if not procStarted: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/PluginWizardE5MessageBox.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardE5MessageBox.py Mon Oct 14 19:30:36 2013 +0200 @@ -67,7 +67,8 @@ """ Private method to initialize the action. """ - self.action = E5Action(self.trUtf8('E5MessageBox Wizard'), + self.action = E5Action( + self.trUtf8('E5MessageBox Wizard'), self.trUtf8('&E5MessageBox Wizard...'), 0, 0, self, 'wizards_e5messagebox') self.action.setStatusTip(self.trUtf8('E5MessageBox Wizard')) @@ -117,9 +118,10 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, - self.trUtf8('No current editor'), - self.trUtf8('Please open or create a file first.')) + E5MessageBox.critical( + self.__ui, + self.trUtf8('No current editor'), + self.trUtf8('Please open or create a file first.')) else: code, ok = self.__callForm(editor) if ok:
--- a/Plugins/PluginWizardPyRegExp.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQColorDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQFileDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQFontDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQInputDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQMessageBox.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQRegExp.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQRegExp.py Mon Oct 14 19:30:36 2013 +0200 @@ -117,7 +117,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/PluginWizardQRegularExpression.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/PluginWizardQRegularExpression.py Mon Oct 14 19:30:36 2013 +0200 @@ -118,7 +118,8 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor == None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8('No current editor'), self.trUtf8('Please open or create a file first.')) else:
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -137,7 +137,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -119,7 +119,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Mon Oct 14 19:30:36 2013 +0200 @@ -79,7 +79,8 @@ shouldReopen = self.vcs.getExtensionObject("fetch")\ .hgFetch(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Fetch"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True)
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -113,7 +113,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -91,7 +91,8 @@ path = path.replace(self.__projectPath, "")[1:] self.pathEdit.setText(path) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add Sub-repository"), self.trUtf8("""The sub-repository path must be inside""" """ the project."""))
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -133,7 +133,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -143,7 +143,8 @@ if not procStarted: self.buttonBox.setFocus() self.inputGroup.setEnabled(False) - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -192,7 +192,8 @@ QApplication.restoreOverrideCursor() self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -419,7 +420,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -434,7 +436,8 @@ f.write(eol.join(self.contents.toPlainText().splitlines())) f.close() except IOError as why: - E5MessageBox.critical(self, self.trUtf8('Save Diff'), + E5MessageBox.critical( + self, self.trUtf8('Save Diff'), self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.' '<br>Reason: {1}</p>') .format(fname, str(why)))
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -424,7 +424,8 @@ errMsg = self.trUtf8("Could not start the hg executable.") if errMsg: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Mercurial Error"), errMsg) @@ -466,7 +467,8 @@ errMsg = self.trUtf8("Could not start the hg executable.") if errMsg: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Mercurial Error"), errMsg) @@ -512,7 +514,8 @@ errMsg = self.trUtf8("Could not start the hg executable.") if errMsg: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Mercurial Error"), errMsg) @@ -707,7 +710,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -1385,7 +1389,8 @@ if revs: shouldReopen = self.vcs.hgGraft(self.repodir, revs) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Copy Changesets"), self.trUtf8( """The project should be reread. Do this now?"""),
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -188,7 +188,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -247,7 +248,8 @@ errMsg = self.trUtf8("Could not start the hg executable.") if errMsg: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Mercurial Error"), errMsg)
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -135,7 +135,8 @@ self.vcs.getPlugin().setPreferences("ServerPort", port) self.vcs.getPlugin().setPreferences("ServerStyle", style) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -275,7 +275,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -589,7 +590,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getCommitableItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Commit"), self.trUtf8("""There are no entries selected to be""" """ committed.""")) @@ -628,7 +630,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getUnversionedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Add"), self.trUtf8("""There are no unversioned entries""" """ available/selected.""")) @@ -649,7 +652,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -665,7 +669,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -688,7 +693,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -705,7 +711,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Differences"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -724,13 +731,15 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) return elif len(names) > 1: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""Only one file with uncommitted changes""" """ must be selected."""))
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -103,7 +103,8 @@ self.process.start('hg', args) procStarted = self.process.waitForStarted(5000) if not procStarted: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -132,7 +132,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Oct 14 19:30:36 2013 +0200 @@ -1184,7 +1184,8 @@ """ shouldReopen = self.vcs.hgPull(self.project.ppath) if shouldReopen: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Pull"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -1346,7 +1347,8 @@ """ shouldReopen = self.vcs.hgUnbundle(self.project.ppath) if shouldReopen: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Apply changegroups"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -1401,7 +1403,8 @@ """ shouldReopen = self.vcs.hgImport(self.project.ppath) if shouldReopen: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Import Patch"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -1420,7 +1423,8 @@ """ shouldReopen = self.vcs.hgRevert(self.project.ppath) if shouldReopen: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Revert Changes"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -1439,7 +1443,8 @@ """ shouldReopen = self.vcs.hgGraft(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Copy Changesets"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -1453,7 +1458,8 @@ """ shouldReopen = self.vcs.hgGraftContinue(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Copy Changesets (Continue)"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -71,7 +71,8 @@ self.process.waitForFinished(3000) if self.__dirtyList: - res = E5MessageBox.question(self, + res = E5MessageBox.question( + self, self.trUtf8("Unsaved Changes"), self.trUtf8("""The guards list has been changed.""" """ Shall the changes be applied?"""), @@ -113,7 +114,8 @@ @param patch selected patch name (empty for current patch) """ if self.__dirtyList: - res = E5MessageBox.question(self, + res = E5MessageBox.question( + self, self.trUtf8("Unsaved Changes"), self.trUtf8("""The guards list has been changed.""" """ Shall the changes be applied?"""), @@ -235,7 +237,8 @@ """ Private slot to remove guard definitions from the list. """ - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Remove Guards"), self.trUtf8( """Do you really want to remove the selected guards?""")) @@ -297,14 +300,16 @@ process.readAllStandardError(), ioEncoding, 'replace') else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Apply Guard Definitions"), self.trUtf8( """The Mercurial process did not finish""" """ in time.""")) if error: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Apply Guard Definitions"), self.trUtf8("""<p>The defined guards could not be""" """ applied.</p><p>Reason: {0}</p>""")\
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -104,7 +104,8 @@ self.process.start('hg', args) procStarted = self.process.waitForStarted(5000) if not procStarted: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -147,7 +147,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -188,7 +189,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Mon Oct 14 19:30:36 2013 +0200 @@ -779,7 +779,8 @@ .hgQueuePushPopPatches(name, operation=operation, all=all, named=named, force=force) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Changing Applied Patches"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True)
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Mon Oct 14 19:30:36 2013 +0200 @@ -403,7 +403,8 @@ else: return False else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Select Patch"), self.trUtf8("""No patches to select from.""")) return False @@ -515,7 +516,8 @@ if res: dia.exec_() else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Select Patch"), self.trUtf8("""No patches to select from.""")) @@ -553,11 +555,13 @@ if res: dia.exec_() else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Fold Patches"), self.trUtf8("""No patches selected.""")) else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Fold Patches"), self.trUtf8("""No patches available to be folded.""")) @@ -583,7 +587,8 @@ self.queuesListGuardsDialog.show() self.queuesListGuardsDialog.start(name) else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("List Guards"), self.trUtf8("""No patches available to list guards for.""")) @@ -620,7 +625,8 @@ self.queuesDefineGuardsDialog.show() self.queuesDefineGuardsDialog.start(name) else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Define Guards"), self.trUtf8("""No patches available to define guards for.""")) @@ -665,7 +671,8 @@ if procStarted: process.waitForFinished(30000) else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Drop All Guards"), self.trUtf8("""No patches available to define guards for.""")) @@ -701,7 +708,8 @@ if res: dia.exec_() else: - E5MessageBox.information(None, + E5MessageBox.information( + None, self.trUtf8("Set Active Guards"), self.trUtf8("""No guards available to select from.""")) return @@ -807,7 +815,8 @@ else: errMsg = self.trUtf8( "Error while renaming the active queue.") - E5MessageBox.warning(None, + E5MessageBox.warning( + None, title, """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) else: @@ -883,7 +892,8 @@ elif operation == Queues.QUEUE_ACTIVATE: errMsg = self.trUtf8( "Error while setting the active queue.") - E5MessageBox.warning(None, + E5MessageBox.warning( + None, title, """<p>{0}</p><p>{1}</p>""".format(errMsg, error)) else:
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Mon Oct 14 19:30:36 2013 +0200 @@ -105,7 +105,8 @@ shouldReopen = self.vcs.getExtensionObject("rebase")\ .hgRebase(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Rebase Changesets"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -119,7 +120,8 @@ shouldReopen = self.vcs.getExtensionObject("rebase")\ .hgRebaseContinue(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Rebase Changesets (Continue)"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -133,7 +135,8 @@ shouldReopen = self.vcs.getExtensionObject("rebase")\ .hgRebaseAbort(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Rebase Changesets (Abort)"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True)
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Mon Oct 14 19:30:36 2013 +0200 @@ -113,7 +113,8 @@ shouldReopen = self.vcs.getExtensionObject("transplant")\ .hgTransplant(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Transplant Changesets"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -127,7 +128,8 @@ shouldReopen = self.vcs.getExtensionObject("transplant")\ .hgTransplantContinue(self.project.getProjectPath()) if shouldReopen: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Transplant Changesets (Continue)"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Oct 14 19:30:36 2013 +0200 @@ -260,7 +260,8 @@ """ success = self.vcsImport(vcsDataDict, project.ppath)[0] if not success: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Create project repository"), self.trUtf8( """The project repository could not be created.""")) @@ -450,7 +451,8 @@ break if not ok: - res = E5MessageBox.yesNo(self.__ui, + res = E5MessageBox.yesNo( + self.__ui, self.trUtf8("Commit Changes"), self.trUtf8( """The commit affects files, that have unsaved""" @@ -963,7 +965,8 @@ names) yes = dlg.exec_() == QDialog.Accepted else: - yes = E5MessageBox.yesNo(None, + yes = E5MessageBox.yesNo( + None, self.trUtf8("Revert changes"), self.trUtf8("""Do you really want to revert all changes of""" """ the project?""")) @@ -1771,7 +1774,8 @@ output1, error = self.__hgGetFileForRevision(name, rev=rev1) if error: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), error) return @@ -1780,7 +1784,8 @@ if rev2: output2, error = self.__hgGetFileForRevision(name, rev=rev2) if error: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), error) return @@ -1792,7 +1797,8 @@ f1.close() name2 = name except IOError: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Mercurial Side-by-Side Difference"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") @@ -2305,7 +2311,8 @@ ignoreName = os.path.join(name, Hg.IgnoreFileName) if os.path.exists(ignoreName): - res = E5MessageBox.yesNo(self.__ui, + res = E5MessageBox.yesNo( + self.__ui, self.trUtf8("Create .hgignore file"), self.trUtf8("""<p>The file <b>{0}</b> exists already.""" """ Overwrite it?</p>""").format(ignoreName), @@ -2375,7 +2382,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self.__ui, + res = E5MessageBox.yesNo( + self.__ui, self.trUtf8("Create changegroup"), self.trUtf8("<p>The Mercurial changegroup file <b>{0}</b> " "already exists. Overwrite it?</p>") @@ -2500,7 +2508,8 @@ if files: self.__lastChangeGroupPath = os.path.dirname(files[0]) - update = E5MessageBox.yesNo(self.__ui, + update = E5MessageBox.yesNo( + self.__ui, self.trUtf8("Apply changegroups"), self.trUtf8("""Shall the working directory be updated?"""), yesDefault=True) @@ -2641,7 +2650,8 @@ if dlg.exec_() == QDialog.Accepted: rev, merge, date, user, message = dlg.getParameters() if not rev: - E5MessageBox.warning(self.__ui, + E5MessageBox.warning( + self.__ui, self.trUtf8("Backing out changeset"), self.trUtf8("""No revision given. Aborting...""")) return @@ -3023,7 +3033,8 @@ contents = f.readlines() f.close() except IOError as err: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Add Sub-repository"), self.trUtf8( """<p>The sub-repositories file .hgsub could not""" @@ -3032,7 +3043,8 @@ return if entry in contents: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Add Sub-repository"), self.trUtf8( """<p>The sub-repositories file .hgsub already""" @@ -3050,7 +3062,8 @@ f.writelines(contents) f.close() except IOError as err: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Add Sub-repository"), self.trUtf8( """<p>The sub-repositories file .hgsub could not""" @@ -3070,7 +3083,8 @@ subrepositories = [] if not os.path.isfile(hgsub): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Remove Sub-repositories"), self.trUtf8("""<p>The sub-repositories file .hgsub does not""" """ exist. Aborting...</p>""")) @@ -3081,7 +3095,8 @@ subrepositories = [line.strip() for line in f.readlines()] f.close() except IOError as err: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Remove Sub-repositories"), self.trUtf8("""<p>The sub-repositories file .hgsub could not""" """ be read.</p><p>Reason: {0}</p>""") @@ -3099,7 +3114,8 @@ f.write(contents) f.close() except IOError as err: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Remove Sub-repositories"), self.trUtf8( """<p>The sub-repositories file .hgsub could not""" @@ -3129,7 +3145,8 @@ if self.__client: ok, err = self.__client.restartServer() if not ok: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Mercurial Command Server"), self.trUtf8( """<p>The Mercurial Command Server could not be""" @@ -3265,7 +3282,8 @@ if ok: self.__client = client else: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Mercurial Command Server"), self.trUtf8( """<p>The Mercurial Command Server could not be"""
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Mon Oct 14 19:30:36 2013 +0200 @@ -92,7 +92,8 @@ if cursor is not None: QApplication.restoreOverrideCursor() parent = isinstance(self, QWidget) and self or None - msgBox = E5MessageBox.E5MessageBox(E5MessageBox.Question, + msgBox = E5MessageBox.E5MessageBox( + E5MessageBox.Question, self.trUtf8("Subversion SSL Server Certificate"), self.trUtf8("""<p>Accept the following SSL certificate?</p>""" """<table>"""
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -158,7 +158,8 @@ elif os.path.exists('/tmp'): tmpdir = '/tmp' else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Diff"), self.trUtf8("""There is no temporary directory available.""")) return @@ -419,7 +420,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -434,7 +436,8 @@ f.write(eol.join(self.contents.toPlainText().splitlines())) f.close() except IOError as why: - E5MessageBox.critical(self, self.trUtf8('Save Diff'), + E5MessageBox.critical( + self, self.trUtf8('Save Diff'), self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.' '<br>Reason: {1}</p>') .format(fname, str(why)))
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -442,7 +442,8 @@ @param msg error message to show (string) """ - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), msg)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -271,7 +271,8 @@ @param msg error message to show (string) """ - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), msg)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -596,7 +596,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getCommitableItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Commit"), self.trUtf8("""There are no entries selected to be""" """ committed.""")) @@ -635,7 +636,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getUnversionedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Add"), self.trUtf8("""There are no unversioned entries""" """ available/selected.""")) @@ -656,7 +658,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -679,7 +682,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -696,7 +700,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Differences"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -716,13 +721,15 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) return elif len(names) > 1: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""Only one file with uncommitted changes""" """ must be selected.""")) @@ -737,7 +744,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getLockActionItems(self.unlockedIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Lock"), self.trUtf8("""There are no unlocked files""" """ available/selected.""")) @@ -753,7 +761,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getLockActionItems(self.lockedIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Unlock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -770,7 +779,8 @@ for itm in self.__getLockActionItems( self.stealBreakLockIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Break Lock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -787,7 +797,8 @@ for itm in self.__getLockActionItems( self.stealBreakLockIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Steal Lock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -803,7 +814,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getNonChangelistItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove from Changelist"), self.trUtf8( """There are no files available/selected not """ @@ -821,7 +833,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) \ for itm in self.__getChangelistItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove from Changelist"), self.trUtf8( """There are no files available/selected belonging"""
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -75,7 +75,8 @@ reposURL = self.vcs.svnGetReposName(dname) if reposURL is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -88,7 +89,8 @@ # determine the base path of the project in the repository rx_base = QRegExp('(.+)/(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The list operation will""" @@ -113,7 +115,8 @@ self.close() return False if not reposPath: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion List"), self.trUtf8( """The repository URL is empty. Aborting..."""))
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -50,7 +50,8 @@ reposURL = self.vcs.svnGetReposName(path) if reposURL is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -63,7 +64,8 @@ # determine the base path of the project in the repository rx_base = QRegExp('(.+/)(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The operation will"""
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon Oct 14 19:30:36 2013 +0200 @@ -197,7 +197,8 @@ """ success = self.vcsImport(vcsDataDict, project.ppath)[0] if not success: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Create project in repository"), self.trUtf8( """The project could not be created in the repository.""" @@ -220,7 +221,8 @@ if not os.path.isfile(pfn): pfn += "z" if not os.path.isfile(pfn): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("New project"), self.trUtf8( """The project could not be checked out of the""" @@ -507,7 +509,8 @@ break if not ok: - res = E5MessageBox.yesNo(self.__ui, + res = E5MessageBox.yesNo( + self.__ui, self.trUtf8("Commit Changes"), self.trUtf8( """The commit affects files, that have unsaved""" @@ -1033,7 +1036,8 @@ reposURL = self.svnGetReposName(dname) if reposURL is None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -1059,7 +1063,8 @@ if self.otherData["standardLayout"]: rx_base = QRegExp('(.+)/(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The tag operation will""" @@ -1136,7 +1141,8 @@ name) yes = dia.exec_() == QDialog.Accepted else: - yes = E5MessageBox.yesNo(None, + yes = E5MessageBox.yesNo( + None, self.trUtf8("Revert changes"), self.trUtf8("""Do you really want to revert all changes of""" """ the project?""")) @@ -1171,7 +1177,8 @@ reposURL = self.svnGetReposName(dname) if reposURL is None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -1197,7 +1204,8 @@ if self.otherData["standardLayout"]: rx_base = QRegExp('(.+)/(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The switch operation will""" @@ -1851,7 +1859,8 @@ if dlg.exec_() == QDialog.Accepted: propName, propValue, recurse = dlg.getData() if not propName: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Set Property"), self.trUtf8( """You have to supply a property name. Aborting.""")) @@ -1904,7 +1913,8 @@ propName, recurse = dlg.getData() if not propName: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Delete Property"), self.trUtf8( """You have to supply a property name. Aborting.""")) @@ -2132,7 +2142,8 @@ output1, error = self.__svnGetFileForRevision(name, rev=rev1) if error: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Side-by-Side Difference"), error) return @@ -2141,7 +2152,8 @@ if rev2: output2, error = self.__svnGetFileForRevision(name, rev=rev2) if error: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Side-by-Side Difference"), error) return @@ -2153,7 +2165,8 @@ f1.close() name2 = name except IOError: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Side-by-Side Difference"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""")
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -96,7 +96,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -108,7 +108,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -144,7 +144,8 @@ self.buttonBox.setFocus() self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -174,7 +174,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -381,7 +382,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -396,7 +398,8 @@ f.write(eol.join(self.contents.toPlainText().splitlines())) f.close() except IOError as why: - E5MessageBox.critical(self, self.trUtf8('Save Diff'), + E5MessageBox.critical( + self, self.trUtf8('Save Diff'), self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.' '<br>Reason: {1}</p>') .format(fname, str(why)))
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -249,7 +249,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -132,7 +132,8 @@ procStarted = self.process.waitForStarted(5000) if not procStarted: self.inputGroup.setEnabled(False) - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -122,7 +122,8 @@ self.process.start('svn', args) procStarted = self.process.waitForStarted(5000) if not procStarted: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -181,7 +181,8 @@ self.errors.ensureCursorVisible() else: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -253,7 +254,8 @@ self.__finish() self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -389,7 +389,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. ' @@ -705,7 +706,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getCommitableItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Commit"), self.trUtf8("""There are no entries selected to be""" """ committed.""")) @@ -744,7 +746,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getUnversionedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Add"), self.trUtf8("""There are no unversioned entries""" """ available/selected.""")) @@ -765,7 +768,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -788,7 +792,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getMissingItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Revert"), self.trUtf8("""There are no missing entries""" """ available/selected.""")) @@ -805,7 +810,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Differences"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) @@ -825,13 +831,15 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getModifiedItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""There are no uncommitted changes""" """ available/selected.""")) return elif len(names) > 1: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Side-by-Side Diff"), self.trUtf8("""Only one file with uncommitted changes""" """ must be selected.""")) @@ -846,7 +854,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getLockActionItems(self.unlockedIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Lock"), self.trUtf8("""There are no unlocked files""" """ available/selected.""")) @@ -862,7 +871,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getLockActionItems(self.lockedIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Unlock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -879,7 +889,8 @@ for itm in self.__getLockActionItems( self.stealBreakLockIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Break Lock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -896,7 +907,8 @@ for itm in self.__getLockActionItems( self.stealBreakLockIndicators)] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Steal Lock"), self.trUtf8("""There are no locked files""" """ available/selected.""")) @@ -912,7 +924,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getNonChangelistItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove from Changelist"), self.trUtf8( """There are no files available/selected not """ @@ -930,7 +943,8 @@ names = [os.path.join(self.dname, itm.text(self.__pathColumn)) for itm in self.__getChangelistItems()] if not names: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Remove from Changelist"), self.trUtf8( """There are no files available/selected belonging"""
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -93,7 +93,8 @@ reposURL = self.vcs.svnGetReposName(dname) if reposURL is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -111,7 +112,8 @@ # determine the base path of the project in the repository rx_base = QRegExp('(.+)/(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The list operation will""" @@ -154,7 +156,8 @@ if not procStarted: self.inputGroup.setEnabled(False) self.inputGroup.hide() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'The process {0} could not be started. '
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -48,7 +48,8 @@ reposURL = self.vcs.svnGetReposName(path) if reposURL is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -61,7 +62,8 @@ # determine the base path of the project in the repository rx_base = QRegExp('(.+/)(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The list operation will"""
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon Oct 14 19:30:36 2013 +0200 @@ -205,7 +205,8 @@ """ success = self.vcsImport(vcsDataDict, project.ppath)[0] if not success: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Create project in repository"), self.trUtf8( """The project could not be created in the repository.""" @@ -228,7 +229,8 @@ if not os.path.isfile(pfn): pfn += "z" if not os.path.isfile(pfn): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("New project"), self.trUtf8( """The project could not be checked out of the""" @@ -486,7 +488,8 @@ break if not ok: - res = E5MessageBox.yesNo(self.__ui, + res = E5MessageBox.yesNo( + self.__ui, self.trUtf8("Commit Changes"), self.trUtf8( """The commit affects files, that have unsaved""" @@ -946,7 +949,8 @@ reposURL = self.svnGetReposName(dname) if reposURL is None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -972,7 +976,8 @@ if self.otherData["standardLayout"]: rx_base = QRegExp('(.+)/(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The tag operation will""" @@ -1041,7 +1046,8 @@ names) yes = dlg.exec_() == QDialog.Accepted else: - yes = E5MessageBox.yesNo(None, + yes = E5MessageBox.yesNo( + None, self.trUtf8("Revert changes"), self.trUtf8("""Do you really want to revert all changes of""" """ the project?""")) @@ -1063,7 +1069,8 @@ reposURL = self.svnGetReposName(dname) if reposURL is None: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8( """The URL of the project repository could not be""" @@ -1089,7 +1096,8 @@ if self.otherData["standardLayout"]: rx_base = QRegExp('(.+)/(trunk|tags|branches).*') if not rx_base.exactMatch(reposURL): - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Error"), self.trUtf8("""The URL of the project repository has an""" """ invalid format. The switch operation will""" @@ -1719,7 +1727,8 @@ if dlg.exec_() == QDialog.Accepted: propName, fileFlag, propValue = dlg.getData() if not propName: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Set Property"), self.trUtf8("""You have to supply a property name.""" """ Aborting.""")) @@ -1763,7 +1772,8 @@ return if not propName: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Delete Property"), self.trUtf8("""You have to supply a property name.""" """ Aborting.""")) @@ -1974,7 +1984,8 @@ output1, error = self.__svnGetFileForRevision(name, rev=rev1) if error: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Side-by-Side Difference"), error) return @@ -1983,7 +1994,8 @@ if rev2: output2, error = self.__svnGetFileForRevision(name, rev=rev2) if error: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Side-by-Side Difference"), error) return @@ -1995,7 +2007,8 @@ f1.close() name2 = name except IOError: - E5MessageBox.critical(self.__ui, + E5MessageBox.critical( + self.__ui, self.trUtf8("Subversion Side-by-Side Difference"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""")
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -64,7 +64,8 @@ ' QColorDialog.getColor({0}, None, "{1}")'.format( coStr, self.eTitle.text())) except: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("QColorDialog Wizard Error"), self.trUtf8( """<p>The colour <b>{0}</b> is not valid.</p>""")
--- a/Preferences/ConfigurationDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ConfigurationDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -557,7 +557,8 @@ mod = getattr(mod, comp) return mod except ImportError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Configuration Page Error"), self.trUtf8("""<p>The configuration page <b>{0}</b>""" """ could not be loaded.</p>""").format(name))
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Mon Oct 14 19:30:36 2013 +0200 @@ -227,7 +227,8 @@ [QAbstractSocket.IPv4Protocol, QAbstractSocket.IPv6Protocol]: self.allowedHostsList.addItem(allowedHost) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add allowed host"), self.trUtf8( """<p>The entered address <b>{0}</b> is not""" @@ -259,7 +260,8 @@ [QAbstractSocket.IPv4Protocol, QAbstractSocket.IPv6Protocol]: self.allowedHostsList.currentItem().setText(allowedHost) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Edit allowed host"), self.trUtf8( """<p>The entered address <b>{0}</b> is not"""
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Mon Oct 14 19:30:36 2013 +0200 @@ -180,7 +180,8 @@ QFileInfo(QDir(installedAPIFilesPath), file) .absoluteFilePath())) else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Add from installed APIs"), self.trUtf8("""There are no APIs installed yet.""" """ Selection is not available."""))
--- a/Preferences/ConfigurationPages/EditorFilePage.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Mon Oct 14 19:30:36 2013 +0200 @@ -186,7 +186,8 @@ """ if not self.__showsOpenFilters and \ filter.count("*") != 1: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add File Filter"), self.trUtf8("""A Save File Filter must contain exactly one""" """ wildcard pattern. Yours contains {0}.""")\ @@ -194,7 +195,8 @@ return False if filter.count("*") == 0: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add File Filter"), self.trUtf8("""A File Filter must contain at least one""" """ wildcard pattern."""))
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Mon Oct 14 19:30:36 2013 +0200 @@ -398,7 +398,8 @@ HighlightingStylesWriter(f, lexers).writeXML() f.close() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export Highlighting Styles"), self.trUtf8( """<p>The highlighting styles could not be exported""" @@ -429,7 +430,8 @@ reader.readXML() f.close() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Import Highlighting Styles"), self.trUtf8( """<p>The highlighting styles could not be read"""
--- a/Preferences/ConfigurationPages/EmailPage.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Mon Oct 14 19:30:36 2013 +0200 @@ -123,7 +123,8 @@ server.login(self.mailUserEdit.text(), self.mailPasswordEdit.text()) QApplication.restoreOverrideCursor() - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Login Test"), self.trUtf8("""The login test succeeded.""")) except (smtplib.SMTPException, socket.error) as e: @@ -139,7 +140,8 @@ errorStr = str(e) else: errorStr = str(e) - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Login Test"), self.trUtf8( """<p>The login test failed.<br>Reason: {0}</p>""") @@ -158,7 +160,8 @@ errorStr = str(e) else: errorStr = str(e) - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Login Test"), self.trUtf8("""<p>The login test failed.<br>Reason: {0}</p>""") .format(errorStr))
--- a/Preferences/Shortcuts.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/Shortcuts.py Mon Oct 14 19:30:36 2013 +0200 @@ -198,7 +198,8 @@ ShortcutsWriter(f).writeXML() f.close() else: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, QApplication.translate("Shortcuts", "Export Keyboard Shortcuts"), QApplication.translate( "Shortcuts", @@ -229,7 +230,8 @@ saveShortcuts() syncPreferences() else: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, QApplication.translate("Shortcuts", "Import Keyboard Shortcuts"), QApplication.translate( "Shortcuts",
--- a/Preferences/ShortcutsDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ShortcutsDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -306,7 +306,8 @@ itmseq = itm.text(col) # step 1: check if shortcut is already allocated if keystr == itmseq: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Edit shortcuts"), self.trUtf8( """<p><b>{0}</b> has already been""" @@ -325,7 +326,8 @@ # step 2: check if shortcut hides an already allocated if itmseq.startswith("{0}+".format(keystr)): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Edit shortcuts"), self.trUtf8( """<p><b>{0}</b> hides the <b>{1}</b>""" @@ -341,7 +343,8 @@ # step 3: check if shortcut is hidden by an # already allocated if keystr.startswith("{0}+".format(itmseq)): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Edit shortcuts"), self.trUtf8( """<p><b>{0}</b> is hidden by the """
--- a/Preferences/ToolConfigurationDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ToolConfigurationDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -97,21 +97,24 @@ redirect = self.redirectionModes[self.redirectCombo.currentIndex()][0] if not executable: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool entry"), self.trUtf8("You have to set an executable to add to the" " Tools-Menu first.")) return if not menutext: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool entry"), self.trUtf8("You have to insert a menuentry text to add the" " selected program to the Tools-Menu first.")) return if not Utilities.isinpath(executable): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool entry"), self.trUtf8("The selected file could not be found or" " is not an executable." @@ -120,7 +123,8 @@ if len(self.toolsList.findItems( menutext, Qt.MatchFlags(Qt.MatchExactly))): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool entry"), self.trUtf8("An entry for the menu text {0} already exists.")\ .format(menutext)) @@ -152,21 +156,24 @@ redirect = self.redirectionModes[self.redirectCombo.currentIndex()][0] if not executable: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Change tool entry"), self.trUtf8("You have to set an executable to change the" " Tools-Menu entry.")) return if not menutext: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Change tool entry"), self.trUtf8("You have to insert a menuentry text to change the" " selected Tools-Menu entry.")) return if not Utilities.isinpath(executable): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Change tool entry"), self.trUtf8("The selected file could not be found or" " is not an executable." @@ -259,7 +266,8 @@ if execfile: execfile = Utilities.toNativeSeparators(execfile) if not Utilities.isinpath(execfile): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Select executable"), self.trUtf8("The selected file is not an executable." " Please choose an executable filename."))
--- a/Preferences/ToolGroupConfigurationDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Preferences/ToolGroupConfigurationDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -56,14 +56,16 @@ groupName = self.nameEdit.text() if not groupName: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool group entry"), self.trUtf8("You have to give a name for the group to add.")) return if len(self.groupsList.findItems( groupName, Qt.MatchFlags(Qt.MatchExactly))): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool group entry"), self.trUtf8("An entry for the group name {0} already exists.")\ .format(groupName)) @@ -84,14 +86,16 @@ groupName = self.nameEdit.text() if not groupName: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool group entry"), self.trUtf8("You have to give a name for the group to add.")) return if len(self.groupsList.findItems( groupName, Qt.MatchFlags(Qt.MatchExactly))): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add tool group entry"), self.trUtf8("An entry for the group name {0} already exists.")\ .format(groupName)) @@ -109,7 +113,8 @@ if row < 0: return - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Delete tool group entry"), self.trUtf8("""<p>Do you really want to delete the tool group""" """ <b>"{0}"</b>?</p>""")\
--- a/Project/CreateDialogCodeDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/CreateDialogCodeDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -112,7 +112,8 @@ self.__module is not None and \ self.classNameCombo.count() == 0: self.__initError = True - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Create Dialog Code"), self.trUtf8( """The file <b>{0}</b> exists but does not contain""" @@ -140,7 +141,8 @@ dlg = uic.loadUi(self.formFile) return dlg.objectName() except (AttributeError, ImportError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("uic error"), self.trUtf8( """<p>There was an error loading the form <b>{0}</b>""" @@ -157,7 +159,8 @@ dlg = uic.loadUi(self.formFile) return dlg.metaObject().className() except (AttributeError, ImportError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("uic error"), self.trUtf8( """<p>There was an error loading the form <b>{0}</b>""" @@ -320,7 +323,8 @@ self.slotsView.sortByColumn(0, Qt.AscendingOrder) except (AttributeError, ImportError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("uic error"), self.trUtf8( """<p>There was an error loading the form <b>{0}</b>""" @@ -388,7 +392,8 @@ template = tmplFile.read() tmplFile.close() except IOError as why: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Code Generation"), self.trUtf8( """<p>Could not open the code template file""" @@ -423,7 +428,8 @@ if not sourceImpl[-1].endswith("\n"): sourceImpl[-1] = "{0}{1}".format(sourceImpl[-1], "\n") except IOError as why: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Code Generation"), self.trUtf8( """<p>Could not open the source file "{0}".</p>""" @@ -501,7 +507,8 @@ srcFile.write("".join(sourceImpl)) srcFile.close() except IOError as why: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Code Generation"), self.trUtf8("""<p>Could not write the source file "{0}".</p>""" """<p>Reason: {1}</p>""")\
--- a/Project/Project.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/Project.py Mon Oct 14 19:30:36 2013 +0200 @@ -310,7 +310,8 @@ if progLanguages: for progLanguage in progLanguages: if progLanguage not in self.__projectProgLanguages: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Registering Project Type"), self.trUtf8( """<p>The Programming Language <b>{0}</b> is not""" @@ -320,7 +321,8 @@ return if type_ in self.__projectProgLanguages[progLanguage]: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Registering Project Type"), self.trUtf8( """<p>The Project type <b>{0}</b> is already""" @@ -331,7 +333,8 @@ return if type_ in self.__projectTypes: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Registering Project Type"), self.trUtf8("""<p>The Project type <b>{0}</b> is already""" """ registered.</p>""").format(type_) @@ -664,7 +667,8 @@ f.close() else: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read project file"), self.trUtf8( "<p>The project file <b>{0}</b> could not be read.</p>")\ @@ -763,7 +767,8 @@ os.path.basename(fn))[0]).writeXML() res = True else: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save project file"), self.trUtf8( "<p>The project file <b>{0}</b> could not be" @@ -798,7 +803,8 @@ reader.readXML() f.close() else: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read user project properties"), self.trUtf8( "<p>The user specific project properties file" @@ -821,7 +827,8 @@ f, os.path.splitext(os.path.basename(fn))[0]).writeXML() f.close() else: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save user project properties"), self.trUtf8( "<p>The user specific project properties file <b>{0}</b>" @@ -854,7 +861,8 @@ """ if self.pfile is None: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read project session"), self.trUtf8("Please save the project first.")) return @@ -871,7 +879,8 @@ f.close() else: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read project session"), self.trUtf8( "<p>The project session file <b>{0}</b> could not be" @@ -887,7 +896,8 @@ """ if self.pfile is None: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save project session"), self.trUtf8("Please save the project first.")) return @@ -904,7 +914,8 @@ f.close() else: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save project session"), self.trUtf8( "<p>The project session file <b>{0}</b> could not be" @@ -915,7 +926,8 @@ Private method to delete the session file. """ if self.pfile is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete project session"), self.trUtf8("Please save the project first.")) return @@ -928,7 +940,8 @@ try: os.remove(fn) except OSError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete project session"), self.trUtf8( "<p>The project session file <b>{0}</b> could" @@ -939,7 +952,8 @@ Private method to read in the project tasks file (.e4t). """ if self.pfile is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read tasks"), self.trUtf8("Please save the project first.")) return @@ -955,7 +969,8 @@ reader.readXML() f.close() else: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be read.</p>")\ @@ -974,7 +989,8 @@ f = QFile(fn) ok = f.open(QIODevice.WriteOnly) if not ok: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be written.</p>") @@ -1012,7 +1028,8 @@ """ if self.pfile is None: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read debugger properties"), self.trUtf8("Please save the project first.")) return @@ -1028,7 +1045,8 @@ f.close() else: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Read debugger properties"), self.trUtf8( "<p>The project debugger properties file <b>{0}</b>" @@ -1043,7 +1061,8 @@ """ if self.pfile is None: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save debugger properties"), self.trUtf8("Please save the project first.")) return @@ -1059,7 +1078,8 @@ f.close() else: if not quiet: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Save debugger properties"), self.trUtf8( "<p>The project debugger properties file <b>{0}</b>" @@ -1070,7 +1090,8 @@ Private method to delete the project debugger properties file (.e4d). """ if self.pfile is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete debugger properties"), self.trUtf8("Please save the project first.")) return @@ -1083,7 +1104,8 @@ try: os.remove(fn) except OSError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete debugger properties"), self.trUtf8( "<p>The project debugger properties file" @@ -1178,7 +1200,8 @@ """ if len(self.pdata["TRANSLATIONPATTERN"]) == 0 or \ self.pdata["TRANSLATIONPATTERN"][0] == '': - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Add Language"), self.trUtf8( "You have to specify a translation pattern first.")) @@ -1272,7 +1295,8 @@ if os.path.exists(fn): os.remove(fn) except IOError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete translation"), self.trUtf8( "<p>The selected translation file <b>{0}</b> could not be" @@ -1292,7 +1316,8 @@ if os.path.exists(fn): os.remove(fn) except IOError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete translation"), self.trUtf8( "<p>The selected translation file <b>{0}</b> could" @@ -1416,7 +1441,8 @@ os.makedirs(target) if os.path.exists(targetfile): - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("Add file"), self.trUtf8( "<p>The file <b>{0}</b> already" @@ -1428,7 +1454,8 @@ shutil.copy(fn, target) except IOError as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Add file"), self.trUtf8( "<p>The selected file <b>{0}</b> could" @@ -1439,7 +1466,8 @@ self.appendFile(targetfile, isSource or filter == 'source') else: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Add file"), self.trUtf8("The target directory must not be empty.")) @@ -1469,7 +1497,8 @@ if len(files) == 0: if not quiet: - E5MessageBox.information(self.ui, + E5MessageBox.information( + self.ui, self.trUtf8("Add directory"), self.trUtf8("<p>The source directory doesn't contain" " any files belonging to the selected category.</p>")) @@ -1480,7 +1509,8 @@ try: os.makedirs(target) except IOError as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Add directory"), self.trUtf8( "<p>The target directory <b>{0}</b> could not be" @@ -1497,7 +1527,8 @@ if not Utilities.samepath(target, source): try: if os.path.exists(targetfile): - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("Add directory"), self.trUtf8( "<p>The file <b>{0}</b> already exists.</p>" @@ -1550,7 +1581,8 @@ if dlg.exec_() == QDialog.Accepted: filetype, source, target, recursive = dlg.getData() if target == '': - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Add directory"), self.trUtf8("The target directory must not be empty.")) return @@ -1560,7 +1592,8 @@ return if source == '': - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Add directory"), self.trUtf8("The source directory must not be empty.")) return @@ -1694,7 +1727,8 @@ newfn = Utilities.toNativeSeparators(newfn) if os.path.exists(newfn): - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("Rename File"), self.trUtf8("""<p>The file <b>{0}</b> already exists.""" """ Overwrite it?</p>""") @@ -1706,7 +1740,8 @@ try: os.rename(oldfn, newfn) except OSError as msg: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Rename File"), self.trUtf8( """<p>The file <b>{0}</b> could not be renamed.<br />""" @@ -1897,7 +1932,8 @@ for f in glob.glob(pat): os.remove(f) except EnvironmentError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete file"), self.trUtf8( "<p>The selected file <b>{0}</b> could not be" @@ -1921,7 +1957,8 @@ try: shutil.rmtree(dn, True) except EnvironmentError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Delete directory"), self.trUtf8("<p>The selected directory <b>{0}</b> could not be" " deleted.</p>").format(dn)) @@ -2002,7 +2039,8 @@ try: os.makedirs(self.ppath) except EnvironmentError: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create project directory"), self.trUtf8( "<p>The project directory <b>{0}</b> could not" @@ -2059,7 +2097,8 @@ f = open(ms, "w") f.close() except IOError as err: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create main script"), self.trUtf8( "<p>The mainscript <b>{0}</b> could not" @@ -2070,7 +2109,8 @@ ms = "" # add existing files to the project - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("New Project"), self.trUtf8("""Add existing files to the project?"""), yesDefault=True) @@ -2119,7 +2159,8 @@ self.setDirty(True) if self.vcs is not None: # edit VCS command options - vcores = E5MessageBox.yesNo(self.ui, + vcores = E5MessageBox.yesNo( + self.ui, self.trUtf8("New Project"), self.trUtf8( """Would you like to edit the VCS""" @@ -2132,7 +2173,8 @@ self.vcs.vcsSetOptions(codlg.getOptions()) # add project file to repository if res == 0: - apres = E5MessageBox.yesNo(self.ui, + apres = E5MessageBox.yesNo( + self.ui, self.trUtf8("New project"), self.trUtf8( "Shall the project file be added" @@ -2182,7 +2224,8 @@ self.setDirty(True) if self.vcs is not None: # edit VCS command options - vcores = E5MessageBox.yesNo(self.ui, + vcores = E5MessageBox.yesNo( + self.ui, self.trUtf8("New Project"), self.trUtf8( """Would you like to edit the VCS command""" @@ -2640,7 +2683,8 @@ if ex: fn += ex if QFileInfo(fn).exists(): - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("Save File"), self.trUtf8("""<p>The file <b>{0}</b> already exists.""" """ Overwrite it?</p>""").format(fn), @@ -2677,7 +2721,8 @@ @return flag indicating whether this operation was successful (boolean) """ if self.isDirty(): - res = E5MessageBox.okToClearData(self.parent(), + res = E5MessageBox.okToClearData( + self.parent(), self.trUtf8("Close Project"), self.trUtf8("The current project has unsaved changes."), self.saveProject) @@ -2806,7 +2851,8 @@ filesWithSyntaxErrors += 1 if reportSyntaxErrors and filesWithSyntaxErrors > 0: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Syntax errors detected"), self.trUtf8( """The project contains %n file(s) with syntax errors.""", @@ -2837,7 +2883,8 @@ filesWithSyntaxErrors += 1 if reportSyntaxErrors and filesWithSyntaxErrors > 0: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Syntax errors detected"), self.trUtf8( """The project contains %n file(s) with syntax errors.""", @@ -3923,7 +3970,8 @@ # if newfiles is empty, put up message box informing user nothing found if not newFiles: if onUserDemand: - E5MessageBox.information(self.ui, + E5MessageBox.information( + self.ui, self.trUtf8("Search New Files"), self.trUtf8("There were no new files found to be added.")) return @@ -4057,7 +4105,8 @@ if override: # override failed, revert to original QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Version Control System"), self.trUtf8( "<p>The selected VCS <b>{0}</b> could not be" @@ -4067,7 +4116,8 @@ return self.initVCS(nooverride=True) QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Version Control System"), self.trUtf8( "<p>The selected VCS <b>{0}</b> could not be" @@ -4183,7 +4233,8 @@ """ fn = self.getMainScript(True) if fn is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Coverage Data"), self.trUtf8("There is no main script defined for the" " current project. Aborting")) @@ -4230,7 +4281,8 @@ """ fn = self.getMainScript(True) if fn is None: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Profile Data"), self.trUtf8("There is no main script defined for the" " current project. Aborting")) @@ -4305,7 +4357,8 @@ """ Private method to handle the application diagram context menu action. """ - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), yesDefault=True) @@ -4422,7 +4475,8 @@ """ pkglist = os.path.join(self.ppath, "PKGLIST") if os.path.exists(pkglist): - res = E5MessageBox.yesNo(self.ui, + res = E5MessageBox.yesNo( + self.ui, self.trUtf8("Create Package List"), self.trUtf8("<p>The file <b>PKGLIST</b> already" " exists.</p><p>Overwrite it?</p>"), @@ -4459,7 +4513,8 @@ pkglistFile.write("\n") # ensure the file ends with an empty line pkglistFile.close() except IOError as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Package List"), self.trUtf8( """<p>The file <b>PKGLIST</b> could not be created.</p>""" @@ -4477,7 +4532,8 @@ """ pkglist = os.path.join(self.ppath, "PKGLIST") if not os.path.exists(pkglist): - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8("""<p>The file <b>PKGLIST</b> does not exist. """ """Aborting...</p>""")) @@ -4485,7 +4541,8 @@ if len(self.pdata["MAINSCRIPT"]) == 0 or \ len(self.pdata["MAINSCRIPT"][0]) == 0: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8( """The project does not have a main script defined. """ @@ -4498,7 +4555,8 @@ pkglistFile.close() names = sorted(names.splitlines()) except IOError as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8( """<p>The file <b>PKGLIST</b> could not be read.</p>""" @@ -4510,7 +4568,8 @@ try: archiveFile = zipfile.ZipFile(archive, "w") except IOError as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8( """<p>The eric5 plugin archive file <b>{0}</b> could """ @@ -4535,7 +4594,8 @@ os.path.join(self.ppath, self.pdata["MAINSCRIPT"][0])) except OSError as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8( """<p>The file <b>{0}</b> could not be stored """ @@ -4557,7 +4617,8 @@ """created successfully.</p>""")\ .format(os.path.basename(archive))) else: - E5MessageBox.information(self.ui, + E5MessageBox.information( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8( """<p>The eric5 plugin archive file <b>{0}</b> was """ @@ -4601,7 +4662,8 @@ sourcelines, encoding = Utilities.readEncodedFile(filename) sourcelines = sourcelines.splitlines(True) except (IOError, UnicodeError) as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8("""<p>The plugin file <b>{0}</b> could """ """not be read.</p>""" @@ -4640,7 +4702,8 @@ sourcelines = Utilities.readEncodedFile(filename)[0] sourcelines = sourcelines.splitlines(True) except (IOError, UnicodeError) as why: - E5MessageBox.critical(self.ui, + E5MessageBox.critical( + self.ui, self.trUtf8("Create Plugin Archive"), self.trUtf8( """<p>The plugin file <b>{0}</b> could """
--- a/Project/ProjectBaseBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/ProjectBaseBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -523,10 +523,11 @@ QApplication.processEvents() if selectedEntries == 0: - E5MessageBox.information(self, - QApplication.translate('ProjectBaseBrowser', "Select entries"), - QApplication.translate('ProjectBaseBrowser', - """There were no matching entries found.""")) + E5MessageBox.information( + self, + QApplication.translate('ProjectBaseBrowser', "Select entries"), + QApplication.translate('ProjectBaseBrowser', + """There were no matching entries found.""")) def selectLocalEntries(self): """
--- a/Project/ProjectFormsBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/ProjectFormsBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -565,7 +565,8 @@ fname += ex if os.path.exists(fname): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("New Form"), self.trUtf8("The file already exists! Overwrite it?"), icon=E5MessageBox.Warning) @@ -576,7 +577,8 @@ try: shutil.copy(templateFile, fname) except IOError as e: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("New Form"), self.trUtf8( "<p>The new form file <b>{0}</b> could not be created.<br>" @@ -672,7 +674,8 @@ if self.compiledFile not in self.project.pdata["SOURCES"]: self.project.appendFile(ofn) if not self.noDialog and not ui.notificationsEnabled(): - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Form Compilation"), self.trUtf8("The compilation of the form file" " was successful.")) @@ -685,7 +688,8 @@ self.project.projectFormCompiled.emit(self.compiledFile) except IOError as msg: if not self.noDialog: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Form Compilation"), self.trUtf8( "<p>The compilation of the form file failed.</p>" @@ -699,7 +703,8 @@ "<p>Reason: {0}</p>").format(str(msg))) else: if not self.noDialog: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Form Compilation"), self.trUtf8("The compilation of the form file failed.")) else: @@ -780,7 +785,8 @@ self.compileRunning = False if progress is not None: progress.cancel() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'Could not start {0}.<br>'
--- a/Project/ProjectInterfacesBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/ProjectInterfacesBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -474,7 +474,8 @@ for file in fileList: self.project.appendFile(file) if not self.noDialog and not ui.notificationsEnabled(): - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Interface Compilation"), self.trUtf8( "The compilation of the interface file was" @@ -487,7 +488,8 @@ " successful.")) else: if not self.noDialog: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Interface Compilation"), self.trUtf8( "The compilation of the interface file failed.")) @@ -532,7 +534,8 @@ self.compileRunning = False if progress is not None: progress.cancel() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start {0}.<br>'
--- a/Project/ProjectResourcesBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/ProjectResourcesBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -428,7 +428,8 @@ fname += ex if os.path.exists(fname): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("New Resource"), self.trUtf8("The file already exists! Overwrite it?"), icon=E5MessageBox.Warning) @@ -449,7 +450,8 @@ rcfile.write('</RCC>\n') rcfile.close() except IOError as e: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("New Resource"), self.trUtf8("<p>The new resource file <b>{0}</b> could not" " be created.<br>Problem: {1}</p>")\ @@ -547,7 +549,8 @@ if self.compiledFile not in self.project.pdata["SOURCES"]: self.project.appendFile(ofn) if not self.noDialog and not ui.notificationsEnabled(): - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Resource Compilation"), self.trUtf8("The compilation of the resource file" " was successful.")) @@ -559,14 +562,16 @@ " was successful.")) except IOError as msg: if not self.noDialog: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Resource Compilation"), self.trUtf8( "<p>The compilation of the resource file" " failed.</p><p>Reason: {0}</p>").format(str(msg))) else: if not self.noDialog: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Resource Compilation"), self.trUtf8( "The compilation of the resource file failed.")) @@ -657,7 +662,8 @@ self.compileRunning = False if progress is not None: progress.cancel() - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'Could not start {0}.<br>'
--- a/Project/ProjectSourcesBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/ProjectSourcesBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -659,7 +659,8 @@ try: os.mkdir(packagePath) except OSError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add new Python package"), self.trUtf8( """<p>The package directory <b>{0}</b> could""" @@ -673,7 +674,8 @@ f = open(packageFile, "w", encoding="utf-8") f.close() except IOError as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Add new Python package"), self.trUtf8( """<p>The package file <b>{0}</b> could""" @@ -897,7 +899,8 @@ fn = itm.fileName() except AttributeError: fn = itm.dirName() - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Class Diagram"), self.trUtf8("""Include class attributes?"""), yesDefault=True) @@ -916,7 +919,8 @@ except AttributeError: fn = itm.dirName() package = os.path.isdir(fn) and fn or os.path.dirname(fn) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?""")) from Graphics.UMLDialog import UMLDialog @@ -935,7 +939,8 @@ except AttributeError: fn = itm.dirName() package = os.path.isdir(fn) and fn or os.path.dirname(fn) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), yesDefault=True) @@ -949,7 +954,8 @@ """ Private method to handle the application diagram context menu action. """ - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), yesDefault=True)
--- a/Project/ProjectTranslationsBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Project/ProjectTranslationsBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -753,7 +753,8 @@ except IndexError: langs = [] if not langs: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Write temporary project file"), self.trUtf8("""No translation files (*.ts) selected.""")) return False @@ -798,7 +799,8 @@ pf.close() self.__tmpProjects.append(outFile) except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Write temporary project file"), self.trUtf8( "<p>The temporary project file <b>{0}</b> could not" @@ -912,13 +914,15 @@ "The generation of the translation files (*.ts)" " was successful.")) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Translation file generation"), self.trUtf8( "The generation of the translation files (*.ts)" " was successful.")) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Translation file generation"), self.trUtf8( "The generation of the translation files (*.ts) has" @@ -1025,7 +1029,8 @@ self.pylupdateProcRunning = True self.__pylupdateProcesses.append((proc, tempProjectFile)) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( 'Could not start {0}.<br>' @@ -1093,7 +1098,8 @@ self.trUtf8("The release of the translation files (*.qm)" " was successful.")) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Translation file release"), self.trUtf8("The release of the translation files (*.qm)" " was successful.")) @@ -1108,7 +1114,8 @@ if os.path.exists(qmFile): shutil.move(qmFile, target) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Translation file release"), self.trUtf8( "The release of the translation files (*.qm) has failed.")) @@ -1193,7 +1200,8 @@ self.lreleaseProcRunning = True self.__lreleaseProcesses.append((proc, tempProjectFile)) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start lrelease.<br>'
--- a/PyUnit/UnittestDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/PyUnit/UnittestDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -254,9 +254,10 @@ prog = self.testsuiteComboBox.currentText() if not prog: - E5MessageBox.critical(self, - self.trUtf8("Unittest"), - self.trUtf8("You must enter a test suite file.")) + E5MessageBox.critical( + self, + self.trUtf8("Unittest"), + self.trUtf8("You must enter a test suite file.")) return # prepend the selected file to the testsuite combobox @@ -328,13 +329,14 @@ module) except: exc_type, exc_value, exc_tb = sys.exc_info() - E5MessageBox.critical(self, - self.trUtf8("Unittest"), - self.trUtf8( - "<p>Unable to run test <b>{0}</b>.<br>" - "{1}<br>{2}</p>") - .format(self.testName, str(exc_type), - str(exc_value))) + E5MessageBox.critical( + self, + self.trUtf8("Unittest"), + self.trUtf8( + "<p>Unable to run test <b>{0}</b>.<br>" + "{1}<br>{2}</p>") + .format(self.testName, str(exc_type), + str(exc_value))) return # now set up the coverage stuff @@ -386,11 +388,12 @@ @param exc_value value of exception occured during preparation (string) """ if nrTests == 0: - E5MessageBox.critical(self, - self.trUtf8("Unittest"), - self.trUtf8( - "<p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p>") - .format(self.testName, exc_type, exc_value)) + E5MessageBox.critical( + self, + self.trUtf8("Unittest"), + self.trUtf8( + "<p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p>") + .format(self.testName, exc_type, exc_value)) return self.totalTests = nrTests
--- a/QScintilla/Editor.py Mon Oct 14 18:26:25 2013 +0200 +++ b/QScintilla/Editor.py Mon Oct 14 19:30:36 2013 +0200 @@ -312,7 +312,8 @@ if self.fileName is not None: if (QFileInfo(self.fileName).size() // 1024) > \ Preferences.getEditor("WarnFilesize"): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Open File"), self.trUtf8("""<p>The size of the file <b>{0}</b>""" """ is <b>{1} KB</b>.""" @@ -1194,14 +1195,16 @@ if exporter: exporter.exportSource() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export source"), self.trUtf8( """<p>No exporter available for the """ """export format <b>{0}</b>. Aborting...</p>""")\ .format(exporterFormat)) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export source"), self.trUtf8("""No export format given. Aborting...""")) @@ -1664,7 +1667,8 @@ """ Private slot to handle the modificationAttempted signal. """ - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Modification of Read Only file"), self.trUtf8("""You are attempting to change a read only file. """ """Please save to a different file first.""")) @@ -2700,7 +2704,8 @@ fn = self.fileName if fn is None: fn = self.noName - res = E5MessageBox.okToClearData(self, + res = E5MessageBox.okToClearData( + self, self.trUtf8("File Modified"), self.trUtf8("<p>The file <b>{0}</b> has unsaved changes.</p>") .format(fn), @@ -2748,7 +2753,9 @@ txt, self.encoding = Utilities.readEncodedFile(fn) except (UnicodeDecodeError, IOError) as why: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.vm, self.trUtf8('Open File'), + E5MessageBox.critical( + self.vm, + self.trUtf8('Open File'), self.trUtf8('<p>The file <b>{0}</b> could not be opened.</p>' '<p>Reason: {1}</p>') .format(fn, str(why))) @@ -2849,7 +2856,9 @@ os.chmod(fn, permissions) return True except (IOError, Utilities.CodingError, UnicodeError) as why: - E5MessageBox.critical(self, self.trUtf8('Save File'), + E5MessageBox.critical( + self, + self.trUtf8('Save File'), self.trUtf8('<p>The file <b>{0}</b> could not be saved.<br/>' 'Reason: {1}</p>') .format(fn, str(why))) @@ -2914,7 +2923,8 @@ if ex: fn += ex if QFileInfo(fn).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save File"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fn), @@ -4215,7 +4225,8 @@ elif acs == QsciScintilla.AcsAll: self.autoCompleteFromAll() else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Autocompletion"), self.trUtf8("""Autocompletion is not available because""" """ there is no autocompletion source set.""")) @@ -4314,7 +4325,8 @@ """ if self.__acHookFunction is not None: # there is another provider registered already - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Activating Auto-Completion Provider"), self.trUtf8("""Auto-completion provider cannot be connected""" """ because there is already another one active.""" @@ -4502,7 +4514,8 @@ """ if self.__ctHookFunction is not None: # there is another provider registered already - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Activating Calltip Provider"), self.trUtf8("""Calltip provider cannot be connected""" """ because there is already another one active.""" @@ -5127,13 +5140,15 @@ self.coverageMarkersShown.emit(True) else: if not silent: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Show Code Coverage Annotations"), self.trUtf8("""All lines have been covered.""")) self.showingNotcoveredMarkers = True else: if not silent: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Show Code Coverage Annotations"), self.trUtf8("""There is no coverage file available.""")) @@ -5364,12 +5379,14 @@ for handle in list(self.syntaxerrors.keys()): if self.markerLine(handle) == line: errors = [e[0] for e in self.syntaxerrors[handle]] - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Syntax Error"), "\n".join(errors)) break else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Syntax Error"), self.trUtf8("No syntax error message available.")) @@ -5494,12 +5511,14 @@ for handle in list(self.warnings.keys()): if self.markerLine(handle) == line: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Warning"), '\n'.join([w[0] for w in self.warnings[handle]])) break else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Warning"), self.trUtf8("No warning messages available.")) @@ -5665,7 +5684,8 @@ lines = f.readlines() f.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error loading macro"), self.trUtf8( "<p>The macro file <b>{0}</b> could not be read.</p>") @@ -5673,7 +5693,8 @@ return if len(lines) != 2: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error loading macro"), self.trUtf8("<p>The macro file <b>{0}</b> is corrupt.</p>") .format(fname)) @@ -5709,7 +5730,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save macro"), self.trUtf8("<p>The macro file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -5724,7 +5746,8 @@ f.write(self.macros[name].save()) f.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving macro"), self.trUtf8( "<p>The macro file <b>{0}</b> could not be written.</p>") @@ -5736,7 +5759,8 @@ Public method to start macro recording. """ if self.recording: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Start Macro Recording"), self.trUtf8("Macro recording is already active. Start new?"), icon=E5MessageBox.Warning, @@ -5893,7 +5917,8 @@ """<br><b>Warning:</b> You will lose""" """ your changes upon reopening it.""") yesDefault = False - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("File changed"), msg, icon=E5MessageBox.Warning, yesDefault=yesDefault) @@ -6153,7 +6178,8 @@ if not QFileInfo(fname).isDir(): self.vm.openSourceFile(fname) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") .format(fname)) @@ -6310,7 +6336,8 @@ package = os.path.isdir(self.fileName) and \ self.fileName or os.path.dirname(self.fileName) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), yesDefault=True) @@ -6329,7 +6356,8 @@ package = os.path.isdir(self.fileName) and self.fileName \ or os.path.dirname(self.fileName) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?""")) self.importsDiagram = UMLDialog( @@ -6342,7 +6370,8 @@ Private method to handle the Imports Diagram context menu action. """ from Graphics.UMLDialog import UMLDialog - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), yesDefault=True) @@ -7038,7 +7067,8 @@ try: txt = float(txt) except ValueError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Sort Lines"), self.trUtf8( """The selection contains illegal data for a"""
--- a/QScintilla/Exporters/ExporterBase.py Mon Oct 14 18:26:25 2013 +0200 +++ b/QScintilla/Exporters/ExporterBase.py Mon Oct 14 19:30:36 2013 +0200 @@ -55,7 +55,8 @@ if ex: fn += ex if QFileInfo(fn).exists(): - res = E5MessageBox.yesNo(self.editor, + res = E5MessageBox.yesNo( + self.editor, self.trUtf8("Export source"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fn),
--- a/QScintilla/Exporters/ExporterTEX.py Mon Oct 14 18:26:25 2013 +0200 +++ b/QScintilla/Exporters/ExporterTEX.py Mon Oct 14 19:30:36 2013 +0200 @@ -267,7 +267,8 @@ f.close() except IOError as err: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.editor, + E5MessageBox.critical( + self.editor, self.trUtf8("Export source"), self.trUtf8( """<p>The source could not be exported to"""
--- a/QScintilla/MiniEditor.py Mon Oct 14 18:26:25 2013 +0200 +++ b/QScintilla/MiniEditor.py Mon Oct 14 19:30:36 2013 +0200 @@ -247,7 +247,9 @@ """ Private slot to show a little About message. """ - E5MessageBox.about(self, self.trUtf8("About eric5 Mini Editor"), + E5MessageBox.about( + self, + self.trUtf8("About eric5 Mini Editor"), self.trUtf8("The eric5 Mini Editor is an editor component" " based on QScintilla. It may be used for simple" " editing tasks, that don't need the power of" @@ -2076,10 +2078,11 @@ @return flag indicating, if it is ok to continue (boolean) """ if self.__textEdit.isModified(): - ret = E5MessageBox.okToClearData(self, - self.trUtf8("eric5 Mini Editor"), - self.trUtf8("The document has unsaved changes."), - self.__save) + ret = E5MessageBox.okToClearData( + self, + self.trUtf8("eric5 Mini Editor"), + self.trUtf8("The document has unsaved changes."), + self.__save) return ret return True @@ -2096,7 +2099,8 @@ txt, self.encoding = Utilities.readEncodedFile(fileName) except (UnicodeDecodeError, IOError) as why: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self, self.trUtf8('Open File'), + E5MessageBox.critical( + self, self.trUtf8('Open File'), self.trUtf8('<p>The file <b>{0}</b> could not be opened.</p>' '<p>Reason: {1}</p>') .format(fileName, str(why))) @@ -2130,7 +2134,8 @@ self.encoding = Utilities.writeEncodedFile( fileName, txt, self.encoding) except (IOError, Utilities.CodingError, UnicodeError) as why: - E5MessageBox.critical(self, self.trUtf8('Save File'), + E5MessageBox.critical( + self, self.trUtf8('Save File'), self.trUtf8('<p>The file <b>{0}</b> could not be saved.<br/>' 'Reason: {1}</p>') .format(fileName, str(why)))
--- a/QScintilla/SearchReplaceWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/QScintilla/SearchReplaceWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -241,7 +241,8 @@ self.ui.replaceButton.setEnabled(True) self.ui.replaceSearchButton.setEnabled(True) else: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("'{0}' was not found.").format(txt)) @pyqtSlot() @@ -277,7 +278,8 @@ self.ui.replaceButton.setEnabled(True) self.ui.replaceSearchButton.setEnabled(True) else: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("'{0}' was not found.").format(txt)) def __findByReturnPressed(self): @@ -626,8 +628,9 @@ if not ok: self.ui.replaceButton.setEnabled(False) self.ui.replaceSearchButton.setEnabled(False) - E5MessageBox.information(self, self.windowTitle(), - self.trUtf8("'{0}' was not found.").format(ftxt)) + E5MessageBox.information( + self, self.windowTitle(), + self.trUtf8("'{0}' was not found.").format(ftxt)) else: self.ui.replaceButton.setEnabled(False) self.ui.replaceSearchButton.setEnabled(False) @@ -744,11 +747,13 @@ self.ui.replaceSearchButton.setEnabled(False) if found: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("Replaced {0} occurrences.") .format(replacements)) else: - E5MessageBox.information(self, self.windowTitle(), + E5MessageBox.information( + self, self.windowTitle(), self.trUtf8("Nothing replaced because '{0}' was not found.") .format(ftxt))
--- a/QScintilla/Shell.py Mon Oct 14 18:26:25 2013 +0200 +++ b/QScintilla/Shell.py Mon Oct 14 19:30:36 2013 +0200 @@ -1539,7 +1539,8 @@ if not QFileInfo(fname).isDir(): self.vm.openSourceFile(fname) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") .format(fname))
--- a/Snapshot/SnapWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Snapshot/SnapWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -215,7 +215,8 @@ @return flag indicating success (boolean) """ if QFileInfo(fileName).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Snapshot"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fileName), @@ -225,18 +226,20 @@ file = QFile(fileName) if not file.open(QFile.WriteOnly): - E5MessageBox.warning(self, self.trUtf8("Save Snapshot"), - self.trUtf8("Cannot write file '{0}:\n{1}.")\ - .format(fileName, file.errorString())) + E5MessageBox.warning( + self, self.trUtf8("Save Snapshot"), + self.trUtf8("Cannot write file '{0}:\n{1}.")\ + .format(fileName, file.errorString())) return False ok = self.__snapshot.save(file) file.close() if not ok: - E5MessageBox.warning(self, self.trUtf8("Save Snapshot"), - self.trUtf8("Cannot write file '{0}:\n{1}.")\ - .format(fileName, file.errorString())) + E5MessageBox.warning( + self, self.trUtf8("Save Snapshot"), + self.trUtf8("Cannot write file '{0}:\n{1}.")\ + .format(fileName, file.errorString())) return ok @@ -473,7 +476,8 @@ @param evt close event (QCloseEvent) """ if self.__modified: - res = E5MessageBox.question(self, + res = E5MessageBox.question( + self, self.trUtf8("eric5 Snapshot"), self.trUtf8( """The application contains an unsaved snapshot."""),
--- a/SqlBrowser/SqlBrowser.py Mon Oct 14 18:26:25 2013 +0200 +++ b/SqlBrowser/SqlBrowser.py Mon Oct 14 19:30:36 2013 +0200 @@ -79,7 +79,8 @@ loop is up. """ for warning in self.__warnings: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("SQL Browser startup problem"), warning) @@ -178,12 +179,16 @@ """ Private slot to show the about information. """ - E5MessageBox.about(self, self.trUtf8("SQL Browser"), self.trUtf8( - """<h3>About SQL Browser</h3>""" - """<p>The SQL browser window is a little tool to examine """ - """the data and the schema of a database and to execute """ - """queries on a database.</p>""" - )) + E5MessageBox.about( + self, + self.trUtf8("SQL Browser"), + self.trUtf8( + """<h3>About SQL Browser</h3>""" + """<p>The SQL browser window is a little tool to examine """ + """the data and the schema of a database and to execute """ + """queries on a database.</p>""" + ) + ) def __aboutQt(self): """
--- a/SqlBrowser/SqlBrowserWidget.py Mon Oct 14 18:26:25 2013 +0200 +++ b/SqlBrowser/SqlBrowserWidget.py Mon Oct 14 19:30:36 2013 +0200 @@ -40,7 +40,8 @@ self.table.addAction(self.deleteRowAction) if len(QSqlDatabase.drivers()) == 0: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("No database drivers found"), self.trUtf8( """This tool requires at least one Qt database driver. """ @@ -156,7 +157,8 @@ driver, dbName, user, password, host, port) if err.type() != QSqlError.NoError: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Unable to open database"), self.trUtf8( """An error occurred while opening the connection."""))
--- a/Tasks/TaskViewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Tasks/TaskViewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -474,7 +474,8 @@ @param on flag indicating the filter state (boolean) """ if on and not self.taskFilter.hasActiveFilter(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Activate task filter"), self.trUtf8( """The task filter doesn't have any active filters."""
--- a/Templates/TemplatePropertiesDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Templates/TemplatePropertiesDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -92,7 +92,8 @@ @param ev key event (QKeyEvent) """ if ev.key() == Qt.Key_Escape: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Close dialog"), self.trUtf8("""Do you really want to close the dialog?""")) if not res: @@ -103,7 +104,8 @@ """ Public slot to show some help. """ - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Template Help"), self.trUtf8( """<p>To use variables in a template, you just have to"""
--- a/Templates/TemplateViewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Templates/TemplateViewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -91,7 +91,8 @@ """ if name in self.entries: if not quiet: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, QApplication.translate("TemplateGroup", "Add Template"), QApplication.translate( "TemplateGroup", @@ -520,7 +521,8 @@ Private slot to handle the Remove context menu action. """ itm = self.currentItem() - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Remove Template"), self.trUtf8("""<p>Do you really want to remove <b>{0}</b>?</p>""")\ .format(itm.getName())) @@ -581,7 +583,8 @@ Private slot to reload the templates. """ if self.__dirty: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Reload Templates"), self.trUtf8( """The templates contain unsaved changes. Shall these""" @@ -599,7 +602,8 @@ """ Private method to show some help. """ - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Template Help"), self.trUtf8( """<p><b>Template groups</b> are a means of grouping""" @@ -842,7 +846,8 @@ """ if oldname != newname: if newname in self.groups: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Edit Template Group"), self.trUtf8("""<p>A template group with the name""" """ <b>{0}</b> already exists.</p>""")\ @@ -935,7 +940,8 @@ f = QFile(filename) ok = f.open(QIODevice.WriteOnly) if not ok: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save templates"), self.trUtf8( "<p>The templates file <b>{0}</b> could not be" @@ -968,7 +974,8 @@ reader.readXML() f.close() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Read templates"), self.trUtf8( "<p>The templates file <b>{0}</b> could not be read.</p>")
--- a/Tools/TRPreviewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Tools/TRPreviewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -344,12 +344,16 @@ """ Private slot to show the about information. """ - E5MessageBox.about(self, self.trUtf8("TR Previewer"), self.trUtf8( - """<h3> About TR Previewer </h3>""" - """<p>The TR Previewer loads and displays Qt User-Interface""" - """ files and translation files and shows dialogs for a""" - """ selected language.</p>""" - )) + E5MessageBox.about( + self, + self.trUtf8("TR Previewer"), + self.trUtf8( + """<h3> About TR Previewer </h3>""" + """<p>The TR Previewer loads and displays Qt User-Interface""" + """ files and translation files and shows dialogs for a""" + """ selected language.</p>""" + ) + ) def __aboutQt(self): """ @@ -467,7 +471,8 @@ ntr.fileName = fileName ntr.name = self.__uniqueName(fileName) if ntr.name is None: - E5MessageBox.warning(self.parent(), + E5MessageBox.warning( + self.parent(), self.trUtf8("Set Translator"), self.trUtf8("""<p>The translation filename <b>{0}</b>""" """ is invalid.</p>""").format(fileName)) @@ -495,7 +500,8 @@ if name != noTranslationName: trans = self.__findName(name) if trans is None: - E5MessageBox.warning(self.parent(), + E5MessageBox.warning( + self.parent(), self.trUtf8("Set Translator"), self.trUtf8( """<p>The translator <b>{0}</b> is not known.</p>""")\ @@ -637,7 +643,8 @@ if tr.load(transFileName): return tr - E5MessageBox.warning(self.parent(), + E5MessageBox.warning( + self.parent(), self.trUtf8("Load Translator"), self.trUtf8("""<p>The translation file <b>{0}</b> could""" """ not be loaded.</p>""").format(transFileName)) @@ -710,7 +717,8 @@ pass if not self.__widget: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Load UI File"), self.trUtf8( """<p>The file <b>{0}</b> could not be loaded.</p>""")\ @@ -765,7 +773,8 @@ if wview is None: name = os.path.basename(uiFileName) if not name: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Load UI File"), self.trUtf8( """<p>The file <b>{0}</b> could not be loaded.</p>""")\
--- a/Tools/TrayStarter.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Tools/TrayStarter.py Mon Oct 14 19:30:36 2013 +0200 @@ -219,7 +219,8 @@ if not os.path.isfile(applPath) or \ not proc.startDetached(sys.executable, args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start the process.<br>'
--- a/Tools/UIPreviewer.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Tools/UIPreviewer.py Mon Oct 14 19:30:36 2013 +0200 @@ -294,12 +294,16 @@ """ Private slot to show the about information. """ - E5MessageBox.about(self, self.trUtf8("UI Previewer"), self.trUtf8( - """<h3> About UI Previewer </h3>""" - """<p>The UI Previewer loads and displays Qt User-Interface""" - """ files with various styles, which are selectable via a""" - """ selection list.</p>""" - )) + E5MessageBox.about( + self, + self.trUtf8("UI Previewer"), + self.trUtf8( + """<h3> About UI Previewer </h3>""" + """<p>The UI Previewer loads and displays Qt User-Interface""" + """ files with various styles, which are selectable via a""" + """ selection list.</p>""" + ) + ) def __aboutQt(self): """ @@ -348,7 +352,8 @@ self.previewSV.setWidget(self.mainWidget) self.mainWidget.show() else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Load UI File"), self.trUtf8( """<p>The file <b>{0}</b> could not be loaded.</p>""")\ @@ -436,7 +441,8 @@ Private slot to handle the Save Image menu action. """ if self.mainWidget is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Image"), self.trUtf8("""There is no UI file loaded.""")) return @@ -468,7 +474,8 @@ pix = QPixmap.grabWidget(self.mainWidget) self.__updateChildren(self.lastStyle) if not pix.save(fname, str(ext)): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Image"), self.trUtf8( """<p>The file <b>{0}</b> could not be saved.</p>""") @@ -479,7 +486,8 @@ Private slot to handle the Copy Image menu action. """ if self.mainWidget is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save Image"), self.trUtf8("""There is no UI file loaded.""")) return @@ -496,7 +504,8 @@ Private slot to handle the Print Image menu action. """ if self.mainWidget is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Print Image"), self.trUtf8("""There is no UI file loaded.""")) return @@ -536,7 +545,8 @@ from PyQt4.QtGui import QPrintPreviewDialog if self.mainWidget is None: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Print Preview"), self.trUtf8("""There is no UI file loaded.""")) return
--- a/UI/CompareDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/UI/CompareDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -229,7 +229,8 @@ lines1 = f1.readlines() f1.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") @@ -242,7 +243,8 @@ lines2 = f2.readlines() f2.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""")
--- a/UI/DiffDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/UI/DiffDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -300,7 +300,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -339,7 +340,8 @@ lines1 = f1.readlines() f1.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""") @@ -356,7 +358,8 @@ lines2 = f2.readlines() f2.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Compare Files"), self.trUtf8( """<p>The file <b>{0}</b> could not be read.</p>""")
--- a/UI/EmailDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/UI/EmailDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -118,7 +118,8 @@ @param ev key event (QKeyEvent) """ if ev.key() == Qt.Key_Escape: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Close dialog"), self.trUtf8("""Do you really want to close the dialog?""")) if res: @@ -137,7 +138,8 @@ """ Private slot to handle the rejected signal of the button box. """ - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Close dialog"), self.trUtf8("""Do you really want to close the dialog?""")) if res: @@ -301,7 +303,8 @@ errorStr = e[1] else: errorStr = str(e) - res = E5MessageBox.retryAbort(self, + res = E5MessageBox.retryAbort( + self, self.trUtf8("Send bug report"), self.trUtf8( """<p>Authentication failed.<br>Reason: {0}</p>""") @@ -326,7 +329,8 @@ errorStr = e[1] else: errorStr = str(e) - res = E5MessageBox.retryAbort(self, + res = E5MessageBox.retryAbort( + self, self.trUtf8("Send bug report"), self.trUtf8( """<p>Message could not be sent.<br>Reason: {0}</p>""")
--- a/UI/FindFileDialog.py Mon Oct 14 18:26:25 2013 +0200 +++ b/UI/FindFileDialog.py Mon Oct 14 19:30:36 2013 +0200 @@ -367,7 +367,8 @@ try: search = re.compile(txt, flags) except re.error as why: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Invalid search expression"), self.trUtf8("""<p>The search expression is not valid.</p>""" """<p>Error: {0}</p>""").format(str(why))) @@ -602,7 +603,8 @@ Utilities.readEncodedFileWithHash(fn) lines = text.splitlines(True) except (UnicodeError, IOError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Replace in Files"), self.trUtf8( """<p>Could not read the file <b>{0}</b>.""" @@ -616,7 +618,8 @@ # Check the original and the current hash. Skip the file, # if hashes are different. if origHash != hash: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Replace in Files"), self.trUtf8( """<p>The current and the original hash of the""" @@ -641,7 +644,8 @@ try: Utilities.writeEncodedFile(fn, txt, encoding) except (IOError, Utilities.CodingError, UnicodeError) as err: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Replace in Files"), self.trUtf8( """<p>Could not save the file <b>{0}</b>."""
--- a/UI/UserInterface.py Mon Oct 14 18:26:25 2013 +0200 +++ b/UI/UserInterface.py Mon Oct 14 19:30:36 2013 +0200 @@ -2880,7 +2880,8 @@ else: if Preferences.getUser("Email") == "" or \ Preferences.getUser("MailServer") == "": - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Report Bug"), self.trUtf8( """Email address or mail server address is empty.""" @@ -3898,7 +3899,8 @@ else: prog = fn else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Unittest Project"), self.trUtf8("There is no main script defined for the" " current project. Aborting")) @@ -3959,7 +3961,8 @@ pass if version == 3: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Qt 3 support"), self.trUtf8("""Qt v.3 is not supported by eric5.""")) return @@ -3970,14 +3973,16 @@ if os.path.isfile(fn) and os.path.getsize(fn): args.append(fn) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8('<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') .format(fn)) return except EnvironmentError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8('<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') @@ -3997,7 +4002,8 @@ proc = QProcess() if not proc.startDetached(designer, args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start Qt-Designer.<br>' @@ -4018,7 +4024,8 @@ @param version indication for the requested version (Qt 4) (integer) """ if version < 4: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Qt 3 support"), self.trUtf8("""Qt v.3 is not supported by eric5.""")) return @@ -4031,14 +4038,16 @@ fn not in args: args.append(fn) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8('<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') .format(fn)) return except EnvironmentError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8('<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') @@ -4058,7 +4067,8 @@ proc = QProcess() if not proc.startDetached(linguist, args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start Qt-Linguist.<br>' @@ -4081,7 +4091,8 @@ @param version indication for the requested version (Qt 4) (integer) """ if version < 4: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Qt 3 support"), self.trUtf8("""Qt v.3 is not supported by eric5.""")) return @@ -4105,7 +4116,8 @@ proc = QProcess() if not proc.startDetached(assistant, args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start Qt-Assistant.<br>' @@ -4132,7 +4144,8 @@ """ customViewer = Preferences.getHelp("CustomViewer") if not customViewer: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Help"), self.trUtf8( """Currently no custom viewer is selected.""" @@ -4145,7 +4158,8 @@ args.append(home) if not proc.startDetached(customViewer, args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start custom viewer.<br>' @@ -4164,7 +4178,8 @@ args.append(home) if not proc.startDetached("hh", args): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start the help viewer.<br>' @@ -4189,14 +4204,16 @@ if os.path.isfile(fn) and os.path.getsize(fn): args.append(fn) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8('<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') .format(fn)) return except EnvironmentError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8('<p>The file <b>{0}</b> does not exist or' ' is zero length.</p>') @@ -4236,7 +4253,8 @@ args.append(fn) else: if not ignore: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8( '<p>The file <b>{0}</b> does not exist or' @@ -4245,7 +4263,8 @@ return except EnvironmentError: if not ignore: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Problem'), self.trUtf8( '<p>The file <b>{0}</b> does not exist or' @@ -4413,7 +4432,8 @@ proc.start(program, args) if not proc.waitForStarted(): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Process Generation Error'), self.trUtf8( '<p>Could not start the tool entry <b>{0}</b>.<br>' @@ -4520,7 +4540,8 @@ home = pythonDocDir if not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4575,7 +4596,8 @@ home = pythonDocDir if not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4643,7 +4665,8 @@ home = qtDocDir if not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4674,7 +4697,8 @@ pyqt4DocDir = Utilities.getEnvironmentEntry("PYQT4DOCDIR", None) if not pyqt4DocDir: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation"), self.trUtf8("""<p>The PyQt4 documentation starting point""" """ has not been configured.</p>""")) @@ -4699,7 +4723,8 @@ home = pyqt4DocDir if not home or not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4732,7 +4757,8 @@ pyqt5DocDir = Utilities.getEnvironmentEntry("PYQT5DOCDIR", None) if not pyqt5DocDir: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation"), self.trUtf8("""<p>The PyQt5 documentation starting point""" """ has not been configured.</p>""")) @@ -4759,7 +4785,8 @@ home = pyqt5DocDir if not home or not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4794,7 +4821,8 @@ not home.startswith("https://") and \ not home.startswith("qthelp://"): if not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4825,7 +4853,8 @@ pysideDocDir = Utilities.getEnvironmentEntry("PYSIDEDOCDIR", None) if not pysideDocDir: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation"), self.trUtf8("""<p>The PySide documentation starting point""" """ has not been configured.</p>""")) @@ -4840,7 +4869,8 @@ else: home = pysideDocDir if not os.path.exists(home): - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Documentation Missing"), self.trUtf8("""<p>The documentation starting point""" """ "<b>{0}</b>" could not be found.</p>""")\ @@ -4932,7 +4962,8 @@ """ started = QDesktopServices.openUrl(QUrl(home)) if not started: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8('Open Browser'), self.trUtf8('Could not start a web browser')) @@ -5264,7 +5295,8 @@ f = QFile(fn) ok = f.open(QIODevice.WriteOnly) if not ok: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be written.</p>") @@ -5289,7 +5321,8 @@ reader.readXML() f.close() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Read tasks"), self.trUtf8( "<p>The tasks file <b>{0}</b> could not be read.</p>") @@ -5306,7 +5339,8 @@ SessionWriter(f, None).writeXML() f.close() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Save session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be written.</p>") @@ -5318,7 +5352,8 @@ """ fn = os.path.join(Utilities.getConfigDir(), "eric5session.e4s") if not os.path.exists(fn): - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Read session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be read.</p>")\ @@ -5332,7 +5367,8 @@ reader.readXML() f.close() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Read session"), self.trUtf8( "<p>The session file <b>{0}</b> could not be read.</p>")\ @@ -5514,7 +5550,8 @@ if QFileInfo(fname).isFile(): self.viewmanager.openSourceFile(fname) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") .format(fname)) @@ -5704,13 +5741,15 @@ Preferences.Prefs.settings.setValue( "Updates/FirstFailedCheckDate", firstFailure) if self.manualUpdatesCheck: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Error getting versions information"), self.trUtf8("""The versions information could not be""" """ downloaded.""" """ Please go online and try again.""")) elif failedDuration > 7: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Error getting versions information"), self.trUtf8("""The versions information could not be""" """ downloaded for the last 7 days.""" @@ -5815,7 +5854,8 @@ """You are using the latest version of""" """ eric5""")) except IndexError: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Error during updates check"), self.trUtf8("""Could not perform updates check.""")) @@ -5878,7 +5918,8 @@ if not Preferences.isConfigured(): self.__initDebugToolbarsLayout() - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("First time usage"), self.trUtf8("""eric5 has not been configured yet. """ """The configuration dialog will be started."""))
--- a/Utilities/crypto/__init__.py Mon Oct 14 18:26:25 2013 +0200 +++ b/Utilities/crypto/__init__.py Mon Oct 14 19:30:36 2013 +0200 @@ -76,19 +76,22 @@ if verifyPassword(pw, masterPassword): MasterPassword = pwEncode(pw) else: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, QCoreApplication.translate( "Crypto", "Master Password"), QCoreApplication.translate( "Crypto", """The given password is incorrect.""")) else: - E5MessageBox.critical(None, + E5MessageBox.critical( + None, QCoreApplication.translate("Crypto", "Master Password"), QCoreApplication.translate("Crypto", """There is no master password registered.""")) except ValueError as why: - E5MessageBox.warning(None, + E5MessageBox.warning( + None, QCoreApplication.translate("Crypto", "Master Password"), QCoreApplication.translate("Crypto", """<p>The given password cannot be verified.</p>"""
--- a/VCS/ProjectHelper.py Mon Oct 14 18:26:25 2013 +0200 +++ b/VCS/ProjectHelper.py Mon Oct 14 19:30:36 2013 +0200 @@ -166,7 +166,8 @@ self.project.pdata["VCS"] = [vcsSystem] self.project.vcs = self.project.initVCS(vcsSystem) # edit VCS command options - vcores = E5MessageBox.yesNo(self.parent(), + vcores = E5MessageBox.yesNo( + self.parent(), self.trUtf8("New Project"), self.trUtf8( """Would you like to edit the VCS command options?""")) @@ -181,7 +182,8 @@ try: os.makedirs(projectdir) except EnvironmentError: - E5MessageBox.critical(self.parent(), + E5MessageBox.critical( + self.parent(), self.trUtf8("Create project directory"), self.trUtf8( "<p>The project directory <b>{0}</b> could not" @@ -224,7 +226,8 @@ self.project.setDirty(True) self.project.saveProject() else: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("New project from repository"), self.trUtf8( "The project retrieved from the repository" @@ -342,7 +345,8 @@ if vcsdlg.exec_() == QDialog.Accepted: vcsDataDict = vcsdlg.getData() # edit VCS command options - vcores = E5MessageBox.yesNo(self.parent(), + vcores = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Import Project"), self.trUtf8( """Would you like to edit the VCS command options?""")) @@ -373,7 +377,8 @@ """ shouldReopen = self.vcs.vcsUpdate(self.project.ppath) if shouldReopen: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Update"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True) @@ -398,7 +403,8 @@ Depending on the parameters set in the vcs object the project may be removed from the local disk as well. """ - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Remove project from repository"), self.trUtf8("Dou you really want to remove this project from" " the repository (and disk)?")) @@ -458,7 +464,8 @@ """ shouldReopen = self.vcs.vcsSwitch(self.project.ppath) if shouldReopen: - res = E5MessageBox.yesNo(self.parent(), + res = E5MessageBox.yesNo( + self.parent(), self.trUtf8("Switch"), self.trUtf8("""The project should be reread. Do this now?"""), yesDefault=True)
--- a/ViewManager/ViewManager.py Mon Oct 14 18:26:25 2013 +0200 +++ b/ViewManager/ViewManager.py Mon Oct 14 19:30:36 2013 +0200 @@ -3999,7 +3999,8 @@ if autosave: res = editor.saveFile() else: - res = E5MessageBox.okToClearData(self.ui, + res = E5MessageBox.okToClearData( + self.ui, QApplication.translate('ViewManager', "File Modified"), QApplication.translate('ViewManager', """<p>The file <b>{0}</b> has unsaved changes.</p>""")
--- a/eric5.e4p Mon Oct 14 18:26:25 2013 +0200 +++ b/eric5.e4p Mon Oct 14 19:30:36 2013 +0200 @@ -1929,7 +1929,7 @@ <string>ExcludeMessages</string> </key> <value> - <string>E24, W293, N, E, W, D</string> + <string>E24, D, W293, N802, N803, N807, N808, N821</string> </value> <key> <string>FixCodes</string> @@ -1953,7 +1953,7 @@ <string>IncludeMessages</string> </key> <value> - <string>E501</string> + <string></string> </value> <key> <string>MaxLineLength</string>
