Mercurial Repositories > eric / changeset
changeset
Made code mostly PEP 8 compliant (except all whitespace and line length).
Fri, 11 Mar 2011 16:51:57 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 11 Mar 2011 16:51:57 +0100
- changeset 945
- 8cd4d08fa9f6
- parent 944
- 1b59c4ba121e
- child 946
- daf90a162be4
Made code mostly PEP 8 compliant (except all whitespace and line length).
--- a/APIs/Python3/eric5.api Fri Mar 11 08:55:14 2011 +0100 +++ b/APIs/Python3/eric5.api Fri Mar 11 16:51:57 2011 +0100 @@ -19,7 +19,7 @@ eric5.Cooperation.ChatWidget.ChatWidget.sendEdit?7 eric5.Cooperation.ChatWidget.ChatWidget.shareEditor?7 eric5.Cooperation.ChatWidget.ChatWidget.startEdit?7 -eric5.Cooperation.ChatWidget.ChatWidget?1(port = -1, parent = None) +eric5.Cooperation.ChatWidget.ChatWidget?1(port=-1, parent=None) eric5.Cooperation.Connection.Connection.Editor?7 eric5.Cooperation.Connection.Connection.GetParticipants?7 eric5.Cooperation.Connection.Connection.Greeting?7 @@ -52,7 +52,7 @@ eric5.Cooperation.Connection.Connection.serverPort?4() eric5.Cooperation.Connection.Connection.setGreetingMessage?4(message, serverPort) eric5.Cooperation.Connection.Connection.timerEvent?4(evt) -eric5.Cooperation.Connection.Connection?1(parent = None) +eric5.Cooperation.Connection.Connection?1(parent=None) eric5.Cooperation.Connection.MaxBufferSize?7 eric5.Cooperation.Connection.PingInterval?7 eric5.Cooperation.Connection.PongTimeout?7 @@ -65,7 +65,7 @@ eric5.Cooperation.CooperationClient.CooperationClient.connectionError?7 eric5.Cooperation.CooperationClient.CooperationClient.disconnectConnections?4() eric5.Cooperation.CooperationClient.CooperationClient.editorCommand?7 -eric5.Cooperation.CooperationClient.CooperationClient.hasConnection?4(senderIp, senderPort = -1) +eric5.Cooperation.CooperationClient.CooperationClient.hasConnection?4(senderIp, senderPort=-1) eric5.Cooperation.CooperationClient.CooperationClient.hasConnections?4() eric5.Cooperation.CooperationClient.CooperationClient.kickUser?4(nick) eric5.Cooperation.CooperationClient.CooperationClient.newMessage?7 @@ -76,11 +76,11 @@ eric5.Cooperation.CooperationClient.CooperationClient.sendEditorCommand?4(projectHash, filename, message) eric5.Cooperation.CooperationClient.CooperationClient.sendMessage?4(message) eric5.Cooperation.CooperationClient.CooperationClient.server?4() -eric5.Cooperation.CooperationClient.CooperationClient?1(parent = None) +eric5.Cooperation.CooperationClient.CooperationClient?1(parent=None) eric5.Cooperation.CooperationServer.CooperationServer.incomingConnection?4(socketDescriptor) eric5.Cooperation.CooperationServer.CooperationServer.newConnection?7 -eric5.Cooperation.CooperationServer.CooperationServer.startListening?4(port = -1) -eric5.Cooperation.CooperationServer.CooperationServer?1(parent = None) +eric5.Cooperation.CooperationServer.CooperationServer.startListening?4(port=-1) +eric5.Cooperation.CooperationServer.CooperationServer?1(parent=None) eric5.DataViews.CodeMetrics.COMMENT?7 eric5.DataViews.CodeMetrics.DEDENT?7 eric5.DataViews.CodeMetrics.EMPTY?7 @@ -104,15 +104,15 @@ eric5.DataViews.CodeMetricsDialog.CodeMetricsDialog.on_startButton_clicked?4() eric5.DataViews.CodeMetricsDialog.CodeMetricsDialog.prepare?4(fileList, project) eric5.DataViews.CodeMetricsDialog.CodeMetricsDialog.start?4(fn) -eric5.DataViews.CodeMetricsDialog.CodeMetricsDialog?1(parent = None) +eric5.DataViews.CodeMetricsDialog.CodeMetricsDialog?1(parent=None) eric5.DataViews.PyCoverageDialog.PyCoverageDialog.on_buttonBox_clicked?4(button) eric5.DataViews.PyCoverageDialog.PyCoverageDialog.on_reloadButton_clicked?4() eric5.DataViews.PyCoverageDialog.PyCoverageDialog.start?4(cfn, fn) eric5.DataViews.PyCoverageDialog.PyCoverageDialog.stringify?4() -eric5.DataViews.PyCoverageDialog.PyCoverageDialog?1(parent = None) +eric5.DataViews.PyCoverageDialog.PyCoverageDialog?1(parent=None) eric5.DataViews.PyProfileDialog.PyProfileDialog.on_buttonBox_clicked?4(button) eric5.DataViews.PyProfileDialog.PyProfileDialog.start?4(pfn, fn=None) -eric5.DataViews.PyProfileDialog.PyProfileDialog?1(parent = None) +eric5.DataViews.PyProfileDialog.PyProfileDialog?1(parent=None) eric5.DebugClients.Python.AsyncFile.AsyncFile.close?4(closeit=0) eric5.DebugClients.Python.AsyncFile.AsyncFile.fileno?4() eric5.DebugClients.Python.AsyncFile.AsyncFile.flush?4() @@ -162,7 +162,7 @@ eric5.DebugClients.Python.DebugBase.DebugBase.setRecursionDepth?4(frame) eric5.DebugClients.Python.DebugBase.DebugBase.set_continue?4(special) eric5.DebugClients.Python.DebugBase.DebugBase.set_quit?4() -eric5.DebugClients.Python.DebugBase.DebugBase.set_trace?4(frame = None) +eric5.DebugClients.Python.DebugBase.DebugBase.set_trace?4(frame=None) eric5.DebugClients.Python.DebugBase.DebugBase.set_watch?4(cond, temporary=0) eric5.DebugClients.Python.DebugBase.DebugBase.step?4(traceMode) eric5.DebugClients.Python.DebugBase.DebugBase.stepOut?4() @@ -178,11 +178,11 @@ eric5.DebugClients.Python.DebugClient.DebugClient.debugClient?7 eric5.DebugClients.Python.DebugClient.DebugClient?1() eric5.DebugClients.Python.DebugClientBase.DebugClientBase.absPath?4(fn) -eric5.DebugClients.Python.DebugClientBase.DebugClientBase.attachThread?4(target = None, args = None, kwargs = None, mainThread = 0) +eric5.DebugClients.Python.DebugClientBase.DebugClientBase.attachThread?4(target=None, args=None, kwargs=None, mainThread=0) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.clientCapabilities?7 eric5.DebugClients.Python.DebugClientBase.DebugClientBase.close?4(fd) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.connectDebugger?4(port, remoteAddress=None, redirect=1) -eric5.DebugClients.Python.DebugClientBase.DebugClientBase.eventLoop?4(disablePolling = False) +eric5.DebugClients.Python.DebugClientBase.DebugClientBase.eventLoop?4(disablePolling=False) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.eventPoll?4() eric5.DebugClients.Python.DebugClientBase.DebugClientBase.fork?4() eric5.DebugClients.Python.DebugClientBase.DebugClientBase.getCoding?4() @@ -193,10 +193,10 @@ eric5.DebugClients.Python.DebugClientBase.DebugClientBase.progTerminated?4(status) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.raw_input?4(prompt, echo) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.run_call?4(scriptname, func, *args) -eric5.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(exit = 1) +eric5.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(exit=1) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.shouldSkip?4(fn) -eric5.DebugClients.Python.DebugClientBase.DebugClientBase.startDebugger?4(filename = None, host = None, port = None, enableTrace = 1, exceptions = 1, tracePython = 0, redirect = 1) -eric5.DebugClients.Python.DebugClientBase.DebugClientBase.startProgInDebugger?4(progargs, wd = '', host = None, port = None, exceptions = 1, tracePython = 0, redirect = 1) +eric5.DebugClients.Python.DebugClientBase.DebugClientBase.startDebugger?4(filename=None, host=None, port=None, enableTrace=1, exceptions=1, tracePython=0, redirect=1) +eric5.DebugClients.Python.DebugClientBase.DebugClientBase.startProgInDebugger?4(progargs, wd='', host=None, port=None, exceptions=1, tracePython=0, redirect=1) eric5.DebugClients.Python.DebugClientBase.DebugClientBase.write?4(s) eric5.DebugClients.Python.DebugClientBase.DebugClientBase?1() eric5.DebugClients.Python.DebugClientBase.DebugClientClose?4(fd) @@ -213,10 +213,10 @@ eric5.DebugClients.Python.DebugClientCapabilities.HasProfiler?7 eric5.DebugClients.Python.DebugClientCapabilities.HasShell?7 eric5.DebugClients.Python.DebugClientCapabilities.HasUnittest?7 -eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.attachThread?4(target = None, args = None, kwargs = None, mainThread = 0) +eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.attachThread?4(target=None, args=None, kwargs=None, mainThread=0) eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.debugClient?7 -eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.eventLoop?4(disablePolling = False) -eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.lockClient?4(blocking = 1) +eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.eventLoop?4(disablePolling=False) +eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.lockClient?4(blocking=1) eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.setCurrentThread?4(id) eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.set_quit?4() eric5.DebugClients.Python.DebugClientThreads.DebugClientThreads.threadTerminated?4(dbgThread) @@ -293,11 +293,11 @@ eric5.DebugClients.Python.DebugThread.DebugThread.set_ident?4(id) eric5.DebugClients.Python.DebugThread.DebugThread.traceThread?4() eric5.DebugClients.Python.DebugThread.DebugThread.trace_dispatch?4(frame, event, arg) -eric5.DebugClients.Python.DebugThread.DebugThread?1(dbgClient, targ = None, args = None, kwargs = None, mainThread = 0) +eric5.DebugClients.Python.DebugThread.DebugThread?1(dbgClient, targ=None, args=None, kwargs=None, mainThread=0) eric5.DebugClients.Python.FlexCompleter.Completer.attr_matches?4(text) eric5.DebugClients.Python.FlexCompleter.Completer.complete?4(text, state) eric5.DebugClients.Python.FlexCompleter.Completer.global_matches?4(text) -eric5.DebugClients.Python.FlexCompleter.Completer?1(namespace = None) +eric5.DebugClients.Python.FlexCompleter.Completer?1(namespace=None) eric5.DebugClients.Python.FlexCompleter.get_class_members?4(klass) eric5.DebugClients.Python.PyProfile.PyProfile.dispatch?7 eric5.DebugClients.Python.PyProfile.PyProfile.dump_stats?4(file) @@ -308,31 +308,31 @@ eric5.DebugClients.Python.PyProfile.PyProfile?1(basename, timer=None, bias=None) eric5.DebugClients.Python.eric5dbgstub.debugger?7 eric5.DebugClients.Python.eric5dbgstub.ericpath?7 -eric5.DebugClients.Python.eric5dbgstub.initDebugger?4(kind = "standard") +eric5.DebugClients.Python.eric5dbgstub.initDebugger?4(kind="standard") eric5.DebugClients.Python.eric5dbgstub.modDir?7 eric5.DebugClients.Python.eric5dbgstub.runcall?4(func, *args) eric5.DebugClients.Python.eric5dbgstub.setScriptname?4(name) -eric5.DebugClients.Python.eric5dbgstub.startDebugger?4(enableTrace = True, exceptions = True, tracePython = False, redirect = True) +eric5.DebugClients.Python.eric5dbgstub.startDebugger?4(enableTrace=True, exceptions=True, tracePython=False, redirect=True) eric5.DebugClients.Python.getpass.default_getpass?7 eric5.DebugClients.Python.getpass.getpass?4(prompt='Password: ') eric5.DebugClients.Python.getpass.getuser?4() eric5.DebugClients.Python.getpass.unix_getpass?7 eric5.DebugClients.Python.getpass.win_getpass?7 -eric5.DebugClients.Python3.AsyncFile.AsyncFile.close?4(closeit = False) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.close?4(closeit=False) eric5.DebugClients.Python3.AsyncFile.AsyncFile.fileno?4() eric5.DebugClients.Python3.AsyncFile.AsyncFile.flush?4() eric5.DebugClients.Python3.AsyncFile.AsyncFile.isatty?4() eric5.DebugClients.Python3.AsyncFile.AsyncFile.maxbuffersize?7 eric5.DebugClients.Python3.AsyncFile.AsyncFile.maxtries?7 eric5.DebugClients.Python3.AsyncFile.AsyncFile.pendingWrite?4() -eric5.DebugClients.Python3.AsyncFile.AsyncFile.read?4(size = -1) -eric5.DebugClients.Python3.AsyncFile.AsyncFile.read_p?4(size = -1) -eric5.DebugClients.Python3.AsyncFile.AsyncFile.readline?4(sizehint = -1) -eric5.DebugClients.Python3.AsyncFile.AsyncFile.readline_p?4(size = -1) -eric5.DebugClients.Python3.AsyncFile.AsyncFile.readlines?4(sizehint = -1) -eric5.DebugClients.Python3.AsyncFile.AsyncFile.seek?4(offset, whence = 0) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.read?4(size=-1) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.read_p?4(size=-1) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.readline?4(sizehint=-1) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.readline_p?4(size=-1) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.readlines?4(sizehint=-1) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.seek?4(offset, whence=0) eric5.DebugClients.Python3.AsyncFile.AsyncFile.tell?4() -eric5.DebugClients.Python3.AsyncFile.AsyncFile.truncate?4(size = -1) +eric5.DebugClients.Python3.AsyncFile.AsyncFile.truncate?4(size=-1) eric5.DebugClients.Python3.AsyncFile.AsyncFile.write?4(s) eric5.DebugClients.Python3.AsyncFile.AsyncFile.writelines?4(list) eric5.DebugClients.Python3.AsyncFile.AsyncFile?1(sock, mode, name) @@ -367,13 +367,13 @@ eric5.DebugClients.Python3.DebugBase.DebugBase.setRecursionDepth?4(frame) eric5.DebugClients.Python3.DebugBase.DebugBase.set_continue?4(special) eric5.DebugClients.Python3.DebugBase.DebugBase.set_quit?4() -eric5.DebugClients.Python3.DebugBase.DebugBase.set_trace?4(frame = None) -eric5.DebugClients.Python3.DebugBase.DebugBase.set_watch?4(cond, temporary = False) +eric5.DebugClients.Python3.DebugBase.DebugBase.set_trace?4(frame=None) +eric5.DebugClients.Python3.DebugBase.DebugBase.set_watch?4(cond, temporary=False) eric5.DebugClients.Python3.DebugBase.DebugBase.step?4(traceMode) eric5.DebugClients.Python3.DebugBase.DebugBase.stepOut?4() eric5.DebugClients.Python3.DebugBase.DebugBase.stop_here?4(frame) eric5.DebugClients.Python3.DebugBase.DebugBase.trace_dispatch?4(frame, event, arg) -eric5.DebugClients.Python3.DebugBase.DebugBase.user_exception?4(frame, excinfo, unhandled = False) +eric5.DebugClients.Python3.DebugBase.DebugBase.user_exception?4(frame, excinfo, unhandled=False) eric5.DebugClients.Python3.DebugBase.DebugBase.user_line?4(frame) eric5.DebugClients.Python3.DebugBase.DebugBase.user_return?4(frame, retval) eric5.DebugClients.Python3.DebugBase.DebugBase?1(dbgClient) @@ -383,29 +383,29 @@ eric5.DebugClients.Python3.DebugClient.DebugClient.debugClient?7 eric5.DebugClients.Python3.DebugClient.DebugClient?1() eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.absPath?4(fn) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.attachThread?4(target = None, args = None, kwargs = None, mainThread = False) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.attachThread?4(target=None, args=None, kwargs=None, mainThread=False) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.clientCapabilities?7 eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.close?4(fd) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.connectDebugger?4(port, remoteAddress = None, redirect = True) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.eventLoop?4(disablePolling = False) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.connectDebugger?4(port, remoteAddress=None, redirect=True) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.eventLoop?4(disablePolling=False) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.eventPoll?4() eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.fork?4() eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.getCoding?4() eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.getRunning?4() eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.handleLine?4(line) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.input?4(prompt, echo = True) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.input?4(prompt, echo=True) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.main?4() eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.progTerminated?4(status) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.run_call?4(scriptname, func, *args) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.sessionClose?4(exit = True) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.sessionClose?4(exit=True) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.shouldSkip?4(fn) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.startDebugger?4(filename = None, host = None, port = None, enableTrace = True, exceptions = True, tracePython = False, redirect = True) -eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.startProgInDebugger?4(progargs, wd = '', host = None, port = None, exceptions = True, tracePython = False, redirect = True) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.startDebugger?4(filename=None, host=None, port=None, enableTrace=True, exceptions=True, tracePython=False, redirect=True) +eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.startProgInDebugger?4(progargs, wd='', host=None, port=None, exceptions=True, tracePython=False, redirect=True) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase.write?4(s) eric5.DebugClients.Python3.DebugClientBase.DebugClientBase?1() eric5.DebugClients.Python3.DebugClientBase.DebugClientClose?4(fd) eric5.DebugClients.Python3.DebugClientBase.DebugClientFork?4() -eric5.DebugClients.Python3.DebugClientBase.DebugClientInput?4(prompt = "", echo = True) +eric5.DebugClients.Python3.DebugClientBase.DebugClientInput?4(prompt="", echo=True) eric5.DebugClients.Python3.DebugClientBase.DebugClientInstance?7 eric5.DebugClients.Python3.DebugClientBase.DebugClientSetRecursionLimit?4(limit) eric5.DebugClients.Python3.DebugClientCapabilities.HasAll?7 @@ -416,16 +416,16 @@ eric5.DebugClients.Python3.DebugClientCapabilities.HasProfiler?7 eric5.DebugClients.Python3.DebugClientCapabilities.HasShell?7 eric5.DebugClients.Python3.DebugClientCapabilities.HasUnittest?7 -eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.attachThread?4(target = None, args = None, kwargs = None, mainThread = False) +eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.attachThread?4(target=None, args=None, kwargs=None, mainThread=False) eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.debugClient?7 -eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.eventLoop?4(disablePolling = False) -eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.lockClient?4(blocking = True) +eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.eventLoop?4(disablePolling=False) +eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.lockClient?4(blocking=True) eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.setCurrentThread?4(id) eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.set_quit?4() eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.threadTerminated?4(dbgThread) eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads.unlockClient?4() eric5.DebugClients.Python3.DebugClientThreads.DebugClientThreads?1() -eric5.DebugClients.Python3.DebugClientThreads._debugclient_start_new_thread?5(target, args, kwargs = {}) +eric5.DebugClients.Python3.DebugClientThreads._debugclient_start_new_thread?5(target, args, kwargs={}) eric5.DebugClients.Python3.DebugClientThreads._original_start_thread?8 eric5.DebugClients.Python3.DebugConfig.ConfigVarTypeStrings?7 eric5.DebugClients.Python3.DebugProtocol.DebugAddress?7 @@ -496,12 +496,12 @@ eric5.DebugClients.Python3.DebugThread.DebugThread.set_ident?4(id) eric5.DebugClients.Python3.DebugThread.DebugThread.traceThread?4() eric5.DebugClients.Python3.DebugThread.DebugThread.trace_dispatch?4(frame, event, arg) -eric5.DebugClients.Python3.DebugThread.DebugThread?1(dbgClient, targ = None, args = None, kwargs = None, mainThread = False) +eric5.DebugClients.Python3.DebugThread.DebugThread?1(dbgClient, targ=None, args=None, kwargs=None, mainThread=False) eric5.DebugClients.Python3.FlexCompleter.Completer._callable_postfix?5(val, word) eric5.DebugClients.Python3.FlexCompleter.Completer.attr_matches?4(text) eric5.DebugClients.Python3.FlexCompleter.Completer.complete?4(text, state) eric5.DebugClients.Python3.FlexCompleter.Completer.global_matches?4(text) -eric5.DebugClients.Python3.FlexCompleter.Completer?1(namespace = None) +eric5.DebugClients.Python3.FlexCompleter.Completer?1(namespace=None) eric5.DebugClients.Python3.FlexCompleter.get_class_members?4(klass) eric5.DebugClients.Python3.PyProfile.PyProfile.dispatch?7 eric5.DebugClients.Python3.PyProfile.PyProfile.dump_stats?4(file) @@ -509,21 +509,21 @@ eric5.DebugClients.Python3.PyProfile.PyProfile.fix_frame_filename?4(frame) eric5.DebugClients.Python3.PyProfile.PyProfile.save?4() eric5.DebugClients.Python3.PyProfile.PyProfile.trace_dispatch_call?4(frame, t) -eric5.DebugClients.Python3.PyProfile.PyProfile?1(basename, timer = None, bias = None) +eric5.DebugClients.Python3.PyProfile.PyProfile?1(basename, timer=None, bias=None) eric5.DebugClients.Python3.eric5dbgstub.debugger?7 eric5.DebugClients.Python3.eric5dbgstub.ericpath?7 -eric5.DebugClients.Python3.eric5dbgstub.initDebugger?4(kind = "standard") +eric5.DebugClients.Python3.eric5dbgstub.initDebugger?4(kind="standard") eric5.DebugClients.Python3.eric5dbgstub.modDir?7 eric5.DebugClients.Python3.eric5dbgstub.runcall?4(func, *args) eric5.DebugClients.Python3.eric5dbgstub.setScriptname?4(name) -eric5.DebugClients.Python3.eric5dbgstub.startDebugger?4(enableTrace = True, exceptions = True, tracePython = False, redirect = True) +eric5.DebugClients.Python3.eric5dbgstub.startDebugger?4(enableTrace=True, exceptions=True, tracePython=False, redirect=True) eric5.DebugClients.Python3.getpass.default_getpass?7 -eric5.DebugClients.Python3.getpass.getpass?4(prompt = 'Password: ') +eric5.DebugClients.Python3.getpass.getpass?4(prompt='Password: ') eric5.DebugClients.Python3.getpass.getuser?4() eric5.DebugClients.Python3.getpass.unix_getpass?7 eric5.DebugClients.Python3.getpass.win_getpass?7 eric5.Debugger.BreakPointModel.BreakPointModel.addBreakPoint?4(fn, line, properties) -eric5.Debugger.BreakPointModel.BreakPointModel.columnCount?4(parent = QModelIndex()) +eric5.Debugger.BreakPointModel.BreakPointModel.columnCount?4(parent=QModelIndex()) eric5.Debugger.BreakPointModel.BreakPointModel.data?4(index, role) eric5.Debugger.BreakPointModel.BreakPointModel.dataAboutToBeChanged?7 eric5.Debugger.BreakPointModel.BreakPointModel.deleteAll?4() @@ -532,20 +532,20 @@ eric5.Debugger.BreakPointModel.BreakPointModel.flags?4(index) eric5.Debugger.BreakPointModel.BreakPointModel.getBreakPointByIndex?4(index) eric5.Debugger.BreakPointModel.BreakPointModel.getBreakPointIndex?4(fn, lineno) -eric5.Debugger.BreakPointModel.BreakPointModel.hasChildren?4(parent = QModelIndex()) -eric5.Debugger.BreakPointModel.BreakPointModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Debugger.BreakPointModel.BreakPointModel.index?4(row, column, parent = QModelIndex()) +eric5.Debugger.BreakPointModel.BreakPointModel.hasChildren?4(parent=QModelIndex()) +eric5.Debugger.BreakPointModel.BreakPointModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Debugger.BreakPointModel.BreakPointModel.index?4(row, column, parent=QModelIndex()) eric5.Debugger.BreakPointModel.BreakPointModel.isBreakPointTemporaryByIndex?4(index) eric5.Debugger.BreakPointModel.BreakPointModel.parent?4(index) -eric5.Debugger.BreakPointModel.BreakPointModel.rowCount?4(parent = QModelIndex()) +eric5.Debugger.BreakPointModel.BreakPointModel.rowCount?4(parent=QModelIndex()) eric5.Debugger.BreakPointModel.BreakPointModel.setBreakPointByIndex?4(index, fn, line, properties) eric5.Debugger.BreakPointModel.BreakPointModel.setBreakPointEnabledByIndex?4(index, enabled) -eric5.Debugger.BreakPointModel.BreakPointModel?1(parent = None) +eric5.Debugger.BreakPointModel.BreakPointModel?1(parent=None) eric5.Debugger.BreakPointViewer.BreakPointViewer.handleResetUI?4() eric5.Debugger.BreakPointViewer.BreakPointViewer.highlightBreakpoint?4(fn, lineno) eric5.Debugger.BreakPointViewer.BreakPointViewer.setModel?4(model) eric5.Debugger.BreakPointViewer.BreakPointViewer.sourceFile?7 -eric5.Debugger.BreakPointViewer.BreakPointViewer?1(parent = None) +eric5.Debugger.BreakPointViewer.BreakPointViewer?1(parent=None) eric5.Debugger.DebugClientCapabilities.HasAll?7 eric5.Debugger.DebugClientCapabilities.HasCompleter?7 eric5.Debugger.DebugClientCapabilities.HasCoverage?7 @@ -648,7 +648,7 @@ eric5.Debugger.DebugServer.DebugServer.getClientCapabilities?4(type) eric5.Debugger.DebugServer.DebugServer.getExtensions?4(language) eric5.Debugger.DebugServer.DebugServer.getHostAddress?4(localhost) -eric5.Debugger.DebugServer.DebugServer.getSupportedLanguages?4(shellOnly = False) +eric5.Debugger.DebugServer.DebugServer.getSupportedLanguages?4(shellOnly=False) eric5.Debugger.DebugServer.DebugServer.getWatchPointModel?4() eric5.Debugger.DebugServer.DebugServer.isConnected?4() eric5.Debugger.DebugServer.DebugServer.passiveDebugStarted?7 @@ -658,18 +658,18 @@ eric5.Debugger.DebugServer.DebugServer.remoteBreakpoint?4(fn, line, set, cond=None, temp=False) eric5.Debugger.DebugServer.DebugServer.remoteCapabilities?4() eric5.Debugger.DebugServer.DebugServer.remoteClientSetFilter?4(scope, filter) -eric5.Debugger.DebugServer.DebugServer.remoteClientVariable?4(scope, filter, var, framenr = 0) -eric5.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filter, framenr = 0) +eric5.Debugger.DebugServer.DebugServer.remoteClientVariable?4(scope, filter, var, framenr=0) +eric5.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filter, framenr=0) eric5.Debugger.DebugServer.DebugServer.remoteCompletion?4(text) -eric5.Debugger.DebugServer.DebugServer.remoteContinue?4(special = False) -eric5.Debugger.DebugServer.DebugServer.remoteCoverage?4(fn, argv, wd, env, autoClearShell = True, erase = False, forProject = False, runInConsole = False, clientType = "") +eric5.Debugger.DebugServer.DebugServer.remoteContinue?4(special=False) +eric5.Debugger.DebugServer.DebugServer.remoteCoverage?4(fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="") eric5.Debugger.DebugServer.DebugServer.remoteEnvironment?4(env) eric5.Debugger.DebugServer.DebugServer.remoteEval?4(arg) eric5.Debugger.DebugServer.DebugServer.remoteExec?4(stmt) -eric5.Debugger.DebugServer.DebugServer.remoteLoad?4(fn, argv, wd, env, autoClearShell = True, tracePython = False, autoContinue = True, forProject = False, runInConsole = False, autoFork = False, forkChild = False, clientType = "") -eric5.Debugger.DebugServer.DebugServer.remoteProfile?4(fn, argv, wd, env, autoClearShell = True, erase = False, forProject = False, runInConsole = False, clientType = "") +eric5.Debugger.DebugServer.DebugServer.remoteLoad?4(fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="") +eric5.Debugger.DebugServer.DebugServer.remoteProfile?4(fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="") eric5.Debugger.DebugServer.DebugServer.remoteRawInput?4(s) -eric5.Debugger.DebugServer.DebugServer.remoteRun?4(fn, argv, wd, env, autoClearShell = True, forProject = False, runInConsole = False, autoFork = False, forkChild = False, clientType = "") +eric5.Debugger.DebugServer.DebugServer.remoteRun?4(fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="") eric5.Debugger.DebugServer.DebugServer.remoteSetThread?4(tid) eric5.Debugger.DebugServer.DebugServer.remoteStatement?4(stmt) eric5.Debugger.DebugServer.DebugServer.remoteStep?4() @@ -689,7 +689,7 @@ eric5.Debugger.DebugServer.DebugServer.signalClientCompletionList?4(completionList, text) eric5.Debugger.DebugServer.DebugServer.signalClientException?4(exceptionType, exceptionMessage, stackTrace) eric5.Debugger.DebugServer.DebugServer.signalClientExit?4(status) -eric5.Debugger.DebugServer.DebugServer.signalClientLine?4(filename, lineno, forStack = False) +eric5.Debugger.DebugServer.DebugServer.signalClientLine?4(filename, lineno, forStack=False) eric5.Debugger.DebugServer.DebugServer.signalClientOutput?4(line) eric5.Debugger.DebugServer.DebugServer.signalClientRawInput?4(prompt, echo) eric5.Debugger.DebugServer.DebugServer.signalClientStack?4(stack) @@ -700,7 +700,7 @@ eric5.Debugger.DebugServer.DebugServer.signalClientVariable?4(scope, variables) eric5.Debugger.DebugServer.DebugServer.signalClientVariables?4(scope, variables) eric5.Debugger.DebugServer.DebugServer.signalClientWatchConditionError?4(condition) -eric5.Debugger.DebugServer.DebugServer.startClient?4(unplanned = True, clType = None, forProject = False, runInConsole = False) +eric5.Debugger.DebugServer.DebugServer.startClient?4(unplanned=True, clType=None, forProject=False, runInConsole=False) eric5.Debugger.DebugServer.DebugServer.utFinished?7 eric5.Debugger.DebugServer.DebugServer.utPrepared?7 eric5.Debugger.DebugServer.DebugServer.utStartTest?7 @@ -720,15 +720,15 @@ eric5.Debugger.DebugUI.DebugUI.initMenus?4() eric5.Debugger.DebugUI.DebugUI.initToolbars?4(toolbarManager) eric5.Debugger.DebugUI.DebugUI.resetUI?7 -eric5.Debugger.DebugUI.DebugUI.setArgvHistory?4(argsStr, clearHistories = False) +eric5.Debugger.DebugUI.DebugUI.setArgvHistory?4(argsStr, clearHistories=False) eric5.Debugger.DebugUI.DebugUI.setAutoClearShell?4(autoClearShell) eric5.Debugger.DebugUI.DebugUI.setAutoContinue?4(autoContinue) -eric5.Debugger.DebugUI.DebugUI.setEnvHistory?4(envStr, clearHistories = False) +eric5.Debugger.DebugUI.DebugUI.setEnvHistory?4(envStr, clearHistories=False) eric5.Debugger.DebugUI.DebugUI.setExcIgnoreList?4(excIgnoreList) eric5.Debugger.DebugUI.DebugUI.setExcList?4(excList) eric5.Debugger.DebugUI.DebugUI.setExceptionReporting?4(exceptions) eric5.Debugger.DebugUI.DebugUI.setTracePython?4(tracePython) -eric5.Debugger.DebugUI.DebugUI.setWdHistory?4(wdStr, clearHistories = False) +eric5.Debugger.DebugUI.DebugUI.setWdHistory?4(wdStr, clearHistories=False) eric5.Debugger.DebugUI.DebugUI.shutdown?4() eric5.Debugger.DebugUI.DebugUI.shutdownServer?4() eric5.Debugger.DebugUI.DebugUI.variablesFilter?4(scope) @@ -748,7 +748,7 @@ eric5.Debugger.DebugViewer.DebugViewer.showVariables?4(vlist, globals) eric5.Debugger.DebugViewer.DebugViewer.showVariablesTab?4(globals) eric5.Debugger.DebugViewer.DebugViewer.sourceFile?7 -eric5.Debugger.DebugViewer.DebugViewer?1(debugServer, docked, vm, parent = None, embeddedShell = True, embeddedBrowser = True) +eric5.Debugger.DebugViewer.DebugViewer?1(debugServer, docked, vm, parent=None, embeddedShell=True, embeddedBrowser=True) eric5.Debugger.DebuggerInterfaceNone.ClientDefaultCapabilities?7 eric5.Debugger.DebuggerInterfaceNone.ClientTypeAssociations?7 eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.flush?4() @@ -756,23 +756,23 @@ eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.isConnected?4() eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.newConnection?4(sock) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBanner?4() -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, set, cond = None, temp = False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, set, cond=None, temp=False) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointEnable?4(fn, line, enable) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointIgnore?4(fn, line, count) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCapabilities?4() eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientSetFilter?4(scope, filter) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariable?4(scope, filter, var, framenr = 0) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariables?4(scope, filter, framenr = 0) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariable?4(scope, filter, var, framenr=0) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariables?4(scope, filter, framenr=0) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCompletion?4(text) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteContinue?4(special = False) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCoverage?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteContinue?4(special=False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCoverage?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteEnvironment?4(env) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteEval?4(arg) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteExec?4(stmt) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteLoad?4(fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteProfile?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteProfile?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteRawInput?4(s) -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteRun?4(fn, argv, wd, autoFork = False, forkChild = False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteSetThread?4(tid) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteStatement?4(stmt) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteStep?4() @@ -783,7 +783,7 @@ eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTPrepare?4(fn, tn, tfn, cov, covname, coverase) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTRun?4() eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTStop?4() -eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpoint?4(cond, set, temp = False) +eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpoint?4(cond, set, temp=False) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointEnable?4(cond, enable) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointIgnore?4(cond, count) eric5.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.shutdown?4() @@ -797,23 +797,23 @@ eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.isConnected?4() eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.newConnection?4(sock) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteBanner?4() -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteBreakpoint?4(fn, line, set, cond = None, temp = False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteBreakpoint?4(fn, line, set, cond=None, temp=False) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteBreakpointEnable?4(fn, line, enable) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteBreakpointIgnore?4(fn, line, count) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteCapabilities?4() eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteClientSetFilter?4(scope, filter) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteClientVariable?4(scope, filter, var, framenr = 0) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteClientVariables?4(scope, filter, framenr = 0) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteClientVariable?4(scope, filter, var, framenr=0) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteClientVariables?4(scope, filter, framenr=0) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteCompletion?4(text) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteContinue?4(special = False) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteCoverage?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteContinue?4(special=False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteCoverage?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteEnvironment?4(env) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteEval?4(arg) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteExec?4(stmt) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteLoad?4(fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteProfile?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteProfile?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteRawInput?4(s) -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteRun?4(fn, argv, wd, autoFork = False, forkChild = False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteSetThread?4(tid) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteStatement?4(stmt) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteStep?4() @@ -824,7 +824,7 @@ eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteUTPrepare?4(fn, tn, tfn, cov, covname, coverase) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteUTRun?4() eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteUTStop?4() -eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteWatchpoint?4(cond, set, temp = False) +eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteWatchpoint?4(cond, set, temp=False) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteWatchpointEnable?4(cond, enable) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteWatchpointIgnore?4(cond, count) eric5.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.shutdown?4() @@ -838,23 +838,23 @@ eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.isConnected?4() eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.newConnection?4(sock) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBanner?4() -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpoint?4(fn, line, set, cond = None, temp = False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpoint?4(fn, line, set, cond=None, temp=False) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpointEnable?4(fn, line, enable) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpointIgnore?4(fn, line, count) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCapabilities?4() eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientSetFilter?4(scope, filter) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariable?4(scope, filter, var, framenr = 0) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariables?4(scope, filter, framenr = 0) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariable?4(scope, filter, var, framenr=0) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariables?4(scope, filter, framenr=0) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCompletion?4(text) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteContinue?4(special = False) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCoverage?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteContinue?4(special=False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCoverage?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteEnvironment?4(env) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteEval?4(arg) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteExec?4(stmt) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteLoad?4(fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteProfile?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteProfile?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteRawInput?4(s) -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteRun?4(fn, argv, wd, autoFork = False, forkChild = False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteSetThread?4(tid) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteStatement?4(stmt) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteStep?4() @@ -865,7 +865,7 @@ eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteUTPrepare?4(fn, tn, tfn, cov, covname, coverase) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteUTRun?4() eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteUTStop?4() -eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteWatchpoint?4(cond, set, temp = False) +eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteWatchpoint?4(cond, set, temp=False) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteWatchpointEnable?4(cond, enable) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteWatchpointIgnore?4(cond, count) eric5.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.shutdown?4() @@ -880,23 +880,23 @@ eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.isConnected?4() eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.newConnection?4(sock) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteBanner?4() -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteBreakpoint?4(fn, line, set, cond = None, temp = False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteBreakpoint?4(fn, line, set, cond=None, temp=False) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteBreakpointEnable?4(fn, line, enable) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteBreakpointIgnore?4(fn, line, count) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteCapabilities?4() eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteClientSetFilter?4(scope, filter) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteClientVariable?4(scope, filter, var, framenr = 0) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteClientVariables?4(scope, filter, framenr = 0) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteClientVariable?4(scope, filter, var, framenr=0) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteClientVariables?4(scope, filter, framenr=0) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteCompletion?4(text) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteContinue?4(special = False) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteCoverage?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteContinue?4(special=False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteCoverage?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteEnvironment?4(env) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteEval?4(arg) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteExec?4(stmt) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteLoad?4(fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteProfile?4(fn, argv, wd, erase = False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteProfile?4(fn, argv, wd, erase=False) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteRawInput?4(s) -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteRun?4(fn, argv, wd, autoFork = False, forkChild = False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteSetThread?4(tid) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteStatement?4(stmt) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteStep?4() @@ -907,7 +907,7 @@ eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteUTPrepare?4(fn, tn, tfn, cov, covname, coverase) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteUTRun?4() eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteUTStop?4() -eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteWatchpoint?4(cond, set, temp = False) +eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteWatchpoint?4(cond, set, temp=False) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteWatchpointEnable?4(cond, enable) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.remoteWatchpointIgnore?4(cond, count) eric5.Debugger.DebuggerInterfaceRuby.DebuggerInterfaceRuby.shutdown?4() @@ -919,9 +919,9 @@ eric5.Debugger.EditBreakpointDialog.EditBreakpointDialog.getData?4() eric5.Debugger.EditBreakpointDialog.EditBreakpointDialog.on_fileButton_clicked?4() eric5.Debugger.EditBreakpointDialog.EditBreakpointDialog.on_filenameCombo_editTextChanged?4(fn) -eric5.Debugger.EditBreakpointDialog.EditBreakpointDialog?1(id, properties, condHistory, parent = None, name = None, modal = False, addMode = False, filenameHistory = None) +eric5.Debugger.EditBreakpointDialog.EditBreakpointDialog?1(id, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None) eric5.Debugger.EditWatchpointDialog.EditWatchpointDialog.getData?4() -eric5.Debugger.EditWatchpointDialog.EditWatchpointDialog?1(properties, parent = None, name = None, modal = False) +eric5.Debugger.EditWatchpointDialog.EditWatchpointDialog?1(properties, parent=None, name=None, modal=False) eric5.Debugger.ExceptionLogger.ExceptionLogger.addException?4(exceptionType, exceptionMessage, stackTrace) eric5.Debugger.ExceptionLogger.ExceptionLogger.debuggingStarted?4() eric5.Debugger.ExceptionLogger.ExceptionLogger.sourceFile?7 @@ -941,12 +941,12 @@ eric5.Debugger.StartDialog.StartDialog.on_buttonBox_clicked?4(button) eric5.Debugger.StartDialog.StartDialog.on_dirButton_clicked?4() eric5.Debugger.StartDialog.StartDialog.on_modFuncCombo_editTextChanged?4() -eric5.Debugger.StartDialog.StartDialog?1(caption, argvList, wdList, envList, exceptions, parent = None, type = 0, modfuncList = None, tracePython = False, autoClearShell = True, autoContinue = True, autoFork = False, forkChild = False) +eric5.Debugger.StartDialog.StartDialog?1(caption, argvList, wdList, envList, exceptions, parent=None, type=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False) eric5.Debugger.VariableDetailDialog.VariableDetailDialog?1(var, vtype, value) eric5.Debugger.VariablesFilterDialog.VariablesFilterDialog.getSelection?4() eric5.Debugger.VariablesFilterDialog.VariablesFilterDialog.on_buttonBox_clicked?4(button) eric5.Debugger.VariablesFilterDialog.VariablesFilterDialog.setSelection?4(lList, gList) -eric5.Debugger.VariablesFilterDialog.VariablesFilterDialog?1(parent = None, name = None, modal = False) +eric5.Debugger.VariablesFilterDialog.VariablesFilterDialog?1(parent=None, name=None, modal=False) eric5.Debugger.VariablesViewer.ArrayElementVarItem.key?4(column) eric5.Debugger.VariablesViewer.ArrayElementVarItem?1(parent, dvar, dvalue, dtype) eric5.Debugger.VariablesViewer.SpecialArrayElementVarItem.key?4(column) @@ -969,7 +969,7 @@ eric5.Debugger.VariablesViewer.VariablesViewer.showVariables?4(vlist, frmnr) eric5.Debugger.VariablesViewer.VariablesViewer?1(parent=None, scope=1) eric5.Debugger.WatchPointModel.WatchPointModel.addWatchPoint?4(cond, special, properties) -eric5.Debugger.WatchPointModel.WatchPointModel.columnCount?4(parent = QModelIndex()) +eric5.Debugger.WatchPointModel.WatchPointModel.columnCount?4(parent=QModelIndex()) eric5.Debugger.WatchPointModel.WatchPointModel.data?4(index, role) eric5.Debugger.WatchPointModel.WatchPointModel.dataAboutToBeChanged?7 eric5.Debugger.WatchPointModel.WatchPointModel.deleteAll?4() @@ -977,31 +977,31 @@ eric5.Debugger.WatchPointModel.WatchPointModel.deleteWatchPoints?4(idxList) eric5.Debugger.WatchPointModel.WatchPointModel.flags?4(index) eric5.Debugger.WatchPointModel.WatchPointModel.getWatchPointByIndex?4(index) -eric5.Debugger.WatchPointModel.WatchPointModel.getWatchPointIndex?4(cond, special = "") -eric5.Debugger.WatchPointModel.WatchPointModel.hasChildren?4(parent = QModelIndex()) -eric5.Debugger.WatchPointModel.WatchPointModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Debugger.WatchPointModel.WatchPointModel.index?4(row, column, parent = QModelIndex()) +eric5.Debugger.WatchPointModel.WatchPointModel.getWatchPointIndex?4(cond, special="") +eric5.Debugger.WatchPointModel.WatchPointModel.hasChildren?4(parent=QModelIndex()) +eric5.Debugger.WatchPointModel.WatchPointModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Debugger.WatchPointModel.WatchPointModel.index?4(row, column, parent=QModelIndex()) eric5.Debugger.WatchPointModel.WatchPointModel.parent?4(index) -eric5.Debugger.WatchPointModel.WatchPointModel.rowCount?4(parent = QModelIndex()) +eric5.Debugger.WatchPointModel.WatchPointModel.rowCount?4(parent=QModelIndex()) eric5.Debugger.WatchPointModel.WatchPointModel.setWatchPointByIndex?4(index, cond, special, properties) eric5.Debugger.WatchPointModel.WatchPointModel.setWatchPointEnabledByIndex?4(index, enabled) -eric5.Debugger.WatchPointModel.WatchPointModel?1(parent = None) +eric5.Debugger.WatchPointModel.WatchPointModel?1(parent=None) eric5.Debugger.WatchPointViewer.WatchPointViewer.setModel?4(model) -eric5.Debugger.WatchPointViewer.WatchPointViewer?1(parent = None) +eric5.Debugger.WatchPointViewer.WatchPointViewer?1(parent=None) eric5.DocumentationTools.APIGenerator.APIGenerator.genAPI?4(newStyle, basePackage, includePrivate) eric5.DocumentationTools.APIGenerator.APIGenerator?1(module) eric5.DocumentationTools.Config.eric5docColorParameterNames?7 eric5.DocumentationTools.Config.eric5docDefaultColors?7 eric5.DocumentationTools.IndexGenerator.IndexGenerator.remember?4(file, moduleDocument, basename="") -eric5.DocumentationTools.IndexGenerator.IndexGenerator.writeIndices?4(basename = "", newline = None) -eric5.DocumentationTools.IndexGenerator.IndexGenerator?1(outputDir, colors, stylesheet = None) +eric5.DocumentationTools.IndexGenerator.IndexGenerator.writeIndices?4(basename="", newline=None) +eric5.DocumentationTools.IndexGenerator.IndexGenerator?1(outputDir, colors, stylesheet=None) eric5.DocumentationTools.ModuleDocumentor.ModuleDocument.description?4() eric5.DocumentationTools.ModuleDocumentor.ModuleDocument.genDocument?4() eric5.DocumentationTools.ModuleDocumentor.ModuleDocument.getQtHelpKeywords?4() eric5.DocumentationTools.ModuleDocumentor.ModuleDocument.isEmpty?4() eric5.DocumentationTools.ModuleDocumentor.ModuleDocument.name?4() eric5.DocumentationTools.ModuleDocumentor.ModuleDocument.shortDescription?4() -eric5.DocumentationTools.ModuleDocumentor.ModuleDocument?1(module, colors, stylesheet = None) +eric5.DocumentationTools.ModuleDocumentor.ModuleDocument?1(module, colors, stylesheet=None) eric5.DocumentationTools.ModuleDocumentor._event?8 eric5.DocumentationTools.ModuleDocumentor._signal?8 eric5.DocumentationTools.QtHelpGenerator.HelpCollection?7 @@ -1010,7 +1010,7 @@ eric5.DocumentationTools.QtHelpGenerator.HelpHelpFile?7 eric5.DocumentationTools.QtHelpGenerator.HelpProject?7 eric5.DocumentationTools.QtHelpGenerator.HelpProjectFile?7 -eric5.DocumentationTools.QtHelpGenerator.QtHelpGenerator.generateFiles?4(basename = "", newline = None) +eric5.DocumentationTools.QtHelpGenerator.QtHelpGenerator.generateFiles?4(basename="", newline=None) eric5.DocumentationTools.QtHelpGenerator.QtHelpGenerator.remember?4(file, moduleDocument, basename="") eric5.DocumentationTools.QtHelpGenerator.QtHelpGenerator?1(htmlDir, outputDir, namespace, virtualFolder, filterName, filterAttributes, title, createCollection) eric5.DocumentationTools.TemplatesListsStyle.authorInfoTemplate?7 @@ -1086,26 +1086,26 @@ eric5.DocumentationTools.supportedExtensionsDictForApis?7 eric5.E5Graphics.E5ArrowItem.ArrowheadAngleFactor?7 eric5.E5Graphics.E5ArrowItem.E5ArrowItem.boundingRect?4() -eric5.E5Graphics.E5ArrowItem.E5ArrowItem.paint?4(painter, option, widget = None) +eric5.E5Graphics.E5ArrowItem.E5ArrowItem.paint?4(painter, option, widget=None) eric5.E5Graphics.E5ArrowItem.E5ArrowItem.setEndPoint?4(x, y) eric5.E5Graphics.E5ArrowItem.E5ArrowItem.setPoints?4(xa, ya, xb, yb) eric5.E5Graphics.E5ArrowItem.E5ArrowItem.setStartPoint?4(x, y) -eric5.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin = QPointF(), end = QPointF(), filled = False, type = NormalArrow, parent = None) +eric5.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=QPointF(), end=QPointF(), filled=False, type=NormalArrow, parent=None) eric5.E5Graphics.E5ArrowItem.NormalArrow?7 eric5.E5Graphics.E5ArrowItem.WideArrow?7 -eric5.E5Graphics.E5GraphicsView.E5GraphicsView._getDiagramRect?5(border = 0) -eric5.E5Graphics.E5GraphicsView.E5GraphicsView._getDiagramSize?5(border = 0) +eric5.E5Graphics.E5GraphicsView.E5GraphicsView._getDiagramRect?5(border=0) +eric5.E5Graphics.E5GraphicsView.E5GraphicsView._getDiagramSize?5(border=0) eric5.E5Graphics.E5GraphicsView.E5GraphicsView.filteredItems?4(items) -eric5.E5Graphics.E5GraphicsView.E5GraphicsView.printDiagram?4(printer, diagramName = "") -eric5.E5Graphics.E5GraphicsView.E5GraphicsView.resizeScene?4(amount, isWidth = True) -eric5.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, format = "PNG") +eric5.E5Graphics.E5GraphicsView.E5GraphicsView.printDiagram?4(printer, diagramName="") +eric5.E5Graphics.E5GraphicsView.E5GraphicsView.resizeScene?4(amount, isWidth=True) +eric5.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, format="PNG") eric5.E5Graphics.E5GraphicsView.E5GraphicsView.setSceneSize?4(width, height) eric5.E5Graphics.E5GraphicsView.E5GraphicsView.setZoom?4(zoomFactor) eric5.E5Graphics.E5GraphicsView.E5GraphicsView.zoom?4() eric5.E5Graphics.E5GraphicsView.E5GraphicsView.zoomIn?4() eric5.E5Graphics.E5GraphicsView.E5GraphicsView.zoomOut?4() eric5.E5Graphics.E5GraphicsView.E5GraphicsView.zoomReset?4() -eric5.E5Graphics.E5GraphicsView.E5GraphicsView?1(scene, parent = None) +eric5.E5Graphics.E5GraphicsView.E5GraphicsView?1(scene, parent=None) eric5.E5Gui.E5Action.ArgumentsError?1(error) eric5.E5Gui.E5Action.E5Action.alternateShortcut?4() eric5.E5Gui.E5Action.E5Action.setAlternateShortcut?4(shortcut) @@ -1113,19 +1113,19 @@ eric5.E5Gui.E5Action.E5Action.setShortcuts?4(shortcuts) eric5.E5Gui.E5Action.E5Action?1(*args) eric5.E5Gui.E5Action.addActions?4(target, actions) -eric5.E5Gui.E5Action.createActionGroup?4(parent, name = None, exclusive = False) +eric5.E5Gui.E5Action.createActionGroup?4(parent, name=None, exclusive=False) eric5.E5Gui.E5Application.E5Application.getObject?4(name) eric5.E5Gui.E5Application.E5Application.getPluginObject?4(name) eric5.E5Gui.E5Application.E5Application.getPluginObjectType?4(name) eric5.E5Gui.E5Application.E5Application.getPluginObjects?4() eric5.E5Gui.E5Application.E5Application.registerObject?4(name, object) -eric5.E5Gui.E5Application.E5Application.registerPluginObject?4(name, object, pluginType = None) +eric5.E5Gui.E5Application.E5Application.registerPluginObject?4(name, object, pluginType=None) eric5.E5Gui.E5Application.E5Application.unregisterPluginObject?4(name) eric5.E5Gui.E5Application.E5Application?1(argv) eric5.E5Gui.E5Application.e5App?7 -eric5.E5Gui.E5Completers.E5DirCompleter?1(parent = None, completionMode = QCompleter.PopupCompletion, showHidden = False) -eric5.E5Gui.E5Completers.E5FileCompleter?1(parent = None, completionMode = QCompleter.PopupCompletion, showHidden = False) -eric5.E5Gui.E5Completers.E5StringListCompleter?1(parent = None, strings = [], completionMode = QCompleter.PopupCompletion) +eric5.E5Gui.E5Completers.E5DirCompleter?1(parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False) +eric5.E5Gui.E5Completers.E5FileCompleter?1(parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False) +eric5.E5Gui.E5Completers.E5StringListCompleter?1(parent=None, strings=[], completionMode=QCompleter.PopupCompletion) eric5.E5Gui.E5FileDialog.DontConfirmOverwrite?7 eric5.E5Gui.E5FileDialog.DontResolveSymlinks?7 eric5.E5Gui.E5FileDialog.DontUseNativeDialog?7 @@ -1134,13 +1134,13 @@ eric5.E5Gui.E5FileDialog.Options?7 eric5.E5Gui.E5FileDialog.ReadOnly?7 eric5.E5Gui.E5FileDialog.ShowDirsOnly?7 -eric5.E5Gui.E5FileDialog.getExistingDirectory?4(parent = None, caption = "", directory = "", options = QFileDialog.ShowDirsOnly) -eric5.E5Gui.E5FileDialog.getOpenFileName?4(parent = None, caption = "", directory = "", filter = "", options = QFileDialog.Options()) -eric5.E5Gui.E5FileDialog.getOpenFileNameAndFilter?4(parent = None, caption = "", directory = "", filter = "", initialFilter = "", options = QFileDialog.Options()) -eric5.E5Gui.E5FileDialog.getOpenFileNames?4(parent = None, caption = "", directory = "", filter = "", options = QFileDialog.Options()) -eric5.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent = None, caption = "", directory = "", filter = "", initialFilter = "", options = QFileDialog.Options()) -eric5.E5Gui.E5FileDialog.getSaveFileName?4(parent = None, caption = "", directory = "", filter = "", options = QFileDialog.Options()) -eric5.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent = None, caption = "", directory = "", filter = "", initialFilter = "", options = QFileDialog.Options()) +eric5.E5Gui.E5FileDialog.getExistingDirectory?4(parent=None, caption="", directory="", options=QFileDialog.ShowDirsOnly) +eric5.E5Gui.E5FileDialog.getOpenFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options()) +eric5.E5Gui.E5FileDialog.getOpenFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()) +eric5.E5Gui.E5FileDialog.getOpenFileNames?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options()) +eric5.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()) +eric5.E5Gui.E5FileDialog.getSaveFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options()) +eric5.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()) eric5.E5Gui.E5Led.E5Led.color?4() eric5.E5Gui.E5Led.E5Led.darkFactor?4() eric5.E5Gui.E5Led.E5Led.isFramed?4() @@ -1159,7 +1159,7 @@ eric5.E5Gui.E5Led.E5Led.shape?4() eric5.E5Gui.E5Led.E5Led.sizeHint?4() eric5.E5Gui.E5Led.E5Led.toggle?4() -eric5.E5Gui.E5Led.E5Led?1(parent = None, color = None, shape = E5LedCircular, rectRatio = 1) +eric5.E5Gui.E5Led.E5Led?1(parent=None, color=None, shape=E5LedCircular, rectRatio=1) eric5.E5Gui.E5Led.E5LedCircular?7 eric5.E5Gui.E5Led.E5LedRectangular?7 eric5.E5Gui.E5LineEdit.E5LineEdit.LeftSide?7 @@ -1175,15 +1175,15 @@ eric5.E5Gui.E5LineEdit.E5LineEdit.setWidgetSpacing?4(spacing) eric5.E5Gui.E5LineEdit.E5LineEdit.textMargin?4(position) eric5.E5Gui.E5LineEdit.E5LineEdit.widgetSpacing?4() -eric5.E5Gui.E5LineEdit.E5LineEdit?1(parent = None, inactiveText = "") +eric5.E5Gui.E5LineEdit.E5LineEdit?1(parent=None, inactiveText="") eric5.E5Gui.E5LineEdit.SideWidget.event?4(evt) eric5.E5Gui.E5LineEdit.SideWidget.sizeHintChanged?7 -eric5.E5Gui.E5LineEdit.SideWidget?1(parent = None) +eric5.E5Gui.E5LineEdit.SideWidget?1(parent=None) eric5.E5Gui.E5LineEditButton.E5LineEditButton.menu?4() eric5.E5Gui.E5LineEditButton.E5LineEditButton.paintEvent?4(evt) eric5.E5Gui.E5LineEditButton.E5LineEditButton.setIcon?4(icon) eric5.E5Gui.E5LineEditButton.E5LineEditButton.setMenu?4(menu) -eric5.E5Gui.E5LineEditButton.E5LineEditButton?1(parent = None) +eric5.E5Gui.E5LineEditButton.E5LineEditButton?1(parent=None) eric5.E5Gui.E5ListView.E5ListView.keyPressEvent?4(evt) eric5.E5Gui.E5ListView.E5ListView.removeAll?4() eric5.E5Gui.E5ListView.E5ListView.removeSelected?4() @@ -1197,7 +1197,7 @@ eric5.E5Gui.E5MessageBox.Critical?7 eric5.E5Gui.E5MessageBox.DestructiveRole?7 eric5.E5Gui.E5MessageBox.Discard?7 -eric5.E5Gui.E5MessageBox.E5MessageBox?1(icon, title, text, modal = False, buttons = QMessageBox.StandardButtons(QMessageBox.NoButton), parent = None) +eric5.E5Gui.E5MessageBox.E5MessageBox?1(icon, title, text, modal=False, buttons=QMessageBox.StandardButtons(QMessageBox.NoButton), parent=None) eric5.E5Gui.E5MessageBox.Help?7 eric5.E5Gui.E5MessageBox.HelpRole?7 eric5.E5Gui.E5MessageBox.Ignore?7 @@ -1224,16 +1224,16 @@ eric5.E5Gui.E5MessageBox.YesToAll?7 eric5.E5Gui.E5MessageBox.about?7 eric5.E5Gui.E5MessageBox.aboutQt?7 -eric5.E5Gui.E5MessageBox.critical?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) -eric5.E5Gui.E5MessageBox.information?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.critical?4(parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.information?4(parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton) eric5.E5Gui.E5MessageBox.okToClearData?4(parent, title, text, saveFunc) -eric5.E5Gui.E5MessageBox.question?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) -eric5.E5Gui.E5MessageBox.retryAbort?4(parent, title, text, icon = Question) -eric5.E5Gui.E5MessageBox.warning?4(parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton) -eric5.E5Gui.E5MessageBox.yesNo?4(parent, title, text, icon = Question, yesDefault = False) +eric5.E5Gui.E5MessageBox.question?4(parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.retryAbort?4(parent, title, text, icon=Question) +eric5.E5Gui.E5MessageBox.warning?4(parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton) +eric5.E5Gui.E5MessageBox.yesNo?4(parent, title, text, icon=Question, yesDefault=False) eric5.E5Gui.E5ModelMenu.E5ModelMenu.activated?7 eric5.E5Gui.E5ModelMenu.E5ModelMenu.createBaseMenu?4() -eric5.E5Gui.E5ModelMenu.E5ModelMenu.createMenu?4(parent, max_, parentMenu = None, menu = None) +eric5.E5Gui.E5ModelMenu.E5ModelMenu.createMenu?4(parent, max_, parentMenu=None, menu=None) eric5.E5Gui.E5ModelMenu.E5ModelMenu.dragEnterEvent?4(evt) eric5.E5Gui.E5ModelMenu.E5ModelMenu.dropEvent?4(evt) eric5.E5Gui.E5ModelMenu.E5ModelMenu.firstSeparator?4() @@ -1257,7 +1257,7 @@ eric5.E5Gui.E5ModelMenu.E5ModelMenu.setSeparatorRole?4(role) eric5.E5Gui.E5ModelMenu.E5ModelMenu.setStatusBarTextRole?4(role) eric5.E5Gui.E5ModelMenu.E5ModelMenu.statusBarTextRole?4() -eric5.E5Gui.E5ModelMenu.E5ModelMenu?1(parent = None) +eric5.E5Gui.E5ModelMenu.E5ModelMenu?1(parent=None) eric5.E5Gui.E5ModelToolBar.E5ModelToolBar._build?5() eric5.E5Gui.E5ModelToolBar.E5ModelToolBar._createMenu?5() eric5.E5Gui.E5ModelToolBar.E5ModelToolBar.activated?7 @@ -1273,7 +1273,7 @@ eric5.E5Gui.E5ModelToolBar.E5ModelToolBar.setModel?4(model) eric5.E5Gui.E5ModelToolBar.E5ModelToolBar.setRootIndex?4(idx) eric5.E5Gui.E5ModelToolBar.E5ModelToolBar.showEvent?4(evt) -eric5.E5Gui.E5ModelToolBar.E5ModelToolBar?1(title = None, parent = None) +eric5.E5Gui.E5ModelToolBar.E5ModelToolBar?1(title=None, parent=None) eric5.E5Gui.E5PassivePopup.DEFAULT_POPUP_TIME?7 eric5.E5Gui.E5PassivePopup.DEFAULT_POPUP_TYPE?7 eric5.E5Gui.E5PassivePopup.E5PassivePopup.Boxed?7 @@ -1284,17 +1284,17 @@ eric5.E5Gui.E5PassivePopup.E5PassivePopup.setTimeout?4(delay) eric5.E5Gui.E5PassivePopup.E5PassivePopup.setView?4(child) eric5.E5Gui.E5PassivePopup.E5PassivePopup.setVisible?4(visible) -eric5.E5Gui.E5PassivePopup.E5PassivePopup.show?4(p = None) +eric5.E5Gui.E5PassivePopup.E5PassivePopup.show?4(p=None) eric5.E5Gui.E5PassivePopup.E5PassivePopup.timeout?4() eric5.E5Gui.E5PassivePopup.E5PassivePopup.view?4() -eric5.E5Gui.E5PassivePopup.E5PassivePopup?1(parent = None) +eric5.E5Gui.E5PassivePopup.E5PassivePopup?1(parent=None) eric5.E5Gui.E5PassivePopup.POPUP_FLAGS?7 eric5.E5Gui.E5SideBar.E5SideBar.East?7 eric5.E5Gui.E5SideBar.E5SideBar.North?7 eric5.E5Gui.E5SideBar.E5SideBar.South?7 eric5.E5Gui.E5SideBar.E5SideBar.Version?7 eric5.E5Gui.E5SideBar.E5SideBar.West?7 -eric5.E5Gui.E5SideBar.E5SideBar.addTab?4(widget, iconOrLabel, label = None) +eric5.E5Gui.E5SideBar.E5SideBar.addTab?4(widget, iconOrLabel, label=None) eric5.E5Gui.E5SideBar.E5SideBar.clear?4() eric5.E5Gui.E5SideBar.E5SideBar.count?4() eric5.E5Gui.E5SideBar.E5SideBar.currentIndex?4() @@ -1303,7 +1303,7 @@ eric5.E5Gui.E5SideBar.E5SideBar.eventFilter?4(obj, evt) eric5.E5Gui.E5SideBar.E5SideBar.expand?4() eric5.E5Gui.E5SideBar.E5SideBar.indexOf?4(widget) -eric5.E5Gui.E5SideBar.E5SideBar.insertTab?4(index, widget, iconOrLabel, label = None) +eric5.E5Gui.E5SideBar.E5SideBar.insertTab?4(index, widget, iconOrLabel, label=None) eric5.E5Gui.E5SideBar.E5SideBar.isAutoHiding?4() eric5.E5Gui.E5SideBar.E5SideBar.isMinimized?4() eric5.E5Gui.E5SideBar.E5SideBar.isTabEnabled?4(index) @@ -1329,7 +1329,7 @@ eric5.E5Gui.E5SideBar.E5SideBar.tabToolTip?4(index) eric5.E5Gui.E5SideBar.E5SideBar.tabWhatsThis?4(index) eric5.E5Gui.E5SideBar.E5SideBar.widget?4(index) -eric5.E5Gui.E5SideBar.E5SideBar?1(orientation = None, parent = None) +eric5.E5Gui.E5SideBar.E5SideBar?1(orientation=None, parent=None) eric5.E5Gui.E5SingleApplication.E5SingleApplicationClient.processArgs?4(args) eric5.E5Gui.E5SingleApplication.E5SingleApplicationClient?1() eric5.E5Gui.E5SingleApplication.E5SingleApplicationServer.handleCommand?4(cmd, params) @@ -1340,19 +1340,19 @@ eric5.E5Gui.E5SingleApplication.SAOpenProject?7 eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabel.paintEvent?4(event) eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabel.setText?4(txt) -eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabel?1(parent = None) +eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabel?1(parent=None) eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath.length?4(txt) eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath.paintEvent?4(event) eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath.setPath?4(path) eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath.setSurrounding?4(surrounding) eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath.setTextPath?4(surrounding, path) -eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath?1(parent = None) +eric5.E5Gui.E5SqueezeLabels.E5SqueezeLabelPath?1(parent=None) eric5.E5Gui.E5TabWidget.E5DnDTabBar.dragEnterEvent?4(event) eric5.E5Gui.E5TabWidget.E5DnDTabBar.dropEvent?4(event) eric5.E5Gui.E5TabWidget.E5DnDTabBar.mouseMoveEvent?4(event) eric5.E5Gui.E5TabWidget.E5DnDTabBar.mousePressEvent?4(event) eric5.E5Gui.E5TabWidget.E5DnDTabBar.tabMoveRequested?7 -eric5.E5Gui.E5TabWidget.E5DnDTabBar?1(parent = None) +eric5.E5Gui.E5TabWidget.E5DnDTabBar?1(parent=None) eric5.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile) eric5.E5Gui.E5TabWidget.E5TabWidget.customTabContextMenuRequested?7 eric5.E5Gui.E5TabWidget.E5TabWidget.moveTab?4(curIndex, newIndex) @@ -1363,18 +1363,18 @@ eric5.E5Gui.E5TabWidget.E5TabWidget.setCustomTabBar?4(dnd, tabBar) eric5.E5Gui.E5TabWidget.E5TabWidget.setTabContextMenuPolicy?4(policy) eric5.E5Gui.E5TabWidget.E5TabWidget.switchTab?4() -eric5.E5Gui.E5TabWidget.E5TabWidget?1(parent = None, dnd = False) +eric5.E5Gui.E5TabWidget.E5TabWidget?1(parent=None, dnd=False) eric5.E5Gui.E5TabWidget.E5WheelTabBar.wheelEvent?4(event) -eric5.E5Gui.E5TabWidget.E5WheelTabBar?1(parent = None) +eric5.E5Gui.E5TabWidget.E5WheelTabBar?1(parent=None) eric5.E5Gui.E5TableView.E5TableView.keyPressEvent?4(evt) eric5.E5Gui.E5TableView.E5TableView.removeAll?4() eric5.E5Gui.E5TableView.E5TableView.removeSelected?4() -eric5.E5Gui.E5TextSpinBox.E5TextSpinBox.addItem?4(txt, data = None) +eric5.E5Gui.E5TextSpinBox.E5TextSpinBox.addItem?4(txt, data=None) eric5.E5Gui.E5TextSpinBox.E5TextSpinBox.currentIndex?4() eric5.E5Gui.E5TextSpinBox.E5TextSpinBox.itemData?4(index) eric5.E5Gui.E5TextSpinBox.E5TextSpinBox.textFromValue?4(value) eric5.E5Gui.E5TextSpinBox.E5TextSpinBox.valueFromText?4(txt) -eric5.E5Gui.E5TextSpinBox.E5TextSpinBox?1(parent = None) +eric5.E5Gui.E5TextSpinBox.E5TextSpinBox?1(parent=None) eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog.ActionIdRole?7 eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog.WidgetActionRole?7 eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog.on_actionsTree_currentItemChanged?4(current, previous) @@ -1387,7 +1387,7 @@ eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog.on_rightButton_clicked?4() eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog.on_toolbarActionsList_currentItemChanged?4(current, previous) eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog.on_upButton_clicked?4() -eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog?1(toolBarManager, parent = None) +eric5.E5Gui.E5ToolBarDialog.E5ToolBarDialog?1(toolBarManager, parent=None) eric5.E5Gui.E5ToolBarDialog.E5ToolBarItem?1(toolBarId, actionIDs, default) eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.CustomToolBarMarker?7 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.ToolBarMarker?7 @@ -1410,8 +1410,8 @@ eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.renameToolBar?4(toolBar, title) eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.resetAllToolBars?4() eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.resetToolBar?4(toolBar) -eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.restoreState?4(state, version = 0) -eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.saveState?4(version = 0) +eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.restoreState?4(state, version=0) +eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.saveState?4(version=0) eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.setMainWindow?4(mainWindow) eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.setToolBar?4(toolBar, actions) eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.setToolBars?4(toolBars) @@ -1420,35 +1420,35 @@ eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.toolBarWidgetAction?4(action) eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.toolBars?4() eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.toolBarsActions?4() -eric5.E5Gui.E5ToolBarManager.E5ToolBarManager?1(ui = None, parent = None) +eric5.E5Gui.E5ToolBarManager.E5ToolBarManager?1(ui=None, parent=None) eric5.E5Gui.E5ToolBox.E5HorizontalToolBox.addItem?4(widget, icon, text) eric5.E5Gui.E5ToolBox.E5HorizontalToolBox.insertItem?4(index, widget, icon, text) eric5.E5Gui.E5ToolBox.E5HorizontalToolBox.setItemEnabled?4(index, enabled) eric5.E5Gui.E5ToolBox.E5HorizontalToolBox.setItemToolTip?4(index, toolTip) -eric5.E5Gui.E5ToolBox.E5HorizontalToolBox?1(parent = None) +eric5.E5Gui.E5ToolBox.E5HorizontalToolBox?1(parent=None) eric5.E5Gui.E5ToolBox.E5VerticalToolBox.wheelEvent?4(event) -eric5.E5Gui.E5ToolBox.E5VerticalToolBox?1(parent = None) +eric5.E5Gui.E5ToolBox.E5VerticalToolBox?1(parent=None) eric5.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel.filterAcceptsRow?4(sourceRow, sourceParent) -eric5.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel.hasChildren?4(parent = QModelIndex()) -eric5.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel?1(parent = None) +eric5.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel.hasChildren?4(parent=QModelIndex()) +eric5.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel?1(parent=None) eric5.E5Gui.E5TreeView.E5TreeView.keyPressEvent?4(evt) eric5.E5Gui.E5TreeView.E5TreeView.removeAll?4() eric5.E5Gui.E5TreeView.E5TreeView.removeSelected?4() eric5.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog.setData?4(name, value) -eric5.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog?1(parent = None) +eric5.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog?1(parent=None) eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor._monitor?8 eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor.closeEvent?4(evt) eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor.closeMonitor?4() eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor.instance?4(networkAccessManager) eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor.reject?4() -eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor?1(networkAccessManager, parent = None) +eric5.E5Network.E5NetworkMonitor.E5NetworkMonitor?1(networkAccessManager, parent=None) eric5.E5Network.E5NetworkMonitor.E5NetworkRequest?1() eric5.E5Network.E5NetworkMonitor.E5RequestModel.columnCount?4(parent) -eric5.E5Network.E5NetworkMonitor.E5RequestModel.data?4(index, role = Qt.DisplayRole) -eric5.E5Network.E5NetworkMonitor.E5RequestModel.headerData?4(section, orientation, role = Qt.DisplayRole) +eric5.E5Network.E5NetworkMonitor.E5RequestModel.data?4(index, role=Qt.DisplayRole) +eric5.E5Network.E5NetworkMonitor.E5RequestModel.headerData?4(section, orientation, role=Qt.DisplayRole) eric5.E5Network.E5NetworkMonitor.E5RequestModel.removeRows?4(row, count, parent) eric5.E5Network.E5NetworkMonitor.E5RequestModel.rowCount?4(parent) -eric5.E5Network.E5NetworkMonitor.E5RequestModel?1(networkAccessManager, parent = None) +eric5.E5Network.E5NetworkMonitor.E5RequestModel?1(networkAccessManager, parent=None) eric5.E5Network.E5NetworkProxyFactory.E5NetworkProxyFactory.queryProxy?4(query) eric5.E5Network.E5NetworkProxyFactory.E5NetworkProxyFactory?1() eric5.E5Network.E5NetworkProxyFactory.proxyAuthenticationRequired?4(proxy, auth) @@ -1463,7 +1463,7 @@ eric5.E5XML.Config.tasksFileFormatVersion?7 eric5.E5XML.Config.templatesFileFormatVersion?7 eric5.E5XML.Config.userProjectFileFormatVersion?7 -eric5.E5XML.DebuggerPropertiesReader.DebuggerPropertiesReader.readXML?4(quiet = False) +eric5.E5XML.DebuggerPropertiesReader.DebuggerPropertiesReader.readXML?4(quiet=False) eric5.E5XML.DebuggerPropertiesReader.DebuggerPropertiesReader.supportedVersions?7 eric5.E5XML.DebuggerPropertiesReader.DebuggerPropertiesReader?1(device, project) eric5.E5XML.DebuggerPropertiesWriter.DebuggerPropertiesWriter.writeXML?4() @@ -1486,7 +1486,7 @@ eric5.E5XML.ProjectReader.ProjectReader?1(device, project) eric5.E5XML.ProjectWriter.ProjectWriter.writeXML?4() eric5.E5XML.ProjectWriter.ProjectWriter?1(device, projectName) -eric5.E5XML.SessionReader.SessionReader.readXML?4(quiet = False) +eric5.E5XML.SessionReader.SessionReader.readXML?4(quiet=False) eric5.E5XML.SessionReader.SessionReader.supportedVersions?7 eric5.E5XML.SessionReader.SessionReader?1(device, isGlobal) eric5.E5XML.SessionWriter.SessionWriter.writeXML?4() @@ -1499,12 +1499,12 @@ eric5.E5XML.ShortcutsWriter.ShortcutsWriter?1(device) eric5.E5XML.TasksReader.TasksReader.readXML?4() eric5.E5XML.TasksReader.TasksReader.supportedVersions?7 -eric5.E5XML.TasksReader.TasksReader?1(device, forProject = False, viewer = None) +eric5.E5XML.TasksReader.TasksReader?1(device, forProject=False, viewer=None) eric5.E5XML.TasksWriter.TasksWriter.writeXML?4() -eric5.E5XML.TasksWriter.TasksWriter?1(device, forProject = False, projectName = "") +eric5.E5XML.TasksWriter.TasksWriter?1(device, forProject=False, projectName="") eric5.E5XML.TemplatesReader.TemplatesReader.readXML?4() eric5.E5XML.TemplatesReader.TemplatesReader.supportedVersions?7 -eric5.E5XML.TemplatesReader.TemplatesReader?1(device, viewer = None) +eric5.E5XML.TemplatesReader.TemplatesReader?1(device, viewer=None) eric5.E5XML.TemplatesWriter.TemplatesWriter.writeXML?4() eric5.E5XML.TemplatesWriter.TemplatesWriter?1(device, templatesViewer) eric5.E5XML.UserProjectReader.UserProjectReader.readXML?4() @@ -1514,7 +1514,7 @@ eric5.E5XML.UserProjectWriter.UserProjectWriter?1(device, projectName) eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase._readBasics?5() eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase._skipUnknownElement?5() -eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase.attribute?4(name, default = "") +eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase.attribute?4(name, default="") eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase.raiseBadValue?4(value) eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase.raiseUnexpectedStartTag?4(tag) eric5.E5XML.XMLStreamReaderBase.XMLStreamReaderBase.raiseUnsupportedFormatVersion?4(version) @@ -1552,10 +1552,10 @@ eric5.Globals.settingsNameRecent?7 eric5.Graphics.ApplicationDiagram.ApplicationDiagram.relayout?4() eric5.Graphics.ApplicationDiagram.ApplicationDiagram.show?4() -eric5.Graphics.ApplicationDiagram.ApplicationDiagram?1(project, parent = None, name = None, noModules = False) +eric5.Graphics.ApplicationDiagram.ApplicationDiagram?1(project, parent=None, name=None, noModules=False) eric5.Graphics.AssociationItem.AssociationItem.unassociate?4() eric5.Graphics.AssociationItem.AssociationItem.widgetMoved?4() -eric5.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, type = Normal, parent = None) +eric5.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, type=Normal, parent=None) eric5.Graphics.AssociationItem.Center?7 eric5.Graphics.AssociationItem.East?7 eric5.Graphics.AssociationItem.Generalisation?7 @@ -1570,75 +1570,75 @@ eric5.Graphics.AssociationItem.SouthWest?7 eric5.Graphics.AssociationItem.West?7 eric5.Graphics.ClassItem.ClassItem.isExternal?4() -eric5.Graphics.ClassItem.ClassItem.paint?4(painter, option, widget = None) +eric5.Graphics.ClassItem.ClassItem.paint?4(painter, option, widget=None) eric5.Graphics.ClassItem.ClassItem.setModel?4(model) -eric5.Graphics.ClassItem.ClassItem?1(model = None, external = False, x = 0, y = 0, rounded = False, noAttrs = False, parent = None, scene = None) +eric5.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None) eric5.Graphics.ClassItem.ClassModel.addAttribute?4(attribute) eric5.Graphics.ClassItem.ClassModel.addMethod?4(method) eric5.Graphics.ClassItem.ClassModel.getAttributes?4() eric5.Graphics.ClassItem.ClassModel.getMethods?4() eric5.Graphics.ClassItem.ClassModel.getName?4() -eric5.Graphics.ClassItem.ClassModel?1(name, methods = [], attributes = []) +eric5.Graphics.ClassItem.ClassModel?1(name, methods=[], attributes=[]) eric5.Graphics.GraphicsUtilities._buildChildrenLists?5(routes) -eric5.Graphics.GraphicsUtilities.sort?4(nodes, routes, noRecursion = False) +eric5.Graphics.GraphicsUtilities.sort?4(nodes, routes, noRecursion=False) eric5.Graphics.ImportsDiagram.ImportsDiagram.relayout?4() eric5.Graphics.ImportsDiagram.ImportsDiagram.show?4() -eric5.Graphics.ImportsDiagram.ImportsDiagram?1(package, parent = None, name = None, showExternalImports = False) -eric5.Graphics.ModuleItem.ModuleItem.paint?4(painter, option, widget = None) +eric5.Graphics.ImportsDiagram.ImportsDiagram?1(package, parent=None, name=None, showExternalImports=False) +eric5.Graphics.ModuleItem.ModuleItem.paint?4(painter, option, widget=None) eric5.Graphics.ModuleItem.ModuleItem.setModel?4(model) -eric5.Graphics.ModuleItem.ModuleItem?1(model = None, x = 0, y = 0, rounded = False, parent = None, scene = None) +eric5.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, parent=None, scene=None) eric5.Graphics.ModuleItem.ModuleModel.addClass?4(classname) eric5.Graphics.ModuleItem.ModuleModel.getClasses?4() eric5.Graphics.ModuleItem.ModuleModel.getName?4() eric5.Graphics.ModuleItem.ModuleModel?1(name, classlist=[]) eric5.Graphics.PackageDiagram.PackageDiagram.relayout?4() eric5.Graphics.PackageDiagram.PackageDiagram.show?4() -eric5.Graphics.PackageDiagram.PackageDiagram?1(package, parent = None, name = None, noAttrs = False) -eric5.Graphics.PackageItem.PackageItem.paint?4(painter, option, widget = None) +eric5.Graphics.PackageDiagram.PackageDiagram?1(package, parent=None, name=None, noAttrs=False) +eric5.Graphics.PackageItem.PackageItem.paint?4(painter, option, widget=None) eric5.Graphics.PackageItem.PackageItem.setModel?4(model) -eric5.Graphics.PackageItem.PackageItem?1(model = None, x = 0, y = 0, rounded = False, noModules = False, parent = None, scene = None) +eric5.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None) eric5.Graphics.PackageItem.PackageModel.addModule?4(modulename) eric5.Graphics.PackageItem.PackageModel.getModules?4() eric5.Graphics.PackageItem.PackageModel.getName?4() -eric5.Graphics.PackageItem.PackageModel?1(name, moduleslist = []) +eric5.Graphics.PackageItem.PackageModel?1(name, moduleslist=[]) eric5.Graphics.PixmapDiagram.PixmapDiagram.getDiagramName?4() eric5.Graphics.PixmapDiagram.PixmapDiagram.getStatus?4() -eric5.Graphics.PixmapDiagram.PixmapDiagram?1(pixmap, parent = None, name = None) +eric5.Graphics.PixmapDiagram.PixmapDiagram?1(pixmap, parent=None, name=None) eric5.Graphics.SvgDiagram.SvgDiagram.getDiagramName?4() -eric5.Graphics.SvgDiagram.SvgDiagram?1(svgFile, parent = None, name = None) +eric5.Graphics.SvgDiagram.SvgDiagram?1(svgFile, parent=None, name=None) eric5.Graphics.UMLClassDiagram.UMLClassDiagram.relayout?4() eric5.Graphics.UMLClassDiagram.UMLClassDiagram.show?4() -eric5.Graphics.UMLClassDiagram.UMLClassDiagram?1(file, parent = None, name = None, noAttrs = False) -eric5.Graphics.UMLDialog.UMLDialog?1(diagramName = "Unnamed", parent = None, name = None) +eric5.Graphics.UMLClassDiagram.UMLClassDiagram?1(file, parent=None, name=None, noAttrs=False) +eric5.Graphics.UMLDialog.UMLDialog?1(diagramName="Unnamed", parent=None, name=None) eric5.Graphics.UMLGraphicsView.UMLGraphicsView.filteredItems?4(items) eric5.Graphics.UMLGraphicsView.UMLGraphicsView.initToolBar?4() eric5.Graphics.UMLGraphicsView.UMLGraphicsView.relayout?7 eric5.Graphics.UMLGraphicsView.UMLGraphicsView.selectItem?4(item) eric5.Graphics.UMLGraphicsView.UMLGraphicsView.selectItems?4(items) eric5.Graphics.UMLGraphicsView.UMLGraphicsView.setDiagramName?4(name) -eric5.Graphics.UMLGraphicsView.UMLGraphicsView?1(scene, diagramName = "Unnamed", parent = None, name = None) +eric5.Graphics.UMLGraphicsView.UMLGraphicsView?1(scene, diagramName="Unnamed", parent=None, name=None) eric5.Graphics.UMLItem.UMLItem.addAssociation?4(assoc) eric5.Graphics.UMLItem.UMLItem.adjustAssociations?4() eric5.Graphics.UMLItem.UMLItem.itemChange?4(change, value) eric5.Graphics.UMLItem.UMLItem.moveBy?4(dx, dy) -eric5.Graphics.UMLItem.UMLItem.paint?4(painter, option, widget = None) +eric5.Graphics.UMLItem.UMLItem.paint?4(painter, option, widget=None) eric5.Graphics.UMLItem.UMLItem.removeAssociation?4(assoc) eric5.Graphics.UMLItem.UMLItem.removeAssociations?4() eric5.Graphics.UMLItem.UMLItem.setPos?4(x, y) eric5.Graphics.UMLItem.UMLItem.setSize?4(width, height) -eric5.Graphics.UMLItem.UMLItem?1(x = 0, y = 0, rounded = False, parent = None) +eric5.Graphics.UMLItem.UMLItem?1(x=0, y=0, rounded=False, parent=None) eric5.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog.getData?4() -eric5.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog?1(w, h, minW, minH, parent = None, name = None) +eric5.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog?1(w, h, minW, minH, parent=None, name=None) eric5.Graphics.ZoomDialog.ZoomDialog.getZoomSize?4() -eric5.Graphics.ZoomDialog.ZoomDialog?1(zoom, parent = None, name = None) -eric5.Helpviewer.AdBlock.AdBlockAccessHandler.AdBlockAccessHandler.createRequest?4(op, request, outgoingData = None) +eric5.Graphics.ZoomDialog.ZoomDialog?1(zoom, parent=None, name=None) +eric5.Helpviewer.AdBlock.AdBlockAccessHandler.AdBlockAccessHandler.createRequest?4(op, request, outgoingData=None) eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.abort?4() eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.readData?4(maxlen) -eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, rule, parent = None) -eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(rule = "") +eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, rule, parent=None) +eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(rule="") eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.model?4() eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.setCurrentIndex?4(index) -eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog?1(parent = None) +eric5.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog?1(parent=None) eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.addSubscription?4(subscription) eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.close?4() eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.customRules?4() @@ -1652,21 +1652,21 @@ eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.setEnabled?4(enabled) eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.showDialog?4() eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager.subscriptions?4() -eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager?1(parent = None) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.data?4(index, role = Qt.DisplayRole) +eric5.Helpviewer.AdBlock.AdBlockManager.AdBlockManager?1(parent=None) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.data?4(index, role=Qt.DisplayRole) eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.flags?4(index) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.hasChildren?4(parent = QModelIndex()) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.index?4(row, column, parent = QModelIndex()) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.parent?4(index = QModelIndex()) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.rowCount?4(parent = QModelIndex()) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.hasChildren?4(parent=QModelIndex()) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.index?4(row, column, parent=QModelIndex()) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.parent?4(index=QModelIndex()) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.rowCount?4(parent=QModelIndex()) eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.rule?4(index) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.setData?4(index, value, role = Qt.EditRole) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.setData?4(index, value, role=Qt.EditRole) eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.subscription?4(index) eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel.subscriptionIndex?4(subscription) -eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel?1(parent = None) +eric5.Helpviewer.AdBlock.AdBlockModel.AdBlockModel?1(parent=None) eric5.Helpviewer.AdBlock.AdBlockNetwork.AdBlockNetwork.block?4(request) eric5.Helpviewer.AdBlock.AdBlockPage.AdBlockPage.applyRulesToPage?4(page) eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.filter?4() @@ -1679,7 +1679,7 @@ eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception) eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filter) eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setPattern?4(pattern, isRegExp) -eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filter = "") +eric5.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filter="") eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule) eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.allRules?4() eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.allow?4(urlString) @@ -1700,7 +1700,7 @@ eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.title?4() eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4() eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4() -eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, parent = None) +eric5.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, parent=None) eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.accept?4() eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.addedNode?4() eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.currentIndex?4() @@ -1711,34 +1711,34 @@ eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.setUrl?4(url) eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.title?4() eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog.url?4() -eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog?1(parent = None, bookmarksManager = None) +eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkDialog?1(parent=None, bookmarksManager=None) eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.columnCount?4(parent) eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.filterAcceptsColumn?4(sourceColumn, sourceParent) eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.filterAcceptsRow?4(sourceRow, sourceParent) -eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.hasChildren?4(parent = QModelIndex()) -eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel?1(parent = None) +eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.hasChildren?4(parent=QModelIndex()) +eric5.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel?1(parent=None) eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.Bookmark?7 eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.Folder?7 eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.Root?7 eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.Separator?7 -eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.add?4(child, offset = -1) +eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.add?4(child, offset=-1) eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.children?4() eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.parent?4() eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.remove?4(child) eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.setType?4(type_) eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.type?4() -eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode?1(type_ = Root, parent = None) +eric5.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode?1(type_=Root, parent=None) eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog.closeEvent?4(evt) eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog.newUrl?7 eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog.openUrl?7 eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog.reject?4() -eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog?1(parent = None, manager = None) +eric5.Helpviewer.Bookmarks.BookmarksDialog.BookmarksDialog?1(parent=None, manager=None) eric5.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKBAR?7 eric5.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKMENU?7 -eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.addBookmark?4(parent, node, row = -1) -eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.bookmarkForUrl?4(url, start = StartRoot) +eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.addBookmark?4(parent, node, row=-1) +eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.bookmarkForUrl?4(url, start=StartRoot) eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.bookmarks?4() -eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.bookmarksForUrl?4(url, start = StartRoot) +eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.bookmarksForUrl?4(url, start=StartRoot) eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.bookmarksModel?4() eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.changeExpanded?4() eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.close?4() @@ -1756,7 +1756,7 @@ eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.setUrl?4(node, newUrl) eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.toolbar?4() eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager.undoRedoStack?4() -eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager?1(parent = None) +eric5.Helpviewer.Bookmarks.BookmarksManager.BookmarksManager?1(parent=None) eric5.Helpviewer.Bookmarks.BookmarksManager.ChangeBookmarkCommand.redo?4() eric5.Helpviewer.Bookmarks.BookmarksManager.ChangeBookmarkCommand.undo?4() eric5.Helpviewer.Bookmarks.BookmarksManager.ChangeBookmarkCommand?1(bookmarksManager, node, newValue, title) @@ -1774,40 +1774,40 @@ eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.newUrl?7 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.openUrl?7 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.postPopulated?4() -eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu?1(parent = None) +eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu?1(parent=None) eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu.prePopulated?4() eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu.setInitialActions?4(actions) -eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu?1(parent = None) +eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu?1(parent=None) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.MIMETYPE?7 eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.SeparatorRole?7 eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.TypeRole?7 eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.UrlRole?7 eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.UrlStringRole?7 eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.bookmarksManager?4() -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.data?4(index, role = Qt.DisplayRole) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.data?4(index, role=Qt.DisplayRole) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.dropMimeData?4(data, action, row, column, parent) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.entryAdded?4(node) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.entryChanged?4(node) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.entryRemoved?4(parent, row, node) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.flags?4(index) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.hasChildren?4(parent = QModelIndex()) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.index?4(row, column, parent = QModelIndex()) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.hasChildren?4(parent=QModelIndex()) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.index?4(row, column, parent=QModelIndex()) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.mimeData?4(indexes) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.mimeTypes?4() eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.node?4(index) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.nodeIndex?4(node) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.parent?4(index = QModelIndex()) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.setData?4(index, value, role = Qt.EditRole) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.parent?4(index=QModelIndex()) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.setData?4(index, value, role=Qt.EditRole) eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.supportedDropActions?4() -eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel?1(manager, parent = None) +eric5.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel?1(manager, parent=None) eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar._createMenu?5() eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar.newUrl?7 eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar.openUrl?7 -eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar?1(model, parent = None) +eric5.Helpviewer.Bookmarks.BookmarksToolBar.BookmarksToolBar?1(model, parent=None) eric5.Helpviewer.Bookmarks.DefaultBookmarks.DefaultBookmarks?7 eric5.Helpviewer.Bookmarks.XbelReader.XbelReader.read?4(fileNameOrDevice) eric5.Helpviewer.Bookmarks.XbelReader.XbelReader?1() @@ -1815,14 +1815,14 @@ eric5.Helpviewer.Bookmarks.XbelWriter.XbelWriter.write?4(fileNameOrDevice, root) eric5.Helpviewer.Bookmarks.XbelWriter.XbelWriter?1() eric5.Helpviewer.CookieJar.CookieDetailsDialog.CookieDetailsDialog.setData?4(domain, name, path, secure, expires, value) -eric5.Helpviewer.CookieJar.CookieDetailsDialog.CookieDetailsDialog?1(parent = None) +eric5.Helpviewer.CookieJar.CookieDetailsDialog.CookieDetailsDialog?1(parent=None) eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.addRule?4(host, rule) -eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent = QModelIndex()) +eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent=QModelIndex()) eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.data?4(index, role) eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.headerData?4(section, orientation, role) -eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel?1(cookieJar, parent = None) +eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel?1(cookieJar, parent=None) eric5.Helpviewer.CookieJar.CookieJar.CookieJar.AcceptAlways?7 eric5.Helpviewer.CookieJar.CookieJar.CookieJar.AcceptNever?7 eric5.Helpviewer.CookieJar.CookieJar.CookieJar.AcceptOnlyFromSitesNavigatedTo?7 @@ -1856,25 +1856,25 @@ eric5.Helpviewer.CookieJar.CookieJar.CookieJar.setCookiesFromUrl?4(cookieList, url) eric5.Helpviewer.CookieJar.CookieJar.CookieJar.setFilterTrackingCookies?4(filterTrackingCookies) eric5.Helpviewer.CookieJar.CookieJar.CookieJar.setKeepPolicy?4(policy) -eric5.Helpviewer.CookieJar.CookieJar.CookieJar?1(parent = None) -eric5.Helpviewer.CookieJar.CookieModel.CookieModel.columnCount?4(parent = QModelIndex()) +eric5.Helpviewer.CookieJar.CookieJar.CookieJar?1(parent=None) +eric5.Helpviewer.CookieJar.CookieModel.CookieModel.columnCount?4(parent=QModelIndex()) eric5.Helpviewer.CookieJar.CookieModel.CookieModel.data?4(index, role) eric5.Helpviewer.CookieJar.CookieModel.CookieModel.headerData?4(section, orientation, role) -eric5.Helpviewer.CookieJar.CookieModel.CookieModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.CookieJar.CookieModel.CookieModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.CookieJar.CookieModel.CookieModel?1(cookieJar, parent = None) +eric5.Helpviewer.CookieJar.CookieModel.CookieModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.CookieJar.CookieModel.CookieModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.CookieJar.CookieModel.CookieModel?1(cookieJar, parent=None) eric5.Helpviewer.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.accept?4() eric5.Helpviewer.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.on_cookiesButton_clicked?4() eric5.Helpviewer.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.on_exceptionsButton_clicked?4() eric5.Helpviewer.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog?1(parent) eric5.Helpviewer.CookieJar.CookiesDialog.CookiesDialog.on_addButton_clicked?4() -eric5.Helpviewer.CookieJar.CookiesDialog.CookiesDialog?1(cookieJar, parent = None) +eric5.Helpviewer.CookieJar.CookiesDialog.CookiesDialog?1(cookieJar, parent=None) eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.on_allowButton_clicked?4() eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.on_allowForSessionButton_clicked?4() eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.on_blockButton_clicked?4() eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.on_domainEdit_textChanged?4(txt) eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog.setDomainName?4(domain) -eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog?1(cookieJar, parent = None) +eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.CookiesExceptionsDialog?1(cookieJar, parent=None) eric5.Helpviewer.Download.DownloadItem.DownloadItem.absoluteFilePath?4() eric5.Helpviewer.Download.DownloadItem.DownloadItem.bytesReceived?4() eric5.Helpviewer.Download.DownloadItem.DownloadItem.bytesTotal?4() @@ -1900,7 +1900,7 @@ eric5.Helpviewer.Download.DownloadItem.DownloadItem.setData?4(data) eric5.Helpviewer.Download.DownloadItem.DownloadItem.setIcon?4(icon) eric5.Helpviewer.Download.DownloadItem.DownloadItem.statusChanged?7 -eric5.Helpviewer.Download.DownloadItem.DownloadItem?1(reply = None, requestFilename = False, webPage = None, download = False, parent = None) +eric5.Helpviewer.Download.DownloadItem.DownloadItem?1(reply=None, requestFilename=False, webPage=None, download=False, parent=None) eric5.Helpviewer.Download.DownloadManager.DownloadManager.RemoveExit?7 eric5.Helpviewer.Download.DownloadManager.DownloadManager.RemoveNever?7 eric5.Helpviewer.Download.DownloadManager.DownloadManager.RemoveSuccessFullDownload?7 @@ -1909,23 +1909,23 @@ eric5.Helpviewer.Download.DownloadManager.DownloadManager.changeOccurred?4() eric5.Helpviewer.Download.DownloadManager.DownloadManager.cleanup?4() eric5.Helpviewer.Download.DownloadManager.DownloadManager.count?4() -eric5.Helpviewer.Download.DownloadManager.DownloadManager.download?4(requestOrUrl, requestFileName = False) +eric5.Helpviewer.Download.DownloadManager.DownloadManager.download?4(requestOrUrl, requestFileName=False) eric5.Helpviewer.Download.DownloadManager.DownloadManager.downloadDirectory?4() eric5.Helpviewer.Download.DownloadManager.DownloadManager.downloads?4() -eric5.Helpviewer.Download.DownloadManager.DownloadManager.handleUnsupportedContent?4(reply, requestFileName = False, webPage = None, download = False) +eric5.Helpviewer.Download.DownloadManager.DownloadManager.handleUnsupportedContent?4(reply, requestFileName=False, webPage=None, download=False) eric5.Helpviewer.Download.DownloadManager.DownloadManager.on_cleanupButton_clicked?4() eric5.Helpviewer.Download.DownloadManager.DownloadManager.removePolicy?4() eric5.Helpviewer.Download.DownloadManager.DownloadManager.save?4() eric5.Helpviewer.Download.DownloadManager.DownloadManager.setDownloadDirectory?4(directory) eric5.Helpviewer.Download.DownloadManager.DownloadManager.setRemovePolicy?4(policy) eric5.Helpviewer.Download.DownloadManager.DownloadManager.shutdown?4() -eric5.Helpviewer.Download.DownloadManager.DownloadManager?1(parent = None) +eric5.Helpviewer.Download.DownloadManager.DownloadManager?1(parent=None) eric5.Helpviewer.Download.DownloadModel.DownloadModel.data?4(index, role) eric5.Helpviewer.Download.DownloadModel.DownloadModel.flags?4(index) eric5.Helpviewer.Download.DownloadModel.DownloadModel.mimeData?4(indexes) -eric5.Helpviewer.Download.DownloadModel.DownloadModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.Download.DownloadModel.DownloadModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.Download.DownloadModel.DownloadModel?1(manager, parent = None) +eric5.Helpviewer.Download.DownloadModel.DownloadModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.Download.DownloadModel.DownloadModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.Download.DownloadModel.DownloadModel?1(manager, parent=None) eric5.Helpviewer.Download.DownloadUtilities.dataString?4(size) eric5.Helpviewer.Download.DownloadUtilities.timeString?4(timeRemaining) eric5.Helpviewer.HTMLResources.notFoundPage_html?7 @@ -1949,7 +1949,7 @@ eric5.Helpviewer.HelpBrowserWV.HelpBrowser.isLoading?4() eric5.Helpviewer.HelpBrowserWV.HelpBrowser.keyPressEvent?4(evt) eric5.Helpviewer.HelpBrowserWV.HelpBrowser.keyReleaseEvent?4(evt) -eric5.Helpviewer.HelpBrowserWV.HelpBrowser.linkedResources?4(relation = "") +eric5.Helpviewer.HelpBrowserWV.HelpBrowser.linkedResources?4(relation="") eric5.Helpviewer.HelpBrowserWV.HelpBrowser.preferencesChanged?4() eric5.Helpviewer.HelpBrowserWV.HelpBrowser.progress?4() eric5.Helpviewer.HelpBrowserWV.HelpBrowser.reload?4() @@ -1962,7 +1962,7 @@ eric5.Helpviewer.HelpBrowserWV.HelpBrowser.zoomIn?4() eric5.Helpviewer.HelpBrowserWV.HelpBrowser.zoomOut?4() eric5.Helpviewer.HelpBrowserWV.HelpBrowser.zoomReset?4() -eric5.Helpviewer.HelpBrowserWV.HelpBrowser?1(mainWindow, parent = None, name = "") +eric5.Helpviewer.HelpBrowserWV.HelpBrowser?1(mainWindow, parent=None, name="") eric5.Helpviewer.HelpBrowserWV.HelpWebPage.acceptNavigationRequest?4(frame, request, type_) eric5.Helpviewer.HelpBrowserWV.HelpWebPage.extension?4(extension, option, output) eric5.Helpviewer.HelpBrowserWV.HelpWebPage.getSslInfo?4() @@ -1971,20 +1971,20 @@ eric5.Helpviewer.HelpBrowserWV.HelpWebPage.setUserAgent?4(agent) eric5.Helpviewer.HelpBrowserWV.HelpWebPage.showSslInfo?4() eric5.Helpviewer.HelpBrowserWV.HelpWebPage.supportsExtension?4(extension) -eric5.Helpviewer.HelpBrowserWV.HelpWebPage.userAgent?4(resolveEmpty = False) +eric5.Helpviewer.HelpBrowserWV.HelpWebPage.userAgent?4(resolveEmpty=False) eric5.Helpviewer.HelpBrowserWV.HelpWebPage.userAgentForUrl?4(url) -eric5.Helpviewer.HelpBrowserWV.HelpWebPage?1(parent = None) +eric5.Helpviewer.HelpBrowserWV.HelpWebPage?1(parent=None) eric5.Helpviewer.HelpBrowserWV.JavaScriptEricObject.providerString?4() eric5.Helpviewer.HelpBrowserWV.JavaScriptEricObject.searchUrl?4(searchStr) eric5.Helpviewer.HelpBrowserWV.JavaScriptEricObject.translate?4(trans) eric5.Helpviewer.HelpBrowserWV.JavaScriptEricObject.translations?7 -eric5.Helpviewer.HelpBrowserWV.JavaScriptEricObject?1(mw, parent = None) +eric5.Helpviewer.HelpBrowserWV.JavaScriptEricObject?1(mw, parent=None) eric5.Helpviewer.HelpBrowserWV.JavaScriptExternalObject.AddSearchProvider?4(url) -eric5.Helpviewer.HelpBrowserWV.JavaScriptExternalObject?1(mw, parent = None) +eric5.Helpviewer.HelpBrowserWV.JavaScriptExternalObject?1(mw, parent=None) eric5.Helpviewer.HelpBrowserWV.LinkedResource?1() eric5.Helpviewer.HelpBrowserWV.contentSniff?4(data) eric5.Helpviewer.HelpClearPrivateDataDialog.HelpClearPrivateDataDialog.getData?4() -eric5.Helpviewer.HelpClearPrivateDataDialog.HelpClearPrivateDataDialog?1(parent = None) +eric5.Helpviewer.HelpClearPrivateDataDialog.HelpClearPrivateDataDialog?1(parent=None) eric5.Helpviewer.HelpDocsInstaller.HelpDocsInstaller.docsInstalled?7 eric5.Helpviewer.HelpDocsInstaller.HelpDocsInstaller.errorMessage?7 eric5.Helpviewer.HelpDocsInstaller.HelpDocsInstaller.installDocs?4() @@ -1996,7 +1996,7 @@ eric5.Helpviewer.HelpIndexWidget.HelpIndexWidget.focusInEvent?4(evt) eric5.Helpviewer.HelpIndexWidget.HelpIndexWidget.linkActivated?7 eric5.Helpviewer.HelpIndexWidget.HelpIndexWidget.linksActivated?7 -eric5.Helpviewer.HelpIndexWidget.HelpIndexWidget?1(engine, mainWindow, parent = None) +eric5.Helpviewer.HelpIndexWidget.HelpIndexWidget?1(engine, mainWindow, parent=None) eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog.accept?4() eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog.defaultAcceptLanguages?4() eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog.expand?4(language) @@ -2005,20 +2005,20 @@ eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog.on_downButton_clicked?4() eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog.on_removeButton_clicked?4() eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog.on_upButton_clicked?4() -eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog?1(parent = None) +eric5.Helpviewer.HelpLanguagesDialog.HelpLanguagesDialog?1(parent=None) eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget.contextMenuEvent?4(evt) eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget.escapePressed?7 eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget.eventFilter?4(watched, event) eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget.keyPressEvent?4(evt) eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget.linkActivated?7 -eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget?1(engine, mainWindow, parent = None) +eric5.Helpviewer.HelpSearchWidget.HelpSearchWidget?1(engine, mainWindow, parent=None) eric5.Helpviewer.HelpSnap.renderTabPreview?4(page, w, h) eric5.Helpviewer.HelpTabBar.HelpTabBar.event?4(evt) eric5.Helpviewer.HelpTabBar.HelpTabBar.leaveEvent?4(evt) eric5.Helpviewer.HelpTabBar.HelpTabBar.mouseMoveEvent?4(evt) eric5.Helpviewer.HelpTabBar.HelpTabBar.mousePressEvent?4(evt) eric5.Helpviewer.HelpTabBar.HelpTabBar.tabRemoved?4(index) -eric5.Helpviewer.HelpTabBar.HelpTabBar?1(parent = None) +eric5.Helpviewer.HelpTabBar.HelpTabBar?1(parent=None) eric5.Helpviewer.HelpTabWidget.HelpTabWidget.browserAt?4(index) eric5.Helpviewer.HelpTabWidget.HelpTabWidget.browsers?4() eric5.Helpviewer.HelpTabWidget.HelpTabWidget.closeAllBrowsers?4() @@ -2027,11 +2027,11 @@ eric5.Helpviewer.HelpTabWidget.HelpTabWidget.currentBrowser?4() eric5.Helpviewer.HelpTabWidget.HelpTabWidget.currentUrlBar?4() eric5.Helpviewer.HelpTabWidget.HelpTabWidget.getSourceFileList?4() -eric5.Helpviewer.HelpTabWidget.HelpTabWidget.newBrowser?4(link = None) +eric5.Helpviewer.HelpTabWidget.HelpTabWidget.newBrowser?4(link=None) eric5.Helpviewer.HelpTabWidget.HelpTabWidget.preferencesChanged?4() -eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printBrowser?4(browser = None) -eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printBrowserPdf?4(browser = None) -eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printPreviewBrowser?4(browser = None) +eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printBrowser?4(browser=None) +eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printBrowserPdf?4(browser=None) +eric5.Helpviewer.HelpTabWidget.HelpTabWidget.printPreviewBrowser?4(browser=None) eric5.Helpviewer.HelpTabWidget.HelpTabWidget.shallShutDown?4() eric5.Helpviewer.HelpTabWidget.HelpTabWidget.showMessage?7 eric5.Helpviewer.HelpTabWidget.HelpTabWidget.sourceChanged?7 @@ -2046,7 +2046,7 @@ eric5.Helpviewer.HelpTocWidget.HelpTocWidget.keyPressEvent?4(evt) eric5.Helpviewer.HelpTocWidget.HelpTocWidget.linkActivated?7 eric5.Helpviewer.HelpTocWidget.HelpTocWidget.syncToContent?4(url) -eric5.Helpviewer.HelpTocWidget.HelpTocWidget?1(engine, mainWindow, parent = None) +eric5.Helpviewer.HelpTocWidget.HelpTocWidget?1(engine, mainWindow, parent=None) eric5.Helpviewer.HelpTopicDialog.HelpTopicDialog.link?4() eric5.Helpviewer.HelpTopicDialog.HelpTopicDialog?1(parent, keyword, links) eric5.Helpviewer.HelpWebSearchWidget.HelpWebSearchWidget.clear?4() @@ -2054,7 +2054,7 @@ eric5.Helpviewer.HelpWebSearchWidget.HelpWebSearchWidget.preferencesChanged?4() eric5.Helpviewer.HelpWebSearchWidget.HelpWebSearchWidget.saveSearches?4() eric5.Helpviewer.HelpWebSearchWidget.HelpWebSearchWidget.search?7 -eric5.Helpviewer.HelpWebSearchWidget.HelpWebSearchWidget?1(parent = None) +eric5.Helpviewer.HelpWebSearchWidget.HelpWebSearchWidget?1(parent=None) eric5.Helpviewer.HelpWindow.HelpWindow._adblockManager?8 eric5.Helpviewer.HelpWindow.HelpWindow._bookmarksManager?8 eric5.Helpviewer.HelpWindow.HelpWindow._cookieJar?8 @@ -2082,8 +2082,8 @@ eric5.Helpviewer.HelpWindow.HelpWindow.mainWindow?4() eric5.Helpviewer.HelpWindow.HelpWindow.maxMenuFilePathLen?7 eric5.Helpviewer.HelpWindow.HelpWindow.networkAccessManager?4() -eric5.Helpviewer.HelpWindow.HelpWindow.newTab?4(link = None) -eric5.Helpviewer.HelpWindow.HelpWindow.newWindow?4(link = None) +eric5.Helpviewer.HelpWindow.HelpWindow.newTab?4(link=None) +eric5.Helpviewer.HelpWindow.HelpWindow.newWindow?4(link=None) eric5.Helpviewer.HelpWindow.HelpWindow.openSearchManager?4() eric5.Helpviewer.HelpWindow.HelpWindow.openUrl?4(url, title) eric5.Helpviewer.HelpWindow.HelpWindow.openUrlNewTab?4(url, title) @@ -2097,45 +2097,45 @@ eric5.Helpviewer.HelpWindow.HelpWindow.setLoadingActions?4(b) eric5.Helpviewer.HelpWindow.HelpWindow.setPrivateMode?4(on) eric5.Helpviewer.HelpWindow.HelpWindow.zoomTextOnlyChanged?7 -eric5.Helpviewer.HelpWindow.HelpWindow?1(home, path, parent, name, fromEric = False, initShortcutsOnly = False, searchWord = None) +eric5.Helpviewer.HelpWindow.HelpWindow?1(home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None) eric5.Helpviewer.History.HistoryCompleter.HistoryCompleter.pathFromIndex?4(idx) eric5.Helpviewer.History.HistoryCompleter.HistoryCompleter.splitPath?4(path) -eric5.Helpviewer.History.HistoryCompleter.HistoryCompleter?1(model, parent = None) +eric5.Helpviewer.History.HistoryCompleter.HistoryCompleter?1(model, parent=None) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.HistoryCompletionRole?7 -eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.data?4(index, role = Qt.DisplayRole) +eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.data?4(index, role=Qt.DisplayRole) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.filterAcceptsRow?4(sourceRow, sourceParent) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.isValid?4() eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.lessThan?4(left, right) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.searchString?4() eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.setSearchString?4(string) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel.setValid?4(valid) -eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel?1(parent = None) +eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionModel?1(parent=None) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionView.resizeEvent?4(evt) eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionView.sizeHintForRow?4(row) -eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionView?1(parent = None) +eric5.Helpviewer.History.HistoryCompleter.HistoryCompletionView?1(parent=None) eric5.Helpviewer.History.HistoryDialog.HistoryDialog.newUrl?7 eric5.Helpviewer.History.HistoryDialog.HistoryDialog.openUrl?7 -eric5.Helpviewer.History.HistoryDialog.HistoryDialog?1(parent = None, manager = None) -eric5.Helpviewer.History.HistoryFilterModel.HistoryData?1(offset, frequency = 0) +eric5.Helpviewer.History.HistoryDialog.HistoryDialog?1(parent=None, manager=None) +eric5.Helpviewer.History.HistoryFilterModel.HistoryData?1(offset, frequency=0) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.FrequencyRole?7 eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.MaxRole?7 -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.data?4(index, role = Qt.DisplayRole) -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.headerData?4(section, orientation, role = Qt.DisplayRole) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.data?4(index, role=Qt.DisplayRole) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.headerData?4(section, orientation, role=Qt.DisplayRole) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.historyContains?4(url) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.historyLocation?4(url) -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.index?4(row, column, parent = QModelIndex()) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.index?4(row, column, parent=QModelIndex()) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.mapFromSource?4(sourceIndex) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.mapToSource?4(proxyIndex) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.parent?4(index) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.recalculateFrequencies?4() -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.rowCount?4(parent = QModelIndex()) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.rowCount?4(parent=QModelIndex()) eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.setSourceModel?4(sourceModel) -eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel?1(sourceModel, parent = None) +eric5.Helpviewer.History.HistoryFilterModel.HistoryFilterModel?1(sourceModel, parent=None) eric5.Helpviewer.History.HistoryManager.HISTORY_VERSION?7 eric5.Helpviewer.History.HistoryManager.HistoryEntry.userTitle?4() -eric5.Helpviewer.History.HistoryManager.HistoryEntry?1(url = None, dateTime = None, title = None) +eric5.Helpviewer.History.HistoryManager.HistoryEntry?1(url=None, dateTime=None, title=None) eric5.Helpviewer.History.HistoryManager.HistoryManager._addHistoryEntry?5(itm) eric5.Helpviewer.History.HistoryManager.HistoryManager._removeHistoryEntry?5(itm) eric5.Helpviewer.History.HistoryManager.HistoryManager.addHistoryEntry?4(url) @@ -2153,113 +2153,113 @@ eric5.Helpviewer.History.HistoryManager.HistoryManager.historyReset?7 eric5.Helpviewer.History.HistoryManager.HistoryManager.historyTreeModel?4() eric5.Helpviewer.History.HistoryManager.HistoryManager.preferencesChanged?4() -eric5.Helpviewer.History.HistoryManager.HistoryManager.removeHistoryEntry?4(url, title = "") +eric5.Helpviewer.History.HistoryManager.HistoryManager.removeHistoryEntry?4(url, title="") eric5.Helpviewer.History.HistoryManager.HistoryManager.save?4() eric5.Helpviewer.History.HistoryManager.HistoryManager.setDaysToExpire?4(limit) -eric5.Helpviewer.History.HistoryManager.HistoryManager.setHistory?4(history, loadedAndSorted = False) +eric5.Helpviewer.History.HistoryManager.HistoryManager.setHistory?4(history, loadedAndSorted=False) eric5.Helpviewer.History.HistoryManager.HistoryManager.updateHistoryEntry?4(url, title) -eric5.Helpviewer.History.HistoryManager.HistoryManager?1(parent = None) +eric5.Helpviewer.History.HistoryManager.HistoryManager?1(parent=None) eric5.Helpviewer.History.HistoryMenu.HistoryMenu.newUrl?7 eric5.Helpviewer.History.HistoryMenu.HistoryMenu.openUrl?7 eric5.Helpviewer.History.HistoryMenu.HistoryMenu.postPopulated?4() eric5.Helpviewer.History.HistoryMenu.HistoryMenu.prePopulated?4() eric5.Helpviewer.History.HistoryMenu.HistoryMenu.setInitialActions?4(actions) -eric5.Helpviewer.History.HistoryMenu.HistoryMenu?1(parent = None) +eric5.Helpviewer.History.HistoryMenu.HistoryMenu?1(parent=None) eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.MOVEDROWS?7 eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.bumpedRows?4() -eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.index?4(row, column, parent = QModelIndex()) +eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.index?4(row, column, parent=QModelIndex()) eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.mapFromSource?4(sourceIndex) eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.mapToSource?4(proxyIndex) eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.mimeData?4(indexes) eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.parent?4(index) -eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel?1(sourceModel, parent = None) +eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryMenu.HistoryMenuModel?1(sourceModel, parent=None) eric5.Helpviewer.History.HistoryModel.HistoryModel.DateRole?7 eric5.Helpviewer.History.HistoryModel.HistoryModel.DateTimeRole?7 eric5.Helpviewer.History.HistoryModel.HistoryModel.MaxRole?7 eric5.Helpviewer.History.HistoryModel.HistoryModel.TitleRole?7 eric5.Helpviewer.History.HistoryModel.HistoryModel.UrlRole?7 eric5.Helpviewer.History.HistoryModel.HistoryModel.UrlStringRole?7 -eric5.Helpviewer.History.HistoryModel.HistoryModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryModel.HistoryModel.data?4(index, role = Qt.DisplayRole) +eric5.Helpviewer.History.HistoryModel.HistoryModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryModel.HistoryModel.data?4(index, role=Qt.DisplayRole) eric5.Helpviewer.History.HistoryModel.HistoryModel.entryAdded?4() eric5.Helpviewer.History.HistoryModel.HistoryModel.entryUpdated?4(row) -eric5.Helpviewer.History.HistoryModel.HistoryModel.headerData?4(section, orientation, role = Qt.DisplayRole) +eric5.Helpviewer.History.HistoryModel.HistoryModel.headerData?4(section, orientation, role=Qt.DisplayRole) eric5.Helpviewer.History.HistoryModel.HistoryModel.historyReset?4() -eric5.Helpviewer.History.HistoryModel.HistoryModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.History.HistoryModel.HistoryModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryModel.HistoryModel?1(historyManager, parent = None) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.data?4(index, role = Qt.DisplayRole) +eric5.Helpviewer.History.HistoryModel.HistoryModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.History.HistoryModel.HistoryModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryModel.HistoryModel?1(historyManager, parent=None) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.data?4(index, role=Qt.DisplayRole) eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.flags?4(index) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.hasChildren?4(parent = QModelIndex()) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.index?4(row, column, parent = QModelIndex()) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.hasChildren?4(parent=QModelIndex()) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.index?4(row, column, parent=QModelIndex()) eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.mapFromSource?4(sourceIndex) eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.mapToSource?4(proxyIndex) eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.parent?4(index) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.rowCount?4(parent = QModelIndex()) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.rowCount?4(parent=QModelIndex()) eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.setSourceModel?4(sourceModel) -eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel?1(sourceModel, parent = None) +eric5.Helpviewer.History.HistoryTreeModel.HistoryTreeModel?1(sourceModel, parent=None) eric5.Helpviewer.JavaScriptResources.fetchLinks_js?7 eric5.Helpviewer.JavaScriptResources.parseForms_js?7 -eric5.Helpviewer.Network.AboutAccessHandler.AboutAccessHandler.createRequest?4(op, request, outgoingData = None) -eric5.Helpviewer.Network.FtpAccessHandler.FtpAccessHandler.createRequest?4(op, request, outgoingData = None) +eric5.Helpviewer.Network.AboutAccessHandler.AboutAccessHandler.createRequest?4(op, request, outgoingData=None) +eric5.Helpviewer.Network.FtpAccessHandler.FtpAccessHandler.createRequest?4(op, request, outgoingData=None) eric5.Helpviewer.Network.FtpReply.FtpReply.abort?4() eric5.Helpviewer.Network.FtpReply.FtpReply.bytesAvailable?4() eric5.Helpviewer.Network.FtpReply.FtpReply.isSequential?4() eric5.Helpviewer.Network.FtpReply.FtpReply.readData?4(maxlen) -eric5.Helpviewer.Network.FtpReply.FtpReply?1(url, parent = None) +eric5.Helpviewer.Network.FtpReply.FtpReply?1(url, parent=None) eric5.Helpviewer.Network.FtpReply.ftpListPage_html?7 -eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.createRequest?4(op, request, outgoingData = None) +eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.createRequest?4(op, request, outgoingData=None) eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.languagesChanged?4() eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.preferencesChanged?4() eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.requestCreated?7 eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager.setSchemeHandler?4(scheme, handler) -eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager?1(engine, parent = None) -eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy.createRequest?4(op, request, outgoingData = None) +eric5.Helpviewer.Network.NetworkAccessManager.NetworkAccessManager?1(engine, parent=None) +eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy.createRequest?4(op, request, outgoingData=None) eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy.primaryManager?7 eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy.setPrimaryNetworkAccessManager?4(manager) eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy.setWebPage?4(page) -eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy?1(parent = None) +eric5.Helpviewer.Network.NetworkAccessManagerProxy.NetworkAccessManagerProxy?1(parent=None) eric5.Helpviewer.Network.NetworkDiskCache.NetworkDiskCache.prepare?4(metaData) eric5.Helpviewer.Network.NetworkProtocolUnknownErrorReply.NetworkProtocolUnknownErrorReply.abort?4() eric5.Helpviewer.Network.NetworkProtocolUnknownErrorReply.NetworkProtocolUnknownErrorReply.bytesAvailable?4() -eric5.Helpviewer.Network.NetworkProtocolUnknownErrorReply.NetworkProtocolUnknownErrorReply?1(protocol, parent = None) +eric5.Helpviewer.Network.NetworkProtocolUnknownErrorReply.NetworkProtocolUnknownErrorReply?1(protocol, parent=None) eric5.Helpviewer.Network.NetworkReply.NetworkReply.abort?4() eric5.Helpviewer.Network.NetworkReply.NetworkReply.bytesAvailable?4() eric5.Helpviewer.Network.NetworkReply.NetworkReply.readData?4(maxlen) -eric5.Helpviewer.Network.NetworkReply.NetworkReply?1(request, fileData, mimeType, parent = None) -eric5.Helpviewer.Network.PyrcAccessHandler.PyrcAccessHandler.createRequest?4(op, request, outgoingData = None) +eric5.Helpviewer.Network.NetworkReply.NetworkReply?1(request, fileData, mimeType, parent=None) +eric5.Helpviewer.Network.PyrcAccessHandler.PyrcAccessHandler.createRequest?4(op, request, outgoingData=None) eric5.Helpviewer.Network.QtHelpAccessHandler.ExtensionMap?7 eric5.Helpviewer.Network.QtHelpAccessHandler.QtDocPath?7 -eric5.Helpviewer.Network.QtHelpAccessHandler.QtHelpAccessHandler.createRequest?4(op, request, outgoingData = None) -eric5.Helpviewer.Network.QtHelpAccessHandler.QtHelpAccessHandler?1(engine, parent = None) -eric5.Helpviewer.Network.SchemeAccessHandler.SchemeAccessHandler.createRequest?4(op, request, outgoingData = None) -eric5.Helpviewer.Network.SchemeAccessHandler.SchemeAccessHandler?1(parent = None) +eric5.Helpviewer.Network.QtHelpAccessHandler.QtHelpAccessHandler.createRequest?4(op, request, outgoingData=None) +eric5.Helpviewer.Network.QtHelpAccessHandler.QtHelpAccessHandler?1(engine, parent=None) +eric5.Helpviewer.Network.SchemeAccessHandler.SchemeAccessHandler.createRequest?4(op, request, outgoingData=None) +eric5.Helpviewer.Network.SchemeAccessHandler.SchemeAccessHandler?1(parent=None) eric5.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.OfflineStorageConfigDialog.on_showDatabasesButton_clicked?4() eric5.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.OfflineStorageConfigDialog.storeData?4() -eric5.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.OfflineStorageConfigDialog?1(parent = None) -eric5.Helpviewer.OfflineStorage.WebDatabasesDialog.WebDatabasesDialog?1(parent = None) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.columnCount?4(parent = QModelIndex()) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.data?4(index, role = Qt.DisplayRole) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.hasChildren?4(parent = QModelIndex()) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.index?4(row, column, parent = QModelIndex()) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.parent?4(index = QModelIndex()) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel?1(parent = None) +eric5.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.OfflineStorageConfigDialog?1(parent=None) +eric5.Helpviewer.OfflineStorage.WebDatabasesDialog.WebDatabasesDialog?1(parent=None) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.columnCount?4(parent=QModelIndex()) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.data?4(index, role=Qt.DisplayRole) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.hasChildren?4(parent=QModelIndex()) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.index?4(row, column, parent=QModelIndex()) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.parent?4(index=QModelIndex()) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel?1(parent=None) eric5.Helpviewer.OpenSearch.OpenSearchDefaultEngines.OpenSearchDefaultEngines?7 eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_addButton_clicked?4() eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_deleteButton_clicked?4() eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_editButton_clicked?4() eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog.on_restoreButton_clicked?4() -eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog?1(parent = None) +eric5.Helpviewer.OpenSearch.OpenSearchDialog.OpenSearchDialog?1(parent=None) eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.OpenSearchEditDialog.accept?4() -eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.OpenSearchEditDialog?1(engine, parent = None) +eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.OpenSearchEditDialog?1(engine, parent=None) eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine._language?8 eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.description?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.image?4() @@ -2294,16 +2294,16 @@ eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.suggestionsParameters?4() eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.suggestionsUrl?4(searchTerm) eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.suggestionsUrlTemplate?4() -eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine?1(parent = None) -eric5.Helpviewer.OpenSearch.OpenSearchEngineAction.OpenSearchEngineAction?1(engine, parent = None) -eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.columnCount?4(parent = QModelIndex()) +eric5.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine?1(parent=None) +eric5.Helpviewer.OpenSearch.OpenSearchEngineAction.OpenSearchEngineAction?1(engine, parent=None) +eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.columnCount?4(parent=QModelIndex()) eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.data?4(index, role) eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.flags?4(index) -eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.rowCount?4(parent = QModelIndex()) -eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.setData?4(index, value, role = Qt.EditRole) -eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel?1(manager, parent = None) +eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.rowCount?4(parent=QModelIndex()) +eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.setData?4(index, value, role=Qt.EditRole) +eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel?1(manager, parent=None) eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.addEngine?4(engine) eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.allEnginesNames?4() eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.changed?7 @@ -2330,7 +2330,7 @@ eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.setCurrentEngineName?4(name) eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.setEngineForKeyword?4(keyword, engine) eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.setKeywordsForEngine?4(engine, keywords) -eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager?1(parent = None) +eric5.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager?1(parent=None) eric5.Helpviewer.OpenSearch.OpenSearchReader.OpenSearchReader.read?4(device) eric5.Helpviewer.OpenSearch.OpenSearchWriter.OpenSearchWriter.write?4(device, engine) eric5.Helpviewer.OpenSearch.OpenSearchWriter.OpenSearchWriter?1() @@ -2353,17 +2353,17 @@ eric5.Helpviewer.Passwords.PasswordManager.PasswordManager.setLogin?4(url, realm, username, password) eric5.Helpviewer.Passwords.PasswordManager.PasswordManager.siteInfo?4(site) eric5.Helpviewer.Passwords.PasswordManager.PasswordManager.sitesCount?4() -eric5.Helpviewer.Passwords.PasswordManager.PasswordManager?1(parent = None) -eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.columnCount?4(parent = QModelIndex()) +eric5.Helpviewer.Passwords.PasswordManager.PasswordManager?1(parent=None) +eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.columnCount?4(parent=QModelIndex()) eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.data?4(index, role) -eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.removeRows?4(row, count, parent = QModelIndex()) -eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.rowCount?4(parent = QModelIndex()) +eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.removeRows?4(row, count, parent=QModelIndex()) +eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.rowCount?4(parent=QModelIndex()) eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.setShowPasswords?4(on) eric5.Helpviewer.Passwords.PasswordModel.PasswordModel.showPasswords?4() -eric5.Helpviewer.Passwords.PasswordModel.PasswordModel?1(manager, parent = None) +eric5.Helpviewer.Passwords.PasswordModel.PasswordModel?1(manager, parent=None) eric5.Helpviewer.Passwords.PasswordsDialog.PasswordsDialog.on_passwordsButton_clicked?4() -eric5.Helpviewer.Passwords.PasswordsDialog.PasswordsDialog?1(parent = None) +eric5.Helpviewer.Passwords.PasswordsDialog.PasswordsDialog?1(parent=None) eric5.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.getTabsToClose?4() eric5.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.hasChanges?4() eric5.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addButton_clicked?4() @@ -2375,7 +2375,7 @@ eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_buttonBox_accepted?4() eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_filtersList_currentItemChanged?4(current, previous) eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_removeButton_clicked?4() -eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog?1(engine, parent = None) +eric5.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog?1(engine, parent=None) eric5.Helpviewer.SearchWidget.SearchWidget.findNext?4() eric5.Helpviewer.SearchWidget.SearchWidget.findPrevious?4() eric5.Helpviewer.SearchWidget.SearchWidget.keyPressEvent?4(event) @@ -2385,7 +2385,7 @@ eric5.Helpviewer.SearchWidget.SearchWidget.on_findtextCombo_editTextChanged?4(txt) eric5.Helpviewer.SearchWidget.SearchWidget.on_highlightAllCheckBox_toggled?4(checked) eric5.Helpviewer.SearchWidget.SearchWidget.showFind?4() -eric5.Helpviewer.SearchWidget.SearchWidget?1(mainWindow, parent = None) +eric5.Helpviewer.SearchWidget.SearchWidget?1(mainWindow, parent=None) eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog.CertRole?7 eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog.on_caCertificatesTree_currentItemChanged?4(current, previous) eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog.on_caDeleteButton_clicked?4() @@ -2397,24 +2397,24 @@ eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog.on_serversExportButton_clicked?4() eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog.on_serversImportButton_clicked?4() eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog.on_serversViewButton_clicked?4() -eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog?1(parent = None) -eric5.Helpviewer.SslInfoDialog.SslInfoDialog?1(certificate, parent = None) +eric5.Helpviewer.SslCertificatesDialog.SslCertificatesDialog?1(parent=None) +eric5.Helpviewer.SslInfoDialog.SslInfoDialog?1(certificate, parent=None) eric5.Helpviewer.UrlBar.BookmarkInfoDialog.BookmarkInfoDialog.accept?4() eric5.Helpviewer.UrlBar.BookmarkInfoDialog.BookmarkInfoDialog.on_removeButton_clicked?4() -eric5.Helpviewer.UrlBar.BookmarkInfoDialog.BookmarkInfoDialog?1(bookmark, parent = None) +eric5.Helpviewer.UrlBar.BookmarkInfoDialog.BookmarkInfoDialog?1(bookmark, parent=None) eric5.Helpviewer.UrlBar.FavIconLabel.FavIconLabel.mouseMoveEvent?4(evt) eric5.Helpviewer.UrlBar.FavIconLabel.FavIconLabel.mousePressEvent?4(evt) eric5.Helpviewer.UrlBar.FavIconLabel.FavIconLabel.setBrowser?4(browser) -eric5.Helpviewer.UrlBar.FavIconLabel.FavIconLabel?1(parent = None) +eric5.Helpviewer.UrlBar.FavIconLabel.FavIconLabel?1(parent=None) eric5.Helpviewer.UrlBar.SslLabel.SslLabel.clicked?7 eric5.Helpviewer.UrlBar.SslLabel.SslLabel.mouseDoubleClickEvent?4(evt) eric5.Helpviewer.UrlBar.SslLabel.SslLabel.mouseReleaseEvent?4(evt) -eric5.Helpviewer.UrlBar.SslLabel.SslLabel?1(parent = None) +eric5.Helpviewer.UrlBar.SslLabel.SslLabel?1(parent=None) eric5.Helpviewer.UrlBar.StackedUrlBar.StackedUrlBar.currentUrlBar?4() eric5.Helpviewer.UrlBar.StackedUrlBar.StackedUrlBar.moveBar?4(from_, to_) eric5.Helpviewer.UrlBar.StackedUrlBar.StackedUrlBar.urlBar?4(index) eric5.Helpviewer.UrlBar.StackedUrlBar.StackedUrlBar.urlBars?4() -eric5.Helpviewer.UrlBar.StackedUrlBar.StackedUrlBar?1(parent = None) +eric5.Helpviewer.UrlBar.StackedUrlBar.StackedUrlBar?1(parent=None) eric5.Helpviewer.UrlBar.UrlBar.UrlBar.browser?4() eric5.Helpviewer.UrlBar.UrlBar.UrlBar.dragEnterEvent?4(evt) eric5.Helpviewer.UrlBar.UrlBar.UrlBar.dropEvent?4(evt) @@ -2425,13 +2425,13 @@ eric5.Helpviewer.UrlBar.UrlBar.UrlBar.preferencesChanged?4() eric5.Helpviewer.UrlBar.UrlBar.UrlBar.setBrowser?4(browser) eric5.Helpviewer.UrlBar.UrlBar.UrlBar.setPrivateMode?4(on) -eric5.Helpviewer.UrlBar.UrlBar.UrlBar?1(mainWindow, parent = None) +eric5.Helpviewer.UrlBar.UrlBar.UrlBar?1(mainWindow, parent=None) eric5.Helpviewer.UserAgent.UserAgentDefaults.UserAgentDefaults?7 -eric5.Helpviewer.UserAgent.UserAgentMenu.UserAgentMenu?1(title, parent = None) +eric5.Helpviewer.UserAgent.UserAgentMenu.UserAgentMenu?1(title, parent=None) eric5.IconEditor.IconEditorGrid.IconEditCommand.redo?4() eric5.IconEditor.IconEditorGrid.IconEditCommand.setAfterImage?4(image) eric5.IconEditor.IconEditorGrid.IconEditCommand.undo?4() -eric5.IconEditor.IconEditorGrid.IconEditCommand?1(grid, text, oldImage, parent = None) +eric5.IconEditor.IconEditorGrid.IconEditCommand?1(grid, text, oldImage, parent=None) eric5.IconEditor.IconEditorGrid.IconEditorGrid.Circle?7 eric5.IconEditor.IconEditorGrid.IconEditorGrid.CircleSelection?7 eric5.IconEditor.IconEditorGrid.IconEditorGrid.ColorPicker?7 @@ -2459,7 +2459,7 @@ eric5.IconEditor.IconEditorGrid.IconEditorGrid.editCopy?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.editCut?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.editNew?4() -eric5.IconEditor.IconEditorGrid.IconEditorGrid.editPaste?4(pasting = False) +eric5.IconEditor.IconEditorGrid.IconEditorGrid.editPaste?4(pasting=False) eric5.IconEditor.IconEditorGrid.IconEditorGrid.editPasteAsNew?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.editRedo?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.editResize?4() @@ -2482,9 +2482,9 @@ eric5.IconEditor.IconEditorGrid.IconEditorGrid.previewPixmap?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.selectionAvailable?7 eric5.IconEditor.IconEditorGrid.IconEditorGrid.setCompositingMode?4(mode) -eric5.IconEditor.IconEditorGrid.IconEditorGrid.setDirty?4(dirty, setCleanState = False) +eric5.IconEditor.IconEditorGrid.IconEditorGrid.setDirty?4(dirty, setCleanState=False) eric5.IconEditor.IconEditorGrid.IconEditorGrid.setGridEnabled?4(enable) -eric5.IconEditor.IconEditorGrid.IconEditorGrid.setIconImage?4(newImage, undoRedo = False, clearUndo = False) +eric5.IconEditor.IconEditorGrid.IconEditorGrid.setIconImage?4(newImage, undoRedo=False, clearUndo=False) eric5.IconEditor.IconEditorGrid.IconEditorGrid.setPenColor?4(newColor) eric5.IconEditor.IconEditorGrid.IconEditorGrid.setTool?4(tool) eric5.IconEditor.IconEditorGrid.IconEditorGrid.setZoomFactor?4(newZoom) @@ -2493,21 +2493,21 @@ eric5.IconEditor.IconEditorGrid.IconEditorGrid.sizeHint?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.tool?4() eric5.IconEditor.IconEditorGrid.IconEditorGrid.zoomFactor?4() -eric5.IconEditor.IconEditorGrid.IconEditorGrid?1(parent = None) +eric5.IconEditor.IconEditorGrid.IconEditorGrid?1(parent=None) eric5.IconEditor.IconEditorPalette.IconEditorPalette.colorChanged?4(color) eric5.IconEditor.IconEditorPalette.IconEditorPalette.colorSelected?7 eric5.IconEditor.IconEditorPalette.IconEditorPalette.compositingChanged?7 eric5.IconEditor.IconEditorPalette.IconEditorPalette.previewChanged?4(pixmap) eric5.IconEditor.IconEditorPalette.IconEditorPalette.setCompositingMode?4(mode) -eric5.IconEditor.IconEditorPalette.IconEditorPalette?1(parent = None) +eric5.IconEditor.IconEditorPalette.IconEditorPalette?1(parent=None) eric5.IconEditor.IconEditorWindow.IconEditorWindow.closeEvent?4(evt) eric5.IconEditor.IconEditorWindow.IconEditorWindow.editorClosed?7 eric5.IconEditor.IconEditorWindow.IconEditorWindow.windows?7 -eric5.IconEditor.IconEditorWindow.IconEditorWindow?1(fileName = "", parent = None, fromEric = False, initShortcutsOnly = False) +eric5.IconEditor.IconEditorWindow.IconEditorWindow?1(fileName="", parent=None, fromEric=False, initShortcutsOnly=False) eric5.IconEditor.IconSizeDialog.IconSizeDialog.getData?4() -eric5.IconEditor.IconSizeDialog.IconSizeDialog?1(width, height, parent = None) +eric5.IconEditor.IconSizeDialog.IconSizeDialog?1(width, height, parent=None) eric5.IconEditor.IconZoomDialog.IconZoomDialog.getZoomFactor?4() -eric5.IconEditor.IconZoomDialog.IconZoomDialog?1(zoom, parent = None) +eric5.IconEditor.IconZoomDialog.IconZoomDialog?1(zoom, parent=None) eric5.IconEditor.cursors.cursors_rc.qCleanupResources?4() eric5.IconEditor.cursors.cursors_rc.qInitResources?4() eric5.IconEditor.cursors.cursors_rc.qt_resource_data?7 @@ -2517,9 +2517,9 @@ eric5.MultiProject.AddProjectDialog.AddProjectDialog.on_fileButton_clicked?4() eric5.MultiProject.AddProjectDialog.AddProjectDialog.on_filenameEdit_textChanged?4(p0) eric5.MultiProject.AddProjectDialog.AddProjectDialog.on_nameEdit_textChanged?4(p0) -eric5.MultiProject.AddProjectDialog.AddProjectDialog?1(parent = None, startdir = None, project = None) +eric5.MultiProject.AddProjectDialog.AddProjectDialog?1(parent=None, startdir=None, project=None) eric5.MultiProject.MultiProject.MultiProject.addE5Actions?4(actions) -eric5.MultiProject.MultiProject.MultiProject.addProject?4(startdir = None) +eric5.MultiProject.MultiProject.MultiProject.addProject?4(startdir=None) eric5.MultiProject.MultiProject.MultiProject.changeProjectProperties?4(pro) eric5.MultiProject.MultiProject.MultiProject.checkDirty?4() eric5.MultiProject.MultiProject.MultiProject.closeMultiProject?4() @@ -2542,7 +2542,7 @@ eric5.MultiProject.MultiProject.MultiProject.multiProjectOpened?7 eric5.MultiProject.MultiProject.MultiProject.multiProjectPropertiesChanged?7 eric5.MultiProject.MultiProject.MultiProject.newMultiProject?7 -eric5.MultiProject.MultiProject.MultiProject.openMultiProject?4(fn = None, openMaster = True) +eric5.MultiProject.MultiProject.MultiProject.openMultiProject?4(fn=None, openMaster=True) eric5.MultiProject.MultiProject.MultiProject.openProject?4(filename) eric5.MultiProject.MultiProject.MultiProject.projectAdded?7 eric5.MultiProject.MultiProject.MultiProject.projectDataChanged?7 @@ -2554,35 +2554,35 @@ eric5.MultiProject.MultiProject.MultiProject.saveMultiProjectAs?4() eric5.MultiProject.MultiProject.MultiProject.setDirty?4(b) eric5.MultiProject.MultiProject.MultiProject.showMenu?7 -eric5.MultiProject.MultiProject.MultiProject?1(project, parent = None, filename = None) -eric5.MultiProject.MultiProjectBrowser.MultiProjectBrowser?1(multiProject, parent = None) +eric5.MultiProject.MultiProject.MultiProject?1(project, parent=None, filename=None) +eric5.MultiProject.MultiProjectBrowser.MultiProjectBrowser?1(multiProject, parent=None) eric5.MultiProject.PropertiesDialog.PropertiesDialog.storeData?4() -eric5.MultiProject.PropertiesDialog.PropertiesDialog?1(multiProject, new = True, parent = None) +eric5.MultiProject.PropertiesDialog.PropertiesDialog?1(multiProject, new=True, parent=None) eric5.PluginManager.PluginDetailsDialog.PluginDetailsDialog.on_activeCheckBox_clicked?4() eric5.PluginManager.PluginDetailsDialog.PluginDetailsDialog.on_autoactivateCheckBox_clicked?4() -eric5.PluginManager.PluginDetailsDialog.PluginDetailsDialog?1(details, parent = None) +eric5.PluginManager.PluginDetailsDialog.PluginDetailsDialog?1(details, parent=None) eric5.PluginManager.PluginExceptions.PluginActivationError?1(name) eric5.PluginManager.PluginExceptions.PluginClassFormatError?1(name, class_, missing) eric5.PluginManager.PluginExceptions.PluginError?1() eric5.PluginManager.PluginExceptions.PluginLoadError?1(name) eric5.PluginManager.PluginExceptions.PluginModuleFormatError?1(name, missing) eric5.PluginManager.PluginExceptions.PluginModulesError?1() -eric5.PluginManager.PluginExceptions.PluginPathError?1(msg = None) +eric5.PluginManager.PluginExceptions.PluginPathError?1(msg=None) eric5.PluginManager.PluginInfoDialog.PluginInfoDialog.on_pluginList_itemActivated?4(item, column) -eric5.PluginManager.PluginInfoDialog.PluginInfoDialog?1(pluginManager, parent = None) +eric5.PluginManager.PluginInfoDialog.PluginInfoDialog?1(pluginManager, parent=None) eric5.PluginManager.PluginInstallDialog.PluginInstallDialog.restartNeeded?4() -eric5.PluginManager.PluginInstallDialog.PluginInstallDialog?1(pluginManager, pluginFileNames, parent = None) +eric5.PluginManager.PluginInstallDialog.PluginInstallDialog?1(pluginManager, pluginFileNames, parent=None) eric5.PluginManager.PluginInstallDialog.PluginInstallWidget.on_addArchivesButton_clicked?4() eric5.PluginManager.PluginInstallDialog.PluginInstallWidget.on_archivesList_itemSelectionChanged?4() eric5.PluginManager.PluginInstallDialog.PluginInstallWidget.on_buttonBox_clicked?4(button) eric5.PluginManager.PluginInstallDialog.PluginInstallWidget.on_removeArchivesButton_clicked?4() eric5.PluginManager.PluginInstallDialog.PluginInstallWidget.restartNeeded?4() -eric5.PluginManager.PluginInstallDialog.PluginInstallWidget?1(pluginManager, pluginFileNames, parent = None) -eric5.PluginManager.PluginInstallDialog.PluginInstallWindow?1(pluginFileNames, parent = None) -eric5.PluginManager.PluginManager.PluginManager.activatePlugin?4(name, onDemand = False) +eric5.PluginManager.PluginInstallDialog.PluginInstallWidget?1(pluginManager, pluginFileNames, parent=None) +eric5.PluginManager.PluginInstallDialog.PluginInstallWindow?1(pluginFileNames, parent=None) +eric5.PluginManager.PluginManager.PluginManager.activatePlugin?4(name, onDemand=False) eric5.PluginManager.PluginManager.PluginManager.activatePlugins?4() eric5.PluginManager.PluginManager.PluginManager.allPlugginsActivated?7 -eric5.PluginManager.PluginManager.PluginManager.deactivatePlugin?4(name, onDemand = False) +eric5.PluginManager.PluginManager.PluginManager.deactivatePlugin?4(name, onDemand=False) eric5.PluginManager.PluginManager.PluginManager.deactivateVcsPlugins?4() eric5.PluginManager.PluginManager.PluginManager.doShutdown?4() eric5.PluginManager.PluginManager.PluginManager.finalizeSetup?4() @@ -2594,7 +2594,7 @@ eric5.PluginManager.PluginManager.PluginManager.getPluginExeDisplayData?4() eric5.PluginManager.PluginManager.PluginManager.getPluginInfos?4() eric5.PluginManager.PluginManager.PluginManager.getPluginModules?4(pluginPath) -eric5.PluginManager.PluginManager.PluginManager.getPluginObject?4(type_, typename, maybeActive = False) +eric5.PluginManager.PluginManager.PluginManager.getPluginObject?4(type_, typename, maybeActive=False) eric5.PluginManager.PluginManager.PluginManager.getPluginPreviewPixmap?4(type_, name) eric5.PluginManager.PluginManager.PluginManager.getVcsSystemIndicators?4() eric5.PluginManager.PluginManager.PluginManager.initOnDemandPlugin?4(name) @@ -2602,7 +2602,7 @@ eric5.PluginManager.PluginManager.PluginManager.isPluginActive?4(pluginName) eric5.PluginManager.PluginManager.PluginManager.isPluginLoaded?4(pluginName) eric5.PluginManager.PluginManager.PluginManager.isValidPluginName?4(pluginName) -eric5.PluginManager.PluginManager.PluginManager.loadPlugin?4(name, directory, reload_ = False) +eric5.PluginManager.PluginManager.PluginManager.loadPlugin?4(name, directory, reload_=False) eric5.PluginManager.PluginManager.PluginManager.pluginAboutToBeActivated?7 eric5.PluginManager.PluginManager.PluginManager.pluginAboutToBeDeactivated?7 eric5.PluginManager.PluginManager.PluginManager.pluginActivated?7 @@ -2611,27 +2611,27 @@ eric5.PluginManager.PluginManager.PluginManager.removePluginFromSysModules?4(pluginName, package, internalPackages) eric5.PluginManager.PluginManager.PluginManager.shutdown?7 eric5.PluginManager.PluginManager.PluginManager.unloadPlugin?4(name, directory) -eric5.PluginManager.PluginManager.PluginManager?1(parent = None, doLoadPlugins = True, develPlugin = None) +eric5.PluginManager.PluginManager.PluginManager?1(parent=None, doLoadPlugins=True, develPlugin=None) eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryDialog.getDownloadedPlugins?4() -eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryDialog?1(parent = None) +eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryDialog?1(parent=None) eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget.addEntry?4(name, short, description, url, author, version, filename, status) eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget.closeAndInstall?7 eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget.getDownloadedPlugins?4() eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget.on_buttonBox_clicked?4(button) eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget.on_repositoryList_currentItemChanged?4(current, previous) eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget.on_repositoryList_itemSelectionChanged?4() -eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget?1(parent = None) -eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWindow?1(parent = None) +eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWidget?1(parent=None) +eric5.PluginManager.PluginRepositoryDialog.PluginRepositoryWindow?1(parent=None) eric5.PluginManager.PluginRepositoryDialog.authorRole?7 eric5.PluginManager.PluginRepositoryDialog.descrRole?7 eric5.PluginManager.PluginRepositoryDialog.filenameRole?7 eric5.PluginManager.PluginRepositoryDialog.urlRole?7 -eric5.PluginManager.PluginUninstallDialog.PluginUninstallDialog?1(pluginManager, parent = None) +eric5.PluginManager.PluginUninstallDialog.PluginUninstallDialog?1(pluginManager, parent=None) eric5.PluginManager.PluginUninstallDialog.PluginUninstallWidget.on_buttonBox_accepted?4() eric5.PluginManager.PluginUninstallDialog.PluginUninstallWidget.on_pluginDirectoryCombo_currentIndexChanged?4(index) -eric5.PluginManager.PluginUninstallDialog.PluginUninstallWidget?1(pluginManager, parent = None) -eric5.PluginManager.PluginUninstallDialog.PluginUninstallWindow?1(parent = None) -eric5.Plugins.AboutPlugin.AboutDialog.AboutDialog?1(parent = None) +eric5.PluginManager.PluginUninstallDialog.PluginUninstallWidget?1(pluginManager, parent=None) +eric5.PluginManager.PluginUninstallDialog.PluginUninstallWindow?1(parent=None) +eric5.Plugins.AboutPlugin.AboutDialog.AboutDialog?1(parent=None) eric5.Plugins.AboutPlugin.AboutDialog.aboutText?7 eric5.Plugins.AboutPlugin.AboutDialog.authorsText?7 eric5.Plugins.AboutPlugin.AboutDialog.licenseText?7 @@ -2641,7 +2641,7 @@ eric5.Plugins.CheckerPlugins.Pep8.Pep8Checker.Pep8Checker?1(filename, lines, repeat=False, select="", ignore="") eric5.Plugins.CheckerPlugins.Pep8.Pep8Checker.Pep8Py2Checker?1(filename, lines, repeat=False, select="", ignore="") eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.Pep8CodeSelectionDialog.getSelectedCodes?4() -eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.Pep8CodeSelectionDialog?1(codes, showFixCodes, parent = None) +eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.Pep8CodeSelectionDialog?1(codes, showFixCodes, parent=None) eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.filenameRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.lineRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.messageRole?7 @@ -2658,13 +2658,13 @@ eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.positionRole?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.prepare?4(fileList, project) eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.settingsKey?7 -eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.start?4(fn, save = False, repeat = None) -eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog?1(parent = None) +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog.start?4(fn, save=False, repeat=None) +eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.Pep8Dialog?1(parent=None) eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8FixableIssues?7 eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer.fixIssue?4(line, pos, message) eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer.saveFile?4(encoding) eric5.Plugins.CheckerPlugins.Pep8.Pep8Fixer.Pep8Fixer?1(project, filename, sourceLines, fixCodes, inPlace) -eric5.Plugins.CheckerPlugins.Pep8.Pep8StatisticsDialog.Pep8StatisticsDialog?1(statistics, parent = None) +eric5.Plugins.CheckerPlugins.Pep8.Pep8StatisticsDialog.Pep8StatisticsDialog?1(statistics, parent=None) eric5.Plugins.CheckerPlugins.Pep8.pep8.BENCHMARK_KEYS?7 eric5.Plugins.CheckerPlugins.Pep8.pep8.BINARY_OPERATORS?7 eric5.Plugins.CheckerPlugins.Pep8.pep8.Checker.build_tokens_line?4() @@ -2749,9 +2749,9 @@ eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog.on_showButton_clicked?4() eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog.on_startButton_clicked?4() eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog.prepare?4(fileList, project) -eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog.start?4(fn, codestring = "") +eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog.start?4(fn, codestring="") eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog.warningRole?7 -eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog?1(parent = None) +eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.SyntaxCheckerDialog?1(parent=None) eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_line?4() eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_lineno?4() eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_msg?4() @@ -2763,7 +2763,7 @@ eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.Whitespace.not_equal_witness?4(other) eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.Whitespace.not_less_witness?4(other) eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.Whitespace?1(ws) -eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.check?4(file, text = "") +eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.check?4(file, text="") eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.format_witnesses?4(w) eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.process_tokens?4(tokens) eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.on_buttonBox_clicked?4(button) @@ -2771,7 +2771,7 @@ eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.on_startButton_clicked?4() eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.prepare?4(fileList, project) eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.start?4(fn) -eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog?1(parent = None) +eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog?1(parent=None) eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog.accept?4() eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog.generateParameters?4() eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog.on_addButton_clicked?4() @@ -2779,10 +2779,10 @@ eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog.on_ignoreDirButton_clicked?4() eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog.on_outputFileButton_clicked?4() eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog.on_outputFileEdit_textChanged?4(filename) -eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog?1(project, parms = None, parent = None) +eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.EricapiConfigDialog?1(project, parms=None, parent=None) eric5.Plugins.DocumentationPlugins.Ericapi.EricapiExecDialog.EricapiExecDialog.on_buttonBox_clicked?4(button) eric5.Plugins.DocumentationPlugins.Ericapi.EricapiExecDialog.EricapiExecDialog.start?4(args, fn) -eric5.Plugins.DocumentationPlugins.Ericapi.EricapiExecDialog.EricapiExecDialog?1(cmdname, parent = None) +eric5.Plugins.DocumentationPlugins.Ericapi.EricapiExecDialog.EricapiExecDialog?1(cmdname, parent=None) eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog.accept?4() eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog.generateParameters?4() eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog.on_addButton_clicked?4() @@ -2804,10 +2804,10 @@ eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog.on_qtHelpGroup_toggled?4(enabled) eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog.on_qtHelpNamespaceEdit_textChanged?4(txt) eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog.on_qtHelpTitleEdit_textChanged?4(p0) -eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog?1(project, parms = None, parent = None) +eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.EricdocConfigDialog?1(project, parms=None, parent=None) eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocExecDialog.EricdocExecDialog.on_buttonBox_clicked?4(button) eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocExecDialog.EricdocExecDialog.start?4(args, fn) -eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocExecDialog.EricdocExecDialog?1(cmdname, parent = None) +eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocExecDialog.EricdocExecDialog?1(cmdname, parent=None) eric5.Plugins.PluginAbout.AboutPlugin.activate?4() eric5.Plugins.PluginAbout.AboutPlugin.deactivate?4() eric5.Plugins.PluginAbout.AboutPlugin?1(ui) @@ -3157,15 +3157,15 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.HgAnnotateDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog.on_noneButton_toggled?4(checked) -eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog?1(tagsList, branchesList, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.HgBackoutDialog?1(tagsList, branchesList, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.getParameters?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog.on_commandCombo_editTextChanged?4(text) -eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog?1(argvList, ppath, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.HgCommandDialog?1(argvList, ppath, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.accepted?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.logMessage?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_buttonBox_accepted?4() @@ -3174,10 +3174,10 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_recentComboBox_activated?4(txt) eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_dirButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog?1(source, parent = None, move = False, force = False) +eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog?1(source, parent=None, move=False, force=False) eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.hasAddOrDelete?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.normalExit?4() @@ -3186,8 +3186,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.startProcess?4(args, workingDir = None, showArgs = True) -eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog?1(text, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.startProcess?4(args, workingDir=None, showArgs=True) +eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog?1(text, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_buttonBox_clicked?4(button) @@ -3195,8 +3195,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_saveButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.start?4(fn, versions = None, bundle = None) -eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.start?4(fn, versions=None, bundle=None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.COLORNAMES?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.COLORS?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.AuthorColumn?7 @@ -3227,29 +3227,29 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode = "log", bundle = None, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", bundle=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries = 0) -eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode = "log", bundle = None, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0) +eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(force, tagsList, branchesList, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(force, tagsList, branchesList, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_projectDirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_vcsUrlButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog?1(vcs, project, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog?1(vcs, project, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog.getRevision?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog?1(tagsList, branchesList, showNone = False, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.HgRevisionSelectionDialog?1(tagsList, branchesList, showNone=False, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog.getRevisions?4() -eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog?1(tagsList, branchesList, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.HgRevisionsSelectionDialog?1(tagsList, branchesList, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog.closeEvent?4(e) -eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog?1(vcs, path, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.HgServeDialog?1(vcs, path, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_addButton_clicked?4() @@ -3267,9 +3267,9 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemChanged?4(item, column) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._performMonitor?5() -eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread?1(interval, project, vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread?1(interval, project, vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_buttonBox_clicked?4(button) @@ -3277,14 +3277,14 @@ eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog.start?4(path, tags, tagsList, allTagsList) -eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.HgTagBranchListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.CreateBranch?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.CreateLocalTag?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.CreateRegularTag?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.DeleteTag?7 eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog.on_tagCombo_editTextChanged?4(text) -eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog?1(taglist, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.HgTagDialog?1(taglist, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4() eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper._addVCSMenu?5(mainMenu) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper._addVCSMenuBack?5(mainMenu) @@ -3295,11 +3295,11 @@ eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper.showContextMenuDir?4(menu, standardItems) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper.showContextMenuDirMulti?4(menu, standardItems) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper.showContextMenuMulti?4(menu, standardItems) -eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.HgProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.getActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initMenu?4(menu) -eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper?1(vcsObject, projectObject, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.committed?7 @@ -3310,22 +3310,22 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditConfig?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentifyBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode = "heads") -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListTagBranch?4(path, tags = True) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode="heads") +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgLogBrowser?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgLogLimited?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolve?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgServe?4(name) @@ -3334,38 +3334,38 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgShowPaths?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgUnbundle?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgVerify?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAdd?4(name, isDir = False, noDialog = False) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAddBinary?4(name, isDir = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAdd?4(name, isDir=False, noDialog=False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAddBinary?4(name, isDir=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAddTree?4(path) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAllRegisteredStates?4(names, dname, shortcut = True) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCheckout?4(vcsDataDict, projectDir, noDialog = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsAllRegisteredStates?4(names, dname, shortcut=True) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCleanup?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommandLine?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog = False, closeBranch = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsConvertProject?4(vcsDataDict, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExists?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExport?4(vcsDataDict, projectDir) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsGetProjectHelper?4(project) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog = False) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog=False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLog?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target = None, noDialog = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsName?4() -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsNewProjectOptionsDialog?4(parent = None) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsOptionsDialog?4(project, archive, editable = False, parent = None) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsNewProjectOptionsDialog?4(parent=None) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsOptionsDialog?4(project, archive, editable=False, parent=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRegisteredState?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRemove?4(name, project = False, noDialog = False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRemove?4(name, project=False, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRepositoryInfos?4(ppath) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsRevert?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsShutdown?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsStatus?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsSwitch?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsTag?4(name) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsUpdate?4(name, noDialog = False, revision = None) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg?1(plugin, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsUpdate?4(name, noDialog=False, revision=None) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg?1(plugin, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsPySvn.Config.ConfigSvnProtocols?7 eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.SubversionPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.SubversionPage.on_serversButton_clicked?4() @@ -3380,18 +3380,18 @@ eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuDir?4(menu, standardItems) eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuDirMulti?4(menu, standardItems) eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuMulti?4(menu, standardItems) -eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper.getActions?4() eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper.initMenu?4(menu) -eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper?1(vcsObject, projectObject, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog.on_dirButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog?1(argvList, wdList, ppath, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.SvnCommandDialog?1(argvList, wdList, ppath, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.accepted?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.changelistsData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.hasChangelists?4() @@ -3402,32 +3402,32 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.on_recentComboBox_activated?4(txt) eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.rejected?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog.showEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog?1(parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.SvnCommitDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.svnNotifyActionMap?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnConst.svnStatusMap?7 eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog.on_dirButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog?1(source, parent = None, move = False, force = False) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.SvnCopyDialog?1(source, parent=None, move=False, force=False) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog._clientNotifyCallback?5(eventDict) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog.finish?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog.hasAddOrDelete?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog.showError?4(msg) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog.showMessage?4(msg) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog?1(text, command, pysvnClient, parent = None, log = "") +eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.SvnDialog?1(text, command, pysvnClient, parent=None, log="") eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin._cancel?5() eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin._clientCancelCallback?5() eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin._clientLogCallback?5() eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin._clientLoginCallback?5(realm, username, may_save) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin._clientSslServerTrustPromptCallback?5(trust_dict) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin._reset?5() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin?1(log = "") +eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.SvnDialogMixin?1(log="") eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.SvnDiffDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.SvnDiffDialog.on_saveButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.SvnDiffDialog.start?4(fn, versions = None, urls = None, summary = False, pegRev = None) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.SvnDiffDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.SvnDiffDialog.start?4(fn, versions=None, urls=None, summary=False, pegRev=None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.SvnDiffDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.SvnInfoDialog.start?4(projectPath, fn) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.SvnInfoDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.SvnInfoDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog._reset?5() eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_clearRxEditButton_clicked?4() @@ -3442,36 +3442,36 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries = 0) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog?1(realm, username, may_save, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog?1(realm, username, may_save, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.on_tag1Combo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.on_tag2Combo_editTextChanged?4(text) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog?1(mergelist1, mergelist2, targetlist, force = False, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog?1(mergelist1, mergelist2, targetlist, force=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_layoutCheckBox_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_projectDirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.on_protocolCombo_activated?4(protocol) eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.on_vcsUrlButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog?1(vcs, project, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog?1(vcs, project, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.SvnPropDelDialog.getData?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.SvnPropDelDialog.on_propNameEdit_textChanged?4(text) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.SvnPropDelDialog?1(recursive, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.SvnPropDelDialog?1(recursive, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.SvnPropListDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.SvnPropListDialog.start?4(fn, recursive = False) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.SvnPropListDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.SvnPropListDialog.start?4(fn, recursive=False) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.SvnPropListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropSetDialog.SvnPropSetDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropSetDialog.SvnPropSetDialog?1(recursive, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropSetDialog.SvnPropSetDialog?1(recursive, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnRelocateDialog.SvnRelocateDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnRelocateDialog.SvnRelocateDialog?1(currUrl, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnRelocateDialog.SvnRelocateDialog?1(currUrl, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog.accept?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog.getSelectedUrl?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog.on_repoTree_itemCollapsed?4(item) @@ -3479,9 +3479,9 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog.on_repoTree_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog.on_urlCombo_currentIndexChanged?4(text) eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog.start?4(url) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog?1(vcs, mode = "browse", parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.SvnRepoBrowserDialog?1(vcs, mode="browse", parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog.getRevisions?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog?1(parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_addButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_buttonBox_clicked?4(button) eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_commitButton_clicked?4() @@ -3493,22 +3493,22 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_statusList_itemChanged?4(item, column) eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.SvnStatusDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusMonitorThread.SvnStatusMonitorThread._performMonitor?5() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusMonitorThread.SvnStatusMonitorThread?1(interval, project, vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusMonitorThread.SvnStatusMonitorThread?1(interval, project, vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnSwitchDialog.SvnSwitchDialog.getParameters?4() -eric5.Plugins.VcsPlugins.vcsPySvn.SvnSwitchDialog.SvnSwitchDialog?1(taglist, reposURL, standardLayout, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnSwitchDialog.SvnSwitchDialog?1(taglist, reposURL, standardLayout, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.SvnTagBranchListDialog.getTagList?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.SvnTagBranchListDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.SvnTagBranchListDialog.start?4(path, tags = True) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.SvnTagBranchListDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.SvnTagBranchListDialog.start?4(path, tags=True) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.SvnTagBranchListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagDialog.SvnTagDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagDialog.SvnTagDialog.on_tagCombo_editTextChanged?4(text) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagDialog.SvnTagDialog?1(taglist, reposURL, standardLayout, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagDialog.SvnTagDialog?1(taglist, reposURL, standardLayout, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog.getURLs?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo1_currentIndexChanged?4(type_) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo2_currentIndexChanged?4(type_) -eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog?1(vcs, tagsList, branchesList, path, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog?1(vcs, tagsList, branchesList, path, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.dateFromTime_t?4(seconds) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.formatTime?4(seconds) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.getConfigPath?4() @@ -3521,55 +3521,55 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnAddToChangelist?4(names) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnBlame?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnCopy?4(name, project) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnDelProp?4(name, recursive = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnDelProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnGetReposName?4(path) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnInfo?4(projectPath, name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListProps?4(name, recursive = False) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListTagBranch?4(path, tags = True) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListProps?4(name, recursive=False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLock?4(name, stealIt=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLogBrowser?4(path) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLogLimited?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRelocate?4(projectPath) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRemoveFromChangelist?4(names) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRepoBrowser?4(projectPath = None) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRepoBrowser?4(projectPath=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnResolve?4(name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSetProp?4(name, recursive = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSetProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUrlDiff?4(name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAdd?4(name, isDir = False, noDialog = False) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAddBinary?4(name, isDir = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAdd?4(name, isDir=False, noDialog=False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAddBinary?4(name, isDir=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAddTree?4(path) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAllRegisteredStates?4(names, dname, shortcut = True) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsCheckout?4(vcsDataDict, projectDir, noDialog = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAllRegisteredStates?4(names, dname, shortcut=True) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsCleanup?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsCommandLine?4(name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsCommit?4(name, message, noDialog = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsCommit?4(name, message, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsConvertProject?4(vcsDataDict, project) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsDiff?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsExists?4() eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsExport?4(vcsDataDict, projectDir) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsGetProjectHelper?4(project) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog = False) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLog?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMerge?4(name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target = None, noDialog = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsName?4() -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsNewProjectOptionsDialog?4(parent = None) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsOptionsDialog?4(project, archive, editable = False, parent = None) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsNewProjectOptionsDialog?4(parent=None) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsOptionsDialog?4(project, archive, editable=False, parent=None) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRegisteredState?4(name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRemove?4(name, project = False, noDialog = False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRemove?4(name, project=False, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRepositoryInfos?4(ppath) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsRevert?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsShutdown?4() eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsStatus?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsSwitch?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsTag?4(name) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsUpdate?4(name, noDialog = False) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion?1(plugin, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsUpdate?4(name, noDialog=False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion?1(plugin, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsSubversion.Config.ConfigSvnProtocols?7 eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.SubversionPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.SubversionPage.on_serversButton_clicked?4() @@ -3584,11 +3584,11 @@ eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuDir?4(menu, standardItems) eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuDirMulti?4(menu, standardItems) eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuMulti?4(menu, standardItems) -eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.SvnProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.SvnProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.getActions?4() eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.initActions?4() eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.initMenu?4(menu) -eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper?1(vcsObject, projectObject, parent = None, name = None) +eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.on_buttonBox_clicked?4(button) @@ -3596,11 +3596,11 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog.on_commandCombo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog.on_dirButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog?1(argvList, wdList, ppath, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.SvnCommandDialog?1(argvList, wdList, ppath, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog.accepted?7 eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog.changelistsData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog.hasChangelists?4() @@ -3611,10 +3611,10 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog.on_recentComboBox_activated?4(txt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog.rejected?7 eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog.showEvent?4(evt) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.SvnCommitDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog.on_dirButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog?1(source, parent = None, move = False, force = False) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.SvnCopyDialog?1(source, parent=None, move=False, force=False) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.hasAddOrDelete?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.normalExit?4() @@ -3622,8 +3622,8 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.startProcess?4(args, workingDir = None) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog?1(text, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog.startProcess?4(args, workingDir=None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.SvnDialog?1(text, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.on_buttonBox_clicked?4(button) @@ -3631,8 +3631,8 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.on_saveButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.start?4(fn, versions = None, urls = None, summary = False) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog.start?4(fn, versions=None, urls=None, summary=False) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.SvnDiffDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) @@ -3651,37 +3651,37 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_input_returnPressed?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_sendButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries = 0) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag1Combo_editTextChanged?4(text) eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag2Combo_editTextChanged?4(text) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog?1(mergelist1, mergelist2, targetlist, force = False, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog?1(mergelist1, mergelist2, targetlist, force=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_layoutCheckBox_toggled?4(checked) eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_projectDirButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.on_protocolCombo_activated?4(protocol) eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.on_vcsUrlButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog?1(vcs, project, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog?1(vcs, project, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog.on_buttonBox_clicked?4(button) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog.start?4(fn, recursive = False) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog.start?4(fn, recursive=False) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropSetDialog.SvnPropSetDialog.getData?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropSetDialog.SvnPropSetDialog.on_fileButton_clicked?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropSetDialog.SvnPropSetDialog?1(parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropSetDialog.SvnPropSetDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnRelocateDialog.SvnRelocateDialog.getData?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnRelocateDialog.SvnRelocateDialog?1(currUrl, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnRelocateDialog.SvnRelocateDialog?1(currUrl, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog.accept?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog.getSelectedUrl?4() @@ -3694,9 +3694,9 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog.on_urlCombo_currentIndexChanged?4(text) eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog.start?4(url) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog?1(vcs, mode = "browse", parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.SvnRepoBrowserDialog?1(vcs, mode="browse", parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog.getRevisions?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog?1(parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnRevisionSelectionDialog.SvnRevisionSelectionDialog?1(parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_addButton_clicked?4() @@ -3713,11 +3713,11 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_statusList_itemChanged?4(item, column) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.on_statusList_itemSelectionChanged?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog.start?4(fn) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.SvnStatusDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusMonitorThread.SvnStatusMonitorThread._performMonitor?5() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusMonitorThread.SvnStatusMonitorThread?1(interval, project, vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusMonitorThread.SvnStatusMonitorThread?1(interval, project, vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnSwitchDialog.SvnSwitchDialog.getParameters?4() -eric5.Plugins.VcsPlugins.vcsSubversion.SvnSwitchDialog.SvnSwitchDialog?1(taglist, reposURL, standardLayout, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnSwitchDialog.SvnSwitchDialog?1(taglist, reposURL, standardLayout, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog.closeEvent?4(e) eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog.keyPressEvent?4(evt) eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog.on_buttonBox_clicked?4(button) @@ -3725,14 +3725,14 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog.on_passwordCheckBox_toggled?4(isOn) eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog.on_sendButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog.start?4(path, tags, tagsList, allTagsList) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog?1(vcs, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.SvnTagBranchListDialog?1(vcs, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagDialog.SvnTagDialog.getParameters?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagDialog.SvnTagDialog.on_tagCombo_editTextChanged?4(text) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagDialog.SvnTagDialog?1(taglist, reposURL, standardLayout, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagDialog.SvnTagDialog?1(taglist, reposURL, standardLayout, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog.getURLs?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo1_currentIndexChanged?4(type_) eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo2_currentIndexChanged?4(type_) -eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog?1(vcs, tagsList, branchesList, path, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog?1(vcs, tagsList, branchesList, path, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.getConfigPath?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.getServersPath?4() eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion._createStatusMonitorThread?5(interval, project) @@ -3742,60 +3742,60 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnAddToChangelist?4(names) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnBlame?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnCopy?4(name, project) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnDelProp?4(name, recursive = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnDelProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnGetReposName?4(path) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListProps?4(name, recursive = False) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListTagBranch?4(path, tags = True) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListProps?4(name, recursive=False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLock?4(name, stealIt=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLogBrowser?4(path) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLogLimited?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRelocate?4(projectPath) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRemoveFromChangelist?4(names) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRepoBrowser?4(projectPath = None) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRepoBrowser?4(projectPath=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnResolve?4(name) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSetProp?4(name, recursive = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSetProp?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUrlDiff?4(name) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAdd?4(name, isDir = False, noDialog = False) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAddBinary?4(name, isDir = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAdd?4(name, isDir=False, noDialog=False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAddBinary?4(name, isDir=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAddTree?4(path) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAllRegisteredStates?4(names, dname, shortcut = True) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsCheckout?4(vcsDataDict, projectDir, noDialog = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAllRegisteredStates?4(names, dname, shortcut=True) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsCleanup?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsCommandLine?4(name) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsCommit?4(name, message, noDialog = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsCommit?4(name, message, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsConvertProject?4(vcsDataDict, project) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsDiff?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsExists?4() eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsExport?4(vcsDataDict, projectDir) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsGetProjectHelper?4(project) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog = False) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLog?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMerge?4(name) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target = None, noDialog = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsName?4() -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsNewProjectOptionsDialog?4(parent = None) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsOptionsDialog?4(project, archive, editable = False, parent = None) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsNewProjectOptionsDialog?4(parent=None) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsOptionsDialog?4(project, archive, editable=False, parent=None) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRegisteredState?4(name) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRemove?4(name, project = False, noDialog = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRemove?4(name, project=False, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRepositoryInfos?4(ppath) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsRevert?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsShutdown?4() eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsStatus?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsSwitch?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsTag?4(name) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsUpdate?4(name, noDialog = False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsUpdate?4(name, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion?1(plugin, parent=None, name=None) -eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._addView?5(win, fn = None, noName = "") +eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._addView?5(win, fn=None, noName="") eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._initWindowActions?5() eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._modificationStatusChanged?5(m, editor) eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._removeAllViews?5() eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._removeView?5(win) -eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._showView?5(win, fn = None) +eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._showView?5(win, fn=None) eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._syntaxErrorToggled?5(editor) eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.activeWindow?4() eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.addSplit?4() @@ -3834,12 +3834,12 @@ eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.StackedWidget.setCurrentIndex?4(index) eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.StackedWidget.setCurrentWidget?4(widget) eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.StackedWidget?1(parent) -eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._addView?5(win, fn = None, noName = "") +eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._addView?5(win, fn=None, noName="") eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._initWindowActions?5() eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._modificationStatusChanged?5(m, editor) eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._removeAllViews?5() eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._removeView?5(win) -eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._showView?5(win, fn = None) +eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._showView?5(win, fn=None) eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea._syntaxErrorToggled?5(editor) eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea.activeWindow?4() eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.MdiArea.bookmarkToggled?7 @@ -3871,7 +3871,7 @@ eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabBar.tabCopyRequested?7 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabBar.tabMoveRequested?7 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabBar.tabRelocateRequested?7 -eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabBar?1(parent = None) +eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabBar?1(parent=None) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.addTab?4(editor, title) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.copyTab?4(sourceIndex, targetIndex) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.copyTabOther?4(sourceId, sourceIndex, targetIndex) @@ -3884,12 +3884,12 @@ eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.removeWidget?4(object) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.showIndicator?4(on) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget?1(vm) -eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._addView?5(win, fn = None, noName = "") +eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._addView?5(win, fn=None, noName="") eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._initWindowActions?5() eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._modificationStatusChanged?5(m, editor) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._removeAllViews?5() eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._removeView?5(win) -eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._showView?5(win, fn = None) +eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._showView?5(win, fn=None) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._syntaxErrorToggled?5(editor) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.activeWindow?4() eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.addSplit?4() @@ -3910,7 +3910,7 @@ eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.editorSaved?7 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.eventFilter?4(watched, event) eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.getTabWidgetById?4(id_) -eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.insertView?4(win, tabWidget, index, fn = None, noName = "") +eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.insertView?4(win, tabWidget, index, fn=None, noName="") eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.lastEditorClosed?7 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.nextSplit?4() eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.preferencesChanged?4() @@ -3942,7 +3942,7 @@ eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.E5MessageBoxWizardDialog.on_rStandard_toggled?4(checked) eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.E5MessageBoxWizardDialog.on_rWarning_toggled?4(checked) eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.E5MessageBoxWizardDialog.on_rYesNo_toggled?4(checked) -eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.E5MessageBoxWizardDialog?1(parent = None) +eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.E5MessageBoxWizardDialog?1(parent=None) eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.getCode?4(indLevel, indString) eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.on_bTest_clicked?4() eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.on_buttonBox_clicked?4(button) @@ -3967,9 +3967,9 @@ eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.PyRegExpWizardCharactersDialog.getCharacters?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.PyRegExpWizardCharactersDialog.predefinedClasses?7 eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.PyRegExpWizardCharactersDialog.specialChars?7 -eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.PyRegExpWizardCharactersDialog?1(parent = None) +eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.PyRegExpWizardCharactersDialog?1(parent=None) eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardDialog.getCode?4(indLevel, indString) -eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardDialog?1(parent = None, fromEric = True) +eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardDialog?1(parent=None, fromEric=True) eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.getCode?4(indLevel, indString) eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_altnButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_anycharButton_clicked?4() @@ -3979,7 +3979,7 @@ eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_commentButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_copyButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_endlineButton_clicked?4() -eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_executeButton_clicked?4(startpos = 0) +eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_executeButton_clicked?4(startpos=0) eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_groupButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_loadButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_namedGroupButton_clicked?4() @@ -3999,18 +3999,18 @@ eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_undoButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_validateButton_clicked?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget.on_wordboundButton_clicked?4() -eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget?1(parent = None, fromEric = True) -eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWindow?1(parent = None) +eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWidget?1(parent=None, fromEric=True) +eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.PyRegExpWizardWindow?1(parent=None) eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog.getRepeat?4() eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog.on_lowerSpin_valueChanged?4(value) eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog.on_upperSpin_valueChanged?4(value) -eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog?1(parent = None) +eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.PyRegExpWizardRepeatDialog?1(parent=None) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.getCharacters?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.predefinedClasses?7 eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog.specialChars?7 -eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog?1(parent = None) +eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.QRegExpWizardCharactersDialog?1(parent=None) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardDialog.getCode?4(indLevel, indString) -eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardDialog?1(parent = None, fromEric = True) +eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardDialog?1(parent=None, fromEric=True) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.getCode?4(indLevel, indString) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_altnButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_anycharButton_clicked?4() @@ -4019,7 +4019,7 @@ eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_charButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_copyButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_endlineButton_clicked?4() -eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_executeButton_clicked?4(startpos = 0) +eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_executeButton_clicked?4(startpos=0) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_groupButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_loadButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_neglookaheadButton_clicked?4() @@ -4032,12 +4032,12 @@ eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_saveButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_validateButton_clicked?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget.on_wordboundButton_clicked?4() -eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget?1(parent = None, fromEric = True) -eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWindow?1(parent = None) +eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWidget?1(parent=None, fromEric=True) +eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.QRegExpWizardWindow?1(parent=None) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog.getRepeat?4() eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog.on_lowerSpin_valueChanged?4(value) eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog.on_upperSpin_valueChanged?4(value) -eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog?1(parent = None) +eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.QRegExpWizardRepeatDialog?1(parent=None) eric5.Preferences.ConfigurationDialog.ConfigurationDialog.DefaultMode?7 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.HelpBrowserMode?7 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.TrayStarterMode?7 @@ -4045,7 +4045,7 @@ eric5.Preferences.ConfigurationDialog.ConfigurationDialog.preferencesChanged?7 eric5.Preferences.ConfigurationDialog.ConfigurationDialog.setPreferences?4() eric5.Preferences.ConfigurationDialog.ConfigurationDialog.showConfigurationPageByName?4(pageName) -eric5.Preferences.ConfigurationDialog.ConfigurationDialog?1(parent = None, name = None, modal = False, fromEric = True, displayMode = ConfigurationWidget.DefaultMode) +eric5.Preferences.ConfigurationDialog.ConfigurationDialog?1(parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode) eric5.Preferences.ConfigurationDialog.ConfigurationPageItem.getPageName?4() eric5.Preferences.ConfigurationDialog.ConfigurationPageItem?1(parent, text, pageName, iconFile) eric5.Preferences.ConfigurationDialog.ConfigurationWidget.DefaultMode?7 @@ -4061,18 +4061,18 @@ eric5.Preferences.ConfigurationDialog.ConfigurationWidget.preferencesChanged?7 eric5.Preferences.ConfigurationDialog.ConfigurationWidget.setPreferences?4() eric5.Preferences.ConfigurationDialog.ConfigurationWidget.showConfigurationPageByName?4(pageName) -eric5.Preferences.ConfigurationDialog.ConfigurationWidget?1(parent = None, fromEric = True, displayMode = DefaultMode) +eric5.Preferences.ConfigurationDialog.ConfigurationWidget?1(parent=None, fromEric=True, displayMode=DefaultMode) eric5.Preferences.ConfigurationDialog.ConfigurationWindow.accept?4() eric5.Preferences.ConfigurationDialog.ConfigurationWindow.showConfigurationPageByName?4(pageName) -eric5.Preferences.ConfigurationDialog.ConfigurationWindow?1(parent = None) +eric5.Preferences.ConfigurationDialog.ConfigurationWindow?1(parent=None) eric5.Preferences.ConfigurationPages.ApplicationPage.ApplicationPage.save?4() eric5.Preferences.ConfigurationPages.ApplicationPage.ApplicationPage?1() eric5.Preferences.ConfigurationPages.ApplicationPage.create?4(dlg) eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.initColour?4(colourstr, button, prefMethod) eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.polishPage?4() eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.saveState?4() -eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.selectColour?4(button, colourVar, showAlpha = False) -eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.selectFont?4(fontSample, fontVar, showFontInfo = False) +eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.selectColour?4(button, colourVar, showAlpha=False) +eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.selectFont?4(fontSample, fontVar, showFontInfo=False) eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.setState?4(state) eric5.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase?1() eric5.Preferences.ConfigurationPages.CooperationPage.CooperationPage.on_addBannedUserButton_clicked?4() @@ -4345,7 +4345,7 @@ eric5.Preferences.ConfigurationPages.TerminalPage.TerminalPage?1() eric5.Preferences.ConfigurationPages.TerminalPage.create?4(dlg) eric5.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage.save?4() -eric5.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1(parent = None) +eric5.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1(parent=None) eric5.Preferences.ConfigurationPages.TrayStarterPage.create?4(dlg) eric5.Preferences.ConfigurationPages.VcsPage.VcsPage.on_pbVcsAddedButton_clicked?4() eric5.Preferences.ConfigurationPages.VcsPage.VcsPage.on_pbVcsConflictButton_clicked?4() @@ -4416,17 +4416,17 @@ eric5.Preferences.ProgramsDialog.ProgramsDialog.on_buttonBox_clicked?4(button) eric5.Preferences.ProgramsDialog.ProgramsDialog.on_programsSearchButton_clicked?4() eric5.Preferences.ProgramsDialog.ProgramsDialog.show?4() -eric5.Preferences.ProgramsDialog.ProgramsDialog?1(parent = None) +eric5.Preferences.ProgramsDialog.ProgramsDialog?1(parent=None) eric5.Preferences.ShortcutDialog.ShortcutDialog.eventFilter?4(watched, event) eric5.Preferences.ShortcutDialog.ShortcutDialog.keyPressEvent?4(evt) eric5.Preferences.ShortcutDialog.ShortcutDialog.on_buttonBox_accepted?4() eric5.Preferences.ShortcutDialog.ShortcutDialog.setKeys?4(key, alternateKey, noCheck, objectType) eric5.Preferences.ShortcutDialog.ShortcutDialog.shortcutChanged?7 -eric5.Preferences.ShortcutDialog.ShortcutDialog?1(parent = None, name = None, modal = False) +eric5.Preferences.ShortcutDialog.ShortcutDialog?1(parent=None, name=None, modal=False) eric5.Preferences.Shortcuts.exportShortcuts?4(fn) eric5.Preferences.Shortcuts.importShortcuts?4(fn) -eric5.Preferences.Shortcuts.readShortcuts?4(prefClass = Prefs, helpViewer = None, pluginName = None) -eric5.Preferences.Shortcuts.saveShortcuts?4(prefClass = Prefs) +eric5.Preferences.Shortcuts.readShortcuts?4(prefClass=Prefs, helpViewer=None, pluginName=None) +eric5.Preferences.Shortcuts.saveShortcuts?4(prefClass=Prefs) eric5.Preferences.Shortcuts.setActions?4(shortcuts) eric5.Preferences.ShortcutsDialog.ShortcutsDialog.noCheckRole?7 eric5.Preferences.ShortcutsDialog.ShortcutsDialog.objectNameRole?7 @@ -4441,7 +4441,7 @@ eric5.Preferences.ShortcutsDialog.ShortcutsDialog.on_shortcutsList_itemDoubleClicked?4(itm, column) eric5.Preferences.ShortcutsDialog.ShortcutsDialog.populate?4() eric5.Preferences.ShortcutsDialog.ShortcutsDialog.updateShortcuts?7 -eric5.Preferences.ShortcutsDialog.ShortcutsDialog?1(parent = None, name = None, modal = False) +eric5.Preferences.ShortcutsDialog.ShortcutsDialog?1(parent=None, name=None, modal=False) eric5.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.getToollist?4() eric5.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.on_addButton_clicked?4() eric5.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.on_argumentsEdit_textChanged?4(text) @@ -4467,101 +4467,101 @@ eric5.Preferences.ToolGroupConfigurationDialog.ToolGroupConfigurationDialog.on_groupsList_currentRowChanged?4(row) eric5.Preferences.ToolGroupConfigurationDialog.ToolGroupConfigurationDialog.on_newButton_clicked?4() eric5.Preferences.ToolGroupConfigurationDialog.ToolGroupConfigurationDialog.on_upButton_clicked?4() -eric5.Preferences.ToolGroupConfigurationDialog.ToolGroupConfigurationDialog?1(toolGroups, currentGroup, parent = None) +eric5.Preferences.ToolGroupConfigurationDialog.ToolGroupConfigurationDialog?1(toolGroups, currentGroup, parent=None) eric5.Preferences.ViewProfileDialog.ViewProfileDialog.getProfiles?4() -eric5.Preferences.ViewProfileDialog.ViewProfileDialog?1(layout, profiles, separateShell, separateBrowser, parent = None) -eric5.Preferences.exportPreferences?4(prefClass = Prefs) -eric5.Preferences.getCooperation?4(key, prefClass = Prefs) -eric5.Preferences.getCorba?4(key, prefClass = Prefs) -eric5.Preferences.getDebugger?4(key, prefClass = Prefs) -eric5.Preferences.getEditor?4(key, prefClass = Prefs) -eric5.Preferences.getEditorAPI?4(key, prefClass = Prefs) -eric5.Preferences.getEditorColour?4(key, prefClass = Prefs) -eric5.Preferences.getEditorExporter?4(key, prefClass = Prefs) -eric5.Preferences.getEditorKeywords?4(key, prefClass = Prefs) -eric5.Preferences.getEditorLexerAssoc?4(filename, prefClass = Prefs) -eric5.Preferences.getEditorLexerAssocs?4(prefClass = Prefs) -eric5.Preferences.getEditorOtherFonts?4(key, prefClass = Prefs) -eric5.Preferences.getEditorTyping?4(key, prefClass = Prefs) -eric5.Preferences.getFlakes?4(key, prefClass = Prefs) -eric5.Preferences.getGeometry?4(key, prefClass = Prefs) -eric5.Preferences.getGraphics?4(key, prefClass = Prefs) -eric5.Preferences.getHelp?4(key, prefClass = Prefs) -eric5.Preferences.getIconEditor?4(key, prefClass = Prefs) -eric5.Preferences.getIcons?4(key, prefClass = Prefs) -eric5.Preferences.getMultiProject?4(key, prefClass = Prefs) -eric5.Preferences.getPluginManager?4(key, prefClass = Prefs) -eric5.Preferences.getPrinter?4(key, prefClass = Prefs) -eric5.Preferences.getProject?4(key, prefClass = Prefs) -eric5.Preferences.getProjectBrowserColour?4(key, prefClass = Prefs) -eric5.Preferences.getProjectBrowserFlags?4(key, prefClass = Prefs) -eric5.Preferences.getPython?4(key, prefClass = Prefs) -eric5.Preferences.getQt4DocDir?4(prefClass = Prefs) -eric5.Preferences.getQt4TranslationsDir?4(prefClass = Prefs) -eric5.Preferences.getQt?4(key, prefClass = Prefs) -eric5.Preferences.getShell?4(key, prefClass = Prefs) -eric5.Preferences.getSystem?4(key, prefClass = Prefs) -eric5.Preferences.getTasks?4(key, prefClass = Prefs) -eric5.Preferences.getTemplates?4(key, prefClass = Prefs) -eric5.Preferences.getTerminal?4(key, prefClass = Prefs) -eric5.Preferences.getTrayStarter?4(key, prefClass = Prefs) -eric5.Preferences.getUI?4(key, prefClass = Prefs) -eric5.Preferences.getUILanguage?4(prefClass = Prefs) -eric5.Preferences.getUILayout?4(prefClass = Prefs) -eric5.Preferences.getUser?4(key, prefClass = Prefs) -eric5.Preferences.getVCS?4(key, prefClass = Prefs) -eric5.Preferences.getVarFilters?4(prefClass = Prefs) -eric5.Preferences.getViewManager?4(prefClass = Prefs) -eric5.Preferences.importPreferences?4(prefClass = Prefs) +eric5.Preferences.ViewProfileDialog.ViewProfileDialog?1(layout, profiles, separateShell, separateBrowser, parent=None) +eric5.Preferences.exportPreferences?4(prefClass=Prefs) +eric5.Preferences.getCooperation?4(key, prefClass=Prefs) +eric5.Preferences.getCorba?4(key, prefClass=Prefs) +eric5.Preferences.getDebugger?4(key, prefClass=Prefs) +eric5.Preferences.getEditor?4(key, prefClass=Prefs) +eric5.Preferences.getEditorAPI?4(key, prefClass=Prefs) +eric5.Preferences.getEditorColour?4(key, prefClass=Prefs) +eric5.Preferences.getEditorExporter?4(key, prefClass=Prefs) +eric5.Preferences.getEditorKeywords?4(key, prefClass=Prefs) +eric5.Preferences.getEditorLexerAssoc?4(filename, prefClass=Prefs) +eric5.Preferences.getEditorLexerAssocs?4(prefClass=Prefs) +eric5.Preferences.getEditorOtherFonts?4(key, prefClass=Prefs) +eric5.Preferences.getEditorTyping?4(key, prefClass=Prefs) +eric5.Preferences.getFlakes?4(key, prefClass=Prefs) +eric5.Preferences.getGeometry?4(key, prefClass=Prefs) +eric5.Preferences.getGraphics?4(key, prefClass=Prefs) +eric5.Preferences.getHelp?4(key, prefClass=Prefs) +eric5.Preferences.getIconEditor?4(key, prefClass=Prefs) +eric5.Preferences.getIcons?4(key, prefClass=Prefs) +eric5.Preferences.getMultiProject?4(key, prefClass=Prefs) +eric5.Preferences.getPluginManager?4(key, prefClass=Prefs) +eric5.Preferences.getPrinter?4(key, prefClass=Prefs) +eric5.Preferences.getProject?4(key, prefClass=Prefs) +eric5.Preferences.getProjectBrowserColour?4(key, prefClass=Prefs) +eric5.Preferences.getProjectBrowserFlags?4(key, prefClass=Prefs) +eric5.Preferences.getPython?4(key, prefClass=Prefs) +eric5.Preferences.getQt4DocDir?4(prefClass=Prefs) +eric5.Preferences.getQt4TranslationsDir?4(prefClass=Prefs) +eric5.Preferences.getQt?4(key, prefClass=Prefs) +eric5.Preferences.getShell?4(key, prefClass=Prefs) +eric5.Preferences.getSystem?4(key, prefClass=Prefs) +eric5.Preferences.getTasks?4(key, prefClass=Prefs) +eric5.Preferences.getTemplates?4(key, prefClass=Prefs) +eric5.Preferences.getTerminal?4(key, prefClass=Prefs) +eric5.Preferences.getTrayStarter?4(key, prefClass=Prefs) +eric5.Preferences.getUI?4(key, prefClass=Prefs) +eric5.Preferences.getUILanguage?4(prefClass=Prefs) +eric5.Preferences.getUILayout?4(prefClass=Prefs) +eric5.Preferences.getUser?4(key, prefClass=Prefs) +eric5.Preferences.getVCS?4(key, prefClass=Prefs) +eric5.Preferences.getVarFilters?4(prefClass=Prefs) +eric5.Preferences.getViewManager?4(prefClass=Prefs) +eric5.Preferences.importPreferences?4(prefClass=Prefs) eric5.Preferences.initPreferences?4() eric5.Preferences.initRecentSettings?4() -eric5.Preferences.isConfigured?4(prefClass = Prefs) -eric5.Preferences.readToolGroups?4(prefClass = Prefs) -eric5.Preferences.removeProjectBrowserFlags?4(key, prefClass = Prefs) -eric5.Preferences.resetLayout?4(prefClass = Prefs) -eric5.Preferences.saveResetLayout?4(prefClass = Prefs) -eric5.Preferences.saveToolGroups?4(toolGroups, currentGroup, prefClass = Prefs) -eric5.Preferences.setCooperation?4(key, value, prefClass = Prefs) -eric5.Preferences.setCorba?4(key, value, prefClass = Prefs) -eric5.Preferences.setDebugger?4(key, value, prefClass = Prefs) -eric5.Preferences.setEditor?4(key, value, prefClass = Prefs) -eric5.Preferences.setEditorAPI?4(key, apilist, prefClass = Prefs) -eric5.Preferences.setEditorColour?4(key, value, prefClass = Prefs) -eric5.Preferences.setEditorExporter?4(key, value, prefClass = Prefs) -eric5.Preferences.setEditorKeywords?4(key, keywordsLists, prefClass = Prefs) -eric5.Preferences.setEditorLexerAssocs?4(assocs, prefClass = Prefs) -eric5.Preferences.setEditorOtherFonts?4(key, font, prefClass = Prefs) -eric5.Preferences.setEditorTyping?4(key, value, prefClass = Prefs) -eric5.Preferences.setFlakes?4(key, value, prefClass = Prefs) -eric5.Preferences.setGeometry?4(key, value, prefClass = Prefs) -eric5.Preferences.setGraphics?4(key, value, prefClass = Prefs) -eric5.Preferences.setHelp?4(key, value, prefClass = Prefs) -eric5.Preferences.setIconEditor?4(key, value, prefClass = Prefs) -eric5.Preferences.setIcons?4(key, value, prefClass = Prefs) -eric5.Preferences.setMultiProject?4(key, value, prefClass = Prefs) -eric5.Preferences.setPluginManager?4(key, value, prefClass = Prefs) -eric5.Preferences.setPrinter?4(key, value, prefClass = Prefs) -eric5.Preferences.setProject?4(key, value, prefClass = Prefs) -eric5.Preferences.setProjectBrowserColour?4(key, value, prefClass = Prefs) -eric5.Preferences.setProjectBrowserFlags?4(key, value, prefClass = Prefs) -eric5.Preferences.setProjectBrowserFlagsDefault?4(key, value, prefClass = Prefs) -eric5.Preferences.setPython?4(key, value, prefClass = Prefs) -eric5.Preferences.setQt?4(key, value, prefClass = Prefs) -eric5.Preferences.setShell?4(key, value, prefClass = Prefs) -eric5.Preferences.setSystem?4(key, value, prefClass = Prefs) -eric5.Preferences.setTasks?4(key, value, prefClass = Prefs) -eric5.Preferences.setTemplates?4(key, value, prefClass = Prefs) -eric5.Preferences.setTerminal?4(key, value, prefClass = Prefs) -eric5.Preferences.setTrayStarter?4(key, value, prefClass = Prefs) -eric5.Preferences.setUI?4(key, value, prefClass = Prefs) -eric5.Preferences.setUILanguage?4(lang, prefClass = Prefs) -eric5.Preferences.setUILayout?4(layout, prefClass = Prefs) -eric5.Preferences.setUser?4(key, value, prefClass = Prefs) -eric5.Preferences.setVCS?4(key, value, prefClass = Prefs) -eric5.Preferences.setVarFilters?4(filters, prefClass = Prefs) -eric5.Preferences.setViewManager?4(vm, prefClass = Prefs) -eric5.Preferences.shouldResetLayout?4(prefClass = Prefs) -eric5.Preferences.syncPreferences?4(prefClass = Prefs) +eric5.Preferences.isConfigured?4(prefClass=Prefs) +eric5.Preferences.readToolGroups?4(prefClass=Prefs) +eric5.Preferences.removeProjectBrowserFlags?4(key, prefClass=Prefs) +eric5.Preferences.resetLayout?4(prefClass=Prefs) +eric5.Preferences.saveResetLayout?4(prefClass=Prefs) +eric5.Preferences.saveToolGroups?4(toolGroups, currentGroup, prefClass=Prefs) +eric5.Preferences.setCooperation?4(key, value, prefClass=Prefs) +eric5.Preferences.setCorba?4(key, value, prefClass=Prefs) +eric5.Preferences.setDebugger?4(key, value, prefClass=Prefs) +eric5.Preferences.setEditor?4(key, value, prefClass=Prefs) +eric5.Preferences.setEditorAPI?4(key, apilist, prefClass=Prefs) +eric5.Preferences.setEditorColour?4(key, value, prefClass=Prefs) +eric5.Preferences.setEditorExporter?4(key, value, prefClass=Prefs) +eric5.Preferences.setEditorKeywords?4(key, keywordsLists, prefClass=Prefs) +eric5.Preferences.setEditorLexerAssocs?4(assocs, prefClass=Prefs) +eric5.Preferences.setEditorOtherFonts?4(key, font, prefClass=Prefs) +eric5.Preferences.setEditorTyping?4(key, value, prefClass=Prefs) +eric5.Preferences.setFlakes?4(key, value, prefClass=Prefs) +eric5.Preferences.setGeometry?4(key, value, prefClass=Prefs) +eric5.Preferences.setGraphics?4(key, value, prefClass=Prefs) +eric5.Preferences.setHelp?4(key, value, prefClass=Prefs) +eric5.Preferences.setIconEditor?4(key, value, prefClass=Prefs) +eric5.Preferences.setIcons?4(key, value, prefClass=Prefs) +eric5.Preferences.setMultiProject?4(key, value, prefClass=Prefs) +eric5.Preferences.setPluginManager?4(key, value, prefClass=Prefs) +eric5.Preferences.setPrinter?4(key, value, prefClass=Prefs) +eric5.Preferences.setProject?4(key, value, prefClass=Prefs) +eric5.Preferences.setProjectBrowserColour?4(key, value, prefClass=Prefs) +eric5.Preferences.setProjectBrowserFlags?4(key, value, prefClass=Prefs) +eric5.Preferences.setProjectBrowserFlagsDefault?4(key, value, prefClass=Prefs) +eric5.Preferences.setPython?4(key, value, prefClass=Prefs) +eric5.Preferences.setQt?4(key, value, prefClass=Prefs) +eric5.Preferences.setShell?4(key, value, prefClass=Prefs) +eric5.Preferences.setSystem?4(key, value, prefClass=Prefs) +eric5.Preferences.setTasks?4(key, value, prefClass=Prefs) +eric5.Preferences.setTemplates?4(key, value, prefClass=Prefs) +eric5.Preferences.setTerminal?4(key, value, prefClass=Prefs) +eric5.Preferences.setTrayStarter?4(key, value, prefClass=Prefs) +eric5.Preferences.setUI?4(key, value, prefClass=Prefs) +eric5.Preferences.setUILanguage?4(lang, prefClass=Prefs) +eric5.Preferences.setUILayout?4(layout, prefClass=Prefs) +eric5.Preferences.setUser?4(key, value, prefClass=Prefs) +eric5.Preferences.setVCS?4(key, value, prefClass=Prefs) +eric5.Preferences.setVarFilters?4(filters, prefClass=Prefs) +eric5.Preferences.setViewManager?4(vm, prefClass=Prefs) +eric5.Preferences.shouldResetLayout?4(prefClass=Prefs) +eric5.Preferences.syncPreferences?4(prefClass=Prefs) eric5.Preferences.toBool?4(value) eric5.Preferences.toByteArray?4(value) eric5.Preferences.toDict?4(value) @@ -4571,58 +4571,58 @@ eric5.Project.AddDirectoryDialog.AddDirectoryDialog.on_sourceDirButton_clicked?4() eric5.Project.AddDirectoryDialog.AddDirectoryDialog.on_sourceDirEdit_textChanged?4(dir) eric5.Project.AddDirectoryDialog.AddDirectoryDialog.on_targetDirButton_clicked?4() -eric5.Project.AddDirectoryDialog.AddDirectoryDialog?1(pro, filter = 'source', parent = None, name = None, startdir = None) +eric5.Project.AddDirectoryDialog.AddDirectoryDialog?1(pro, filter='source', parent=None, name=None, startdir=None) eric5.Project.AddFileDialog.AddFileDialog.getData?4() eric5.Project.AddFileDialog.AddFileDialog.on_sourceFileButton_clicked?4() eric5.Project.AddFileDialog.AddFileDialog.on_sourceFileEdit_textChanged?4(sfile) eric5.Project.AddFileDialog.AddFileDialog.on_targetDirButton_clicked?4() -eric5.Project.AddFileDialog.AddFileDialog?1(pro, parent = None, filter = None, name = None, startdir = None) +eric5.Project.AddFileDialog.AddFileDialog?1(pro, parent=None, filter=None, name=None, startdir=None) eric5.Project.AddFoundFilesDialog.AddFoundFilesDialog.getSelection?4() eric5.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_addAllButton_clicked?4() eric5.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_addSelectedButton_clicked?4() eric5.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_buttonBox_clicked?4(button) -eric5.Project.AddFoundFilesDialog.AddFoundFilesDialog?1(files, parent = None, name = None) +eric5.Project.AddFoundFilesDialog.AddFoundFilesDialog?1(files, parent=None, name=None) eric5.Project.AddLanguageDialog.AddLanguageDialog.getSelectedLanguage?4() -eric5.Project.AddLanguageDialog.AddLanguageDialog?1(parent = None, name = None) +eric5.Project.AddLanguageDialog.AddLanguageDialog?1(parent=None, name=None) eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.initError?4() eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_buttonBox_clicked?4(button) eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_classNameCombo_activated?4(index) eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_clearFilterButton_clicked?4() eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_filterEdit_textChanged?4(text) eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog.on_newButton_clicked?4() -eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog?1(formName, project, parent = None) +eric5.Project.CreateDialogCodeDialog.CreateDialogCodeDialog?1(formName, project, parent=None) eric5.Project.CreateDialogCodeDialog.pyqtSignatureRole?7 eric5.Project.CreateDialogCodeDialog.pythonSignatureRole?7 eric5.Project.CreateDialogCodeDialog.rubySignatureRole?7 eric5.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.on_debugClientButton_clicked?4() eric5.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.on_interpreterButton_clicked?4() eric5.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.storeData?4() -eric5.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog?1(project, parent = None, name = None) +eric5.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog?1(project, parent=None, name=None) eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.on_addAssociationButton_clicked?4() eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.on_deleteAssociationButton_clicked?4() eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.on_filePatternEdit_textChanged?4(txt) eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.on_filetypeAssociationList_currentItemChanged?4(itm, prevItm) eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.transferData?4() -eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog?1(project, parent = None) +eric5.Project.FiletypeAssociationDialog.FiletypeAssociationDialog?1(project, parent=None) eric5.Project.LexerAssociationDialog.LexerAssociationDialog.on_addLexerButton_clicked?4() eric5.Project.LexerAssociationDialog.LexerAssociationDialog.on_deleteLexerButton_clicked?4() eric5.Project.LexerAssociationDialog.LexerAssociationDialog.on_editorLexerCombo_currentIndexChanged?4(text) eric5.Project.LexerAssociationDialog.LexerAssociationDialog.on_editorLexerList_itemActivated?4(itm, column) eric5.Project.LexerAssociationDialog.LexerAssociationDialog.on_editorLexerList_itemClicked?4(itm, column) eric5.Project.LexerAssociationDialog.LexerAssociationDialog.transferData?4() -eric5.Project.LexerAssociationDialog.LexerAssociationDialog?1(project, parent = None) +eric5.Project.LexerAssociationDialog.LexerAssociationDialog?1(project, parent=None) eric5.Project.NewDialogClassDialog.NewDialogClassDialog.getData?4() eric5.Project.NewDialogClassDialog.NewDialogClassDialog.on_classnameEdit_textChanged?4(text) eric5.Project.NewDialogClassDialog.NewDialogClassDialog.on_filenameEdit_textChanged?4(text) eric5.Project.NewDialogClassDialog.NewDialogClassDialog.on_pathButton_clicked?4() eric5.Project.NewDialogClassDialog.NewDialogClassDialog.on_pathnameEdit_textChanged?4(text) -eric5.Project.NewDialogClassDialog.NewDialogClassDialog?1(defaultClassName, defaultFile, defaultPath, parent = None) +eric5.Project.NewDialogClassDialog.NewDialogClassDialog?1(defaultClassName, defaultFile, defaultPath, parent=None) eric5.Project.NewPythonPackageDialog.NewPythonPackageDialog.getData?4() eric5.Project.NewPythonPackageDialog.NewPythonPackageDialog.on_packageEdit_textChanged?4(txt) -eric5.Project.NewPythonPackageDialog.NewPythonPackageDialog?1(relPath, parent = None) -eric5.Project.Project.Project.addDirectory?4(filter = None, startdir = None) +eric5.Project.NewPythonPackageDialog.NewPythonPackageDialog?1(relPath, parent=None) +eric5.Project.Project.Project.addDirectory?4(filter=None, startdir=None) eric5.Project.Project.Project.addE5Actions?4(actions) -eric5.Project.Project.Project.addFiles?4(filter = None, startdir = None) +eric5.Project.Project.Project.addFiles?4(filter=None, startdir=None) eric5.Project.Project.Project.addIdlDir?4() eric5.Project.Project.Project.addIdlFiles?4() eric5.Project.Project.Project.addLanguage?4() @@ -4635,12 +4635,12 @@ eric5.Project.Project.Project.addToOthers?4(fn) eric5.Project.Project.Project.addUiDir?4() eric5.Project.Project.Project.addUiFiles?4() -eric5.Project.Project.Project.appendFile?4(fn, isSourceFile = False, updateModel = True) +eric5.Project.Project.Project.appendFile?4(fn, isSourceFile=False, updateModel=True) eric5.Project.Project.Project.checkDirty?4() eric5.Project.Project.Project.checkLanguageFiles?4() eric5.Project.Project.Project.checkVCSStatus?4() eric5.Project.Project.Project.clearStatusMonitorCachedState?4(name) -eric5.Project.Project.Project.closeProject?4(reopen = False, noSave = False) +eric5.Project.Project.Project.closeProject?4(reopen=False, noSave=False) eric5.Project.Project.Project.completeRepopulateItem?7 eric5.Project.Project.Project.copyDirectory?4(olddn, newdn) eric5.Project.Project.Project.createNewProject?4() @@ -4660,7 +4660,7 @@ eric5.Project.Project.Project.getEolString?4() eric5.Project.Project.Project.getFiles?4(start) eric5.Project.Project.Project.getHash?4() -eric5.Project.Project.Project.getMainScript?4(normalized = False) +eric5.Project.Project.Project.getMainScript?4(normalized=False) eric5.Project.Project.Project.getMenu?4(menuName) eric5.Project.Project.Project.getModel?4() eric5.Project.Project.Project.getMostRecent?4() @@ -4674,7 +4674,7 @@ eric5.Project.Project.Project.getProjectTypes?4() eric5.Project.Project.Project.getRelativePath?4(path) eric5.Project.Project.Project.getRelativeUniversalPath?4(path) -eric5.Project.Project.Project.getSources?4(normalized = False) +eric5.Project.Project.Project.getSources?4(normalized=False) eric5.Project.Project.Project.getStatusMonitorAutoUpdate?4() eric5.Project.Project.Project.getStatusMonitorInterval?4() eric5.Project.Project.Project.getVcs?4() @@ -4686,7 +4686,7 @@ eric5.Project.Project.Project.initFileTypes?4() eric5.Project.Project.Project.initMenu?4() eric5.Project.Project.Project.initToolbar?4(toolbarManager) -eric5.Project.Project.Project.initVCS?4(vcsSystem = None, nooverride = False) +eric5.Project.Project.Project.initVCS?4(vcsSystem=None, nooverride=False) eric5.Project.Project.Project.isDebugPropertiesLoaded?4() eric5.Project.Project.Project.isDirty?4() eric5.Project.Project.Project.isOpen?4() @@ -4701,8 +4701,8 @@ eric5.Project.Project.Project.newProject?7 eric5.Project.Project.Project.newProjectAddFiles?4(mainscript) eric5.Project.Project.Project.newProjectHooks?7 -eric5.Project.Project.Project.openProject?4(fn = None, restoreSession = True, reopen = False) -eric5.Project.Project.Project.othersAdded?4(fn, updateModel = True) +eric5.Project.Project.Project.openProject?4(fn=None, restoreSession=True, reopen=False) +eric5.Project.Project.Project.othersAdded?4(fn, updateModel=True) eric5.Project.Project.Project.prepareRepopulateItem?7 eric5.Project.Project.Project.projectAboutToBeCreated?7 eric5.Project.Project.Project.projectClosed?7 @@ -4724,22 +4724,22 @@ eric5.Project.Project.Project.projectResourceRemoved?7 eric5.Project.Project.Project.projectSourceAdded?7 eric5.Project.Project.Project.projectSourceRemoved?7 -eric5.Project.Project.Project.registerProjectType?4(type_, description, fileTypeCallback = None, binaryTranslationsCallback = None, lexerAssociationCallback = None) +eric5.Project.Project.Project.registerProjectType?4(type_, description, fileTypeCallback=None, binaryTranslationsCallback=None, lexerAssociationCallback=None) eric5.Project.Project.Project.reinitVCS?7 eric5.Project.Project.Project.removeDirectory?4(dn) eric5.Project.Project.Project.removeE5Actions?4(actions) -eric5.Project.Project.Project.removeFile?4(fn, updateModel = True) +eric5.Project.Project.Project.removeFile?4(fn, updateModel=True) eric5.Project.Project.Project.removeLanguageFile?4(langFile) -eric5.Project.Project.Project.renameFile?4(oldfn, newfn = None) -eric5.Project.Project.Project.renameFileInPdata?4(oldname, newname, isSourceFile = False) +eric5.Project.Project.Project.renameFile?4(oldfn, newfn=None) +eric5.Project.Project.Project.renameFileInPdata?4(oldname, newname, isSourceFile=False) eric5.Project.Project.Project.renameMainScript?4(oldfn, newfn) eric5.Project.Project.Project.reopenProject?4() eric5.Project.Project.Project.repopulateItem?4(fullname) -eric5.Project.Project.Project.saveAllScripts?4(reportSyntaxErrors = False) +eric5.Project.Project.Project.saveAllScripts?4(reportSyntaxErrors=False) eric5.Project.Project.Project.saveProject?4() eric5.Project.Project.Project.saveProjectAs?4() eric5.Project.Project.Project.setData?4(category, key, data) -eric5.Project.Project.Project.setDbgInfo?4(argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython = None, autoContinue = None) +eric5.Project.Project.Project.setDbgInfo?4(argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython=None, autoContinue=None) eric5.Project.Project.Project.setDirty?4(b) eric5.Project.Project.Project.setStatusMonitorAutoUpdate?4(auto) eric5.Project.Project.Project.setStatusMonitorInterval?4(interval) @@ -4753,7 +4753,7 @@ eric5.Project.Project.Project.useSystemEol?4() eric5.Project.Project.Project.userKeynames?7 eric5.Project.Project.Project.vcsStatusMonitorStatus?7 -eric5.Project.Project.Project?1(parent = None, filename = None) +eric5.Project.Project.Project?1(parent=None, filename=None) eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._collapseAllDirs?5() eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._completeRepopulateItem?5(name) eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._configure?5() @@ -4772,7 +4772,7 @@ eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._removeDir?5() eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._removeFile?5() eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._renameFile?5() -eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectEntries?5(local = True, filter = None) +eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectEntries?5(local=True, filter=None) eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectSingleItem?5(index) eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._setItemRangeSelected?5(startIndex, endIndex, selected) eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser._setItemSelected?5(index, selected) @@ -4791,13 +4791,13 @@ eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser.selectLocalEntries?4() eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser.selectVCSDirEntries?4() eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser.selectVCSEntries?4() -eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser?1(project, type_, parent = None) +eric5.Project.ProjectBaseBrowser.ProjectBaseBrowser?1(project, type_, parent=None) eric5.Project.ProjectBrowser.ProjectBrowser.getProjectBrowser?4(name) eric5.Project.ProjectBrowser.ProjectBrowser.getProjectBrowsers?4() eric5.Project.ProjectBrowser.ProjectBrowser.handleEditorChanged?4(fn) eric5.Project.ProjectBrowser.ProjectBrowser.handlePreferencesChanged?4() eric5.Project.ProjectBrowser.ProjectBrowser.showEvent?4(evt) -eric5.Project.ProjectBrowser.ProjectBrowser?1(project, parent = None, embeddedBrowser = True) +eric5.Project.ProjectBrowser.ProjectBrowser?1(project, parent=None, embeddedBrowser=True) eric5.Project.ProjectBrowserFlags.AllBrowsersFlag?7 eric5.Project.ProjectBrowserFlags.FormsBrowserFlag?7 eric5.Project.ProjectBrowserFlags.InterfacesBrowserFlag?7 @@ -4805,8 +4805,8 @@ eric5.Project.ProjectBrowserFlags.ResourcesBrowserFlag?7 eric5.Project.ProjectBrowserFlags.SourcesBrowserFlag?7 eric5.Project.ProjectBrowserFlags.TranslationsBrowserFlag?7 -eric5.Project.ProjectBrowserModel.ProjectBrowserDirectoryItem?1(parent, dinfo, projectType, full = True, bold = False) -eric5.Project.ProjectBrowserModel.ProjectBrowserFileItem?1(parent, finfo, projectType, full = True, bold = False, sourceLanguage = "") +eric5.Project.ProjectBrowserModel.ProjectBrowserDirectoryItem?1(parent, dinfo, projectType, full=True, bold=False) +eric5.Project.ProjectBrowserModel.ProjectBrowserFileItem?1(parent, finfo, projectType, full=True, bold=False, sourceLanguage="") eric5.Project.ProjectBrowserModel.ProjectBrowserFormType?7 eric5.Project.ProjectBrowserModel.ProjectBrowserInterfaceType?7 eric5.Project.ProjectBrowserModel.ProjectBrowserItemDirectory?7 @@ -4817,18 +4817,18 @@ eric5.Project.ProjectBrowserModel.ProjectBrowserItemMixin.getTextColor?4() eric5.Project.ProjectBrowserModel.ProjectBrowserItemMixin.setVcsState?4(state) eric5.Project.ProjectBrowserModel.ProjectBrowserItemMixin.setVcsStatus?4(vcsStatus) -eric5.Project.ProjectBrowserModel.ProjectBrowserItemMixin?1(type_, bold = False) +eric5.Project.ProjectBrowserModel.ProjectBrowserItemMixin?1(type_, bold=False) eric5.Project.ProjectBrowserModel.ProjectBrowserItemSimpleDirectory?7 -eric5.Project.ProjectBrowserModel.ProjectBrowserModel.addNewItem?4(typeString, name, additionalTypeStrings = []) +eric5.Project.ProjectBrowserModel.ProjectBrowserModel.addNewItem?4(typeString, name, additionalTypeStrings=[]) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.changeVCSStates?4(statesList) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.data?4(index, role) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.directoryChanged?4(path) -eric5.Project.ProjectBrowserModel.ProjectBrowserModel.findChildItem?4(text, column, parentItem = None) +eric5.Project.ProjectBrowserModel.ProjectBrowserModel.findChildItem?4(text, column, parentItem=None) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.findItem?4(name) -eric5.Project.ProjectBrowserModel.ProjectBrowserModel.findParentItemByName?4(type_, name, dontSplit = False) +eric5.Project.ProjectBrowserModel.ProjectBrowserModel.findParentItemByName?4(type_, name, dontSplit=False) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.itemIndexByName?4(name) -eric5.Project.ProjectBrowserModel.ProjectBrowserModel.populateItem?4(parentItem, repopulate = False) -eric5.Project.ProjectBrowserModel.ProjectBrowserModel.populateProjectDirectoryItem?4(parentItem, repopulate = False) +eric5.Project.ProjectBrowserModel.ProjectBrowserModel.populateItem?4(parentItem, repopulate=False) +eric5.Project.ProjectBrowserModel.ProjectBrowserModel.populateProjectDirectoryItem?4(parentItem, repopulate=False) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.preferencesChanged?4() eric5.Project.ProjectBrowserModel.ProjectBrowserModel.projectClosed?4() eric5.Project.ProjectBrowserModel.ProjectBrowserModel.projectOpened?4() @@ -4836,7 +4836,7 @@ eric5.Project.ProjectBrowserModel.ProjectBrowserModel.removeItem?4(name) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.renameItem?4(name, newFilename) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.repopulateItem?4(name) -eric5.Project.ProjectBrowserModel.ProjectBrowserModel.updateVCSStatus?4(name, recursive = True) +eric5.Project.ProjectBrowserModel.ProjectBrowserModel.updateVCSStatus?4(name, recursive=True) eric5.Project.ProjectBrowserModel.ProjectBrowserModel.vcsStateChanged?7 eric5.Project.ProjectBrowserModel.ProjectBrowserModel?1(parent) eric5.Project.ProjectBrowserModel.ProjectBrowserNoType?7 @@ -4844,13 +4844,13 @@ eric5.Project.ProjectBrowserModel.ProjectBrowserResourceType?7 eric5.Project.ProjectBrowserModel.ProjectBrowserSimpleDirectoryItem.dirName?4() eric5.Project.ProjectBrowserModel.ProjectBrowserSimpleDirectoryItem.lessThan?4(other, column, order) -eric5.Project.ProjectBrowserModel.ProjectBrowserSimpleDirectoryItem.setName?4(dinfo, full = True) -eric5.Project.ProjectBrowserModel.ProjectBrowserSimpleDirectoryItem?1(parent, projectType, text, path = "") +eric5.Project.ProjectBrowserModel.ProjectBrowserSimpleDirectoryItem.setName?4(dinfo, full=True) +eric5.Project.ProjectBrowserModel.ProjectBrowserSimpleDirectoryItem?1(parent, projectType, text, path="") eric5.Project.ProjectBrowserModel.ProjectBrowserSourceType?7 eric5.Project.ProjectBrowserModel.ProjectBrowserTranslationType?7 eric5.Project.ProjectBrowserSortFilterProxyModel.ProjectBrowserSortFilterProxyModel.filterAcceptsRow?4(source_row, source_parent) eric5.Project.ProjectBrowserSortFilterProxyModel.ProjectBrowserSortFilterProxyModel.preferencesChanged?4() -eric5.Project.ProjectBrowserSortFilterProxyModel.ProjectBrowserSortFilterProxyModel?1(filterType, parent = None) +eric5.Project.ProjectBrowserSortFilterProxyModel.ProjectBrowserSortFilterProxyModel?1(filterType, parent=None) eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser._contextMenuRequested?5(coord) eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser._createPopupMenus?5() eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser._initHookMethods?5() @@ -4864,7 +4864,7 @@ eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser.sourceFile?7 eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser.trpreview?7 eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser.uipreview?7 -eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser?1(project, parent = None) +eric5.Project.ProjectFormsBrowser.ProjectFormsBrowser?1(project, parent=None) eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser._contextMenuRequested?5(coord) eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser._createPopupMenus?5() eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser._openItem?5() @@ -4873,7 +4873,7 @@ eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser.closeSourceWindow?7 eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser.showMenu?7 eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser.sourceFile?7 -eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser?1(project, parent = None) +eric5.Project.ProjectInterfacesBrowser.ProjectInterfacesBrowser?1(project, parent=None) eric5.Project.ProjectOthersBrowser.ProjectOthersBrowser._contextMenuRequested?5(coord) eric5.Project.ProjectOthersBrowser.ProjectOthersBrowser._createPopupMenus?5() eric5.Project.ProjectOthersBrowser.ProjectOthersBrowser._editPixmap?5() @@ -4898,7 +4898,7 @@ eric5.Project.ProjectResourcesBrowser.ProjectResourcesBrowser.handlePreferencesChanged?4() eric5.Project.ProjectResourcesBrowser.ProjectResourcesBrowser.showMenu?7 eric5.Project.ProjectResourcesBrowser.ProjectResourcesBrowser.sourceFile?7 -eric5.Project.ProjectResourcesBrowser.ProjectResourcesBrowser?1(project, parent = None) +eric5.Project.ProjectResourcesBrowser.ProjectResourcesBrowser?1(project, parent=None) eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser._contextMenuRequested?5(coord) eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser._createPopupMenus?5() eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser._openItem?5() @@ -4906,7 +4906,7 @@ eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser.closeSourceWindow?7 eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser.showMenu?7 eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser.sourceFile?7 -eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser?1(project, parent = None) +eric5.Project.ProjectSourcesBrowser.ProjectSourcesBrowser?1(project, parent=None) eric5.Project.ProjectTranslationsBrowser.ProjectTranslationsBrowser._contextMenuRequested?5(coord) eric5.Project.ProjectTranslationsBrowser.ProjectTranslationsBrowser._createPopupMenus?5() eric5.Project.ProjectTranslationsBrowser.ProjectTranslationsBrowser._initHookMethods?5() @@ -4927,7 +4927,7 @@ eric5.Project.PropertiesDialog.PropertiesDialog.on_transPropertiesButton_clicked?4() eric5.Project.PropertiesDialog.PropertiesDialog.on_vcsInfoButton_clicked?4() eric5.Project.PropertiesDialog.PropertiesDialog.storeData?4() -eric5.Project.PropertiesDialog.PropertiesDialog?1(project, new = True, parent = None, name = None) +eric5.Project.PropertiesDialog.PropertiesDialog?1(project, new=True, parent=None, name=None) eric5.Project.SpellingPropertiesDialog.SpellingPropertiesDialog.initDialog?4() eric5.Project.SpellingPropertiesDialog.SpellingPropertiesDialog.on_pelButton_clicked?4() eric5.Project.SpellingPropertiesDialog.SpellingPropertiesDialog.on_pwlButton_clicked?4() @@ -4947,7 +4947,7 @@ eric5.Project.TranslationPropertiesDialog.TranslationPropertiesDialog.storeData?4() eric5.Project.TranslationPropertiesDialog.TranslationPropertiesDialog?1(project, new, parent) eric5.Project.UserPropertiesDialog.UserPropertiesDialog.storeData?4() -eric5.Project.UserPropertiesDialog.UserPropertiesDialog?1(project, parent = None, name = None) +eric5.Project.UserPropertiesDialog.UserPropertiesDialog?1(project, parent=None, name=None) eric5.PyUnit.UnittestDialog.QtTestResult.addError?4(test, err) eric5.PyUnit.UnittestDialog.QtTestResult.addFailure?4(test, err) eric5.PyUnit.UnittestDialog.QtTestResult.startTest?4(test) @@ -4967,21 +4967,21 @@ eric5.PyUnit.UnittestDialog.UnittestDialog.testFinished?4() eric5.PyUnit.UnittestDialog.UnittestDialog.testStarted?4(test, doc) eric5.PyUnit.UnittestDialog.UnittestDialog.unittestFile?7 -eric5.PyUnit.UnittestDialog.UnittestDialog?1(prog = None, dbs = None, ui = None, parent = None, name = None) +eric5.PyUnit.UnittestDialog.UnittestDialog?1(prog=None, dbs=None, ui=None, parent=None, name=None) eric5.PyUnit.UnittestDialog.UnittestWindow.eventFilter?4(obj, event) -eric5.PyUnit.UnittestDialog.UnittestWindow?1(prog = None, parent = None) +eric5.PyUnit.UnittestDialog.UnittestWindow?1(prog=None, parent=None) eric5.QScintilla.APIsManager.APIs.apiPreparationCancelled?7 eric5.QScintilla.APIsManager.APIs.apiPreparationFinished?7 eric5.QScintilla.APIsManager.APIs.apiPreparationStarted?7 eric5.QScintilla.APIsManager.APIs.cancelPreparation?4() eric5.QScintilla.APIsManager.APIs.getQsciAPIs?4() eric5.QScintilla.APIsManager.APIs.installedAPIFiles?4() -eric5.QScintilla.APIsManager.APIs.prepareAPIs?4(ondemand = False, rawList = None) +eric5.QScintilla.APIsManager.APIs.prepareAPIs?4(ondemand=False, rawList=None) eric5.QScintilla.APIsManager.APIs.reloadAPIs?4() -eric5.QScintilla.APIsManager.APIs?1(language, forPreparation = False, parent = None) -eric5.QScintilla.APIsManager.APIsManager.getAPIs?4(language, forPreparation = False) +eric5.QScintilla.APIsManager.APIs?1(language, forPreparation=False, parent=None) +eric5.QScintilla.APIsManager.APIsManager.getAPIs?4(language, forPreparation=False) eric5.QScintilla.APIsManager.APIsManager.reloadAPIs?4() -eric5.QScintilla.APIsManager.APIsManager?1(parent = None) +eric5.QScintilla.APIsManager.APIsManager?1(parent=None) eric5.QScintilla.Editor.Editor.AttributeID?7 eric5.QScintilla.Editor.Editor.AttributePrivateID?7 eric5.QScintilla.Editor.Editor.AttributeProtectedID?7 @@ -5002,7 +5002,7 @@ eric5.QScintilla.Editor.Editor.TemplateImageID?7 eric5.QScintilla.Editor.Editor.addClone?4(editor) eric5.QScintilla.Editor.Editor.addedToProject?4() -eric5.QScintilla.Editor.Editor.autoComplete?4(auto = False, context = True) +eric5.QScintilla.Editor.Editor.autoComplete?4(auto=False, context=True) eric5.QScintilla.Editor.Editor.autoCompleteQScintilla?4() eric5.QScintilla.Editor.Editor.autoCompletionAPIsAvailable?7 eric5.QScintilla.Editor.Editor.autoCompletionHook?4() @@ -5014,7 +5014,7 @@ eric5.QScintilla.Editor.Editor.callTip?4() eric5.QScintilla.Editor.Editor.callTipHook?4() eric5.QScintilla.Editor.Editor.canAutoCompleteFromAPIs?4() -eric5.QScintilla.Editor.Editor.cancelSharedEdit?4(send = True) +eric5.QScintilla.Editor.Editor.cancelSharedEdit?4(send=True) eric5.QScintilla.Editor.Editor.captionChanged?7 eric5.QScintilla.Editor.Editor.changeEvent?4(evt) eric5.QScintilla.Editor.Editor.checkDirty?4() @@ -5024,7 +5024,7 @@ eric5.QScintilla.Editor.Editor.clearFlakesWarnings?4() eric5.QScintilla.Editor.Editor.clearSearchIndicators?4() eric5.QScintilla.Editor.Editor.clearSyntaxError?4() -eric5.QScintilla.Editor.Editor.close?4(alsoDelete = False) +eric5.QScintilla.Editor.Editor.close?4(alsoDelete=False) eric5.QScintilla.Editor.Editor.closeIt?4() eric5.QScintilla.Editor.Editor.commentLine?4() eric5.QScintilla.Editor.Editor.commentLineOrSelection?4() @@ -5059,18 +5059,18 @@ eric5.QScintilla.Editor.Editor.getFileTypeByFlag?4() eric5.QScintilla.Editor.Editor.getFlakesWarnings?4() eric5.QScintilla.Editor.Editor.getHighlightPosition?4() -eric5.QScintilla.Editor.Editor.getLanguage?4(normalized = True) +eric5.QScintilla.Editor.Editor.getLanguage?4(normalized=True) eric5.QScintilla.Editor.Editor.getLexer?4() eric5.QScintilla.Editor.Editor.getMenu?4(menuName) eric5.QScintilla.Editor.Editor.getNoName?4() -eric5.QScintilla.Editor.Editor.getSearchText?4(selectionOnly = False) +eric5.QScintilla.Editor.Editor.getSearchText?4(selectionOnly=False) eric5.QScintilla.Editor.Editor.getSharingStatus?4() eric5.QScintilla.Editor.Editor.getSyntaxErrors?4() -eric5.QScintilla.Editor.Editor.getWord?4(line, index, direction = 0, useWordChars = True) -eric5.QScintilla.Editor.Editor.getWordBoundaries?4(line, index, useWordChars = True) +eric5.QScintilla.Editor.Editor.getWord?4(line, index, direction=0, useWordChars=True) +eric5.QScintilla.Editor.Editor.getWordBoundaries?4(line, index, useWordChars=True) eric5.QScintilla.Editor.Editor.getWordLeft?4(line, index) eric5.QScintilla.Editor.Editor.getWordRight?4(line, index) -eric5.QScintilla.Editor.Editor.gotoLine?4(line, pos = 1) +eric5.QScintilla.Editor.Editor.gotoLine?4(line, pos=1) eric5.QScintilla.Editor.Editor.gotoSyntaxError?4() eric5.QScintilla.Editor.Editor.handleMonospacedEnable?4() eric5.QScintilla.Editor.Editor.handleRenamed?4(fn) @@ -5081,7 +5081,7 @@ eric5.QScintilla.Editor.Editor.hasMiniMenu?4() eric5.QScintilla.Editor.Editor.hasSyntaxErrors?4() eric5.QScintilla.Editor.Editor.hasTaskMarkers?4() -eric5.QScintilla.Editor.Editor.highlight?4(line = None, error = False, syntaxError = False) +eric5.QScintilla.Editor.Editor.highlight?4(line=None, error=False, syntaxError=False) eric5.QScintilla.Editor.Editor.highlightVisible?4() eric5.QScintilla.Editor.Editor.indentLineOrSelection?4() eric5.QScintilla.Editor.Editor.isPy2File?4() @@ -5097,7 +5097,7 @@ eric5.QScintilla.Editor.Editor.macroRecordingStop?4() eric5.QScintilla.Editor.Editor.macroRun?4() eric5.QScintilla.Editor.Editor.macroSave?4() -eric5.QScintilla.Editor.Editor.menuEditBreakpoint?4(line = None) +eric5.QScintilla.Editor.Editor.menuEditBreakpoint?4(line=None) eric5.QScintilla.Editor.Editor.menuNextBreakpoint?4() eric5.QScintilla.Editor.Editor.menuPreviousBreakpoint?4() eric5.QScintilla.Editor.Editor.menuToggleBookmark?4() @@ -5116,7 +5116,7 @@ eric5.QScintilla.Editor.Editor.printFile?4() eric5.QScintilla.Editor.Editor.printPreviewFile?4() eric5.QScintilla.Editor.Editor.projectLexerAssociationsChanged?4() -eric5.QScintilla.Editor.Editor.readFile?4(fn, createIt = False) +eric5.QScintilla.Editor.Editor.readFile?4(fn, createIt=False) eric5.QScintilla.Editor.Editor.readSettings?4() eric5.QScintilla.Editor.Editor.receive?4(command) eric5.QScintilla.Editor.Editor.redo?4() @@ -5124,8 +5124,8 @@ eric5.QScintilla.Editor.Editor.refresh?4() eric5.QScintilla.Editor.Editor.removeClone?4(editor) eric5.QScintilla.Editor.Editor.revertToUnmodified?4() -eric5.QScintilla.Editor.Editor.saveFile?4(saveas = False, path = None) -eric5.QScintilla.Editor.Editor.saveFileAs?4(path = None, toProject = False) +eric5.QScintilla.Editor.Editor.saveFile?4(saveas=False, path=None) +eric5.QScintilla.Editor.Editor.saveFileAs?4(path=None, toProject=False) eric5.QScintilla.Editor.Editor.selectCurrentWord?4() eric5.QScintilla.Editor.Editor.selectWord?4(line, index) eric5.QScintilla.Editor.Editor.sendSharedEdit?4() @@ -5133,7 +5133,7 @@ eric5.QScintilla.Editor.Editor.setAutoCompletionHook?4(func) eric5.QScintilla.Editor.Editor.setAutoSpellChecking?4() eric5.QScintilla.Editor.Editor.setCallTipHook?4(func) -eric5.QScintilla.Editor.Editor.setLanguage?4(filename, initTextDisplay = True, propagate = True, pyname = "") +eric5.QScintilla.Editor.Editor.setLanguage?4(filename, initTextDisplay=True, propagate=True, pyname="") eric5.QScintilla.Editor.Editor.setMonospaced?4(on) eric5.QScintilla.Editor.Editor.setNoName?4(noName) eric5.QScintilla.Editor.Editor.setSearchIndicator?4(startPos, indicLength) @@ -5151,8 +5151,8 @@ eric5.QScintilla.Editor.Editor.syntaxerrorToggled?7 eric5.QScintilla.Editor.Editor.taskMarkersUpdated?7 eric5.QScintilla.Editor.Editor.toggleBookmark?4(line) -eric5.QScintilla.Editor.Editor.toggleFlakesWarning?4(line, warning, msg = "") -eric5.QScintilla.Editor.Editor.toggleSyntaxError?4(line, index, error, msg = "", show = False) +eric5.QScintilla.Editor.Editor.toggleFlakesWarning?4(line, warning, msg="") +eric5.QScintilla.Editor.Editor.toggleSyntaxError?4(line, index, error, msg="", show=False) eric5.QScintilla.Editor.Editor.uncommentLine?4() eric5.QScintilla.Editor.Editor.uncommentLineOrSelection?4() eric5.QScintilla.Editor.Editor.uncommentSelection?4() @@ -5162,20 +5162,20 @@ eric5.QScintilla.Editor.Editor.unsetAutoCompletionHook?4() eric5.QScintilla.Editor.Editor.unsetCallTipHook?4() eric5.QScintilla.Editor.Editor.writeFile?4(fn) -eric5.QScintilla.Editor.Editor?1(dbs, fn = None, vm = None, filetype = "", editor = None, tv = None) +eric5.QScintilla.Editor.Editor?1(dbs, fn=None, vm=None, filetype="", editor=None, tv=None) eric5.QScintilla.Editor.EditorAutoCompletionListID?7 eric5.QScintilla.Editor.TemplateCompletionListID?7 eric5.QScintilla.Exporters.ExporterBase.ExporterBase._getFileName?5(filter) eric5.QScintilla.Exporters.ExporterBase.ExporterBase.exportSource?4() -eric5.QScintilla.Exporters.ExporterBase.ExporterBase?1(editor, parent = None) +eric5.QScintilla.Exporters.ExporterBase.ExporterBase?1(editor, parent=None) eric5.QScintilla.Exporters.ExporterHTML.ExporterHTML.exportSource?4() -eric5.QScintilla.Exporters.ExporterHTML.ExporterHTML?1(editor, parent = None) -eric5.QScintilla.Exporters.ExporterHTML.HTMLGenerator.generate?4(tabSize = 4, useTabs = False, wysiwyg = True, folding = False, onlyStylesUsed = False, titleFullPath = False) +eric5.QScintilla.Exporters.ExporterHTML.ExporterHTML?1(editor, parent=None) +eric5.QScintilla.Exporters.ExporterHTML.HTMLGenerator.generate?4(tabSize=4, useTabs=False, wysiwyg=True, folding=False, onlyStylesUsed=False, titleFullPath=False) eric5.QScintilla.Exporters.ExporterHTML.HTMLGenerator?1(editor) eric5.QScintilla.Exporters.ExporterODT.ExporterODT.exportSource?4() -eric5.QScintilla.Exporters.ExporterODT.ExporterODT?1(editor, parent = None) +eric5.QScintilla.Exporters.ExporterODT.ExporterODT?1(editor, parent=None) eric5.QScintilla.Exporters.ExporterPDF.ExporterPDF.exportSource?4() -eric5.QScintilla.Exporters.ExporterPDF.ExporterPDF?1(editor, parent = None) +eric5.QScintilla.Exporters.ExporterPDF.ExporterPDF?1(editor, parent=None) eric5.QScintilla.Exporters.ExporterPDF.PDFObjectTracker.add?4(objectData) eric5.QScintilla.Exporters.ExporterPDF.PDFObjectTracker.write?4(objectData) eric5.QScintilla.Exporters.ExporterPDF.PDFObjectTracker.xref?4() @@ -5227,14 +5227,14 @@ eric5.QScintilla.Exporters.ExporterRTF.ExporterRTF.RTF_SETFONTSIZE?7 eric5.QScintilla.Exporters.ExporterRTF.ExporterRTF.RTF_TAB?7 eric5.QScintilla.Exporters.ExporterRTF.ExporterRTF.exportSource?4() -eric5.QScintilla.Exporters.ExporterRTF.ExporterRTF?1(editor, parent = None) +eric5.QScintilla.Exporters.ExporterRTF.ExporterRTF?1(editor, parent=None) eric5.QScintilla.Exporters.ExporterTEX.ExporterTEX.CHARZ?7 eric5.QScintilla.Exporters.ExporterTEX.ExporterTEX.exportSource?4() -eric5.QScintilla.Exporters.ExporterTEX.ExporterTEX?1(editor, parent = None) +eric5.QScintilla.Exporters.ExporterTEX.ExporterTEX?1(editor, parent=None) eric5.QScintilla.Exporters.getExporter?4(format, editor) eric5.QScintilla.Exporters.getSupportedFormats?4() eric5.QScintilla.GotoDialog.GotoDialog.getLinenumber?4() -eric5.QScintilla.GotoDialog.GotoDialog?1(maximum, parent, name = None, modal = False) +eric5.QScintilla.GotoDialog.GotoDialog?1(maximum, parent, name=None, modal=False) eric5.QScintilla.Lexers.Lexer.Lexer.alwaysKeepTabs?4() eric5.QScintilla.Lexers.Lexer.Lexer.autoCompletionWordSeparators?4() eric5.QScintilla.Lexers.Lexer.Lexer.boxCommentStr?4() @@ -5255,7 +5255,7 @@ eric5.QScintilla.Lexers.LexerBash.LexerBash.initProperties?4() eric5.QScintilla.Lexers.LexerBash.LexerBash.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerBash.LexerBash.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerBash.LexerBash?1(parent = None) +eric5.QScintilla.Lexers.LexerBash.LexerBash?1(parent=None) eric5.QScintilla.Lexers.LexerBatch.LexerBatch.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerBatch.LexerBatch.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerBatch.LexerBatch.isStringStyle?4(style) @@ -5270,7 +5270,7 @@ eric5.QScintilla.Lexers.LexerCPP.LexerCPP.initProperties?4() eric5.QScintilla.Lexers.LexerCPP.LexerCPP.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerCPP.LexerCPP.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerCPP.LexerCPP?1(parent=None, caseInsensitiveKeywords = False) +eric5.QScintilla.Lexers.LexerCPP.LexerCPP?1(parent=None, caseInsensitiveKeywords=False) eric5.QScintilla.Lexers.LexerCSS.LexerCSS.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerCSS.LexerCSS.initProperties?4() eric5.QScintilla.Lexers.LexerCSS.LexerCSS.isCommentStyle?4(style) @@ -5286,7 +5286,7 @@ eric5.QScintilla.Lexers.LexerContainer.LexerContainer.lexer?4() eric5.QScintilla.Lexers.LexerContainer.LexerContainer.styleBitsNeeded?4() eric5.QScintilla.Lexers.LexerContainer.LexerContainer.styleText?4(start, end) -eric5.QScintilla.Lexers.LexerContainer.LexerContainer?1(parent = None) +eric5.QScintilla.Lexers.LexerContainer.LexerContainer?1(parent=None) eric5.QScintilla.Lexers.LexerD.LexerD.autoCompletionWordSeparators?4() eric5.QScintilla.Lexers.LexerD.LexerD.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerD.LexerD.initProperties?4() @@ -5302,13 +5302,13 @@ eric5.QScintilla.Lexers.LexerFortran.LexerFortran.initProperties?4() eric5.QScintilla.Lexers.LexerFortran.LexerFortran.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerFortran.LexerFortran.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerFortran.LexerFortran?1(parent = None) +eric5.QScintilla.Lexers.LexerFortran.LexerFortran?1(parent=None) eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77.autoCompletionWordSeparators?4() eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77.initProperties?4() eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77?1(parent = None) +eric5.QScintilla.Lexers.LexerFortran77.LexerFortran77?1(parent=None) eric5.QScintilla.Lexers.LexerHTML.LexerHTML.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerHTML.LexerHTML.initProperties?4() eric5.QScintilla.Lexers.LexerHTML.LexerHTML.isCommentStyle?4(style) @@ -5349,7 +5349,7 @@ eric5.QScintilla.Lexers.LexerPascal.LexerPascal.initProperties?4() eric5.QScintilla.Lexers.LexerPascal.LexerPascal.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerPascal.LexerPascal.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerPascal.LexerPascal?1(parent = None) +eric5.QScintilla.Lexers.LexerPascal.LexerPascal?1(parent=None) eric5.QScintilla.Lexers.LexerPerl.LexerPerl.autoCompletionWordSeparators?4() eric5.QScintilla.Lexers.LexerPerl.LexerPerl.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerPerl.LexerPerl.initProperties?4() @@ -5360,7 +5360,7 @@ eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.initProperties?4() eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript?1(parent = None) +eric5.QScintilla.Lexers.LexerPostScript.LexerPostScript?1(parent=None) eric5.QScintilla.Lexers.LexerProperties.LexerProperties.defaultKeywords?4(kwSet) eric5.QScintilla.Lexers.LexerProperties.LexerProperties.initProperties?4() eric5.QScintilla.Lexers.LexerProperties.LexerProperties.isCommentStyle?4(style) @@ -5379,7 +5379,7 @@ eric5.QScintilla.Lexers.LexerPygments.LexerPygments.name?4() eric5.QScintilla.Lexers.LexerPygments.LexerPygments.styleBitsNeeded?4() eric5.QScintilla.Lexers.LexerPygments.LexerPygments.styleText?4(start, end) -eric5.QScintilla.Lexers.LexerPygments.LexerPygments?1(parent = None, name = "") +eric5.QScintilla.Lexers.LexerPygments.LexerPygments?1(parent=None, name="") eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_INSERTED?7 eric5.QScintilla.Lexers.LexerPygments.PYGMENTS_PUNCTUATION?7 eric5.QScintilla.Lexers.LexerPygments.TOKEN_MAP?7 @@ -5390,7 +5390,7 @@ eric5.QScintilla.Lexers.LexerPython.LexerPython.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerPython.LexerPython.isStringStyle?4(style) eric5.QScintilla.Lexers.LexerPython.LexerPython.language?4() -eric5.QScintilla.Lexers.LexerPython.LexerPython?1(variant = "", parent = None) +eric5.QScintilla.Lexers.LexerPython.LexerPython?1(variant="", parent=None) eric5.QScintilla.Lexers.LexerRegistry?7 eric5.QScintilla.Lexers.LexerRuby.LexerRuby.autoCompletionWordSeparators?4() eric5.QScintilla.Lexers.LexerRuby.LexerRuby.defaultKeywords?4(kwSet) @@ -5425,13 +5425,13 @@ eric5.QScintilla.Lexers.LexerYAML.LexerYAML.initProperties?4() eric5.QScintilla.Lexers.LexerYAML.LexerYAML.isCommentStyle?4(style) eric5.QScintilla.Lexers.LexerYAML.LexerYAML.isStringStyle?4(style) -eric5.QScintilla.Lexers.LexerYAML.LexerYAML?1(parent = None) +eric5.QScintilla.Lexers.LexerYAML.LexerYAML?1(parent=None) eric5.QScintilla.Lexers.getDefaultLexerAssociations?4() -eric5.QScintilla.Lexers.getLexer?4(language, parent = None, pyname = "") -eric5.QScintilla.Lexers.getOpenFileFiltersList?4(includeAll = False, asString = False, withAdditional = True) -eric5.QScintilla.Lexers.getSaveFileFiltersList?4(includeAll = False, asString = False, withAdditional = True) +eric5.QScintilla.Lexers.getLexer?4(language, parent=None, pyname="") +eric5.QScintilla.Lexers.getOpenFileFiltersList?4(includeAll=False, asString=False, withAdditional=True) +eric5.QScintilla.Lexers.getSaveFileFiltersList?4(includeAll=False, asString=False, withAdditional=True) eric5.QScintilla.Lexers.getSupportedLanguages?4() -eric5.QScintilla.Lexers.registerLexer?4(name, displayString, filenameSample, getLexerFunc, openFilters = [], saveFilters = [], defaultAssocs = []) +eric5.QScintilla.Lexers.registerLexer?4(name, displayString, filenameSample, getLexerFunc, openFilters=[], saveFilters=[], defaultAssocs=[]) eric5.QScintilla.Lexers.unregisterLexer?4(name) eric5.QScintilla.MiniEditor.MiniEditor.activeWindow?4() eric5.QScintilla.MiniEditor.MiniEditor.clearSearchIndicators?4() @@ -5440,17 +5440,17 @@ eric5.QScintilla.MiniEditor.MiniEditor.getFileName?4() eric5.QScintilla.MiniEditor.MiniEditor.getLanguage?4() eric5.QScintilla.MiniEditor.MiniEditor.getSRHistory?4(key) -eric5.QScintilla.MiniEditor.MiniEditor.setLanguage?4(filename, initTextDisplay = True, pyname = "") +eric5.QScintilla.MiniEditor.MiniEditor.setLanguage?4(filename, initTextDisplay=True, pyname="") eric5.QScintilla.MiniEditor.MiniEditor.setSearchIndicator?4(startPos, indicLength) -eric5.QScintilla.MiniEditor.MiniEditor.setText?4(txt, filetype = None) +eric5.QScintilla.MiniEditor.MiniEditor.setText?4(txt, filetype=None) eric5.QScintilla.MiniEditor.MiniEditor.textForFind?4() -eric5.QScintilla.MiniEditor.MiniEditor?1(filename = "", filetype = "", parent = None, name = None) +eric5.QScintilla.MiniEditor.MiniEditor?1(filename="", filetype="", parent=None, name=None) eric5.QScintilla.MiniEditor.MiniScintilla.focusInEvent?4(event) eric5.QScintilla.MiniEditor.MiniScintilla.focusOutEvent?4(event) eric5.QScintilla.MiniEditor.MiniScintilla.getFileName?4() -eric5.QScintilla.MiniEditor.MiniScintilla?1(parent = None) +eric5.QScintilla.MiniEditor.MiniScintilla?1(parent=None) eric5.QScintilla.Printer.Printer.formatPage?4(painter, drawing, area, pagenr) -eric5.QScintilla.Printer.Printer?1(mode = QPrinter.ScreenResolution) +eric5.QScintilla.Printer.Printer?1(mode=QPrinter.ScreenResolution) eric5.QScintilla.QsciScintillaCompat.QSCINTILLA_VERSION?4() eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.ArrowFoldStyle?7 eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.ArrowTreeFoldStyle?7 @@ -5481,7 +5481,7 @@ eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionToEOL?4() eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordLeft?4() eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordRight?4() -eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline = -1, begindex = -1, endline = -1, endindex = -1, ws_ = False) +eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findNextTarget?4() eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.focusOutEvent?4(event) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.foldExpandedAt?4(line) @@ -5520,20 +5520,20 @@ eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setCursorFlashTime?4(time) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setEolModeByEolString?4(eolStr) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setFoldMarkersColors?4(foreColor, backColor) -eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setFolding?4(style, margin = 2) +eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setFolding?4(style, margin=2) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setIndentationGuideView?4(view) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setIndicator?4(indicator, sline, sindex, eline, eindex) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setIndicatorRange?4(indicator, spos, length) -eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setLexer?4(lex = None) +eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setLexer?4(lex=None) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyleBits?4(bits) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(id, lst) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.styleAt?4(pos) -eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomIn?4(zoom = 1) -eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomOut?4(zoom = 1) +eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomIn?4(zoom=1) +eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomOut?4(zoom=1) eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomTo?4(zoom) -eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat?1(parent = None) +eric5.QScintilla.QsciScintillaCompat.QsciScintillaCompat?1(parent=None) eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.findNext?4() eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.findPrev?4() eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.keyPressEvent?4(event) @@ -5545,9 +5545,9 @@ eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.on_replaceButton_clicked?4() eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.searchListChanged?7 eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.selectionChanged?4() -eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.show?4(text = '') +eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.show?4(text='') eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget.updateSelectionCheckBox?4(editor) -eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget?1(replace, vm, parent = None) +eric5.QScintilla.SearchReplaceWidget.SearchReplaceWidget?1(replace, vm, parent=None) eric5.QScintilla.Shell.Shell.clear?4() eric5.QScintilla.Shell.Shell.closeShell?4() eric5.QScintilla.Shell.Shell.contextMenuEvent?4(ev) @@ -5571,7 +5571,7 @@ eric5.QScintilla.Shell.Shell.reloadHistory?4() eric5.QScintilla.Shell.Shell.saveHistory?4(clientType) eric5.QScintilla.Shell.Shell.setDebuggerUI?4(ui) -eric5.QScintilla.Shell.Shell?1(dbs, vm, parent = None) +eric5.QScintilla.Shell.Shell?1(dbs, vm, parent=None) eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.getHistory?4() eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_copyButton_clicked?4() eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_deleteButton_clicked?4() @@ -5580,33 +5580,33 @@ eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_historyList_itemSelectionChanged?4() eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog.on_reloadButton_clicked?4() eric5.QScintilla.ShellHistoryDialog.ShellHistoryDialog?1(history, vm, shell) -eric5.QScintilla.SpellChecker.SpellChecker._getDict?5(lang, pwl = "", pel = "") +eric5.QScintilla.SpellChecker.SpellChecker._getDict?5(lang, pwl="", pel="") eric5.QScintilla.SpellChecker.SpellChecker._spelling_dict?8 eric5.QScintilla.SpellChecker.SpellChecker._spelling_lang?8 -eric5.QScintilla.SpellChecker.SpellChecker.add?4(word = None) +eric5.QScintilla.SpellChecker.SpellChecker.add?4(word=None) eric5.QScintilla.SpellChecker.SpellChecker.checkCurrentPage?4() eric5.QScintilla.SpellChecker.SpellChecker.checkDocument?4() eric5.QScintilla.SpellChecker.SpellChecker.checkDocumentIncrementally?4() eric5.QScintilla.SpellChecker.SpellChecker.checkLines?4(firstLine, lastLine) eric5.QScintilla.SpellChecker.SpellChecker.checkSelection?4() -eric5.QScintilla.SpellChecker.SpellChecker.checkWord?4(pos, atEnd = False) +eric5.QScintilla.SpellChecker.SpellChecker.checkWord?4(pos, atEnd=False) eric5.QScintilla.SpellChecker.SpellChecker.clearAll?4() eric5.QScintilla.SpellChecker.SpellChecker.getAvailableLanguages?4() eric5.QScintilla.SpellChecker.SpellChecker.getContext?4(wordStart, wordEnd) eric5.QScintilla.SpellChecker.SpellChecker.getError?4() eric5.QScintilla.SpellChecker.SpellChecker.getLanguage?4() eric5.QScintilla.SpellChecker.SpellChecker.getSuggestions?4(word) -eric5.QScintilla.SpellChecker.SpellChecker.ignoreAlways?4(word = None) +eric5.QScintilla.SpellChecker.SpellChecker.ignoreAlways?4(word=None) eric5.QScintilla.SpellChecker.SpellChecker.initCheck?4(startPos, endPos) eric5.QScintilla.SpellChecker.SpellChecker.isAvailable?4() eric5.QScintilla.SpellChecker.SpellChecker.remove?4(word) eric5.QScintilla.SpellChecker.SpellChecker.replace?4(replacement) eric5.QScintilla.SpellChecker.SpellChecker.replaceAlways?4(replacement) eric5.QScintilla.SpellChecker.SpellChecker.setDefaultLanguage?4(language) -eric5.QScintilla.SpellChecker.SpellChecker.setLanguage?4(language, pwl = "", pel = "") +eric5.QScintilla.SpellChecker.SpellChecker.setLanguage?4(language, pwl="", pel="") eric5.QScintilla.SpellChecker.SpellChecker.setMinimumWordSize?4(size) eric5.QScintilla.SpellChecker.SpellChecker.stopIncrementalCheck?4() -eric5.QScintilla.SpellChecker.SpellChecker?1(editor, indicator, defaultLanguage = None, checkRegion = None) +eric5.QScintilla.SpellChecker.SpellChecker?1(editor, indicator, defaultLanguage=None, checkRegion=None) eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog.on_addButton_clicked?4() eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog.on_changeEdit_textChanged?4(text) eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog.on_ignoreAllButton_clicked?4() @@ -5614,7 +5614,7 @@ eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog.on_replaceAllButton_clicked?4() eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog.on_replaceButton_clicked?4() eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog.on_suggestionsList_currentTextChanged?4(currentText) -eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog?1(spellChecker, startPos, endPos, parent = None) +eric5.QScintilla.SpellCheckingDialog.SpellCheckingDialog?1(spellChecker, startPos, endPos, parent=None) eric5.QScintilla.Terminal.Terminal.clear?4() eric5.QScintilla.Terminal.Terminal.closeTerminal?4() eric5.QScintilla.Terminal.Terminal.contextMenuEvent?4(ev) @@ -5629,22 +5629,22 @@ eric5.QScintilla.Terminal.Terminal.mousePressEvent?4(event) eric5.QScintilla.Terminal.Terminal.reloadHistory?4() eric5.QScintilla.Terminal.Terminal.saveHistory?4() -eric5.QScintilla.Terminal.Terminal?1(vm, parent = None) +eric5.QScintilla.Terminal.Terminal?1(vm, parent=None) eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.charAdded?4(charNumber) eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.isEnabled?4() eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.readSettings?4() eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.setEnabled?4(enable) -eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase?1(editor, parent = None) +eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase?1(editor, parent=None) eric5.QScintilla.TypingCompleters.CompleterPython.CompleterPython.charAdded?4(charNumber) eric5.QScintilla.TypingCompleters.CompleterPython.CompleterPython.readSettings?4() -eric5.QScintilla.TypingCompleters.CompleterPython.CompleterPython?1(editor, parent = None) +eric5.QScintilla.TypingCompleters.CompleterPython.CompleterPython?1(editor, parent=None) eric5.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby.charAdded?4(charNumber) eric5.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby.readSettings?4() -eric5.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby?1(editor, parent = None) -eric5.QScintilla.TypingCompleters.getCompleter?4(language, editor, parent = None) +eric5.QScintilla.TypingCompleters.CompleterRuby.CompleterRuby?1(editor, parent=None) +eric5.QScintilla.TypingCompleters.getCompleter?4(language, editor, parent=None) eric5.QScintilla.ZoomDialog.ZoomDialog.getZoomSize?4() -eric5.QScintilla.ZoomDialog.ZoomDialog?1(zoom, parent, name = None, modal = False) -eric5.SqlBrowser.SqlBrowser.SqlBrowser?1(connections = [], parent = None) +eric5.QScintilla.ZoomDialog.ZoomDialog?1(zoom, parent, name=None, modal=False) +eric5.SqlBrowser.SqlBrowser.SqlBrowser?1(connections=[], parent=None) eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.addConnection?4(driver, dbName, user, password, host, port) eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.addConnectionByDialog?4() eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.cCount?7 @@ -5660,24 +5660,24 @@ eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.showTable?4(table) eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.statusMessage?7 eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.updateActions?4() -eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget?1(parent = None) +eric5.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget?1(parent=None) eric5.SqlBrowser.SqlConnectionDialog.SqlConnectionDialog.getData?4() eric5.SqlBrowser.SqlConnectionDialog.SqlConnectionDialog.on_databaseEdit_textChanged?4(p0) eric5.SqlBrowser.SqlConnectionDialog.SqlConnectionDialog.on_databaseFileButton_clicked?4() eric5.SqlBrowser.SqlConnectionDialog.SqlConnectionDialog.on_driverCombo_activated?4(txt) -eric5.SqlBrowser.SqlConnectionDialog.SqlConnectionDialog?1(parent = None) +eric5.SqlBrowser.SqlConnectionDialog.SqlConnectionDialog?1(parent=None) eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.cleared?7 eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.currentDatabase?4() eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.refresh?4() eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.schemaRequested?7 eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.showSchema?4() eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.tableActivated?7 -eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget?1(parent = None) +eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget?1(parent=None) eric5.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog.configureTaskFilter?4(taskFilter) -eric5.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog?1(taskFilter, parent = None) +eric5.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog?1(taskFilter, parent=None) eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.getData?4() eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.setReadOnly?4() -eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog?1(task = None, parent = None, projectOpen = False) +eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog?1(task=None, parent=None, projectOpen=False) eric5.Tasks.TaskViewer.Task.colorizeTask?4() eric5.Tasks.TaskViewer.Task.getFilename?4() eric5.Tasks.TaskViewer.Task.getLineno?4() @@ -5688,7 +5688,7 @@ eric5.Tasks.TaskViewer.Task.setLongText?4(longtext) eric5.Tasks.TaskViewer.Task.setPriority?4(priority) eric5.Tasks.TaskViewer.Task.setProjectTask?4(pt) -eric5.Tasks.TaskViewer.Task?1(description, priority = 1, filename = "", lineno = 0, completed = False, _time = 0, isProjectTask = False, isBugfixTask = False, project = None, longtext = "") +eric5.Tasks.TaskViewer.Task?1(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, project=None, longtext="") eric5.Tasks.TaskViewer.TaskFilter.hasActiveFilter?4() eric5.Tasks.TaskViewer.TaskFilter.setActive?4(enabled) eric5.Tasks.TaskViewer.TaskFilter.setDescriptionFilter?4(filter) @@ -5699,8 +5699,8 @@ eric5.Tasks.TaskViewer.TaskFilter.setTypeFilter?4(type_) eric5.Tasks.TaskViewer.TaskFilter.showTask?4(task) eric5.Tasks.TaskViewer.TaskFilter?1() -eric5.Tasks.TaskViewer.TaskViewer.addFileTask?4(description, filename, lineno, isBugfixTask = False, longtext = "") -eric5.Tasks.TaskViewer.TaskViewer.addTask?4(description, priority = 1, filename = "", lineno = 0, completed = False, _time = 0, isProjectTask = False, isBugfixTask = False, longtext = "") +eric5.Tasks.TaskViewer.TaskViewer.addFileTask?4(description, filename, lineno, isBugfixTask=False, longtext="") +eric5.Tasks.TaskViewer.TaskViewer.addTask?4(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, longtext="") eric5.Tasks.TaskViewer.TaskViewer.clearFileTasks?4(filename) eric5.Tasks.TaskViewer.TaskViewer.clearProjectTasks?4() eric5.Tasks.TaskViewer.TaskViewer.clearTasks?4() @@ -5708,17 +5708,17 @@ eric5.Tasks.TaskViewer.TaskViewer.getGlobalTasks?4() eric5.Tasks.TaskViewer.TaskViewer.getProjectTasks?4() eric5.Tasks.TaskViewer.TaskViewer.handlePreferencesChanged?4() -eric5.Tasks.TaskViewer.TaskViewer.setProjectOpen?4(o = False) +eric5.Tasks.TaskViewer.TaskViewer.setProjectOpen?4(o=False) eric5.Tasks.TaskViewer.TaskViewer?1(parent, project) eric5.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog.getVariables?4() -eric5.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog?1(variables, parent = None) +eric5.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog?1(variables, parent=None) eric5.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.getData?4() eric5.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.keyPressEvent?4(ev) eric5.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.on_helpButton_clicked?4() eric5.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.setSelectedGroup?4(name) -eric5.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog?1(parent, groupMode = False, itm = None) +eric5.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog?1(parent, groupMode=False, itm=None) eric5.Templates.TemplateSingleVariableDialog.TemplateSingleVariableDialog.getVariable?4() -eric5.Templates.TemplateSingleVariableDialog.TemplateSingleVariableDialog?1(variable, parent = None) +eric5.Templates.TemplateSingleVariableDialog.TemplateSingleVariableDialog?1(variable, parent=None) eric5.Templates.TemplateViewer.TemplateEntry.getDescription?4() eric5.Templates.TemplateViewer.TemplateEntry.getExpandedText?4(varDict, indent) eric5.Templates.TemplateViewer.TemplateEntry.getGroupName?4() @@ -5729,7 +5729,7 @@ eric5.Templates.TemplateViewer.TemplateEntry.setName?4(name) eric5.Templates.TemplateViewer.TemplateEntry.setTemplateText?4(templateText) eric5.Templates.TemplateViewer.TemplateEntry?1(parent, name, description, templateText) -eric5.Templates.TemplateViewer.TemplateGroup.addEntry?4(name, description, template, quiet = False) +eric5.Templates.TemplateViewer.TemplateGroup.addEntry?4(name, description, template, quiet=False) eric5.Templates.TemplateViewer.TemplateGroup.getAllEntries?4() eric5.Templates.TemplateViewer.TemplateGroup.getEntry?4(name) eric5.Templates.TemplateViewer.TemplateGroup.getEntryNames?4(beginning) @@ -5740,29 +5740,29 @@ eric5.Templates.TemplateViewer.TemplateGroup.removeEntry?4(name) eric5.Templates.TemplateViewer.TemplateGroup.setLanguage?4(language) eric5.Templates.TemplateViewer.TemplateGroup.setName?4(name) -eric5.Templates.TemplateViewer.TemplateGroup?1(parent, name, language = "All") -eric5.Templates.TemplateViewer.TemplateViewer.addEntry?4(groupName, name, description, template, quiet = False) -eric5.Templates.TemplateViewer.TemplateViewer.addGroup?4(name, language = "All") +eric5.Templates.TemplateViewer.TemplateGroup?1(parent, name, language="All") +eric5.Templates.TemplateViewer.TemplateViewer.addEntry?4(groupName, name, description, template, quiet=False) +eric5.Templates.TemplateViewer.TemplateViewer.addGroup?4(name, language="All") eric5.Templates.TemplateViewer.TemplateViewer.applyNamedTemplate?4(templateName) eric5.Templates.TemplateViewer.TemplateViewer.applyTemplate?4(itm) eric5.Templates.TemplateViewer.TemplateViewer.changeEntry?4(itm, name, groupName, description, template) -eric5.Templates.TemplateViewer.TemplateViewer.changeGroup?4(oldname, newname, language = "All") +eric5.Templates.TemplateViewer.TemplateViewer.changeGroup?4(oldname, newname, language="All") eric5.Templates.TemplateViewer.TemplateViewer.getAllGroups?4() eric5.Templates.TemplateViewer.TemplateViewer.getGroupNames?4() eric5.Templates.TemplateViewer.TemplateViewer.getTemplateNames?4(start) eric5.Templates.TemplateViewer.TemplateViewer.hasTemplate?4(entryName) -eric5.Templates.TemplateViewer.TemplateViewer.readTemplates?4(filename = None) +eric5.Templates.TemplateViewer.TemplateViewer.readTemplates?4(filename=None) eric5.Templates.TemplateViewer.TemplateViewer.removeEntry?4(itm) eric5.Templates.TemplateViewer.TemplateViewer.removeGroup?4(itm) -eric5.Templates.TemplateViewer.TemplateViewer.writeTemplates?4(filename = None) +eric5.Templates.TemplateViewer.TemplateViewer.writeTemplates?4(filename=None) eric5.Templates.TemplateViewer.TemplateViewer?1(parent, viewmanager) eric5.Tools.TRPreviewer.TRPreviewer.closeEvent?4(event) eric5.Tools.TRPreviewer.TRPreviewer.reloadTranslations?4() eric5.Tools.TRPreviewer.TRPreviewer.setTranslation?4(name) eric5.Tools.TRPreviewer.TRPreviewer.show?4() -eric5.Tools.TRPreviewer.TRPreviewer?1(filenames = [], parent = None, name = None) +eric5.Tools.TRPreviewer.TRPreviewer?1(filenames=[], parent=None, name=None) eric5.Tools.TRPreviewer.Translation?1() -eric5.Tools.TRPreviewer.TranslationsDict.add?4(fileName, setTranslation = True) +eric5.Tools.TRPreviewer.TranslationsDict.add?4(fileName, setTranslation=True) eric5.Tools.TRPreviewer.TranslationsDict.hasTranslations?4() eric5.Tools.TRPreviewer.TranslationsDict.loadTransFile?4(transFileName) eric5.Tools.TRPreviewer.TranslationsDict.reload?4() @@ -5778,11 +5778,11 @@ eric5.Tools.TRPreviewer.WidgetArea.rebuildWidgets?7 eric5.Tools.TRPreviewer.WidgetArea.showWindowMenu?4(windowMenu) eric5.Tools.TRPreviewer.WidgetArea.toggleSelectedWidget?4(act) -eric5.Tools.TRPreviewer.WidgetArea?1(parent = None) +eric5.Tools.TRPreviewer.WidgetArea?1(parent=None) eric5.Tools.TRPreviewer.WidgetView.buildWidget?4() eric5.Tools.TRPreviewer.WidgetView.isValid?4() eric5.Tools.TRPreviewer.WidgetView.uiFileName?4() -eric5.Tools.TRPreviewer.WidgetView?1(uiFileName, parent = None, name = None) +eric5.Tools.TRPreviewer.WidgetView?1(uiFileName, parent=None, name=None) eric5.Tools.TRPreviewer.noTranslationName?7 eric5.Tools.TRSingleApplication.SAFile?7 eric5.Tools.TRSingleApplication.SALoadForm?7 @@ -5797,11 +5797,11 @@ eric5.Tools.TrayStarter.TrayStarter?1() eric5.Tools.UIPreviewer.UIPreviewer.eventFilter?4(obj, ev) eric5.Tools.UIPreviewer.UIPreviewer.show?4() -eric5.Tools.UIPreviewer.UIPreviewer?1(filename = None, parent = None, name = None) +eric5.Tools.UIPreviewer.UIPreviewer?1(filename=None, parent=None, name=None) eric5.UI.AuthenticationDialog.AuthenticationDialog.getData?4() eric5.UI.AuthenticationDialog.AuthenticationDialog.setData?4(username, password) eric5.UI.AuthenticationDialog.AuthenticationDialog.shallSave?4() -eric5.UI.AuthenticationDialog.AuthenticationDialog?1(info, username, showSave = False, saveIt = False, parent = None) +eric5.UI.AuthenticationDialog.AuthenticationDialog?1(info, username, showSave=False, saveIt=False, parent=None) eric5.UI.Browser.Browser._contextMenuRequested?5(coord) eric5.UI.Browser.Browser._copyToClipboard?5() eric5.UI.Browser.Browser._editPixmap?5() @@ -5829,7 +5829,7 @@ eric5.UI.Browser.Browser.trpreview?7 eric5.UI.Browser.Browser.unittestOpen?7 eric5.UI.Browser.Browser.wantedItem?4(itm, filter=None) -eric5.UI.Browser.Browser?1(parent = None) +eric5.UI.Browser.Browser?1(parent=None) eric5.UI.BrowserModel.BrowserClassAttributeItem.attributeObject?4() eric5.UI.BrowserModel.BrowserClassAttributeItem.fileName?4() eric5.UI.BrowserModel.BrowserClassAttributeItem.isPublic?4() @@ -5850,8 +5850,8 @@ eric5.UI.BrowserModel.BrowserDirectoryItem.dirName?4() eric5.UI.BrowserModel.BrowserDirectoryItem.lessThan?4(other, column, order) eric5.UI.BrowserModel.BrowserDirectoryItem.name?4() -eric5.UI.BrowserModel.BrowserDirectoryItem.setName?4(dinfo, full = True) -eric5.UI.BrowserModel.BrowserDirectoryItem?1(parent, dinfo, full = True) +eric5.UI.BrowserModel.BrowserDirectoryItem.setName?4(dinfo, full=True) +eric5.UI.BrowserModel.BrowserDirectoryItem?1(parent, dinfo, full=True) eric5.UI.BrowserModel.BrowserFileItem.dirName?4() eric5.UI.BrowserModel.BrowserFileItem.fileExt?4() eric5.UI.BrowserModel.BrowserFileItem.fileName?4() @@ -5870,8 +5870,8 @@ eric5.UI.BrowserModel.BrowserFileItem.lessThan?4(other, column, order) eric5.UI.BrowserModel.BrowserFileItem.moduleName?4() eric5.UI.BrowserModel.BrowserFileItem.name?4() -eric5.UI.BrowserModel.BrowserFileItem.setName?4(finfo, full = True) -eric5.UI.BrowserModel.BrowserFileItem?1(parent, finfo, full = True, sourceLanguage = "") +eric5.UI.BrowserModel.BrowserFileItem.setName?4(finfo, full=True) +eric5.UI.BrowserModel.BrowserFileItem?1(parent, finfo, full=True, sourceLanguage="") eric5.UI.BrowserModel.BrowserItem.appendChild?4(child) eric5.UI.BrowserModel.BrowserItem.child?4(row) eric5.UI.BrowserModel.BrowserItem.childCount?4() @@ -5908,38 +5908,38 @@ eric5.UI.BrowserModel.BrowserModel._addItem?5(itm, parentItem) eric5.UI.BrowserModel.BrowserModel._addWatchedItem?5(itm) eric5.UI.BrowserModel.BrowserModel._removeWatchedItem?5(itm) -eric5.UI.BrowserModel.BrowserModel.addItem?4(itm, parent = QModelIndex()) +eric5.UI.BrowserModel.BrowserModel.addItem?4(itm, parent=QModelIndex()) eric5.UI.BrowserModel.BrowserModel.addTopLevelDir?4(dirname) eric5.UI.BrowserModel.BrowserModel.clear?4() eric5.UI.BrowserModel.BrowserModel.columnCount?4(parent=QModelIndex()) eric5.UI.BrowserModel.BrowserModel.data?4(index, role) eric5.UI.BrowserModel.BrowserModel.directoryChanged?4(path) eric5.UI.BrowserModel.BrowserModel.flags?4(index) -eric5.UI.BrowserModel.BrowserModel.hasChildren?4(parent = QModelIndex()) -eric5.UI.BrowserModel.BrowserModel.headerData?4(section, orientation, role = Qt.DisplayRole) -eric5.UI.BrowserModel.BrowserModel.index?4(row, column, parent = QModelIndex()) +eric5.UI.BrowserModel.BrowserModel.hasChildren?4(parent=QModelIndex()) +eric5.UI.BrowserModel.BrowserModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric5.UI.BrowserModel.BrowserModel.index?4(row, column, parent=QModelIndex()) eric5.UI.BrowserModel.BrowserModel.item?4(index) eric5.UI.BrowserModel.BrowserModel.parent?4(index) -eric5.UI.BrowserModel.BrowserModel.populateClassAttributesItem?4(parentItem, repopulate = False) -eric5.UI.BrowserModel.BrowserModel.populateClassItem?4(parentItem, repopulate = False) -eric5.UI.BrowserModel.BrowserModel.populateDirectoryItem?4(parentItem, repopulate = False) -eric5.UI.BrowserModel.BrowserModel.populateFileItem?4(parentItem, repopulate = False) -eric5.UI.BrowserModel.BrowserModel.populateItem?4(parentItem, repopulate = False) -eric5.UI.BrowserModel.BrowserModel.populateMethodItem?4(parentItem, repopulate = False) -eric5.UI.BrowserModel.BrowserModel.populateSysPathItem?4(parentItem, repopulate = False) +eric5.UI.BrowserModel.BrowserModel.populateClassAttributesItem?4(parentItem, repopulate=False) +eric5.UI.BrowserModel.BrowserModel.populateClassItem?4(parentItem, repopulate=False) +eric5.UI.BrowserModel.BrowserModel.populateDirectoryItem?4(parentItem, repopulate=False) +eric5.UI.BrowserModel.BrowserModel.populateFileItem?4(parentItem, repopulate=False) +eric5.UI.BrowserModel.BrowserModel.populateItem?4(parentItem, repopulate=False) +eric5.UI.BrowserModel.BrowserModel.populateMethodItem?4(parentItem, repopulate=False) +eric5.UI.BrowserModel.BrowserModel.populateSysPathItem?4(parentItem, repopulate=False) eric5.UI.BrowserModel.BrowserModel.programChange?4(dirname) eric5.UI.BrowserModel.BrowserModel.removeToplevelDir?4(index) -eric5.UI.BrowserModel.BrowserModel.rowCount?4(parent = QModelIndex()) +eric5.UI.BrowserModel.BrowserModel.rowCount?4(parent=QModelIndex()) eric5.UI.BrowserModel.BrowserModel.saveToplevelDirs?4() -eric5.UI.BrowserModel.BrowserModel?1(parent = None) +eric5.UI.BrowserModel.BrowserModel?1(parent=None) eric5.UI.BrowserModel.BrowserSysPathItem?1(parent) eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.filterAcceptsRow?4(source_row, source_parent) -eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.hasChildren?4(parent = QModelIndex()) +eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.hasChildren?4(parent=QModelIndex()) eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.item?4(index) eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.lessThan?4(left, right) eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.preferencesChanged?4() eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.sort?4(column, order) -eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel?1(parent = None) +eric5.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel?1(parent=None) eric5.UI.CompareDialog.CompareDialog.on_buttonBox_clicked?4(button) eric5.UI.CompareDialog.CompareDialog.on_diffButton_clicked?4() eric5.UI.CompareDialog.CompareDialog.on_downButton_clicked?4() @@ -5949,12 +5949,12 @@ eric5.UI.CompareDialog.CompareDialog.on_lastButton_clicked?4() eric5.UI.CompareDialog.CompareDialog.on_synchronizeCheckBox_toggled?4(sync) eric5.UI.CompareDialog.CompareDialog.on_upButton_clicked?4() -eric5.UI.CompareDialog.CompareDialog.show?4(filename = None) -eric5.UI.CompareDialog.CompareDialog?1(files = [], parent = None) +eric5.UI.CompareDialog.CompareDialog.show?4(filename=None) +eric5.UI.CompareDialog.CompareDialog?1(files=[], parent=None) eric5.UI.CompareDialog.CompareWindow.eventFilter?4(obj, event) -eric5.UI.CompareDialog.CompareWindow?1(files = [], parent = None) +eric5.UI.CompareDialog.CompareWindow?1(files=[], parent=None) eric5.UI.CompareDialog.removeMarkers?4(line) -eric5.UI.CompareDialog.sbsdiff?4(a, b, linenumberwidth = 4) +eric5.UI.CompareDialog.sbsdiff?4(a, b, linenumberwidth=4) eric5.UI.Config.ToolBarIconSize?7 eric5.UI.DeleteFilesConfirmationDialog.DeleteFilesConfirmationDialog.on_buttonBox_clicked?4(button) eric5.UI.DeleteFilesConfirmationDialog.DeleteFilesConfirmationDialog?1(parent, caption, message, files) @@ -5963,10 +5963,10 @@ eric5.UI.DiffDialog.DiffDialog.on_file1Button_clicked?4() eric5.UI.DiffDialog.DiffDialog.on_file2Button_clicked?4() eric5.UI.DiffDialog.DiffDialog.on_saveButton_clicked?4() -eric5.UI.DiffDialog.DiffDialog.show?4(filename = None) -eric5.UI.DiffDialog.DiffDialog?1(parent = None) +eric5.UI.DiffDialog.DiffDialog.show?4(filename=None) +eric5.UI.DiffDialog.DiffDialog?1(parent=None) eric5.UI.DiffDialog.DiffWindow.eventFilter?4(obj, event) -eric5.UI.DiffDialog.DiffWindow?1(parent = None) +eric5.UI.DiffDialog.DiffWindow?1(parent=None) eric5.UI.DiffDialog.context_diff?4(a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n') eric5.UI.DiffDialog.unified_diff?4(a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n') eric5.UI.EmailDialog.EmailDialog.attachFile?4(fname, deleteFile) @@ -5978,7 +5978,7 @@ eric5.UI.EmailDialog.EmailDialog.on_message_textChanged?4() eric5.UI.EmailDialog.EmailDialog.on_sendButton_clicked?4() eric5.UI.EmailDialog.EmailDialog.on_subject_textChanged?4(txt) -eric5.UI.EmailDialog.EmailDialog?1(mode = "bug", parent = None) +eric5.UI.EmailDialog.EmailDialog?1(mode="bug", parent=None) eric5.UI.EmailDialog._encode_base64?5(msg) eric5.UI.FindFileDialog.FindFileDialog.designerFile?7 eric5.UI.FindFileDialog.FindFileDialog.endRole?7 @@ -5997,10 +5997,10 @@ eric5.UI.FindFileDialog.FindFileDialog.on_replacetextCombo_editTextChanged?4(text) eric5.UI.FindFileDialog.FindFileDialog.replaceRole?7 eric5.UI.FindFileDialog.FindFileDialog.setSearchDirectory?4(searchDir) -eric5.UI.FindFileDialog.FindFileDialog.show?4(txt = "") +eric5.UI.FindFileDialog.FindFileDialog.show?4(txt="") eric5.UI.FindFileDialog.FindFileDialog.sourceFile?7 eric5.UI.FindFileDialog.FindFileDialog.startRole?7 -eric5.UI.FindFileDialog.FindFileDialog?1(project, replaceMode = False, parent=None) +eric5.UI.FindFileDialog.FindFileDialog?1(project, replaceMode=False, parent=None) eric5.UI.FindFileNameDialog.FindFileNameDialog.checkStop?4() eric5.UI.FindFileNameDialog.FindFileNameDialog.designerFile?7 eric5.UI.FindFileNameDialog.FindFileNameDialog.on_buttonBox_clicked?4(button) @@ -6014,7 +6014,7 @@ eric5.UI.FindFileNameDialog.FindFileNameDialog.on_syspathCheckBox_toggled?4(checked) eric5.UI.FindFileNameDialog.FindFileNameDialog.show?4() eric5.UI.FindFileNameDialog.FindFileNameDialog.sourceFile?7 -eric5.UI.FindFileNameDialog.FindFileNameDialog?1(project, parent = None) +eric5.UI.FindFileNameDialog.FindFileNameDialog?1(project, parent=None) eric5.UI.Info.BugAddress?7 eric5.UI.Info.Copyright?7 eric5.UI.Info.FeatureAddress?7 @@ -6024,18 +6024,18 @@ eric5.UI.LogView.LogViewer.appendToStderr?4(txt) eric5.UI.LogView.LogViewer.appendToStdout?4(txt) eric5.UI.LogView.LogViewer.preferencesChanged?4() -eric5.UI.LogView.LogViewer?1(parent = None) +eric5.UI.LogView.LogViewer?1(parent=None) eric5.UI.NumbersWidget.BinaryModel.columnCount?4(parent) -eric5.UI.NumbersWidget.BinaryModel.data?4(index, role = Qt.DisplayRole) +eric5.UI.NumbersWidget.BinaryModel.data?4(index, role=Qt.DisplayRole) eric5.UI.NumbersWidget.BinaryModel.flags?4(index) eric5.UI.NumbersWidget.BinaryModel.getValue?4() -eric5.UI.NumbersWidget.BinaryModel.headerData?4(section, orientation, role = Qt.DisplayRole) +eric5.UI.NumbersWidget.BinaryModel.headerData?4(section, orientation, role=Qt.DisplayRole) eric5.UI.NumbersWidget.BinaryModel.rowCount?4(parent) eric5.UI.NumbersWidget.BinaryModel.setBits?4(bits) eric5.UI.NumbersWidget.BinaryModel.setBitsAndValue?4(bits, value) -eric5.UI.NumbersWidget.BinaryModel.setData?4(index, value, role = Qt.EditRole) +eric5.UI.NumbersWidget.BinaryModel.setData?4(index, value, role=Qt.EditRole) eric5.UI.NumbersWidget.BinaryModel.setValue?4(value) -eric5.UI.NumbersWidget.BinaryModel?1(parent = None) +eric5.UI.NumbersWidget.BinaryModel?1(parent=None) eric5.UI.NumbersWidget.NumbersWidget.insertNumber?7 eric5.UI.NumbersWidget.NumbersWidget.on_binEdit_textChanged?4(txt) eric5.UI.NumbersWidget.NumbersWidget.on_binInButton_clicked?4() @@ -6051,14 +6051,14 @@ eric5.UI.NumbersWidget.NumbersWidget.on_octInButton_clicked?4() eric5.UI.NumbersWidget.NumbersWidget.on_octOutButton_clicked?4() eric5.UI.NumbersWidget.NumbersWidget.on_sizeBox_valueChanged?4(index) -eric5.UI.NumbersWidget.NumbersWidget?1(parent = None) +eric5.UI.NumbersWidget.NumbersWidget?1(parent=None) eric5.UI.PixmapCache.PixmapCache.addSearchPath?4(path) eric5.UI.PixmapCache.PixmapCache.getPixmap?4(key) eric5.UI.PixmapCache.PixmapCache?1() -eric5.UI.PixmapCache.addSearchPath?4(path, cache = pixCache) -eric5.UI.PixmapCache.getIcon?4(key, cache = pixCache) -eric5.UI.PixmapCache.getPixmap?4(key, cache = pixCache) -eric5.UI.PixmapCache.getSymlinkIcon?4(key, cache = pixCache) +eric5.UI.PixmapCache.addSearchPath?4(path, cache=pixCache) +eric5.UI.PixmapCache.getIcon?4(key, cache=pixCache) +eric5.UI.PixmapCache.getPixmap?4(key, cache=pixCache) +eric5.UI.PixmapCache.getSymlinkIcon?4(key, cache=pixCache) eric5.UI.PixmapCache.pixCache?7 eric5.UI.SplashScreen.NoneSplashScreen.clearMessage?4() eric5.UI.SplashScreen.NoneSplashScreen.finish?4(widget) @@ -6068,19 +6068,19 @@ eric5.UI.SplashScreen.SplashScreen.showMessage?4(msg) eric5.UI.SplashScreen.SplashScreen?1() eric5.UI.SymbolsWidget.SymbolsModel.columnCount?4(parent) -eric5.UI.SymbolsWidget.SymbolsModel.data?4(index, role = Qt.DisplayRole) +eric5.UI.SymbolsWidget.SymbolsModel.data?4(index, role=Qt.DisplayRole) eric5.UI.SymbolsWidget.SymbolsModel.getTableBoundaries?4(index) eric5.UI.SymbolsWidget.SymbolsModel.getTableIndex?4() eric5.UI.SymbolsWidget.SymbolsModel.getTableNames?4() -eric5.UI.SymbolsWidget.SymbolsModel.headerData?4(section, orientation, role = Qt.DisplayRole) +eric5.UI.SymbolsWidget.SymbolsModel.headerData?4(section, orientation, role=Qt.DisplayRole) eric5.UI.SymbolsWidget.SymbolsModel.rowCount?4(parent) eric5.UI.SymbolsWidget.SymbolsModel.selectTable?4(index) -eric5.UI.SymbolsWidget.SymbolsModel?1(parent = None) +eric5.UI.SymbolsWidget.SymbolsModel?1(parent=None) eric5.UI.SymbolsWidget.SymbolsWidget.insertSymbol?7 eric5.UI.SymbolsWidget.SymbolsWidget.on_symbolSpinBox_editingFinished?4() eric5.UI.SymbolsWidget.SymbolsWidget.on_symbolsTable_activated?4(index) eric5.UI.SymbolsWidget.SymbolsWidget.on_tableCombo_currentIndexChanged?4(index) -eric5.UI.SymbolsWidget.SymbolsWidget?1(parent = None) +eric5.UI.SymbolsWidget.SymbolsWidget?1(parent=None) eric5.UI.UserInterface.Redirector.appendStderr?7 eric5.UI.UserInterface.Redirector.appendStdout?7 eric5.UI.UserInterface.Redirector.flush?4() @@ -6106,25 +6106,25 @@ eric5.UI.UserInterface.UserInterface.getToolBarIconSize?4() eric5.UI.UserInterface.UserInterface.getToolbar?4(name) eric5.UI.UserInterface.UserInterface.getViewProfile?4() -eric5.UI.UserInterface.UserInterface.launchHelpViewer?4(home, searchWord = None) +eric5.UI.UserInterface.UserInterface.launchHelpViewer?4(home, searchWord=None) eric5.UI.UserInterface.UserInterface.maxFilePathLen?7 eric5.UI.UserInterface.UserInterface.maxMenuFilePathLen?7 eric5.UI.UserInterface.UserInterface.maxSbFilePathLen?7 -eric5.UI.UserInterface.UserInterface.performVersionCheck?4(manual = True, alternative = 0, showVersions = False) +eric5.UI.UserInterface.UserInterface.performVersionCheck?4(manual=True, alternative=0, showVersions=False) eric5.UI.UserInterface.UserInterface.preferencesChanged?7 eric5.UI.UserInterface.UserInterface.processArgs?4(args) eric5.UI.UserInterface.UserInterface.registerToolbar?4(name, text, toolbar) eric5.UI.UserInterface.UserInterface.reloadAPIs?7 -eric5.UI.UserInterface.UserInterface.removeE5Actions?4(actions, type = 'ui') +eric5.UI.UserInterface.UserInterface.removeE5Actions?4(actions, type='ui') eric5.UI.UserInterface.UserInterface.reregisterToolbar?4(name, text) -eric5.UI.UserInterface.UserInterface.setDebugProfile?4(save = True) +eric5.UI.UserInterface.UserInterface.setDebugProfile?4(save=True) eric5.UI.UserInterface.UserInterface.showAvailableVersionsInfo?4() eric5.UI.UserInterface.UserInterface.showEvent?4(evt) eric5.UI.UserInterface.UserInterface.showLogTab?4(tabname) eric5.UI.UserInterface.UserInterface.showMenu?7 -eric5.UI.UserInterface.UserInterface.showPreferences?4(pageName = None) +eric5.UI.UserInterface.UserInterface.showPreferences?4(pageName=None) eric5.UI.UserInterface.UserInterface.unregisterToolbar?4(name) -eric5.UI.UserInterface.UserInterface.versionIsNewer?4(required, snapshot = None) +eric5.UI.UserInterface.UserInterface.versionIsNewer?4(required, snapshot=None) eric5.UI.UserInterface.UserInterface?1(app, locale, splash, plugin, noOpenAtStartup, restartArguments) eric5.Utilities.AutoSaver.AutoSaver.AUTOSAVE_IN?7 eric5.Utilities.AutoSaver.AutoSaver.MAXWAIT?7 @@ -6149,7 +6149,7 @@ eric5.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrVisibilityMixinBase.setProtected?4() eric5.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrVisibilityMixinBase.setPublic?4() eric5.Utilities.ClassBrowsers.ClbrBaseClasses.Coding?1(module, file, lineno, coding) -eric5.Utilities.ClassBrowsers.ClbrBaseClasses.Function?1(module, name, file, lineno, signature = '', separator = ', ') +eric5.Utilities.ClassBrowsers.ClbrBaseClasses.Function?1(module, name, file, lineno, signature='', separator=', ') eric5.Utilities.ClassBrowsers.ClbrBaseClasses.Module?1(module, name, file, lineno) eric5.Utilities.ClassBrowsers.ClbrBaseClasses._ClbrBase?2(module, name, file, lineno) eric5.Utilities.ClassBrowsers.IDL_SOURCE?7 @@ -6157,9 +6157,9 @@ eric5.Utilities.ClassBrowsers.PY_SOURCE?7 eric5.Utilities.ClassBrowsers.RB_SOURCE?7 eric5.Utilities.ClassBrowsers.SUPPORTED_TYPES?7 -eric5.Utilities.ClassBrowsers.find_module?4(name, path, isPyFile = False) +eric5.Utilities.ClassBrowsers.find_module?4(name, path, isPyFile=False) eric5.Utilities.ClassBrowsers.idlclbr.Attribute?1(module, name, file, lineno) -eric5.Utilities.ClassBrowsers.idlclbr.Function?1(module, name, file, lineno, signature = '', separator = ', ') +eric5.Utilities.ClassBrowsers.idlclbr.Function?1(module, name, file, lineno, signature='', separator=', ') eric5.Utilities.ClassBrowsers.idlclbr.Interface?1(module, name, super, file, lineno) eric5.Utilities.ClassBrowsers.idlclbr.Module?1(module, name, file, lineno) eric5.Utilities.ClassBrowsers.idlclbr.SUPPORTED_TYPES?7 @@ -6171,7 +6171,7 @@ eric5.Utilities.ClassBrowsers.idlclbr.readmodule_ex?4(module, path=[]) eric5.Utilities.ClassBrowsers.pyclbr.Attribute?1(module, name, file, lineno) eric5.Utilities.ClassBrowsers.pyclbr.Class?1(module, name, super, file, lineno) -eric5.Utilities.ClassBrowsers.pyclbr.Function?1(module, name, file, lineno, signature = '', separator = ', ') +eric5.Utilities.ClassBrowsers.pyclbr.Function?1(module, name, file, lineno, signature='', separator=', ') eric5.Utilities.ClassBrowsers.pyclbr.Publics?1(module, file, lineno, idents) eric5.Utilities.ClassBrowsers.pyclbr.SUPPORTED_TYPES?7 eric5.Utilities.ClassBrowsers.pyclbr.TABWIDTH?7 @@ -6180,10 +6180,10 @@ eric5.Utilities.ClassBrowsers.pyclbr._getnext?8 eric5.Utilities.ClassBrowsers.pyclbr._indent?5(ws) eric5.Utilities.ClassBrowsers.pyclbr._modules?8 -eric5.Utilities.ClassBrowsers.pyclbr.readmodule_ex?4(module, path=[], inpackage = False, isPyFile = False) +eric5.Utilities.ClassBrowsers.pyclbr.readmodule_ex?4(module, path=[], inpackage=False, isPyFile=False) eric5.Utilities.ClassBrowsers.rbclbr.Attribute?1(module, name, file, lineno) eric5.Utilities.ClassBrowsers.rbclbr.Class?1(module, name, super, file, lineno) -eric5.Utilities.ClassBrowsers.rbclbr.Function?1(module, name, file, lineno, signature = '', separator = ', ') +eric5.Utilities.ClassBrowsers.rbclbr.Function?1(module, name, file, lineno, signature='', separator=', ') eric5.Utilities.ClassBrowsers.rbclbr.Module?1(module, name, file, lineno) eric5.Utilities.ClassBrowsers.rbclbr.SUPPORTED_TYPES?7 eric5.Utilities.ClassBrowsers.rbclbr.VisibilityMixin?1() @@ -6191,9 +6191,9 @@ eric5.Utilities.ClassBrowsers.rbclbr._getnext?8 eric5.Utilities.ClassBrowsers.rbclbr._modules?8 eric5.Utilities.ClassBrowsers.rbclbr.readmodule_ex?4(module, path=[]) -eric5.Utilities.ClassBrowsers.readmodule?4(module, path=[], isPyFile = False) +eric5.Utilities.ClassBrowsers.readmodule?4(module, path=[], isPyFile=False) eric5.Utilities.CodingError?1(coding) -eric5.Utilities.ModuleParser.Attribute?1(module, name, file, lineno, isSignal = False) +eric5.Utilities.ModuleParser.Attribute?1(module, name, file, lineno, isSignal=False) eric5.Utilities.ModuleParser.Class.addAttribute?4(name, attr) eric5.Utilities.ModuleParser.Class.addDescription?4(description) eric5.Utilities.ModuleParser.Class.addGlobal?4(name, attr) @@ -6203,7 +6203,7 @@ eric5.Utilities.ModuleParser.Class.setEndLine?4(endLineNo) eric5.Utilities.ModuleParser.Class?1(module, name, super, file, lineno) eric5.Utilities.ModuleParser.Function.addDescription?4(description) -eric5.Utilities.ModuleParser.Function?1(module, name, file, lineno, signature = '', pyqtSignature = None) +eric5.Utilities.ModuleParser.Function?1(module, name, file, lineno, signature='', pyqtSignature=None) eric5.Utilities.ModuleParser.Module.addClass?4(name, _class) eric5.Utilities.ModuleParser.Module.addDescription?4(description) eric5.Utilities.ModuleParser.Module.addFunction?4(name, function) @@ -6236,8 +6236,8 @@ eric5.Utilities.ModuleParser._py_getnext?8 eric5.Utilities.ModuleParser._rb_getnext?8 eric5.Utilities.ModuleParser.find_module?4(name, path, extensions) -eric5.Utilities.ModuleParser.readModule?4(module, path = [], inpackage = False, basename = "", extensions = None, caching = True) -eric5.Utilities.ModuleParser.resetParsedModule?4(module, basename = "") +eric5.Utilities.ModuleParser.readModule?4(module, path=[], inpackage=False, basename="", extensions=None, caching=True) +eric5.Utilities.ModuleParser.resetParsedModule?4(module, basename="") eric5.Utilities.ModuleParser.resetParsedModules?4() eric5.Utilities.SingleApplication.SingleApplicationClient.connect?4() eric5.Utilities.SingleApplication.SingleApplicationClient.disconnect?4() @@ -6251,12 +6251,12 @@ eric5.Utilities.Startup.handleArgs?4(argv, appinfo) eric5.Utilities.Startup.initializeResourceSearchPath?4() eric5.Utilities.Startup.loadTranslatorForLocale?4(dirs, tn) -eric5.Utilities.Startup.loadTranslators?4(qtTransDir, app, translationFiles = ()) +eric5.Utilities.Startup.loadTranslators?4(qtTransDir, app, translationFiles=()) eric5.Utilities.Startup.loaded_translators?7 -eric5.Utilities.Startup.makeAppInfo?4(argv, name, arg, description, options = []) +eric5.Utilities.Startup.makeAppInfo?4(argv, name, arg, description, options=[]) eric5.Utilities.Startup.setLibraryPaths?4() -eric5.Utilities.Startup.simpleAppStartup?4(argv, appinfo, mwFactory, quitOnLastWindowClosed = True, app = None) -eric5.Utilities.Startup.usage?4(appinfo, optlen = 12) +eric5.Utilities.Startup.simpleAppStartup?4(argv, appinfo, mwFactory, quitOnLastWindowClosed=True, app=None) +eric5.Utilities.Startup.usage?4(appinfo, optlen=12) eric5.Utilities.Startup.version?4(appinfo) eric5.Utilities._escape?8 eric5.Utilities._escape_map?8 @@ -6265,8 +6265,8 @@ eric5.Utilities.checkBlacklistedVersions?4() eric5.Utilities.codingBytes_regexps?7 eric5.Utilities.coding_regexps?7 -eric5.Utilities.compactPath?4(path, width, measure = len) -eric5.Utilities.compile?4(file, codestring = "") +eric5.Utilities.compactPath?4(path, width, measure=len) +eric5.Utilities.compile?4(file, codestring="") eric5.Utilities.configDir?7 eric5.Utilities.convertLineEnds?4(text, eol) eric5.Utilities.decode?4(text) @@ -6277,13 +6277,13 @@ eric5.Utilities.escape_uentities?4(m) eric5.Utilities.extractFlags?4(text) eric5.Utilities.fromNativeSeparators?4(path) -eric5.Utilities.generateDistroInfo?4(linesep = '\n') -eric5.Utilities.generatePluginsVersionInfo?4(linesep = '\n') +eric5.Utilities.generateDistroInfo?4(linesep='\n') +eric5.Utilities.generatePluginsVersionInfo?4(linesep='\n') eric5.Utilities.generateQtToolName?4(toolname) -eric5.Utilities.generateVersionInfo?4(linesep = '\n') +eric5.Utilities.generateVersionInfo?4(linesep='\n') eric5.Utilities.getConfigDir?4() eric5.Utilities.getDirs?4(path, excludeDirs) -eric5.Utilities.getEnvironmentEntry?4(key, default = None) +eric5.Utilities.getEnvironmentEntry?4(key, default=None) eric5.Utilities.getExecutablePath?4(file) eric5.Utilities.getHomeDir?4() eric5.Utilities.getPercentReplacement?4(code) @@ -6313,7 +6313,7 @@ eric5.Utilities.prepareQtMacBundle?4(toolname, version, args) eric5.Utilities.pwDecode?4(epw) eric5.Utilities.pwEncode?4(pw) -eric5.Utilities.py2compile?4(file, checkFlakes = False) +eric5.Utilities.py2compile?4(file, checkFlakes=False) eric5.Utilities.py3flakes.checker.Binding?1(name, source) eric5.Utilities.py3flakes.checker.Checker.ASSIGN?4(node) eric5.Utilities.py3flakes.checker.Checker.ATTRIBUTES?7 @@ -6344,7 +6344,7 @@ eric5.Utilities.py3flakes.checker.Checker.STARRED?4(node) eric5.Utilities.py3flakes.checker.Checker._runDeferred?5(deferred) eric5.Utilities.py3flakes.checker.Checker.addArgs?4() -eric5.Utilities.py3flakes.checker.Checker.addBinding?4(lineno, value, reportRedef = True) +eric5.Utilities.py3flakes.checker.Checker.addBinding?4(lineno, value, reportRedef=True) eric5.Utilities.py3flakes.checker.Checker.checkUnusedAssignments?4() eric5.Utilities.py3flakes.checker.Checker.check_dead_scopes?4() eric5.Utilities.py3flakes.checker.Checker.collectLoopVars?4() @@ -6365,7 +6365,7 @@ eric5.Utilities.py3flakes.checker.Checker.scope?4() eric5.Utilities.py3flakes.checker.Checker.scope?7 eric5.Utilities.py3flakes.checker.Checker.traceTree?7 -eric5.Utilities.py3flakes.checker.Checker?1(module, filename = '(none)') +eric5.Utilities.py3flakes.checker.Checker?1(module, filename='(none)') eric5.Utilities.py3flakes.checker.ExportBinding.names?4() eric5.Utilities.py3flakes.checker.FunctionScope?1() eric5.Utilities.py3flakes.checker.Importation?1(name, source) @@ -6400,14 +6400,14 @@ eric5.Utilities.py3flakes.messages.UnusedVariable?1(filename, lineno, name) eric5.Utilities.readEncodedFile?4(filename) eric5.Utilities.readEncodedFileWithHash?4(filename) -eric5.Utilities.relpath?4(path, start = os.path.curdir) +eric5.Utilities.relpath?4(path, start=os.path.curdir) eric5.Utilities.samepath?4(f1, f2) eric5.Utilities.setConfigDir?4(d) eric5.Utilities.splitPath?4(name) eric5.Utilities.supportedCodecs?7 eric5.Utilities.toNativeSeparators?4(path) -eric5.Utilities.uic.compileUiDir?4(dir, recurse = False, map = None, **compileUi_args) -eric5.Utilities.uic.compileUiFiles?4(dir, recurse = False) +eric5.Utilities.uic.compileUiDir?4(dir, recurse = False, map = None, ** compileUi_args) +eric5.Utilities.uic.compileUiFiles?4(dir, recurse=False) eric5.Utilities.uic.compile_ui?4(ui_dir, ui_file) eric5.Utilities.uic.pyName?4(py_dir, py_file) eric5.Utilities.win32_GetUserName?4() @@ -6607,8 +6607,8 @@ eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper.showContextMenuDir?4(menu, standardItems) eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper.showContextMenuDirMulti?4(menu, standardItems) eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper.showContextMenuMulti?4(menu, standardItems) -eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None) -eric5.VCS.ProjectHelper.VcsProjectHelper._vcsCheckout?5(export = False) +eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None) +eric5.VCS.ProjectHelper.VcsProjectHelper._vcsCheckout?5(export=False) eric5.VCS.ProjectHelper.VcsProjectHelper._vcsCleanup?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsCommand?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsCommandOptions?5() @@ -6630,7 +6630,7 @@ eric5.VCS.ProjectHelper.VcsProjectHelper.revertChanges?4() eric5.VCS.ProjectHelper.VcsProjectHelper.setObjects?4(vcsObject, projectObject) eric5.VCS.ProjectHelper.VcsProjectHelper.showMenu?4() -eric5.VCS.ProjectHelper.VcsProjectHelper?1(vcsObject, projectObject, parent = None, name = None) +eric5.VCS.ProjectHelper.VcsProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric5.VCS.RepositoryInfoDialog.VcsRepositoryInfoDialog?1(parent, info) eric5.VCS.StatusMonitorLed.StatusMonitorLed._showContextMenu?5(coord) eric5.VCS.StatusMonitorLed.StatusMonitorLed?1(project, parent) @@ -6645,7 +6645,7 @@ eric5.VCS.StatusMonitorThread.VcsStatusMonitorThread.stop?4() eric5.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorData?7 eric5.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorStatus?7 -eric5.VCS.StatusMonitorThread.VcsStatusMonitorThread?1(interval, project, vcs, parent = None) +eric5.VCS.StatusMonitorThread.VcsStatusMonitorThread?1(interval, project, vcs, parent=None) eric5.VCS.VersionControl.VersionControl._createStatusMonitorThread?5(interval, project) eric5.VCS.VersionControl.VersionControl.addArguments?4(args, argslist) eric5.VCS.VersionControl.VersionControl.canBeAdded?7 @@ -6660,16 +6660,16 @@ eric5.VCS.VersionControl.VersionControl.splitPath?4(name) eric5.VCS.VersionControl.VersionControl.splitPathList?4(names) eric5.VCS.VersionControl.VersionControl.startStatusMonitor?4(project) -eric5.VCS.VersionControl.VersionControl.startSynchronizedProcess?4(proc, program, arguments, workingDir = None) +eric5.VCS.VersionControl.VersionControl.startSynchronizedProcess?4(proc, program, arguments, workingDir=None) eric5.VCS.VersionControl.VersionControl.stopStatusMonitor?4() -eric5.VCS.VersionControl.VersionControl.vcsAdd?4(name, isDir = False, noDialog = False) -eric5.VCS.VersionControl.VersionControl.vcsAddBinary?4(name, isDir = False) +eric5.VCS.VersionControl.VersionControl.vcsAdd?4(name, isDir=False, noDialog=False) +eric5.VCS.VersionControl.VersionControl.vcsAddBinary?4(name, isDir=False) eric5.VCS.VersionControl.VersionControl.vcsAddTree?4(path) eric5.VCS.VersionControl.VersionControl.vcsAllRegisteredStates?4(names, dname) -eric5.VCS.VersionControl.VersionControl.vcsCheckout?4(vcsDataDict, projectDir, noDialog = False) +eric5.VCS.VersionControl.VersionControl.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsCleanup?4(name) eric5.VCS.VersionControl.VersionControl.vcsCommandLine?4(name) -eric5.VCS.VersionControl.VersionControl.vcsCommit?4(name, message, noDialog = False) +eric5.VCS.VersionControl.VersionControl.vcsCommit?4(name, message, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsConvertProject?4(vcsDataDict, project) eric5.VCS.VersionControl.VersionControl.vcsDefaultOptions?4() eric5.VCS.VersionControl.VersionControl.vcsDiff?4(name) @@ -6677,19 +6677,19 @@ eric5.VCS.VersionControl.VersionControl.vcsExport?4(vcsDataDict, projectDir) eric5.VCS.VersionControl.VersionControl.vcsGetOptions?4() eric5.VCS.VersionControl.VersionControl.vcsGetOtherData?4() -eric5.VCS.VersionControl.VersionControl.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser = False) +eric5.VCS.VersionControl.VersionControl.vcsGetProjectBrowserHelper?4(browser, project, isTranslationsBrowser=False) eric5.VCS.VersionControl.VersionControl.vcsGetProjectHelper?4(project) eric5.VCS.VersionControl.VersionControl.vcsHistory?4(name) -eric5.VCS.VersionControl.VersionControl.vcsImport?4(vcsDataDict, projectDir, noDialog = False) -eric5.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog = False) +eric5.VCS.VersionControl.VersionControl.vcsImport?4(vcsDataDict, projectDir, noDialog=False) +eric5.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsLog?4(name) eric5.VCS.VersionControl.VersionControl.vcsMerge?4(name) -eric5.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target = None, noDialog = False) +eric5.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target=None, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsName?4() -eric5.VCS.VersionControl.VersionControl.vcsNewProjectOptionsDialog?4(parent = None) -eric5.VCS.VersionControl.VersionControl.vcsOptionsDialog?4(project, archive, editable = False, parent = None) +eric5.VCS.VersionControl.VersionControl.vcsNewProjectOptionsDialog?4(parent=None) +eric5.VCS.VersionControl.VersionControl.vcsOptionsDialog?4(project, archive, editable=False, parent=None) eric5.VCS.VersionControl.VersionControl.vcsRegisteredState?4(name) -eric5.VCS.VersionControl.VersionControl.vcsRemove?4(name, project = False, noDialog = False) +eric5.VCS.VersionControl.VersionControl.vcsRemove?4(name, project=False, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsRepositoryInfos?4(ppath) eric5.VCS.VersionControl.VersionControl.vcsRevert?4(name) eric5.VCS.VersionControl.VersionControl.vcsSetData?4(key, value) @@ -6702,8 +6702,8 @@ eric5.VCS.VersionControl.VersionControl.vcsStatusMonitorStatus?7 eric5.VCS.VersionControl.VersionControl.vcsSwitch?4(name) eric5.VCS.VersionControl.VersionControl.vcsTag?4(name) -eric5.VCS.VersionControl.VersionControl.vcsUpdate?4(name, noDialog = False) -eric5.VCS.VersionControl.VersionControl?1(parent = None, name = None) +eric5.VCS.VersionControl.VersionControl.vcsUpdate?4(name, noDialog=False) +eric5.VCS.VersionControl.VersionControl?1(parent=None, name=None) eric5.VCS.factory?4(vcs) eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.getBookmarkedFiles?4() eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_addButton_clicked?4() @@ -6714,7 +6714,7 @@ eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_fileEdit_textChanged?4(txt) eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_filesList_currentRowChanged?4(row) eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_upButton_clicked?4() -eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog?1(bookmarks, parent = None) +eric5.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog?1(bookmarks, parent=None) eric5.ViewManager.ViewManager.QuickSearchLineEdit.editorCommand?4(cmd) eric5.ViewManager.ViewManager.QuickSearchLineEdit.escPressed?7 eric5.ViewManager.ViewManager.QuickSearchLineEdit.focusInEvent?4(evt) @@ -6722,7 +6722,7 @@ eric5.ViewManager.ViewManager.QuickSearchLineEdit.keyPressEvent?4(evt) eric5.ViewManager.ViewManager.QuickSearchLineEdit.returnPressed?7 eric5.ViewManager.ViewManager.ViewManager._addView?5(win, fn=None, noName="") -eric5.ViewManager.ViewManager.ViewManager._checkActions?5(editor, setSb = True) +eric5.ViewManager.ViewManager.ViewManager._checkActions?5(editor, setSb=True) eric5.ViewManager.ViewManager.ViewManager._getOpenFileFilter?5() eric5.ViewManager.ViewManager.ViewManager._getOpenStartDir?5() eric5.ViewManager.ViewManager.ViewManager._initWindowActions?5() @@ -6745,7 +6745,7 @@ eric5.ViewManager.ViewManager.ViewManager.cascade?4() eric5.ViewManager.ViewManager.ViewManager.checkActions?7 eric5.ViewManager.ViewManager.ViewManager.checkAllDirty?4() -eric5.ViewManager.ViewManager.ViewManager.checkDirty?4(editor, autosave = False) +eric5.ViewManager.ViewManager.ViewManager.checkDirty?4(editor, autosave=False) eric5.ViewManager.ViewManager.ViewManager.cloneEditor?4(caller, filetype, fn) eric5.ViewManager.ViewManager.ViewManager.closeAllWindows?4() eric5.ViewManager.ViewManager.ViewManager.closeCurrentWindow?4() @@ -6766,7 +6766,7 @@ eric5.ViewManager.ViewManager.ViewManager.getAPIsManager?4() eric5.ViewManager.ViewManager.ViewManager.getActions?4(type) eric5.ViewManager.ViewManager.ViewManager.getActiveName?4() -eric5.ViewManager.ViewManager.ViewManager.getEditor?4(fn, filetype = "") +eric5.ViewManager.ViewManager.ViewManager.getEditor?4(fn, filetype="") eric5.ViewManager.ViewManager.ViewManager.getMostRecent?4() eric5.ViewManager.ViewManager.ViewManager.getNumber?4() eric5.ViewManager.ViewManager.ViewManager.getOpenEditor?4(fn) @@ -6793,10 +6793,10 @@ eric5.ViewManager.ViewManager.ViewManager.isConnected?4() eric5.ViewManager.ViewManager.ViewManager.lastEditorClosed?7 eric5.ViewManager.ViewManager.ViewManager.newEditor?4() -eric5.ViewManager.ViewManager.ViewManager.newEditorView?4(fn, caller, filetype = "") +eric5.ViewManager.ViewManager.ViewManager.newEditorView?4(fn, caller, filetype="") eric5.ViewManager.ViewManager.ViewManager.nextSplit?4() -eric5.ViewManager.ViewManager.ViewManager.openFiles?4(prog = None) -eric5.ViewManager.ViewManager.ViewManager.openSourceFile?4(fn, lineno = None, filetype = "", selStart = 0, selEnd = 0, pos = 0) +eric5.ViewManager.ViewManager.ViewManager.openFiles?4(prog=None) +eric5.ViewManager.ViewManager.ViewManager.openSourceFile?4(fn, lineno=None, filetype="", selStart=0, selEnd=0, pos=0) eric5.ViewManager.ViewManager.ViewManager.preferencesChanged?4() eric5.ViewManager.ViewManager.ViewManager.prevSplit?4() eric5.ViewManager.ViewManager.ViewManager.printCurrentEditor?4() @@ -6818,7 +6818,7 @@ eric5.ViewManager.ViewManager.ViewManager.sendSharedEdit?4() eric5.ViewManager.ViewManager.ViewManager.setCooperationClient?4(client) eric5.ViewManager.ViewManager.ViewManager.setEditorName?4(editor, newName) -eric5.ViewManager.ViewManager.ViewManager.setFileLine?4(fn, line, error = False, syntaxError = False) +eric5.ViewManager.ViewManager.ViewManager.setFileLine?4(fn, line, error=False, syntaxError=False) eric5.ViewManager.ViewManager.ViewManager.setReferences?4(ui, dbs) eric5.ViewManager.ViewManager.ViewManager.setSbInfo?4(sbFile, sbLine, sbPos, sbWritable, sbEncoding, sbLanguage, sbEol) eric5.ViewManager.ViewManager.ViewManager.setSplitOrientation?4(orientation) @@ -6828,12 +6828,12 @@ eric5.ViewManager.ViewManager.ViewManager.showWindowMenu?4(windowMenu) eric5.ViewManager.ViewManager.ViewManager.startSharedEdit?4() eric5.ViewManager.ViewManager.ViewManager.syntaxerrorToggled?7 -eric5.ViewManager.ViewManager.ViewManager.textForFind?4(getCurrentWord = True) +eric5.ViewManager.ViewManager.ViewManager.textForFind?4(getCurrentWord=True) eric5.ViewManager.ViewManager.ViewManager.tile?4() -eric5.ViewManager.ViewManager.ViewManager.unhighlight?4(current = False) +eric5.ViewManager.ViewManager.ViewManager.unhighlight?4(current=False) eric5.ViewManager.ViewManager.ViewManager?1() eric5.ViewManager.factory?4(parent, ui, dbs, pluginManager) -eric5.compileUiFiles.compileUiDir?4(dir, recurse = False, map = None, **compileUi_args) +eric5.compileUiFiles.compileUiDir?4(dir, recurse = False, map = None, ** compileUi_args) eric5.compileUiFiles.compileUiFiles?4() eric5.compileUiFiles.compile_ui?4(ui_dir, ui_file) eric5.compileUiFiles.main?4(argv) @@ -6894,12 +6894,12 @@ eric5.install-i18n.main?4(argv) eric5.install-i18n.privateInstall?7 eric5.install-i18n.progName?7 -eric5.install-i18n.usage?4(rcode = 2) +eric5.install-i18n.usage?4(rcode=2) eric5.install.BlackLists?7 eric5.install.apisDir?7 eric5.install.cfg?7 eric5.install.cleanUp?4() -eric5.install.compileUiDir?4(dir, recurse = False, map = None, **compileUi_args) +eric5.install.compileUiDir?4(dir, recurse = False, map = None, ** compileUi_args) eric5.install.compileUiFiles?4() eric5.install.compile_ui?4(ui_dir, ui_file) eric5.install.configLength?7 @@ -6909,12 +6909,12 @@ eric5.install.createConfig?4() eric5.install.createGlobalPluginsDir?4() eric5.install.createInstallConfig?4() -eric5.install.createPyWrapper?4(pydir, wfile, isGuiScript = True) +eric5.install.createPyWrapper?4(pydir, wfile, isGuiScript=True) eric5.install.distDir?7 eric5.install.doCleanup?7 eric5.install.doCompile?7 eric5.install.doDependancyChecks?4() -eric5.install.exit?4(rcode = 0) +eric5.install.exit?4(rcode=0) eric5.install.initGlobals?4() eric5.install.installEric?4() eric5.install.main?4(argv) @@ -6925,17 +6925,17 @@ eric5.install.pyModDir?7 eric5.install.pyName?4(py_dir, py_file) eric5.install.sourceDir?7 -eric5.install.usage?4(rcode = 2) +eric5.install.usage?4(rcode=2) eric5.install.wrapperName?4(dname, wfile) eric5.patch_modpython.initGlobals?4() eric5.patch_modpython.main?4(argv) eric5.patch_modpython.modDir?7 eric5.patch_modpython.progName?7 -eric5.patch_modpython.usage?4(rcode = 2) +eric5.patch_modpython.usage?4(rcode=2) eric5.uninstall.initGlobals?4() eric5.uninstall.main?4(argv) eric5.uninstall.progName?7 eric5.uninstall.pyModDir?7 eric5.uninstall.uninstallEric?4() -eric5.uninstall.usage?4(rcode = 2) +eric5.uninstall.usage?4(rcode=2) eric5.uninstall.wrapperName?4(dname, wfile)
--- a/Cooperation/ChatWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Cooperation/ChatWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,6 +25,7 @@ import Utilities import UI.PixmapCache + class ChatWidget(QWidget, Ui_ChatWidget): """ Class implementing the chat dialog. @@ -46,7 +47,7 @@ sendEdit = pyqtSignal() cancelEdit = pyqtSignal() - def __init__(self, port = -1, parent = None): + def __init__(self, port=-1, parent=None): """ Constructor @@ -176,7 +177,7 @@ QListWidgetItem( UI.PixmapCache.getIcon( - "chatUser{0}.png".format(1 + self.usersList.count() % 6)), + "chatUser{0}.png".format(1 + self.usersList.count() % 6)), nick, self.usersList) if not self.__connected: @@ -468,30 +469,30 @@ self.__chatMenu = QMenu(self) self.__cutChatAct = \ self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut.png"), self.trUtf8("Cut"), self.__cutChat) self.__copyChatAct = \ self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8("Copy"), self.__copyChat) self.__chatMenu.addSeparator() self.__cutAllChatAct = \ self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut.png"), self.trUtf8("Cut all"), self.__cutAllChat) self.__copyAllChatAct = \ self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8("Copy all"), self.__copyAllChat) self.__chatMenu.addSeparator() self.__clearChatAct = \ self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete.png"), self.trUtf8("Clear"), self.__clearChat) self.__chatMenu.addSeparator() self.__saveChatAct = \ self.__chatMenu.addAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8("Save"), self.__saveChat) @pyqtSlot(bool) @@ -547,13 +548,13 @@ self.trUtf8("Save Chat"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) try: - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write(txt) f.close() except IOError as err: @@ -601,15 +602,15 @@ self.__usersMenu = QMenu(self) self.__kickUserAct = \ self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatKickUser.png"), + UI.PixmapCache.getIcon("chatKickUser.png"), self.trUtf8("Kick User"), self.__kickUser) self.__banUserAct = \ self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatBanUser.png"), + UI.PixmapCache.getIcon("chatBanUser.png"), self.trUtf8("Ban User"), self.__banUser) self.__banKickUserAct = \ self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatBanKickUser.png"), + UI.PixmapCache.getIcon("chatBanKickUser.png"), self.trUtf8("Ban and Kick User"), self.__banKickUser) @pyqtSlot(QPoint)
--- a/Cooperation/Connection.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Cooperation/Connection.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,52 +14,53 @@ import Preferences -MaxBufferSize = 1024 * 1024 -TransferTimeout = 30 * 1000 -PongTimeout = 60 * 1000 -PingInterval = 5 * 1000 -SeparatorToken = '|||' +MaxBufferSize = 1024 * 1024 +TransferTimeout = 30 * 1000 +PongTimeout = 60 * 1000 +PingInterval = 5 * 1000 +SeparatorToken = '|||' + class Connection(QTcpSocket): """ Class representing a peer connection. @signal readyForUse() emitted when the connection is ready for use - @signal newMessage(user, message) emitted after a new message has + @signal newMessage(user, message) emitted after a new message has arrived (string, string) @signal getParticipants() emitted after a get participants message has arrived @signal participants(participants) emitted after the list of participants has arrived (list of strings of "host:port") """ - WaitingForGreeting = 0 - ReadingGreeting = 1 - ReadyForUse = 2 + WaitingForGreeting = 0 + ReadingGreeting = 1 + ReadyForUse = 2 - PlainText = 0 - Ping = 1 - Pong = 2 - Greeting = 3 + PlainText = 0 + Ping = 1 + Pong = 2 + Greeting = 3 GetParticipants = 4 - Participants = 5 - Editor = 6 - Undefined = 99 + Participants = 5 + Editor = 6 + Undefined = 99 - ProtocolMessage = "MESSAGE" - ProtocolPing = "PING" - ProtocolPong = "PONG" - ProtocolGreeting = "GREETING" + ProtocolMessage = "MESSAGE" + ProtocolPing = "PING" + ProtocolPong = "PONG" + ProtocolGreeting = "GREETING" ProtocolGetParticipants = "GET_PARTICIPANTS" - ProtocolParticipants = "PARTICIPANTS" - ProtocolEditor = "EDITOR" + ProtocolParticipants = "PARTICIPANTS" + ProtocolEditor = "EDITOR" - readyForUse = pyqtSignal() - newMessage = pyqtSignal(str, str) + readyForUse = pyqtSignal() + newMessage = pyqtSignal(str, str) getParticipants = pyqtSignal() - participants = pyqtSignal(list) - editorCommand = pyqtSignal(str, str, str) - rejected = pyqtSignal(str) + participants = pyqtSignal(list) + editorCommand = pyqtSignal(str, str, str) + rejected = pyqtSignal(str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -157,15 +158,15 @@ return try: - user, serverPort = str(self.__buffer, encoding = "utf-8").split(":") + user, serverPort = str(self.__buffer, encoding="utf-8").split(":") except ValueError: self.abort() return self.__serverPort = int(serverPort) self.__username = "{0}@{1}:{2}".format( - user, - self.peerAddress().toString(), + user, + self.peerAddress().toString(), self.peerPort() ) self.__currentDataType = Connection.Undefined @@ -177,7 +178,7 @@ return bannedName = "{0}@{1}".format( - user, + user, self.peerAddress().toString() ) Preferences.syncPreferences() @@ -190,14 +191,14 @@ if self.__serverPort != self.peerPort() and \ not Preferences.getCooperation("AutoAcceptConnections"): - # don't ask for reverse connections or + # don't ask for reverse connections or # if we shall accept automatically res = E5MessageBox.yesNo(None, self.trUtf8("New Connection"), self.trUtf8("""<p>Accept connection from """ """<strong>{0}@{1}</strong>?</p>""").format( user, self.peerAddress().toString()), - yesDefault = True) + yesDefault=True) if not res: self.abort() return @@ -240,7 +241,7 @@ if self.write(data) == data.size(): self.__isGreetingMessageSent = True - def __readDataIntoBuffer(self, maxSize = MaxBufferSize): + def __readDataIntoBuffer(self, maxSize=MaxBufferSize): """ Private method to read some data into the buffer. @@ -346,7 +347,7 @@ return if self.__currentDataType == Connection.PlainText: - self.newMessage.emit(self.__username, str(self.__buffer, encoding = "utf-8")) + self.newMessage.emit(self.__username, str(self.__buffer, encoding="utf-8")) elif self.__currentDataType == Connection.Ping: self.write("{0}{1}1{1}p".format(Connection.ProtocolPong, SeparatorToken)) elif self.__currentDataType == Connection.Pong: @@ -354,14 +355,14 @@ elif self.__currentDataType == Connection.GetParticipants: self.getParticipants.emit() elif self.__currentDataType == Connection.Participants: - msg = str(self.__buffer, encoding = "utf-8") + msg = str(self.__buffer, encoding="utf-8") if msg == "<empty>": participantsList = [] else: participantsList = msg.split(SeparatorToken) self.participants.emit(participantsList[:]) elif self.__currentDataType == Connection.Editor: - hash, fn, msg = str(self.__buffer, encoding = "utf-8").split(SeparatorToken) + hash, fn, msg = str(self.__buffer, encoding="utf-8").split(SeparatorToken) self.editorCommand.emit(hash, fn, msg) self.__currentDataType = Connection.Undefined @@ -396,7 +397,7 @@ Public method to send an editor command. @param projectHash hash of the project (string) - @param filename project relative universal file name of + @param filename project relative universal file name of the sending editor (string) @param message editor command to be sent (string) """
--- a/Cooperation/CooperationClient.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Cooperation/CooperationClient.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Preferences + class CooperationClient(QObject): """ Class implementing the client of the cooperation package. - @signal newMessage(user, message) emitted after a new message has + @signal newMessage(user, message) emitted after a new message has arrived (string, string) @signal newParticipant(nickname) emitted after a new participant joined (string) @signal participantLeft(nickname) emitted after a participant left (string) @@ -30,14 +31,14 @@ @signal editorCommand(hash, filename, message) emitted when an editor command has been received (string, string, string) """ - newMessage = pyqtSignal(str, str) - newParticipant = pyqtSignal(str) + newMessage = pyqtSignal(str, str) + newParticipant = pyqtSignal(str) participantLeft = pyqtSignal(str) connectionError = pyqtSignal(str) - cannotConnect = pyqtSignal() - editorCommand = pyqtSignal(str, str, str) + cannotConnect = pyqtSignal() + editorCommand = pyqtSignal(str, str, str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -50,7 +51,7 @@ self.__initialConnection = None - envVariables = ["USERNAME.*", "USER.*", "USERDOMAIN.*", + envVariables = ["USERNAME.*", "USER.*", "USERDOMAIN.*", "HOSTNAME.*", "DOMAINNAME.*"] environment = QProcess.systemEnvironment() found = False @@ -99,12 +100,12 @@ @return nick name (string) """ return "{0}@{1}:{2}".format( - self.__username, - QHostInfo.localHostName(), + self.__username, + QHostInfo.localHostName(), self.__server.serverPort() ) - def hasConnection(self, senderIp, senderPort = -1): + def hasConnection(self, senderIp, senderPort=-1): """ Public method to check for an existing connection. @@ -167,7 +168,7 @@ @param connection reference to the new connection (Connection) """ connection.setParent(self) - connection.setGreetingMessage(self.__username, + connection.setGreetingMessage(self.__username, self.__server.serverPort()) connection.error.connect(self.__connectionError) @@ -193,8 +194,8 @@ if socketError != QAbstractSocket.RemoteHostClosedError: if connection.peerPort() != 0: msg = "* {0}:{1}\n{2}\n".format( - connection.peerAddress().toString(), - connection.peerPort(), + connection.peerAddress().toString(), + connection.peerPort(), connection.errorString() ) else: @@ -281,7 +282,7 @@ Public method to send an editor command. @param projectHash hash of the project (string) - @param filename project relative universal file name of + @param filename project relative universal file name of the sending editor (string) @param message editor command to be sent (string) """
--- a/Cooperation/CooperationServer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Cooperation/CooperationServer.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class CooperationServer(QTcpServer): """ Class implementing the cooperation server. @@ -23,7 +24,7 @@ """ newConnection = pyqtSignal(Connection) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -41,7 +42,7 @@ connection.setSocketDescriptor(socketDescriptor) self.newConnection.emit(connection) - def startListening(self, port = -1): + def startListening(self, port=-1): """ Public method to start listening for new connections.
--- a/DataViews/CodeMetrics.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DataViews/CodeMetrics.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,12 +22,13 @@ import Utilities -KEYWORD = token.NT_OFFSET + 1 -COMMENT = tokenize.COMMENT -INDENT = token.INDENT -DEDENT = token.DEDENT -NEWLINE = token.NEWLINE -EMPTY = tokenize.NL +KEYWORD = token.NT_OFFSET + 1 +COMMENT = tokenize.COMMENT +INDENT = token.INDENT +DEDENT = token.DEDENT +NEWLINE = token.NEWLINE +EMPTY = tokenize.NL + class Token(object): """ @@ -41,6 +42,7 @@ """ self.__dict__.update(kw) + class Parser(object): """ Class used to parse the source code of a Python file. @@ -92,11 +94,12 @@ @param scol starting column of the token (int) @param line logical line the token was found (string) """ - self.tokenlist.append(Token(type=toktype, text=toktext, row=srow, + self.tokenlist.append(Token(type=toktype, text=toktext, row=srow, col=scol, line=line)) spacer = ' ' + class SourceStat(object): """ Class used to calculate and store the source code statistics. @@ -105,9 +108,9 @@ """ Constructor """ - self.identifiers = [] # list of identifiers in order of appearance - self.active = [('TOTAL ',-1,0)] # stack of active identifiers and indent levels - self.counters = {} # counters per identifier + self.identifiers = [] # list of identifiers in order of appearance + self.active = [('TOTAL ', -1, 0)] # stack of active identifiers and indent levels + self.counters = {} # counters per identifier self.indent_level = 0 def indent(self, tok): @@ -191,6 +194,7 @@ """ return self.counters.get(id, {}).get(key, 0) + def summarize(total, key, value): """ Module function used to collect overall statistics. @@ -203,8 +207,9 @@ total[key] = total.setdefault(key, 0) + value return value + def analyze(filename, total): - """ + """ Module function used analyze the source of a Python file. @param filename name of the Python file to be analyzed (string) @@ -230,17 +235,17 @@ elif tok.type == COMMENT: stats.inc('comments') elif tok.type == EMPTY: - if parser.tokenlist[idx-1].type == token.OP: + if parser.tokenlist[idx - 1].type == token.OP: stats.inc('nloc') else: stats.inc('empty') - elif tok.type == INDENT: + elif tok.type == INDENT: stats.indent(tok) - elif tok.type == DEDENT: + elif tok.type == DEDENT: stats.dedent(tok) elif tok.type == KEYWORD: if tok.text in ("class", "def"): - stats.push(parser.tokenlist[idx+1].text, tok.row) + stats.push(parser.tokenlist[idx + 1].text, tok.row) # collect overall statistics summarize(total, 'lines', parser.lines) @@ -251,6 +256,7 @@ return stats + def main(): """ Modules main function used when called as a script.
--- a/DataViews/CodeMetricsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DataViews/CodeMetricsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import UI.PixmapCache + class CodeMetricsDialog(QDialog, Ui_CodeMetricsDialog): """ Class implementing a dialog to display the code metrics. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -71,7 +72,7 @@ @return the generated item """ itm = QTreeWidgetItem(parent, strings) - for col in range(1,7): + for col in range(1, 7): itm.setTextAlignment(col, Qt.Alignment(Qt.AlignRight)) return itm @@ -111,7 +112,7 @@ self.__data = self.__project.getData("OTHERTOOLSPARMS", "CodeMetrics") if self.__data is None or "ExcludeFiles" not in self.__data: - self.__data = {"ExcludeFiles" : ""} + self.__data = {"ExcludeFiles": ""} self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) def start(self, fn): @@ -186,11 +187,11 @@ self.__createSummaryItem(self.trUtf8("lines"), loc.toString(total['lines'])) self.__createSummaryItem(self.trUtf8("bytes"), loc.toString(total['bytes'])) self.__createSummaryItem(self.trUtf8("comments"), loc.toString(total['comments'])) - self.__createSummaryItem(self.trUtf8("empty lines"), + self.__createSummaryItem(self.trUtf8("empty lines"), loc.toString(total['empty lines'])) - self.__createSummaryItem(self.trUtf8("non-commentary lines"), + self.__createSummaryItem(self.trUtf8("non-commentary lines"), loc.toString(total['non-commentary lines'])) - self.__createSummaryItem(self.trUtf8("documentation lines"), + self.__createSummaryItem(self.trUtf8("documentation lines"), loc.toString(docstrings)) self.__resizeSummaryColumns() self.__finish()
--- a/DataViews/PyCoverageDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DataViews/PyCoverageDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Utilities from DebugClients.Python3.coverage import coverage + class PyCoverageDialog(QDialog, Ui_PyCoverageDialog): """ Class implementing a dialog to display the collected code coverage data. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -43,10 +44,10 @@ self.excludeList = ['# *pragma[: ]*[nN][oO] *[cC][oO][vV][eE][rR]'] self.__menu = QMenu(self) - self.annotate = self.__menu.addAction(self.trUtf8('Annotate'), + self.annotate = self.__menu.addAction(self.trUtf8('Annotate'), self.__annotate) self.__menu.addAction(self.trUtf8('Annotate all'), self.__annotateAll) - self.__menu.addAction(self.trUtf8('Delete annotated files'), + self.__menu.addAction(self.trUtf8('Delete annotated files'), self.__deleteAnnotated) self.__menu.addSeparator() self.__menu.addAction(self.trUtf8('Erase Coverage Info'), self.__erase) @@ -78,7 +79,7 @@ start = None if ind + 1 >= len(lines): break - i = lines[ind+1] + i = lines[ind + 1] if start: pairs.append((start, end)) @@ -108,11 +109,11 @@ @param missing list of lines without coverage (string) """ itm = QTreeWidgetItem(self.resultList, [ - file, - str(statements), + file, + str(statements), str(executed), - "{0:.0f}%".format(coverage), - excluded, + "{0:.0f}%".format(coverage), + excluded, missing ]) for col in range(1, 4): @@ -144,7 +145,7 @@ self.path = os.path.dirname(cfn) files.sort() - cover = coverage(data_file = self.cfn) + cover = coverage(data_file=self.cfn) cover.use_cache(True) cover.load() @@ -171,7 +172,7 @@ if self.cancelled: return - statements, excluded, missing, readable = cover.analysis2(file)[1:] + statements, excluded, missing, readable = cover.analysis2(file)[1:] readableEx = excluded and self.__format_lines(excluded) or '' n = len(statements) m = n - len(missing) @@ -200,7 +201,7 @@ else: pc = 100.0 itm = QTreeWidgetItem(self.summaryList, [ - str(total_statements), + str(total_statements), str(total_executed), "{0:.0f}%".format(pc) ]) @@ -257,7 +258,7 @@ itm = self.resultList.currentItem() fn = itm.text(0) - cover = coverage(data_file = self.cfn) + cover = coverage(data_file=self.cfn) cover.use_cache(True) cover.exclude(self.excludeList[0]) cover.load() @@ -280,13 +281,13 @@ itm = self.resultList.topLevelItem(index) files.append(itm.text(0)) - cover = coverage(data_file = self.cfn) + cover = coverage(data_file=self.cfn) cover.use_cache(True) cover.exclude(self.excludeList[0]) cover.load() # now process them - progress = QProgressDialog(self.trUtf8("Annotating files..."), + progress = QProgressDialog(self.trUtf8("Annotating files..."), self.trUtf8("Abort"), 0, len(files), self) progress.setMinimumDuration(0) count = 0 @@ -295,7 +296,7 @@ progress.setValue(count) if progress.wasCanceled(): break - cover.annotate([file], None)#, True) + cover.annotate([file], None) # , True) count += 1 progress.setValue(len(files)) @@ -307,7 +308,7 @@ This method erases the collected coverage data that is stored in the .coverage file. """ - cover = coverage(data_file = self.cfn) + cover = coverage(data_file=self.cfn) cover.use_cache(True) cover.load() cover.erase()
--- a/DataViews/PyProfileDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DataViews/PyProfileDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ from eric5config import getConfig + class ProfileTreeWidgetItem(QTreeWidgetItem): """ Class implementing a custom QTreeWidgetItem to allow sorting on numeric values. @@ -47,11 +48,12 @@ return int(self.text(column)) < int(other.text(column)) return self.text(column) < other.text(column) + class PyProfileDialog(QDialog, Ui_PyProfileDialog): """ Class implementing a dialog to display the results of a syntax check run. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -73,10 +75,10 @@ self.resultList.header().setSortIndicator(0, Qt.DescendingOrder) self.__menu = QMenu(self) - self.filterItm = self.__menu.addAction(self.trUtf8('Exclude Python Library'), + self.filterItm = self.__menu.addAction(self.trUtf8('Exclude Python Library'), self.__filter) self.__menu.addSeparator() - self.__menu.addAction(self.trUtf8('Erase Profiling Info'), + self.__menu.addAction(self.trUtf8('Erase Profiling Info'), self.__eraseProfile) self.__menu.addAction(self.trUtf8('Erase Timing Info'), self.__eraseTiming) self.__menu.addSeparator() @@ -86,7 +88,7 @@ self.summaryList.setContextMenuPolicy(Qt.CustomContextMenu) self.summaryList.customContextMenuRequested.connect(self.__showContextMenu) - def __createResultItem(self, calls, totalTime, totalTimePerCall, cumulativeTime, + def __createResultItem(self, calls, totalTime, totalTimePerCall, cumulativeTime, cumulativeTimePerCall, file, line, functionName): """ Private method to create an entry in the result list. @@ -101,13 +103,13 @@ @param functionName function name (string) """ itm = ProfileTreeWidgetItem(self.resultList, [ - calls, - "{0: 8.3f}".format(totalTime), - totalTimePerCall, - "{0: 8.3f}".format(cumulativeTime), - cumulativeTimePerCall, - file, - str(line), + calls, + "{0: 8.3f}".format(totalTime), + totalTimePerCall, + "{0: 8.3f}".format(cumulativeTime), + cumulativeTimePerCall, + file, + str(line), functionName ]) for col in [0, 1, 2, 3, 4, 6]: @@ -127,10 +129,10 @@ """ Private method to resort the tree. """ - self.resultList.sortItems(self.resultList.sortColumn(), + self.resultList.sortItems(self.resultList.sortColumn(), self.resultList.header().sortIndicatorOrder()) - def __populateLists(self, exclude = False): + def __populateLists(self, exclude=False): """ Private method used to populate the listviews. @@ -145,8 +147,8 @@ progress = 0 total_calls = 0 - prim_calls = 0 - total_tt = 0 + prim_calls = 0 + total_tt = 0 try: # disable updates of the list for speed @@ -164,8 +166,8 @@ func[0].startswith(self.pyLibPath): # calculate the totals total_calls += nc - prim_calls += cc - total_tt += tt + prim_calls += cc + total_tt += tt if nc != cc: c = "{0:d}/{1:d}".format(nc, cc) @@ -174,12 +176,12 @@ if nc == 0: tpc = "{0: 8.3f}".format(0.0) else: - tpc = "{0: 8.3f}".format(tt/nc) + tpc = "{0: 8.3f}".format(tt / nc) if cc == 0: cpc = "{0: 8.3f}".format(0.0) else: - cpc = "{0: 8.3f}".format(ct/cc) - self.__createResultItem(c, tt, tpc, ct, cpc, func[0], + cpc = "{0: 8.3f}".format(ct / cc) + self.__createResultItem(c, tt, tpc, ct, cpc, func[0], func[1], func[2]) progress += 1 @@ -310,4 +312,4 @@ self.exclude = True self.filterItm.setText(self.trUtf8('Exclude Python Library')) self.__populateLists(False) - self.__finish() \ No newline at end of file + self.__finish()
--- a/DebugClients/Python/AsyncFile.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/AsyncFile.py Fri Mar 11 16:51:57 2011 +0100 @@ -34,7 +34,7 @@ maxtries = 10 maxbuffersize = 1024 * 1024 * 4 - def __init__(self,sock,mode,name): + def __init__(self, sock, mode, name): """ Constructor @@ -51,7 +51,7 @@ self.wpending = u'' - def __checkMode(self,mode): + def __checkMode(self, mode): """ Private method to check the mode. @@ -61,16 +61,16 @@ @param mode the mode to be checked (string) """ if mode != self.mode: - raise IOError, '[Errno 9] Bad file descriptor' + raise IOError('[Errno 9] Bad file descriptor') - def __nWrite(self,n): + def __nWrite(self, n): """ Private method to write a specific number of pending bytes. @param n the number of bytes to be written (int) """ if n: - try : + try: buf = "%s%s" % (self.wpending[:n], EOT) try: buf = buf.encode('utf8') @@ -82,7 +82,7 @@ except socket.error: self.nWriteErrors += 1 if self.nWriteErrors > self.maxtries: - self.wpending = u'' # delete all output + self.wpending = u'' # delete all output def pendingWrite(self): """ @@ -128,7 +128,7 @@ except socket.error: return -1 - def read_p(self,size=-1): + def read_p(self, size=-1): """ Public method to read bytes from this file. @@ -142,7 +142,7 @@ return self.sock.recv(size).decode('utf8') - def read(self,size=-1): + def read(self, size=-1): """ Public method to read bytes from this file. @@ -156,7 +156,7 @@ buf = buf[:size] return buf - def readline_p(self,size=-1): + def readline_p(self, size=-1): """ Public method to read a line from this file. @@ -187,7 +187,7 @@ # Now we know how big the line is, read it for real. return self.sock.recv(size).decode('utf8') - def readlines(self,sizehint=-1): + def readlines(self, sizehint=-1): """ Public method to read all lines from this file. @@ -230,14 +230,14 @@ line = line[:sizehint] return line - def seek(self,offset,whence=0): + def seek(self, offset, whence=0): """ Public method to move the filepointer. @exception IOError This method is not supported and always raises an IOError. """ - raise IOError, '[Errno 29] Illegal seek' + raise IOError('[Errno 29] Illegal seek') def tell(self): """ @@ -246,18 +246,18 @@ @exception IOError This method is not supported and always raises an IOError. """ - raise IOError, '[Errno 29] Illegal seek' + raise IOError('[Errno 29] Illegal seek') - def truncate(self,size=-1): + def truncate(self, size=-1): """ Public method to truncate the file. @exception IOError This method is not supported and always raises an IOError. """ - raise IOError, '[Errno 29] Illegal seek' + raise IOError('[Errno 29] Illegal seek') - def write(self,s): + def write(self, s): """ Public method to write a string to the file. @@ -282,13 +282,13 @@ self.wpending += s self.__nWrite(self.pendingWrite()) - def writelines(self,list): + def writelines(self, list): """ Public method to write a list of strings to the file. @param list the list to be written (list of string) """ - map(self.write,list) + map(self.write, list) # # eflag: FileType = Python2
--- a/DebugClients/Python/AsyncIO.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/AsyncIO.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,7 +28,7 @@ self.readfd = None self.writefd = None - def setDescriptors(self,rfd,wfd): + def setDescriptors(self, rfd, wfd): """ Public method called to set the descriptors for the connection. @@ -41,7 +41,7 @@ self.wbuf = '' self.writefd = wfd - def readReady(self,fd): + def readReady(self, fd): """ Public method called when there is data ready to be read. @@ -67,7 +67,7 @@ self.handleLine(s) eol = self.rbuf.find('\n') - def writeReady(self,fd): + def writeReady(self, fd): """ Public method called when we are ready to write data. @@ -77,7 +77,7 @@ self.writefd.flush() self.wbuf = '' - def write(self,s): + def write(self, s): """ Public method to write a string.
--- a/DebugClients/Python/DCTestResult.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DCTestResult.py Fri Mar 11 16:51:57 2011 +0100 @@ -74,7 +74,7 @@ self.parent.write('%s\n' % ResponseUTStopTest) # ensure that pending input is processed - rrdy, wrdy, xrdy = select.select([self.parent.readstream],[],[], 0.01) + rrdy, wrdy, xrdy = select.select([self.parent.readstream], [], [], 0.01) if self.parent.readstream in rrdy: self.parent.readReady(self.parent.readstream.fileno())
--- a/DebugClients/Python/DebugBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DebugBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ gRecursionLimit = 64 + def printerr(s): """ Module function used for debugging the debug client. @@ -27,6 +28,7 @@ sys.__stderr__.write('%s\n' % unicode(s)) sys.__stderr__.flush() + def setRecursionLimit(limit): """ Module function to set the recursion limit. @@ -36,6 +38,7 @@ global gRecursionLimit gRecursionLimit = limit + class DebugBase(bdb.Bdb): """ Class implementing base class of the debugger. @@ -84,7 +87,7 @@ @return the current frame """ - return self.currentFrame + return self.currentFrame def getCurrentFrameLocals(self): """ @@ -92,7 +95,7 @@ @return locals dictionary of the current frame """ - return self.currentFrameLocals + return self.currentFrameLocals def step(self, traceMode): """ @@ -140,14 +143,14 @@ def profile(self, frame, event, arg): """ - Public method used to trace some stuff independant of the debugger + Public method used to trace some stuff independant of the debugger trace function. @param frame The current stack frame. @param event The trace event (string) @param arg The arguments """ - if event == 'return': + if event == 'return': self.cFrame = frame.f_back self.__recursionDepth -= 1 elif event == 'call': @@ -171,7 +174,7 @@ @return local trace function """ if self.quitting: - return # None + return # None # give the client a chance to push through new break points. self._dbgClient.eventPoll() @@ -193,7 +196,7 @@ return self.trace_dispatch if event == 'c_return': return self.trace_dispatch - print 'DebugBase.trace_dispatch: unknown debugging event:', `event` + print 'DebugBase.trace_dispatch: unknown debugging event:', repr(event) return self.trace_dispatch def dispatch_line(self, frame): @@ -241,7 +244,7 @@ raise bdb.BdbQuit return self.trace_dispatch - def set_trace(self, frame = None): + def set_trace(self, frame=None): """ Overridden method of bdb.py to do some special setup. @@ -265,7 +268,7 @@ def set_quit(self): """ - Public method to quit. + Public method to quit. It wraps call to bdb to clear the current frame properly. """ @@ -291,7 +294,7 @@ @param frame the frame object """ # get module name from __file__ - if frame.f_globals.has_key('__file__') and \ + if '__file__' in frame.f_globals and \ frame.f_globals['__file__'] and \ frame.f_globals['__file__'] == frame.f_code.co_filename: root, ext = os.path.splitext(frame.f_globals['__file__']) @@ -316,7 +319,7 @@ bp.condition = cond bp.special = "" bp.values = {} - if not self.breaks.has_key("Watch"): + if "Watch" not in self.breaks: self.breaks["Watch"] = 1 else: self.breaks["Watch"] += 1 @@ -327,7 +330,7 @@ @param cond expression of the watch expression to be cleared (string) """ - try: + try: possibles = bdb.Breakpoint.bplist["Watch", 0] for i in range(0, len(possibles)): b = possibles[i] @@ -416,7 +419,7 @@ def break_here(self, frame): """ - Reimplemented from bdb.py to fix the filename from the frame. + Reimplemented from bdb.py to fix the filename from the frame. See fix_frame_filename for more info. @@ -424,10 +427,10 @@ @return flag indicating the break status (boolean) """ filename = self.canonic(self.fix_frame_filename(frame)) - if not self.breaks.has_key(filename) and not self.breaks.has_key("Watch"): + if filename not in self.breaks and "Watch" not in self.breaks: return 0 - if self.breaks.has_key(filename): + if filename in self.breaks: lineno = frame.f_lineno if lineno in self.breaks[filename]: # flag says ok to delete temp. bp @@ -438,7 +441,7 @@ self.__do_clear(filename, lineno) return 1 - if self.breaks.has_key("Watch"): + if "Watch" in self.breaks: # flag says ok to delete temp. bp (bp, flag) = self.__effective(frame) if bp: @@ -459,9 +462,9 @@ @param frame the frame object @return flag indicating the break status (boolean) """ - return self.breaks.has_key( - self.canonic(self.fix_frame_filename(frame))) or \ - (self.breaks.has_key("Watch") and self.breaks["Watch"]) + return \ + self.canonic(self.fix_frame_filename(frame)) in self.breaks or \ + ("Watch" in self.breaks and self.breaks["Watch"]) def get_break(self, filename, lineno): """ @@ -475,7 +478,7 @@ @return breakpoint or None, if there is no bp """ filename = self.canonic(filename) - return self.breaks.has_key(filename) and \ + return filename in self.breaks and \ lineno in self.breaks[filename] and \ bdb.Breakpoint.bplist[filename, lineno][0] or None @@ -567,7 +570,7 @@ self._dbgClient.write('%s%s\n' % (ResponseLine, unicode(stack))) self._dbgClient.eventLoop() - def user_exception(self,frame,(exctype,excval,exctb),unhandled=0): + def user_exception(self, frame, (exctype, excval, exctb), unhandled=0): """ Reimplemented to report an exception to the debug server. @@ -608,7 +611,7 @@ else: exctypetxt = unicode(exctype) try: - exclist = [exctypetxt, + exclist = [exctypetxt, unicode(excval).encode(self._dbgClient.getCoding())] except TypeError: exclist = [exctypetxt, str(excval)] @@ -651,7 +654,7 @@ tb = None return stack - def user_return(self,frame,retval): + def user_return(self, frame, retval): """ Reimplemented to report program termination to the debug server. @@ -667,7 +670,7 @@ self.stepFrame = None self.user_line(frame) - def stop_here(self,frame): + def stop_here(self, frame): """ Reimplemented to filter out debugger files. @@ -679,7 +682,7 @@ """ if self.__skip_it(frame): return 0 - return bdb.Bdb.stop_here(self,frame) + return bdb.Bdb.stop_here(self, frame) def __skip_it(self, frame): """ @@ -703,8 +706,8 @@ if os.path.basename(fn) in [\ 'AsyncFile.py', 'AsyncIO.py', 'DebugConfig.py', 'DCTestResult.py', - 'DebugBase.py', 'DebugClientBase.py', - 'DebugClientCapabilities.py', 'DebugClient.py', + 'DebugBase.py', 'DebugClientBase.py', + 'DebugClientCapabilities.py', 'DebugClient.py', 'DebugClientThreads.py', 'DebugProtocol.py', 'DebugThread.py', 'FlexCompleter.py', 'PyProfile.py'] or \
--- a/DebugClients/Python/DebugClientBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DebugClientBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,6 +30,7 @@ ################################################################################ + def DebugClientRawInput(prompt="", echo=1): """ Replacement for the standard raw_input builtin. @@ -55,6 +56,7 @@ ################################################################################ + def DebugClientInput(prompt=""): """ Replacement for the standard input builtin. @@ -79,6 +81,7 @@ ################################################################################ + def DebugClientFork(): """ Replacement for the standard os.fork(). @@ -95,6 +98,7 @@ ################################################################################ + def DebugClientClose(fd): """ Replacement for the standard os.close(fd). @@ -113,6 +117,7 @@ ################################################################################ + def DebugClientSetRecursionLimit(limit): """ Replacement for the standard sys.setrecursionlimit(limit). @@ -131,6 +136,7 @@ ################################################################################ + class DebugClientBase(object): """ Class implementing the client side of the debugger. @@ -145,12 +151,12 @@ The protocol is as follows. First the client opens a connection to the debugger and then sends a series of one line commands. A command is either - >Load<, >Step<, >StepInto<, ... or a Python statement. + >Load<, >Step<, >StepInto<, ... or a Python statement. See DebugProtocol.py for a listing of valid protocol tokens. A Python statement consists of the statement to execute, followed (in a separate line) by >OK?<. If the statement was incomplete then the response - is >Continue<. If there was an exception then the response is + is >Continue<. If there was an exception then the response is >Exception<. Otherwise the response is >OK<. The reason for the >OK?< part is to provide a sentinal (ie. the responding >OK<) after any possible output as a @@ -271,11 +277,11 @@ return self.__coding = default - def attachThread(self, target = None, args = None, kwargs = None, mainThread = 0): + def attachThread(self, target=None, args=None, kwargs=None, mainThread=0): """ Public method to setup a thread for DebugClient to debug. - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. This is just an empty function and is overridden in the threaded @@ -284,7 +290,7 @@ @param target the start function of the target thread (i.e. the user code) @param args arguments to pass to target @param kwargs keyword arguments to pass to target - @param mainThread non-zero, if we are attaching to the already + @param mainThread non-zero, if we are attaching to the already started mainthread of the app @return The identifier of the created thread """ @@ -314,7 +320,7 @@ self.write('%s%s\n' % (ResponseThreadList, unicode((currentId, threadList)))) - def raw_input(self,prompt,echo): + def raw_input(self, prompt, echo): """ Public method to implement raw_input() using the event loop. @@ -327,7 +333,7 @@ self.eventLoop(True) return self.rawLine - def input(self,prompt): + def input(self, prompt): """ Public method to implement input() using the event loop. @@ -344,7 +350,7 @@ """ self.pendingResponse = ResponseException - def sessionClose(self, exit = 1): + def sessionClose(self, exit=1): """ Public method to close the session with the debugger and optionally terminate. @@ -370,7 +376,7 @@ # Ok, go away. sys.exit() - def handleLine(self,line): + def handleLine(self, line): """ Public method to handle the receipt of a complete line. @@ -453,7 +459,7 @@ env = eval(arg) for key, value in env.items(): if key.endswith("+"): - if os.environ.has_key(key[:-1]): + if key[:-1] in os.environ: os.environ[key[:-1]] += value else: os.environ[key[:-1]] = value @@ -481,7 +487,7 @@ self.debugging = 1 self.threads.clear() - self.attachThread(mainThread = 1) + self.attachThread(mainThread=1) # set the system exception handling function to ensure, that # we report on all unhandled exceptions @@ -495,11 +501,11 @@ # This will eventually enter a local event loop. # Note the use of backquotes to cause a repr of self.running. The # need for this is on Windows os where backslash is the path separator. - # They will get inadvertantly stripped away during the eval causing + # They will get inadvertantly stripped away during the eval causing # IOErrors, if self.running is passed as a normal str. self.debugMod.__dict__['__file__'] = self.running sys.modules['__main__'] = self.debugMod - res = self.mainThread.run('execfile(' + `self.running` + ')', + res = self.mainThread.run('execfile(' + repr(self.running) + ')', self.debugMod.__dict__) self.progTerminated(res) return @@ -522,7 +528,7 @@ self.inRawMode = 0 self.threads.clear() - self.attachThread(mainThread = 1) + self.attachThread(mainThread=1) # set the system exception handling function to ensure, that # we report on all unhandled exceptions @@ -554,8 +560,8 @@ sys.excepthook = self.__unhandled_exception # generate a coverage object - self.cover = coverage(auto_data = True, - data_file = "%s.coverage" % os.path.splitext(sys.argv[0])[0]) + self.cover = coverage(auto_data=True, + data_file="%s.coverage" % os.path.splitext(sys.argv[0])[0]) self.cover.use_cache(True) if int(erase): @@ -713,7 +719,7 @@ finally: tblist = tb = None - map(self.write,list) + map(self.write, list) self.write(ResponseException + '\n') @@ -753,13 +759,13 @@ return if cmd == RequestBanner: - self.write('%s%s\n' % (ResponseBanner, - unicode(("Python %s" % sys.version, socket.gethostname(), + self.write('%s%s\n' % (ResponseBanner, + unicode(("Python %s" % sys.version, socket.gethostname(), self.variant)))) return if cmd == RequestCapabilities: - self.write('%s%d, "Python"\n' % (ResponseCapabilities, + self.write('%s%d, "Python"\n' % (ResponseCapabilities, self.__clientCapabilities())) return @@ -800,8 +806,8 @@ # generate a coverage object if int(cov): from coverage import coverage - self.cover = coverage(auto_data = True, - data_file = "%s.coverage" % os.path.splitext(covname)[0]) + self.cover = coverage(auto_data=True, + data_file="%s.coverage" % os.path.splitext(covname)[0]) self.cover.use_cache(True) if int(erase): self.cover.erase() @@ -856,7 +862,7 @@ except (OverflowError, SyntaxError, ValueError): # Report the exception sys.last_type, sys.last_value, sys.last_traceback = sys.exc_info() - map(self.write,traceback.format_exception_only(sys.last_type,sys.last_value)) + map(self.write, traceback.format_exception_only(sys.last_type, sys.last_value)) self.buffer = '' self.__exceptionRaised() @@ -890,12 +896,12 @@ _globals = cf.f_globals _locals = self.currentThread.getCurrentFrameLocals() # reset sys.stdout to our redirector (unconditionally) - if _globals.has_key("sys"): + if "sys" in _globals: __stdout = _globals["sys"].stdout _globals["sys"].stdout = self.writestream exec code in _globals, _locals _globals["sys"].stdout = __stdout - elif _locals.has_key("sys"): + elif "sys" in _locals: __stdout = _locals["sys"].stdout _locals["sys"].stdout = self.writestream exec code in _globals, _locals @@ -941,7 +947,7 @@ except ImportError: return self.clientCapabilities & ~DebugClientCapabilities.HasProfiler - def write(self,s): + def write(self, s): """ Public method to write data to the output stream. @@ -956,14 +962,14 @@ """ global DebugClientInstance - self.setDescriptors(self.readstream,self.writestream) + self.setDescriptors(self.readstream, self.writestream) DebugClientInstance = self if not self.passive: # At this point simulate an event loop. self.eventLoop() - def eventLoop(self, disablePolling = False): + def eventLoop(self, disablePolling=False): """ Public method implementing our event loop. @@ -983,7 +989,7 @@ wrdy.append(self.errorstream) try: - rrdy, wrdy, xrdy = select.select([self.readstream],wrdy,[]) + rrdy, wrdy, xrdy = select.select([self.readstream], wrdy, []) except (select.error, KeyboardInterrupt, socket.error): # just carry on continue @@ -1025,7 +1031,7 @@ # immediate return if nothing is ready. try: - rrdy, wrdy, xrdy = select.select([self.readstream],wrdy,[],0) + rrdy, wrdy, xrdy = select.select([self.readstream], wrdy, [], 0) except (select.error, KeyboardInterrupt, socket.error): return @@ -1038,11 +1044,11 @@ if self.errorstream in wrdy: self.writeReady(self.errorstream.fileno()) - def connectDebugger(self,port,remoteAddress=None,redirect=1): + def connectDebugger(self, port, remoteAddress=None, redirect=1): """ - Public method to establish a session with the debugger. + Public method to establish a session with the debugger. - It opens a network connection to the debugger, connects it to stdin, + It opens a network connection to the debugger, connects it to stdin, stdout and stderr and saves these file objects in case the application being debugged redirects them itself. @@ -1071,7 +1077,7 @@ self.redirect = redirect # attach to the main thread here - self.attachThread(mainThread = 1) + self.attachThread(mainThread=1) def __unhandled_exception(self, exctype, excval, exctb): """ @@ -1081,13 +1087,13 @@ @param excval data about the exception @param exctb traceback for the exception """ - self.mainThread.user_exception(None, (exctype,excval,exctb), 1) + self.mainThread.user_exception(None, (exctype, excval, exctb), 1) - def absPath(self,fn): + def absPath(self, fn): """ Public method to convert a filename to an absolute name. - sys.path is used as a set of possible prefixes. The name stays + sys.path is used as a set of possible prefixes. The name stays relative if a file could not be found. @param fn filename (string) @@ -1097,12 +1103,12 @@ return fn # Check the cache. - if self.fncache.has_key(fn): + if fn in self.fncache: return self.fncache[fn] # Search sys.path. for p in sys.path: - afn = os.path.abspath(os.path.join(p,fn)) + afn = os.path.abspath(os.path.join(p, fn)) afn = os.path.normcase(afn) if os.path.exists(afn): @@ -1114,7 +1120,7 @@ # Search the additional directory cache for p in self.dircache: - afn = os.path.abspath(os.path.join(p,fn)) + afn = os.path.abspath(os.path.join(p, fn)) afn = os.path.normcase(afn) if os.path.exists(afn): @@ -1148,7 +1154,7 @@ """ return self.running - def progTerminated(self,status): + def progTerminated(self, status): """ Public method to tell the debugger that the program has terminated. @@ -1165,7 +1171,7 @@ if self.running: self.set_quit() self.running = None - self.write('%s%d\n' % (ResponseExit,status)) + self.write('%s%d\n' % (ResponseExit, status)) # reset coding self.__coding = self.defaultCoding @@ -1254,15 +1260,15 @@ ndict = {} # this has to be in line with VariablesViewer.indicators if var[i][-2:] in ["[]", "()", "{}"]: - if i+1 == len(var): + if i + 1 == len(var): if var[i][:-2] == '...': - dictkeys = [var[i-1]] + dictkeys = [var[i - 1]] else: dictkeys = [var[i][:-2]] formatSequences = 1 if not access and not oaccess: if var[i][:-2] == '...': - access = '["%s"]' % var[i-1] + access = '["%s"]' % var[i - 1] dict = odict else: access = '["%s"]' % var[i][:-2] @@ -1271,7 +1277,7 @@ if oaccess: access = oaccess else: - access = '%s[%s]' % (access, var[i-1]) + access = '%s[%s]' % (access, var[i - 1]) dict = odict else: if oaccess: @@ -1285,13 +1291,13 @@ else: if not access: if var[i][:-2] == '...': - access = '["%s"]' % var[i-1] + access = '["%s"]' % var[i - 1] dict = odict else: access = '["%s"]' % var[i][:-2] else: if var[i][:-2] == '...': - access = '%s[%s]' % (access, var[i-1]) + access = '%s[%s]' % (access, var[i - 1]) dict = odict else: if oaccess: @@ -1305,7 +1311,7 @@ access = '%s[%s]' % (oaccess, var[i]) else: access = '%s[%s]' % (access, var[i]) - if var[i-1][:-2] == '...': + if var[i - 1][:-2] == '...': oaccess = access else: oaccess = '' @@ -1382,7 +1388,7 @@ dictkeys = dict.keys() else: dictkeys = range(len(dict)) - vlist = self.__formatVariablesList(dictkeys, dict, scope, filter, + vlist = self.__formatVariablesList(dictkeys, dict, scope, filter, formatSequences) varlist.extend(vlist) @@ -1402,8 +1408,8 @@ @param value variable to be formated @param vtype type of the variable to be formatted (string) - @return A tuple consisting of a list of formatted variables. Each - variable entry is a tuple of three elements, the variable name, + @return A tuple consisting of a list of formatted variables. Each + variable entry is a tuple of three elements, the variable name, its type and value. """ qttype = vtype.split('.')[-1] @@ -1511,30 +1517,30 @@ return varlist - def __formatVariablesList(self, keylist, dict, scope, filter = [], - formatSequences = 0): + def __formatVariablesList(self, keylist, dict, scope, filter=[], + formatSequences=0): """ Private method to produce a formated variables list. The dictionary passed in to it is scanned. Variables are - only added to the list, if their type is not contained + only added to the list, if their type is not contained in the filter list and their name doesn't match any of the filter expressions. The formated variables list (a list of tuples of 3 values) is returned. @param keylist keys of the dictionary @param dict the dictionary to be scanned - @param scope 1 to filter using the globals filter, 0 using the locals + @param scope 1 to filter using the globals filter, 0 using the locals filter (int). Variables are only added to the list, if their name do not match any of the filter expressions. @param filter the indices of variable types to be filtered. Variables are - only added to the list, if their type is not contained in the filter + only added to the list, if their type is not contained in the filter list. @param formatSequences flag indicating, that sequence or dictionary variables should be formatted. If it is 0 (or false), just the number of items contained in these variables is returned. (boolean) @return A tuple consisting of a list of formatted variables. Each variable - entry is a tuple of three elements, the variable name, its type and + entry is a tuple of three elements, the variable name, its type and value. """ varlist = [] @@ -1565,7 +1571,7 @@ value = dict[key] valtypestr = ("%s" % type(value))[1:-1] - if valtypestr.split(' ',1)[0] == 'class': + if valtypestr.split(' ', 1)[0] == 'class': # handle new class type of python 2.2+ if ConfigVarTypeStrings.index('instance') in filter: continue @@ -1609,7 +1615,7 @@ """ Private slot to convert a filter string to a list of filter objects. - @param scope 1 to generate filter for global variables, 0 for local + @param scope 1 to generate filter for global variables, 0 for local variables (int) @param filterString string of filter patterns separated by ';' """ @@ -1638,7 +1644,7 @@ if pos == -1: text = '' else: - text = text[pos+1:] + text = text[pos + 1:] break pos -= 1 @@ -1656,8 +1662,8 @@ self.write("%s%s||%s\n" % (ResponseCompletion, unicode(completions), text)) - def startDebugger(self, filename = None, host = None, port = None, - enableTrace = 1, exceptions = 1, tracePython = 0, redirect = 1): + def startDebugger(self, filename=None, host=None, port=None, + enableTrace=1, exceptions=1, tracePython=0, redirect=1): """ Public method used to start the remote debugger. @@ -1697,7 +1703,7 @@ self.inRawMode = 0 self.debugging = 1 - self.attachThread(mainThread = 1) + self.attachThread(mainThread=1) self.mainThread.tracePython = tracePython # set the system exception handling function to ensure, that @@ -1708,12 +1714,12 @@ if enableTrace: self.mainThread.set_trace() - def startProgInDebugger(self, progargs, wd = '', host = None, - port = None, exceptions = 1, tracePython = 0, redirect = 1): + def startProgInDebugger(self, progargs, wd='', host=None, + port=None, exceptions=1, tracePython=0, redirect=1): """ Public method used to start the remote debugger. - @param progargs commandline for the program to be debugged + @param progargs commandline for the program to be debugged (list of strings) @param wd working directory for the program execution (string) @param host hostname of the debug server (string) @@ -1749,7 +1755,7 @@ self.write("%s%s|%d\n" % (PassiveStartup, self.running, exceptions)) self.__interact() - self.attachThread(mainThread = 1) + self.attachThread(mainThread=1) self.mainThread.tracePython = tracePython # set the system exception handling function to ensure, that @@ -1763,7 +1769,7 @@ # if self.running is passed as a normal str. self.debugMod.__dict__['__file__'] = self.running sys.modules['__main__'] = self.debugMod - res = self.mainThread.run('execfile(' + `self.running` + ')', + res = self.mainThread.run('execfile(' + repr(self.running) + ')', self.debugMod.__dict__) self.progTerminated(res) @@ -1776,7 +1782,7 @@ @param *args arguments being passed to func @return result of the function call """ - self.startDebugger(scriptname, enableTrace = 0) + self.startDebugger(scriptname, enableTrace=0) res = self.mainThread.runcall(func, *args) self.progTerminated(res) return res @@ -1845,7 +1851,7 @@ else: if not self.noencoding: self.__coding = self.defaultCoding - self.startProgInDebugger(args, wd, host, port, + self.startProgInDebugger(args, wd, host, port, exceptions=exceptions, tracePython=tracePython, redirect=redirect) else: @@ -1913,7 +1919,7 @@ @param fd file descriptor to be closed (integer) """ - if fd in [self.readstream.fileno(), self.writestream.fileno(), + if fd in [self.readstream.fileno(), self.writestream.fileno(), self.errorstream.fileno()]: return @@ -1921,13 +1927,13 @@ def __getSysPath(self, firstEntry): """ - Private slot to calculate a path list including the PYTHONPATH + Private slot to calculate a path list including the PYTHONPATH environment variable. @param firstEntry entry to be put first in sys.path (string) @return path list for use as sys.path (list of strings) """ - sysPath = [path for path in os.environ.get("PYTHONPATH", "").split(os.pathsep) + sysPath = [path for path in os.environ.get("PYTHONPATH", "").split(os.pathsep) if path not in sys.path] + sys.path[:] if "" in sysPath: sysPath.remove("")
--- a/DebugClients/Python/DebugClientCapabilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DebugClientCapabilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,13 +7,13 @@ Module defining the debug clients capabilities. """ -HasDebugger = 0x0001 -HasInterpreter = 0x0002 -HasProfiler = 0x0004 -HasCoverage = 0x0008 -HasCompleter = 0x0010 -HasUnittest = 0x0020 -HasShell = 0x0040 +HasDebugger = 0x0001 +HasInterpreter = 0x0002 +HasProfiler = 0x0004 +HasCoverage = 0x0008 +HasCompleter = 0x0010 +HasUnittest = 0x0020 +HasShell = 0x0040 HasAll = HasDebugger | HasInterpreter | HasProfiler | \ HasCoverage | HasCompleter | HasUnittest | HasShell
--- a/DebugClients/Python/DebugClientThreads.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DebugClientThreads.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,14 +19,14 @@ """ Module function used to allow for debugging of multiple threads. - The way it works is that below, we reset thread._start_new_thread to + The way it works is that below, we reset thread._start_new_thread to this function object. Thus, providing a hook for us to see when - threads are started. From here we forward the request onto the + threads are started. From here we forward the request onto the DebugClient which will create a DebugThread object to allow tracing of the thread then start up the thread. These actions are always performed in order to allow dropping into debug mode. - See DebugClientThreads.attachThread and DebugThread.DebugThread in + See DebugClientThreads.attachThread and DebugThread.DebugThread in DebugThread.py @param target the start function of the target thread (i.e. the user code) @@ -39,14 +39,15 @@ else: return _original_start_thread(target, args, kwargs) -# make thread hooks available to system +# make thread hooks available to system _original_start_thread = thread.start_new_thread thread.start_new_thread = _debugclient_start_new_thread -# NOTE: import threading here AFTER above hook, as threading cache's +# NOTE: import threading here AFTER above hook, as threading cache's # thread._start_new_thread. from threading import RLock + class DebugClientThreads(DebugClientBase.DebugClientBase, AsyncIO): """ Class implementing the client side of the debugger. @@ -74,17 +75,17 @@ self.variant = 'Threaded' - def attachThread(self, target = None, args = None, kwargs = None, mainThread = 0): + def attachThread(self, target=None, args=None, kwargs=None, mainThread=0): """ Public method to setup a thread for DebugClient to debug. - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. @param target the start function of the target thread (i.e. the user code) @param args arguments to pass to target @param kwargs keyword arguments to pass to target - @param mainThread non-zero, if we are attaching to the already + @param mainThread non-zero, if we are attaching to the already started mainthread of the app @return The identifier of the created thread """ @@ -120,7 +121,7 @@ finally: self.unlockClient() - def lockClient(self, blocking = 1): + def lockClient(self, blocking=1): """ Public method to acquire the lock for this client. @@ -156,7 +157,7 @@ finally: self.unlockClient() - def eventLoop(self, disablePolling = False): + def eventLoop(self, disablePolling=False): """ Public method implementing our event loop.
--- a/DebugClients/Python/DebugProtocol.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DebugProtocol.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,68 +11,68 @@ DebugAddress = '127.0.0.1' # The protocol "words". -RequestOK = '>OK?<' -RequestEnv = '>Environment<' -RequestCapabilities = '>Capabilities<' -RequestLoad = '>Load<' -RequestRun = '>Run<' -RequestCoverage = '>Coverage<' -RequestProfile = '>Profile<' -RequestContinue = '>Continue<' -RequestStep = '>Step<' -RequestStepOver = '>StepOver<' -RequestStepOut = '>StepOut<' -RequestStepQuit = '>StepQuit<' -RequestBreak = '>Break<' -RequestBreakEnable = '>EnableBreak<' -RequestBreakIgnore = '>IgnoreBreak<' -RequestWatch = '>Watch<' -RequestWatchEnable = '>EnableWatch<' -RequestWatchIgnore = '>IgnoreWatch<' -RequestVariables = '>Variables<' -RequestVariable = '>Variable<' -RequestSetFilter = '>SetFilter<' -RequestThreadList = '>ThreadList<' -RequestThreadSet = '>ThreadSet<' -RequestEval = '>Eval<' -RequestExec = '>Exec<' -RequestShutdown = '>Shutdown<' -RequestBanner = '>Banner<' -RequestCompletion = '>Completion<' -RequestUTPrepare = '>UTPrepare<' -RequestUTRun = '>UTRun<' -RequestUTStop = '>UTStop<' -RequestForkTo = '>ForkTo<' -RequestForkMode = '>ForkMode<' +RequestOK = '>OK?<' +RequestEnv = '>Environment<' +RequestCapabilities = '>Capabilities<' +RequestLoad = '>Load<' +RequestRun = '>Run<' +RequestCoverage = '>Coverage<' +RequestProfile = '>Profile<' +RequestContinue = '>Continue<' +RequestStep = '>Step<' +RequestStepOver = '>StepOver<' +RequestStepOut = '>StepOut<' +RequestStepQuit = '>StepQuit<' +RequestBreak = '>Break<' +RequestBreakEnable = '>EnableBreak<' +RequestBreakIgnore = '>IgnoreBreak<' +RequestWatch = '>Watch<' +RequestWatchEnable = '>EnableWatch<' +RequestWatchIgnore = '>IgnoreWatch<' +RequestVariables = '>Variables<' +RequestVariable = '>Variable<' +RequestSetFilter = '>SetFilter<' +RequestThreadList = '>ThreadList<' +RequestThreadSet = '>ThreadSet<' +RequestEval = '>Eval<' +RequestExec = '>Exec<' +RequestShutdown = '>Shutdown<' +RequestBanner = '>Banner<' +RequestCompletion = '>Completion<' +RequestUTPrepare = '>UTPrepare<' +RequestUTRun = '>UTRun<' +RequestUTStop = '>UTStop<' +RequestForkTo = '>ForkTo<' +RequestForkMode = '>ForkMode<' -ResponseOK = '>OK<' -ResponseCapabilities = RequestCapabilities -ResponseContinue = '>Continue<' -ResponseException = '>Exception<' -ResponseSyntax = '>SyntaxError<' -ResponseExit = '>Exit<' -ResponseLine = '>Line<' -ResponseRaw = '>Raw<' -ResponseClearBreak = '>ClearBreak<' +ResponseOK = '>OK<' +ResponseCapabilities = RequestCapabilities +ResponseContinue = '>Continue<' +ResponseException = '>Exception<' +ResponseSyntax = '>SyntaxError<' +ResponseExit = '>Exit<' +ResponseLine = '>Line<' +ResponseRaw = '>Raw<' +ResponseClearBreak = '>ClearBreak<' ResponseBPConditionError = '>BPConditionError<' -ResponseClearWatch = '>ClearWatch<' +ResponseClearWatch = '>ClearWatch<' ResponseWPConditionError = '>WPConditionError<' -ResponseVariables = RequestVariables -ResponseVariable = RequestVariable -ResponseThreadList = RequestThreadList -ResponseThreadSet = RequestThreadSet -ResponseStack = '>CurrentStack<' -ResponseBanner = RequestBanner -ResponseCompletion = RequestCompletion -ResponseUTPrepared = '>UTPrepared<' -ResponseUTStartTest = '>UTStartTest<' -ResponseUTStopTest = '>UTStopTest<' -ResponseUTTestFailed = '>UTTestFailed<' -ResponseUTTestErrored = '>UTTestErrored<' -ResponseUTFinished = '>UTFinished<' -ResponseForkTo = RequestForkTo +ResponseVariables = RequestVariables +ResponseVariable = RequestVariable +ResponseThreadList = RequestThreadList +ResponseThreadSet = RequestThreadSet +ResponseStack = '>CurrentStack<' +ResponseBanner = RequestBanner +ResponseCompletion = RequestCompletion +ResponseUTPrepared = '>UTPrepared<' +ResponseUTStartTest = '>UTStartTest<' +ResponseUTStopTest = '>UTStopTest<' +ResponseUTTestFailed = '>UTTestFailed<' +ResponseUTTestErrored = '>UTTestErrored<' +ResponseUTFinished = '>UTFinished<' +ResponseForkTo = RequestForkTo -PassiveStartup = '>PassiveStartup<' +PassiveStartup = '>PassiveStartup<' EOT = '>EOT<\n'
--- a/DebugClients/Python/DebugThread.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/DebugThread.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from DebugBase import * + class DebugThread(DebugBase): """ Class implementing a debug thread. @@ -21,8 +22,8 @@ Provides simple wrapper methods around bdb for the 'owning' client to call to step etc. """ - def __init__(self, dbgClient, targ = None, args = None, kwargs = None, - mainThread = 0): + def __init__(self, dbgClient, targ=None, args=None, kwargs=None, + mainThread=0): """ Constructor @@ -34,16 +35,16 @@ """ DebugBase.__init__(self, dbgClient) - self._target = targ + self._target = targ self._args = args self._kwargs = kwargs self._mainThread = mainThread # thread running tracks execution state of client code # it will always be 0 for main thread as that is tracked # by DebugClientThreads and Bdb... - self._threadRunning = 0 + self._threadRunning = 0 - self.__ident = None # id of this thread. + self.__ident = None # id of this thread. self.__name = "" def set_ident(self, id): @@ -82,7 +83,7 @@ """ Private method to bootstrap the thread. - It wraps the call to the user function to enable tracing + It wraps the call to the user function to enable tracing before hand. """ try: @@ -114,8 +115,8 @@ """ try: self._dbgClient.lockClient() - # if this thread came out of a lock, and we are quitting - # and we are still running, then get rid of tracing for this thread + # if this thread came out of a lock, and we are quitting + # and we are still running, then get rid of tracing for this thread if self.quitting and self._threadRunning: sys.settrace(None) sys.setprofile(None)
--- a/DebugClients/Python/FlexCompleter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/FlexCompleter.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,8 +5,8 @@ <h4>NOTE for eric5 variant</h4> - This version is a re-implementation of FlexCompleter - as found in the PyQwt package. It is modified to work with the eric5 debug + This version is a re-implementation of FlexCompleter + as found in the PyQwt package. It is modified to work with the eric5 debug clients. @@ -20,7 +20,7 @@ <h4>NOTE for FlexCompleter</h4> - This version is a re-implementation of rlcompleter with + This version is a re-implementation of rlcompleter with selectable namespace. The problem with rlcompleter is that it's hardwired to work with @@ -103,11 +103,12 @@ __all__ = ["Completer"] + class Completer(object): """ Class implementing the command line completer object. """ - def __init__(self, namespace = None): + def __init__(self, namespace=None): """ Create a new completer for the command line. @@ -126,7 +127,7 @@ """ if namespace and type(namespace) != type({}): - raise TypeError,'namespace must be a dictionary' + raise TypeError('namespace must be a dictionary') # Don't bind to namespace quite yet, but flag whether the user wants a # specific namespace or to use __main__.__dict__. This will allow us @@ -211,7 +212,7 @@ expr, attr = m.group(1, 3) object = eval(expr, self.namespace) words = dir(object) - if hasattr(object,'__class__'): + if hasattr(object, '__class__'): words.append('__class__') words = words + get_class_members(object.__class__) matches = [] @@ -229,6 +230,7 @@ pass return matches + def get_class_members(klass): """ Module function to retrieve the class members. @@ -241,7 +243,7 @@ return klass.getLazyNames() # vanilla Python stuff ret = dir(klass) - if hasattr(klass,'__bases__'): + if hasattr(klass, '__bases__'): for base in klass.__bases__: ret = ret + get_class_members(base) return ret
--- a/DebugClients/Python/PyProfile.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/PyProfile.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,13 +12,14 @@ import atexit import pickle + class PyProfile(profile.Profile): """ Class extending the standard Python profiler with additional methods. This class extends the standard Python profiler by the functionality to save the collected timing data in a timing cache, to restore these data - on subsequent calls, to store a profile dump to a standard filename and + on subsequent calls, to store a profile dump to a standard filename and to erase these caches. """ def __init__(self, basename, timer=None, bias=None): @@ -113,7 +114,7 @@ """ # get module name from __file__ if not isinstance(frame, profile.Profile.fake_frame) and \ - frame.f_globals.has_key('__file__'): + '__file__' in frame.f_globals: root, ext = os.path.splitext(frame.f_globals['__file__']) if ext == '.pyc' or ext == '.py': fixedName = root + '.py' @@ -144,7 +145,7 @@ fcode.co_firstlineno, fcode.co_name) self.cur = (t, 0, 0, fn, frame, self.cur) timings = self.timings - if timings.has_key(fn): + if fn in timings: cc, ns, tt, ct, callers = timings[fn] timings[fn] = cc, ns + 1, tt, ct, callers else:
--- a/DebugClients/Python/eric5dbgstub.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/eric5dbgstub.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,8 @@ if not ericpath in sys.path: sys.path.insert(-1, ericpath) -def initDebugger(kind = "standard"): + +def initDebugger(kind="standard"): """ Module function to initialize a debugger for remote debugging. @@ -46,6 +47,7 @@ return res + def runcall(func, *args): """ Module function mimicing the Pdb interface. @@ -57,6 +59,7 @@ global debugger, __scriptname return debugger.run_call(__scriptname, func, *args) + def setScriptname(name): """ Module function to set the scriptname to be reported back to the IDE. @@ -66,8 +69,9 @@ global __scriptname __scriptname = name -def startDebugger(enableTrace = True, exceptions = True, - tracePython = False, redirect = True): + +def startDebugger(enableTrace=True, exceptions=True, + tracePython=False, redirect=True): """ Module function used to start the remote debugger. @@ -78,8 +82,8 @@ """ global debugger if debugger: - debugger.startDebugger(enableTrace = enableTrace, exceptions = exceptions, - tracePython = tracePython, redirect = redirect) + debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions, + tracePython=tracePython, redirect=redirect) # # eflag: FileType = Python2
--- a/DebugClients/Python/getpass.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python/getpass.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,7 +13,8 @@ is to provide a debugger compatible variant of the a.m. functions. """ -__all__ = ["getpass","getuser"] +__all__ = ["getpass", "getuser"] + def getuser(): """ @@ -37,6 +38,7 @@ import pwd return pwd.getpwuid(os.getuid())[0] + def getpass(prompt='Password: '): """ Function to prompt for a password, with echo turned off.
--- a/DebugClients/Python3/AsyncFile.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/AsyncFile.py Fri Mar 11 16:51:57 2011 +0100 @@ -70,7 +70,7 @@ @param n the number of bytes to be written (int) """ if n: - try : + try: buf = "{0!s}{1!s}".format(self.wpending[:n], EOT) try: buf = buf.encode('utf8', 'backslashreplace') @@ -82,7 +82,7 @@ except socket.error: self.nWriteErrors += 1 if self.nWriteErrors > self.maxtries: - self.wpending = '' # delete all output + self.wpending = '' # delete all output def pendingWrite(self): """ @@ -92,7 +92,7 @@ """ return self.wpending.rfind('\n') + 1 - def close(self, closeit = False): + def close(self, closeit=False): """ Public method to close the file. @@ -128,7 +128,7 @@ except socket.error: return -1 - def read_p(self, size = -1): + def read_p(self, size=-1): """ Public method to read bytes from this file. @@ -142,7 +142,7 @@ return self.sock.recv(size).decode('utf8') - def read(self, size = -1): + def read(self, size=-1): """ Public method to read bytes from this file. @@ -156,7 +156,7 @@ buf = buf[:size] return buf - def readline_p(self, size = -1): + def readline_p(self, size=-1): """ Public method to read a line from this file. @@ -187,7 +187,7 @@ # Now we know how big the line is, read it for real. return self.sock.recv(size).decode('utf8') - def readlines(self, sizehint = -1): + def readlines(self, sizehint=-1): """ Public method to read all lines from this file. @@ -216,7 +216,7 @@ return lines - def readline(self, sizehint = -1): + def readline(self, sizehint=-1): """ Public method to read one line from this file. @@ -230,7 +230,7 @@ line = line[:sizehint] return line - def seek(self, offset, whence = 0): + def seek(self, offset, whence=0): """ Public method to move the filepointer. @@ -250,7 +250,7 @@ """ raise IOError((29, '[Errno 29] Illegal seek')) - def truncate(self, size = -1): + def truncate(self, size=-1): """ Public method to truncate the file.
--- a/DebugClients/Python3/AsyncIO.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/AsyncIO.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,6 +7,7 @@ Module implementing a base class of an asynchronous interface for the debugger. """ + class AsyncIO(object): """ Class implementing asynchronous reading and writing.
--- a/DebugClients/Python3/DCTestResult.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DCTestResult.py Fri Mar 11 16:51:57 2011 +0100 @@ -74,7 +74,7 @@ self.parent.write('{0}\n'.format(ResponseUTStopTest)) # ensure that pending input is processed - rrdy, wrdy, xrdy = select.select([self.parent.readstream],[],[], 0.01) + rrdy, wrdy, xrdy = select.select([self.parent.readstream], [], [], 0.01) if self.parent.readstream in rrdy: - self.parent.readReady(self.parent.readstream.fileno()) \ No newline at end of file + self.parent.readReady(self.parent.readstream.fileno())
--- a/DebugClients/Python3/DebugBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DebugBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ gRecursionLimit = 64 + def printerr(s): """ Module function used for debugging the debug client. @@ -26,6 +27,7 @@ sys.__stderr__.write('{0!s}\n'.format(s)) sys.__stderr__.flush() + def setRecursionLimit(limit): """ Module function to set the recursion limit. @@ -35,6 +37,7 @@ global gRecursionLimit gRecursionLimit = limit + class DebugBase(bdb.Bdb): """ Class implementing base class of the debugger. @@ -83,7 +86,7 @@ @return the current frame """ - return self.currentFrame + return self.currentFrame def getCurrentFrameLocals(self): """ @@ -91,7 +94,7 @@ @return locals dictionary of the current frame """ - return self.currentFrameLocals + return self.currentFrameLocals def step(self, traceMode): """ @@ -139,14 +142,14 @@ def profile(self, frame, event, arg): """ - Public method used to trace some stuff independant of the debugger + Public method used to trace some stuff independant of the debugger trace function. @param frame The current stack frame. @param event The trace event (string) @param arg The arguments """ - if event == 'return': + if event == 'return': self.cFrame = frame.f_back self.__recursionDepth -= 1 elif event == 'call': @@ -170,7 +173,7 @@ @return local trace function """ if self.quitting: - return # None + return # None # give the client a chance to push through new break points. self._dbgClient.eventPoll() @@ -240,7 +243,7 @@ raise bdb.BdbQuit return self.trace_dispatch - def set_trace(self, frame = None): + def set_trace(self, frame=None): """ Overridden method of bdb.py to do some special setup. @@ -264,7 +267,7 @@ def set_quit(self): """ - Public method to quit. + Public method to quit. It wraps call to bdb to clear the current frame properly. """ @@ -305,7 +308,7 @@ return frame.f_code.co_filename - def set_watch(self, cond, temporary = False): + def set_watch(self, cond, temporary=False): """ Public method to set a watch expression. @@ -330,7 +333,7 @@ @param cond expression of the watch expression to be cleared (string) """ - try: + try: possibles = bdb.Breakpoint.bplist["Watch", 0] for i in range(0, len(possibles)): b = possibles[i] @@ -420,7 +423,7 @@ def break_here(self, frame): """ - Reimplemented from bdb.py to fix the filename from the frame. + Reimplemented from bdb.py to fix the filename from the frame. See fix_frame_filename for more info. @@ -576,7 +579,7 @@ self._dbgClient.write('{0}{1}\n'.format(ResponseLine, str(stack))) self._dbgClient.eventLoop() - def user_exception(self, frame, excinfo, unhandled = False): + def user_exception(self, frame, excinfo, unhandled=False): """ Reimplemented to report an exception to the debug server. @@ -694,7 +697,7 @@ if self.__skip_it(frame): return False - return bdb.Bdb.stop_here(self,frame) + return bdb.Bdb.stop_here(self, frame) def __skip_it(self, frame): """ @@ -718,8 +721,8 @@ if os.path.basename(fn) in [\ 'AsyncFile.py', 'AsyncIO.py', 'DebugConfig.py', 'DCTestResult.py', - 'DebugBase.py', 'DebugClientBase.py', - 'DebugClientCapabilities.py', 'DebugClient.py', + 'DebugBase.py', 'DebugClientBase.py', + 'DebugClientCapabilities.py', 'DebugClient.py', 'DebugClientThreads.py', 'DebugProtocol.py', 'DebugThread.py', 'FlexCompleter.py', 'PyProfile.py'] or \
--- a/DebugClients/Python3/DebugClientBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DebugClientBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,7 +30,8 @@ ################################################################################ -def DebugClientInput(prompt = "", echo = True): + +def DebugClientInput(prompt="", echo=True): """ Replacement for the standard input builtin. @@ -54,6 +55,7 @@ ################################################################################ + def DebugClientFork(): """ Replacement for the standard os.fork(). @@ -70,6 +72,7 @@ ################################################################################ + def DebugClientClose(fd): """ Replacement for the standard os.close(fd). @@ -88,6 +91,7 @@ ################################################################################ + def DebugClientSetRecursionLimit(limit): """ Replacement for the standard sys.setrecursionlimit(limit). @@ -106,6 +110,7 @@ ################################################################################ + class DebugClientBase(object): """ Class implementing the client side of the debugger. @@ -120,12 +125,12 @@ The protocol is as follows. First the client opens a connection to the debugger and then sends a series of one line commands. A command is either - >Load<, >Step<, >StepInto<, ... or a Python statement. + >Load<, >Step<, >StepInto<, ... or a Python statement. See DebugProtocol.py for a listing of valid protocol tokens. A Python statement consists of the statement to execute, followed (in a separate line) by >OK?<. If the statement was incomplete then the response - is >Continue<. If there was an exception then the response is + is >Continue<. If there was an exception then the response is >Exception<. Otherwise the response is >OK<. The reason for the >OK?< part is to provide a sentinal (ie. the responding >OK<) after any possible output as a @@ -243,17 +248,17 @@ return self.__coding = default - def attachThread(self, target = None, args = None, kwargs = None, mainThread = False): + def attachThread(self, target=None, args=None, kwargs=None, mainThread=False): """ Public method to setup a thread for DebugClient to debug. - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. @param target the start function of the target thread (i.e. the user code) @param args arguments to pass to target @param kwargs keyword arguments to pass to target - @param mainThread True, if we are attaching to the already + @param mainThread True, if we are attaching to the already started mainthread of the app @return The identifier of the created thread """ @@ -283,7 +288,7 @@ self.write("{0}{1!r}\n".format(ResponseThreadList, (currentId, threadList))) - def input(self, prompt, echo = True): + def input(self, prompt, echo=True): """ Public method to implement input() using the event loop. @@ -304,7 +309,7 @@ """ self.pendingResponse = ResponseException - def sessionClose(self, exit = True): + def sessionClose(self, exit=True): """ Public method to close the session with the debugger and optionally terminate. @@ -330,7 +335,7 @@ # Ok, go away. sys.exit() - def __compileFileSource(self, filename, mode = 'exec'): + def __compileFileSource(self, filename, mode='exec'): """ Private method to compile source code read from a file. @@ -338,7 +343,7 @@ @param mode kind of code to be generated (string, exec or eval) @return compiled code object (None in case of errors) """ - with open(filename, encoding = self.__coding) as fp: + with open(filename, encoding=self.__coding) as fp: statement = fp.read() try: @@ -357,7 +362,7 @@ return code - def handleLine(self,line): + def handleLine(self, line): """ Public method to handle the receipt of a complete line. @@ -468,7 +473,7 @@ self.debugging = True self.threads.clear() - self.attachThread(mainThread = True) + self.attachThread(mainThread=True) # set the system exception handling function to ensure, that # we report on all unhandled exceptions @@ -482,7 +487,7 @@ # This will eventually enter a local event loop. # Note the use of backquotes to cause a repr of self.running. The # need for this is on Windows os where backslash is the path separator. - # They will get inadvertantly stripped away during the eval causing + # They will get inadvertantly stripped away during the eval causing # IOErrors, if self.running is passed as a normal str. self.debugMod.__dict__['__file__'] = self.running sys.modules['__main__'] = self.debugMod @@ -510,7 +515,7 @@ self.inRawMode = False self.threads.clear() - self.attachThread(mainThread = True) + self.attachThread(mainThread=True) # set the system exception handling function to ensure, that # we report on all unhandled exceptions @@ -520,7 +525,7 @@ self.debugMod.__dict__['__file__'] = sys.argv[0] sys.modules['__main__'] = self.debugMod - exec(open(sys.argv[0], encoding = self.__coding).read(), + exec(open(sys.argv[0], encoding=self.__coding).read(), self.debugMod.__dict__) self.writestream.flush() return @@ -550,7 +555,7 @@ self.prof.erase() self.debugMod.__dict__['__file__'] = sys.argv[0] sys.modules['__main__'] = self.debugMod - fp = open(sys.argv[0], encoding = self.__coding) + fp = open(sys.argv[0], encoding=self.__coding) try: script = fp.read() finally: @@ -579,8 +584,8 @@ sys.excepthook = self.__unhandled_exception # generate a coverage object - self.cover = coverage(auto_data = True, - data_file = "{0}.coverage".format(os.path.splitext(sys.argv[0])[0])) + self.cover = coverage(auto_data=True, + data_file="{0}.coverage".format(os.path.splitext(sys.argv[0])[0])) self.cover.use_cache(True) if int(erase): @@ -588,7 +593,7 @@ sys.modules['__main__'] = self.debugMod self.debugMod.__dict__['__file__'] = sys.argv[0] self.cover.start() - exec(open(sys.argv[0], encoding = self.__coding).read(), + exec(open(sys.argv[0], encoding=self.__coding).read(), self.debugMod.__dict__) self.cover.stop() self.cover.save() @@ -751,13 +756,13 @@ return if cmd == RequestBanner: - self.write('{0}{1}\n'.format(ResponseBanner, - str(("Python {0}".format(sys.version), + self.write('{0}{1}\n'.format(ResponseBanner, + str(("Python {0}".format(sys.version), socket.gethostname(), self.variant)))) return if cmd == RequestCapabilities: - self.write('{0}{1:d}, "Python3"\n'.format(ResponseCapabilities, + self.write('{0}{1:d}, "Python3"\n'.format(ResponseCapabilities, self.__clientCapabilities())) return @@ -798,8 +803,8 @@ # generate a coverage object if int(cov): from coverage import coverage - self.cover = coverage(auto_data = True, - data_file = "{0}.coverage".format(os.path.splitext(covname)[0])) + self.cover = coverage(auto_data=True, + data_file="{0}.coverage".format(os.path.splitext(covname)[0])) self.cover.use_cache(True) if int(erase): self.cover.erase() @@ -862,7 +867,7 @@ else: if code is None: self.pendingResponse = ResponseContinue - else: + else: self.buffer = '' try: @@ -941,7 +946,7 @@ except ImportError: return self.clientCapabilities & ~DebugClientCapabilities.HasProfiler - def write(self,s): + def write(self, s): """ Public method to write data to the output stream. @@ -963,7 +968,7 @@ # At this point simulate an event loop. self.eventLoop() - def eventLoop(self, disablePolling = False): + def eventLoop(self, disablePolling=False): """ Public method implementing our event loop. @@ -1038,11 +1043,11 @@ if self.errorstream in wrdy: self.writeReady(self.errorstream.fileno()) - def connectDebugger(self, port, remoteAddress = None, redirect = True): + def connectDebugger(self, port, remoteAddress=None, redirect=True): """ - Public method to establish a session with the debugger. + Public method to establish a session with the debugger. - It opens a network connection to the debugger, connects it to stdin, + It opens a network connection to the debugger, connects it to stdin, stdout and stderr and saves these file objects in case the application being debugged redirects them itself. @@ -1071,7 +1076,7 @@ self.redirect = redirect # attach to the main thread here - self.attachThread(mainThread = True) + self.attachThread(mainThread=True) def __unhandled_exception(self, exctype, excval, exctb): """ @@ -1087,7 +1092,7 @@ """ Public method to convert a filename to an absolute name. - sys.path is used as a set of possible prefixes. The name stays + sys.path is used as a set of possible prefixes. The name stays relative if a file could not be found. @param fn filename (string) @@ -1140,7 +1145,6 @@ if afn.startswith(d): return True - return False def getRunning(self): @@ -1306,12 +1310,12 @@ access = '{0!s}[{1!s}]'.format(oaccess, var[i]) else: access = '{0!s}[{1!s}]'.format(access, var[i]) - if var[i-1][:-2] == '...': + if var[i - 1][:-2] == '...': oaccess = access else: oaccess = '' try: - loc = {"dict" : dict} + loc = {"dict": dict} exec('mdict = dict{0!s}.__dict__\nobj = dict{0!s}'\ .format(access), globals(), loc) mdict = loc["mdict"] @@ -1323,13 +1327,13 @@ except: pass try: - loc = {"cdict" : {}, "dict" : dict} - exec('slv = dict{0!s}.__slots__'.format(access), + loc = {"cdict": {}, "dict": dict} + exec('slv = dict{0!s}.__slots__'.format(access), globals(), loc) for v in loc["slv"]: try: loc["v"] = v - exec('cdict[v] = dict{0!s}.{1!s}'.format(access, v), + exec('cdict[v] = dict{0!s}.{1!s}'.format(access, v), globals, loc) except: pass @@ -1348,11 +1352,11 @@ pass try: slv = dict[var[i]].__slots__ - loc = {"cdict" : {}, "dict" : dict, "var" : var, "i" : i} + loc = {"cdict": {}, "dict": dict, "var": var, "i": i} for v in slv: try: loc["v"] = v - exec('cdict[v] = dict[var[i]].{0!s}'.format(v), + exec('cdict[v] = dict[var[i]].{0!s}'.format(v), globals(), loc) except: pass @@ -1367,13 +1371,13 @@ if ("sipThis" in dict.keys() and len(dict) == 1) or \ (len(dict) == 0 and len(udict) > 0): if access: - loc = {"udict" : udict} + loc = {"udict": udict} exec('qvar = udict{0!s}'.format(access), globals(), loc) qvar = loc["qvar"] # this has to be in line with VariablesViewer.indicators elif rvar and rvar[0][-2:] in ["[]", "()", "{}"]: - loc = {"udict" : udict} - exec('qvar = udict["{0!s}"][{1!s}]'.format(rvar[0][:-2], rvar[1]), + loc = {"udict": udict} + exec('qvar = udict["{0!s}"][{1!s}]'.format(rvar[0][:-2], rvar[1]), globals(), loc) qvar = loc["qvar"] else: @@ -1390,7 +1394,7 @@ else: # treatment for sequences and dictionaries if access: - loc = {"dict" : dict} + loc = {"dict": dict} exec("dict = dict{0!s}".format(access), globals(), loc) dict = loc["dict"] else: @@ -1399,7 +1403,7 @@ dictkeys = dict.keys() else: dictkeys = range(len(dict)) - vlist = self.__formatVariablesList(dictkeys, dict, scope, filter, + vlist = self.__formatVariablesList(dictkeys, dict, scope, filter, formatSequences) varlist.extend(vlist) @@ -1419,8 +1423,8 @@ @param value variable to be formatted @param vtype type of the variable to be formatted (string) - @return A tuple consisting of a list of formatted variables. Each - variable entry is a tuple of three elements, the variable name, + @return A tuple consisting of a list of formatted variables. Each + variable entry is a tuple of three elements, the variable name, its type and value. """ qttype = vtype.split('.')[-1] @@ -1453,13 +1457,13 @@ elif qttype == 'QColor': varlist.append(("name", "str", "{0}".format(value.name()))) r, g, b, a = value.getRgb() - varlist.append(("rgb", "int", + varlist.append(("rgb", "int", "{0:d}, {1:d}, {2:d}, {3:d}".format(r, g, b, a))) h, s, v, a = value.getHsv() - varlist.append(("hsv", "int", + varlist.append(("hsv", "int", "{0:d}, {1:d}, {2:d}, {3:d}".format(h, s, v, a))) c, m, y, k, a = value.getCmyk() - varlist.append(("cmyk", "int", + varlist.append(("cmyk", "int", "{0:d}, {1:d}, {2:d}, {3:d}, {4:d}".format(c, m, y, k, a))) elif qttype == 'QDate': varlist.append(("", "QDate", "{0}".format(value.toString()))) @@ -1469,9 +1473,9 @@ varlist.append(("", "QDateTime", "{0}".format(value.toString()))) elif qttype == 'QDir': varlist.append(("path", "str", "{0}".format(value.path()))) - varlist.append(("absolutePath", "str", + varlist.append(("absolutePath", "str", "{0}".format(value.absolutePath()))) - varlist.append(("canonicalPath", "str", + varlist.append(("canonicalPath", "str", "{0}".format(value.canonicalPath()))) elif qttype == 'QFile': varlist.append(("fileName", "str", "{0}".format(value.fileName()))) @@ -1495,7 +1499,7 @@ varlist.append(("row", "int", "{0}".format(value.row()))) varlist.append(("column", "int", "{0}".format(value.column()))) varlist.append(("internalId", "int", "{0}".format(value.internalId()))) - varlist.append(("internalPointer", "void *", + varlist.append(("internalPointer", "void *", "{0}".format(value.internalPointer()))) elif qttype == 'QRegExp': varlist.append(("pattern", "str", "{0}".format(value.pattern()))) @@ -1507,7 +1511,7 @@ varlist.append(("icon text", "str", "{0}".format(value.iconText()))) varlist.append(("tooltip", "str", "{0}".format(value.toolTip()))) varlist.append(("whatsthis", "str", "{0}".format(value.whatsThis()))) - varlist.append(("shortcut", "str", + varlist.append(("shortcut", "str", "{0}".format(value.shortcut().toString()))) elif qttype == 'QKeySequence': varlist.append(("value", "", "{0}".format(value.toString()))) @@ -1534,30 +1538,30 @@ return varlist - def __formatVariablesList(self, keylist, dict, scope, filter = [], - formatSequences = False): + def __formatVariablesList(self, keylist, dict, scope, filter=[], + formatSequences=False): """ Private method to produce a formated variables list. The dictionary passed in to it is scanned. Variables are - only added to the list, if their type is not contained + only added to the list, if their type is not contained in the filter list and their name doesn't match any of the filter expressions. The formated variables list (a list of tuples of 3 values) is returned. @param keylist keys of the dictionary @param dict the dictionary to be scanned - @param scope 1 to filter using the globals filter, 0 using the locals + @param scope 1 to filter using the globals filter, 0 using the locals filter (int). Variables are only added to the list, if their name do not match any of the filter expressions. @param filter the indices of variable types to be filtered. Variables are - only added to the list, if their type is not contained in the filter + only added to the list, if their type is not contained in the filter list. @param formatSequences flag indicating, that sequence or dictionary variables should be formatted. If it is 0 (or false), just the number of items contained in these variables is returned. (boolean) @return A tuple consisting of a list of formatted variables. Each variable - entry is a tuple of three elements, the variable name, its type and + entry is a tuple of three elements, the variable name, its type and value. """ varlist = [] @@ -1631,7 +1635,7 @@ """ Private slot to convert a filter string to a list of filter objects. - @param scope 1 to generate filter for global variables, 0 for local + @param scope 1 to generate filter for global variables, 0 for local variables (int) @param filterString string of filter patterns separated by ';' """ @@ -1660,7 +1664,7 @@ if pos == -1: text = '' else: - text = text[pos+1:] + text = text[pos + 1:] break pos -= 1 @@ -1678,8 +1682,8 @@ self.write("{0}{1}||{2}\n".format(ResponseCompletion, str(completions), text)) - def startDebugger(self, filename = None, host = None, port = None, - enableTrace = True, exceptions = True, tracePython = False, redirect = True): + def startDebugger(self, filename=None, host=None, port=None, + enableTrace=True, exceptions=True, tracePython=False, redirect=True): """ Public method used to start the remote debugger. @@ -1719,7 +1723,7 @@ self.inRawMode = False self.debugging = True - self.attachThread(mainThread = True) + self.attachThread(mainThread=True) self.mainThread.tracePython = tracePython # set the system exception handling function to ensure, that @@ -1730,12 +1734,12 @@ if enableTrace: self.mainThread.set_trace() - def startProgInDebugger(self, progargs, wd = '', host = None, - port = None, exceptions = True, tracePython = False, redirect = True): + def startProgInDebugger(self, progargs, wd='', host=None, + port=None, exceptions=True, tracePython=False, redirect=True): """ Public method used to start the remote debugger. - @param progargs commandline for the program to be debugged + @param progargs commandline for the program to be debugged (list of strings) @param wd working directory for the program execution (string) @param host hostname of the debug server (string) @@ -1771,7 +1775,7 @@ self.write("{0}{1}|{2:d}\n".format(PassiveStartup, self.running, exceptions)) self.__interact() - self.attachThread(mainThread = True) + self.attachThread(mainThread=True) self.mainThread.tracePython = tracePython # set the system exception handling function to ensure, that @@ -1798,7 +1802,7 @@ @param *args arguments being passed to func @return result of the function call """ - self.startDebugger(scriptname, enableTrace = False) + self.startDebugger(scriptname, enableTrace=False) res = self.mainThread.runcall(func, *args) self.progTerminated(res) return res @@ -1867,10 +1871,10 @@ else: if not self.noencoding: self.__coding = self.defaultCoding - self.startProgInDebugger(args, wd, host, port, - exceptions = exceptions, - tracePython = tracePython, - redirect = redirect) + self.startProgInDebugger(args, wd, host, port, + exceptions=exceptions, + tracePython=tracePython, + redirect=redirect) else: if sys.argv[1] == '--no-encoding': self.noencoding = True @@ -1936,7 +1940,7 @@ @param fd file descriptor to be closed (integer) """ - if fd in [self.readstream.fileno(), self.writestream.fileno(), + if fd in [self.readstream.fileno(), self.writestream.fileno(), self.errorstream.fileno()]: return @@ -1944,13 +1948,13 @@ def __getSysPath(self, firstEntry): """ - Private slot to calculate a path list including the PYTHONPATH + Private slot to calculate a path list including the PYTHONPATH environment variable. @param firstEntry entry to be put first in sys.path (string) @return path list for use as sys.path (list of strings) """ - sysPath = [path for path in os.environ.get("PYTHONPATH", "").split(os.pathsep) + sysPath = [path for path in os.environ.get("PYTHONPATH", "").split(os.pathsep) if path not in sys.path] + sys.path[:] if "" in sysPath: sysPath.remove("")
--- a/DebugClients/Python3/DebugClientCapabilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DebugClientCapabilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,13 +7,13 @@ Module defining the debug clients capabilities. """ -HasDebugger = 0x0001 -HasInterpreter = 0x0002 -HasProfiler = 0x0004 -HasCoverage = 0x0008 -HasCompleter = 0x0010 -HasUnittest = 0x0020 -HasShell = 0x0040 +HasDebugger = 0x0001 +HasInterpreter = 0x0002 +HasProfiler = 0x0004 +HasCoverage = 0x0008 +HasCompleter = 0x0010 +HasUnittest = 0x0020 +HasShell = 0x0040 HasAll = HasDebugger | HasInterpreter | HasProfiler | \ HasCoverage | HasCompleter | HasUnittest | HasShell
--- a/DebugClients/Python3/DebugClientThreads.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DebugClientThreads.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,18 +15,18 @@ import DebugClientBase -def _debugclient_start_new_thread(target, args, kwargs = {}): +def _debugclient_start_new_thread(target, args, kwargs={}): """ Module function used to allow for debugging of multiple threads. - The way it works is that below, we reset _thread._start_new_thread to + The way it works is that below, we reset _thread._start_new_thread to this function object. Thus, providing a hook for us to see when - threads are started. From here we forward the request onto the + threads are started. From here we forward the request onto the DebugClient which will create a DebugThread object to allow tracing of the thread then start up the thread. These actions are always performed in order to allow dropping into debug mode. - See DebugClientThreads.attachThread and DebugThread.DebugThread in + See DebugClientThreads.attachThread and DebugThread.DebugThread in DebugThread.py @param target the start function of the target thread (i.e. the user code) @@ -39,14 +39,15 @@ else: return _original_start_thread(target, args, kwargs) -# make _thread hooks available to system +# make _thread hooks available to system _original_start_thread = _thread.start_new_thread _thread.start_new_thread = _debugclient_start_new_thread -# NOTE: import threading here AFTER above hook, as threading cache's +# NOTE: import threading here AFTER above hook, as threading cache's # thread._start_new_thread. from threading import RLock + class DebugClientThreads(DebugClientBase.DebugClientBase, AsyncIO): """ Class implementing the client side of the debugger. @@ -74,17 +75,17 @@ self.variant = 'Threaded' - def attachThread(self, target = None, args = None, kwargs = None, mainThread = False): + def attachThread(self, target=None, args=None, kwargs=None, mainThread=False): """ Public method to setup a thread for DebugClient to debug. - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. @param target the start function of the target thread (i.e. the user code) @param args arguments to pass to target @param kwargs keyword arguments to pass to target - @param mainThread True, if we are attaching to the already + @param mainThread True, if we are attaching to the already started mainthread of the app @return identifier of the created thread """ @@ -119,7 +120,7 @@ finally: self.unlockClient() - def lockClient(self, blocking = True): + def lockClient(self, blocking=True): """ Public method to acquire the lock for this client. @@ -155,7 +156,7 @@ finally: self.unlockClient() - def eventLoop(self, disablePolling = False): + def eventLoop(self, disablePolling=False): """ Public method implementing our event loop.
--- a/DebugClients/Python3/DebugProtocol.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DebugProtocol.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,67 +11,67 @@ DebugAddress = '127.0.0.1' # The protocol "words". -RequestOK = '>OK?<' -RequestEnv = '>Environment<' -RequestCapabilities = '>Capabilities<' -RequestLoad = '>Load<' -RequestRun = '>Run<' -RequestCoverage = '>Coverage<' -RequestProfile = '>Profile<' -RequestContinue = '>Continue<' -RequestStep = '>Step<' -RequestStepOver = '>StepOver<' -RequestStepOut = '>StepOut<' -RequestStepQuit = '>StepQuit<' -RequestBreak = '>Break<' -RequestBreakEnable = '>EnableBreak<' -RequestBreakIgnore = '>IgnoreBreak<' -RequestWatch = '>Watch<' -RequestWatchEnable = '>EnableWatch<' -RequestWatchIgnore = '>IgnoreWatch<' -RequestVariables = '>Variables<' -RequestVariable = '>Variable<' -RequestSetFilter = '>SetFilter<' -RequestThreadList = '>ThreadList<' -RequestThreadSet = '>ThreadSet<' -RequestEval = '>Eval<' -RequestExec = '>Exec<' -RequestShutdown = '>Shutdown<' -RequestBanner = '>Banner<' -RequestCompletion = '>Completion<' -RequestUTPrepare = '>UTPrepare<' -RequestUTRun = '>UTRun<' -RequestUTStop = '>UTStop<' -RequestForkTo = '>ForkTo<' -RequestForkMode = '>ForkMode<' +RequestOK = '>OK?<' +RequestEnv = '>Environment<' +RequestCapabilities = '>Capabilities<' +RequestLoad = '>Load<' +RequestRun = '>Run<' +RequestCoverage = '>Coverage<' +RequestProfile = '>Profile<' +RequestContinue = '>Continue<' +RequestStep = '>Step<' +RequestStepOver = '>StepOver<' +RequestStepOut = '>StepOut<' +RequestStepQuit = '>StepQuit<' +RequestBreak = '>Break<' +RequestBreakEnable = '>EnableBreak<' +RequestBreakIgnore = '>IgnoreBreak<' +RequestWatch = '>Watch<' +RequestWatchEnable = '>EnableWatch<' +RequestWatchIgnore = '>IgnoreWatch<' +RequestVariables = '>Variables<' +RequestVariable = '>Variable<' +RequestSetFilter = '>SetFilter<' +RequestThreadList = '>ThreadList<' +RequestThreadSet = '>ThreadSet<' +RequestEval = '>Eval<' +RequestExec = '>Exec<' +RequestShutdown = '>Shutdown<' +RequestBanner = '>Banner<' +RequestCompletion = '>Completion<' +RequestUTPrepare = '>UTPrepare<' +RequestUTRun = '>UTRun<' +RequestUTStop = '>UTStop<' +RequestForkTo = '>ForkTo<' +RequestForkMode = '>ForkMode<' -ResponseOK = '>OK<' -ResponseCapabilities = RequestCapabilities -ResponseContinue = '>Continue<' -ResponseException = '>Exception<' -ResponseSyntax = '>SyntaxError<' -ResponseExit = '>Exit<' -ResponseLine = '>Line<' -ResponseRaw = '>Raw<' -ResponseClearBreak = '>ClearBreak<' +ResponseOK = '>OK<' +ResponseCapabilities = RequestCapabilities +ResponseContinue = '>Continue<' +ResponseException = '>Exception<' +ResponseSyntax = '>SyntaxError<' +ResponseExit = '>Exit<' +ResponseLine = '>Line<' +ResponseRaw = '>Raw<' +ResponseClearBreak = '>ClearBreak<' ResponseBPConditionError = '>BPConditionError<' -ResponseClearWatch = '>ClearWatch<' +ResponseClearWatch = '>ClearWatch<' ResponseWPConditionError = '>WPConditionError<' -ResponseVariables = RequestVariables -ResponseVariable = RequestVariable -ResponseThreadList = RequestThreadList -ResponseThreadSet = RequestThreadSet -ResponseStack = '>CurrentStack<' -ResponseBanner = RequestBanner -ResponseCompletion = RequestCompletion -ResponseUTPrepared = '>UTPrepared<' -ResponseUTStartTest = '>UTStartTest<' -ResponseUTStopTest = '>UTStopTest<' -ResponseUTTestFailed = '>UTTestFailed<' -ResponseUTTestErrored = '>UTTestErrored<' -ResponseUTFinished = '>UTFinished<' -ResponseForkTo = RequestForkTo +ResponseVariables = RequestVariables +ResponseVariable = RequestVariable +ResponseThreadList = RequestThreadList +ResponseThreadSet = RequestThreadSet +ResponseStack = '>CurrentStack<' +ResponseBanner = RequestBanner +ResponseCompletion = RequestCompletion +ResponseUTPrepared = '>UTPrepared<' +ResponseUTStartTest = '>UTStartTest<' +ResponseUTStopTest = '>UTStopTest<' +ResponseUTTestFailed = '>UTTestFailed<' +ResponseUTTestErrored = '>UTTestErrored<' +ResponseUTFinished = '>UTFinished<' +ResponseForkTo = RequestForkTo -PassiveStartup = '>PassiveStartup<' +PassiveStartup = '>PassiveStartup<' EOT = '>EOT<\n'
--- a/DebugClients/Python3/DebugThread.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/DebugThread.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from DebugBase import * + class DebugThread(DebugBase): """ Class implementing a debug thread. @@ -21,8 +22,8 @@ Provides simple wrapper methods around bdb for the 'owning' client to call to step etc. """ - def __init__(self, dbgClient, targ = None, args = None, kwargs = None, - mainThread = False): + def __init__(self, dbgClient, targ=None, args=None, kwargs=None, + mainThread=False): """ Constructor @@ -34,7 +35,7 @@ """ DebugBase.__init__(self, dbgClient) - self._target = targ + self._target = targ self._args = args self._kwargs = kwargs self._mainThread = mainThread @@ -43,7 +44,7 @@ # by DebugClientThreads and Bdb... self._threadRunning = False - self.__ident = None # id of this thread. + self.__ident = None # id of this thread. self.__name = "" def set_ident(self, id): @@ -82,7 +83,7 @@ """ Private method to bootstrap the thread. - It wraps the call to the user function to enable tracing + It wraps the call to the user function to enable tracing before hand. """ try: @@ -113,8 +114,8 @@ """ try: self._dbgClient.lockClient() - # if this thread came out of a lock, and we are quitting - # and we are still running, then get rid of tracing for this thread + # if this thread came out of a lock, and we are quitting + # and we are still running, then get rid of tracing for this thread if self.quitting and self._threadRunning: sys.settrace(None) sys.setprofile(None)
--- a/DebugClients/Python3/FlexCompleter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/FlexCompleter.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,8 +5,8 @@ <h4>NOTE for eric5 variant</h4> - This version is a re-implementation of rlcompleter - as found in the Python3 library. It is modified to work with the eric5 + This version is a re-implementation of rlcompleter + as found in the Python3 library. It is modified to work with the eric5 debug clients. <h4>Original rlcompleter documentation</h4> @@ -53,11 +53,12 @@ __all__ = ["Completer"] + class Completer(object): """ Class implementing the command line completer object. """ - def __init__(self, namespace = None): + def __init__(self, namespace=None): """ Create a new completer for the command line. @@ -176,7 +177,7 @@ if "__builtins__" in words: words.remove("__builtins__") - if hasattr(object,'__class__'): + if hasattr(object, '__class__'): words.append('__class__') words = words + get_class_members(object.__class__) matches = [] @@ -194,6 +195,7 @@ pass return matches + def get_class_members(klass): """ Module function to retrieve the class members. @@ -205,4 +207,4 @@ if hasattr(klass, '__bases__'): for base in klass.__bases__: ret = ret + get_class_members(base) - return ret \ No newline at end of file + return ret
--- a/DebugClients/Python3/PyProfile.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/PyProfile.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,16 +12,17 @@ import atexit import pickle + class PyProfile(profile.Profile): """ Class extending the standard Python profiler with additional methods. This class extends the standard Python profiler by the functionality to save the collected timing data in a timing cache, to restore these data - on subsequent calls, to store a profile dump to a standard filename and + on subsequent calls, to store a profile dump to a standard filename and to erase these caches. """ - def __init__(self, basename, timer = None, bias = None): + def __init__(self, basename, timer=None, bias=None): """ Constructor
--- a/DebugClients/Python3/eric5dbgstub.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/eric5dbgstub.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,8 @@ if not ericpath in sys.path: sys.path.insert(-1, ericpath) -def initDebugger(kind = "standard"): + +def initDebugger(kind="standard"): """ Module function to initialize a debugger for remote debugging. @@ -46,6 +47,7 @@ return res + def runcall(func, *args): """ Module function mimicing the Pdb interface. @@ -57,6 +59,7 @@ global debugger, __scriptname return debugger.run_call(__scriptname, func, *args) + def setScriptname(name): """ Module function to set the scriptname to be reported back to the IDE. @@ -66,8 +69,9 @@ global __scriptname __scriptname = name -def startDebugger(enableTrace = True, exceptions = True, - tracePython = False, redirect = True): + +def startDebugger(enableTrace=True, exceptions=True, + tracePython=False, redirect=True): """ Module function used to start the remote debugger. @@ -78,5 +82,5 @@ """ global debugger if debugger: - debugger.startDebugger(enableTrace = enableTrace, exceptions = exceptions, - tracePython = tracePython, redirect = redirect) \ No newline at end of file + debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions, + tracePython=tracePython, redirect=redirect)
--- a/DebugClients/Python3/getpass.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DebugClients/Python3/getpass.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ __all__ = ["getpass", "getuser"] + def getuser(): """ Function to get the username from the environment or password database. @@ -37,7 +38,8 @@ import pwd return pwd.getpwuid(os.getuid())[0] -def getpass(prompt = 'Password: '): + +def getpass(prompt='Password: '): """ Function to prompt for a password, with echo turned off.
--- a/Debugger/BreakPointModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/BreakPointModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,13 +9,14 @@ from PyQt4.QtCore import * + class BreakPointModel(QAbstractItemModel): """ Class implementing a custom model for breakpoints. """ dataAboutToBeChanged = pyqtSignal(QModelIndex, QModelIndex) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -41,7 +42,7 @@ Qt.Alignment(Qt.AlignHCenter), ] - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the current column count. @@ -49,7 +50,7 @@ """ return len(self.header) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the current row count. @@ -102,7 +103,7 @@ return Qt.ItemIsEnabled | Qt.ItemIsSelectable - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get header data. @@ -119,7 +120,7 @@ return None - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to create an index. @@ -144,7 +145,7 @@ """ return QModelIndex() - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check for the presence of child items. @@ -165,7 +166,7 @@ @param fn filename of the breakpoint (string) @param line line number of the breakpoint (integer) @param properties properties of the breakpoint - (tuple of condition (string), temporary flag (bool), + (tuple of condition (string), temporary flag (bool), enabled flag (bool), ignore count (integer)) """ bp = [fn, line] + list(properties) @@ -182,13 +183,13 @@ @param fn filename of the breakpoint (string) @param line line number of the breakpoint (integer) @param properties properties of the breakpoint - (tuple of condition (string), temporary flag (bool), + (tuple of condition (string), temporary flag (bool), enabled flag (bool), ignore count (integer)) """ if index.isValid(): row = index.row() index1 = self.createIndex(row, 0, self.breakpoints[row]) - index2 = self.createIndex(row, len(self.breakpoints[row]), + index2 = self.createIndex(row, len(self.breakpoints[row]), self.breakpoints[row]) self.dataAboutToBeChanged.emit(index1, index2) i = 0 @@ -234,7 +235,7 @@ for index in idxList: if index.isValid(): rows.append(index.row()) - rows.sort(reverse = True) + rows.sort(reverse=True) for row in rows: self.beginRemoveRows(QModelIndex(), row, row) del self.breakpoints[row] @@ -258,7 +259,7 @@ condition, temporary flag, enabled flag, ignore count)) """ if index.isValid(): - return self.breakpoints[index.row()][:] # return a copy + return self.breakpoints[index.row()][:] # return a copy else: return [] @@ -284,7 +285,7 @@ @param index index of the breakpoint to test (QModelIndex) @return flag indicating a temporary breakpoint (boolean) """ - if index.isValid(): + if index.isValid(): return self.breakpoints[index.row()][3] else: return False
--- a/Debugger/BreakPointViewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/BreakPointViewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from .EditBreakpointDialog import EditBreakpointDialog + class BreakPointViewer(QTreeView): """ Class implementing the Breakpoint viewer widget. @@ -25,7 +26,7 @@ """ sourceFile = pyqtSignal(str, int) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -94,7 +95,7 @@ """ Private slot to resort the tree. """ - self.model().sort(self.header().sortIndicatorSection(), + self.model().sort(self.header().sortIndicatorSection(), self.header().sortIndicatorOrder()) def __toSourceIndex(self, index): @@ -113,7 +114,7 @@ """ return self.sortingModel.mapFromSource(sindex) - def __setRowSelected(self, index, selected = True): + def __setRowSelected(self, index, selected=True): """ Private slot to select a complete row. @@ -168,15 +169,15 @@ self.multiMenu = QMenu() self.multiMenu.addAction(self.trUtf8("Add"), self.__addBreak) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8("Enable selected"), + self.multiMenu.addAction(self.trUtf8("Enable selected"), self.__enableSelectedBreaks) self.multiMenu.addAction(self.trUtf8("Enable all"), self.__enableAllBreaks) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8("Disable selected"), + self.multiMenu.addAction(self.trUtf8("Disable selected"), self.__disableSelectedBreaks) self.multiMenu.addAction(self.trUtf8("Disable all"), self.__disableAllBreaks) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8("Delete selected"), + self.multiMenu.addAction(self.trUtf8("Delete selected"), self.__deleteSelectedBreaks) self.multiMenu.addAction(self.trUtf8("Delete all"), self.__deleteAllBreaks) self.multiMenu.addSeparator() @@ -214,8 +215,8 @@ Private slot to handle the add breakpoint context menu entry. """ dlg = EditBreakpointDialog((self.fnHistory[0], None), None, - self.condHistory, self, modal = 1, addMode = 1, - filenameHistory = self.fnHistory) + self.condHistory, self, modal=1, addMode=1, + filenameHistory=self.fnHistory) if dlg.exec_() == QDialog.Accepted: fn, line, cond, temp, enabled, count = dlg.getAddData() if fn is not None: @@ -264,7 +265,7 @@ fn, line, cond, temp, enabled, count = bp[:6] dlg = EditBreakpointDialog((fn, line), (cond, temp, enabled, count), - self.condHistory, self, modal = True) + self.condHistory, self, modal=True) if dlg.exec_() == QDialog.Accepted: cond, temp, enabled, count = dlg.getData() if cond: @@ -272,7 +273,7 @@ self.condHistory.remove(cond) self.condHistory.insert(0, cond) - self.__model.setBreakPointByIndex(sindex, + self.__model.setBreakPointByIndex(sindex, fn, line, (cond, temp, enabled, count)) self.__resizeColumns() self.__resort() @@ -436,4 +437,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
--- a/Debugger/Config.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/Config.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,46 +12,46 @@ # Variables type definition ConfigVarTypeDispStrings = [ - QT_TRANSLATE_NOOP('Variable Types', 'Hidden Attributes'), - QT_TRANSLATE_NOOP('Variable Types', 'None'), - QT_TRANSLATE_NOOP('Variable Types', 'Type'), - QT_TRANSLATE_NOOP('Variable Types', 'Boolean'), - QT_TRANSLATE_NOOP('Variable Types', 'Integer'), - QT_TRANSLATE_NOOP('Variable Types', 'Long Integer'), - QT_TRANSLATE_NOOP('Variable Types', 'Float'), - QT_TRANSLATE_NOOP('Variable Types', 'Complex'), - QT_TRANSLATE_NOOP('Variable Types', 'String'), - QT_TRANSLATE_NOOP('Variable Types', 'Unicode String'), - QT_TRANSLATE_NOOP('Variable Types', 'Tuple'), - QT_TRANSLATE_NOOP('Variable Types', 'List/Array'), - QT_TRANSLATE_NOOP('Variable Types', 'Dictionary/Hash/Map'), - QT_TRANSLATE_NOOP('Variable Types', 'Dictionary Proxy'), - QT_TRANSLATE_NOOP('Variable Types', 'Set'), - QT_TRANSLATE_NOOP('Variable Types', 'File'), - QT_TRANSLATE_NOOP('Variable Types', 'X Range'), - QT_TRANSLATE_NOOP('Variable Types', 'Slice'), - QT_TRANSLATE_NOOP('Variable Types', 'Buffer'), - QT_TRANSLATE_NOOP('Variable Types', 'Class'), - QT_TRANSLATE_NOOP('Variable Types', 'Class Instance'), - QT_TRANSLATE_NOOP('Variable Types', 'Class Method'), - QT_TRANSLATE_NOOP('Variable Types', 'Class Property'), - QT_TRANSLATE_NOOP('Variable Types', 'Generator'), - QT_TRANSLATE_NOOP('Variable Types', 'Function'), - QT_TRANSLATE_NOOP('Variable Types', 'Builtin Function'), - QT_TRANSLATE_NOOP('Variable Types', 'Code'), - QT_TRANSLATE_NOOP('Variable Types', 'Module'), - QT_TRANSLATE_NOOP('Variable Types', 'Ellipsis'), - QT_TRANSLATE_NOOP('Variable Types', 'Traceback'), - QT_TRANSLATE_NOOP('Variable Types', 'Frame'), + QT_TRANSLATE_NOOP('Variable Types', 'Hidden Attributes'), + QT_TRANSLATE_NOOP('Variable Types', 'None'), + QT_TRANSLATE_NOOP('Variable Types', 'Type'), + QT_TRANSLATE_NOOP('Variable Types', 'Boolean'), + QT_TRANSLATE_NOOP('Variable Types', 'Integer'), + QT_TRANSLATE_NOOP('Variable Types', 'Long Integer'), + QT_TRANSLATE_NOOP('Variable Types', 'Float'), + QT_TRANSLATE_NOOP('Variable Types', 'Complex'), + QT_TRANSLATE_NOOP('Variable Types', 'String'), + QT_TRANSLATE_NOOP('Variable Types', 'Unicode String'), + QT_TRANSLATE_NOOP('Variable Types', 'Tuple'), + QT_TRANSLATE_NOOP('Variable Types', 'List/Array'), + QT_TRANSLATE_NOOP('Variable Types', 'Dictionary/Hash/Map'), + QT_TRANSLATE_NOOP('Variable Types', 'Dictionary Proxy'), + QT_TRANSLATE_NOOP('Variable Types', 'Set'), + QT_TRANSLATE_NOOP('Variable Types', 'File'), + QT_TRANSLATE_NOOP('Variable Types', 'X Range'), + QT_TRANSLATE_NOOP('Variable Types', 'Slice'), + QT_TRANSLATE_NOOP('Variable Types', 'Buffer'), + QT_TRANSLATE_NOOP('Variable Types', 'Class'), + QT_TRANSLATE_NOOP('Variable Types', 'Class Instance'), + QT_TRANSLATE_NOOP('Variable Types', 'Class Method'), + QT_TRANSLATE_NOOP('Variable Types', 'Class Property'), + QT_TRANSLATE_NOOP('Variable Types', 'Generator'), + QT_TRANSLATE_NOOP('Variable Types', 'Function'), + QT_TRANSLATE_NOOP('Variable Types', 'Builtin Function'), + QT_TRANSLATE_NOOP('Variable Types', 'Code'), + QT_TRANSLATE_NOOP('Variable Types', 'Module'), + QT_TRANSLATE_NOOP('Variable Types', 'Ellipsis'), + QT_TRANSLATE_NOOP('Variable Types', 'Traceback'), + QT_TRANSLATE_NOOP('Variable Types', 'Frame'), QT_TRANSLATE_NOOP('Variable Types', 'Other') ] except ImportError: # Variables type definition (for non-Qt only) ConfigVarTypeDispStrings = [ - 'Hidden Attributes', 'None', 'Type', 'Boolean', 'Integer', - 'Long Integer', 'Float', 'Complex', 'String', 'Unicode String', + 'Hidden Attributes', 'None', 'Type', 'Boolean', 'Integer', + 'Long Integer', 'Float', 'Complex', 'String', 'Unicode String', 'Tuple', 'List/Array', 'Dictionary/Hash/Map', 'Dictionary Proxy', - 'Set', 'File', 'X Range', 'Slice', 'Buffer', 'Class', 'Class Instance', - 'Class Method', 'Class Property', 'Generator', 'Function', - 'Builtin Function', 'Code', 'Module', 'Ellipsis', + 'Set', 'File', 'X Range', 'Slice', 'Buffer', 'Class', 'Class Instance', + 'Class Method', 'Class Property', 'Generator', 'Function', + 'Builtin Function', 'Code', 'Module', 'Ellipsis', 'Traceback', 'Frame', 'Other']
--- a/Debugger/DebugClientCapabilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebugClientCapabilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,13 +7,13 @@ Module defining the debug clients capabilities. """ -HasDebugger = 0x0001 -HasInterpreter = 0x0002 -HasProfiler = 0x0004 -HasCoverage = 0x0008 -HasCompleter = 0x0010 -HasUnittest = 0x0020 -HasShell = 0x0040 +HasDebugger = 0x0001 +HasInterpreter = 0x0002 +HasProfiler = 0x0004 +HasCoverage = 0x0008 +HasCompleter = 0x0010 +HasUnittest = 0x0020 +HasShell = 0x0040 HasAll = HasDebugger | HasInterpreter | HasProfiler | \ HasCoverage | HasCompleter | HasUnittest | HasShell
--- a/Debugger/DebugProtocol.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebugProtocol.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,67 +8,67 @@ """ # The protocol "words". -RequestOK = '>OK?<' -RequestEnv = '>Environment<' -RequestCapabilities = '>Capabilities<' -RequestLoad = '>Load<' -RequestRun = '>Run<' -RequestCoverage = '>Coverage<' -RequestProfile = '>Profile<' -RequestContinue = '>Continue<' -RequestStep = '>Step<' -RequestStepOver = '>StepOver<' -RequestStepOut = '>StepOut<' -RequestStepQuit = '>StepQuit<' -RequestBreak = '>Break<' -RequestBreakEnable = '>EnableBreak<' -RequestBreakIgnore = '>IgnoreBreak<' -RequestWatch = '>Watch<' -RequestWatchEnable = '>EnableWatch<' -RequestWatchIgnore = '>IgnoreWatch<' -RequestVariables = '>Variables<' -RequestVariable = '>Variable<' -RequestSetFilter = '>SetFilter<' -RequestThreadList = '>ThreadList<' -RequestThreadSet = '>ThreadSet<' -RequestEval = '>Eval<' -RequestExec = '>Exec<' -RequestShutdown = '>Shutdown<' -RequestBanner = '>Banner<' -RequestCompletion = '>Completion<' -RequestUTPrepare = '>UTPrepare<' -RequestUTRun = '>UTRun<' -RequestUTStop = '>UTStop<' -RequestForkTo = '>ForkTo<' -RequestForkMode = '>ForkMode<' +RequestOK = '>OK?<' +RequestEnv = '>Environment<' +RequestCapabilities = '>Capabilities<' +RequestLoad = '>Load<' +RequestRun = '>Run<' +RequestCoverage = '>Coverage<' +RequestProfile = '>Profile<' +RequestContinue = '>Continue<' +RequestStep = '>Step<' +RequestStepOver = '>StepOver<' +RequestStepOut = '>StepOut<' +RequestStepQuit = '>StepQuit<' +RequestBreak = '>Break<' +RequestBreakEnable = '>EnableBreak<' +RequestBreakIgnore = '>IgnoreBreak<' +RequestWatch = '>Watch<' +RequestWatchEnable = '>EnableWatch<' +RequestWatchIgnore = '>IgnoreWatch<' +RequestVariables = '>Variables<' +RequestVariable = '>Variable<' +RequestSetFilter = '>SetFilter<' +RequestThreadList = '>ThreadList<' +RequestThreadSet = '>ThreadSet<' +RequestEval = '>Eval<' +RequestExec = '>Exec<' +RequestShutdown = '>Shutdown<' +RequestBanner = '>Banner<' +RequestCompletion = '>Completion<' +RequestUTPrepare = '>UTPrepare<' +RequestUTRun = '>UTRun<' +RequestUTStop = '>UTStop<' +RequestForkTo = '>ForkTo<' +RequestForkMode = '>ForkMode<' -ResponseOK = '>OK<' -ResponseCapabilities = RequestCapabilities -ResponseContinue = '>Continue<' -ResponseException = '>Exception<' -ResponseSyntax = '>SyntaxError<' -ResponseExit = '>Exit<' -ResponseLine = '>Line<' -ResponseRaw = '>Raw<' -ResponseClearBreak = '>ClearBreak<' +ResponseOK = '>OK<' +ResponseCapabilities = RequestCapabilities +ResponseContinue = '>Continue<' +ResponseException = '>Exception<' +ResponseSyntax = '>SyntaxError<' +ResponseExit = '>Exit<' +ResponseLine = '>Line<' +ResponseRaw = '>Raw<' +ResponseClearBreak = '>ClearBreak<' ResponseBPConditionError = '>BPConditionError<' -ResponseClearWatch = '>ClearWatch<' +ResponseClearWatch = '>ClearWatch<' ResponseWPConditionError = '>WPConditionError<' -ResponseVariables = RequestVariables -ResponseVariable = RequestVariable -ResponseThreadList = RequestThreadList -ResponseThreadSet = RequestThreadSet -ResponseStack = '>CurrentStack<' -ResponseBanner = RequestBanner -ResponseCompletion = RequestCompletion -ResponseUTPrepared = '>UTPrepared<' -ResponseUTStartTest = '>UTStartTest<' -ResponseUTStopTest = '>UTStopTest<' -ResponseUTTestFailed = '>UTTestFailed<' -ResponseUTTestErrored = '>UTTestErrored<' -ResponseUTFinished = '>UTFinished<' -ResponseForkTo = RequestForkTo +ResponseVariables = RequestVariables +ResponseVariable = RequestVariable +ResponseThreadList = RequestThreadList +ResponseThreadSet = RequestThreadSet +ResponseStack = '>CurrentStack<' +ResponseBanner = RequestBanner +ResponseCompletion = RequestCompletion +ResponseUTPrepared = '>UTPrepared<' +ResponseUTStartTest = '>UTStartTest<' +ResponseUTStopTest = '>UTStopTest<' +ResponseUTTestFailed = '>UTTestFailed<' +ResponseUTTestErrored = '>UTTestErrored<' +ResponseUTFinished = '>UTFinished<' +ResponseForkTo = RequestForkTo -PassiveStartup = '>PassiveStartup<' +PassiveStartup = '>PassiveStartup<' EOT = '>EOT<\n'
--- a/Debugger/DebugServer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebugServer.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,6 +30,7 @@ "DebuggerInterfaceNone", ] + class DebugServer(QTcpServer): """ Class implementing the debug server embedded within the IDE. @@ -40,7 +41,7 @@ via stderr @signal clientOutput(str) emitted after the client has sent some output @signal clientRawInputSent() emitted after the data was sent to the debug client - @signal clientLine(filename, lineno, forStack) emitted after the debug client + @signal clientLine(filename, lineno, forStack) emitted after the debug client has executed a line of code @signal clientStack(stack) emitted after the debug client has executed a line of code @@ -48,14 +49,14 @@ has been received @signal clientThreadSet() emitted after the client has acknowledged the change of the current thread - @signal clientVariables(scope, variables) emitted after a variables dump has + @signal clientVariables(scope, variables) emitted after a variables dump has been received - @signal clientVariable(scope, variables) emitted after a dump for one class + @signal clientVariable(scope, variables) emitted after a dump for one class variable has been received @signal clientStatement(bool) emitted after an interactive command has been executed. The parameter is 0 to indicate that the command is complete and 1 if it needs more input. - @signal clientException(exception) emitted after an exception occured on the + @signal clientException(exception) emitted after an exception occured on the client side @signal clientSyntaxError(exception) emitted after a syntax error has been detected on the client side @@ -81,12 +82,12 @@ @signal utPrepared(nrTests, exc_type, exc_value) emitted after the client has loaded a unittest suite @signal utFinished() emitted after the client signalled the end of the unittest - @signal utStartTest(testname, testdocu) emitted after the client has started + @signal utStartTest(testname, testdocu) emitted after the client has started a test @signal utStopTest() emitted after the client has finished a test - @signal utTestFailed(testname, exc_info) emitted after the client reported + @signal utTestFailed(testname, exc_info) emitted after the client reported a failed test - @signal utTestErrored(testname, exc_info) emitted after the client reported + @signal utTestErrored(testname, exc_info) emitted after the client reported an errored test """ clientClearBreak = pyqtSignal(str, int) @@ -130,19 +131,19 @@ self.breakpointModel = BreakPointModel(self) self.watchpointModel = WatchPointModel(self) self.watchSpecialCreated = \ - self.trUtf8("created", "must be same as in EditWatchpointDialog") + self.trUtf8("created", "must be same as in EditWatchpointDialog") self.watchSpecialChanged = \ self.trUtf8("changed", "must be same as in EditWatchpointDialog") self.networkInterface = Preferences.getDebugger("NetworkInterface") if self.networkInterface == "all": - hostAddress = QHostAddress("0.0.0.0")#QHostAddress.Any) + hostAddress = QHostAddress("0.0.0.0") # QHostAddress.Any) elif self.networkInterface == "allv6": - hostAddress = QHostAddress("::")#QHostAddress.AnyIPv6) + hostAddress = QHostAddress("::") # QHostAddress.AnyIPv6) else: hostAddress = QHostAddress(Preferences.getDebugger("NetworkInterface")) if Preferences.getDebugger("PassiveDbgEnabled"): - socket = Preferences.getDebugger("PassiveDbgPort") # default: 42424 + socket = Preferences.getDebugger("PassiveDbgPort") # default: 42424 self.listen(hostAddress, socket) self.passive = True self.passiveClientExited = False @@ -225,7 +226,7 @@ if extension not in self.__clientAssociations: self.__clientAssociations[extension] = clientLanguage - def getSupportedLanguages(self, shellOnly = False): + def getSupportedLanguages(self, shellOnly=False): """ Public slot to return the supported programming languages. @@ -260,7 +261,7 @@ return tuple(extensions) - def __createDebuggerInterface(self, clientType = None): + def __createDebuggerInterface(self, clientType=None): """ Private slot to create the debugger interface object. @@ -294,23 +295,23 @@ """ if clType is not None and clType in self.getSupportedLanguages(): self.clientType = clType - Preferences.Prefs.settings.setValue('DebugClient/Type', + Preferences.Prefs.settings.setValue('DebugClient/Type', self.clientType) - def startClient(self, unplanned = True, clType = None, forProject = False, - runInConsole = False): + def startClient(self, unplanned=True, clType=None, forProject=False, + runInConsole=False): """ Public method to start a debug client. @keyparam unplanned flag indicating that the client has died (boolean) @keyparam clType type of client to be started (string) @keyparam forProject flag indicating a project related action (boolean) - @keyparam runInConsole flag indicating to start the debugger in a + @keyparam runInConsole flag indicating to start the debugger in a console window (boolean) """ self.running = False - if not self.passive or not self.passiveClientExited: + if not self.passive or not self.passiveClientExited: if self.debuggerInterface and self.debuggerInterface.isConnected(): self.shutdownServer() self.clientGone.emit(unplanned and self.debugging) @@ -335,11 +336,11 @@ project = e5App().getObject("Project") if not project.isDebugPropertiesLoaded(): self.clientProcess, isNetworked = \ - self.debuggerInterface.startRemote(self.serverPort(), + self.debuggerInterface.startRemote(self.serverPort(), runInConsole) else: self.clientProcess, isNetworked = \ - self.debuggerInterface.startRemoteForProject(self.serverPort(), + self.debuggerInterface.startRemoteForProject(self.serverPort(), runInConsole) else: self.clientProcess, isNetworked = \ @@ -369,8 +370,8 @@ """ Private slot to process client output received via stdout. """ - output = str(self.clientProcess.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + output = str(self.clientProcess.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') self.clientProcessStdout.emit(output) @@ -378,8 +379,8 @@ """ Private slot to process client output received via stderr. """ - error = str(self.clientProcess.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + error = str(self.clientProcess.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.clientProcessStderr.emit(error) @@ -403,7 +404,7 @@ @param end end row (integer) """ if self.debugging: - for row in range(start, end+1): + for row in range(start, end + 1): index = self.breakpointModel.index(row, 0, parentIndex) fn, lineno = self.breakpointModel.getBreakPointByIndex(index)[0:2] self.remoteBreakpoint(fn, lineno, False) @@ -436,7 +437,7 @@ @param end end row (integer) """ if self.debugging: - for row in range(start, end+1): + for row in range(start, end + 1): index = self.breakpointModel.index(row, 0, parentIndex) fn, line, cond, temp, enabled, ignorecount = \ self.breakpointModel.getBreakPointByIndex(index)[:6] @@ -502,7 +503,7 @@ @param end end row (integer) """ if self.debugging: - for row in range(start, end+1): + for row in range(start, end + 1): index = self.watchpointModel.index(row, 0, parentIndex) cond, special = self.watchpointModel.getWatchPointByIndex(index)[0:2] cond = self.__makeWatchCondition(cond, special) @@ -510,7 +511,7 @@ def __watchPointDataAboutToBeChanged(self, startIndex, endIndex): """ - Private slot to handle the dataAboutToBeChanged signal of the + Private slot to handle the dataAboutToBeChanged signal of the watch expression model. @param startIndex start index of the rows to be changed (QModelIndex) @@ -574,7 +575,7 @@ self.trUtf8("""<p>A connection was attempted by the""" """ illegal host <b>{0}</b>. Accept this connection?</p>""")\ .format(peerAddress), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: sock.abort() return @@ -628,10 +629,10 @@ pass self.debuggerInterface.remoteEnvironment(envdict) - def remoteLoad(self, fn, argv, wd, env, autoClearShell = True, - tracePython = False, autoContinue = True, forProject = False, - runInConsole = False, autoFork = False, forkChild = False, - clientType = ""): + def remoteLoad(self, fn, argv, wd, env, autoClearShell=True, + tracePython=False, autoContinue=True, forProject=False, + runInConsole=False, autoFork=False, forkChild=False, + clientType=""): """ Public method to load a new program to debug. @@ -646,7 +647,7 @@ @keyparam autoContinue flag indicating, that the debugger should not stop at the first executable line (boolean) @keyparam forProject flag indicating a project related action (boolean) - @keyparam runInConsole flag indicating to start the debugger in a + @keyparam runInConsole flag indicating to start the debugger in a console window (boolean) @keyparam autoFork flag indicating the automatic fork mode (boolean) @keyparam forkChild flag indicating to debug the child after forking (boolean) @@ -663,21 +664,21 @@ self.__setClientType(self.__clientAssociations[os.path.splitext(fn)[1]]) except KeyError: self.__setClientType('Python3') # assume it is a Python3 file - self.startClient(False, forProject = forProject, runInConsole = runInConsole) + self.startClient(False, forProject=forProject, runInConsole=runInConsole) self.remoteEnvironment(env) - self.debuggerInterface.remoteLoad(fn, argv, wd, tracePython, autoContinue, + self.debuggerInterface.remoteLoad(fn, argv, wd, tracePython, autoContinue, autoFork, forkChild) self.debugging = True self.running = True self.__restoreBreakpoints() self.__restoreWatchpoints() - def remoteRun(self, fn, argv, wd, env, autoClearShell = True, - forProject = False, runInConsole = False, - autoFork = False, forkChild = False, - clientType = ""): + def remoteRun(self, fn, argv, wd, env, autoClearShell=True, + forProject=False, runInConsole=False, + autoFork=False, forkChild=False, + clientType=""): """ Public method to load a new program to run. @@ -688,7 +689,7 @@ @keyparam autoClearShell flag indicating, that the interpreter window should be cleared (boolean) @keyparam forProject flag indicating a project related action (boolean) - @keyparam runInConsole flag indicating to start the debugger in a + @keyparam runInConsole flag indicating to start the debugger in a console window (boolean) @keyparam autoFork flag indicating the automatic fork mode (boolean) @keyparam forkChild flag indicating to debug the child after forking (boolean) @@ -704,7 +705,7 @@ self.__setClientType(self.__clientAssociations[os.path.splitext(fn)[1]]) except KeyError: self.__setClientType('Python3') # assume it is a Python3 file - self.startClient(False, forProject = forProject, runInConsole = runInConsole) + self.startClient(False, forProject=forProject, runInConsole=runInConsole) self.remoteEnvironment(env) @@ -712,9 +713,9 @@ self.debugging = False self.running = True - def remoteCoverage(self, fn, argv, wd, env, autoClearShell = True, - erase = False, forProject = False, runInConsole = False, - clientType = ""): + def remoteCoverage(self, fn, argv, wd, env, autoClearShell=True, + erase=False, forProject=False, runInConsole=False, + clientType=""): """ Public method to load a new program to collect coverage data. @@ -724,10 +725,10 @@ @param env environment settings (string) @keyparam autoClearShell flag indicating, that the interpreter window should be cleared (boolean) - @keyparam erase flag indicating that coverage info should be + @keyparam erase flag indicating that coverage info should be cleared first (boolean) @keyparam forProject flag indicating a project related action (boolean) - @keyparam runInConsole flag indicating to start the debugger in a + @keyparam runInConsole flag indicating to start the debugger in a console window (boolean) @keyparam clientType client type to be used (string) """ @@ -741,7 +742,7 @@ self.__setClientType(self.__clientAssociations[os.path.splitext(fn)[1]]) except KeyError: self.__setClientType('Python3') # assume it is a Python3 file - self.startClient(False, forProject = forProject, runInConsole = runInConsole) + self.startClient(False, forProject=forProject, runInConsole=runInConsole) self.remoteEnvironment(env) @@ -749,10 +750,10 @@ self.debugging = False self.running = True - def remoteProfile(self, fn, argv, wd, env, autoClearShell = True, - erase = False, forProject = False, - runInConsole = False, - clientType = ""): + def remoteProfile(self, fn, argv, wd, env, autoClearShell=True, + erase=False, forProject=False, + runInConsole=False, + clientType=""): """ Public method to load a new program to collect profiling data. @@ -764,7 +765,7 @@ be cleared (boolean) @keyparam erase flag indicating that timing info should be cleared first (boolean) @keyparam forProject flag indicating a project related action (boolean) - @keyparam runInConsole flag indicating to start the debugger in a + @keyparam runInConsole flag indicating to start the debugger in a console window (boolean) @keyparam clientType client type to be used (string) """ @@ -778,7 +779,7 @@ self.__setClientType(self.__clientAssociations[os.path.splitext(fn)[1]]) except KeyError: self.__setClientType('Python3') # assume it is a Python3 file - self.startClient(False, forProject = forProject, runInConsole = runInConsole) + self.startClient(False, forProject=forProject, runInConsole=runInConsole) self.remoteEnvironment(env) @@ -788,7 +789,7 @@ def remoteStatement(self, stmt): """ - Public method to execute a Python statement. + Public method to execute a Python statement. @param stmt the Python statement to execute (string). It should not have a trailing newline. @@ -819,7 +820,7 @@ """ self.debuggerInterface.remoteStepQuit() - def remoteContinue(self, special = False): + def remoteContinue(self, special=False): """ Public method to continue the debugged program. @@ -859,7 +860,7 @@ """ self.debuggerInterface.remoteBreakpointIgnore(fn, line, count) - def __remoteWatchpoint(self, cond, set, temp = False): + def __remoteWatchpoint(self, cond, set, temp=False): """ Private method to set or clear a watch expression. @@ -890,7 +891,7 @@ # cond is combination of cond and special (s. watch expression viewer) self.debuggerInterface.remoteWatchpointIgnore(cond, count) - def remoteRawInput(self,s): + def remoteRawInput(self, s): """ Public method to send the raw input to the debugged program. @@ -913,7 +914,7 @@ """ self.debuggerInterface.remoteSetThread(tid) - def remoteClientVariables(self, scope, filter, framenr = 0): + def remoteClientVariables(self, scope, filter, framenr=0): """ Public method to request the variables of the debugged program. @@ -923,7 +924,7 @@ """ self.debuggerInterface.remoteClientVariables(scope, filter, framenr) - def remoteClientVariable(self, scope, filter, var, framenr = 0): + def remoteClientVariable(self, scope, filter, var, framenr=0): """ Public method to request the variables of the debugged program. @@ -1023,7 +1024,7 @@ """ self.clientOutput.emit(line) - def signalClientLine(self, filename, lineno, forStack = False): + def signalClientLine(self, filename, lineno, forStack=False): """ Public method to process client position feedback. @@ -1274,14 +1275,14 @@ Private method to restore the breakpoints after a restart. """ if self.debugging: - self.__addBreakPoints(QModelIndex(), 0, self.breakpointModel.rowCount()-1) + self.__addBreakPoints(QModelIndex(), 0, self.breakpointModel.rowCount() - 1) def __restoreWatchpoints(self): """ Private method to restore the watch expressions after a restart. """ if self.debugging: - self.__addWatchPoints(QModelIndex(), 0, self.watchpointModel.rowCount()-1) + self.__addWatchPoints(QModelIndex(), 0, self.watchpointModel.rowCount() - 1) def getBreakPointModel(self): """
--- a/Debugger/DebugUI.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebugUI.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,6 +29,7 @@ from eric5config import getConfig + class DebugUI(QObject): """ Class implementing the debugger part of the UI. @@ -164,7 +165,7 @@ self.runAct = E5Action(self.trUtf8('Run Script'), UI.PixmapCache.getIcon("runScript.png"), - self.trUtf8('&Run Script...'),Qt.Key_F2,0,self,'dbg_run_script') + self.trUtf8('&Run Script...'), Qt.Key_F2, 0, self, 'dbg_run_script') self.runAct.setStatusTip(self.trUtf8('Run the current Script')) self.runAct.setWhatsThis(self.trUtf8( """<b>Run Script</b>""" @@ -176,7 +177,7 @@ self.runProjectAct = E5Action(self.trUtf8('Run Project'), UI.PixmapCache.getIcon("runProject.png"), - self.trUtf8('Run &Project...'),Qt.SHIFT + Qt.Key_F2,0,self, + self.trUtf8('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self, 'dbg_run_project') self.runProjectAct.setStatusTip(self.trUtf8('Run the current Project')) self.runProjectAct.setWhatsThis(self.trUtf8( @@ -191,7 +192,7 @@ self.coverageAct = E5Action(self.trUtf8('Coverage run of Script'), UI.PixmapCache.getIcon("coverageScript.png"), - self.trUtf8('Coverage run of Script...'),0,0,self,'dbg_coverage_script') + self.trUtf8('Coverage run of Script...'), 0, 0, self, 'dbg_coverage_script') self.coverageAct.setStatusTip( self.trUtf8('Perform a coverage run of the current Script')) self.coverageAct.setWhatsThis(self.trUtf8( @@ -205,7 +206,7 @@ self.coverageProjectAct = E5Action(self.trUtf8('Coverage run of Project'), UI.PixmapCache.getIcon("coverageProject.png"), - self.trUtf8('Coverage run of Project...'),0,0,self,'dbg_coverage_project') + self.trUtf8('Coverage run of Project...'), 0, 0, self, 'dbg_coverage_project') self.coverageProjectAct.setStatusTip( self.trUtf8('Perform a coverage run of the current Project')) self.coverageProjectAct.setWhatsThis(self.trUtf8( @@ -220,7 +221,7 @@ self.profileAct = E5Action(self.trUtf8('Profile Script'), UI.PixmapCache.getIcon("profileScript.png"), - self.trUtf8('Profile Script...'),0,0,self,'dbg_profile_script') + self.trUtf8('Profile Script...'), 0, 0, self, 'dbg_profile_script') self.profileAct.setStatusTip(self.trUtf8('Profile the current Script')) self.profileAct.setWhatsThis(self.trUtf8( """<b>Profile Script</b>""" @@ -232,7 +233,7 @@ self.profileProjectAct = E5Action(self.trUtf8('Profile Project'), UI.PixmapCache.getIcon("profileProject.png"), - self.trUtf8('Profile Project...'),0,0,self,'dbg_profile_project') + self.trUtf8('Profile Project...'), 0, 0, self, 'dbg_profile_project') self.profileProjectAct.setStatusTip(self.trUtf8('Profile the current Project')) self.profileProjectAct.setWhatsThis(self.trUtf8( """<b>Profile Project</b>""" @@ -245,7 +246,7 @@ self.debugAct = E5Action(self.trUtf8('Debug Script'), UI.PixmapCache.getIcon("debugScript.png"), - self.trUtf8('&Debug Script...'),Qt.Key_F5,0,self,'dbg_debug_script') + self.trUtf8('&Debug Script...'), Qt.Key_F5, 0, self, 'dbg_debug_script') self.debugAct.setStatusTip(self.trUtf8('Debug the current Script')) self.debugAct.setWhatsThis(self.trUtf8( """<b>Debug Script</b>""" @@ -258,7 +259,7 @@ self.debugProjectAct = E5Action(self.trUtf8('Debug Project'), UI.PixmapCache.getIcon("debugProject.png"), - self.trUtf8('Debug &Project...'),Qt.SHIFT + Qt.Key_F5,0,self, + self.trUtf8('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self, 'dbg_debug_project') self.debugProjectAct.setStatusTip(self.trUtf8('Debug the current Project')) self.debugProjectAct.setWhatsThis(self.trUtf8( @@ -273,7 +274,7 @@ self.restartAct = E5Action(self.trUtf8('Restart Script'), UI.PixmapCache.getIcon("restart.png"), - self.trUtf8('Restart Script'),Qt.Key_F4,0,self,'dbg_restart_script') + self.trUtf8('Restart Script'), Qt.Key_F4, 0, self, 'dbg_restart_script') self.restartAct.setStatusTip(self.trUtf8('Restart the last debugged script')) self.restartAct.setWhatsThis(self.trUtf8( """<b>Restart Script</b>""" @@ -286,8 +287,8 @@ self.stopAct = E5Action(self.trUtf8('Stop Script'), UI.PixmapCache.getIcon("stopScript.png"), - self.trUtf8('Stop Script'),Qt.SHIFT + Qt.Key_F10,0, - self,'dbg_stop_script') + self.trUtf8('Stop Script'), Qt.SHIFT + Qt.Key_F10, 0, + self, 'dbg_stop_script') self.stopAct.setStatusTip(self.trUtf8("""Stop the running script.""")) self.stopAct.setWhatsThis(self.trUtf8( """<b>Stop Script</b>""" @@ -300,8 +301,8 @@ act = E5Action(self.trUtf8('Continue'), UI.PixmapCache.getIcon("continue.png"), - self.trUtf8('&Continue'),Qt.Key_F6,0, - self.debugActGrp,'dbg_continue') + self.trUtf8('&Continue'), Qt.Key_F6, 0, + self.debugActGrp, 'dbg_continue') act.setStatusTip( self.trUtf8('Continue running the program from the current line')) act.setWhatsThis(self.trUtf8( @@ -314,8 +315,8 @@ act = E5Action(self.trUtf8('Continue to Cursor'), UI.PixmapCache.getIcon("continueToCursor.png"), - self.trUtf8('Continue &To Cursor'),Qt.SHIFT + Qt.Key_F6,0, - self.debugActGrp,'dbg_continue_to_cursor') + self.trUtf8('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0, + self.debugActGrp, 'dbg_continue_to_cursor') act.setStatusTip(self.trUtf8("""Continue running the program from the""" """ current line to the current cursor position""")) act.setWhatsThis(self.trUtf8( @@ -328,8 +329,8 @@ act = E5Action(self.trUtf8('Single Step'), UI.PixmapCache.getIcon("step.png"), - self.trUtf8('Sin&gle Step'),Qt.Key_F7,0, - self.debugActGrp,'dbg_single_step') + self.trUtf8('Sin&gle Step'), Qt.Key_F7, 0, + self.debugActGrp, 'dbg_single_step') act.setStatusTip(self.trUtf8('Execute a single Python statement')) act.setWhatsThis(self.trUtf8( """<b>Single Step</b>""" @@ -343,8 +344,8 @@ act = E5Action(self.trUtf8('Step Over'), UI.PixmapCache.getIcon("stepOver.png"), - self.trUtf8('Step &Over'),Qt.Key_F8,0, - self.debugActGrp,'dbg_step_over') + self.trUtf8('Step &Over'), Qt.Key_F8, 0, + self.debugActGrp, 'dbg_step_over') act.setStatusTip(self.trUtf8("""Execute a single Python statement staying""" """ in the current frame""")) act.setWhatsThis(self.trUtf8( @@ -359,8 +360,8 @@ act = E5Action(self.trUtf8('Step Out'), UI.PixmapCache.getIcon("stepOut.png"), - self.trUtf8('Step Ou&t'),Qt.Key_F9,0, - self.debugActGrp,'dbg_step_out') + self.trUtf8('Step Ou&t'), Qt.Key_F9, 0, + self.debugActGrp, 'dbg_step_out') act.setStatusTip(self.trUtf8("""Execute Python statements until leaving""" """ the current frame""")) act.setWhatsThis(self.trUtf8( @@ -375,8 +376,8 @@ act = E5Action(self.trUtf8('Stop'), UI.PixmapCache.getIcon("stepQuit.png"), - self.trUtf8('&Stop'),Qt.Key_F10,0, - self.debugActGrp,'dbg_stop') + self.trUtf8('&Stop'), Qt.Key_F10, 0, + self.debugActGrp, 'dbg_stop') act.setStatusTip(self.trUtf8('Stop debugging')) act.setWhatsThis(self.trUtf8( """<b>Stop</b>""" @@ -389,7 +390,7 @@ act = E5Action(self.trUtf8('Evaluate'), self.trUtf8('E&valuate...'), - 0,0,self.debugActGrp2,'dbg_evaluate') + 0, 0, self.debugActGrp2, 'dbg_evaluate') act.setStatusTip(self.trUtf8('Evaluate in current context')) act.setWhatsThis(self.trUtf8( """<b>Evaluate</b>""" @@ -402,7 +403,7 @@ act = E5Action(self.trUtf8('Execute'), self.trUtf8('E&xecute...'), - 0,0,self.debugActGrp2,'dbg_execute') + 0, 0, self.debugActGrp2, 'dbg_execute') act.setStatusTip( self.trUtf8('Execute a one line statement in the current context')) act.setWhatsThis(self.trUtf8( @@ -414,7 +415,7 @@ self.actions.append(act) self.dbgFilterAct = E5Action(self.trUtf8('Variables Type Filter'), - self.trUtf8('Varia&bles Type Filter...'), 0, 0, self, + self.trUtf8('Varia&bles Type Filter...'), 0, 0, self, 'dbg_variables_filter') self.dbgFilterAct.setStatusTip(self.trUtf8('Configure variables type filter')) self.dbgFilterAct.setWhatsThis(self.trUtf8( @@ -440,7 +441,7 @@ self.actions.append(self.excFilterAct) self.excIgnoreFilterAct = E5Action(self.trUtf8('Ignored Exceptions'), - self.trUtf8('&Ignored Exceptions...'), 0, 0, + self.trUtf8('&Ignored Exceptions...'), 0, 0, self, 'dbg_ignored_exceptions') self.excIgnoreFilterAct.setStatusTip(self.trUtf8('Configure ignored exceptions')) self.excIgnoreFilterAct.setWhatsThis(self.trUtf8( @@ -456,8 +457,8 @@ self.dbgToggleBpAct = E5Action(self.trUtf8('Toggle Breakpoint'), UI.PixmapCache.getIcon("breakpointToggle.png"), - self.trUtf8('Toggle Breakpoint'), - QKeySequence(self.trUtf8("Shift+F11","Debug|Toggle Breakpoint")), 0, + self.trUtf8('Toggle Breakpoint'), + QKeySequence(self.trUtf8("Shift+F11", "Debug|Toggle Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_toggle_breakpoint') self.dbgToggleBpAct.setStatusTip(self.trUtf8('Toggle Breakpoint')) self.dbgToggleBpAct.setWhatsThis(self.trUtf8( @@ -471,7 +472,7 @@ self.dbgEditBpAct = E5Action(self.trUtf8('Edit Breakpoint'), UI.PixmapCache.getIcon("cBreakpointToggle.png"), self.trUtf8('Edit Breakpoint...'), - QKeySequence(self.trUtf8("Shift+F12","Debug|Edit Breakpoint")), 0, + QKeySequence(self.trUtf8("Shift+F12", "Debug|Edit Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_edit_breakpoint') self.dbgEditBpAct.setStatusTip(self.trUtf8('Edit Breakpoint')) self.dbgEditBpAct.setWhatsThis(self.trUtf8( @@ -485,7 +486,7 @@ self.dbgNextBpAct = E5Action(self.trUtf8('Next Breakpoint'), UI.PixmapCache.getIcon("breakpointNext.png"), self.trUtf8('Next Breakpoint'), - QKeySequence(self.trUtf8("Ctrl+Shift+PgDown","Debug|Next Breakpoint")), 0, + QKeySequence(self.trUtf8("Ctrl+Shift+PgDown", "Debug|Next Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_next_breakpoint') self.dbgNextBpAct.setStatusTip(self.trUtf8('Next Breakpoint')) self.dbgNextBpAct.setWhatsThis(self.trUtf8( @@ -498,7 +499,7 @@ self.dbgPrevBpAct = E5Action(self.trUtf8('Previous Breakpoint'), UI.PixmapCache.getIcon("breakpointPrevious.png"), self.trUtf8('Previous Breakpoint'), - QKeySequence(self.trUtf8("Ctrl+Shift+PgUp","Debug|Previous Breakpoint")), + QKeySequence(self.trUtf8("Ctrl+Shift+PgUp", "Debug|Previous Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_previous_breakpoint') self.dbgPrevBpAct.setStatusTip(self.trUtf8('Previous Breakpoint')) self.dbgPrevBpAct.setWhatsThis(self.trUtf8( @@ -510,7 +511,7 @@ act = E5Action(self.trUtf8('Clear Breakpoints'), self.trUtf8('Clear Breakpoints'), - QKeySequence(self.trUtf8("Ctrl+Shift+C","Debug|Clear Breakpoints")), 0, + QKeySequence(self.trUtf8("Ctrl+Shift+C", "Debug|Clear Breakpoints")), 0, self.dbgSetBpActGrp, 'dbg_clear_breakpoint') act.setStatusTip(self.trUtf8('Clear Breakpoints')) act.setWhatsThis(self.trUtf8( @@ -620,7 +621,7 @@ return [starttb, debugtb] - def setArgvHistory(self, argsStr, clearHistories = False): + def setArgvHistory(self, argsStr, clearHistories=False): """ Public slot to initialize the argv history. @@ -635,7 +636,7 @@ self.argvHistory.remove(argsStr) self.argvHistory.insert(0, argsStr) - def setWdHistory(self, wdStr, clearHistories = False): + def setWdHistory(self, wdStr, clearHistories=False): """ Public slot to initialize the wd history. @@ -650,7 +651,7 @@ self.wdHistory.remove(wdStr) self.wdHistory.insert(0, wdStr) - def setEnvHistory(self, envStr, clearHistories = False): + def setEnvHistory(self, envStr, clearHistories=False): """ Public slot to initialize the env history. @@ -857,27 +858,27 @@ del self.wdHistory[10:] del self.envHistory[10:] - Preferences.Prefs.settings.setValue('DebugInfo/ArgumentsHistory', + Preferences.Prefs.settings.setValue('DebugInfo/ArgumentsHistory', self.argvHistory) - Preferences.Prefs.settings.setValue('DebugInfo/WorkingDirectoryHistory', + Preferences.Prefs.settings.setValue('DebugInfo/WorkingDirectoryHistory', self.wdHistory) - Preferences.Prefs.settings.setValue('DebugInfo/EnvironmentHistory', + Preferences.Prefs.settings.setValue('DebugInfo/EnvironmentHistory', self.envHistory) - Preferences.Prefs.settings.setValue('DebugInfo/Exceptions', + Preferences.Prefs.settings.setValue('DebugInfo/Exceptions', self.excList) - Preferences.Prefs.settings.setValue('DebugInfo/IgnoredExceptions', + Preferences.Prefs.settings.setValue('DebugInfo/IgnoredExceptions', self.excIgnoreList) - Preferences.Prefs.settings.setValue('DebugInfo/ReportExceptions', + Preferences.Prefs.settings.setValue('DebugInfo/ReportExceptions', self.exceptions) - Preferences.Prefs.settings.setValue('DebugInfo/AutoClearShell', + Preferences.Prefs.settings.setValue('DebugInfo/AutoClearShell', self.autoClearShell) - Preferences.Prefs.settings.setValue('DebugInfo/TracePython', + Preferences.Prefs.settings.setValue('DebugInfo/TracePython', self.tracePython) - Preferences.Prefs.settings.setValue('DebugInfo/AutoContinue', + Preferences.Prefs.settings.setValue('DebugInfo/AutoContinue', self.autoContinue) - Preferences.Prefs.settings.setValue('DebugInfo/ForkAutomatically', + Preferences.Prefs.settings.setValue('DebugInfo/ForkAutomatically', self.forkAutomatically) - Preferences.Prefs.settings.setValue('DebugInfo/ForkIntoChild', + Preferences.Prefs.settings.setValue('DebugInfo/ForkIntoChild', self.forkIntoChild) def shutdownServer(self): @@ -979,13 +980,13 @@ 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.')) return 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>') .format(filename, message, lineNo, characterNo)) @@ -1002,7 +1003,7 @@ 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 @@ -1031,9 +1032,9 @@ self.trUtf8('<p>The debugged program raised the exception' ' <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>,' ' Line: <b>{3}</b></p><p>Break here?</p>') - .format(exceptionType, - Utilities.html_encode(exceptionMessage), - stackTrace[0][0], + .format(exceptionType, + Utilities.html_encode(exceptionMessage), + stackTrace[0][0], stackTrace[0][1]), buttons, E5MessageBox.No) @@ -1041,7 +1042,7 @@ res = E5MessageBox.critical(self.ui, Program, self.trUtf8('<p>The debugged program raised the exception' ' <b>{0}</b><br>"<b>{1}</b>"</p>') - .format(exceptionType, + .format(exceptionType, Utilities.html_encode(exceptionMessage))) if res == E5MessageBox.Yes: self.exceptionInterrupt.emit() @@ -1072,7 +1073,7 @@ """ self.__resetUI() if unplanned: - E5MessageBox.information(self.ui,Program, + E5MessageBox.information(self.ui, Program, self.trUtf8('The program being debugged has terminated unexpectedly.')) def __getThreadList(self): @@ -1114,7 +1115,7 @@ elif scope == 0: self.debugViewer.showVariables(variables, False) elif scope == -1: - vlist = [('None','','')] + vlist = [('None', '', '')] self.debugViewer.showVariables(vlist, False) if scope < 1: @@ -1159,7 +1160,7 @@ fn, line, cond, temp, enabled, count = bp[:6] dlg = EditBreakpointDialog((fn, line), (cond, temp, enabled, count), - [], self.ui, modal = True) + [], self.ui, modal=True) if dlg.exec_() == QDialog.Accepted: cond, temp, enabled, count = dlg.getData() model.setBreakPointByIndex(index, fn, line, (cond, temp, enabled, count)) @@ -1205,14 +1206,14 @@ else: msg = self.trUtf8("""<p>A watch expression '<b>{0}</b>'""" """ for the variable <b>{1}</b> already exists.</p>""")\ - .format(special, + .format(special, Utilities.html_encode(cond)) E5MessageBox.warning(self, self.trUtf8("Watch expression already exists"), msg) model.deleteWatchPointByIndex(index) else: - model.setWatchPointByIndex(index, cond, special, + model.setWatchPointByIndex(index, cond, special, (temp, enabled, count)) def __configureVariablesFilters(self): @@ -1232,7 +1233,7 @@ """ Private slot for displaying the exception filter dialog. """ - dlg = ExceptionsFilterDialog(self.excList, ignore = False) + dlg = ExceptionsFilterDialog(self.excList, ignore=False) if dlg.exec_() == QDialog.Accepted: self.excList = dlg.getExceptionsList()[:] # keep a copy @@ -1240,7 +1241,7 @@ """ Private slot for displaying the ignored exceptions dialog. """ - dlg = ExceptionsFilterDialog(self.excIgnoreList, ignore = True) + dlg = ExceptionsFilterDialog(self.excIgnoreList, ignore=True) if dlg.exec_() == QDialog.Accepted: self.excIgnoreList = dlg.getExceptionsList()[:] # keep a copy @@ -1300,7 +1301,7 @@ "{0}{1}".format( Utilities.compactPath( filename, - self.ui.maxMenuFilePathLen - len(bpSuffix)), + self.ui.maxMenuFilePathLen - len(bpSuffix)), bpSuffix)) act.setData([filename, line]) @@ -1356,7 +1357,7 @@ else: cap = self.trUtf8("Coverage of Script") dlg = StartDialog(cap, self.argvHistory, self.wdHistory, self.envHistory, - self.exceptions, self.ui, 2, autoClearShell = self.autoClearShell) + self.exceptions, self.ui, 2, autoClearShell=self.autoClearShell) if dlg.exec_() == QDialog.Accepted: argv, wd, env, exceptions, clearShell, clearHistories, console = dlg.getData() eraseCoverage = dlg.getCoverageData() @@ -1371,11 +1372,11 @@ return if Preferences.getDebugger("Autosave") and \ - not self.project.saveAllScripts(reportSyntaxErrors = True): + not self.project.saveAllScripts(reportSyntaxErrors=True): doNotStart = True # save the info for later use - self.project.setDbgInfo(argv, wd, env, exceptions, self.excList, + self.project.setDbgInfo(argv, wd, env, exceptions, self.excList, self.excIgnoreList, clearShell) self.lastStartAction = 6 @@ -1385,7 +1386,7 @@ if editor is None: return - if not self.viewmanager.checkDirty(editor, + if not self.viewmanager.checkDirty(editor, Preferences.getDebugger("Autosave")) or \ editor.getFileName() is None: return @@ -1425,10 +1426,10 @@ fn = os.path.join(getConfig('ericDir'), "eric5.py") # Ask the client to open the new program. - self.debugServer.remoteCoverage(fn, argv, wd, env, - autoClearShell = self.autoClearShell, erase = eraseCoverage, - forProject = runProject, runInConsole = console, - clientType = self.clientType) + self.debugServer.remoteCoverage(fn, argv, wd, env, + autoClearShell=self.autoClearShell, erase=eraseCoverage, + forProject=runProject, runInConsole=console, + clientType=self.clientType) self.stopAct.setEnabled(True) @@ -1463,7 +1464,7 @@ cap = self.trUtf8("Profile of Script") dlg = StartDialog(cap, self.argvHistory, self.wdHistory, self.envHistory, self.exceptions, self.ui, 3, - autoClearShell = self.autoClearShell) + autoClearShell=self.autoClearShell) if dlg.exec_() == QDialog.Accepted: argv, wd, env, exceptions, clearShell, clearHistories, console = dlg.getData() eraseTimings = dlg.getProfilingData() @@ -1478,7 +1479,7 @@ return if Preferences.getDebugger("Autosave") and \ - not self.project.saveAllScripts(reportSyntaxErrors = True): + not self.project.saveAllScripts(reportSyntaxErrors=True): doNotStart = True # save the info for later use @@ -1492,7 +1493,7 @@ if editor is None: return - if not self.viewmanager.checkDirty(editor, + if not self.viewmanager.checkDirty(editor, Preferences.getDebugger("Autosave")) or \ editor.getFileName() is None: return @@ -1533,9 +1534,9 @@ # Ask the client to open the new program. self.debugServer.remoteProfile(fn, argv, wd, env, - autoClearShell = self.autoClearShell, erase = eraseTimings, - forProject = runProject, runInConsole = console, - clientType = self.clientType) + autoClearShell=self.autoClearShell, erase=eraseTimings, + forProject=runProject, runInConsole=console, + clientType=self.clientType) self.stopAct.setEnabled(True) @@ -1568,11 +1569,11 @@ cap = self.trUtf8("Run Project") else: cap = self.trUtf8("Run Script") - dlg = StartDialog(cap, self.argvHistory, self.wdHistory, self.envHistory, + dlg = StartDialog(cap, self.argvHistory, self.wdHistory, self.envHistory, self.exceptions, self.ui, 1, - autoClearShell = self.autoClearShell, - autoFork = self.forkAutomatically, - forkChild = self.forkIntoChild) + autoClearShell=self.autoClearShell, + autoFork=self.forkAutomatically, + forkChild=self.forkIntoChild) if dlg.exec_() == QDialog.Accepted: argv, wd, env, exceptions, clearShell, clearHistories, console = dlg.getData() forkAutomatically, forkIntoChild = dlg.getRunData() @@ -1587,7 +1588,7 @@ return if Preferences.getDebugger("Autosave") and \ - not self.project.saveAllScripts(reportSyntaxErrors = True): + not self.project.saveAllScripts(reportSyntaxErrors=True): doNotStart = True # save the info for later use @@ -1601,7 +1602,7 @@ if editor is None: return - if not self.viewmanager.checkDirty(editor, + if not self.viewmanager.checkDirty(editor, Preferences.getDebugger("Autosave")) or \ editor.getFileName() is None: return @@ -1643,9 +1644,9 @@ # Ask the client to open the new program. self.debugServer.remoteRun(fn, argv, wd, env, - autoClearShell = self.autoClearShell, forProject = runProject, - runInConsole = console, autoFork = forkAutomatically, - forkChild = forkIntoChild, clientType = self.clientType) + autoClearShell=self.autoClearShell, forProject=runProject, + runInConsole=console, autoFork=forkAutomatically, + forkChild=forkIntoChild, clientType=self.clientType) self.stopAct.setEnabled(True) @@ -1678,10 +1679,10 @@ cap = self.trUtf8("Debug Project") else: cap = self.trUtf8("Debug Script") - dlg = StartDialog(cap, self.argvHistory, self.wdHistory, self.envHistory, - self.exceptions, self.ui, 0, tracePython = self.tracePython, - autoClearShell = self.autoClearShell, autoContinue = self.autoContinue, - autoFork = self.forkAutomatically, forkChild = self.forkIntoChild) + dlg = StartDialog(cap, self.argvHistory, self.wdHistory, self.envHistory, + self.exceptions, self.ui, 0, tracePython=self.tracePython, + autoClearShell=self.autoClearShell, autoContinue=self.autoContinue, + autoFork=self.forkAutomatically, forkChild=self.forkIntoChild) if dlg.exec_() == QDialog.Accepted: argv, wd, env, exceptions, clearShell, clearHistories, console = dlg.getData() tracePython, autoContinue, forkAutomatically, forkIntoChild = \ @@ -1697,13 +1698,13 @@ return if Preferences.getDebugger("Autosave") and \ - not self.project.saveAllScripts(reportSyntaxErrors = True): + not self.project.saveAllScripts(reportSyntaxErrors=True): doNotStart = True # save the info for later use self.project.setDbgInfo(argv, wd, env, exceptions, self.excList, - self.excIgnoreList, clearShell, tracePython = tracePython, - autoContinue = self.autoContinue) + self.excIgnoreList, clearShell, tracePython=tracePython, + autoContinue=self.autoContinue) self.lastStartAction = 2 self.clientType = "" @@ -1712,7 +1713,7 @@ if editor is None: return - if not self.viewmanager.checkDirty(editor, + if not self.viewmanager.checkDirty(editor, Preferences.getDebugger("Autosave")) or \ editor.getFileName() is None: return @@ -1757,14 +1758,14 @@ if debugProject and self.project.getProjectType() == "E4Plugin": argv = '--plugin="{0}" {1}'.format(fn, argv) fn = os.path.join(getConfig('ericDir'), "eric5.py") - tracePython = True # override flag because it must be true + tracePython = True # override flag because it must be true # Ask the client to open the new program. - self.debugServer.remoteLoad(fn, argv, wd, env, - autoClearShell = self.autoClearShell, tracePython = tracePython, - autoContinue = autoContinue, forProject = debugProject, - runInConsole = console, autoFork = forkAutomatically, - forkChild = forkIntoChild, clientType = self.clientType) + self.debugServer.remoteLoad(fn, argv, wd, env, + autoClearShell=self.autoClearShell, tracePython=tracePython, + autoContinue=autoContinue, forProject=debugProject, + runInConsole=console, autoFork=forkAutomatically, + forkChild=forkIntoChild, clientType=self.clientType) # Signal that we have started a debugging session self.debuggingStarted.emit(fn) @@ -1782,13 +1783,13 @@ if self.lastStartAction in [1, 3, 5, 7, 9]: editor = self.viewmanager.getOpenEditor(self.lastDebuggedFile) if editor and \ - not self.viewmanager.checkDirty(editor, + not self.viewmanager.checkDirty(editor, Preferences.getDebugger("Autosave")): return forProject = False elif self.lastStartAction in [2, 4, 6, 8, 10]: if Preferences.getDebugger("Autosave") and \ - not self.project.saveAllScripts(reportSyntaxErrors = True): + not self.project.saveAllScripts(reportSyntaxErrors=True): doNotStart = True self.__compileChangedProjectFiles() forProject = True @@ -1811,35 +1812,35 @@ if self.lastStartAction in [1, 2]: # Ask the client to debug the new program. - self.debugServer.remoteLoad(fn, argv, wd, env, - autoClearShell = self.autoClearShell, tracePython = self.tracePython, - autoContinue = self.autoContinue, forProject = forProject, - runInConsole = self.runInConsole, autoFork = self.forkAutomatically, - forkChild = self.forkIntoChild, clientType = self.clientType) + self.debugServer.remoteLoad(fn, argv, wd, env, + autoClearShell=self.autoClearShell, tracePython=self.tracePython, + autoContinue=self.autoContinue, forProject=forProject, + runInConsole=self.runInConsole, autoFork=self.forkAutomatically, + forkChild=self.forkIntoChild, clientType=self.clientType) # Signal that we have started a debugging session self.debuggingStarted.emit(fn) elif self.lastStartAction in [3, 4]: # Ask the client to run the new program. - self.debugServer.remoteRun(fn, argv, wd, env, - autoClearShell = self.autoClearShell, forProject = forProject, - runInConsole = self.runInConsole, autoFork = self.forkAutomatically, - forkChild = self.forkIntoChild, clientType = self.clientType) + self.debugServer.remoteRun(fn, argv, wd, env, + autoClearShell=self.autoClearShell, forProject=forProject, + runInConsole=self.runInConsole, autoFork=self.forkAutomatically, + forkChild=self.forkIntoChild, clientType=self.clientType) elif self.lastStartAction in [5, 6]: # Ask the client to coverage run the new program. - self.debugServer.remoteCoverage(fn, argv, wd, env, - autoClearShell = self.autoClearShell, erase = self.eraseCoverage, - forProject = forProject, runInConsole = self.runInConsole, - clientType = self.clientType) + self.debugServer.remoteCoverage(fn, argv, wd, env, + autoClearShell=self.autoClearShell, erase=self.eraseCoverage, + forProject=forProject, runInConsole=self.runInConsole, + clientType=self.clientType) elif self.lastStartAction in [7, 8]: # Ask the client to profile run the new program. - self.debugServer.remoteProfile(fn, argv, wd, env, - autoClearShell = self.autoClearShell, erase = self.eraseTimings, - forProject = forProject, runInConsole = self.runInConsole, - clientType = self.clientType) + self.debugServer.remoteProfile(fn, argv, wd, env, + autoClearShell=self.autoClearShell, erase=self.eraseTimings, + forProject=forProject, runInConsole=self.runInConsole, + clientType=self.clientType) self.stopAct.setEnabled(True) @@ -1925,7 +1926,7 @@ aw = self.viewmanager.activeWindow() line = aw.getCursorPosition()[0] + 1 self.__enterRemote() - self.debugServer.remoteBreakpoint(aw.getFileName(), + self.debugServer.remoteBreakpoint(aw.getFileName(), line, 1, None, 1) self.debugServer.remoteContinue()
--- a/Debugger/DebugViewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebugViewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -34,11 +34,12 @@ from E5Gui.E5TabWidget import E5TabWidget + class DebugViewer(QWidget): """ Class implementing a widget conatining various debug related views. - The individual tabs contain the interpreter shell (optional), + The individual tabs contain the interpreter shell (optional), the filesystem browser (optional), the two variables viewers (global and local), a breakpoint viewer, a watch expression viewer and the exception logger. Additionally a list of all threads is shown. @@ -47,8 +48,8 @@ """ sourceFile = pyqtSignal(str, int) - def __init__(self, debugServer, docked, vm, parent = None, - embeddedShell = True, embeddedBrowser = True): + def __init__(self, debugServer, docked, vm, parent=None, + embeddedShell=True, embeddedBrowser=True): """ Constructor @@ -82,7 +83,7 @@ if embeddedShell: # add the interpreter shell self.shell = Shell(debugServer, vm) - index = self.__tabWidget.addTab(self.shell, + index = self.__tabWidget.addTab(self.shell, UI.PixmapCache.getIcon("shell.png"), '') self.__tabWidget.setTabToolTip(index, self.shell.windowTitle()) @@ -91,7 +92,7 @@ from UI.Browser import Browser # add the browser self.browser = Browser() - index = self.__tabWidget.addTab(self.browser, + index = self.__tabWidget.addTab(self.browser, UI.PixmapCache.getIcon("browser.png"), '') self.__tabWidget.setTabToolTip(index, self.browser.windowTitle()) @@ -196,7 +197,7 @@ # add the exception logger self.exceptionLogger = ExceptionLogger() - index = self.__tabWidget.addTab(self.exceptionLogger, + index = self.__tabWidget.addTab(self.exceptionLogger, UI.PixmapCache.getIcon("exceptions.png"), '') self.__tabWidget.setTabToolTip(index, self.exceptionLogger.windowTitle()) @@ -211,7 +212,7 @@ # add the threads viewer self.__mainLayout.addWidget(QLabel(self.trUtf8("Threads:"))) self.__threadList = QTreeWidget() - self.__threadList.setHeaderLabels([self.trUtf8("ID"), self.trUtf8("Name"), + self.__threadList.setHeaderLabels([self.trUtf8("ID"), self.trUtf8("Name"), self.trUtf8("State"), ""]) self.__threadList.setSortingEnabled(True) self.__mainLayout.addWidget(self.__threadList) @@ -411,7 +412,7 @@ state = self.trUtf8("waiting at breakpoint") else: state = self.trUtf8("running") - itm = QTreeWidgetItem(self.__threadList, + itm = QTreeWidgetItem(self.__threadList, ["{0:d}".format(thread['id']), thread['name'], state]) if thread['id'] == currentID: citm = itm
--- a/Debugger/DebuggerInterfaceNone.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebuggerInterfaceNone.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,15 +14,17 @@ ClientTypeAssociations = [] + def getRegistryData(): """ Module functionto get characterising data for the debugger interface. - @return list of the following data. Client type (string), client + @return list of the following data. Client type (string), client capabilities (integer), client type association (list of strings) """ return ["None", ClientDefaultCapabilities, ClientTypeAssociations] + class DebuggerInterfaceNone(QObject): """ Class implementing a dummy debugger interface for the debug server. @@ -49,7 +51,7 @@ Public method to start a remote Python interpreter. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -61,7 +63,7 @@ Public method to start a remote Python interpreter for a project. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -117,8 +119,8 @@ """ return - def remoteLoad(self, fn, argv, wd, traceInterpreter = False, autoContinue = True, - autoFork = False, forkChild = False): + def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True, + autoFork=False, forkChild=False): """ Public method to load a new program to debug. @@ -134,7 +136,7 @@ """ return - def remoteRun(self, fn, argv, wd, autoFork = False, forkChild = False): + def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False): """ Public method to load a new program to run. @@ -146,19 +148,19 @@ """ return - def remoteCoverage(self, fn, argv, wd, erase = False): + def remoteCoverage(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect coverage data. @param fn the filename to run (string) @param argv the commandline arguments to pass to the program (string) @param wd the working directory for the program (string) - @keyparam erase flag indicating that coverage info should be + @keyparam erase flag indicating that coverage info should be cleared first (boolean) """ return - def remoteProfile(self, fn, argv, wd, erase = False): + def remoteProfile(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect profiling data. @@ -171,7 +173,7 @@ def remoteStatement(self, stmt): """ - Public method to execute a Python statement. + Public method to execute a Python statement. @param stmt the Python statement to execute (string). It should not have a trailing newline. @@ -203,7 +205,7 @@ """ return - def remoteContinue(self, special = False): + def remoteContinue(self, special=False): """ Public method to continue the debugged program. @@ -211,7 +213,7 @@ """ return - def remoteBreakpoint(self, fn, line, set, cond = None, temp = False): + def remoteBreakpoint(self, fn, line, set, cond=None, temp=False): """ Public method to set or clear a breakpoint. @@ -243,7 +245,7 @@ """ return - def remoteWatchpoint(self, cond, set, temp = False): + def remoteWatchpoint(self, cond, set, temp=False): """ Public method to set or clear a watch expression. @@ -271,7 +273,7 @@ """ return - def remoteRawInput(self,s): + def remoteRawInput(self, s): """ Public method to send the raw input to the debugged program. @@ -293,7 +295,7 @@ """ return - def remoteClientVariables(self, scope, filter, framenr = 0): + def remoteClientVariables(self, scope, filter, framenr=0): """ Public method to request the variables of the debugged program. @@ -303,7 +305,7 @@ """ return - def remoteClientVariable(self, scope, filter, var, framenr = 0): + def remoteClientVariable(self, scope, filter, var, framenr=0): """ Public method to request the variables of the debugged program. @@ -385,4 +387,4 @@ """ public method to stop a unittest run. """ - return \ No newline at end of file + return
--- a/Debugger/DebuggerInterfacePython.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebuggerInterfacePython.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,11 +28,12 @@ ClientDefaultCapabilities = DebugClientCapabilities.HasAll + def getRegistryData(): """ Module function to get characterising data for the debugger interface. - @return list of the following data. Client type (string), client + @return list of the following data. Client type (string), client capabilities (integer), client type association (list of strings) """ exts = [] @@ -47,6 +48,7 @@ else: return ["", 0, []] + class DebuggerInterfacePython(QObject): """ Class implementing the Python debugger interface for the debug server. @@ -87,7 +89,7 @@ else: self.translate = self.__identityTranslation - def __identityTranslation(self, fn, remote2local = True): + def __identityTranslation(self, fn, remote2local=True): """ Private method to perform the identity path translation. @@ -98,7 +100,7 @@ """ return fn - def __remoteTranslation(self, fn, remote2local = True): + def __remoteTranslation(self, fn, remote2local=True): """ Private method to perform the path translation. @@ -112,7 +114,7 @@ else: return fn.replace(self.translateLocal, self.translateRemote) - def __startProcess(self, program, arguments, environment = None): + def __startProcess(self, program, arguments, environment=None): """ Private method to start the debugger client process. @@ -141,7 +143,7 @@ Public method to start a remote Python interpreter. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -156,7 +158,7 @@ debugClientType = Preferences.getDebugger("DebugClientType") if debugClientType == "standard": - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python", "DebugClient.py") elif debugClientType == "threaded": debugClient = os.path.join(getConfig('ericDir'), @@ -235,8 +237,8 @@ """<p>The debugger backend could not be started.</p>""")) return process, self.__isNetworked - process = self.__startProcess(interpreter, - [debugClient, noencoding, str(port), redirect, ipaddr], + process = self.__startProcess(interpreter, + [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: E5MessageBox.critical(None, @@ -249,7 +251,7 @@ Public method to start a remote Python interpreter for a project. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -328,8 +330,8 @@ """<p>The debugger backend could not be started.</p>""")) return process, self.__isNetworked - process = self.__startProcess(interpreter, - [debugClient, noencoding, str(port), redirect, ipaddr], + process = self.__startProcess(interpreter, + [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: E5MessageBox.critical(None, @@ -416,8 +418,8 @@ """ self.__sendCommand('{0}{1}\n'.format(RequestEnv, str(env))) - def remoteLoad(self, fn, argv, wd, traceInterpreter = False, autoContinue = True, - autoFork = False, forkChild = False): + def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True, + autoFork=False, forkChild=False): """ Public method to load a new program to debug. @@ -440,7 +442,7 @@ RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), traceInterpreter)) - def remoteRun(self, fn, argv, wd, autoFork = False, forkChild = False): + def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False): """ Public method to load a new program to run. @@ -456,14 +458,14 @@ self.__sendCommand('{0}{1}|{2}|{3}\n'.format( RequestRun, wd, fn, str(Utilities.parseOptionString(argv)))) - def remoteCoverage(self, fn, argv, wd, erase = False): + def remoteCoverage(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect coverage data. @param fn the filename to run (string) @param argv the commandline arguments to pass to the program (string) @param wd the working directory for the program (string) - @keyparam erase flag indicating that coverage info should be + @keyparam erase flag indicating that coverage info should be cleared first (boolean) """ wd = self.translate(wd, False) @@ -472,7 +474,7 @@ RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)), erase)) - def remoteProfile(self, fn, argv, wd, erase = False): + def remoteProfile(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect profiling data. @@ -488,7 +490,7 @@ def remoteStatement(self, stmt): """ - Public method to execute a Python statement. + Public method to execute a Python statement. @param stmt the Python statement to execute (string). It should not have a trailing newline. @@ -520,7 +522,7 @@ """ self.__sendCommand(RequestStepQuit + '\n') - def remoteContinue(self, special = False): + def remoteContinue(self, special=False): """ Public method to continue the debugged program. @@ -528,7 +530,7 @@ """ self.__sendCommand('{0}{1:d}\n'.format(RequestContinue, special)) - def remoteBreakpoint(self, fn, line, set, cond = None, temp = False): + def remoteBreakpoint(self, fn, line, set, cond=None, temp=False): """ Public method to set or clear a breakpoint. @@ -566,7 +568,7 @@ self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format( RequestBreakIgnore, fn, line, count)) - def remoteWatchpoint(self, cond, set, temp = False): + def remoteWatchpoint(self, cond, set, temp=False): """ Public method to set or clear a watch expression. @@ -597,7 +599,7 @@ # cond is combination of cond and special (s. watch expression viewer) self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchIgnore, cond, count)) - def remoteRawInput(self,s): + def remoteRawInput(self, s): """ Public method to send the raw input to the debugged program. @@ -619,7 +621,7 @@ """ self.__sendCommand('{0}{1:d}\n'.format(RequestThreadSet, tid)) - def remoteClientVariables(self, scope, filter, framenr = 0): + def remoteClientVariables(self, scope, filter, framenr=0): """ Public method to request the variables of the debugged program. @@ -630,7 +632,7 @@ self.__sendCommand('{0}{1:d}, {2:d}, {3}\n'.format( RequestVariables, framenr, scope, str(filter))) - def remoteClientVariable(self, scope, filter, var, framenr = 0): + def remoteClientVariable(self, scope, filter, var, framenr=0): """ Public method to request the variables of the debugged program. @@ -775,7 +777,7 @@ self.__autoContinue = False QTimer.singleShot(0, self.remoteContinue) else: - self.debugServer.signalClientLine(cf[0], int(cf[1]), + self.debugServer.signalClientLine(cf[0], int(cf[1]), resp == ResponseStack) self.debugServer.signalClientStack(stack) continue
--- a/Debugger/DebuggerInterfacePython3.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebuggerInterfacePython3.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,11 +27,12 @@ ClientDefaultCapabilities = DebugClientCapabilities.HasAll + def getRegistryData(): """ Module function to get characterising data for the debugger interface. - @return list of the following data. Client type (string), client + @return list of the following data. Client type (string), client capabilities (integer), client type association (list of strings) """ exts = [] @@ -46,6 +47,7 @@ else: return ["", 0, []] + class DebuggerInterfacePython3(QObject): """ Class implementing the Python debugger interface for the debug server. @@ -84,7 +86,7 @@ else: self.translate = self.__identityTranslation - def __identityTranslation(self, fn, remote2local = True): + def __identityTranslation(self, fn, remote2local=True): """ Private method to perform the identity path translation. @@ -95,7 +97,7 @@ """ return fn - def __remoteTranslation(self, fn, remote2local = True): + def __remoteTranslation(self, fn, remote2local=True): """ Private method to perform the path translation. @@ -109,7 +111,7 @@ else: return fn.replace(self.translateLocal, self.translateRemote) - def __startProcess(self, program, arguments, environment = None): + def __startProcess(self, program, arguments, environment=None): """ Private method to start the debugger client process. @@ -138,7 +140,7 @@ Public method to start a remote Python interpreter. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -152,7 +154,7 @@ debugClientType = Preferences.getDebugger("DebugClientType3") if debugClientType == "standard": - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python3", "DebugClient.py") elif debugClientType == "threaded": debugClient = os.path.join(getConfig('ericDir'), @@ -231,8 +233,8 @@ """<p>The debugger backend could not be started.</p>""")) return process, self.__isNetworked - process = self.__startProcess(interpreter, - [debugClient, noencoding, str(port), redirect, ipaddr], + process = self.__startProcess(interpreter, + [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: E5MessageBox.critical(None, @@ -245,7 +247,7 @@ Public method to start a remote Python interpreter for a project. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -324,8 +326,8 @@ """<p>The debugger backend could not be started.</p>""")) return process, self.__isNetworked - process = self.__startProcess(interpreter, - [debugClient, noencoding, str(port), redirect, ipaddr], + process = self.__startProcess(interpreter, + [debugClient, noencoding, str(port), redirect, ipaddr], clientEnv) if process is None: E5MessageBox.critical(None, @@ -412,8 +414,8 @@ """ self.__sendCommand('{0}{1}\n'.format(RequestEnv, str(env))) - def remoteLoad(self, fn, argv, wd, traceInterpreter = False, autoContinue = True, - autoFork = False, forkChild = False): + def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True, + autoFork=False, forkChild=False): """ Public method to load a new program to debug. @@ -433,10 +435,10 @@ fn = self.translate(os.path.abspath(fn), False) self.__sendCommand('{0}{1}\n'.format(RequestForkMode, repr((autoFork, forkChild)))) self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format( - RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), + RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), traceInterpreter)) - def remoteRun(self, fn, argv, wd, autoFork = False, forkChild = False): + def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False): """ Public method to load a new program to run. @@ -452,14 +454,14 @@ self.__sendCommand('{0}{1}|{2}|{3}\n'.format( RequestRun, wd, fn, str(Utilities.parseOptionString(argv)))) - def remoteCoverage(self, fn, argv, wd, erase = False): + def remoteCoverage(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect coverage data. @param fn the filename to run (string) @param argv the commandline arguments to pass to the program (string) @param wd the working directory for the program (string) - @keyparam erase flag indicating that coverage info should be + @keyparam erase flag indicating that coverage info should be cleared first (boolean) """ wd = self.translate(wd, False) @@ -468,7 +470,7 @@ RequestCoverage, wd, fn, str(Utilities.parseOptionString(argv)), erase)) - def remoteProfile(self, fn, argv, wd, erase = False): + def remoteProfile(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect profiling data. @@ -484,7 +486,7 @@ def remoteStatement(self, stmt): """ - Public method to execute a Python statement. + Public method to execute a Python statement. @param stmt the Python statement to execute (string). It should not have a trailing newline. @@ -516,7 +518,7 @@ """ self.__sendCommand(RequestStepQuit + '\n') - def remoteContinue(self, special = False): + def remoteContinue(self, special=False): """ Public method to continue the debugged program. @@ -524,7 +526,7 @@ """ self.__sendCommand('{0}{1:d}\n'.format(RequestContinue, special)) - def remoteBreakpoint(self, fn, line, set, cond = None, temp = False): + def remoteBreakpoint(self, fn, line, set, cond=None, temp=False): """ Public method to set or clear a breakpoint. @@ -562,7 +564,7 @@ self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format( RequestBreakIgnore, fn, line, count)) - def remoteWatchpoint(self, cond, set, temp = False): + def remoteWatchpoint(self, cond, set, temp=False): """ Public method to set or clear a watch expression. @@ -593,7 +595,7 @@ # cond is combination of cond and special (s. watch expression viewer) self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchIgnore, cond, count)) - def remoteRawInput(self,s): + def remoteRawInput(self, s): """ Public method to send the raw input to the debugged program. @@ -615,7 +617,7 @@ """ self.__sendCommand('{0}{1:d}\n'.format(RequestThreadSet, tid)) - def remoteClientVariables(self, scope, filter, framenr = 0): + def remoteClientVariables(self, scope, filter, framenr=0): """ Public method to request the variables of the debugged program. @@ -626,7 +628,7 @@ self.__sendCommand('{0}{1:d}, {2:d}, {3}\n'.format( RequestVariables, framenr, scope, str(filter))) - def remoteClientVariable(self, scope, filter, var, framenr = 0): + def remoteClientVariable(self, scope, filter, var, framenr=0): """ Public method to request the variables of the debugged program. @@ -770,7 +772,7 @@ self.__autoContinue = False QTimer.singleShot(0, self.remoteContinue) else: - self.debugServer.signalClientLine(cf[0], int(cf[1]), + self.debugServer.signalClientLine(cf[0], int(cf[1]), resp == ResponseStack) self.debugServer.signalClientStack(stack) continue
--- a/Debugger/DebuggerInterfaceRuby.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/DebuggerInterfaceRuby.py Fri Mar 11 16:51:57 2011 +0100 @@ -31,15 +31,17 @@ ClientTypeAssociations = [".rb"] + def getRegistryData(): """ Module function to get characterising data for the debugger interface. - @return list of the following data. Client type (string), client + @return list of the following data. Client type (string), client capabilities (integer), client type association (list of strings) """ return ["Ruby", ClientDefaultCapabilities, ClientTypeAssociations] + class DebuggerInterfaceRuby(QObject): """ Class implementing the Ruby debugger interface for the debug server. @@ -78,7 +80,7 @@ else: self.translate = self.__identityTranslation - def __identityTranslation(self, fn, remote2local = True): + def __identityTranslation(self, fn, remote2local=True): """ Private method to perform the identity path translation. @@ -89,7 +91,7 @@ """ return fn - def __remoteTranslation(self, fn, remote2local = True): + def __remoteTranslation(self, fn, remote2local=True): """ Private method to perform the path translation. @@ -103,7 +105,7 @@ else: return fn.replace(self.translateLocal, self.translateRemote) - def __startProcess(self, program, arguments, environment = None): + def __startProcess(self, program, arguments, environment=None): """ Private method to start the debugger client process. @@ -132,7 +134,7 @@ Public method to start a remote Ruby interpreter. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return client process object (QProcess) and a flag to indicate a network connection (boolean) @@ -140,7 +142,7 @@ interpreter = Preferences.getDebugger("RubyInterpreter") if interpreter == "": interpreter = "/usr/bin/ruby" - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Ruby", "DebugClient.rb") redirect = str(Preferences.getDebugger("RubyRedirect")) @@ -209,8 +211,8 @@ """<p>The debugger backend could not be started.</p>""")) return process, self.__isNetworked - process = self.__startProcess(interpreter, - [debugClient, str(port), redirect, ipaddr], + process = self.__startProcess(interpreter, + [debugClient, str(port), redirect, ipaddr], clientEnv) if process is None: E5MessageBox.critical(None, @@ -223,7 +225,7 @@ Public method to start a remote Ruby interpreter for a project. @param port portnumber the debug server is listening on (integer) - @param runInConsole flag indicating to start the debugger in a + @param runInConsole flag indicating to start the debugger in a console window (boolean) @return pid of the client process (integer) and a flag to indicate a network connection (boolean) @@ -300,8 +302,8 @@ """<p>The debugger backend could not be started.</p>""")) return process, self.__isNetworked - process = self.__startProcess(interpreter, - [debugClient, str(port), redirect, ipaddr], + process = self.__startProcess(interpreter, + [debugClient, str(port), redirect, ipaddr], clientEnv) if process is None: E5MessageBox.critical(None, @@ -388,8 +390,8 @@ """ self.__sendCommand('{0}{1}\n'.format(RequestEnv, str(env))) - def remoteLoad(self, fn, argv, wd, traceInterpreter = False, autoContinue = True, - autoFork = False, forkChild = False): + def remoteLoad(self, fn, argv, wd, traceInterpreter=False, autoContinue=True, + autoFork=False, forkChild=False): """ Public method to load a new program to debug. @@ -401,7 +403,7 @@ @keyparam autoContinue flag indicating, that the debugger should not stop at the first executable line (boolean) @keyparam autoFork flag indicating the automatic fork mode (boolean) (ignored) - @keyparam forkChild flag indicating to debug the child after forking + @keyparam forkChild flag indicating to debug the child after forking (boolean) (ignored) """ self.__autoContinue = autoContinue @@ -409,10 +411,10 @@ wd = self.translate(wd, False) fn = self.translate(os.path.abspath(fn), False) self.__sendCommand('{0}{1}|{2}|{3}|{4:d}\n'.format( - RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), + RequestLoad, wd, fn, str(Utilities.parseOptionString(argv)), traceInterpreter)) - def remoteRun(self, fn, argv, wd, autoFork = False, forkChild = False): + def remoteRun(self, fn, argv, wd, autoFork=False, forkChild=False): """ Public method to load a new program to run. @@ -420,7 +422,7 @@ @param argv the commandline arguments to pass to the program (string) @param wd the working directory for the program (string) @keyparam autoFork flag indicating the automatic fork mode (boolean) (ignored) - @keyparam forkChild flag indicating to debug the child after forking + @keyparam forkChild flag indicating to debug the child after forking (boolean) (ignored) """ wd = self.translate(wd, False) @@ -428,19 +430,19 @@ self.__sendCommand('{0}{1}|{2}|{3}\n'.format( RequestRun, wd, fn, str(Utilities.parseOptionString(argv)))) - def remoteCoverage(self, fn, argv, wd, erase = False): + def remoteCoverage(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect coverage data. @param fn the filename to run (string) @param argv the commandline arguments to pass to the program (string) @param wd the working directory for the program (string) - @keyparam erase flag indicating that coverage info should be + @keyparam erase flag indicating that coverage info should be cleared first (boolean) """ raise NotImplementedError("Interface not available.") - def remoteProfile(self, fn, argv, wd, erase = False): + def remoteProfile(self, fn, argv, wd, erase=False): """ Public method to load a new program to collect profiling data. @@ -453,7 +455,7 @@ def remoteStatement(self, stmt): """ - Public method to execute a Ruby statement. + Public method to execute a Ruby statement. @param stmt the Ruby statement to execute (string). It should not have a trailing newline. @@ -485,7 +487,7 @@ """ self.__sendCommand(RequestStepQuit + '\n') - def remoteContinue(self, special = False): + def remoteContinue(self, special=False): """ Public method to continue the debugged program. @@ -493,7 +495,7 @@ """ self.__sendCommand('{0}{1:d}\n'.format(RequestContinue, special)) - def remoteBreakpoint(self, fn, line, set, cond = None, temp = False): + def remoteBreakpoint(self, fn, line, set, cond=None, temp=False): """ Public method to set or clear a breakpoint. @@ -531,7 +533,7 @@ self.__sendCommand('{0}{1},{2:d},{3:d}\n'.format( RequestBreakIgnore, fn, line, count)) - def remoteWatchpoint(self, cond, set, temp = False): + def remoteWatchpoint(self, cond, set, temp=False): """ Public method to set or clear a watch expression. @@ -562,7 +564,7 @@ # cond is combination of cond and special (s. watch expression viewer) self.__sendCommand('{0}{1},{2:d}\n'.format(RequestWatchIgnore, cond, count)) - def remoteRawInput(self,s): + def remoteRawInput(self, s): """ Public method to send the raw input to the debugged program. @@ -584,7 +586,7 @@ """ return - def remoteClientVariables(self, scope, filter, framenr = 0): + def remoteClientVariables(self, scope, filter, framenr=0): """ Public method to request the variables of the debugged program. @@ -595,7 +597,7 @@ self.__sendCommand('{0}{1:d}, {2:d}, {3}\n'.format( RequestVariables, framenr, scope, str(filter))) - def remoteClientVariable(self, scope, filter, var, framenr = 0): + def remoteClientVariable(self, scope, filter, var, framenr=0): """ Public method to request the variables of the debugged program. @@ -834,4 +836,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8')) else: - self.queue.append(cmd) \ No newline at end of file + self.queue.append(cmd)
--- a/Debugger/EditBreakpointDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/EditBreakpointDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,12 +19,13 @@ import Utilities + class EditBreakpointDialog(QDialog, Ui_EditBreakpointDialog): """ Class implementing a dialog to edit breakpoint properties. """ - def __init__(self, id, properties, condHistory, parent = None, name = None, - modal = False, addMode = False, filenameHistory = None): + def __init__(self, id, properties, condHistory, parent=None, name=None, + modal=False, addMode=False, filenameHistory=None): """ Constructor @@ -37,7 +38,7 @@ @param name the widget name of this dialog @param modal flag indicating a modal dialog """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) if name: self.setObjectName(name) @@ -138,7 +139,7 @@ @return a tuple containing the breakpoints new properties (condition, temporary flag, enabled flag, ignore count) """ - return (self.conditionCombo.currentText(), + return (self.conditionCombo.currentText(), self.temporaryCheckBox.isChecked(), self.enabledCheckBox.isChecked(), self.ignoreSpinBox.value()) @@ -151,11 +152,11 @@ """ fn = self.filenameCombo.currentText() if not fn: - fn = None + fn = None else: fn = os.path.expanduser(os.path.expandvars(fn)) - return (fn, self.linenoSpinBox.value(), + return (fn, self.linenoSpinBox.value(), self.conditionCombo.currentText(), self.temporaryCheckBox.isChecked(), self.enabledCheckBox.isChecked(), self.ignoreSpinBox.value())
--- a/Debugger/EditWatchpointDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/EditWatchpointDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,7 +17,7 @@ """ Class implementing a dialog to edit watch expression properties. """ - def __init__(self, properties, parent = None, name = None, modal = False): + def __init__(self, properties, parent=None, name=None, modal=False): """ Constructor @@ -27,7 +27,7 @@ @param name the widget name of this dialog @param modal flag indicating a modal dialog """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) if name: self.setObjectName(name) @@ -90,15 +90,15 @@ (expression, temporary flag, enabled flag, ignore count, special condition) """ if self.conditionButton.isChecked(): - return (self.conditionEdit.text(), + return (self.conditionEdit.text(), self.temporaryCheckBox.isChecked(), - self.enabledCheckBox.isChecked(), + self.enabledCheckBox.isChecked(), self.ignoreSpinBox.value(), "") elif self.specialButton.isChecked(): - return (self.specialEdit.text(), + return (self.specialEdit.text(), self.temporaryCheckBox.isChecked(), - self.enabledCheckBox.isChecked(), + self.enabledCheckBox.isChecked(), self.ignoreSpinBox.value(), self.specialCombo.currentText()) else:
--- a/Debugger/ExceptionLogger.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/ExceptionLogger.py Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ def __itemDoubleClicked(self, itm): """ - Private slot to handle the double click of an item. + Private slot to handle the double click of an item. @param itm the item that was double clicked(QTreeWidgetItem), ignored """
--- a/Debugger/ExceptionsFilterDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/ExceptionsFilterDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .Ui_ExceptionsFilterDialog import Ui_ExceptionsFilterDialog + class ExceptionsFilterDialog(QDialog, Ui_ExceptionsFilterDialog): """ Class implementing the exceptions filter dialog.
--- a/Debugger/StartDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/StartDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Utilities import Preferences + class StartDialog(QDialog): """ Class implementing the Start Program dialog. @@ -25,9 +26,9 @@ the commandline parameters, the working directory and whether exception reporting should be disabled. """ - def __init__(self, caption, argvList, wdList, envList, exceptions, parent = None, - type = 0, modfuncList = None, tracePython = False, autoClearShell = True, - autoContinue = True, autoFork = False, forkChild = False): + def __init__(self, caption, argvList, wdList, envList, exceptions, parent=None, + type=0, modfuncList=None, tracePython=False, autoClearShell=True, + autoContinue=True, autoFork=False, forkChild=False): """ Constructor @@ -45,7 +46,7 @@ <li>3 = start profile dialog</li> </ul> @keyparam modfuncList history list of module functions (list of strings) - @keyparam tracePython flag indicating if the Python library should + @keyparam tracePython flag indicating if the Python library should be traced as well (boolean) @keyparam autoClearShell flag indicating, that the interpreter window should be cleared automatically (boolean) @@ -144,12 +145,12 @@ workdir = self.ui.workdirCombo.currentText() environment = self.ui.environmentCombo.currentText() - return (cmdLine, + return (cmdLine, workdir, environment, self.ui.exceptionCheckBox.isChecked(), - self.ui.clearShellCheckBox.isChecked(), - self.__clearHistoryLists, + self.ui.clearShellCheckBox.isChecked(), + self.__clearHistoryLists, self.ui.consoleCheckBox.isChecked()) def getDebugData(self): @@ -159,13 +160,13 @@ @return a tuple of a flag indicating, if the Python library should be traced as well, a flag indicating, that the debugger should not stop at the first executable line (boolean), a flag indicating, that the debugger - should fork automatically (boolean) and a flag indicating, that the + should fork automatically (boolean) and a flag indicating, that the debugger should debug the child process after forking automatically (boolean) """ if self.type == 0: return (self.ui.tracePythonCheckBox.isChecked(), self.ui.autoContinueCheckBox.isChecked(), - self.ui.forkModeCheckBox.isChecked(), + self.ui.forkModeCheckBox.isChecked(), self.ui.forkChildCheckBox.isChecked()) def getRunData(self): @@ -173,11 +174,11 @@ Public method to retrieve the debug related data entered into this dialog. @return a tuple of a flag indicating, that the debugger should fork automatically - (boolean) and a flag indicating, that the debugger should debug the child + (boolean) and a flag indicating, that the debugger should debug the child process after forking automatically (boolean) """ if self.type == 1: - return (self.ui.forkModeCheckBox.isChecked(), + return (self.ui.forkModeCheckBox.isChecked(), self.ui.forkChildCheckBox.isChecked()) def getCoverageData(self):
--- a/Debugger/VariableDetailDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/VariableDetailDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .Ui_VariableDetailDialog import Ui_VariableDetailDialog + class VariableDetailDialog(QDialog, Ui_VariableDetailDialog): """ Class implementing the variable detail dialog.
--- a/Debugger/VariablesFilterDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/VariablesFilterDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,7 +23,7 @@ It opens a dialog window for the configuration of the variables type filter to be applied during a debugging session. """ - def __init__(self, parent = None, name = None, modal = False): + def __init__(self, parent=None, name=None, modal=False): """ Constructor @@ -31,7 +31,7 @@ @param name name of this dialog (string) @param modal flag to indicate a modal dialog (boolean) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) if name: self.setObjectName(name) self.setModal(modal) @@ -75,7 +75,7 @@ def setSelection(self, lList, gList): """ - Public slot to set the current selection. + Public slot to set the current selection. @param lList local variables filter (list of int) @param gList global variables filter (list of int) @@ -94,4 +94,4 @@ @param button button that was clicked (QAbstractButton) """ if button == self.defaultButton: - Preferences.setVarFilters(self.getSelection()) \ No newline at end of file + Preferences.setVarFilters(self.getSelection())
--- a/Debugger/VariablesViewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/VariablesViewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -35,7 +35,7 @@ """ self.value = dvalue if len(dvalue) > 2048: # 1024 * 2 - dvalue = QApplication.translate("VariableItem", + dvalue = QApplication.translate("VariableItem", "<double click to show value>") QTreeWidgetItem.__init__(self, parent, [dvar, dvalue, dtype]) @@ -113,11 +113,12 @@ """ return + class SpecialVarItem(VariableItem): """ Class implementing a VariableItem that represents a special variable node. - These special variable nodes are generated for classes, lists, + These special variable nodes are generated for classes, lists, tuples and dictionaries. """ def __init__(self, parent, dvar, dvalue, dtype, frmnr, scope): @@ -158,6 +159,7 @@ e5App().getObject("DebugServer").remoteClientVariable( self.scope, filter, pathlist, self.framenr) + class ArrayElementVarItem(VariableItem): """ Class implementing a VariableItem that represents an array element. @@ -175,8 +177,8 @@ """ Array elements have numbers as names, but the key must be - right justified and zero filled to 6 decimal places. Then - element 2 will have a key of '000002' and appear before + right justified and zero filled to 6 decimal places. Then + element 2 will have a key of '000002' and appear before element 10 with a key of '000010' """ keyStr = self.text(0) @@ -193,6 +195,7 @@ else: return VariableItem.key(self, column) + class SpecialArrayElementVarItem(SpecialVarItem): """ Class implementing a QTreeWidgetItem that represents a special array variable node. @@ -212,11 +215,11 @@ """ Array elements have numbers as names, but the key must be - right justified and zero filled to 6 decimal places. Then - element 2 will have a key of '000002' and appear before + right justified and zero filled to 6 decimal places. Then + element 2 will have a key of '000002' and appear before element 10 with a key of '000010' """ - keyStr = self.text(0)[:-2] # strip off [], () or {} + keyStr = self.text(0)[:-2] # strip off [], () or {} self.arrayElementKey = "{0:6d}".format(int(keyStr)) def key(self, column): @@ -230,13 +233,14 @@ else: return SpecialVarItem.key(self, column) + class VariablesViewer(QTreeWidget): """ Class implementing the variables viewer widget. This widget is used to display the variables of the program being debugged in a tree. Compound types will be shown with - their main entry first. Once the subtree has been expanded, the + their main entry first. Once the subtree has been expanded, the individual entries will be shown. Double clicking an entry will popup a dialog showing the variables parameters in a more readable form. This is especially useful for lengthy strings. @@ -253,8 +257,8 @@ """ QTreeWidget.__init__(self, parent) - self.indicators = {'list' : '[]', 'tuple' : '()', 'dict' : '{}', # Python types - 'Array' : '[]', 'Hash' : '{}'} # Ruby types + self.indicators = {'list': '[]', 'tuple': '()', 'dict': '{}', # Python types + 'Array': '[]', 'Hash': '{}'} # Ruby types self.rx_class = QRegExp('<.*(instance|object) at 0x.*>') self.rx_class2 = QRegExp('class .*') @@ -279,8 +283,8 @@ if scope: self.setWindowTitle(self.trUtf8("Global Variables")) self.setHeaderLabels([ - self.trUtf8("Globals"), - self.trUtf8("Value"), + self.trUtf8("Globals"), + self.trUtf8("Value"), self.trUtf8("Type")]) self.setWhatsThis(self.trUtf8( """<b>The Global Variables Viewer Window</b>""" @@ -290,8 +294,8 @@ else: self.setWindowTitle(self.trUtf8("Local Variables")) self.setHeaderLabels([ - self.trUtf8("Locals"), - self.trUtf8("Value"), + self.trUtf8("Locals"), + self.trUtf8("Value"), self.trUtf8("Type")]) self.setWhatsThis(self.trUtf8( """<b>The Local Variables Viewer Window</b>""" @@ -419,9 +423,9 @@ """ Public method to show variables in a list. - @param vlist the list of subitems to be displayed. + @param vlist the list of subitems to be displayed. The first element gives the path of the - parent variable. Each other listentry is + parent variable. Each other listentry is a tuple of three values. <ul> <li>the variable name (string)</li> @@ -461,7 +465,7 @@ self.setCurrentItem(citm) self.setItemSelected(citm, True) if self.__scrollToItem: - self.scrollToItem(self.__scrollToItem, + self.scrollToItem(self.__scrollToItem, QAbstractItemView.PositionAtTop) else: self.scrollToItem(citm, QAbstractItemView.PositionAtTop) @@ -472,7 +476,7 @@ self.resortEnabled = resortEnabled self.__resort() - def __generateItem(self, parent, dvar, dvalue, dtype, isSpecial = False): + def __generateItem(self, parent, dvar, dvalue, dtype, isSpecial=False): """ Private method used to generate a VariableItem. @@ -489,17 +493,17 @@ isSpecial = False if self.rx_class2.exactMatch(dtype): - return SpecialVarItem(parent, dvar, dvalue, dtype[7:-1], + return SpecialVarItem(parent, dvar, dvalue, dtype[7:-1], self.framenr, self.scope) elif dtype != "void *" and \ (self.rx_class.exactMatch(dvalue) or \ self.rx_class3.exactMatch(dvalue) or \ isSpecial): if self.dvar_rx_special_array_element.exactMatch(dvar): - return SpecialArrayElementVarItem(parent, dvar, dvalue, dtype, + return SpecialArrayElementVarItem(parent, dvar, dvalue, dtype, self.framenr, self.scope) else: - return SpecialVarItem(parent, dvar, dvalue, dtype, + return SpecialVarItem(parent, dvar, dvalue, dtype, self.framenr, self.scope) else: if self.dvar_rx_array_element.exactMatch(dvar): @@ -511,7 +515,7 @@ """ Private method used to add an item to the list. - If the item is of a type with subelements (i.e. list, dictionary, + If the item is of a type with subelements (i.e. list, dictionary, tuple), these subelements are added by calling this method recursively. @param parent the parent of the item to be added @@ -531,8 +535,8 @@ dvtype = self.__getDispType(vtype) if vtype in ['list', 'Array', 'tuple', 'dict', 'Hash']: - itm = self.__generateItem(parent, dvar, - self.trUtf8("{0} items").format(value), + itm = self.__generateItem(parent, dvar, + self.trUtf8("{0} items").format(value), dvtype, True) elif vtype in ['unicode', 'str']: if self.rx_nonprintable.indexIn(value) != -1: @@ -571,7 +575,7 @@ def mouseDoubleClickEvent(self, mouseEvent): """ - Protected method of QAbstractItemView. + Protected method of QAbstractItemView. Reimplemented to disable expanding/collapsing of items when double-clicking. Instead the double-clicked entry is opened. @@ -704,4 +708,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
--- a/Debugger/WatchPointModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/WatchPointModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,13 +9,14 @@ from PyQt4.QtCore import * + class WatchPointModel(QAbstractItemModel): """ Class implementing a custom model for watch expressions. """ dataAboutToBeChanged = pyqtSignal(QModelIndex, QModelIndex) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -38,7 +39,7 @@ Qt.Alignment(Qt.AlignRight), ] - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the current column count. @@ -46,7 +47,7 @@ """ return len(self.header) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the current row count. @@ -99,7 +100,7 @@ return Qt.ItemIsEnabled | Qt.ItemIsSelectable - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get header data. @@ -116,7 +117,7 @@ return None - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to create an index. @@ -141,7 +142,7 @@ """ return QModelIndex() - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check for the presence of child items. @@ -183,7 +184,7 @@ if index.isValid(): row = index.row() index1 = self.createIndex(row, 0, self.watchpoints[row]) - index2 = self.createIndex(row, len(self.watchpoints[row]), + index2 = self.createIndex(row, len(self.watchpoints[row]), self.watchpoints[row]) self.dataAboutToBeChanged.emit(index1, index2) i = 0 @@ -229,7 +230,7 @@ for index in idxList: if index.isValid(): rows.append(index.row()) - rows.sort(reverse = True) + rows.sort(reverse=True) for row in rows: self.beginRemoveRows(QModelIndex(), row, row) del self.watchpoints[row] @@ -253,11 +254,11 @@ temporary flag, enabled flag, ignore count, index)) """ if index.isValid(): - return self.watchpoints[index.row()][:] # return a copy + return self.watchpoints[index.row()][:] # return a copy else: return [] - def getWatchPointIndex(self, cond, special = ""): + def getWatchPointIndex(self, cond, special=""): """ Public method to get the index of a watch expression given by expression.
--- a/Debugger/WatchPointViewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Debugger/WatchPointViewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ import Utilities + class WatchPointViewer(QTreeView): """ Class implementing the watch expression viewer widget. @@ -24,13 +25,13 @@ Watch expressions will be shown with all their details. They can be modified through the context menu of this widget. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @param parent the parent (QWidget) """ - QTreeView.__init__(self,parent) + QTreeView.__init__(self, parent) self.setObjectName("WatchExpressionViewer") self.__model = None @@ -89,7 +90,7 @@ """ Private slot to resort the tree. """ - self.model().sort(self.header().sortIndicatorSection(), + self.model().sort(self.header().sortIndicatorSection(), self.header().sortIndicatorOrder()) def __toSourceIndex(self, index): @@ -108,7 +109,7 @@ """ return self.sortingModel.mapFromSource(sindex) - def __setRowSelected(self, index, selected = True): + def __setRowSelected(self, index, selected=True): """ Private slot to select a complete row. @@ -149,13 +150,13 @@ self.backMenu = QMenu() self.backMenu.addAction(self.trUtf8("Add"), self.__addWatchPoint) self.backMenuActions["EnableAll"] = \ - self.backMenu.addAction(self.trUtf8("Enable all"), + self.backMenu.addAction(self.trUtf8("Enable all"), self.__enableAllWatchPoints) self.backMenuActions["DisableAll"] = \ - self.backMenu.addAction(self.trUtf8("Disable all"), + self.backMenu.addAction(self.trUtf8("Disable all"), self.__disableAllWatchPoints) self.backMenuActions["DeleteAll"] = \ - self.backMenu.addAction(self.trUtf8("Delete all"), + self.backMenu.addAction(self.trUtf8("Delete all"), self.__deleteAllWatchPoints) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8("Configure..."), self.__configure) @@ -164,15 +165,15 @@ self.multiMenu = QMenu() self.multiMenu.addAction(self.trUtf8("Add"), self.__addWatchPoint) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8("Enable selected"), + self.multiMenu.addAction(self.trUtf8("Enable selected"), self.__enableSelectedWatchPoints) self.multiMenu.addAction(self.trUtf8("Enable all"), self.__enableAllWatchPoints) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8("Disable selected"), + self.multiMenu.addAction(self.trUtf8("Disable selected"), self.__disableSelectedWatchPoints) self.multiMenu.addAction(self.trUtf8("Disable all"), self.__disableAllWatchPoints) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8("Delete selected"), + self.multiMenu.addAction(self.trUtf8("Delete selected"), self.__deleteSelectedWatchPoints) self.multiMenu.addAction(self.trUtf8("Delete all"), self.__deleteAllWatchPoints) self.multiMenu.addSeparator() @@ -205,7 +206,7 @@ for index in self.selectedIndexes(): self.__setRowSelected(index, False) - def __findDuplicates(self, cond, special, showMessage = False, index = QModelIndex()): + def __findDuplicates(self, cond, special, showMessage=False, index=QModelIndex()): """ Private method to check, if an entry already exists. @@ -281,7 +282,7 @@ if dlg.exec_() == QDialog.Accepted: cond, temp, enabled, count, special = dlg.getData() if not self.__findDuplicates(cond, special, True, sindex): - self.__model.setWatchPointByIndex(sindex, + self.__model.setWatchPointByIndex(sindex, cond, special, (temp, enabled, count)) self.__resizeColumns() self.__resort() @@ -402,7 +403,7 @@ @return count of items selected (integer) """ - count = len(self.selectedIndexes()) // (self.__model.columnCount()-1) + count = len(self.selectedIndexes()) // (self.__model.columnCount() - 1) # column count is 1 greater than selectable return count @@ -410,4 +411,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
--- a/Documentation/Source/eric5.Cooperation.ChatWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Cooperation.ChatWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -197,7 +197,7 @@ </table> <a NAME="ChatWidget.__init__" ID="ChatWidget.__init__"></a> <h4>ChatWidget (Constructor)</h4> -<b>ChatWidget</b>(<i>port = -1, parent = None</i>) +<b>ChatWidget</b>(<i>port=-1, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Cooperation.Connection.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Cooperation.Connection.html Fri Mar 11 16:51:57 2011 +0100 @@ -128,7 +128,7 @@ </table> <a NAME="Connection.__init__" ID="Connection.__init__"></a> <h4>Connection (Constructor)</h4> -<b>Connection</b>(<i>parent = None</i>) +<b>Connection</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -173,7 +173,7 @@ Private slot to handle the readyRead signal. </p><a NAME="Connection.__readDataIntoBuffer" ID="Connection.__readDataIntoBuffer"></a> <h4>Connection.__readDataIntoBuffer</h4> -<b>__readDataIntoBuffer</b>(<i>maxSize = MaxBufferSize</i>) +<b>__readDataIntoBuffer</b>(<i>maxSize=MaxBufferSize</i>) <p> Private method to read some data into the buffer. </p><dl>
--- a/Documentation/Source/eric5.Cooperation.CooperationClient.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Cooperation.CooperationClient.html Fri Mar 11 16:51:57 2011 +0100 @@ -143,7 +143,7 @@ </table> <a NAME="CooperationClient.__init__" ID="CooperationClient.__init__"></a> <h4>CooperationClient (Constructor)</h4> -<b>CooperationClient</b>(<i>parent = None</i>) +<b>CooperationClient</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -261,7 +261,7 @@ Public slot to disconnect from the chat network. </p><a NAME="CooperationClient.hasConnection" ID="CooperationClient.hasConnection"></a> <h4>CooperationClient.hasConnection</h4> -<b>hasConnection</b>(<i>senderIp, senderPort = -1</i>) +<b>hasConnection</b>(<i>senderIp, senderPort=-1</i>) <p> Public method to check for an existing connection. </p><dl>
--- a/Documentation/Source/eric5.Cooperation.CooperationServer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Cooperation.CooperationServer.html Fri Mar 11 16:51:57 2011 +0100 @@ -73,7 +73,7 @@ </table> <a NAME="CooperationServer.__init__" ID="CooperationServer.__init__"></a> <h4>CooperationServer (Constructor)</h4> -<b>CooperationServer</b>(<i>parent = None</i>) +<b>CooperationServer</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -93,7 +93,7 @@ </dd> </dl><a NAME="CooperationServer.startListening" ID="CooperationServer.startListening"></a> <h4>CooperationServer.startListening</h4> -<b>startListening</b>(<i>port = -1</i>) +<b>startListening</b>(<i>port=-1</i>) <p> Public method to start listening for new connections. </p><dl>
--- a/Documentation/Source/eric5.DataViews.CodeMetrics.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DataViews.CodeMetrics.html Fri Mar 11 16:51:57 2011 +0100 @@ -264,8 +264,6 @@ <h2>analyze</h2> <b>analyze</b>(<i>filename, total</i>) <p> - -</p><p> Module function used analyze the source of a Python file. </p><dl> <dt><i>filename</i></dt>
--- a/Documentation/Source/eric5.DataViews.CodeMetricsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DataViews.CodeMetricsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="CodeMetricsDialog.__init__" ID="CodeMetricsDialog.__init__"></a> <h4>CodeMetricsDialog (Constructor)</h4> -<b>CodeMetricsDialog</b>(<i>parent = None</i>) +<b>CodeMetricsDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.DataViews.PyCoverageDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DataViews.PyCoverageDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -96,7 +96,7 @@ </table> <a NAME="PyCoverageDialog.__init__" ID="PyCoverageDialog.__init__"></a> <h4>PyCoverageDialog (Constructor)</h4> -<b>PyCoverageDialog</b>(<i>parent = None</i>) +<b>PyCoverageDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.DataViews.PyProfileDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DataViews.PyProfileDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -151,7 +151,7 @@ </table> <a NAME="PyProfileDialog.__init__" ID="PyProfileDialog.__init__"></a> <h4>PyProfileDialog (Constructor)</h4> -<b>PyProfileDialog</b>(<i>parent = None</i>) +<b>PyProfileDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -230,7 +230,7 @@ Private slot called when the action finished or the user pressed the button. </p><a NAME="PyProfileDialog.__populateLists" ID="PyProfileDialog.__populateLists"></a> <h4>PyProfileDialog.__populateLists</h4> -<b>__populateLists</b>(<i>exclude = False</i>) +<b>__populateLists</b>(<i>exclude=False</i>) <p> Private method used to populate the listviews. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python.DebugBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.DebugBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -270,7 +270,7 @@ <h4>DebugBase.break_here</h4> <b>break_here</b>(<i>frame</i>) <p> - Reimplemented from bdb.py to fix the filename from the frame. + Reimplemented from bdb.py to fix the filename from the frame. </p><p> See fix_frame_filename for more info. </p><dl> @@ -467,7 +467,7 @@ <h4>DebugBase.profile</h4> <b>profile</b>(<i>frame, event, arg</i>) <p> - Public method used to trace some stuff independant of the debugger + Public method used to trace some stuff independant of the debugger trace function. </p><dl> <dt><i>frame</i></dt> @@ -504,12 +504,12 @@ <h4>DebugBase.set_quit</h4> <b>set_quit</b>(<i></i>) <p> - Public method to quit. + Public method to quit. </p><p> It wraps call to bdb to clear the current frame properly. </p><a NAME="DebugBase.set_trace" ID="DebugBase.set_trace"></a> <h4>DebugBase.set_trace</h4> -<b>set_trace</b>(<i>frame = None</i>) +<b>set_trace</b>(<i>frame=None</i>) <p> Overridden method of bdb.py to do some special setup. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python.DebugClientBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.DebugClientBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -70,12 +70,12 @@ </p><p> The protocol is as follows. First the client opens a connection to the debugger and then sends a series of one line commands. A command is either - >Load<, >Step<, >StepInto<, ... or a Python statement. + >Load<, >Step<, >StepInto<, ... or a Python statement. See DebugProtocol.py for a listing of valid protocol tokens. </p><p> A Python statement consists of the statement to execute, followed (in a separate line) by >OK?<. If the statement was incomplete then the response - is >Continue<. If there was an exception then the response is + is >Continue<. If there was an exception then the response is >Exception<. Otherwise the response is >OK<. The reason for the >OK?< part is to provide a sentinal (ie. the responding >OK<) after any possible output as a @@ -295,17 +295,17 @@ <dt>Returns:</dt> <dd> A tuple consisting of a list of formatted variables. Each - variable entry is a tuple of three elements, the variable name, + variable entry is a tuple of three elements, the variable name, its type and value. </dd> </dl><a NAME="DebugClientBase.__formatVariablesList" ID="DebugClientBase.__formatVariablesList"></a> <h4>DebugClientBase.__formatVariablesList</h4> -<b>__formatVariablesList</b>(<i>keylist, dict, scope, filter = [], formatSequences = 0</i>) +<b>__formatVariablesList</b>(<i>keylist, dict, scope, filter=[], formatSequences=0</i>) <p> Private method to produce a formated variables list. </p><p> The dictionary passed in to it is scanned. Variables are - only added to the list, if their type is not contained + only added to the list, if their type is not contained in the filter list and their name doesn't match any of the filter expressions. The formated variables list (a list of tuples of 3 values) is returned. </p><dl> @@ -324,7 +324,7 @@ </dd><dt><i>filter</i></dt> <dd> the indices of variable types to be filtered. Variables are - only added to the list, if their type is not contained in the filter + only added to the list, if their type is not contained in the filter list. </dd><dt><i>formatSequences</i></dt> <dd> @@ -336,7 +336,7 @@ <dt>Returns:</dt> <dd> A tuple consisting of a list of formatted variables. Each variable - entry is a tuple of three elements, the variable name, its type and + entry is a tuple of three elements, the variable name, its type and value. </dd> </dl><a NAME="DebugClientBase.__generateFilterObjects" ID="DebugClientBase.__generateFilterObjects"></a> @@ -357,7 +357,7 @@ <h4>DebugClientBase.__getSysPath</h4> <b>__getSysPath</b>(<i>firstEntry</i>) <p> - Private slot to calculate a path list including the PYTHONPATH + Private slot to calculate a path list including the PYTHONPATH environment variable. </p><dl> <dt><i>firstEntry</i></dt> @@ -421,7 +421,7 @@ <p> Public method to convert a filename to an absolute name. </p><p> - sys.path is used as a set of possible prefixes. The name stays + sys.path is used as a set of possible prefixes. The name stays relative if a file could not be found. </p><dl> <dt><i>fn</i></dt> @@ -435,11 +435,11 @@ </dd> </dl><a NAME="DebugClientBase.attachThread" ID="DebugClientBase.attachThread"></a> <h4>DebugClientBase.attachThread</h4> -<b>attachThread</b>(<i>target = None, args = None, kwargs = None, mainThread = 0</i>) +<b>attachThread</b>(<i>target=None, args=None, kwargs=None, mainThread=0</i>) <p> Public method to setup a thread for DebugClient to debug. </p><p> - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. </p><p> This is just an empty function and is overridden in the threaded @@ -480,9 +480,9 @@ <h4>DebugClientBase.connectDebugger</h4> <b>connectDebugger</b>(<i>port, remoteAddress=None, redirect=1</i>) <p> - Public method to establish a session with the debugger. + Public method to establish a session with the debugger. </p><p> - It opens a network connection to the debugger, connects it to stdin, + It opens a network connection to the debugger, connects it to stdin, stdout and stderr and saves these file objects in case the application being debugged redirects them itself. </p><dl> @@ -498,7 +498,7 @@ </dd> </dl><a NAME="DebugClientBase.eventLoop" ID="DebugClientBase.eventLoop"></a> <h4>DebugClientBase.eventLoop</h4> -<b>eventLoop</b>(<i>disablePolling = False</i>) +<b>eventLoop</b>(<i>disablePolling=False</i>) <p> Public method implementing our event loop. </p><dl> @@ -616,7 +616,7 @@ </dd> </dl><a NAME="DebugClientBase.sessionClose" ID="DebugClientBase.sessionClose"></a> <h4>DebugClientBase.sessionClose</h4> -<b>sessionClose</b>(<i>exit = 1</i>) +<b>sessionClose</b>(<i>exit=1</i>) <p> Public method to close the session with the debugger and optionally terminate. </p><dl> @@ -641,7 +641,7 @@ </dd> </dl><a NAME="DebugClientBase.startDebugger" ID="DebugClientBase.startDebugger"></a> <h4>DebugClientBase.startDebugger</h4> -<b>startDebugger</b>(<i>filename = None, host = None, port = None, enableTrace = 1, exceptions = 1, tracePython = 0, redirect = 1</i>) +<b>startDebugger</b>(<i>filename=None, host=None, port=None, enableTrace=1, exceptions=1, tracePython=0, redirect=1</i>) <p> Public method used to start the remote debugger. </p><dl> @@ -669,7 +669,7 @@ </dd> </dl><a NAME="DebugClientBase.startProgInDebugger" ID="DebugClientBase.startProgInDebugger"></a> <h4>DebugClientBase.startProgInDebugger</h4> -<b>startProgInDebugger</b>(<i>progargs, wd = '', host = None, port = None, exceptions = 1, tracePython = 0, redirect = 1</i>) +<b>startProgInDebugger</b>(<i>progargs, wd='', host=None, port=None, exceptions=1, tracePython=0, redirect=1</i>) <p> Public method used to start the remote debugger. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python.DebugClientThreads.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.DebugClientThreads.html Fri Mar 11 16:51:57 2011 +0100 @@ -92,11 +92,11 @@ Constructor </p><a NAME="DebugClientThreads.attachThread" ID="DebugClientThreads.attachThread"></a> <h4>DebugClientThreads.attachThread</h4> -<b>attachThread</b>(<i>target = None, args = None, kwargs = None, mainThread = 0</i>) +<b>attachThread</b>(<i>target=None, args=None, kwargs=None, mainThread=0</i>) <p> Public method to setup a thread for DebugClient to debug. </p><p> - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. </p><dl> <dt><i>target</i></dt> @@ -120,7 +120,7 @@ </dd> </dl><a NAME="DebugClientThreads.eventLoop" ID="DebugClientThreads.eventLoop"></a> <h4>DebugClientThreads.eventLoop</h4> -<b>eventLoop</b>(<i>disablePolling = False</i>) +<b>eventLoop</b>(<i>disablePolling=False</i>) <p> Public method implementing our event loop. </p><dl> @@ -131,7 +131,7 @@ </dd> </dl><a NAME="DebugClientThreads.lockClient" ID="DebugClientThreads.lockClient"></a> <h4>DebugClientThreads.lockClient</h4> -<b>lockClient</b>(<i>blocking = 1</i>) +<b>lockClient</b>(<i>blocking=1</i>) <p> Public method to acquire the lock for this client. </p><dl> @@ -183,14 +183,14 @@ <p> Module function used to allow for debugging of multiple threads. </p><p> - The way it works is that below, we reset thread._start_new_thread to + The way it works is that below, we reset thread._start_new_thread to this function object. Thus, providing a hook for us to see when - threads are started. From here we forward the request onto the + threads are started. From here we forward the request onto the DebugClient which will create a DebugThread object to allow tracing of the thread then start up the thread. These actions are always performed in order to allow dropping into debug mode. </p><p> - See DebugClientThreads.attachThread and DebugThread.DebugThread in + See DebugClientThreads.attachThread and DebugThread.DebugThread in DebugThread.py </p><dl> <dt><i>target</i></dt>
--- a/Documentation/Source/eric5.DebugClients.Python.DebugThread.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.DebugThread.html Fri Mar 11 16:51:57 2011 +0100 @@ -83,7 +83,7 @@ </table> <a NAME="DebugThread.__init__" ID="DebugThread.__init__"></a> <h4>DebugThread (Constructor)</h4> -<b>DebugThread</b>(<i>dbgClient, targ = None, args = None, kwargs = None, mainThread = 0</i>) +<b>DebugThread</b>(<i>dbgClient, targ=None, args=None, kwargs=None, mainThread=0</i>) <p> Constructor </p><dl> @@ -109,7 +109,7 @@ <p> Private method to bootstrap the thread. </p><p> - It wraps the call to the user function to enable tracing + It wraps the call to the user function to enable tracing before hand. </p><a NAME="DebugThread.get_ident" ID="DebugThread.get_ident"></a> <h4>DebugThread.get_ident</h4>
--- a/Documentation/Source/eric5.DebugClients.Python.FlexCompleter.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.FlexCompleter.html Fri Mar 11 16:51:57 2011 +0100 @@ -26,8 +26,8 @@ </p><p> <h4>NOTE for eric5 variant</h4> </p><p> - This version is a re-implementation of FlexCompleter - as found in the PyQwt package. It is modified to work with the eric5 debug + This version is a re-implementation of FlexCompleter + as found in the PyQwt package. It is modified to work with the eric5 debug clients. </p><p> @@ -43,7 +43,7 @@ </p><p> <h4>NOTE for FlexCompleter</h4> </p><p> - This version is a re-implementation of rlcompleter with + This version is a re-implementation of rlcompleter with selectable namespace. </p><p> The problem with rlcompleter is that it's hardwired to work with @@ -152,7 +152,7 @@ </table> <a NAME="Completer.__init__" ID="Completer.__init__"></a> <h4>Completer (Constructor)</h4> -<b>Completer</b>(<i>namespace = None</i>) +<b>Completer</b>(<i>namespace=None</i>) <p> Create a new completer for the command line. </p><p>
--- a/Documentation/Source/eric5.DebugClients.Python.PyProfile.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.PyProfile.html Fri Mar 11 16:51:57 2011 +0100 @@ -47,7 +47,7 @@ </p><p> This class extends the standard Python profiler by the functionality to save the collected timing data in a timing cache, to restore these data - on subsequent calls, to store a profile dump to a standard filename and + on subsequent calls, to store a profile dump to a standard filename and to erase these caches. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.DebugClients.Python.eric5dbgstub.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python.eric5dbgstub.html Fri Mar 11 16:51:57 2011 +0100 @@ -51,7 +51,7 @@ <hr /><hr /> <a NAME="initDebugger" ID="initDebugger"></a> <h2>initDebugger</h2> -<b>initDebugger</b>(<i>kind = "standard"</i>) +<b>initDebugger</b>(<i>kind="standard"</i>) <p> Module function to initialize a debugger for remote debugging. </p><dl> @@ -103,7 +103,7 @@ <hr /><hr /> <a NAME="startDebugger" ID="startDebugger"></a> <h2>startDebugger</h2> -<b>startDebugger</b>(<i>enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) +<b>startDebugger</b>(<i>enableTrace=True, exceptions=True, tracePython=False, redirect=True</i>) <p> Module function used to start the remote debugger. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python3.AsyncFile.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.AsyncFile.html Fri Mar 11 16:51:57 2011 +0100 @@ -153,7 +153,7 @@ </dd> </dl><a NAME="AsyncFile.close" ID="AsyncFile.close"></a> <h4>AsyncFile.close</h4> -<b>close</b>(<i>closeit = False</i>) +<b>close</b>(<i>closeit=False</i>) <p> Public method to close the file. </p><dl> @@ -198,7 +198,7 @@ </dd> </dl><a NAME="AsyncFile.read" ID="AsyncFile.read"></a> <h4>AsyncFile.read</h4> -<b>read</b>(<i>size = -1</i>) +<b>read</b>(<i>size=-1</i>) <p> Public method to read bytes from this file. </p><dl> @@ -213,7 +213,7 @@ </dd> </dl><a NAME="AsyncFile.read_p" ID="AsyncFile.read_p"></a> <h4>AsyncFile.read_p</h4> -<b>read_p</b>(<i>size = -1</i>) +<b>read_p</b>(<i>size=-1</i>) <p> Public method to read bytes from this file. </p><dl> @@ -228,7 +228,7 @@ </dd> </dl><a NAME="AsyncFile.readline" ID="AsyncFile.readline"></a> <h4>AsyncFile.readline</h4> -<b>readline</b>(<i>sizehint = -1</i>) +<b>readline</b>(<i>sizehint=-1</i>) <p> Public method to read one line from this file. </p><dl> @@ -243,7 +243,7 @@ </dd> </dl><a NAME="AsyncFile.readline_p" ID="AsyncFile.readline_p"></a> <h4>AsyncFile.readline_p</h4> -<b>readline_p</b>(<i>size = -1</i>) +<b>readline_p</b>(<i>size=-1</i>) <p> Public method to read a line from this file. </p><p> @@ -261,7 +261,7 @@ </dd> </dl><a NAME="AsyncFile.readlines" ID="AsyncFile.readlines"></a> <h4>AsyncFile.readlines</h4> -<b>readlines</b>(<i>sizehint = -1</i>) +<b>readlines</b>(<i>sizehint=-1</i>) <p> Public method to read all lines from this file. </p><dl> @@ -276,7 +276,7 @@ </dd> </dl><a NAME="AsyncFile.seek" ID="AsyncFile.seek"></a> <h4>AsyncFile.seek</h4> -<b>seek</b>(<i>offset, whence = 0</i>) +<b>seek</b>(<i>offset, whence=0</i>) <p> Public method to move the filepointer. </p><dl> @@ -306,7 +306,7 @@ </dd> </dl><a NAME="AsyncFile.truncate" ID="AsyncFile.truncate"></a> <h4>AsyncFile.truncate</h4> -<b>truncate</b>(<i>size = -1</i>) +<b>truncate</b>(<i>size=-1</i>) <p> Public method to truncate the file. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python3.DebugBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.DebugBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -284,7 +284,7 @@ <h4>DebugBase.break_here</h4> <b>break_here</b>(<i>frame</i>) <p> - Reimplemented from bdb.py to fix the filename from the frame. + Reimplemented from bdb.py to fix the filename from the frame. </p><p> See fix_frame_filename for more info. </p><dl> @@ -481,7 +481,7 @@ <h4>DebugBase.profile</h4> <b>profile</b>(<i>frame, event, arg</i>) <p> - Public method used to trace some stuff independant of the debugger + Public method used to trace some stuff independant of the debugger trace function. </p><dl> <dt><i>frame</i></dt> @@ -518,12 +518,12 @@ <h4>DebugBase.set_quit</h4> <b>set_quit</b>(<i></i>) <p> - Public method to quit. + Public method to quit. </p><p> It wraps call to bdb to clear the current frame properly. </p><a NAME="DebugBase.set_trace" ID="DebugBase.set_trace"></a> <h4>DebugBase.set_trace</h4> -<b>set_trace</b>(<i>frame = None</i>) +<b>set_trace</b>(<i>frame=None</i>) <p> Overridden method of bdb.py to do some special setup. </p><dl> @@ -533,7 +533,7 @@ </dd> </dl><a NAME="DebugBase.set_watch" ID="DebugBase.set_watch"></a> <h4>DebugBase.set_watch</h4> -<b>set_watch</b>(<i>cond, temporary = False</i>) +<b>set_watch</b>(<i>cond, temporary=False</i>) <p> Public method to set a watch expression. </p><dl> @@ -605,7 +605,7 @@ </dd> </dl><a NAME="DebugBase.user_exception" ID="DebugBase.user_exception"></a> <h4>DebugBase.user_exception</h4> -<b>user_exception</b>(<i>frame, excinfo, unhandled = False</i>) +<b>user_exception</b>(<i>frame, excinfo, unhandled=False</i>) <p> Reimplemented to report an exception to the debug server. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python3.DebugClientBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.DebugClientBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -67,12 +67,12 @@ </p><p> The protocol is as follows. First the client opens a connection to the debugger and then sends a series of one line commands. A command is either - >Load<, >Step<, >StepInto<, ... or a Python statement. + >Load<, >Step<, >StepInto<, ... or a Python statement. See DebugProtocol.py for a listing of valid protocol tokens. </p><p> A Python statement consists of the statement to execute, followed (in a separate line) by >OK?<. If the statement was incomplete then the response - is >Continue<. If there was an exception then the response is + is >Continue<. If there was an exception then the response is >Exception<. Otherwise the response is >OK<. The reason for the >OK?< part is to provide a sentinal (ie. the responding >OK<) after any possible output as a @@ -220,7 +220,7 @@ </dd> </dl><a NAME="DebugClientBase.__compileFileSource" ID="DebugClientBase.__compileFileSource"></a> <h4>DebugClientBase.__compileFileSource</h4> -<b>__compileFileSource</b>(<i>filename, mode = 'exec'</i>) +<b>__compileFileSource</b>(<i>filename, mode='exec'</i>) <p> Private method to compile source code read from a file. </p><dl> @@ -310,17 +310,17 @@ <dt>Returns:</dt> <dd> A tuple consisting of a list of formatted variables. Each - variable entry is a tuple of three elements, the variable name, + variable entry is a tuple of three elements, the variable name, its type and value. </dd> </dl><a NAME="DebugClientBase.__formatVariablesList" ID="DebugClientBase.__formatVariablesList"></a> <h4>DebugClientBase.__formatVariablesList</h4> -<b>__formatVariablesList</b>(<i>keylist, dict, scope, filter = [], formatSequences = False</i>) +<b>__formatVariablesList</b>(<i>keylist, dict, scope, filter=[], formatSequences=False</i>) <p> Private method to produce a formated variables list. </p><p> The dictionary passed in to it is scanned. Variables are - only added to the list, if their type is not contained + only added to the list, if their type is not contained in the filter list and their name doesn't match any of the filter expressions. The formated variables list (a list of tuples of 3 values) is returned. </p><dl> @@ -339,7 +339,7 @@ </dd><dt><i>filter</i></dt> <dd> the indices of variable types to be filtered. Variables are - only added to the list, if their type is not contained in the filter + only added to the list, if their type is not contained in the filter list. </dd><dt><i>formatSequences</i></dt> <dd> @@ -351,7 +351,7 @@ <dt>Returns:</dt> <dd> A tuple consisting of a list of formatted variables. Each variable - entry is a tuple of three elements, the variable name, its type and + entry is a tuple of three elements, the variable name, its type and value. </dd> </dl><a NAME="DebugClientBase.__generateFilterObjects" ID="DebugClientBase.__generateFilterObjects"></a> @@ -372,7 +372,7 @@ <h4>DebugClientBase.__getSysPath</h4> <b>__getSysPath</b>(<i>firstEntry</i>) <p> - Private slot to calculate a path list including the PYTHONPATH + Private slot to calculate a path list including the PYTHONPATH environment variable. </p><dl> <dt><i>firstEntry</i></dt> @@ -436,7 +436,7 @@ <p> Public method to convert a filename to an absolute name. </p><p> - sys.path is used as a set of possible prefixes. The name stays + sys.path is used as a set of possible prefixes. The name stays relative if a file could not be found. </p><dl> <dt><i>fn</i></dt> @@ -450,11 +450,11 @@ </dd> </dl><a NAME="DebugClientBase.attachThread" ID="DebugClientBase.attachThread"></a> <h4>DebugClientBase.attachThread</h4> -<b>attachThread</b>(<i>target = None, args = None, kwargs = None, mainThread = False</i>) +<b>attachThread</b>(<i>target=None, args=None, kwargs=None, mainThread=False</i>) <p> Public method to setup a thread for DebugClient to debug. </p><p> - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. </p><dl> <dt><i>target</i></dt> @@ -490,11 +490,11 @@ </dd> </dl><a NAME="DebugClientBase.connectDebugger" ID="DebugClientBase.connectDebugger"></a> <h4>DebugClientBase.connectDebugger</h4> -<b>connectDebugger</b>(<i>port, remoteAddress = None, redirect = True</i>) +<b>connectDebugger</b>(<i>port, remoteAddress=None, redirect=True</i>) <p> - Public method to establish a session with the debugger. + Public method to establish a session with the debugger. </p><p> - It opens a network connection to the debugger, connects it to stdin, + It opens a network connection to the debugger, connects it to stdin, stdout and stderr and saves these file objects in case the application being debugged redirects them itself. </p><dl> @@ -510,7 +510,7 @@ </dd> </dl><a NAME="DebugClientBase.eventLoop" ID="DebugClientBase.eventLoop"></a> <h4>DebugClientBase.eventLoop</h4> -<b>eventLoop</b>(<i>disablePolling = False</i>) +<b>eventLoop</b>(<i>disablePolling=False</i>) <p> Public method implementing our event loop. </p><dl> @@ -559,7 +559,7 @@ </dd> </dl><a NAME="DebugClientBase.input" ID="DebugClientBase.input"></a> <h4>DebugClientBase.input</h4> -<b>input</b>(<i>prompt, echo = True</i>) +<b>input</b>(<i>prompt, echo=True</i>) <p> Public method to implement input() using the event loop. </p><dl> @@ -613,7 +613,7 @@ </dd> </dl><a NAME="DebugClientBase.sessionClose" ID="DebugClientBase.sessionClose"></a> <h4>DebugClientBase.sessionClose</h4> -<b>sessionClose</b>(<i>exit = True</i>) +<b>sessionClose</b>(<i>exit=True</i>) <p> Public method to close the session with the debugger and optionally terminate. </p><dl> @@ -638,7 +638,7 @@ </dd> </dl><a NAME="DebugClientBase.startDebugger" ID="DebugClientBase.startDebugger"></a> <h4>DebugClientBase.startDebugger</h4> -<b>startDebugger</b>(<i>filename = None, host = None, port = None, enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) +<b>startDebugger</b>(<i>filename=None, host=None, port=None, enableTrace=True, exceptions=True, tracePython=False, redirect=True</i>) <p> Public method used to start the remote debugger. </p><dl> @@ -666,7 +666,7 @@ </dd> </dl><a NAME="DebugClientBase.startProgInDebugger" ID="DebugClientBase.startProgInDebugger"></a> <h4>DebugClientBase.startProgInDebugger</h4> -<b>startProgInDebugger</b>(<i>progargs, wd = '', host = None, port = None, exceptions = True, tracePython = False, redirect = True</i>) +<b>startProgInDebugger</b>(<i>progargs, wd='', host=None, port=None, exceptions=True, tracePython=False, redirect=True</i>) <p> Public method used to start the remote debugger. </p><dl> @@ -729,7 +729,7 @@ <hr /><hr /> <a NAME="DebugClientInput" ID="DebugClientInput"></a> <h2>DebugClientInput</h2> -<b>DebugClientInput</b>(<i>prompt = "", echo = True</i>) +<b>DebugClientInput</b>(<i>prompt="", echo=True</i>) <p> Replacement for the standard input builtin. </p><p>
--- a/Documentation/Source/eric5.DebugClients.Python3.DebugClientThreads.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.DebugClientThreads.html Fri Mar 11 16:51:57 2011 +0100 @@ -92,11 +92,11 @@ Constructor </p><a NAME="DebugClientThreads.attachThread" ID="DebugClientThreads.attachThread"></a> <h4>DebugClientThreads.attachThread</h4> -<b>attachThread</b>(<i>target = None, args = None, kwargs = None, mainThread = False</i>) +<b>attachThread</b>(<i>target=None, args=None, kwargs=None, mainThread=False</i>) <p> Public method to setup a thread for DebugClient to debug. </p><p> - If mainThread is non-zero, then we are attaching to the already + If mainThread is non-zero, then we are attaching to the already started mainthread of the app and the rest of the args are ignored. </p><dl> <dt><i>target</i></dt> @@ -120,7 +120,7 @@ </dd> </dl><a NAME="DebugClientThreads.eventLoop" ID="DebugClientThreads.eventLoop"></a> <h4>DebugClientThreads.eventLoop</h4> -<b>eventLoop</b>(<i>disablePolling = False</i>) +<b>eventLoop</b>(<i>disablePolling=False</i>) <p> Public method implementing our event loop. </p><dl> @@ -131,7 +131,7 @@ </dd> </dl><a NAME="DebugClientThreads.lockClient" ID="DebugClientThreads.lockClient"></a> <h4>DebugClientThreads.lockClient</h4> -<b>lockClient</b>(<i>blocking = True</i>) +<b>lockClient</b>(<i>blocking=True</i>) <p> Public method to acquire the lock for this client. </p><dl> @@ -179,18 +179,18 @@ <hr /><hr /> <a NAME="_debugclient_start_new_thread" ID="_debugclient_start_new_thread"></a> <h2>_debugclient_start_new_thread</h2> -<b>_debugclient_start_new_thread</b>(<i>target, args, kwargs = {}</i>) +<b>_debugclient_start_new_thread</b>(<i>target, args, kwargs={}</i>) <p> Module function used to allow for debugging of multiple threads. </p><p> - The way it works is that below, we reset _thread._start_new_thread to + The way it works is that below, we reset _thread._start_new_thread to this function object. Thus, providing a hook for us to see when - threads are started. From here we forward the request onto the + threads are started. From here we forward the request onto the DebugClient which will create a DebugThread object to allow tracing of the thread then start up the thread. These actions are always performed in order to allow dropping into debug mode. </p><p> - See DebugClientThreads.attachThread and DebugThread.DebugThread in + See DebugClientThreads.attachThread and DebugThread.DebugThread in DebugThread.py </p><dl> <dt><i>target</i></dt>
--- a/Documentation/Source/eric5.DebugClients.Python3.DebugThread.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.DebugThread.html Fri Mar 11 16:51:57 2011 +0100 @@ -83,7 +83,7 @@ </table> <a NAME="DebugThread.__init__" ID="DebugThread.__init__"></a> <h4>DebugThread (Constructor)</h4> -<b>DebugThread</b>(<i>dbgClient, targ = None, args = None, kwargs = None, mainThread = False</i>) +<b>DebugThread</b>(<i>dbgClient, targ=None, args=None, kwargs=None, mainThread=False</i>) <p> Constructor </p><dl> @@ -109,7 +109,7 @@ <p> Private method to bootstrap the thread. </p><p> - It wraps the call to the user function to enable tracing + It wraps the call to the user function to enable tracing before hand. </p><a NAME="DebugThread.get_ident" ID="DebugThread.get_ident"></a> <h4>DebugThread.get_ident</h4>
--- a/Documentation/Source/eric5.DebugClients.Python3.FlexCompleter.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.FlexCompleter.html Fri Mar 11 16:51:57 2011 +0100 @@ -26,8 +26,8 @@ </p><p> <h4>NOTE for eric5 variant</h4> </p><p> - This version is a re-implementation of rlcompleter - as found in the Python3 library. It is modified to work with the eric5 + This version is a re-implementation of rlcompleter + as found in the Python3 library. It is modified to work with the eric5 debug clients. </p><p> <h4>Original rlcompleter documentation</h4> @@ -119,7 +119,7 @@ </table> <a NAME="Completer.__init__" ID="Completer.__init__"></a> <h4>Completer (Constructor)</h4> -<b>Completer</b>(<i>namespace = None</i>) +<b>Completer</b>(<i>namespace=None</i>) <p> Create a new completer for the command line. </p><p>
--- a/Documentation/Source/eric5.DebugClients.Python3.PyProfile.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.PyProfile.html Fri Mar 11 16:51:57 2011 +0100 @@ -47,7 +47,7 @@ </p><p> This class extends the standard Python profiler by the functionality to save the collected timing data in a timing cache, to restore these data - on subsequent calls, to store a profile dump to a standard filename and + on subsequent calls, to store a profile dump to a standard filename and to erase these caches. </p> <h3>Derived from</h3> @@ -83,7 +83,7 @@ </table> <a NAME="PyProfile.__init__" ID="PyProfile.__init__"></a> <h4>PyProfile (Constructor)</h4> -<b>PyProfile</b>(<i>basename, timer = None, bias = None</i>) +<b>PyProfile</b>(<i>basename, timer=None, bias=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python3.eric5dbgstub.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.eric5dbgstub.html Fri Mar 11 16:51:57 2011 +0100 @@ -51,7 +51,7 @@ <hr /><hr /> <a NAME="initDebugger" ID="initDebugger"></a> <h2>initDebugger</h2> -<b>initDebugger</b>(<i>kind = "standard"</i>) +<b>initDebugger</b>(<i>kind="standard"</i>) <p> Module function to initialize a debugger for remote debugging. </p><dl> @@ -103,7 +103,7 @@ <hr /><hr /> <a NAME="startDebugger" ID="startDebugger"></a> <h2>startDebugger</h2> -<b>startDebugger</b>(<i>enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) +<b>startDebugger</b>(<i>enableTrace=True, exceptions=True, tracePython=False, redirect=True</i>) <p> Module function used to start the remote debugger. </p><dl>
--- a/Documentation/Source/eric5.DebugClients.Python3.getpass.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DebugClients.Python3.getpass.html Fri Mar 11 16:51:57 2011 +0100 @@ -51,7 +51,7 @@ <hr /><hr /> <a NAME="getpass" ID="getpass"></a> <h2>getpass</h2> -<b>getpass</b>(<i>prompt = 'Password: '</i>) +<b>getpass</b>(<i>prompt='Password: '</i>) <p> Function to prompt for a password, with echo turned off. </p><dl>
--- a/Documentation/Source/eric5.Debugger.BreakPointModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.BreakPointModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="BreakPointModel.__init__" ID="BreakPointModel.__init__"></a> <h4>BreakPointModel (Constructor)</h4> -<b>BreakPointModel</b>(<i>parent = None</i>) +<b>BreakPointModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -134,12 +134,12 @@ </dd><dt><i>properties</i></dt> <dd> properties of the breakpoint - (tuple of condition (string), temporary flag (bool), + (tuple of condition (string), temporary flag (bool), enabled flag (bool), ignore count (integer)) </dd> </dl><a NAME="BreakPointModel.columnCount" ID="BreakPointModel.columnCount"></a> <h4>BreakPointModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the current column count. </p><dl> @@ -241,7 +241,7 @@ </dd> </dl><a NAME="BreakPointModel.hasChildren" ID="BreakPointModel.hasChildren"></a> <h4>BreakPointModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check for the presence of child items. </p><dl> @@ -256,7 +256,7 @@ </dd> </dl><a NAME="BreakPointModel.headerData" ID="BreakPointModel.headerData"></a> <h4>BreakPointModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get header data. </p><dl> @@ -277,7 +277,7 @@ </dd> </dl><a NAME="BreakPointModel.index" ID="BreakPointModel.index"></a> <h4>BreakPointModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to create an index. </p><dl> @@ -328,7 +328,7 @@ </dd> </dl><a NAME="BreakPointModel.rowCount" ID="BreakPointModel.rowCount"></a> <h4>BreakPointModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the current row count. </p><dl> @@ -354,7 +354,7 @@ </dd><dt><i>properties</i></dt> <dd> properties of the breakpoint - (tuple of condition (string), temporary flag (bool), + (tuple of condition (string), temporary flag (bool), enabled flag (bool), ignore count (integer)) </dd> </dl><a NAME="BreakPointModel.setBreakPointEnabledByIndex" ID="BreakPointModel.setBreakPointEnabledByIndex"></a>
--- a/Documentation/Source/eric5.Debugger.BreakPointViewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.BreakPointViewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -159,7 +159,7 @@ </table> <a NAME="BreakPointViewer.__init__" ID="BreakPointViewer.__init__"></a> <h4>BreakPointViewer (Constructor)</h4> -<b>BreakPointViewer</b>(<i>parent = None</i>) +<b>BreakPointViewer</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -307,7 +307,7 @@ </dd> </dl><a NAME="BreakPointViewer.__setRowSelected" ID="BreakPointViewer.__setRowSelected"></a> <h4>BreakPointViewer.__setRowSelected</h4> -<b>__setRowSelected</b>(<i>index, selected = True</i>) +<b>__setRowSelected</b>(<i>index, selected=True</i>) <p> Private slot to select a complete row. </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebugServer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebugServer.html Fri Mar 11 16:51:57 2011 +0100 @@ -547,7 +547,7 @@ Private slot to process client output received via stdout. </p><a NAME="DebugServer.__createDebuggerInterface" ID="DebugServer.__createDebuggerInterface"></a> <h4>DebugServer.__createDebuggerInterface</h4> -<b>__createDebuggerInterface</b>(<i>clientType = None</i>) +<b>__createDebuggerInterface</b>(<i>clientType=None</i>) <p> Private slot to create the debugger interface object. </p><dl> @@ -654,7 +654,7 @@ </dd> </dl><a NAME="DebugServer.__remoteWatchpoint" ID="DebugServer.__remoteWatchpoint"></a> <h4>DebugServer.__remoteWatchpoint</h4> -<b>__remoteWatchpoint</b>(<i>cond, set, temp = False</i>) +<b>__remoteWatchpoint</b>(<i>cond, set, temp=False</i>) <p> Private method to set or clear a watch expression. </p><dl> @@ -733,7 +733,7 @@ <h4>DebugServer.__watchPointDataAboutToBeChanged</h4> <b>__watchPointDataAboutToBeChanged</b>(<i>startIndex, endIndex</i>) <p> - Private slot to handle the dataAboutToBeChanged signal of the + Private slot to handle the dataAboutToBeChanged signal of the watch expression model. </p><dl> <dt><i>startIndex</i></dt> @@ -865,7 +865,7 @@ </dd> </dl><a NAME="DebugServer.getSupportedLanguages" ID="DebugServer.getSupportedLanguages"></a> <h4>DebugServer.getSupportedLanguages</h4> -<b>getSupportedLanguages</b>(<i>shellOnly = False</i>) +<b>getSupportedLanguages</b>(<i>shellOnly=False</i>) <p> Public slot to return the supported programming languages. </p><dl> @@ -964,7 +964,7 @@ </dd> </dl><a NAME="DebugServer.remoteClientVariable" ID="DebugServer.remoteClientVariable"></a> <h4>DebugServer.remoteClientVariable</h4> -<b>remoteClientVariable</b>(<i>scope, filter, var, framenr = 0</i>) +<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -983,7 +983,7 @@ </dd> </dl><a NAME="DebugServer.remoteClientVariables" ID="DebugServer.remoteClientVariables"></a> <h4>DebugServer.remoteClientVariables</h4> -<b>remoteClientVariables</b>(<i>scope, filter, framenr = 0</i>) +<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -1010,7 +1010,7 @@ </dd> </dl><a NAME="DebugServer.remoteContinue" ID="DebugServer.remoteContinue"></a> <h4>DebugServer.remoteContinue</h4> -<b>remoteContinue</b>(<i>special = False</i>) +<b>remoteContinue</b>(<i>special=False</i>) <p> Public method to continue the debugged program. </p><dl> @@ -1020,7 +1020,7 @@ </dd> </dl><a NAME="DebugServer.remoteCoverage" ID="DebugServer.remoteCoverage"></a> <h4>DebugServer.remoteCoverage</h4> -<b>remoteCoverage</b>(<i>fn, argv, wd, env, autoClearShell = True, erase = False, forProject = False, runInConsole = False, clientType = ""</i>) +<b>remoteCoverage</b>(<i>fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType=""</i>) <p> Public method to load a new program to collect coverage data. </p><dl> @@ -1087,7 +1087,7 @@ </dd> </dl><a NAME="DebugServer.remoteLoad" ID="DebugServer.remoteLoad"></a> <h4>DebugServer.remoteLoad</h4> -<b>remoteLoad</b>(<i>fn, argv, wd, env, autoClearShell = True, tracePython = False, autoContinue = True, forProject = False, runInConsole = False, autoFork = False, forkChild = False, clientType = ""</i>) +<b>remoteLoad</b>(<i>fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType=""</i>) <p> Public method to load a new program to debug. </p><dl> @@ -1134,7 +1134,7 @@ </dd> </dl><a NAME="DebugServer.remoteProfile" ID="DebugServer.remoteProfile"></a> <h4>DebugServer.remoteProfile</h4> -<b>remoteProfile</b>(<i>fn, argv, wd, env, autoClearShell = True, erase = False, forProject = False, runInConsole = False, clientType = ""</i>) +<b>remoteProfile</b>(<i>fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType=""</i>) <p> Public method to load a new program to collect profiling data. </p><dl> @@ -1180,7 +1180,7 @@ </dd> </dl><a NAME="DebugServer.remoteRun" ID="DebugServer.remoteRun"></a> <h4>DebugServer.remoteRun</h4> -<b>remoteRun</b>(<i>fn, argv, wd, env, autoClearShell = True, forProject = False, runInConsole = False, autoFork = False, forkChild = False, clientType = ""</i>) +<b>remoteRun</b>(<i>fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType=""</i>) <p> Public method to load a new program to run. </p><dl> @@ -1231,7 +1231,7 @@ <h4>DebugServer.remoteStatement</h4> <b>remoteStatement</b>(<i>stmt</i>) <p> - Public method to execute a Python statement. + Public method to execute a Python statement. </p><dl> <dt><i>stmt</i></dt> <dd> @@ -1414,7 +1414,7 @@ </dd> </dl><a NAME="DebugServer.signalClientLine" ID="DebugServer.signalClientLine"></a> <h4>DebugServer.signalClientLine</h4> -<b>signalClientLine</b>(<i>filename, lineno, forStack = False</i>) +<b>signalClientLine</b>(<i>filename, lineno, forStack=False</i>) <p> Public method to process client position feedback. </p><dl> @@ -1548,7 +1548,7 @@ </dd> </dl><a NAME="DebugServer.startClient" ID="DebugServer.startClient"></a> <h4>DebugServer.startClient</h4> -<b>startClient</b>(<i>unplanned = True, clType = None, forProject = False, runInConsole = False</i>) +<b>startClient</b>(<i>unplanned=True, clType=None, forProject=False, runInConsole=False</i>) <p> Public method to start a debug client. </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebugUI.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebugUI.html Fri Mar 11 16:51:57 2011 +0100 @@ -782,7 +782,7 @@ </dd> </dl><a NAME="DebugUI.setArgvHistory" ID="DebugUI.setArgvHistory"></a> <h4>DebugUI.setArgvHistory</h4> -<b>setArgvHistory</b>(<i>argsStr, clearHistories = False</i>) +<b>setArgvHistory</b>(<i>argsStr, clearHistories=False</i>) <p> Public slot to initialize the argv history. </p><dl> @@ -818,7 +818,7 @@ </dd> </dl><a NAME="DebugUI.setEnvHistory" ID="DebugUI.setEnvHistory"></a> <h4>DebugUI.setEnvHistory</h4> -<b>setEnvHistory</b>(<i>envStr, clearHistories = False</i>) +<b>setEnvHistory</b>(<i>envStr, clearHistories=False</i>) <p> Public slot to initialize the env history. </p><dl> @@ -873,7 +873,7 @@ </dd> </dl><a NAME="DebugUI.setWdHistory" ID="DebugUI.setWdHistory"></a> <h4>DebugUI.setWdHistory</h4> -<b>setWdHistory</b>(<i>wdStr, clearHistories = False</i>) +<b>setWdHistory</b>(<i>wdStr, clearHistories=False</i>) <p> Public slot to initialize the wd history. </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebugViewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebugViewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -57,7 +57,7 @@ <p> Class implementing a widget conatining various debug related views. </p><p> - The individual tabs contain the interpreter shell (optional), + The individual tabs contain the interpreter shell (optional), the filesystem browser (optional), the two variables viewers (global and local), a breakpoint viewer, a watch expression viewer and the exception logger. Additionally a list of all threads is shown. @@ -140,7 +140,7 @@ </table> <a NAME="DebugViewer.__init__" ID="DebugViewer.__init__"></a> <h4>DebugViewer (Constructor)</h4> -<b>DebugViewer</b>(<i>debugServer, docked, vm, parent = None, embeddedShell = True, embeddedBrowser = True</i>) +<b>DebugViewer</b>(<i>debugServer, docked, vm, parent=None, embeddedShell=True, embeddedBrowser=True</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebuggerInterfaceNone.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebuggerInterfaceNone.html Fri Mar 11 16:51:57 2011 +0100 @@ -235,7 +235,7 @@ Public slot to get the banner info of the remote client. </p><a NAME="DebuggerInterfaceNone.remoteBreakpoint" ID="DebuggerInterfaceNone.remoteBreakpoint"></a> <h4>DebuggerInterfaceNone.remoteBreakpoint</h4> -<b>remoteBreakpoint</b>(<i>fn, line, set, cond = None, temp = False</i>) +<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>) <p> Public method to set or clear a breakpoint. </p><dl> @@ -307,7 +307,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteClientVariable" ID="DebuggerInterfaceNone.remoteClientVariable"></a> <h4>DebuggerInterfaceNone.remoteClientVariable</h4> -<b>remoteClientVariable</b>(<i>scope, filter, var, framenr = 0</i>) +<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -326,7 +326,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteClientVariables" ID="DebuggerInterfaceNone.remoteClientVariables"></a> <h4>DebuggerInterfaceNone.remoteClientVariables</h4> -<b>remoteClientVariables</b>(<i>scope, filter, framenr = 0</i>) +<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -353,7 +353,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteContinue" ID="DebuggerInterfaceNone.remoteContinue"></a> <h4>DebuggerInterfaceNone.remoteContinue</h4> -<b>remoteContinue</b>(<i>special = False</i>) +<b>remoteContinue</b>(<i>special=False</i>) <p> Public method to continue the debugged program. </p><dl> @@ -363,7 +363,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteCoverage" ID="DebuggerInterfaceNone.remoteCoverage"></a> <h4>DebuggerInterfaceNone.remoteCoverage</h4> -<b>remoteCoverage</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteCoverage</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect coverage data. </p><dl> @@ -413,7 +413,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteLoad" ID="DebuggerInterfaceNone.remoteLoad"></a> <h4>DebuggerInterfaceNone.remoteLoad</h4> -<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False</i>) +<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to debug. </p><dl> @@ -443,7 +443,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteProfile" ID="DebuggerInterfaceNone.remoteProfile"></a> <h4>DebuggerInterfaceNone.remoteProfile</h4> -<b>remoteProfile</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect profiling data. </p><dl> @@ -472,7 +472,7 @@ </dd> </dl><a NAME="DebuggerInterfaceNone.remoteRun" ID="DebuggerInterfaceNone.remoteRun"></a> <h4>DebuggerInterfaceNone.remoteRun</h4> -<b>remoteRun</b>(<i>fn, argv, wd, autoFork = False, forkChild = False</i>) +<b>remoteRun</b>(<i>fn, argv, wd, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to run. </p><dl> @@ -506,7 +506,7 @@ <h4>DebuggerInterfaceNone.remoteStatement</h4> <b>remoteStatement</b>(<i>stmt</i>) <p> - Public method to execute a Python statement. + Public method to execute a Python statement. </p><dl> <dt><i>stmt</i></dt> <dd> @@ -576,7 +576,7 @@ public method to stop a unittest run. </p><a NAME="DebuggerInterfaceNone.remoteWatchpoint" ID="DebuggerInterfaceNone.remoteWatchpoint"></a> <h4>DebuggerInterfaceNone.remoteWatchpoint</h4> -<b>remoteWatchpoint</b>(<i>cond, set, temp = False</i>) +<b>remoteWatchpoint</b>(<i>cond, set, temp=False</i>) <p> Public method to set or clear a watch expression. </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebuggerInterfacePython.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebuggerInterfacePython.html Fri Mar 11 16:51:57 2011 +0100 @@ -213,7 +213,7 @@ Private method to ask the user which branch of a fork to follow. </p><a NAME="DebuggerInterfacePython.__identityTranslation" ID="DebuggerInterfacePython.__identityTranslation"></a> <h4>DebuggerInterfacePython.__identityTranslation</h4> -<b>__identityTranslation</b>(<i>fn, remote2local = True</i>) +<b>__identityTranslation</b>(<i>fn, remote2local=True</i>) <p> Private method to perform the identity path translation. </p><dl> @@ -237,7 +237,7 @@ Private method to handle data from the client. </p><a NAME="DebuggerInterfacePython.__remoteTranslation" ID="DebuggerInterfacePython.__remoteTranslation"></a> <h4>DebuggerInterfacePython.__remoteTranslation</h4> -<b>__remoteTranslation</b>(<i>fn, remote2local = True</i>) +<b>__remoteTranslation</b>(<i>fn, remote2local=True</i>) <p> Private method to perform the path translation. </p><dl> @@ -266,7 +266,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.__startProcess" ID="DebuggerInterfacePython.__startProcess"></a> <h4>DebuggerInterfacePython.__startProcess</h4> -<b>__startProcess</b>(<i>program, arguments, environment = None</i>) +<b>__startProcess</b>(<i>program, arguments, environment=None</i>) <p> Private method to start the debugger client process. </p><dl> @@ -332,7 +332,7 @@ Public slot to get the banner info of the remote client. </p><a NAME="DebuggerInterfacePython.remoteBreakpoint" ID="DebuggerInterfacePython.remoteBreakpoint"></a> <h4>DebuggerInterfacePython.remoteBreakpoint</h4> -<b>remoteBreakpoint</b>(<i>fn, line, set, cond = None, temp = False</i>) +<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>) <p> Public method to set or clear a breakpoint. </p><dl> @@ -404,7 +404,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteClientVariable" ID="DebuggerInterfacePython.remoteClientVariable"></a> <h4>DebuggerInterfacePython.remoteClientVariable</h4> -<b>remoteClientVariable</b>(<i>scope, filter, var, framenr = 0</i>) +<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -423,7 +423,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteClientVariables" ID="DebuggerInterfacePython.remoteClientVariables"></a> <h4>DebuggerInterfacePython.remoteClientVariables</h4> -<b>remoteClientVariables</b>(<i>scope, filter, framenr = 0</i>) +<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -450,7 +450,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteContinue" ID="DebuggerInterfacePython.remoteContinue"></a> <h4>DebuggerInterfacePython.remoteContinue</h4> -<b>remoteContinue</b>(<i>special = False</i>) +<b>remoteContinue</b>(<i>special=False</i>) <p> Public method to continue the debugged program. </p><dl> @@ -460,7 +460,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteCoverage" ID="DebuggerInterfacePython.remoteCoverage"></a> <h4>DebuggerInterfacePython.remoteCoverage</h4> -<b>remoteCoverage</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteCoverage</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect coverage data. </p><dl> @@ -510,7 +510,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteLoad" ID="DebuggerInterfacePython.remoteLoad"></a> <h4>DebuggerInterfacePython.remoteLoad</h4> -<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False</i>) +<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to debug. </p><dl> @@ -540,7 +540,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteProfile" ID="DebuggerInterfacePython.remoteProfile"></a> <h4>DebuggerInterfacePython.remoteProfile</h4> -<b>remoteProfile</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect profiling data. </p><dl> @@ -569,7 +569,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython.remoteRun" ID="DebuggerInterfacePython.remoteRun"></a> <h4>DebuggerInterfacePython.remoteRun</h4> -<b>remoteRun</b>(<i>fn, argv, wd, autoFork = False, forkChild = False</i>) +<b>remoteRun</b>(<i>fn, argv, wd, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to run. </p><dl> @@ -603,7 +603,7 @@ <h4>DebuggerInterfacePython.remoteStatement</h4> <b>remoteStatement</b>(<i>stmt</i>) <p> - Public method to execute a Python statement. + Public method to execute a Python statement. </p><dl> <dt><i>stmt</i></dt> <dd> @@ -673,7 +673,7 @@ Public method to stop a unittest run. </p><a NAME="DebuggerInterfacePython.remoteWatchpoint" ID="DebuggerInterfacePython.remoteWatchpoint"></a> <h4>DebuggerInterfacePython.remoteWatchpoint</h4> -<b>remoteWatchpoint</b>(<i>cond, set, temp = False</i>) +<b>remoteWatchpoint</b>(<i>cond, set, temp=False</i>) <p> Public method to set or clear a watch expression. </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebuggerInterfacePython3.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebuggerInterfacePython3.html Fri Mar 11 16:51:57 2011 +0100 @@ -213,7 +213,7 @@ Private method to ask the user which branch of a fork to follow. </p><a NAME="DebuggerInterfacePython3.__identityTranslation" ID="DebuggerInterfacePython3.__identityTranslation"></a> <h4>DebuggerInterfacePython3.__identityTranslation</h4> -<b>__identityTranslation</b>(<i>fn, remote2local = True</i>) +<b>__identityTranslation</b>(<i>fn, remote2local=True</i>) <p> Private method to perform the identity path translation. </p><dl> @@ -237,7 +237,7 @@ Private method to handle data from the client. </p><a NAME="DebuggerInterfacePython3.__remoteTranslation" ID="DebuggerInterfacePython3.__remoteTranslation"></a> <h4>DebuggerInterfacePython3.__remoteTranslation</h4> -<b>__remoteTranslation</b>(<i>fn, remote2local = True</i>) +<b>__remoteTranslation</b>(<i>fn, remote2local=True</i>) <p> Private method to perform the path translation. </p><dl> @@ -266,7 +266,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.__startProcess" ID="DebuggerInterfacePython3.__startProcess"></a> <h4>DebuggerInterfacePython3.__startProcess</h4> -<b>__startProcess</b>(<i>program, arguments, environment = None</i>) +<b>__startProcess</b>(<i>program, arguments, environment=None</i>) <p> Private method to start the debugger client process. </p><dl> @@ -332,7 +332,7 @@ Public slot to get the banner info of the remote client. </p><a NAME="DebuggerInterfacePython3.remoteBreakpoint" ID="DebuggerInterfacePython3.remoteBreakpoint"></a> <h4>DebuggerInterfacePython3.remoteBreakpoint</h4> -<b>remoteBreakpoint</b>(<i>fn, line, set, cond = None, temp = False</i>) +<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>) <p> Public method to set or clear a breakpoint. </p><dl> @@ -404,7 +404,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteClientVariable" ID="DebuggerInterfacePython3.remoteClientVariable"></a> <h4>DebuggerInterfacePython3.remoteClientVariable</h4> -<b>remoteClientVariable</b>(<i>scope, filter, var, framenr = 0</i>) +<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -423,7 +423,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteClientVariables" ID="DebuggerInterfacePython3.remoteClientVariables"></a> <h4>DebuggerInterfacePython3.remoteClientVariables</h4> -<b>remoteClientVariables</b>(<i>scope, filter, framenr = 0</i>) +<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -450,7 +450,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteContinue" ID="DebuggerInterfacePython3.remoteContinue"></a> <h4>DebuggerInterfacePython3.remoteContinue</h4> -<b>remoteContinue</b>(<i>special = False</i>) +<b>remoteContinue</b>(<i>special=False</i>) <p> Public method to continue the debugged program. </p><dl> @@ -460,7 +460,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteCoverage" ID="DebuggerInterfacePython3.remoteCoverage"></a> <h4>DebuggerInterfacePython3.remoteCoverage</h4> -<b>remoteCoverage</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteCoverage</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect coverage data. </p><dl> @@ -510,7 +510,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteLoad" ID="DebuggerInterfacePython3.remoteLoad"></a> <h4>DebuggerInterfacePython3.remoteLoad</h4> -<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False</i>) +<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to debug. </p><dl> @@ -540,7 +540,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteProfile" ID="DebuggerInterfacePython3.remoteProfile"></a> <h4>DebuggerInterfacePython3.remoteProfile</h4> -<b>remoteProfile</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect profiling data. </p><dl> @@ -569,7 +569,7 @@ </dd> </dl><a NAME="DebuggerInterfacePython3.remoteRun" ID="DebuggerInterfacePython3.remoteRun"></a> <h4>DebuggerInterfacePython3.remoteRun</h4> -<b>remoteRun</b>(<i>fn, argv, wd, autoFork = False, forkChild = False</i>) +<b>remoteRun</b>(<i>fn, argv, wd, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to run. </p><dl> @@ -603,7 +603,7 @@ <h4>DebuggerInterfacePython3.remoteStatement</h4> <b>remoteStatement</b>(<i>stmt</i>) <p> - Public method to execute a Python statement. + Public method to execute a Python statement. </p><dl> <dt><i>stmt</i></dt> <dd> @@ -673,7 +673,7 @@ Public method to stop a unittest run. </p><a NAME="DebuggerInterfacePython3.remoteWatchpoint" ID="DebuggerInterfacePython3.remoteWatchpoint"></a> <h4>DebuggerInterfacePython3.remoteWatchpoint</h4> -<b>remoteWatchpoint</b>(<i>cond, set, temp = False</i>) +<b>remoteWatchpoint</b>(<i>cond, set, temp=False</i>) <p> Public method to set or clear a watch expression. </p><dl>
--- a/Documentation/Source/eric5.Debugger.DebuggerInterfaceRuby.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.DebuggerInterfaceRuby.html Fri Mar 11 16:51:57 2011 +0100 @@ -205,7 +205,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.__identityTranslation" ID="DebuggerInterfaceRuby.__identityTranslation"></a> <h4>DebuggerInterfaceRuby.__identityTranslation</h4> -<b>__identityTranslation</b>(<i>fn, remote2local = True</i>) +<b>__identityTranslation</b>(<i>fn, remote2local=True</i>) <p> Private method to perform the identity path translation. </p><dl> @@ -229,7 +229,7 @@ Private method to handle data from the client. </p><a NAME="DebuggerInterfaceRuby.__remoteTranslation" ID="DebuggerInterfaceRuby.__remoteTranslation"></a> <h4>DebuggerInterfaceRuby.__remoteTranslation</h4> -<b>__remoteTranslation</b>(<i>fn, remote2local = True</i>) +<b>__remoteTranslation</b>(<i>fn, remote2local=True</i>) <p> Private method to perform the path translation. </p><dl> @@ -258,7 +258,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.__startProcess" ID="DebuggerInterfaceRuby.__startProcess"></a> <h4>DebuggerInterfaceRuby.__startProcess</h4> -<b>__startProcess</b>(<i>program, arguments, environment = None</i>) +<b>__startProcess</b>(<i>program, arguments, environment=None</i>) <p> Private method to start the debugger client process. </p><dl> @@ -324,7 +324,7 @@ Public slot to get the banner info of the remote client. </p><a NAME="DebuggerInterfaceRuby.remoteBreakpoint" ID="DebuggerInterfaceRuby.remoteBreakpoint"></a> <h4>DebuggerInterfaceRuby.remoteBreakpoint</h4> -<b>remoteBreakpoint</b>(<i>fn, line, set, cond = None, temp = False</i>) +<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>) <p> Public method to set or clear a breakpoint. </p><dl> @@ -396,7 +396,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteClientVariable" ID="DebuggerInterfaceRuby.remoteClientVariable"></a> <h4>DebuggerInterfaceRuby.remoteClientVariable</h4> -<b>remoteClientVariable</b>(<i>scope, filter, var, framenr = 0</i>) +<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -415,7 +415,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteClientVariables" ID="DebuggerInterfaceRuby.remoteClientVariables"></a> <h4>DebuggerInterfaceRuby.remoteClientVariables</h4> -<b>remoteClientVariables</b>(<i>scope, filter, framenr = 0</i>) +<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>) <p> Public method to request the variables of the debugged program. </p><dl> @@ -442,7 +442,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteContinue" ID="DebuggerInterfaceRuby.remoteContinue"></a> <h4>DebuggerInterfaceRuby.remoteContinue</h4> -<b>remoteContinue</b>(<i>special = False</i>) +<b>remoteContinue</b>(<i>special=False</i>) <p> Public method to continue the debugged program. </p><dl> @@ -452,7 +452,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteCoverage" ID="DebuggerInterfaceRuby.remoteCoverage"></a> <h4>DebuggerInterfaceRuby.remoteCoverage</h4> -<b>remoteCoverage</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteCoverage</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect coverage data. </p><dl> @@ -502,7 +502,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteLoad" ID="DebuggerInterfaceRuby.remoteLoad"></a> <h4>DebuggerInterfaceRuby.remoteLoad</h4> -<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter = False, autoContinue = True, autoFork = False, forkChild = False</i>) +<b>remoteLoad</b>(<i>fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to debug. </p><dl> @@ -533,7 +533,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteProfile" ID="DebuggerInterfaceRuby.remoteProfile"></a> <h4>DebuggerInterfaceRuby.remoteProfile</h4> -<b>remoteProfile</b>(<i>fn, argv, wd, erase = False</i>) +<b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>) <p> Public method to load a new program to collect profiling data. </p><dl> @@ -562,7 +562,7 @@ </dd> </dl><a NAME="DebuggerInterfaceRuby.remoteRun" ID="DebuggerInterfaceRuby.remoteRun"></a> <h4>DebuggerInterfaceRuby.remoteRun</h4> -<b>remoteRun</b>(<i>fn, argv, wd, autoFork = False, forkChild = False</i>) +<b>remoteRun</b>(<i>fn, argv, wd, autoFork=False, forkChild=False</i>) <p> Public method to load a new program to run. </p><dl> @@ -597,7 +597,7 @@ <h4>DebuggerInterfaceRuby.remoteStatement</h4> <b>remoteStatement</b>(<i>stmt</i>) <p> - Public method to execute a Ruby statement. + Public method to execute a Ruby statement. </p><dl> <dt><i>stmt</i></dt> <dd> @@ -667,7 +667,7 @@ public method to stop a unittest run. </p><a NAME="DebuggerInterfaceRuby.remoteWatchpoint" ID="DebuggerInterfaceRuby.remoteWatchpoint"></a> <h4>DebuggerInterfaceRuby.remoteWatchpoint</h4> -<b>remoteWatchpoint</b>(<i>cond, set, temp = False</i>) +<b>remoteWatchpoint</b>(<i>cond, set, temp=False</i>) <p> Public method to set or clear a watch expression. </p><dl>
--- a/Documentation/Source/eric5.Debugger.EditBreakpointDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.EditBreakpointDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="EditBreakpointDialog.__init__" ID="EditBreakpointDialog.__init__"></a> <h4>EditBreakpointDialog (Constructor)</h4> -<b>EditBreakpointDialog</b>(<i>id, properties, condHistory, parent = None, name = None, modal = False, addMode = False, filenameHistory = None</i>) +<b>EditBreakpointDialog</b>(<i>id, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Debugger.EditWatchpointDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.EditWatchpointDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="EditWatchpointDialog.__init__" ID="EditWatchpointDialog.__init__"></a> <h4>EditWatchpointDialog (Constructor)</h4> -<b>EditWatchpointDialog</b>(<i>properties, parent = None, name = None, modal = False</i>) +<b>EditWatchpointDialog</b>(<i>properties, parent=None, name=None, modal=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Debugger.ExceptionLogger.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.ExceptionLogger.html Fri Mar 11 16:51:57 2011 +0100 @@ -104,7 +104,7 @@ <h4>ExceptionLogger.__itemDoubleClicked</h4> <b>__itemDoubleClicked</b>(<i>itm</i>) <p> - Private slot to handle the double click of an item. + Private slot to handle the double click of an item. </p><dl> <dt><i>itm</i></dt> <dd>
--- a/Documentation/Source/eric5.Debugger.StartDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.StartDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -92,7 +92,7 @@ </table> <a NAME="StartDialog.__init__" ID="StartDialog.__init__"></a> <h4>StartDialog (Constructor)</h4> -<b>StartDialog</b>(<i>caption, argvList, wdList, envList, exceptions, parent = None, type = 0, modfuncList = None, tracePython = False, autoClearShell = True, autoContinue = True, autoFork = False, forkChild = False</i>) +<b>StartDialog</b>(<i>caption, argvList, wdList, envList, exceptions, parent=None, type=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False</i>) <p> Constructor </p><dl> @@ -184,7 +184,7 @@ a tuple of a flag indicating, if the Python library should be traced as well, a flag indicating, that the debugger should not stop at the first executable line (boolean), a flag indicating, that the debugger - should fork automatically (boolean) and a flag indicating, that the + should fork automatically (boolean) and a flag indicating, that the debugger should debug the child process after forking automatically (boolean) </dd> </dl><a NAME="StartDialog.getProfilingData" ID="StartDialog.getProfilingData"></a> @@ -206,7 +206,7 @@ <dt>Returns:</dt> <dd> a tuple of a flag indicating, that the debugger should fork automatically - (boolean) and a flag indicating, that the debugger should debug the child + (boolean) and a flag indicating, that the debugger should debug the child process after forking automatically (boolean) </dd> </dl><a NAME="StartDialog.on_buttonBox_clicked" ID="StartDialog.on_buttonBox_clicked"></a>
--- a/Documentation/Source/eric5.Debugger.VariablesFilterDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.VariablesFilterDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="VariablesFilterDialog.__init__" ID="VariablesFilterDialog.__init__"></a> <h4>VariablesFilterDialog (Constructor)</h4> -<b>VariablesFilterDialog</b>(<i>parent = None, name = None, modal = False</i>) +<b>VariablesFilterDialog</b>(<i>parent=None, name=None, modal=False</i>) <p> Constructor </p><dl> @@ -111,7 +111,7 @@ <h4>VariablesFilterDialog.setSelection</h4> <b>setSelection</b>(<i>lList, gList</i>) <p> - Public slot to set the current selection. + Public slot to set the current selection. </p><dl> <dt><i>lList</i></dt> <dd>
--- a/Documentation/Source/eric5.Debugger.VariablesViewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.VariablesViewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -169,7 +169,7 @@ <p> Class implementing a VariableItem that represents a special variable node. </p><p> - These special variable nodes are generated for classes, lists, + These special variable nodes are generated for classes, lists, tuples and dictionaries. </p> <h3>Derived from</h3> @@ -377,7 +377,7 @@ </p><p> This widget is used to display the variables of the program being debugged in a tree. Compound types will be shown with - their main entry first. Once the subtree has been expanded, the + their main entry first. Once the subtree has been expanded, the individual entries will be shown. Double clicking an entry will popup a dialog showing the variables parameters in a more readable form. This is especially useful for lengthy strings. @@ -471,7 +471,7 @@ <p> Private method used to add an item to the list. </p><p> - If the item is of a type with subelements (i.e. list, dictionary, + If the item is of a type with subelements (i.e. list, dictionary, tuple), these subelements are added by calling this method recursively. </p><dl> <dt><i>parent</i></dt> @@ -556,7 +556,7 @@ </dd> </dl><a NAME="VariablesViewer.__generateItem" ID="VariablesViewer.__generateItem"></a> <h4>VariablesViewer.__generateItem</h4> -<b>__generateItem</b>(<i>parent, dvar, dvalue, dtype, isSpecial = False</i>) +<b>__generateItem</b>(<i>parent, dvar, dvalue, dtype, isSpecial=False</i>) <p> Private method used to generate a VariableItem. </p><dl> @@ -656,7 +656,7 @@ <h4>VariablesViewer.mouseDoubleClickEvent</h4> <b>mouseDoubleClickEvent</b>(<i>mouseEvent</i>) <p> - Protected method of QAbstractItemView. + Protected method of QAbstractItemView. </p><p> Reimplemented to disable expanding/collapsing of items when double-clicking. Instead the double-clicked entry is opened. @@ -675,7 +675,7 @@ <dd> the list of subitems to be displayed. The first element gives the path of the - parent variable. Each other listentry is + parent variable. Each other listentry is a tuple of three values. <ul> <li>the variable name (string)</li>
--- a/Documentation/Source/eric5.Debugger.WatchPointModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.WatchPointModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="WatchPointModel.__init__" ID="WatchPointModel.__init__"></a> <h4>WatchPointModel (Constructor)</h4> -<b>WatchPointModel</b>(<i>parent = None</i>) +<b>WatchPointModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -135,7 +135,7 @@ </dd> </dl><a NAME="WatchPointModel.columnCount" ID="WatchPointModel.columnCount"></a> <h4>WatchPointModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the current column count. </p><dl> @@ -219,7 +219,7 @@ </dd> </dl><a NAME="WatchPointModel.getWatchPointIndex" ID="WatchPointModel.getWatchPointIndex"></a> <h4>WatchPointModel.getWatchPointIndex</h4> -<b>getWatchPointIndex</b>(<i>cond, special = ""</i>) +<b>getWatchPointIndex</b>(<i>cond, special=""</i>) <p> Public method to get the index of a watch expression given by expression. </p><dl> @@ -237,7 +237,7 @@ </dd> </dl><a NAME="WatchPointModel.hasChildren" ID="WatchPointModel.hasChildren"></a> <h4>WatchPointModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check for the presence of child items. </p><dl> @@ -252,7 +252,7 @@ </dd> </dl><a NAME="WatchPointModel.headerData" ID="WatchPointModel.headerData"></a> <h4>WatchPointModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get header data. </p><dl> @@ -273,7 +273,7 @@ </dd> </dl><a NAME="WatchPointModel.index" ID="WatchPointModel.index"></a> <h4>WatchPointModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to create an index. </p><dl> @@ -309,7 +309,7 @@ </dd> </dl><a NAME="WatchPointModel.rowCount" ID="WatchPointModel.rowCount"></a> <h4>WatchPointModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the current row count. </p><dl>
--- a/Documentation/Source/eric5.Debugger.WatchPointViewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Debugger.WatchPointViewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -147,7 +147,7 @@ </table> <a NAME="WatchPointViewer.__init__" ID="WatchPointViewer.__init__"></a> <h4>WatchPointViewer (Constructor)</h4> -<b>WatchPointViewer</b>(<i>parent = None</i>) +<b>WatchPointViewer</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -247,7 +247,7 @@ Private slot to handle the enable watch expression context menu entry. </p><a NAME="WatchPointViewer.__findDuplicates" ID="WatchPointViewer.__findDuplicates"></a> <h4>WatchPointViewer.__findDuplicates</h4> -<b>__findDuplicates</b>(<i>cond, special, showMessage = False, index = QModelIndex()</i>) +<b>__findDuplicates</b>(<i>cond, special, showMessage=False, index=QModelIndex()</i>) <p> Private method to check, if an entry already exists. </p><dl> @@ -307,7 +307,7 @@ Private slot to resort the tree. </p><a NAME="WatchPointViewer.__setRowSelected" ID="WatchPointViewer.__setRowSelected"></a> <h4>WatchPointViewer.__setRowSelected</h4> -<b>__setRowSelected</b>(<i>index, selected = True</i>) +<b>__setRowSelected</b>(<i>index, selected=True</i>) <p> Private slot to select a complete row. </p><dl>
--- a/Documentation/Source/eric5.DocumentationTools.APIGenerator.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DocumentationTools.APIGenerator.html Fri Mar 11 16:51:57 2011 +0100 @@ -113,7 +113,7 @@ <h4>APIGenerator.__addGlobalsAPI</h4> <b>__addGlobalsAPI</b>(<i></i>) <p> - Private method to generate the api section for global variables. + Private method to generate the api section for global variables. </p><a NAME="APIGenerator.__addMethodsAPI" ID="APIGenerator.__addMethodsAPI"></a> <h4>APIGenerator.__addMethodsAPI</h4> <b>__addMethodsAPI</b>(<i>className</i>)
--- a/Documentation/Source/eric5.DocumentationTools.IndexGenerator.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DocumentationTools.IndexGenerator.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="IndexGenerator.__init__" ID="IndexGenerator.__init__"></a> <h4>IndexGenerator (Constructor)</h4> -<b>IndexGenerator</b>(<i>outputDir, colors, stylesheet = None</i>) +<b>IndexGenerator</b>(<i>outputDir, colors, stylesheet=None</i>) <p> Constructor </p><dl> @@ -86,7 +86,7 @@ </dd> </dl><a NAME="IndexGenerator.__writeIndex" ID="IndexGenerator.__writeIndex"></a> <h4>IndexGenerator.__writeIndex</h4> -<b>__writeIndex</b>(<i>packagename, package, newline = None</i>) +<b>__writeIndex</b>(<i>packagename, package, newline=None</i>) <p> Private method to generate an index file for a package. </p><dl> @@ -126,7 +126,7 @@ </dd> </dl><a NAME="IndexGenerator.writeIndices" ID="IndexGenerator.writeIndices"></a> <h4>IndexGenerator.writeIndices</h4> -<b>writeIndices</b>(<i>basename = "", newline = None</i>) +<b>writeIndices</b>(<i>basename="", newline=None</i>) <p> Public method to generate all index files. </p><dl>
--- a/Documentation/Source/eric5.DocumentationTools.ModuleDocumentor.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DocumentationTools.ModuleDocumentor.html Fri Mar 11 16:51:57 2011 +0100 @@ -151,7 +151,7 @@ </table> <a NAME="ModuleDocument.__init__" ID="ModuleDocument.__init__"></a> <h4>ModuleDocument (Constructor)</h4> -<b>ModuleDocument</b>(<i>module, colors, stylesheet = None</i>) +<b>ModuleDocument</b>(<i>module, colors, stylesheet=None</i>) <p> Constructor </p><dl> @@ -170,7 +170,7 @@ <h4>ModuleDocument.__checkDeprecated</h4> <b>__checkDeprecated</b>(<i>descr</i>) <p> - Private method to check, if the object to be documented contains a + Private method to check, if the object to be documented contains a deprecated flag. </p><dl> <dt><i>desc</i></dt> @@ -281,7 +281,7 @@ </dd> </dl><a NAME="ModuleDocument.__genGlobalsListSection" ID="ModuleDocument.__genGlobalsListSection"></a> <h4>ModuleDocument.__genGlobalsListSection</h4> -<b>__genGlobalsListSection</b>(<i>class_ = None</i>) +<b>__genGlobalsListSection</b>(<i>class_=None</i>) <p> Private method to generate the section listing all global attributes of the module. @@ -297,7 +297,7 @@ </dd> </dl><a NAME="ModuleDocument.__genListSection" ID="ModuleDocument.__genListSection"></a> <h4>ModuleDocument.__genListSection</h4> -<b>__genListSection</b>(<i>names, dict, kwSuffix = ""</i>) +<b>__genListSection</b>(<i>names, dict, kwSuffix=""</i>) <p> Private method to generate a list section of the document. </p><dl> @@ -449,7 +449,7 @@ <h4>ModuleDocument.__genRbModulesListSection</h4> <b>__genRbModulesListSection</b>(<i></i>) <p> - Private method to generate the section listing all modules of the file + Private method to generate the section listing all modules of the file (Ruby only). </p><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric5.DocumentationTools.QtHelpGenerator.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.DocumentationTools.QtHelpGenerator.html Fri Mar 11 16:51:57 2011 +0100 @@ -140,7 +140,7 @@ </dd> </dl><a NAME="QtHelpGenerator.generateFiles" ID="QtHelpGenerator.generateFiles"></a> <h4>QtHelpGenerator.generateFiles</h4> -<b>generateFiles</b>(<i>basename = "", newline = None</i>) +<b>generateFiles</b>(<i>basename="", newline=None</i>) <p> Public method to generate all index files. </p><dl>
--- a/Documentation/Source/eric5.E5Graphics.E5ArrowItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Graphics.E5ArrowItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="E5ArrowItem.__init__" ID="E5ArrowItem.__init__"></a> <h4>E5ArrowItem (Constructor)</h4> -<b>E5ArrowItem</b>(<i>origin = QPointF(), end = QPointF(), filled = False, type = NormalArrow, parent = None</i>) +<b>E5ArrowItem</b>(<i>origin=QPointF(), end=QPointF(), filled=False, type=NormalArrow, parent=None</i>) <p> Constructor </p><dl> @@ -107,7 +107,7 @@ </dd> </dl><a NAME="E5ArrowItem.paint" ID="E5ArrowItem.paint"></a> <h4>E5ArrowItem.paint</h4> -<b>paint</b>(<i>painter, option, widget = None</i>) +<b>paint</b>(<i>painter, option, widget=None</i>) <p> Public method to paint the item in local coordinates. </p><dl>
--- a/Documentation/Source/eric5.E5Graphics.E5GraphicsView.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Graphics.E5GraphicsView.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="E5GraphicsView.__init__" ID="E5GraphicsView.__init__"></a> <h4>E5GraphicsView (Constructor)</h4> -<b>E5GraphicsView</b>(<i>scene, parent = None</i>) +<b>E5GraphicsView</b>(<i>scene, parent=None</i>) <p> Constructor </p><dl> @@ -112,9 +112,9 @@ </dd> </dl><a NAME="E5GraphicsView.__getDiagram" ID="E5GraphicsView.__getDiagram"></a> <h4>E5GraphicsView.__getDiagram</h4> -<b>__getDiagram</b>(<i>rect, format = "PNG", filename = None</i>) +<b>__getDiagram</b>(<i>rect, format="PNG", filename=None</i>) <p> - Private method to retrieve the diagram from the scene fitting it + Private method to retrieve the diagram from the scene fitting it in the minimum rectangle. </p><dl> <dt><i>rect</i></dt> @@ -134,7 +134,7 @@ </dd> </dl><a NAME="E5GraphicsView._getDiagramRect" ID="E5GraphicsView._getDiagramRect"></a> <h4>E5GraphicsView._getDiagramRect</h4> -<b>_getDiagramRect</b>(<i>border = 0</i>) +<b>_getDiagramRect</b>(<i>border=0</i>) <p> Protected method to calculate the minimum rectangle fitting the diagram. </p><dl> @@ -149,7 +149,7 @@ </dd> </dl><a NAME="E5GraphicsView._getDiagramSize" ID="E5GraphicsView._getDiagramSize"></a> <h4>E5GraphicsView._getDiagramSize</h4> -<b>_getDiagramSize</b>(<i>border = 0</i>) +<b>_getDiagramSize</b>(<i>border=0</i>) <p> Protected method to calculate the minimum size fitting the diagram. </p><dl> @@ -180,7 +180,7 @@ </dd> </dl><a NAME="E5GraphicsView.printDiagram" ID="E5GraphicsView.printDiagram"></a> <h4>E5GraphicsView.printDiagram</h4> -<b>printDiagram</b>(<i>printer, diagramName = ""</i>) +<b>printDiagram</b>(<i>printer, diagramName=""</i>) <p> Public method to print the diagram. </p><dl> @@ -193,7 +193,7 @@ </dd> </dl><a NAME="E5GraphicsView.resizeScene" ID="E5GraphicsView.resizeScene"></a> <h4>E5GraphicsView.resizeScene</h4> -<b>resizeScene</b>(<i>amount, isWidth = True</i>) +<b>resizeScene</b>(<i>amount, isWidth=True</i>) <p> Public method to resize the scene. </p><dl> @@ -206,7 +206,7 @@ </dd> </dl><a NAME="E5GraphicsView.saveImage" ID="E5GraphicsView.saveImage"></a> <h4>E5GraphicsView.saveImage</h4> -<b>saveImage</b>(<i>filename, format = "PNG"</i>) +<b>saveImage</b>(<i>filename, format="PNG"</i>) <p> Public method to save the scene to a file. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5Action.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5Action.html Fri Mar 11 16:51:57 2011 +0100 @@ -148,17 +148,17 @@ <dd> argument list of the constructor. This list is one of <ul> - <li>text (string), icon (QIcon), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), icon (QIcon), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string), toggle (boolean)</li> - <li>text (string), icon (QIcon), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), icon (QIcon), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string)</li> - <li>text (string), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string), toggle (boolean)</li> - <li>text (string), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string)</li> </ul> </dd> @@ -206,7 +206,7 @@ <dt><i>shortcuts</i></dt> <dd> list of keyboard accelerators (list of QKeySequence) - or key for a platform dependent list of accelerators + or key for a platform dependent list of accelerators (QKeySequence.StandardKey) </dd> </dl> @@ -231,7 +231,7 @@ <hr /><hr /> <a NAME="createActionGroup" ID="createActionGroup"></a> <h2>createActionGroup</h2> -<b>createActionGroup</b>(<i>parent, name = None, exclusive = False</i>) +<b>createActionGroup</b>(<i>parent, name=None, exclusive=False</i>) <p> Module function to create an action group. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5Application.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5Application.html Fri Mar 11 16:51:57 2011 +0100 @@ -180,7 +180,7 @@ </dd> </dl><a NAME="E5Application.registerPluginObject" ID="E5Application.registerPluginObject"></a> <h4>E5Application.registerPluginObject</h4> -<b>registerPluginObject</b>(<i>name, object, pluginType = None</i>) +<b>registerPluginObject</b>(<i>name, object, pluginType=None</i>) <p> Public method to register a plugin object in the object registry. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5Completers.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5Completers.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="E5DirCompleter.__init__" ID="E5DirCompleter.__init__"></a> <h4>E5DirCompleter (Constructor)</h4> -<b>E5DirCompleter</b>(<i>parent = None, completionMode = QCompleter.PopupCompletion, showHidden = False</i>) +<b>E5DirCompleter</b>(<i>parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False</i>) <p> Constructor </p><dl> @@ -104,7 +104,7 @@ </table> <a NAME="E5FileCompleter.__init__" ID="E5FileCompleter.__init__"></a> <h4>E5FileCompleter (Constructor)</h4> -<b>E5FileCompleter</b>(<i>parent = None, completionMode = QCompleter.PopupCompletion, showHidden = False</i>) +<b>E5FileCompleter</b>(<i>parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False</i>) <p> Constructor </p><dl> @@ -142,7 +142,7 @@ </table> <a NAME="E5StringListCompleter.__init__" ID="E5StringListCompleter.__init__"></a> <h4>E5StringListCompleter (Constructor)</h4> -<b>E5StringListCompleter</b>(<i>parent = None, strings = [], completionMode = QCompleter.PopupCompletion</i>) +<b>E5StringListCompleter</b>(<i>parent=None, strings=[], completionMode=QCompleter.PopupCompletion</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5FileDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5FileDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -64,7 +64,7 @@ <hr /><hr /> <a NAME="__reorderFilter" ID="__reorderFilter"></a> <h2>__reorderFilter</h2> -<b>__reorderFilter</b>(<i>filter, initialFilter = ""</i>) +<b>__reorderFilter</b>(<i>filter, initialFilter=""</i>) <p> Private function to reorder the file filter to cope with a KDE issue introduced by distributor's usage of KDE file dialogs. @@ -86,7 +86,7 @@ <hr /><hr /> <a NAME="getExistingDirectory" ID="getExistingDirectory"></a> <h2>getExistingDirectory</h2> -<b>getExistingDirectory</b>(<i>parent = None, caption = "", directory = "", options = QFileDialog.ShowDirsOnly</i>) +<b>getExistingDirectory</b>(<i>parent=None, caption="", directory="", options=QFileDialog.ShowDirsOnly</i>) <p> Module function to get the name of a directory. </p><dl> @@ -113,7 +113,7 @@ <hr /><hr /> <a NAME="getOpenFileName" ID="getOpenFileName"></a> <h2>getOpenFileName</h2> -<b>getOpenFileName</b>(<i>parent = None, caption = "", directory = "", filter = "", options = QFileDialog.Options()</i>) +<b>getOpenFileName</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>) <p> Module function to get the name of a file for opening it. </p><dl> @@ -143,7 +143,7 @@ <hr /><hr /> <a NAME="getOpenFileNameAndFilter" ID="getOpenFileNameAndFilter"></a> <h2>getOpenFileNameAndFilter</h2> -<b>getOpenFileNameAndFilter</b>(<i>parent = None, caption = "", directory = "", filter = "", initialFilter = "", options = QFileDialog.Options()</i>) +<b>getOpenFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>) <p> Module function to get the name of a file for opening it and the selected file name filter. @@ -177,7 +177,7 @@ <hr /><hr /> <a NAME="getOpenFileNames" ID="getOpenFileNames"></a> <h2>getOpenFileNames</h2> -<b>getOpenFileNames</b>(<i>parent = None, caption = "", directory = "", filter = "", options = QFileDialog.Options()</i>) +<b>getOpenFileNames</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>) <p> Module function to get a list of names of files for opening. </p><dl> @@ -207,7 +207,7 @@ <hr /><hr /> <a NAME="getOpenFileNamesAndFilter" ID="getOpenFileNamesAndFilter"></a> <h2>getOpenFileNamesAndFilter</h2> -<b>getOpenFileNamesAndFilter</b>(<i>parent = None, caption = "", directory = "", filter = "", initialFilter = "", options = QFileDialog.Options()</i>) +<b>getOpenFileNamesAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>) <p> Module function to get a list of names of files for opening and the selected file name filter. @@ -242,7 +242,7 @@ <hr /><hr /> <a NAME="getSaveFileName" ID="getSaveFileName"></a> <h2>getSaveFileName</h2> -<b>getSaveFileName</b>(<i>parent = None, caption = "", directory = "", filter = "", options = QFileDialog.Options()</i>) +<b>getSaveFileName</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>) <p> Module function to get the name of a file for saving it. </p><dl> @@ -272,7 +272,7 @@ <hr /><hr /> <a NAME="getSaveFileNameAndFilter" ID="getSaveFileNameAndFilter"></a> <h2>getSaveFileNameAndFilter</h2> -<b>getSaveFileNameAndFilter</b>(<i>parent = None, caption = "", directory = "", filter = "", initialFilter = "", options = QFileDialog.Options()</i>) +<b>getSaveFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>) <p> Module function to get the name of a file for saving it and the selected file name filter.
--- a/Documentation/Source/eric5.E5Gui.E5Led.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5Led.html Fri Mar 11 16:51:57 2011 +0100 @@ -125,7 +125,7 @@ </table> <a NAME="E5Led.__init__" ID="E5Led.__init__"></a> <h4>E5Led (Constructor)</h4> -<b>E5Led</b>(<i>parent = None, color = None, shape = E5LedCircular, rectRatio = 1</i>) +<b>E5Led</b>(<i>parent=None, color=None, shape=E5LedCircular, rectRatio=1</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5LineEdit.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5LineEdit.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.E5Gui.E5LineEdit</h1> <p> -Module implementing specialized line edits. +Module implementing specialized line edits. </p> <h3>Global Attributes</h3> <table> @@ -99,7 +99,7 @@ </table> <a NAME="E5LineEdit.__init__" ID="E5LineEdit.__init__"></a> <h4>E5LineEdit (Constructor)</h4> -<b>E5LineEdit</b>(<i>parent = None, inactiveText = ""</i>) +<b>E5LineEdit</b>(<i>parent=None, inactiveText=""</i>) <p> Constructor </p><dl> @@ -251,7 +251,7 @@ </table> <a NAME="SideWidget.__init__" ID="SideWidget.__init__"></a> <h4>SideWidget (Constructor)</h4> -<b>SideWidget</b>(<i>parent = None</i>) +<b>SideWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5LineEditButton.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5LineEditButton.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="E5LineEditButton.__init__" ID="E5LineEditButton.__init__"></a> <h4>E5LineEditButton (Constructor)</h4> -<b>E5LineEditButton</b>(<i>parent = None</i>) +<b>E5LineEditButton</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5ListView.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ListView.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.E5Gui.E5ListView</h1> <p> -Module implementing specialized list views. +Module implementing specialized list views. </p> <h3>Global Attributes</h3> <table>
--- a/Documentation/Source/eric5.E5Gui.E5MessageBox.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5MessageBox.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="E5MessageBox.__init__" ID="E5MessageBox.__init__"></a> <h4>E5MessageBox (Constructor)</h4> -<b>E5MessageBox</b>(<i>icon, title, text, modal = False, buttons = QMessageBox.StandardButtons(QMessageBox.NoButton), parent = None</i>) +<b>E5MessageBox</b>(<i>icon, title, text, modal=False, buttons=QMessageBox.StandardButtons(QMessageBox.NoButton), parent=None</i>) <p> Constructor </p><dl> @@ -112,7 +112,7 @@ <hr /><hr /> <a NAME="__messageBox" ID="__messageBox"></a> <h2>__messageBox</h2> -<b>__messageBox</b>(<i>parent, title, text, icon, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<b>__messageBox</b>(<i>parent, title, text, icon, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton</i>) <p> Private module function to show a modal message box. </p><dl> @@ -147,7 +147,7 @@ <hr /><hr /> <a NAME="critical" ID="critical"></a> <h2>critical</h2> -<b>critical</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<b>critical</b>(<i>parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton</i>) <p> Function to show a modal critical message box. </p><dl> @@ -179,7 +179,7 @@ <hr /><hr /> <a NAME="information" ID="information"></a> <h2>information</h2> -<b>information</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<b>information</b>(<i>parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton</i>) <p> Function to show a modal information message box. </p><dl> @@ -239,7 +239,7 @@ <hr /><hr /> <a NAME="question" ID="question"></a> <h2>question</h2> -<b>question</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<b>question</b>(<i>parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton</i>) <p> Function to show a modal question message box. </p><dl> @@ -271,7 +271,7 @@ <hr /><hr /> <a NAME="retryAbort" ID="retryAbort"></a> <h2>retryAbort</h2> -<b>retryAbort</b>(<i>parent, title, text, icon = Question</i>) +<b>retryAbort</b>(<i>parent, title, text, icon=Question</i>) <p> Function to show a model abort/retry message box. </p><dl> @@ -298,7 +298,7 @@ <hr /><hr /> <a NAME="warning" ID="warning"></a> <h2>warning</h2> -<b>warning</b>(<i>parent, title, text, buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton</i>) +<b>warning</b>(<i>parent, title, text, buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton</i>) <p> Function to show a modal warning message box. </p><dl> @@ -330,7 +330,7 @@ <hr /><hr /> <a NAME="yesNo" ID="yesNo"></a> <h2>yesNo</h2> -<b>yesNo</b>(<i>parent, title, text, icon = Question, yesDefault = False</i>) +<b>yesNo</b>(<i>parent, title, text, icon=Question, yesDefault=False</i>) <p> Function to show a model yes/no message box. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5ModelMenu.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ModelMenu.html Fri Mar 11 16:51:57 2011 +0100 @@ -150,7 +150,7 @@ </table> <a NAME="E5ModelMenu.__init__" ID="E5ModelMenu.__init__"></a> <h4>E5ModelMenu (Constructor)</h4> -<b>E5ModelMenu</b>(<i>parent = None</i>) +<b>E5ModelMenu</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -200,7 +200,7 @@ </dd> </dl><a NAME="E5ModelMenu.createMenu" ID="E5ModelMenu.createMenu"></a> <h4>E5ModelMenu.createMenu</h4> -<b>createMenu</b>(<i>parent, max_, parentMenu = None, menu = None</i>) +<b>createMenu</b>(<i>parent, max_, parentMenu=None, menu=None</i>) <p> Public method to put all the children of a parent into a menu of a given length. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5ModelToolBar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ModelToolBar.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="E5ModelToolBar.__init__" ID="E5ModelToolBar.__init__"></a> <h4>E5ModelToolBar (Constructor)</h4> -<b>E5ModelToolBar</b>(<i>title = None, parent = None</i>) +<b>E5ModelToolBar</b>(<i>title=None, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5PassivePopup.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5PassivePopup.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.E5Gui.E5PassivePopup</h1> <p> -Module implementing dialog-like popup that displays messages without +Module implementing dialog-like popup that displays messages without interrupting the user. </p> <h3>Global Attributes</h3> @@ -44,7 +44,7 @@ <a NAME="E5PassivePopup" ID="E5PassivePopup"></a> <h2>E5PassivePopup</h2> <p> - Class implementing dialog-like popup that displays messages without + Class implementing dialog-like popup that displays messages without interrupting the user. </p> <h3>Derived from</h3> @@ -98,7 +98,7 @@ </table> <a NAME="E5PassivePopup.__init__" ID="E5PassivePopup.__init__"></a> <h4>E5PassivePopup (Constructor)</h4> -<b>E5PassivePopup</b>(<i>parent = None</i>) +<b>E5PassivePopup</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -110,7 +110,7 @@ <h4>E5PassivePopup.__calculateNearbyPoint</h4> <b>__calculateNearbyPoint</b>(<i>target</i>) <p> - Private method to calculate the position to place the popup near the + Private method to calculate the position to place the popup near the specified rectangle. </p><dl> <dt><i>target</i></dt> @@ -204,7 +204,7 @@ </dd> </dl><a NAME="E5PassivePopup.show" ID="E5PassivePopup.show"></a> <h4>E5PassivePopup.show</h4> -<b>show</b>(<i>p = None</i>) +<b>show</b>(<i>p=None</i>) <p> Public slot to show the popup. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5SideBar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5SideBar.html Fri Mar 11 16:51:57 2011 +0100 @@ -175,7 +175,7 @@ </table> <a NAME="E5SideBar.__init__" ID="E5SideBar.__init__"></a> <h4>E5SideBar (Constructor)</h4> -<b>E5SideBar</b>(<i>orientation = None, parent = None</i>) +<b>E5SideBar</b>(<i>orientation=None, parent=None</i>) <p> Constructor </p><dl> @@ -224,7 +224,7 @@ </dd> </dl><a NAME="E5SideBar.addTab" ID="E5SideBar.addTab"></a> <h4>E5SideBar.addTab</h4> -<b>addTab</b>(<i>widget, iconOrLabel, label = None</i>) +<b>addTab</b>(<i>widget, iconOrLabel, label=None</i>) <p> Public method to add a tab to the sidebar. </p><dl> @@ -325,7 +325,7 @@ </dd> </dl><a NAME="E5SideBar.insertTab" ID="E5SideBar.insertTab"></a> <h4>E5SideBar.insertTab</h4> -<b>insertTab</b>(<i>index, widget, iconOrLabel, label = None</i>) +<b>insertTab</b>(<i>index, widget, iconOrLabel, label=None</i>) <p> Public method to insert a tab into the sidebar. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5SqueezeLabels.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5SqueezeLabels.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="E5SqueezeLabel.__init__" ID="E5SqueezeLabel.__init__"></a> <h4>E5SqueezeLabel (Constructor)</h4> -<b>E5SqueezeLabel</b>(<i>parent = None</i>) +<b>E5SqueezeLabel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -135,7 +135,7 @@ </table> <a NAME="E5SqueezeLabelPath.__init__" ID="E5SqueezeLabelPath.__init__"></a> <h4>E5SqueezeLabelPath (Constructor)</h4> -<b>E5SqueezeLabelPath</b>(<i>parent = None</i>) +<b>E5SqueezeLabelPath</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5TabWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5TabWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -85,7 +85,7 @@ </table> <a NAME="E5DnDTabBar.__init__" ID="E5DnDTabBar.__init__"></a> <h4>E5DnDTabBar (Constructor)</h4> -<b>E5DnDTabBar</b>(<i>parent = None</i>) +<b>E5DnDTabBar</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -202,7 +202,7 @@ </table> <a NAME="E5TabWidget.__init__" ID="E5TabWidget.__init__"></a> <h4>E5TabWidget (Constructor)</h4> -<b>E5TabWidget</b>(<i>parent = None, dnd = False</i>) +<b>E5TabWidget</b>(<i>parent=None, dnd=False</i>) <p> Constructor </p><dl> @@ -363,7 +363,7 @@ </table> <a NAME="E5WheelTabBar.__init__" ID="E5WheelTabBar.__init__"></a> <h4>E5WheelTabBar (Constructor)</h4> -<b>E5WheelTabBar</b>(<i>parent = None</i>) +<b>E5WheelTabBar</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5TableView.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5TableView.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.E5Gui.E5TableView</h1> <p> -Module implementing specialized table views. +Module implementing specialized table views. </p> <h3>Global Attributes</h3> <table>
--- a/Documentation/Source/eric5.E5Gui.E5TextSpinBox.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5TextSpinBox.html Fri Mar 11 16:51:57 2011 +0100 @@ -73,7 +73,7 @@ </table> <a NAME="E5TextSpinBox.__init__" ID="E5TextSpinBox.__init__"></a> <h4>E5TextSpinBox (Constructor)</h4> -<b>E5TextSpinBox</b>(<i>parent = None</i>) +<b>E5TextSpinBox</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -83,7 +83,7 @@ </dd> </dl><a NAME="E5TextSpinBox.addItem" ID="E5TextSpinBox.addItem"></a> <h4>E5TextSpinBox.addItem</h4> -<b>addItem</b>(<i>txt, data = None</i>) +<b>addItem</b>(<i>txt, data=None</i>) <p> Public method to add an item with item data. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5ToolBarDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ToolBarDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="E5ToolBarDialog.__init__" ID="E5ToolBarDialog.__init__"></a> <h4>E5ToolBarDialog (Constructor)</h4> -<b>E5ToolBarDialog</b>(<i>toolBarManager, parent = None</i>) +<b>E5ToolBarDialog</b>(<i>toolBarManager, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5ToolBarManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ToolBarManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -153,7 +153,7 @@ </table> <a NAME="E5ToolBarManager.__init__" ID="E5ToolBarManager.__init__"></a> <h4>E5ToolBarManager (Constructor)</h4> -<b>E5ToolBarManager</b>(<i>ui = None, parent = None</i>) +<b>E5ToolBarManager</b>(<i>ui=None, parent=None</i>) <p> Constructor </p><dl> @@ -424,7 +424,7 @@ </dd> </dl><a NAME="E5ToolBarManager.restoreState" ID="E5ToolBarManager.restoreState"></a> <h4>E5ToolBarManager.restoreState</h4> -<b>restoreState</b>(<i>state, version = 0</i>) +<b>restoreState</b>(<i>state, version=0</i>) <p> Public method to restore the state of the toolbar manager. </p><dl> @@ -442,7 +442,7 @@ </dd> </dl><a NAME="E5ToolBarManager.saveState" ID="E5ToolBarManager.saveState"></a> <h4>E5ToolBarManager.saveState</h4> -<b>saveState</b>(<i>version = 0</i>) +<b>saveState</b>(<i>version=0</i>) <p> Public method to save the state of the toolbar manager. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5ToolBox.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ToolBox.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="E5HorizontalToolBox.__init__" ID="E5HorizontalToolBox.__init__"></a> <h4>E5HorizontalToolBox (Constructor)</h4> -<b>E5HorizontalToolBox</b>(<i>parent = None</i>) +<b>E5HorizontalToolBox</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -180,7 +180,7 @@ </table> <a NAME="E5VerticalToolBox.__init__" ID="E5VerticalToolBox.__init__"></a> <h4>E5VerticalToolBox (Constructor)</h4> -<b>E5VerticalToolBox</b>(<i>parent = None</i>) +<b>E5VerticalToolBox</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5TreeSortFilterProxyModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5TreeSortFilterProxyModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="E5TreeSortFilterProxyModel.__init__" ID="E5TreeSortFilterProxyModel.__init__"></a> <h4>E5TreeSortFilterProxyModel (Constructor)</h4> -<b>E5TreeSortFilterProxyModel</b>(<i>parent = None</i>) +<b>E5TreeSortFilterProxyModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -97,7 +97,7 @@ </dd> </dl><a NAME="E5TreeSortFilterProxyModel.hasChildren" ID="E5TreeSortFilterProxyModel.hasChildren"></a> <h4>E5TreeSortFilterProxyModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check, if a parent node has some children. </p><dl>
--- a/Documentation/Source/eric5.E5Gui.E5TreeView.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5TreeView.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.E5Gui.E5TreeView</h1> <p> -Module implementing specialized tree views. +Module implementing specialized tree views. </p> <h3>Global Attributes</h3> <table>
--- a/Documentation/Source/eric5.E5Network.E5NetworkHeaderDetailsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Network.E5NetworkHeaderDetailsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="E5NetworkHeaderDetailsDialog.__init__" ID="E5NetworkHeaderDetailsDialog.__init__"></a> <h4>E5NetworkHeaderDetailsDialog (Constructor)</h4> -<b>E5NetworkHeaderDetailsDialog</b>(<i>parent = None</i>) +<b>E5NetworkHeaderDetailsDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5Network.E5NetworkMonitor.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5Network.E5NetworkMonitor.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="E5NetworkMonitor.__init__" ID="E5NetworkMonitor.__init__"></a> <h4>E5NetworkMonitor (Constructor)</h4> -<b>E5NetworkMonitor</b>(<i>networkAccessManager, parent = None</i>) +<b>E5NetworkMonitor</b>(<i>networkAccessManager, parent=None</i>) <p> Constructor </p><dl> @@ -223,7 +223,7 @@ </table> <a NAME="E5RequestModel.__init__" ID="E5RequestModel.__init__"></a> <h4>E5RequestModel (Constructor)</h4> -<b>E5RequestModel</b>(<i>networkAccessManager, parent = None</i>) +<b>E5RequestModel</b>(<i>networkAccessManager, parent=None</i>) <p> Constructor </p><dl> @@ -283,7 +283,7 @@ </dd> </dl><a NAME="E5RequestModel.data" ID="E5RequestModel.data"></a> <h4>E5RequestModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -301,7 +301,7 @@ </dd> </dl><a NAME="E5RequestModel.headerData" ID="E5RequestModel.headerData"></a> <h4>E5RequestModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get header data from the model. </p><dl>
--- a/Documentation/Source/eric5.E5XML.DebuggerPropertiesReader.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5XML.DebuggerPropertiesReader.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ Private method to read the remote debugger info. </p><a NAME="DebuggerPropertiesReader.readXML" ID="DebuggerPropertiesReader.readXML"></a> <h4>DebuggerPropertiesReader.readXML</h4> -<b>readXML</b>(<i>quiet = False</i>) +<b>readXML</b>(<i>quiet=False</i>) <p> Public method to read and parse the XML document. </p><dl>
--- a/Documentation/Source/eric5.E5XML.SessionReader.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5XML.SessionReader.html Fri Mar 11 16:51:57 2011 +0100 @@ -140,7 +140,7 @@ Private method to read watch expression infos. </p><a NAME="SessionReader.readXML" ID="SessionReader.readXML"></a> <h4>SessionReader.readXML</h4> -<b>readXML</b>(<i>quiet = False</i>) +<b>readXML</b>(<i>quiet=False</i>) <p> Public method to read and parse the XML document. </p><dl>
--- a/Documentation/Source/eric5.E5XML.TasksReader.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5XML.TasksReader.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="TasksReader.__init__" ID="TasksReader.__init__"></a> <h4>TasksReader (Constructor)</h4> -<b>TasksReader</b>(<i>device, forProject = False, viewer = None</i>) +<b>TasksReader</b>(<i>device, forProject=False, viewer=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5XML.TasksWriter.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5XML.TasksWriter.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="TasksWriter.__init__" ID="TasksWriter.__init__"></a> <h4>TasksWriter (Constructor)</h4> -<b>TasksWriter</b>(<i>device, forProject = False, projectName = ""</i>) +<b>TasksWriter</b>(<i>device, forProject=False, projectName=""</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5XML.TemplatesReader.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5XML.TemplatesReader.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="TemplatesReader.__init__" ID="TemplatesReader.__init__"></a> <h4>TemplatesReader (Constructor)</h4> -<b>TemplatesReader</b>(<i>device, viewer = None</i>) +<b>TemplatesReader</b>(<i>device, viewer=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.E5XML.XMLStreamReaderBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.E5XML.XMLStreamReaderBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -177,7 +177,7 @@ Protected method to skip over all unknown elements. </p><a NAME="XMLStreamReaderBase.attribute" ID="XMLStreamReaderBase.attribute"></a> <h4>XMLStreamReaderBase.attribute</h4> -<b>attribute</b>(<i>name, default = ""</i>) +<b>attribute</b>(<i>name, default=""</i>) <p> Public method to read the given attribute of the current tag. </p><dl>
--- a/Documentation/Source/eric5.Graphics.ApplicationDiagram.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.ApplicationDiagram.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="ApplicationDiagram.__init__" ID="ApplicationDiagram.__init__"></a> <h4>ApplicationDiagram (Constructor)</h4> -<b>ApplicationDiagram</b>(<i>project, parent = None, name = None, noModules = False</i>) +<b>ApplicationDiagram</b>(<i>project, parent=None, name=None, noModules=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.AssociationItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.AssociationItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -90,7 +90,7 @@ </table> <a NAME="AssociationItem.__init__" ID="AssociationItem.__init__"></a> <h4>AssociationItem (Constructor)</h4> -<b>AssociationItem</b>(<i>itemA, itemB, type = Normal, parent = None</i>) +<b>AssociationItem</b>(<i>itemA, itemB, type=Normal, parent=None</i>) <p> Constructor </p><dl> @@ -148,7 +148,7 @@ Each diagonal is defined by two corners of the bounding rectangle </p><p> To calculate the start point we have to find out in which - region (defined by itemA's diagonals) is itemB's TopLeft corner + region (defined by itemA's diagonals) is itemB's TopLeft corner (lets call it region M). After that the start point will be the middle point of rectangle's side contained in region M. </p><p> @@ -201,7 +201,7 @@ <h4>AssociationItem.__findPointRegion</h4> <b>__findPointRegion</b>(<i>rect, posX, posY</i>) <p> - Private method to find out, which region of rectangle rect contains the point + Private method to find out, which region of rectangle rect contains the point (PosX, PosY) and returns the region number. </p><dl> <dt><i>rect</i></dt>
--- a/Documentation/Source/eric5.Graphics.ClassItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.ClassItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="ClassItem.__init__" ID="ClassItem.__init__"></a> <h4>ClassItem (Constructor)</h4> -<b>ClassItem</b>(<i>model = None, external = False, x = 0, y = 0, rounded = False, noAttrs = False, parent = None, scene = None</i>) +<b>ClassItem</b>(<i>model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None</i>) <p> Constructor </p><dl> @@ -129,7 +129,7 @@ </dd> </dl><a NAME="ClassItem.paint" ID="ClassItem.paint"></a> <h4>ClassItem.paint</h4> -<b>paint</b>(<i>painter, option, widget = None</i>) +<b>paint</b>(<i>painter, option, widget=None</i>) <p> Public method to paint the item in local coordinates. </p><dl> @@ -191,7 +191,7 @@ </table> <a NAME="ClassModel.__init__" ID="ClassModel.__init__"></a> <h4>ClassModel (Constructor)</h4> -<b>ClassModel</b>(<i>name, methods = [], attributes = []</i>) +<b>ClassModel</b>(<i>name, methods=[], attributes=[]</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.GraphicsUtilities.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.GraphicsUtilities.html Fri Mar 11 16:51:57 2011 +0100 @@ -86,7 +86,7 @@ <hr /><hr /> <a NAME="sort" ID="sort"></a> <h2>sort</h2> -<b>sort</b>(<i>nodes, routes, noRecursion = False</i>) +<b>sort</b>(<i>nodes, routes, noRecursion=False</i>) <p> Function to sort widgets topographically. </p><p>
--- a/Documentation/Source/eric5.Graphics.ImportsDiagram.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.ImportsDiagram.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="ImportsDiagram.__init__" ID="ImportsDiagram.__init__"></a> <h4>ImportsDiagram (Constructor)</h4> -<b>ImportsDiagram</b>(<i>package, parent = None, name = None, showExternalImports = False</i>) +<b>ImportsDiagram</b>(<i>package, parent=None, name=None, showExternalImports=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.ModuleItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.ModuleItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="ModuleItem.__init__" ID="ModuleItem.__init__"></a> <h4>ModuleItem (Constructor)</h4> -<b>ModuleItem</b>(<i>model = None, x = 0, y = 0, rounded = False, parent = None, scene = None</i>) +<b>ModuleItem</b>(<i>model=None, x=0, y=0, rounded=False, parent=None, scene=None</i>) <p> Constructor </p><dl> @@ -110,7 +110,7 @@ Private method to create the text items of the module item. </p><a NAME="ModuleItem.paint" ID="ModuleItem.paint"></a> <h4>ModuleItem.paint</h4> -<b>paint</b>(<i>painter, option, widget = None</i>) +<b>paint</b>(<i>painter, option, widget=None</i>) <p> Public method to paint the item in local coordinates. </p><dl>
--- a/Documentation/Source/eric5.Graphics.PackageDiagram.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.PackageDiagram.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="PackageDiagram.__init__" ID="PackageDiagram.__init__"></a> <h4>PackageDiagram (Constructor)</h4> -<b>PackageDiagram</b>(<i>package, parent = None, name = None, noAttrs = False</i>) +<b>PackageDiagram</b>(<i>package, parent=None, name=None, noAttrs=False</i>) <p> Constructor </p><dl> @@ -125,7 +125,7 @@ </dd> </dl><a NAME="PackageDiagram.__addLocalClass" ID="PackageDiagram.__addLocalClass"></a> <h4>PackageDiagram.__addLocalClass</h4> -<b>__addLocalClass</b>(<i>className, _class, x, y, isRbModule = False</i>) +<b>__addLocalClass</b>(<i>className, _class, x, y, isRbModule=False</i>) <p> Private method to add a class defined in the module. </p><dl> @@ -147,7 +147,7 @@ </dd> </dl><a NAME="PackageDiagram.__arrangeClasses" ID="PackageDiagram.__arrangeClasses"></a> <h4>PackageDiagram.__arrangeClasses</h4> -<b>__arrangeClasses</b>(<i>nodes, routes, whiteSpaceFactor = 1.2</i>) +<b>__arrangeClasses</b>(<i>nodes, routes, whiteSpaceFactor=1.2</i>) <p> Private method to arrange the shapes on the canvas. </p><p>
--- a/Documentation/Source/eric5.Graphics.PackageItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.PackageItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="PackageItem.__init__" ID="PackageItem.__init__"></a> <h4>PackageItem (Constructor)</h4> -<b>PackageItem</b>(<i>model = None, x = 0, y = 0, rounded = False, noModules = False, parent = None, scene = None</i>) +<b>PackageItem</b>(<i>model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None</i>) <p> Constructor </p><dl> @@ -114,7 +114,7 @@ Private method to create the text items of the class item. </p><a NAME="PackageItem.paint" ID="PackageItem.paint"></a> <h4>PackageItem.paint</h4> -<b>paint</b>(<i>painter, option, widget = None</i>) +<b>paint</b>(<i>painter, option, widget=None</i>) <p> Public method to paint the item in local coordinates. </p><dl> @@ -170,7 +170,7 @@ </table> <a NAME="PackageModel.__init__" ID="PackageModel.__init__"></a> <h4>PackageModel (Constructor)</h4> -<b>PackageModel</b>(<i>name, moduleslist = []</i>) +<b>PackageModel</b>(<i>name, moduleslist=[]</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.PixmapDiagram.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.PixmapDiagram.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="PixmapDiagram.__init__" ID="PixmapDiagram.__init__"></a> <h4>PixmapDiagram (Constructor)</h4> -<b>PixmapDiagram</b>(<i>pixmap, parent = None, name = None</i>) +<b>PixmapDiagram</b>(<i>pixmap, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.SvgDiagram.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.SvgDiagram.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="SvgDiagram.__init__" ID="SvgDiagram.__init__"></a> <h4>SvgDiagram (Constructor)</h4> -<b>SvgDiagram</b>(<i>svgFile, parent = None, name = None</i>) +<b>SvgDiagram</b>(<i>svgFile, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.UMLClassDiagram.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.UMLClassDiagram.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="UMLClassDiagram.__init__" ID="UMLClassDiagram.__init__"></a> <h4>UMLClassDiagram (Constructor)</h4> -<b>UMLClassDiagram</b>(<i>file, parent = None, name = None, noAttrs = False</i>) +<b>UMLClassDiagram</b>(<i>file, parent=None, name=None, noAttrs=False</i>) <p> Constructor </p><dl> @@ -122,7 +122,7 @@ </dd> </dl><a NAME="UMLClassDiagram.__addLocalClass" ID="UMLClassDiagram.__addLocalClass"></a> <h4>UMLClassDiagram.__addLocalClass</h4> -<b>__addLocalClass</b>(<i>className, _class, x, y, isRbModule = False</i>) +<b>__addLocalClass</b>(<i>className, _class, x, y, isRbModule=False</i>) <p> Private method to add a class defined in the module. </p><dl> @@ -144,7 +144,7 @@ </dd> </dl><a NAME="UMLClassDiagram.__arrangeClasses" ID="UMLClassDiagram.__arrangeClasses"></a> <h4>UMLClassDiagram.__arrangeClasses</h4> -<b>__arrangeClasses</b>(<i>nodes, routes, whiteSpaceFactor = 1.2</i>) +<b>__arrangeClasses</b>(<i>nodes, routes, whiteSpaceFactor=1.2</i>) <p> Private method to arrange the shapes on the canvas. </p><p>
--- a/Documentation/Source/eric5.Graphics.UMLDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.UMLDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="UMLDialog.__init__" ID="UMLDialog.__init__"></a> <h4>UMLDialog (Constructor)</h4> -<b>UMLDialog</b>(<i>diagramName = "Unnamed", parent = None, name = None</i>) +<b>UMLDialog</b>(<i>diagramName="Unnamed", parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.UMLGraphicsView.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.UMLGraphicsView.html Fri Mar 11 16:51:57 2011 +0100 @@ -127,7 +127,7 @@ </table> <a NAME="UMLGraphicsView.__init__" ID="UMLGraphicsView.__init__"></a> <h4>UMLGraphicsView (Constructor)</h4> -<b>UMLGraphicsView</b>(<i>scene, diagramName = "Unnamed", parent = None, name = None</i>) +<b>UMLGraphicsView</b>(<i>scene, diagramName="Unnamed", parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.UMLItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.UMLItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="UMLItem.__init__" ID="UMLItem.__init__"></a> <h4>UMLItem (Constructor)</h4> -<b>UMLItem</b>(<i>x = 0, y = 0, rounded = False, parent = None</i>) +<b>UMLItem</b>(<i>x=0, y=0, rounded=False, parent=None</i>) <p> Constructor </p><dl> @@ -152,7 +152,7 @@ </dd> </dl><a NAME="UMLItem.paint" ID="UMLItem.paint"></a> <h4>UMLItem.paint</h4> -<b>paint</b>(<i>painter, option, widget = None</i>) +<b>paint</b>(<i>painter, option, widget=None</i>) <p> Public method to paint the item in local coordinates. </p><dl>
--- a/Documentation/Source/eric5.Graphics.UMLSceneSizeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.UMLSceneSizeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="UMLSceneSizeDialog.__init__" ID="UMLSceneSizeDialog.__init__"></a> <h4>UMLSceneSizeDialog (Constructor)</h4> -<b>UMLSceneSizeDialog</b>(<i>w, h, minW, minH, parent = None, name = None</i>) +<b>UMLSceneSizeDialog</b>(<i>w, h, minW, minH, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Graphics.ZoomDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Graphics.ZoomDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="ZoomDialog.__init__" ID="ZoomDialog.__init__"></a> <h4>ZoomDialog (Constructor)</h4> -<b>ZoomDialog</b>(<i>zoom, parent = None, name = None</i>) +<b>ZoomDialog</b>(<i>zoom, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockAccessHandler.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockAccessHandler.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="AdBlockAccessHandler.createRequest" ID="AdBlockAccessHandler.createRequest"></a> <h4>AdBlockAccessHandler.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="AdBlockBlockedNetworkReply.__init__" ID="AdBlockBlockedNetworkReply.__init__"></a> <h4>AdBlockBlockedNetworkReply (Constructor)</h4> -<b>AdBlockBlockedNetworkReply</b>(<i>request, rule, parent = None</i>) +<b>AdBlockBlockedNetworkReply</b>(<i>request, rule, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="AdBlockDialog.__init__" ID="AdBlockDialog.__init__"></a> <h4>AdBlockDialog (Constructor)</h4> -<b>AdBlockDialog</b>(<i>parent = None</i>) +<b>AdBlockDialog</b>(<i>parent=None</i>) <p> Constructor </p><a NAME="AdBlockDialog.__aboutToShowActionMenu" ID="AdBlockDialog.__aboutToShowActionMenu"></a> @@ -114,7 +114,7 @@ Private slot to update the selected subscription. </p><a NAME="AdBlockDialog.addCustomRule" ID="AdBlockDialog.addCustomRule"></a> <h4>AdBlockDialog.addCustomRule</h4> -<b>addCustomRule</b>(<i>rule = ""</i>) +<b>addCustomRule</b>(<i>rule=""</i>) <p> Public slot to add a custom AdBlock rule. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="AdBlockManager.__init__" ID="AdBlockManager.__init__"></a> <h4>AdBlockManager (Constructor)</h4> -<b>AdBlockManager</b>(<i>parent = None</i>) +<b>AdBlockManager</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="AdBlockModel.__init__" ID="AdBlockModel.__init__"></a> <h4>AdBlockModel (Constructor)</h4> -<b>AdBlockModel</b>(<i>parent = None</i>) +<b>AdBlockModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -117,7 +117,7 @@ Private slot to handle changes in rules. </p><a NAME="AdBlockModel.columnCount" ID="AdBlockModel.columnCount"></a> <h4>AdBlockModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -132,7 +132,7 @@ </dd> </dl><a NAME="AdBlockModel.data" ID="AdBlockModel.data"></a> <h4>AdBlockModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -165,7 +165,7 @@ </dd> </dl><a NAME="AdBlockModel.hasChildren" ID="AdBlockModel.hasChildren"></a> <h4>AdBlockModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check, if a parent node has some children. </p><dl> @@ -180,7 +180,7 @@ </dd> </dl><a NAME="AdBlockModel.headerData" ID="AdBlockModel.headerData"></a> <h4>AdBlockModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -201,7 +201,7 @@ </dd> </dl><a NAME="AdBlockModel.index" ID="AdBlockModel.index"></a> <h4>AdBlockModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to get a model index for a node cell. </p><dl> @@ -222,7 +222,7 @@ </dd> </dl><a NAME="AdBlockModel.parent" ID="AdBlockModel.parent"></a> <h4>AdBlockModel.parent</h4> -<b>parent</b>(<i>index = QModelIndex()</i>) +<b>parent</b>(<i>index=QModelIndex()</i>) <p> Public method to get the index of the parent node. </p><dl> @@ -237,7 +237,7 @@ </dd> </dl><a NAME="AdBlockModel.removeRows" ID="AdBlockModel.removeRows"></a> <h4>AdBlockModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove bookmarks from the model. </p><dl> @@ -258,7 +258,7 @@ </dd> </dl><a NAME="AdBlockModel.rowCount" ID="AdBlockModel.rowCount"></a> <h4>AdBlockModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl> @@ -288,7 +288,7 @@ </dd> </dl><a NAME="AdBlockModel.setData" ID="AdBlockModel.setData"></a> <h4>AdBlockModel.setData</h4> -<b>setData</b>(<i>index, value, role = Qt.EditRole</i>) +<b>setData</b>(<i>index, value, role=Qt.EditRole</i>) <p> Public method to set the data of a node cell. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockRule.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockRule.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="AdBlockRule.__init__" ID="AdBlockRule.__init__"></a> <h4>AdBlockRule (Constructor)</h4> -<b>AdBlockRule</b>(<i>filter = ""</i>) +<b>AdBlockRule</b>(<i>filter=""</i>) <p> Constructor </p><a NAME="AdBlockRule.__convertPatternToRegExp" ID="AdBlockRule.__convertPatternToRegExp"></a>
--- a/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockSubscription.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.AdBlock.AdBlockSubscription.html Fri Mar 11 16:51:57 2011 +0100 @@ -135,7 +135,7 @@ </table> <a NAME="AdBlockSubscription.__init__" ID="AdBlockSubscription.__init__"></a> <h4>AdBlockSubscription (Constructor)</h4> -<b>AdBlockSubscription</b>(<i>url, parent = None</i>) +<b>AdBlockSubscription</b>(<i>url, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.AddBookmarkDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.AddBookmarkDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="AddBookmarkDialog.__init__" ID="AddBookmarkDialog.__init__"></a> <h4>AddBookmarkDialog (Constructor)</h4> -<b>AddBookmarkDialog</b>(<i>parent = None, bookmarksManager = None</i>) +<b>AddBookmarkDialog</b>(<i>parent=None, bookmarksManager=None</i>) <p> Constructor </p><dl> @@ -235,7 +235,7 @@ </table> <a NAME="AddBookmarkProxyModel.__init__" ID="AddBookmarkProxyModel.__init__"></a> <h4>AddBookmarkProxyModel (Constructor)</h4> -<b>AddBookmarkProxyModel</b>(<i>parent = None</i>) +<b>AddBookmarkProxyModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -296,7 +296,7 @@ </dd> </dl><a NAME="AddBookmarkProxyModel.hasChildren" ID="AddBookmarkProxyModel.hasChildren"></a> <h4>AddBookmarkProxyModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check, if a parent node has some children. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarkNode.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarkNode.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="BookmarkNode.__init__" ID="BookmarkNode.__init__"></a> <h4>BookmarkNode (Constructor)</h4> -<b>BookmarkNode</b>(<i>type_ = Root, parent = None</i>) +<b>BookmarkNode</b>(<i>type_=Root, parent=None</i>) <p> Constructor </p><dl> @@ -91,7 +91,7 @@ </dd> </dl><a NAME="BookmarkNode.add" ID="BookmarkNode.add"></a> <h4>BookmarkNode.add</h4> -<b>add</b>(<i>child, offset = -1</i>) +<b>add</b>(<i>child, offset=-1</i>) <p> Public method to add/insert a child node. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="BookmarksDialog.__init__" ID="BookmarksDialog.__init__"></a> <h4>BookmarksDialog (Constructor)</h4> -<b>BookmarksDialog</b>(<i>parent = None, manager = None</i>) +<b>BookmarksDialog</b>(<i>parent=None, manager=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -145,7 +145,7 @@ </table> <a NAME="BookmarksManager.__init__" ID="BookmarksManager.__init__"></a> <h4>BookmarksManager (Constructor)</h4> -<b>BookmarksManager</b>(<i>parent = None</i>) +<b>BookmarksManager</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -196,7 +196,7 @@ </dd> </dl><a NAME="BookmarksManager.addBookmark" ID="BookmarksManager.addBookmark"></a> <h4>BookmarksManager.addBookmark</h4> -<b>addBookmark</b>(<i>parent, node, row = -1</i>) +<b>addBookmark</b>(<i>parent, node, row=-1</i>) <p> Public method to add a bookmark. </p><dl> @@ -212,7 +212,7 @@ </dd> </dl><a NAME="BookmarksManager.bookmarkForUrl" ID="BookmarksManager.bookmarkForUrl"></a> <h4>BookmarksManager.bookmarkForUrl</h4> -<b>bookmarkForUrl</b>(<i>url, start = StartRoot</i>) +<b>bookmarkForUrl</b>(<i>url, start=StartRoot</i>) <p> Public method to get a bookmark node for a given URL. </p><dl> @@ -241,7 +241,7 @@ </dd> </dl><a NAME="BookmarksManager.bookmarksForUrl" ID="BookmarksManager.bookmarksForUrl"></a> <h4>BookmarksManager.bookmarksForUrl</h4> -<b>bookmarksForUrl</b>(<i>url, start = StartRoot</i>) +<b>bookmarksForUrl</b>(<i>url, start=StartRoot</i>) <p> Public method to get a list of bookmark nodes for a given URL. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksMenu.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksMenu.html Fri Mar 11 16:51:57 2011 +0100 @@ -96,7 +96,7 @@ </table> <a NAME="BookmarksMenu.__init__" ID="BookmarksMenu.__init__"></a> <h4>BookmarksMenu (Constructor)</h4> -<b>BookmarksMenu</b>(<i>parent = None</i>) +<b>BookmarksMenu</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -188,7 +188,7 @@ </table> <a NAME="BookmarksMenuBarMenu.__init__" ID="BookmarksMenuBarMenu.__init__"></a> <h4>BookmarksMenuBarMenu (Constructor)</h4> -<b>BookmarksMenuBarMenu</b>(<i>parent = None</i>) +<b>BookmarksMenuBarMenu</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -120,7 +120,7 @@ </table> <a NAME="BookmarksModel.__init__" ID="BookmarksModel.__init__"></a> <h4>BookmarksModel (Constructor)</h4> -<b>BookmarksModel</b>(<i>manager, parent = None</i>) +<b>BookmarksModel</b>(<i>manager, parent=None</i>) <p> Constructor </p><dl> @@ -143,7 +143,7 @@ </dd> </dl><a NAME="BookmarksModel.columnCount" ID="BookmarksModel.columnCount"></a> <h4>BookmarksModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -158,7 +158,7 @@ </dd> </dl><a NAME="BookmarksModel.data" ID="BookmarksModel.data"></a> <h4>BookmarksModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -254,7 +254,7 @@ </dd> </dl><a NAME="BookmarksModel.hasChildren" ID="BookmarksModel.hasChildren"></a> <h4>BookmarksModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check, if a parent node has some children. </p><dl> @@ -269,7 +269,7 @@ </dd> </dl><a NAME="BookmarksModel.headerData" ID="BookmarksModel.headerData"></a> <h4>BookmarksModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -290,7 +290,7 @@ </dd> </dl><a NAME="BookmarksModel.index" ID="BookmarksModel.index"></a> <h4>BookmarksModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to get a model index for a node cell. </p><dl> @@ -366,7 +366,7 @@ </dd> </dl><a NAME="BookmarksModel.parent" ID="BookmarksModel.parent"></a> <h4>BookmarksModel.parent</h4> -<b>parent</b>(<i>index = QModelIndex()</i>) +<b>parent</b>(<i>index=QModelIndex()</i>) <p> Public method to get the index of the parent node. </p><dl> @@ -381,7 +381,7 @@ </dd> </dl><a NAME="BookmarksModel.removeRows" ID="BookmarksModel.removeRows"></a> <h4>BookmarksModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove bookmarks from the model. </p><dl> @@ -402,7 +402,7 @@ </dd> </dl><a NAME="BookmarksModel.rowCount" ID="BookmarksModel.rowCount"></a> <h4>BookmarksModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl> @@ -417,7 +417,7 @@ </dd> </dl><a NAME="BookmarksModel.setData" ID="BookmarksModel.setData"></a> <h4>BookmarksModel.setData</h4> -<b>setData</b>(<i>index, value, role = Qt.EditRole</i>) +<b>setData</b>(<i>index, value, role=Qt.EditRole</i>) <p> Public method to set the data of a node cell. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksToolBar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksToolBar.html Fri Mar 11 16:51:57 2011 +0100 @@ -96,7 +96,7 @@ </table> <a NAME="BookmarksToolBar.__init__" ID="BookmarksToolBar.__init__"></a> <h4>BookmarksToolBar (Constructor)</h4> -<b>BookmarksToolBar</b>(<i>model, parent = None</i>) +<b>BookmarksToolBar</b>(<i>model, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.CookieJar.CookieDetailsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.CookieJar.CookieDetailsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="CookieDetailsDialog.__init__" ID="CookieDetailsDialog.__init__"></a> <h4>CookieDetailsDialog (Constructor)</h4> -<b>CookieDetailsDialog</b>(<i>parent = None</i>) +<b>CookieDetailsDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.CookieJar.CookieExceptionsModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.CookieJar.CookieExceptionsModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="CookieExceptionsModel.__init__" ID="CookieExceptionsModel.__init__"></a> <h4>CookieExceptionsModel (Constructor)</h4> -<b>CookieExceptionsModel</b>(<i>cookieJar, parent = None</i>) +<b>CookieExceptionsModel</b>(<i>cookieJar, parent=None</i>) <p> Constructor </p><dl> @@ -127,7 +127,7 @@ </dd> </dl><a NAME="CookieExceptionsModel.columnCount" ID="CookieExceptionsModel.columnCount"></a> <h4>CookieExceptionsModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns of the model. </p><dl> @@ -181,7 +181,7 @@ </dd> </dl><a NAME="CookieExceptionsModel.removeRows" ID="CookieExceptionsModel.removeRows"></a> <h4>CookieExceptionsModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove entries from the model. </p><dl> @@ -202,7 +202,7 @@ </dd> </dl><a NAME="CookieExceptionsModel.rowCount" ID="CookieExceptionsModel.rowCount"></a> <h4>CookieExceptionsModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of rows of the model. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.CookieJar.CookieJar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.CookieJar.CookieJar.html Fri Mar 11 16:51:57 2011 +0100 @@ -141,7 +141,7 @@ </table> <a NAME="CookieJar.__init__" ID="CookieJar.__init__"></a> <h4>CookieJar (Constructor)</h4> -<b>CookieJar</b>(<i>parent = None</i>) +<b>CookieJar</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.CookieJar.CookieModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.CookieJar.CookieModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="CookieModel.__init__" ID="CookieModel.__init__"></a> <h4>CookieModel (Constructor)</h4> -<b>CookieModel</b>(<i>cookieJar, parent = None</i>) +<b>CookieModel</b>(<i>cookieJar, parent=None</i>) <p> Constructor </p><dl> @@ -96,7 +96,7 @@ Private slot handling changes of the cookies list in the cookie jar. </p><a NAME="CookieModel.columnCount" ID="CookieModel.columnCount"></a> <h4>CookieModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns of the model. </p><dl> @@ -150,7 +150,7 @@ </dd> </dl><a NAME="CookieModel.removeRows" ID="CookieModel.removeRows"></a> <h4>CookieModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove entries from the model. </p><dl> @@ -171,7 +171,7 @@ </dd> </dl><a NAME="CookieModel.rowCount" ID="CookieModel.rowCount"></a> <h4>CookieModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of rows of the model. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.CookieJar.CookiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.CookieJar.CookiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="CookiesDialog.__init__" ID="CookiesDialog.__init__"></a> <h4>CookiesDialog (Constructor)</h4> -<b>CookiesDialog</b>(<i>cookieJar, parent = None</i>) +<b>CookiesDialog</b>(<i>cookieJar, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.CookieJar.CookiesExceptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="CookiesExceptionsDialog.__init__" ID="CookiesExceptionsDialog.__init__"></a> <h4>CookiesExceptionsDialog (Constructor)</h4> -<b>CookiesExceptionsDialog</b>(<i>cookieJar, parent = None</i>) +<b>CookiesExceptionsDialog</b>(<i>cookieJar, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Download.DownloadItem.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Download.DownloadItem.html Fri Mar 11 16:51:57 2011 +0100 @@ -168,7 +168,7 @@ </table> <a NAME="DownloadItem.__init__" ID="DownloadItem.__init__"></a> <h4>DownloadItem (Constructor)</h4> -<b>DownloadItem</b>(<i>reply = None, requestFilename = False, webPage = None, download = False, parent = None</i>) +<b>DownloadItem</b>(<i>reply=None, requestFilename=False, webPage=None, download=False, parent=None</i>) <p> Constructor </p><dl> @@ -219,7 +219,7 @@ </dd> </dl><a NAME="DownloadItem.__initialize" ID="DownloadItem.__initialize"></a> <h4>DownloadItem.__initialize</h4> -<b>__initialize</b>(<i>tryAgain = False</i>) +<b>__initialize</b>(<i>tryAgain=False</i>) <p> Private method to (re)initialize the widget. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Download.DownloadManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Download.DownloadManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -153,7 +153,7 @@ </table> <a NAME="DownloadManager.__init__" ID="DownloadManager.__init__"></a> <h4>DownloadManager (Constructor)</h4> -<b>DownloadManager</b>(<i>parent = None</i>) +<b>DownloadManager</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -253,7 +253,7 @@ Private method to update the count label. </p><a NAME="DownloadManager.__updateRow" ID="DownloadManager.__updateRow"></a> <h4>DownloadManager.__updateRow</h4> -<b>__updateRow</b>(<i>itm = None</i>) +<b>__updateRow</b>(<i>itm=None</i>) <p> Private slot to update a download item. </p><dl> @@ -303,7 +303,7 @@ </dd> </dl><a NAME="DownloadManager.download" ID="DownloadManager.download"></a> <h4>DownloadManager.download</h4> -<b>download</b>(<i>requestOrUrl, requestFileName = False</i>) +<b>download</b>(<i>requestOrUrl, requestFileName=False</i>) <p> Public method to download a file. </p><dl> @@ -338,7 +338,7 @@ </dd> </dl><a NAME="DownloadManager.handleUnsupportedContent" ID="DownloadManager.handleUnsupportedContent"></a> <h4>DownloadManager.handleUnsupportedContent</h4> -<b>handleUnsupportedContent</b>(<i>reply, requestFileName = False, webPage = None, download = False</i>) +<b>handleUnsupportedContent</b>(<i>reply, requestFileName=False, webPage=None, download=False</i>) <a NAME="DownloadManager.on_cleanupButton_clicked" ID="DownloadManager.on_cleanupButton_clicked"></a> <h4>DownloadManager.on_cleanupButton_clicked</h4> <b>on_cleanupButton_clicked</b>(<i></i>) @@ -378,7 +378,7 @@ <dt><i>policy</i></dt> <dd> policy to be set - (DownloadManager.RemoveExit, DownloadManager.RemoveNever, + (DownloadManager.RemoveExit, DownloadManager.RemoveNever, DownloadManager.RemoveSuccessFullDownload) </dd> </dl><a NAME="DownloadManager.shutdown" ID="DownloadManager.shutdown"></a>
--- a/Documentation/Source/eric5.Helpviewer.Download.DownloadModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Download.DownloadModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="DownloadModel.__init__" ID="DownloadModel.__init__"></a> <h4>DownloadModel (Constructor)</h4> -<b>DownloadModel</b>(<i>manager, parent = None</i>) +<b>DownloadModel</b>(<i>manager, parent=None</i>) <p> Constructor </p><dl> @@ -136,7 +136,7 @@ </dd> </dl><a NAME="DownloadModel.removeRows" ID="DownloadModel.removeRows"></a> <h4>DownloadModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove bookmarks from the model. </p><dl> @@ -157,7 +157,7 @@ </dd> </dl><a NAME="DownloadModel.rowCount" ID="DownloadModel.rowCount"></a> <h4>DownloadModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of rows of the model. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpBrowserWV.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpBrowserWV.html Fri Mar 11 16:51:57 2011 +0100 @@ -252,7 +252,7 @@ </table> <a NAME="HelpBrowser.__init__" ID="HelpBrowser.__init__"></a> <h4>HelpBrowser (Constructor)</h4> -<b>HelpBrowser</b>(<i>mainWindow, parent = None, name = ""</i>) +<b>HelpBrowser</b>(<i>mainWindow, parent=None, name=""</i>) <p> Constructor </p><dl> @@ -268,7 +268,7 @@ </dd> </dl><a NAME="HelpBrowser.__addExternalBinding" ID="HelpBrowser.__addExternalBinding"></a> <h4>HelpBrowser.__addExternalBinding</h4> -<b>__addExternalBinding</b>(<i>frame = None</i>) +<b>__addExternalBinding</b>(<i>frame=None</i>) <p> Private slot to add javascript bindings for adding search providers. </p><dl> @@ -447,7 +447,7 @@ </dd> </dl><a NAME="HelpBrowser.__unsupportedContent" ID="HelpBrowser.__unsupportedContent"></a> <h4>HelpBrowser.__unsupportedContent</h4> -<b>__unsupportedContent</b>(<i>reply, requestFilename = None, download = False</i>) +<b>__unsupportedContent</b>(<i>reply, requestFilename=None, download=False</i>) <p> Private slot to handle the unsupportedContent signal. </p><dl> @@ -628,7 +628,7 @@ </dd> </dl><a NAME="HelpBrowser.linkedResources" ID="HelpBrowser.linkedResources"></a> <h4>HelpBrowser.linkedResources</h4> -<b>linkedResources</b>(<i>relation = ""</i>) +<b>linkedResources</b>(<i>relation=""</i>) <p> Public method to extract linked resources. </p><dl> @@ -762,7 +762,7 @@ </table> <a NAME="HelpWebPage.__init__" ID="HelpWebPage.__init__"></a> <h4>HelpWebPage (Constructor)</h4> -<b>HelpWebPage</b>(<i>parent = None</i>) +<b>HelpWebPage</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -886,7 +886,7 @@ </dd> </dl><a NAME="HelpWebPage.userAgent" ID="HelpWebPage.userAgent"></a> <h4>HelpWebPage.userAgent</h4> -<b>userAgent</b>(<i>resolveEmpty = False</i>) +<b>userAgent</b>(<i>resolveEmpty=False</i>) <p> Public method to get the current user agent setting. </p><dl> @@ -947,7 +947,7 @@ </table> <a NAME="JavaScriptEricObject.__init__" ID="JavaScriptEricObject.__init__"></a> <h4>JavaScriptEricObject (Constructor)</h4> -<b>JavaScriptEricObject</b>(<i>mw, parent = None</i>) +<b>JavaScriptEricObject</b>(<i>mw, parent=None</i>) <p> Constructor </p><dl> @@ -1024,7 +1024,7 @@ </table> <a NAME="JavaScriptExternalObject.__init__" ID="JavaScriptExternalObject.__init__"></a> <h4>JavaScriptExternalObject (Constructor)</h4> -<b>JavaScriptExternalObject</b>(<i>mw, parent = None</i>) +<b>JavaScriptExternalObject</b>(<i>mw, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpClearPrivateDataDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpClearPrivateDataDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="HelpClearPrivateDataDialog.__init__" ID="HelpClearPrivateDataDialog.__init__"></a> <h4>HelpClearPrivateDataDialog (Constructor)</h4> -<b>HelpClearPrivateDataDialog</b>(<i>parent = None</i>) +<b>HelpClearPrivateDataDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -80,7 +80,7 @@ <dt>Returns:</dt> <dd> tuple of flags indicating which data to clear (browsing history, - search history, favicons, disk cache, cookies, passwords, web + search history, favicons, disk cache, cookies, passwords, web databases, downloads) (list of boolean) </dd> </dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpIndexWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpIndexWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -91,7 +91,7 @@ </table> <a NAME="HelpIndexWidget.__init__" ID="HelpIndexWidget.__init__"></a> <h4>HelpIndexWidget (Constructor)</h4> -<b>HelpIndexWidget</b>(<i>engine, mainWindow, parent = None</i>) +<b>HelpIndexWidget</b>(<i>engine, mainWindow, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpLanguagesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpLanguagesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="HelpLanguagesDialog.__init__" ID="HelpLanguagesDialog.__init__"></a> <h4>HelpLanguagesDialog (Constructor)</h4> -<b>HelpLanguagesDialog</b>(<i>parent = None</i>) +<b>HelpLanguagesDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpSearchWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpSearchWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="HelpSearchWidget.__init__" ID="HelpSearchWidget.__init__"></a> <h4>HelpSearchWidget (Constructor)</h4> -<b>HelpSearchWidget</b>(<i>engine, mainWindow, parent = None</i>) +<b>HelpSearchWidget</b>(<i>engine, mainWindow, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpTabBar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpTabBar.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="HelpTabBar.__init__" ID="HelpTabBar.__init__"></a> <h4>HelpTabBar (Constructor)</h4> -<b>HelpTabBar</b>(<i>parent = None</i>) +<b>HelpTabBar</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -97,7 +97,7 @@ <p> Protected method to handle event. </p><p> - This event handler just handles the tooltip event and passes the + This event handler just handles the tooltip event and passes the handling of all others to the superclass. </p><dl> <dt><i>evt</i></dt>
--- a/Documentation/Source/eric5.Helpviewer.HelpTabWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpTabWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -203,7 +203,7 @@ </dd> </dl><a NAME="HelpTabWidget.__elide" ID="HelpTabWidget.__elide"></a> <h4>HelpTabWidget.__elide</h4> -<b>__elide</b>(<i>txt, mode = Qt.ElideRight, length = 40</i>) +<b>__elide</b>(<i>txt, mode=Qt.ElideRight, length=40</i>) <p> Private method to elide some text. </p><dl> @@ -477,7 +477,7 @@ </dd> </dl><a NAME="HelpTabWidget.newBrowser" ID="HelpTabWidget.newBrowser"></a> <h4>HelpTabWidget.newBrowser</h4> -<b>newBrowser</b>(<i>link = None</i>) +<b>newBrowser</b>(<i>link=None</i>) <p> Public method to create a new web browser tab. </p><dl> @@ -492,7 +492,7 @@ Public slot to handle a change of preferences. </p><a NAME="HelpTabWidget.printBrowser" ID="HelpTabWidget.printBrowser"></a> <h4>HelpTabWidget.printBrowser</h4> -<b>printBrowser</b>(<i>browser = None</i>) +<b>printBrowser</b>(<i>browser=None</i>) <p> Public slot called to print the displayed page. </p><dl> @@ -502,7 +502,7 @@ </dd> </dl><a NAME="HelpTabWidget.printBrowserPdf" ID="HelpTabWidget.printBrowserPdf"></a> <h4>HelpTabWidget.printBrowserPdf</h4> -<b>printBrowserPdf</b>(<i>browser = None</i>) +<b>printBrowserPdf</b>(<i>browser=None</i>) <p> Public slot called to print the displayed page to PDF. </p><dl> @@ -512,7 +512,7 @@ </dd> </dl><a NAME="HelpTabWidget.printPreviewBrowser" ID="HelpTabWidget.printPreviewBrowser"></a> <h4>HelpTabWidget.printPreviewBrowser</h4> -<b>printPreviewBrowser</b>(<i>browser = None</i>) +<b>printPreviewBrowser</b>(<i>browser=None</i>) <p> Public slot called to show a print preview of the displayed file. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpTocWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpTocWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="HelpTocWidget.__init__" ID="HelpTocWidget.__init__"></a> <h4>HelpTocWidget (Constructor)</h4> -<b>HelpTocWidget</b>(<i>engine, mainWindow, parent = None</i>) +<b>HelpTocWidget</b>(<i>engine, mainWindow, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpWebSearchWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpWebSearchWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -123,7 +123,7 @@ </table> <a NAME="HelpWebSearchWidget.__init__" ID="HelpWebSearchWidget.__init__"></a> <h4>HelpWebSearchWidget (Constructor)</h4> -<b>HelpWebSearchWidget</b>(<i>parent = None</i>) +<b>HelpWebSearchWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.HelpWindow.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.HelpWindow.html Fri Mar 11 16:51:57 2011 +0100 @@ -388,7 +388,7 @@ </table> <a NAME="HelpWindow.__init__" ID="HelpWindow.__init__"></a> <h4>HelpWindow (Constructor)</h4> -<b>HelpWindow</b>(<i>home, path, parent, name, fromEric = False, initShortcutsOnly = False, searchWord = None</i>) +<b>HelpWindow</b>(<i>home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None</i>) <p> Constructor </p><dl> @@ -695,7 +695,7 @@ Private slot to search for a word. </p><a NAME="HelpWindow.__setIconDatabasePath" ID="HelpWindow.__setIconDatabasePath"></a> <h4>HelpWindow.__setIconDatabasePath</h4> -<b>__setIconDatabasePath</b>(<i>enable = True</i>) +<b>__setIconDatabasePath</b>(<i>enable=True</i>) <p> Private method to set the favicons path. </p><dl> @@ -1058,7 +1058,7 @@ </dd> </dl><a NAME="HelpWindow.newTab" ID="HelpWindow.newTab"></a> <h4>HelpWindow.newTab</h4> -<b>newTab</b>(<i>link = None</i>) +<b>newTab</b>(<i>link=None</i>) <p> Public slot called to open a new help window tab. </p><dl> @@ -1068,7 +1068,7 @@ </dd> </dl><a NAME="HelpWindow.newWindow" ID="HelpWindow.newWindow"></a> <h4>HelpWindow.newWindow</h4> -<b>newWindow</b>(<i>link = None</i>) +<b>newWindow</b>(<i>link=None</i>) <p> Public slot called to open a new help browser dialog. </p><dl> @@ -1104,7 +1104,7 @@ <h4>HelpWindow.openUrlNewTab</h4> <b>openUrlNewTab</b>(<i>url, title</i>) <p> - Public slot to load a URL from the bookmarks menu or bookmarks toolbar + Public slot to load a URL from the bookmarks menu or bookmarks toolbar in a new tab. </p><dl> <dt><i>url</i></dt>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryCompleter.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryCompleter.html Fri Mar 11 16:51:57 2011 +0100 @@ -73,7 +73,7 @@ </table> <a NAME="HistoryCompleter.__init__" ID="HistoryCompleter.__init__"></a> <h4>HistoryCompleter (Constructor)</h4> -<b>HistoryCompleter</b>(<i>model, parent = None</i>) +<b>HistoryCompleter</b>(<i>model, parent=None</i>) <p> Constructor </p><dl> @@ -164,7 +164,7 @@ </table> <a NAME="HistoryCompletionModel.__init__" ID="HistoryCompletionModel.__init__"></a> <h4>HistoryCompletionModel (Constructor)</h4> -<b>HistoryCompletionModel</b>(<i>parent = None</i>) +<b>HistoryCompletionModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -174,7 +174,7 @@ </dd> </dl><a NAME="HistoryCompletionModel.data" ID="HistoryCompletionModel.data"></a> <h4>HistoryCompletionModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -224,7 +224,7 @@ <p> Protected method used to sort the displayed items. </p><p> - It implements a special sorting function based on the history entry's + It implements a special sorting function based on the history entry's frequency giving a bonus to hits that match on a word boundary so that e.g. "dot.python-projects.org" is a better result for typing "dot" than "slashdot.org". However, it only looks for the string in the host name, @@ -303,7 +303,7 @@ </table> <a NAME="HistoryCompletionView.__init__" ID="HistoryCompletionView.__init__"></a> <h4>HistoryCompletionView (Constructor)</h4> -<b>HistoryCompletionView</b>(<i>parent = None</i>) +<b>HistoryCompletionView</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -90,7 +90,7 @@ </table> <a NAME="HistoryDialog.__init__" ID="HistoryDialog.__init__"></a> <h4>HistoryDialog (Constructor)</h4> -<b>HistoryDialog</b>(<i>parent = None, manager = None</i>) +<b>HistoryDialog</b>(<i>parent=None, manager=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryFilterModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryFilterModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="HistoryData.__init__" ID="HistoryData.__init__"></a> <h4>HistoryData (Constructor)</h4> -<b>HistoryData</b>(<i>offset, frequency = 0</i>) +<b>HistoryData</b>(<i>offset, frequency=0</i>) <p> Constructor </p><dl> @@ -101,7 +101,7 @@ <p> Special method determining less relation. </p><p> - Note: Like the actual history entries the index mapping is sorted in reverse + Note: Like the actual history entries the index mapping is sorted in reverse order by offset </p><dl> <dt><i>other</i></dt> @@ -194,7 +194,7 @@ </table> <a NAME="HistoryFilterModel.__init__" ID="HistoryFilterModel.__init__"></a> <h4>HistoryFilterModel (Constructor)</h4> -<b>HistoryFilterModel</b>(<i>sourceModel, parent = None</i>) +<b>HistoryFilterModel</b>(<i>sourceModel, parent=None</i>) <p> Constructor </p><dl> @@ -277,7 +277,7 @@ </dd> </dl><a NAME="HistoryFilterModel.columnCount" ID="HistoryFilterModel.columnCount"></a> <h4>HistoryFilterModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -292,7 +292,7 @@ </dd> </dl><a NAME="HistoryFilterModel.data" ID="HistoryFilterModel.data"></a> <h4>HistoryFilterModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -310,7 +310,7 @@ </dd> </dl><a NAME="HistoryFilterModel.headerData" ID="HistoryFilterModel.headerData"></a> <h4>HistoryFilterModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -361,7 +361,7 @@ </dd> </dl><a NAME="HistoryFilterModel.index" ID="HistoryFilterModel.index"></a> <h4>HistoryFilterModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to create an index. </p><dl> @@ -432,7 +432,7 @@ Public method to recalculate the frequencies. </p><a NAME="HistoryFilterModel.removeRows" ID="HistoryFilterModel.removeRows"></a> <h4>HistoryFilterModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove entries from the model. </p><dl> @@ -453,7 +453,7 @@ </dd> </dl><a NAME="HistoryFilterModel.rowCount" ID="HistoryFilterModel.rowCount"></a> <h4>HistoryFilterModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="HistoryEntry.__init__" ID="HistoryEntry.__init__"></a> <h4>HistoryEntry (Constructor)</h4> -<b>HistoryEntry</b>(<i>url = None, dateTime = None, title = None</i>) +<b>HistoryEntry</b>(<i>url=None, dateTime=None, title=None</i>) <p> Constructor </p><dl> @@ -232,7 +232,7 @@ </table> <a NAME="HistoryManager.__init__" ID="HistoryManager.__init__"></a> <h4>HistoryManager (Constructor)</h4> -<b>HistoryManager</b>(<i>parent = None</i>) +<b>HistoryManager</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -372,7 +372,7 @@ Public method to indicate a change of preferences. </p><a NAME="HistoryManager.removeHistoryEntry" ID="HistoryManager.removeHistoryEntry"></a> <h4>HistoryManager.removeHistoryEntry</h4> -<b>removeHistoryEntry</b>(<i>url, title = ""</i>) +<b>removeHistoryEntry</b>(<i>url, title=""</i>) <p> Public method to remove a history entry. </p><dl> @@ -400,7 +400,7 @@ </dd> </dl><a NAME="HistoryManager.setHistory" ID="HistoryManager.setHistory"></a> <h4>HistoryManager.setHistory</h4> -<b>setHistory</b>(<i>history, loadedAndSorted = False</i>) +<b>setHistory</b>(<i>history, loadedAndSorted=False</i>) <p> Public method to set a new history. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryMenu.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryMenu.html Fri Mar 11 16:51:57 2011 +0100 @@ -90,7 +90,7 @@ </table> <a NAME="HistoryMenu.__init__" ID="HistoryMenu.__init__"></a> <h4>HistoryMenu (Constructor)</h4> -<b>HistoryMenu</b>(<i>parent = None</i>) +<b>HistoryMenu</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -192,7 +192,7 @@ </table> <a NAME="HistoryMenuModel.__init__" ID="HistoryMenuModel.__init__"></a> <h4>HistoryMenuModel (Constructor)</h4> -<b>HistoryMenuModel</b>(<i>sourceModel, parent = None</i>) +<b>HistoryMenuModel</b>(<i>sourceModel, parent=None</i>) <p> Constructor </p><dl> @@ -215,7 +215,7 @@ </dd> </dl><a NAME="HistoryMenuModel.columnCount" ID="HistoryMenuModel.columnCount"></a> <h4>HistoryMenuModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -230,7 +230,7 @@ </dd> </dl><a NAME="HistoryMenuModel.index" ID="HistoryMenuModel.index"></a> <h4>HistoryMenuModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to create an index. </p><dl> @@ -311,7 +311,7 @@ </dd> </dl><a NAME="HistoryMenuModel.rowCount" ID="HistoryMenuModel.rowCount"></a> <h4>HistoryMenuModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="HistoryModel.__init__" ID="HistoryModel.__init__"></a> <h4>HistoryModel (Constructor)</h4> -<b>HistoryModel</b>(<i>historyManager, parent = None</i>) +<b>HistoryModel</b>(<i>historyManager, parent=None</i>) <p> Constructor </p><dl> @@ -97,7 +97,7 @@ </dd> </dl><a NAME="HistoryModel.columnCount" ID="HistoryModel.columnCount"></a> <h4>HistoryModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -112,7 +112,7 @@ </dd> </dl><a NAME="HistoryModel.data" ID="HistoryModel.data"></a> <h4>HistoryModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -145,7 +145,7 @@ </dd> </dl><a NAME="HistoryModel.headerData" ID="HistoryModel.headerData"></a> <h4>HistoryModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -171,7 +171,7 @@ Public slot to reset the model. </p><a NAME="HistoryModel.removeRows" ID="HistoryModel.removeRows"></a> <h4>HistoryModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove history entries from the model. </p><dl> @@ -192,7 +192,7 @@ </dd> </dl><a NAME="HistoryModel.rowCount" ID="HistoryModel.rowCount"></a> <h4>HistoryModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.History.HistoryTreeModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.History.HistoryTreeModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="HistoryTreeModel.__init__" ID="HistoryTreeModel.__init__"></a> <h4>HistoryTreeModel (Constructor)</h4> -<b>HistoryTreeModel</b>(<i>sourceModel, parent = None</i>) +<b>HistoryTreeModel</b>(<i>sourceModel, parent=None</i>) <p> Constructor </p><dl> @@ -123,7 +123,7 @@ <h4>HistoryTreeModel.__sourceDateRow</h4> <b>__sourceDateRow</b>(<i>row</i>) <p> - Private method to translate the top level date row into the offset + Private method to translate the top level date row into the offset where that date starts. </p><dl> <dt><i>row</i></dt> @@ -174,7 +174,7 @@ </dd> </dl><a NAME="HistoryTreeModel.columnCount" ID="HistoryTreeModel.columnCount"></a> <h4>HistoryTreeModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -189,7 +189,7 @@ </dd> </dl><a NAME="HistoryTreeModel.data" ID="HistoryTreeModel.data"></a> <h4>HistoryTreeModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -222,7 +222,7 @@ </dd> </dl><a NAME="HistoryTreeModel.hasChildren" ID="HistoryTreeModel.hasChildren"></a> <h4>HistoryTreeModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check, if an entry has some children. </p><dl> @@ -237,7 +237,7 @@ </dd> </dl><a NAME="HistoryTreeModel.headerData" ID="HistoryTreeModel.headerData"></a> <h4>HistoryTreeModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -258,7 +258,7 @@ </dd> </dl><a NAME="HistoryTreeModel.index" ID="HistoryTreeModel.index"></a> <h4>HistoryTreeModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to create an index. </p><dl> @@ -324,7 +324,7 @@ </dd> </dl><a NAME="HistoryTreeModel.removeRows" ID="HistoryTreeModel.removeRows"></a> <h4>HistoryTreeModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove entries from the model. </p><dl> @@ -345,7 +345,7 @@ </dd> </dl><a NAME="HistoryTreeModel.rowCount" ID="HistoryTreeModel.rowCount"></a> <h4>HistoryTreeModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.AboutAccessHandler.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.AboutAccessHandler.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="AboutAccessHandler.createRequest" ID="AboutAccessHandler.createRequest"></a> <h4>AboutAccessHandler.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.FtpAccessHandler.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.FtpAccessHandler.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="FtpAccessHandler.createRequest" ID="FtpAccessHandler.createRequest"></a> <h4>FtpAccessHandler.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.FtpReply.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.FtpReply.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="FtpReply.__init__" ID="FtpReply.__init__"></a> <h4>FtpReply (Constructor)</h4> -<b>FtpReply</b>(<i>url, parent = None</i>) +<b>FtpReply</b>(<i>url, parent=None</i>) <p> Constructor </p><dl> @@ -127,7 +127,7 @@ Private slot to start the FTP process by connecting to the host. </p><a NAME="FtpReply.__cssLinkClass" ID="FtpReply.__cssLinkClass"></a> <h4>FtpReply.__cssLinkClass</h4> -<b>__cssLinkClass</b>(<i>icon, size = 32</i>) +<b>__cssLinkClass</b>(<i>icon, size=32</i>) <p> Private method to generate a link class with an icon. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.NetworkAccessManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.NetworkAccessManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="NetworkAccessManager.__init__" ID="NetworkAccessManager.__init__"></a> <h4>NetworkAccessManager (Constructor)</h4> -<b>NetworkAccessManager</b>(<i>engine, parent = None</i>) +<b>NetworkAccessManager</b>(<i>engine, parent=None</i>) <p> Constructor </p><dl> @@ -162,7 +162,7 @@ </dd> </dl><a NAME="NetworkAccessManager.createRequest" ID="NetworkAccessManager.createRequest"></a> <h4>NetworkAccessManager.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.NetworkAccessManagerProxy.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.NetworkAccessManagerProxy.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="NetworkAccessManagerProxy.__init__" ID="NetworkAccessManagerProxy.__init__"></a> <h4>NetworkAccessManagerProxy (Constructor)</h4> -<b>NetworkAccessManagerProxy</b>(<i>parent = None</i>) +<b>NetworkAccessManagerProxy</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -79,7 +79,7 @@ </dd> </dl><a NAME="NetworkAccessManagerProxy.createRequest" ID="NetworkAccessManagerProxy.createRequest"></a> <h4>NetworkAccessManagerProxy.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.NetworkProtocolUnknownErrorReply.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.NetworkProtocolUnknownErrorReply.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="NetworkProtocolUnknownErrorReply.__init__" ID="NetworkProtocolUnknownErrorReply.__init__"></a> <h4>NetworkProtocolUnknownErrorReply (Constructor)</h4> -<b>NetworkProtocolUnknownErrorReply</b>(<i>protocol, parent = None</i>) +<b>NetworkProtocolUnknownErrorReply</b>(<i>protocol, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.NetworkReply.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.NetworkReply.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="NetworkReply.__init__" ID="NetworkReply.__init__"></a> <h4>NetworkReply (Constructor)</h4> -<b>NetworkReply</b>(<i>request, fileData, mimeType, parent = None</i>) +<b>NetworkReply</b>(<i>request, fileData, mimeType, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.PyrcAccessHandler.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.PyrcAccessHandler.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="PyrcAccessHandler.createRequest" ID="PyrcAccessHandler.createRequest"></a> <h4>PyrcAccessHandler.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.QtHelpAccessHandler.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.QtHelpAccessHandler.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="QtHelpAccessHandler.__init__" ID="QtHelpAccessHandler.__init__"></a> <h4>QtHelpAccessHandler (Constructor)</h4> -<b>QtHelpAccessHandler</b>(<i>engine, parent = None</i>) +<b>QtHelpAccessHandler</b>(<i>engine, parent=None</i>) <p> Constructor </p><dl> @@ -89,7 +89,7 @@ </dd> </dl><a NAME="QtHelpAccessHandler.createRequest" ID="QtHelpAccessHandler.createRequest"></a> <h4>QtHelpAccessHandler.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Network.SchemeAccessHandler.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Network.SchemeAccessHandler.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SchemeAccessHandler.__init__" ID="SchemeAccessHandler.__init__"></a> <h4>SchemeAccessHandler (Constructor)</h4> -<b>SchemeAccessHandler</b>(<i>parent = None</i>) +<b>SchemeAccessHandler</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -73,7 +73,7 @@ </dd> </dl><a NAME="SchemeAccessHandler.createRequest" ID="SchemeAccessHandler.createRequest"></a> <h4>SchemeAccessHandler.createRequest</h4> -<b>createRequest</b>(<i>op, request, outgoingData = None</i>) +<b>createRequest</b>(<i>op, request, outgoingData=None</i>) <p> Protected method to create a request. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="OfflineStorageConfigDialog.__init__" ID="OfflineStorageConfigDialog.__init__"></a> <h4>OfflineStorageConfigDialog (Constructor)</h4> -<b>OfflineStorageConfigDialog</b>(<i>parent = None</i>) +<b>OfflineStorageConfigDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OfflineStorage.WebDatabasesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OfflineStorage.WebDatabasesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="WebDatabasesDialog.__init__" ID="WebDatabasesDialog.__init__"></a> <h4>WebDatabasesDialog (Constructor)</h4> -<b>WebDatabasesDialog</b>(<i>parent = None</i>) +<b>WebDatabasesDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OfflineStorage.WebDatabasesModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OfflineStorage.WebDatabasesModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="WebDatabasesModel.__init__" ID="WebDatabasesModel.__init__"></a> <h4>WebDatabasesModel (Constructor)</h4> -<b>WebDatabasesModel</b>(<i>parent = None</i>) +<b>WebDatabasesModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -112,7 +112,7 @@ </dd> </dl><a NAME="WebDatabasesModel.columnCount" ID="WebDatabasesModel.columnCount"></a> <h4>WebDatabasesModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns. </p><dl> @@ -127,7 +127,7 @@ </dd> </dl><a NAME="WebDatabasesModel.data" ID="WebDatabasesModel.data"></a> <h4>WebDatabasesModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -145,7 +145,7 @@ </dd> </dl><a NAME="WebDatabasesModel.hasChildren" ID="WebDatabasesModel.hasChildren"></a> <h4>WebDatabasesModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check, if a parent node has some children. </p><dl> @@ -160,7 +160,7 @@ </dd> </dl><a NAME="WebDatabasesModel.headerData" ID="WebDatabasesModel.headerData"></a> <h4>WebDatabasesModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -181,7 +181,7 @@ </dd> </dl><a NAME="WebDatabasesModel.index" ID="WebDatabasesModel.index"></a> <h4>WebDatabasesModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to get a model index for an entry. </p><dl> @@ -202,7 +202,7 @@ </dd> </dl><a NAME="WebDatabasesModel.parent" ID="WebDatabasesModel.parent"></a> <h4>WebDatabasesModel.parent</h4> -<b>parent</b>(<i>index = QModelIndex()</i>) +<b>parent</b>(<i>index=QModelIndex()</i>) <p> Public method to get the index of the parent entry. </p><dl> @@ -217,7 +217,7 @@ </dd> </dl><a NAME="WebDatabasesModel.removeRows" ID="WebDatabasesModel.removeRows"></a> <h4>WebDatabasesModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove databases from the model. </p><dl> @@ -238,7 +238,7 @@ </dd> </dl><a NAME="WebDatabasesModel.rowCount" ID="WebDatabasesModel.rowCount"></a> <h4>WebDatabasesModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to determine the number of rows. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="OpenSearchDialog.__init__" ID="OpenSearchDialog.__init__"></a> <h4>OpenSearchDialog (Constructor)</h4> -<b>OpenSearchDialog</b>(<i>parent = None</i>) +<b>OpenSearchDialog</b>(<i>parent=None</i>) <p> Constructor </p><a NAME="OpenSearchDialog.__selectionChanged" ID="OpenSearchDialog.__selectionChanged"></a>
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEditDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="OpenSearchEditDialog.__init__" ID="OpenSearchEditDialog.__init__"></a> <h4>OpenSearchEditDialog (Constructor)</h4> -<b>OpenSearchEditDialog</b>(<i>engine, parent = None</i>) +<b>OpenSearchEditDialog</b>(<i>engine, parent=None</i>) <p> Constructor </p><a NAME="OpenSearchEditDialog.accept" ID="OpenSearchEditDialog.accept"></a>
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngine.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngine.html Fri Mar 11 16:51:57 2011 +0100 @@ -172,7 +172,7 @@ </table> <a NAME="OpenSearchEngine.__init__" ID="OpenSearchEngine.__init__"></a> <h4>OpenSearchEngine (Constructor)</h4> -<b>OpenSearchEngine</b>(<i>parent = None</i>) +<b>OpenSearchEngine</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngineAction.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngineAction.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="OpenSearchEngineAction.__init__" ID="OpenSearchEngineAction.__init__"></a> <h4>OpenSearchEngineAction (Constructor)</h4> -<b>OpenSearchEngineAction</b>(<i>engine, parent = None</i>) +<b>OpenSearchEngineAction</b>(<i>engine, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchEngineModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="OpenSearchEngineModel.__init__" ID="OpenSearchEngineModel.__init__"></a> <h4>OpenSearchEngineModel (Constructor)</h4> -<b>OpenSearchEngineModel</b>(<i>manager, parent = None</i>) +<b>OpenSearchEngineModel</b>(<i>manager, parent=None</i>) <p> Constructor </p><dl> @@ -102,7 +102,7 @@ Private slot handling a change of the registered engines. </p><a NAME="OpenSearchEngineModel.columnCount" ID="OpenSearchEngineModel.columnCount"></a> <h4>OpenSearchEngineModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns of the model. </p><dl> @@ -150,7 +150,7 @@ </dd> </dl><a NAME="OpenSearchEngineModel.headerData" ID="OpenSearchEngineModel.headerData"></a> <h4>OpenSearchEngineModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -171,7 +171,7 @@ </dd> </dl><a NAME="OpenSearchEngineModel.removeRows" ID="OpenSearchEngineModel.removeRows"></a> <h4>OpenSearchEngineModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove entries from the model. </p><dl> @@ -192,7 +192,7 @@ </dd> </dl><a NAME="OpenSearchEngineModel.rowCount" ID="OpenSearchEngineModel.rowCount"></a> <h4>OpenSearchEngineModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of rows of the model. </p><dl> @@ -207,7 +207,7 @@ </dd> </dl><a NAME="OpenSearchEngineModel.setData" ID="OpenSearchEngineModel.setData"></a> <h4>OpenSearchEngineModel.setData</h4> -<b>setData</b>(<i>index, value, role = Qt.EditRole</i>) +<b>setData</b>(<i>index, value, role=Qt.EditRole</i>) <p> Public method to set the data of a model cell. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.OpenSearch.OpenSearchManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -157,7 +157,7 @@ </table> <a NAME="OpenSearchManager.__init__" ID="OpenSearchManager.__init__"></a> <h4>OpenSearchManager (Constructor)</h4> -<b>OpenSearchManager</b>(<i>parent = None</i>) +<b>OpenSearchManager</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Passwords.PasswordManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Passwords.PasswordManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -192,7 +192,7 @@ </table> <a NAME="PasswordManager.__init__" ID="PasswordManager.__init__"></a> <h4>PasswordManager (Constructor)</h4> -<b>PasswordManager</b>(<i>parent = None</i>) +<b>PasswordManager</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -238,7 +238,7 @@ </dd> </dl><a NAME="PasswordManager.__findForm" ID="PasswordManager.__findForm"></a> <h4>PasswordManager.__findForm</h4> -<b>__findForm</b>(<i>webPage, data, boundary = None</i>) +<b>__findForm</b>(<i>webPage, data, boundary=None</i>) <p> Private method to find the form used for logging in. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Passwords.PasswordModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Passwords.PasswordModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="PasswordModel.__init__" ID="PasswordModel.__init__"></a> <h4>PasswordModel (Constructor)</h4> -<b>PasswordModel</b>(<i>manager, parent = None</i>) +<b>PasswordModel</b>(<i>manager, parent=None</i>) <p> Constructor </p><dl> @@ -102,7 +102,7 @@ Private slot handling a change of the registered passwords. </p><a NAME="PasswordModel.columnCount" ID="PasswordModel.columnCount"></a> <h4>PasswordModel.columnCount</h4> -<b>columnCount</b>(<i>parent = QModelIndex()</i>) +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of columns of the model. </p><dl> @@ -135,7 +135,7 @@ </dd> </dl><a NAME="PasswordModel.headerData" ID="PasswordModel.headerData"></a> <h4>PasswordModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -156,7 +156,7 @@ </dd> </dl><a NAME="PasswordModel.removeRows" ID="PasswordModel.removeRows"></a> <h4>PasswordModel.removeRows</h4> -<b>removeRows</b>(<i>row, count, parent = QModelIndex()</i>) +<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>) <p> Public method to remove entries from the model. </p><dl> @@ -177,7 +177,7 @@ </dd> </dl><a NAME="PasswordModel.rowCount" ID="PasswordModel.rowCount"></a> <h4>PasswordModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of rows of the model. </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.Passwords.PasswordsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.Passwords.PasswordsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="PasswordsDialog.__init__" ID="PasswordsDialog.__init__"></a> <h4>PasswordsDialog (Constructor)</h4> -<b>PasswordsDialog</b>(<i>parent = None</i>) +<b>PasswordsDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.QtHelpFiltersDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.QtHelpFiltersDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="QtHelpFiltersDialog.__init__" ID="QtHelpFiltersDialog.__init__"></a> <h4>QtHelpFiltersDialog (Constructor)</h4> -<b>QtHelpFiltersDialog</b>(<i>engine, parent = None</i>) +<b>QtHelpFiltersDialog</b>(<i>engine, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.SearchWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.SearchWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="SearchWidget.__init__" ID="SearchWidget.__init__"></a> <h4>SearchWidget (Constructor)</h4> -<b>SearchWidget</b>(<i>mainWindow, parent = None</i>) +<b>SearchWidget</b>(<i>mainWindow, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.SslCertificatesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.SslCertificatesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -114,7 +114,7 @@ </table> <a NAME="SslCertificatesDialog.__init__" ID="SslCertificatesDialog.__init__"></a> <h4>SslCertificatesDialog (Constructor)</h4> -<b>SslCertificatesDialog</b>(<i>parent = None</i>) +<b>SslCertificatesDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -197,7 +197,7 @@ <h4>SslCertificatesDialog.on_caCertificatesTree_currentItemChanged</h4> <b>on_caCertificatesTree_currentItemChanged</b>(<i>current, previous</i>) <p> - Private slot handling a change of the current item + Private slot handling a change of the current item in the CA certificates list. </p><dl> <dt><i>current</i></dt>
--- a/Documentation/Source/eric5.Helpviewer.SslInfoDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.SslInfoDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="SslInfoDialog.__init__" ID="SslInfoDialog.__init__"></a> <h4>SslInfoDialog (Constructor)</h4> -<b>SslInfoDialog</b>(<i>certificate, parent = None</i>) +<b>SslInfoDialog</b>(<i>certificate, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.UrlBar.BookmarkInfoDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.UrlBar.BookmarkInfoDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="BookmarkInfoDialog.__init__" ID="BookmarkInfoDialog.__init__"></a> <h4>BookmarkInfoDialog (Constructor)</h4> -<b>BookmarkInfoDialog</b>(<i>bookmark, parent = None</i>) +<b>BookmarkInfoDialog</b>(<i>bookmark, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.UrlBar.FavIconLabel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.UrlBar.FavIconLabel.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="FavIconLabel.__init__" ID="FavIconLabel.__init__"></a> <h4>FavIconLabel (Constructor)</h4> -<b>FavIconLabel</b>(<i>parent = None</i>) +<b>FavIconLabel</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.UrlBar.SslLabel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.UrlBar.SslLabel.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SslLabel.__init__" ID="SslLabel.__init__"></a> <h4>SslLabel (Constructor)</h4> -<b>SslLabel</b>(<i>parent = None</i>) +<b>SslLabel</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.UrlBar.StackedUrlBar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.UrlBar.StackedUrlBar.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="StackedUrlBar.__init__" ID="StackedUrlBar.__init__"></a> <h4>StackedUrlBar (Constructor)</h4> -<b>StackedUrlBar</b>(<i>parent = None</i>) +<b>StackedUrlBar</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.UrlBar.UrlBar.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.UrlBar.UrlBar.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="UrlBar.__init__" ID="UrlBar.__init__"></a> <h4>UrlBar (Constructor)</h4> -<b>UrlBar</b>(<i>mainWindow, parent = None</i>) +<b>UrlBar</b>(<i>mainWindow, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Helpviewer.UserAgent.UserAgentMenu.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Helpviewer.UserAgent.UserAgentMenu.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="UserAgentMenu.__init__" ID="UserAgentMenu.__init__"></a> <h4>UserAgentMenu (Constructor)</h4> -<b>UserAgentMenu</b>(<i>title, parent = None</i>) +<b>UserAgentMenu</b>(<i>title, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.IconEditor.IconEditorGrid.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.IconEditor.IconEditorGrid.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="IconEditCommand.__init__" ID="IconEditCommand.__init__"></a> <h4>IconEditCommand (Constructor)</h4> -<b>IconEditCommand</b>(<i>grid, text, oldImage, parent = None</i>) +<b>IconEditCommand</b>(<i>grid, text, oldImage, parent=None</i>) <p> Constructor </p><dl> @@ -325,7 +325,7 @@ </table> <a NAME="IconEditorGrid.__init__" ID="IconEditorGrid.__init__"></a> <h4>IconEditorGrid (Constructor)</h4> -<b>IconEditorGrid</b>(<i>parent = None</i>) +<b>IconEditorGrid</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -362,7 +362,7 @@ </dd> </dl><a NAME="IconEditorGrid.__drawFlood" ID="IconEditorGrid.__drawFlood"></a> <h4>IconEditorGrid.__drawFlood</h4> -<b>__drawFlood</b>(<i>i, j, oldColor, doUpdate = True</i>) +<b>__drawFlood</b>(<i>i, j, oldColor, doUpdate=True</i>) <p> Private method to perform a flood fill operation. </p><dl> @@ -590,7 +590,7 @@ Public slot to generate a new, empty image. </p><a NAME="IconEditorGrid.editPaste" ID="IconEditorGrid.editPaste"></a> <h4>IconEditorGrid.editPaste</h4> -<b>editPaste</b>(<i>pasting = False</i>) +<b>editPaste</b>(<i>pasting=False</i>) <p> Public slot to paste an image from the clipboard. </p><dl> @@ -750,7 +750,7 @@ </dd> </dl><a NAME="IconEditorGrid.setDirty" ID="IconEditorGrid.setDirty"></a> <h4>IconEditorGrid.setDirty</h4> -<b>setDirty</b>(<i>dirty, setCleanState = False</i>) +<b>setDirty</b>(<i>dirty, setCleanState=False</i>) <p> Public slot to set the dirty flag. </p><dl> @@ -773,7 +773,7 @@ </dd> </dl><a NAME="IconEditorGrid.setIconImage" ID="IconEditorGrid.setIconImage"></a> <h4>IconEditorGrid.setIconImage</h4> -<b>setIconImage</b>(<i>newImage, undoRedo = False, clearUndo = False</i>) +<b>setIconImage</b>(<i>newImage, undoRedo=False, clearUndo=False</i>) <p> Public method to set a new icon image. </p><dl>
--- a/Documentation/Source/eric5.IconEditor.IconEditorPalette.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.IconEditor.IconEditorPalette.html Fri Mar 11 16:51:57 2011 +0100 @@ -88,7 +88,7 @@ </table> <a NAME="IconEditorPalette.__init__" ID="IconEditorPalette.__init__"></a> <h4>IconEditorPalette (Constructor)</h4> -<b>IconEditorPalette</b>(<i>parent = None</i>) +<b>IconEditorPalette</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.IconEditor.IconEditorWindow.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.IconEditor.IconEditorWindow.html Fri Mar 11 16:51:57 2011 +0100 @@ -171,7 +171,7 @@ </table> <a NAME="IconEditorWindow.__init__" ID="IconEditorWindow.__init__"></a> <h4>IconEditorWindow (Constructor)</h4> -<b>IconEditorWindow</b>(<i>fileName = "", parent = None, fromEric = False, initShortcutsOnly = False</i>) +<b>IconEditorWindow</b>(<i>fileName="", parent=None, fromEric=False, initShortcutsOnly=False</i>) <p> Constructor </p><dl> @@ -289,7 +289,7 @@ <h4>IconEditorWindow.__modificationChanged</h4> <b>__modificationChanged</b>(<i>m</i>) <p> - Private slot to handle the modificationChanged signal. + Private slot to handle the modificationChanged signal. </p><dl> <dt><i>m</i></dt> <dd>
--- a/Documentation/Source/eric5.IconEditor.IconSizeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.IconEditor.IconSizeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="IconSizeDialog.__init__" ID="IconSizeDialog.__init__"></a> <h4>IconSizeDialog (Constructor)</h4> -<b>IconSizeDialog</b>(<i>width, height, parent = None</i>) +<b>IconSizeDialog</b>(<i>width, height, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.IconEditor.IconZoomDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.IconEditor.IconZoomDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="IconZoomDialog.__init__" ID="IconZoomDialog.__init__"></a> <h4>IconZoomDialog (Constructor)</h4> -<b>IconZoomDialog</b>(<i>zoom, parent = None</i>) +<b>IconZoomDialog</b>(<i>zoom, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.MultiProject.AddProjectDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.MultiProject.AddProjectDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="AddProjectDialog.__init__" ID="AddProjectDialog.__init__"></a> <h4>AddProjectDialog (Constructor)</h4> -<b>AddProjectDialog</b>(<i>parent = None, startdir = None, project = None</i>) +<b>AddProjectDialog</b>(<i>parent=None, startdir=None, project=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.MultiProject.MultiProject.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.MultiProject.MultiProject.html Fri Mar 11 16:51:57 2011 +0100 @@ -218,7 +218,7 @@ </table> <a NAME="MultiProject.__init__" ID="MultiProject.__init__"></a> <h4>MultiProject (Constructor)</h4> -<b>MultiProject</b>(<i>project, parent = None, filename = None</i>) +<b>MultiProject</b>(<i>project, parent=None, filename=None</i>) <p> Constructor </p><dl> @@ -236,7 +236,7 @@ <h4>MultiProject.__checkFilesExist</h4> <b>__checkFilesExist</b>(<i></i>) <p> - Private method to check, if the files in a list exist. + Private method to check, if the files in a list exist. </p><p> The project files are checked for existance in the filesystem. Non existant projects are removed from the list and the @@ -266,7 +266,7 @@ the multi project object with the data entered. </p><a NAME="MultiProject.__openMasterProject" ID="MultiProject.__openMasterProject"></a> <h4>MultiProject.__openMasterProject</h4> -<b>__openMasterProject</b>(<i>reopen = True</i>) +<b>__openMasterProject</b>(<i>reopen=True</i>) <p> Public slot to open the master project. </p><dl> @@ -279,7 +279,7 @@ <h4>MultiProject.__openRecent</h4> <b>__openRecent</b>(<i>act</i>) <p> - Private method to open a multi project from the list of rencently + Private method to open a multi project from the list of rencently opened multi projects. </p><dl> <dt><i>act</i></dt> @@ -329,7 +329,7 @@ with the central store. </p><a NAME="MultiProject.__writeMultiProject" ID="MultiProject.__writeMultiProject"></a> <h4>MultiProject.__writeMultiProject</h4> -<b>__writeMultiProject</b>(<i>fn = None</i>) +<b>__writeMultiProject</b>(<i>fn=None</i>) <p> Private method to save the multi project infos to a multi project file. </p><dl> @@ -358,7 +358,7 @@ </dd> </dl><a NAME="MultiProject.addProject" ID="MultiProject.addProject"></a> <h4>MultiProject.addProject</h4> -<b>addProject</b>(<i>startdir = None</i>) +<b>addProject</b>(<i>startdir=None</i>) <p> Public slot used to add files to the project. </p><dl> @@ -548,7 +548,7 @@ </dd> </dl><a NAME="MultiProject.openMultiProject" ID="MultiProject.openMultiProject"></a> <h4>MultiProject.openMultiProject</h4> -<b>openMultiProject</b>(<i>fn = None, openMaster = True</i>) +<b>openMultiProject</b>(<i>fn=None, openMaster=True</i>) <p> Public slot to open a multi project. </p><dl>
--- a/Documentation/Source/eric5.MultiProject.MultiProjectBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.MultiProject.MultiProjectBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="MultiProjectBrowser.__init__" ID="MultiProjectBrowser.__init__"></a> <h4>MultiProjectBrowser (Constructor)</h4> -<b>MultiProjectBrowser</b>(<i>multiProject, parent = None</i>) +<b>MultiProjectBrowser</b>(<i>multiProject, parent=None</i>) <p> Constructor </p><dl> @@ -181,7 +181,7 @@ Private slot to handle the creation of a new multi project. </p><a NAME="MultiProjectBrowser.__openItem" ID="MultiProjectBrowser.__openItem"></a> <h4>MultiProjectBrowser.__openItem</h4> -<b>__openItem</b>(<i>itm = None</i>) +<b>__openItem</b>(<i>itm=None</i>) <p> Private slot to open a project. </p><dl>
--- a/Documentation/Source/eric5.MultiProject.PropertiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.MultiProject.PropertiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="PropertiesDialog.__init__" ID="PropertiesDialog.__init__"></a> <h4>PropertiesDialog (Constructor)</h4> -<b>PropertiesDialog</b>(<i>multiProject, new = True, parent = None</i>) +<b>PropertiesDialog</b>(<i>multiProject, new=True, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PluginManager.PluginDetailsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginDetailsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="PluginDetailsDialog.__init__" ID="PluginDetailsDialog.__init__"></a> <h4>PluginDetailsDialog (Constructor)</h4> -<b>PluginDetailsDialog</b>(<i>details, parent = None</i>) +<b>PluginDetailsDialog</b>(<i>details, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PluginManager.PluginExceptions.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginExceptions.html Fri Mar 11 16:51:57 2011 +0100 @@ -290,7 +290,7 @@ </table> <a NAME="PluginPathError.__init__" ID="PluginPathError.__init__"></a> <h4>PluginPathError (Constructor)</h4> -<b>PluginPathError</b>(<i>msg = None</i>) +<b>PluginPathError</b>(<i>msg=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PluginManager.PluginInfoDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginInfoDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="PluginInfoDialog.__init__" ID="PluginInfoDialog.__init__"></a> <h4>PluginInfoDialog (Constructor)</h4> -<b>PluginInfoDialog</b>(<i>pluginManager, parent = None</i>) +<b>PluginInfoDialog</b>(<i>pluginManager, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PluginManager.PluginInstallDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginInstallDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="PluginInstallDialog.__init__" ID="PluginInstallDialog.__init__"></a> <h4>PluginInstallDialog (Constructor)</h4> -<b>PluginInstallDialog</b>(<i>pluginManager, pluginFileNames, parent = None</i>) +<b>PluginInstallDialog</b>(<i>pluginManager, pluginFileNames, parent=None</i>) <p> Constructor </p><dl> @@ -153,7 +153,7 @@ </table> <a NAME="PluginInstallWidget.__init__" ID="PluginInstallWidget.__init__"></a> <h4>PluginInstallWidget (Constructor)</h4> -<b>PluginInstallWidget</b>(<i>pluginManager, pluginFileNames, parent = None</i>) +<b>PluginInstallWidget</b>(<i>pluginManager, pluginFileNames, parent=None</i>) <p> Constructor </p><dl> @@ -208,7 +208,7 @@ </dd> </dl><a NAME="PluginInstallWidget.__makedirs" ID="PluginInstallWidget.__makedirs"></a> <h4>PluginInstallWidget.__makedirs</h4> -<b>__makedirs</b>(<i>name, mode = 0o777</i>) +<b>__makedirs</b>(<i>name, mode=0o777</i>) <p> Private method to create a directory and all intermediate ones. </p><p> @@ -302,7 +302,7 @@ </table> <a NAME="PluginInstallWindow.__init__" ID="PluginInstallWindow.__init__"></a> <h4>PluginInstallWindow (Constructor)</h4> -<b>PluginInstallWindow</b>(<i>pluginFileNames, parent = None</i>) +<b>PluginInstallWindow</b>(<i>pluginFileNames, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PluginManager.PluginManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -188,13 +188,13 @@ </table> <a NAME="PluginManager.__init__" ID="PluginManager.__init__"></a> <h4>PluginManager (Constructor)</h4> -<b>PluginManager</b>(<i>parent = None, doLoadPlugins = True, develPlugin = None</i>) +<b>PluginManager</b>(<i>parent=None, doLoadPlugins=True, develPlugin=None</i>) <p> Constructor </p><p> The Plugin Manager deals with three different plugin directories. The first is the one, that is part of eric5 (eric5/Plugins). The - second one is the global plugin directory called 'eric5plugins', + second one is the global plugin directory called 'eric5plugins', which is located inside the site-packages directory. The last one is the user plugin directory located inside the .eric5 directory of the users home directory. @@ -300,7 +300,7 @@ </dd> </dl><a NAME="PluginManager.activatePlugin" ID="PluginManager.activatePlugin"></a> <h4>PluginManager.activatePlugin</h4> -<b>activatePlugin</b>(<i>name, onDemand = False</i>) +<b>activatePlugin</b>(<i>name, onDemand=False</i>) <p> Public method to activate a plugin. </p><dl> @@ -325,7 +325,7 @@ set to True. </p><a NAME="PluginManager.deactivatePlugin" ID="PluginManager.deactivatePlugin"></a> <h4>PluginManager.deactivatePlugin</h4> -<b>deactivatePlugin</b>(<i>name, onDemand = False</i>) +<b>deactivatePlugin</b>(<i>name, onDemand=False</i>) <p> Public method to deactivate a plugin. </p><dl> @@ -385,12 +385,12 @@ <dd>filename of the pixmap to be shown next to the display string</dd> <dt>page creation function</dt> <dd>plugin module function to be called to create the configuration - page. The page must be subclasses from + page. The page must be subclasses from Preferences.ConfigurationPages.ConfigurationPageBase and must implement a method called 'save' to save the settings. A parent entry will be created in the selection list, if this value is None.</dd> <dt>parent key</dt> - <dd>dictionary key of the parent entry or None, if this defines a + <dd>dictionary key of the parent entry or None, if this defines a toplevel entry.</dd> <dt>reference to configuration page</dt> <dd>This will be used by the configuration dialog and must always be None</dd> @@ -456,7 +456,7 @@ <li>versionCommand - commandline parameter for the exe (string)</li> <li>versionStartsWith - indicator for the output line containing the version (string)</li> - <li>versionPosition - number of element containing the + <li>versionPosition - number of element containing the version (integer)</li> <li>version - version to be used as default (string)</li> <li>versionCleanup - tuple of two integers giving string positions @@ -480,7 +480,7 @@ <dt>Returns:</dt> <dd> list of tuples giving module name (string), plugin name (string), - version (string), autoactivate (boolean), active (boolean), + version (string), autoactivate (boolean), active (boolean), short description (string), error flag (boolean) </dd> </dl><a NAME="PluginManager.getPluginModules" ID="PluginManager.getPluginModules"></a> @@ -500,7 +500,7 @@ </dd> </dl><a NAME="PluginManager.getPluginObject" ID="PluginManager.getPluginObject"></a> <h4>PluginManager.getPluginObject</h4> -<b>getPluginObject</b>(<i>type_, typename, maybeActive = False</i>) +<b>getPluginObject</b>(<i>type_, typename, maybeActive=False</i>) <p> Public method to activate an ondemand plugin given by type and typename. </p><dl> @@ -616,7 +616,7 @@ </dd> </dl><a NAME="PluginManager.loadPlugin" ID="PluginManager.loadPlugin"></a> <h4>PluginManager.loadPlugin</h4> -<b>loadPlugin</b>(<i>name, directory, reload_ = False</i>) +<b>loadPlugin</b>(<i>name, directory, reload_=False</i>) <p> Public method to load a plugin module. </p><p>
--- a/Documentation/Source/eric5.PluginManager.PluginRepositoryDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginRepositoryDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="PluginRepositoryDialog.__init__" ID="PluginRepositoryDialog.__init__"></a> <h4>PluginRepositoryDialog (Constructor)</h4> -<b>PluginRepositoryDialog</b>(<i>parent = None</i>) +<b>PluginRepositoryDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -187,7 +187,7 @@ </table> <a NAME="PluginRepositoryWidget.__init__" ID="PluginRepositoryWidget.__init__"></a> <h4>PluginRepositoryWidget (Constructor)</h4> -<b>PluginRepositoryWidget</b>(<i>parent = None</i>) +<b>PluginRepositoryWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -202,7 +202,7 @@ Private slot to cancel the current download. </p><a NAME="PluginRepositoryWidget.__downloadFile" ID="PluginRepositoryWidget.__downloadFile"></a> <h4>PluginRepositoryWidget.__downloadFile</h4> -<b>__downloadFile</b>(<i>url, filename, doneMethod = None</i>) +<b>__downloadFile</b>(<i>url, filename, doneMethod=None</i>) <p> Private slot to download the given file. </p><dl> @@ -437,7 +437,7 @@ </table> <a NAME="PluginRepositoryWindow.__init__" ID="PluginRepositoryWindow.__init__"></a> <h4>PluginRepositoryWindow (Constructor)</h4> -<b>PluginRepositoryWindow</b>(<i>parent = None</i>) +<b>PluginRepositoryWindow</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PluginManager.PluginUninstallDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PluginManager.PluginUninstallDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="PluginUninstallDialog.__init__" ID="PluginUninstallDialog.__init__"></a> <h4>PluginUninstallDialog (Constructor)</h4> -<b>PluginUninstallDialog</b>(<i>pluginManager, parent = None</i>) +<b>PluginUninstallDialog</b>(<i>pluginManager, parent=None</i>) <p> Constructor </p><dl> @@ -109,7 +109,7 @@ </table> <a NAME="PluginUninstallWidget.__init__" ID="PluginUninstallWidget.__init__"></a> <h4>PluginUninstallWidget (Constructor)</h4> -<b>PluginUninstallWidget</b>(<i>pluginManager, parent = None</i>) +<b>PluginUninstallWidget</b>(<i>pluginManager, parent=None</i>) <p> Constructor </p><dl> @@ -169,7 +169,7 @@ </table> <a NAME="PluginUninstallWindow.__init__" ID="PluginUninstallWindow.__init__"></a> <h4>PluginUninstallWindow (Constructor)</h4> -<b>PluginUninstallWindow</b>(<i>parent = None</i>) +<b>PluginUninstallWindow</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.AboutPlugin.AboutDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.AboutPlugin.AboutDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -60,7 +60,7 @@ </table> <a NAME="AboutDialog.__init__" ID="AboutDialog.__init__"></a> <h4>AboutDialog (Constructor)</h4> -<b>AboutDialog</b>(<i>parent = None</i>) +<b>AboutDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8CodeSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="Pep8CodeSelectionDialog.__init__" ID="Pep8CodeSelectionDialog.__init__"></a> <h4>Pep8CodeSelectionDialog (Constructor)</h4> -<b>Pep8CodeSelectionDialog</b>(<i>codes, showFixCodes, parent = None</i>) +<b>Pep8CodeSelectionDialog</b>(<i>codes, showFixCodes, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8Dialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -114,7 +114,7 @@ </table> <a NAME="Pep8Dialog.__init__" ID="Pep8Dialog.__init__"></a> <h4>Pep8Dialog (Constructor)</h4> -<b>Pep8Dialog</b>(<i>parent = None</i>) +<b>Pep8Dialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -216,7 +216,7 @@ <h4>Pep8Dialog.on_resultList_itemActivated</h4> <b>on_resultList_itemActivated</b>(<i>item, column</i>) <p> - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. </p><dl> <dt><i>item</i></dt> <dd> @@ -261,7 +261,7 @@ </dd> </dl><a NAME="Pep8Dialog.start" ID="Pep8Dialog.start"></a> <h4>Pep8Dialog.start</h4> -<b>start</b>(<i>fn, save = False, repeat = None</i>) +<b>start</b>(<i>fn, save=False, repeat=None</i>) <p> Public slot to start the PEP 8 check. </p><dl>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8StatisticsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Pep8.Pep8StatisticsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -64,7 +64,7 @@ </table> <a NAME="Pep8StatisticsDialog.__init__" ID="Pep8StatisticsDialog.__init__"></a> <h4>Pep8StatisticsDialog (Constructor)</h4> -<b>Pep8StatisticsDialog</b>(<i>statistics, parent = None</i>) +<b>Pep8StatisticsDialog</b>(<i>statistics, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -90,7 +90,7 @@ </table> <a NAME="SyntaxCheckerDialog.__init__" ID="SyntaxCheckerDialog.__init__"></a> <h4>SyntaxCheckerDialog (Constructor)</h4> -<b>SyntaxCheckerDialog</b>(<i>parent = None</i>) +<b>SyntaxCheckerDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -105,7 +105,7 @@ Private method to clear all error markers of open editors. </p><a NAME="SyntaxCheckerDialog.__createResultItem" ID="SyntaxCheckerDialog.__createResultItem"></a> <h4>SyntaxCheckerDialog.__createResultItem</h4> -<b>__createResultItem</b>(<i>file, line, index, error, sourcecode, isWarning = False</i>) +<b>__createResultItem</b>(<i>file, line, index, error, sourcecode, isWarning=False</i>) <p> Private method to create an entry in the result list. </p><dl> @@ -153,7 +153,7 @@ <h4>SyntaxCheckerDialog.on_resultList_itemActivated</h4> <b>on_resultList_itemActivated</b>(<i>itm, col</i>) <p> - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. </p><dl> <dt><i>itm</i></dt> <dd> @@ -187,7 +187,7 @@ </dd> </dl><a NAME="SyntaxCheckerDialog.start" ID="SyntaxCheckerDialog.start"></a> <h4>SyntaxCheckerDialog.start</h4> -<b>start</b>(<i>fn, codestring = ""</i>) +<b>start</b>(<i>fn, codestring=""</i>) <p> Public slot to start the syntax check. </p><dl>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html Fri Mar 11 16:51:57 2011 +0100 @@ -226,7 +226,7 @@ <h4>Whitespace.less</h4> <b>less</b>(<i>other</i>) <p> - Method to compare the indentation level against another Whitespace objects to + Method to compare the indentation level against another Whitespace objects to be smaller. </p><dl> <dt><i>other</i></dt> @@ -292,7 +292,7 @@ <hr /><hr /> <a NAME="check" ID="check"></a> <h2>check</h2> -<b>check</b>(<i>file, text = ""</i>) +<b>check</b>(<i>file, text=""</i>) <p> Private function to check one Python source file for whitespace related problems. </p><dl>
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="TabnannyDialog.__init__" ID="TabnannyDialog.__init__"></a> <h4>TabnannyDialog (Constructor)</h4> -<b>TabnannyDialog</b>(<i>parent = None</i>) +<b>TabnannyDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -153,7 +153,7 @@ <h4>TabnannyDialog.on_resultList_itemActivated</h4> <b>on_resultList_itemActivated</b>(<i>itm, col</i>) <p> - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. </p><dl> <dt><i>itm</i></dt> <dd>
--- a/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericapi.EricapiConfigDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="EricapiConfigDialog.__init__" ID="EricapiConfigDialog.__init__"></a> <h4>EricapiConfigDialog (Constructor)</h4> -<b>EricapiConfigDialog</b>(<i>project, parms = None, parent = None</i>) +<b>EricapiConfigDialog</b>(<i>project, parms=None, parent=None</i>) <p> Constructor </p><dl> @@ -102,7 +102,7 @@ <h4>EricapiConfigDialog.__initializeDefaults</h4> <b>__initializeDefaults</b>(<i></i>) <p> - Private method to set the default values. + Private method to set the default values. </p><p> These are needed later on to generate the commandline parameters. @@ -110,7 +110,7 @@ <h4>EricapiConfigDialog.accept</h4> <b>accept</b>(<i></i>) <p> - Protected slot called by the Ok button. + Protected slot called by the Ok button. </p><p> It saves the values in the parameters dictionary. </p><a NAME="EricapiConfigDialog.generateParameters" ID="EricapiConfigDialog.generateParameters"></a>
--- a/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericapi.EricapiExecDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericapi.EricapiExecDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="EricapiExecDialog.__init__" ID="EricapiExecDialog.__init__"></a> <h4>EricapiExecDialog (Constructor)</h4> -<b>EricapiExecDialog</b>(<i>cmdname, parent = None</i>) +<b>EricapiExecDialog</b>(<i>cmdname, parent=None</i>) <p> Constructor </p><dl> @@ -101,7 +101,7 @@ <h4>EricapiExecDialog.__readStderr</h4> <b>__readStderr</b>(<i></i>) <p> - Private slot to handle the readyReadStandardError signal. + Private slot to handle the readyReadStandardError signal. </p><p> It reads the error output of the process and inserts it into the error pane. @@ -109,7 +109,7 @@ <h4>EricapiExecDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process, formats it and inserts it into the contents pane.
--- a/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocConfigDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -132,7 +132,7 @@ </table> <a NAME="EricdocConfigDialog.__init__" ID="EricdocConfigDialog.__init__"></a> <h4>EricdocConfigDialog (Constructor)</h4> -<b>EricdocConfigDialog</b>(<i>project, parms = None, parent = None</i>) +<b>EricdocConfigDialog</b>(<i>project, parms=None, parent=None</i>) <p> Constructor </p><dl> @@ -155,7 +155,7 @@ <h4>EricdocConfigDialog.__initializeDefaults</h4> <b>__initializeDefaults</b>(<i></i>) <p> - Private method to set the default values. + Private method to set the default values. </p><p> These are needed later on to generate the commandline parameters. @@ -173,7 +173,7 @@ <h4>EricdocConfigDialog.accept</h4> <b>accept</b>(<i></i>) <p> - Protected slot called by the Ok button. + Protected slot called by the Ok button. </p><p> It saves the values in the parameters dictionary. </p><a NAME="EricdocConfigDialog.generateParameters" ID="EricdocConfigDialog.generateParameters"></a>
--- a/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocExecDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.DocumentationPlugins.Ericdoc.EricdocExecDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="EricdocExecDialog.__init__" ID="EricdocExecDialog.__init__"></a> <h4>EricdocExecDialog (Constructor)</h4> -<b>EricdocExecDialog</b>(<i>cmdname, parent = None</i>) +<b>EricdocExecDialog</b>(<i>cmdname, parent=None</i>) <p> Constructor </p><dl> @@ -101,7 +101,7 @@ <h4>EricdocExecDialog.__readStderr</h4> <b>__readStderr</b>(<i></i>) <p> - Private slot to handle the readyReadStandardError signal. + Private slot to handle the readyReadStandardError signal. </p><p> It reads the error output of the process and inserts it into the error pane. @@ -109,7 +109,7 @@ <h4>EricdocExecDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process, formats it and inserts it into the contents pane.
--- a/Documentation/Source/eric5.Plugins.PluginEricapi.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginEricapi.html Fri Mar 11 16:51:57 2011 +0100 @@ -100,7 +100,7 @@ <h4>EricapiPlugin.__projectShowMenu</h4> <b>__projectShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt>
--- a/Documentation/Source/eric5.Plugins.PluginEricdoc.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginEricdoc.html Fri Mar 11 16:51:57 2011 +0100 @@ -100,7 +100,7 @@ <h4>EricdocPlugin.__projectShowMenu</h4> <b>__projectShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt>
--- a/Documentation/Source/eric5.Plugins.PluginPep8Checker.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginPep8Checker.html Fri Mar 11 16:51:57 2011 +0100 @@ -131,7 +131,7 @@ <h4>Pep8CheckerPlugin.__editorShowMenu</h4> <b>__editorShowMenu</b>(<i>menuName, menu, editor</i>) <p> - Private slot called, when the the editor context menu or a submenu is + Private slot called, when the the editor context menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt> @@ -159,7 +159,7 @@ <h4>Pep8CheckerPlugin.__projectBrowserShowMenu</h4> <b>__projectBrowserShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project browser menu or a submenu is + Private slot called, when the the project browser menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt> @@ -178,7 +178,7 @@ <h4>Pep8CheckerPlugin.__projectShowMenu</h4> <b>__projectShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt>
--- a/Documentation/Source/eric5.Plugins.PluginSyntaxChecker.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginSyntaxChecker.html Fri Mar 11 16:51:57 2011 +0100 @@ -125,7 +125,7 @@ <h4>SyntaxCheckerPlugin.__editorShowMenu</h4> <b>__editorShowMenu</b>(<i>menuName, menu, editor</i>) <p> - Private slot called, when the the editor context menu or a submenu is + Private slot called, when the the editor context menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt> @@ -152,7 +152,7 @@ <h4>SyntaxCheckerPlugin.__projectBrowserShowMenu</h4> <b>__projectBrowserShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project browser menu or a submenu is + Private slot called, when the the project browser menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt> @@ -172,7 +172,7 @@ <h4>SyntaxCheckerPlugin.__projectShowMenu</h4> <b>__projectShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt>
--- a/Documentation/Source/eric5.Plugins.PluginTabnanny.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginTabnanny.html Fri Mar 11 16:51:57 2011 +0100 @@ -125,7 +125,7 @@ <h4>TabnannyPlugin.__editorShowMenu</h4> <b>__editorShowMenu</b>(<i>menuName, menu, editor</i>) <p> - Private slot called, when the the editor context menu or a submenu is + Private slot called, when the the editor context menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt> @@ -152,7 +152,7 @@ <h4>TabnannyPlugin.__projectBrowserShowMenu</h4> <b>__projectBrowserShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project browser context menu or a submenu is + Private slot called, when the the project browser context menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt> @@ -172,7 +172,7 @@ <h4>TabnannyPlugin.__projectShowMenu</h4> <b>__projectShowMenu</b>(<i>menuName, menu</i>) <p> - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. </p><dl> <dt><i>menuName</i></dt>
--- a/Documentation/Source/eric5.Plugins.PluginWizardE5MessageBox.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardE5MessageBox.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>E5MessageBoxWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="E5MessageBoxWizard.__initAction" ID="E5MessageBoxWizard.__initAction"></a> <h4>E5MessageBoxWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardPyRegExp.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardPyRegExp.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>PyRegExpWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="PyRegExpWizard.__initAction" ID="PyRegExpWizard.__initAction"></a> <h4>PyRegExpWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardQColorDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardQColorDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>ColorDialogWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="ColorDialogWizard.__initAction" ID="ColorDialogWizard.__initAction"></a> <h4>ColorDialogWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardQFileDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardQFileDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>FileDialogWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="FileDialogWizard.__initAction" ID="FileDialogWizard.__initAction"></a> <h4>FileDialogWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardQFontDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardQFontDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>FontDialogWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="FontDialogWizard.__initAction" ID="FontDialogWizard.__initAction"></a> <h4>FontDialogWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardQInputDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardQInputDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>InputDialogWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="InputDialogWizard.__initAction" ID="InputDialogWizard.__initAction"></a> <h4>InputDialogWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardQMessageBox.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardQMessageBox.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>MessageBoxWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="MessageBoxWizard.__initAction" ID="MessageBoxWizard.__initAction"></a> <h4>MessageBoxWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.PluginWizardQRegExp.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.PluginWizardQRegExp.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>QRegExpWizard.__handle</h4> <b>__handle</b>(<i></i>) <p> - Private method to handle the wizards action + Private method to handle the wizards action </p><a NAME="QRegExpWizard.__initAction" ID="QRegExpWizard.__initAction"></a> <h4>QRegExpWizard.__initAction</h4> <b>__initAction</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="HgAnnotateDialog.__init__" ID="HgAnnotateDialog.__init__"></a> <h4>HgAnnotateDialog (Constructor)</h4> -<b>HgAnnotateDialog</b>(<i>vcs, parent = None</i>) +<b>HgAnnotateDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBackoutDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="HgBackoutDialog.__init__" ID="HgBackoutDialog.__init__"></a> <h4>HgBackoutDialog (Constructor)</h4> -<b>HgBackoutDialog</b>(<i>tagsList, branchesList, parent = None</i>) +<b>HgBackoutDialog</b>(<i>tagsList, branchesList, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="HgBundleDialog.__init__" ID="HgBundleDialog.__init__"></a> <h4>HgBundleDialog (Constructor)</h4> -<b>HgBundleDialog</b>(<i>tagsList, branchesList, parent = None</i>) +<b>HgBundleDialog</b>(<i>tagsList, branchesList, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommandDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -70,7 +70,7 @@ </table> <a NAME="HgCommandDialog.__init__" ID="HgCommandDialog.__init__"></a> <h4>HgCommandDialog (Constructor)</h4> -<b>HgCommandDialog</b>(<i>argvList, ppath, parent = None</i>) +<b>HgCommandDialog</b>(<i>argvList, ppath, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="HgCommitDialog.__init__" ID="HgCommitDialog.__init__"></a> <h4>HgCommitDialog (Constructor)</h4> -<b>HgCommitDialog</b>(<i>vcs, parent = None</i>) +<b>HgCommitDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="HgCopyDialog.__init__" ID="HgCopyDialog.__init__"></a> <h4>HgCopyDialog (Constructor)</h4> -<b>HgCopyDialog</b>(<i>source, parent = None, move = False, force = False</i>) +<b>HgCopyDialog</b>(<i>source, parent=None, move=False, force=False</i>) <p> Constructor </p><dl> @@ -98,7 +98,7 @@ <h4>HgCopyDialog.on_dirButton_clicked</h4> <b>on_dirButton_clicked</b>(<i></i>) <p> - Private slot to handle the button press for selecting the target via a + Private slot to handle the button press for selecting the target via a selection dialog. </p> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -103,7 +103,7 @@ </table> <a NAME="HgDialog.__init__" ID="HgDialog.__init__"></a> <h4>HgDialog (Constructor)</h4> -<b>HgDialog</b>(<i>text, parent = None</i>) +<b>HgDialog</b>(<i>text, parent=None</i>) <p> Constructor </p><dl> @@ -144,7 +144,7 @@ <h4>HgDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process, formats it and inserts it into the contents pane. @@ -221,7 +221,7 @@ Private slot to send the input to the subversion process. </p><a NAME="HgDialog.startProcess" ID="HgDialog.startProcess"></a> <h4>HgDialog.startProcess</h4> -<b>startProcess</b>(<i>args, workingDir = None, showArgs = True</i>) +<b>startProcess</b>(<i>args, workingDir=None, showArgs=True</i>) <p> Public slot used to start the process. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="HgDiffDialog.__init__" ID="HgDiffDialog.__init__"></a> <h4>HgDiffDialog (Constructor)</h4> -<b>HgDiffDialog</b>(<i>vcs, parent = None</i>) +<b>HgDiffDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -163,7 +163,7 @@ <h4>HgDiffDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process, formats it and inserts it into the contents pane. @@ -227,7 +227,7 @@ Private slot to send the input to the subversion process. </p><a NAME="HgDiffDialog.start" ID="HgDiffDialog.start"></a> <h4>HgDiffDialog.start</h4> -<b>start</b>(<i>fn, versions = None, bundle = None</i>) +<b>start</b>(<i>fn, versions=None, bundle=None</i>) <p> Public slot to start the hg diff command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -186,7 +186,7 @@ </table> <a NAME="HgLogBrowserDialog.__init__" ID="HgLogBrowserDialog.__init__"></a> <h4>HgLogBrowserDialog (Constructor)</h4> -<b>HgLogBrowserDialog</b>(<i>vcs, mode = "log", bundle = None, parent = None</i>) +<b>HgLogBrowserDialog</b>(<i>vcs, mode="log", bundle=None, parent=None</i>) <p> Constructor </p><dl> @@ -260,7 +260,7 @@ <dd> tuple containing the column and color index for the given node and a list of tuples indicating the edges - between the given node and its parents + between the given node and its parents (integer, integer, [(integer, integer, integer), ...]) </dd> </dl><a NAME="HgLogBrowserDialog.__generateFileItem" ID="HgLogBrowserDialog.__generateFileItem"></a> @@ -381,7 +381,7 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> <h4>HgLogBrowserDialog.__getLogEntries</h4> -<b>__getLogEntries</b>(<i>startRev = None</i>) +<b>__getLogEntries</b>(<i>startRev=None</i>) <p> Private method to retrieve log entries from the repository. </p><dl> @@ -440,7 +440,7 @@ <h4>HgLogBrowserDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process and inserts it into a buffer. </p><a NAME="HgLogBrowserDialog.__resizeColumnsFiles" ID="HgLogBrowserDialog.__resizeColumnsFiles"></a>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -45,7 +45,7 @@ <p> Class implementing a dialog to show the output of the hg log command process. </p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows + The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the revisions. </p> <h3>Derived from</h3> @@ -96,7 +96,7 @@ </table> <a NAME="HgLogDialog.__init__" ID="HgLogDialog.__init__"></a> <h4>HgLogDialog (Constructor)</h4> -<b>HgLogDialog</b>(<i>vcs, mode = "log", bundle = None, parent = None</i>) +<b>HgLogDialog</b>(<i>vcs, mode="log", bundle=None, parent=None</i>) <p> Constructor </p><dl> @@ -153,7 +153,7 @@ <h4>HgLogDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process and inserts it into a buffer. </p><a NAME="HgLogDialog.__sourceChanged" ID="HgLogDialog.__sourceChanged"></a> @@ -208,7 +208,7 @@ Private slot to send the input to the hg process. </p><a NAME="HgLogDialog.start" ID="HgLogDialog.start"></a> <h4>HgLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries = 0</i>) +<b>start</b>(<i>fn, noEntries=0</i>) <p> Public slot to start the hg log command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> <h4>HgMergeDialog (Constructor)</h4> -<b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent = None</i>) +<b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="HgNewProjectOptionsDialog.__init__" ID="HgNewProjectOptionsDialog.__init__"></a> <h4>HgNewProjectOptionsDialog (Constructor)</h4> -<b>HgNewProjectOptionsDialog</b>(<i>vcs, parent = None</i>) +<b>HgNewProjectOptionsDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -64,7 +64,7 @@ </table> <a NAME="HgOptionsDialog.__init__" ID="HgOptionsDialog.__init__"></a> <h4>HgOptionsDialog (Constructor)</h4> -<b>HgOptionsDialog</b>(<i>vcs, project, parent = None</i>) +<b>HgOptionsDialog</b>(<i>vcs, project, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="HgRevisionSelectionDialog.__init__" ID="HgRevisionSelectionDialog.__init__"></a> <h4>HgRevisionSelectionDialog (Constructor)</h4> -<b>HgRevisionSelectionDialog</b>(<i>tagsList, branchesList, showNone = False, parent = None</i>) +<b>HgRevisionSelectionDialog</b>(<i>tagsList, branchesList, showNone=False, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgRevisionsSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="HgRevisionsSelectionDialog.__init__" ID="HgRevisionsSelectionDialog.__init__"></a> <h4>HgRevisionsSelectionDialog (Constructor)</h4> -<b>HgRevisionsSelectionDialog</b>(<i>tagsList, branchesList, parent = None</i>) +<b>HgRevisionsSelectionDialog</b>(<i>tagsList, branchesList, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="HgServeDialog.__init__" ID="HgServeDialog.__init__"></a> <h4>HgServeDialog (Constructor)</h4> -<b>HgServeDialog</b>(<i>vcs, path, parent = None</i>) +<b>HgServeDialog</b>(<i>vcs, path, parent=None</i>) <p> Constructor </p><dl> @@ -100,7 +100,7 @@ </dd> </dl><a NAME="HgServeDialog.__appendText" ID="HgServeDialog.__appendText"></a> <h4>HgServeDialog.__appendText</h4> -<b>__appendText</b>(<i>txt, error = False</i>) +<b>__appendText</b>(<i>txt, error=False</i>) <p> Public method to append text to the end. </p><dl> @@ -135,7 +135,7 @@ <h4>HgServeDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process and inserts it into the log. </p><a NAME="HgServeDialog.__startBrowser" ID="HgServeDialog.__startBrowser"></a>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -174,7 +174,7 @@ </table> <a NAME="HgStatusDialog.__init__" ID="HgStatusDialog.__init__"></a> <h4>HgStatusDialog (Constructor)</h4> -<b>HgStatusDialog</b>(<i>vcs, parent = None</i>) +<b>HgStatusDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="HgStatusMonitorThread.__init__" ID="HgStatusMonitorThread.__init__"></a> <h4>HgStatusMonitorThread (Constructor)</h4> -<b>HgStatusMonitorThread</b>(<i>interval, project, vcs, parent = None</i>) +<b>HgStatusMonitorThread</b>(<i>interval, project, vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgTagBranchListDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="HgTagBranchListDialog.__init__" ID="HgTagBranchListDialog.__init__"></a> <h4>HgTagBranchListDialog (Constructor)</h4> -<b>HgTagBranchListDialog</b>(<i>vcs, parent = None</i>) +<b>HgTagBranchListDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="HgTagDialog.__init__" ID="HgTagDialog.__init__"></a> <h4>HgTagDialog (Constructor)</h4> -<b>HgTagDialog</b>(<i>taglist, parent = None</i>) +<b>HgTagDialog</b>(<i>taglist, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="HgProjectBrowserHelper.__init__" ID="HgProjectBrowserHelper.__init__"></a> <h4>HgProjectBrowserHelper (Constructor)</h4> -<b>HgProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None</i>) +<b>HgProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -223,7 +223,7 @@ <h4>HgProjectBrowserHelper._addVCSMenuMulti</h4> <b>_addVCSMenuMulti</b>(<i>mainMenu</i>) <p> - Protected method used to add the VCS menu for multi selection to all + Protected method used to add the VCS menu for multi selection to all project browsers. </p><dl> <dt><i>mainMenu</i></dt> @@ -234,9 +234,9 @@ <h4>HgProjectBrowserHelper.showContextMenu</h4> <b>showContextMenu</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. </p><dl> <dt><i>menu</i></dt> @@ -251,9 +251,9 @@ <h4>HgProjectBrowserHelper.showContextMenuDir</h4> <b>showContextMenuDir</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -268,9 +268,9 @@ <h4>HgProjectBrowserHelper.showContextMenuDirMulti</h4> <b>showContextMenuDirMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -285,9 +285,9 @@ <h4>HgProjectBrowserHelper.showContextMenuMulti</h4> <b>showContextMenuMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. </p><dl> <dt><i>menu</i></dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -174,7 +174,7 @@ </table> <a NAME="HgProjectHelper.__init__" ID="HgProjectHelper.__init__"></a> <h4>HgProjectHelper (Constructor)</h4> -<b>HgProjectHelper</b>(<i>vcsObject, projectObject, parent = None, name = None</i>) +<b>HgProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Mar 11 16:51:57 2011 +0100 @@ -264,7 +264,7 @@ </table> <a NAME="Hg.__init__" ID="Hg.__init__"></a> <h4>Hg (Constructor)</h4> -<b>Hg</b>(<i>plugin, parent = None, name = None</i>) +<b>Hg</b>(<i>plugin, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -405,7 +405,7 @@ </dd> </dl><a NAME="Hg.hgCreateIgnoreFile" ID="Hg.hgCreateIgnoreFile"></a> <h4>Hg.hgCreateIgnoreFile</h4> -<b>hgCreateIgnoreFile</b>(<i>name, autoAdd = False</i>) +<b>hgCreateIgnoreFile</b>(<i>name, autoAdd=False</i>) <p> Public method to create the ignore file. </p><dl> @@ -435,11 +435,11 @@ <h4>Hg.hgExtendedDiff</h4> <b>hgExtendedDiff</b>(<i>name</i>) <p> - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Mercurial repository. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><p> This method gives the chance to enter the revisions to be compared. @@ -484,7 +484,7 @@ <h4>Hg.hgIncoming</h4> <b>hgIncoming</b>(<i>name</i>) <p> - Public method used to view the log of incoming changes from the + Public method used to view the log of incoming changes from the Mercurial repository. </p><dl> <dt><i>name</i></dt> @@ -493,7 +493,7 @@ </dd> </dl><a NAME="Hg.hgInfo" ID="Hg.hgInfo"></a> <h4>Hg.hgInfo</h4> -<b>hgInfo</b>(<i>ppath, mode = "heads"</i>) +<b>hgInfo</b>(<i>ppath, mode="heads"</i>) <p> Public method to show information about the heads of the repository. </p><dl> @@ -506,7 +506,7 @@ </dd> </dl><a NAME="Hg.hgListTagBranch" ID="Hg.hgListTagBranch"></a> <h4>Hg.hgListTagBranch</h4> -<b>hgListTagBranch</b>(<i>path, tags = True</i>) +<b>hgListTagBranch</b>(<i>path, tags=True</i>) <p> Public method used to list the available tags or branches. </p><dl> @@ -522,7 +522,7 @@ <h4>Hg.hgLogBrowser</h4> <b>hgLogBrowser</b>(<i>path</i>) <p> - Public method used to browse the log of a file/directory from the + Public method used to browse the log of a file/directory from the Mercurial repository. </p><dl> <dt><i>path</i></dt> @@ -533,7 +533,7 @@ <h4>Hg.hgLogLimited</h4> <b>hgLogLimited</b>(<i>name</i>) <p> - Public method used to view the (limited) log of a file/directory from the + Public method used to view the (limited) log of a file/directory from the Mercurial repository. </p><dl> <dt><i>name</i></dt> @@ -559,7 +559,7 @@ <h4>Hg.hgOutgoing</h4> <b>hgOutgoing</b>(<i>name</i>) <p> - Public method used to view the log of outgoing changes from the + Public method used to view the log of outgoing changes from the Mercurial repository. </p><dl> <dt><i>name</i></dt> @@ -595,7 +595,7 @@ </dd> </dl><a NAME="Hg.hgPush" ID="Hg.hgPush"></a> <h4>Hg.hgPush</h4> -<b>hgPush</b>(<i>name, force = False</i>) +<b>hgPush</b>(<i>name, force=False</i>) <p> Public method used to push changes to a remote Mercurial repository. </p><dl> @@ -688,7 +688,7 @@ </dd> </dl><a NAME="Hg.vcsAdd" ID="Hg.vcsAdd"></a> <h4>Hg.vcsAdd</h4> -<b>vcsAdd</b>(<i>name, isDir = False, noDialog = False</i>) +<b>vcsAdd</b>(<i>name, isDir=False, noDialog=False</i>) <p> Public method used to add a file/directory to the Mercurial repository. </p><dl> @@ -704,7 +704,7 @@ </dd> </dl><a NAME="Hg.vcsAddBinary" ID="Hg.vcsAddBinary"></a> <h4>Hg.vcsAddBinary</h4> -<b>vcsAddBinary</b>(<i>name, isDir = False</i>) +<b>vcsAddBinary</b>(<i>name, isDir=False</i>) <p> Public method used to add a file/directory in binary mode to the Mercurial repository. @@ -728,7 +728,7 @@ </dd> </dl><a NAME="Hg.vcsAllRegisteredStates" ID="Hg.vcsAllRegisteredStates"></a> <h4>Hg.vcsAllRegisteredStates</h4> -<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut = True</i>) +<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut=True</i>) <p> Public method used to get the registered states of a number of files in the vcs. </p><p> @@ -754,7 +754,7 @@ </dd> </dl><a NAME="Hg.vcsCheckout" ID="Hg.vcsCheckout"></a> <h4>Hg.vcsCheckout</h4> -<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to check the project out of a Mercurial repository (clone). </p><dl> @@ -795,7 +795,7 @@ </dd> </dl><a NAME="Hg.vcsCommit" ID="Hg.vcsCommit"></a> <h4>Hg.vcsCommit</h4> -<b>vcsCommit</b>(<i>name, message, noDialog = False, closeBranch = False</i>) +<b>vcsCommit</b>(<i>name, message, noDialog=False, closeBranch=False</i>) <p> Public method used to make the change of a file/directory permanent in the Mercurial repository. @@ -830,11 +830,11 @@ <h4>Hg.vcsDiff</h4> <b>vcsDiff</b>(<i>name</i>) <p> - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Mercurial repository. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><dl> <dt><i>name</i></dt> @@ -871,7 +871,7 @@ </dd> </dl><a NAME="Hg.vcsGetProjectBrowserHelper" ID="Hg.vcsGetProjectBrowserHelper"></a> <h4>Hg.vcsGetProjectBrowserHelper</h4> -<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser = False</i>) +<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) <p> Public method to instanciate a helper object for the different project browsers. </p><dl> @@ -908,7 +908,7 @@ </dd> </dl><a NAME="Hg.vcsImport" ID="Hg.vcsImport"></a> <h4>Hg.vcsImport</h4> -<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to import the project into the Subversion repository. </p><dl> @@ -930,11 +930,11 @@ </dd> </dl><a NAME="Hg.vcsInit" ID="Hg.vcsInit"></a> <h4>Hg.vcsInit</h4> -<b>vcsInit</b>(<i>vcsDir, noDialog = False</i>) +<b>vcsInit</b>(<i>vcsDir, noDialog=False</i>) <p> Public method used to initialize the mercurial repository. </p><p> - The initialization is done, when a project is converted into a Mercurial + The initialization is done, when a project is converted into a Mercurial controlled project. Therefore we always return TRUE without doing anything. </p><dl> <dt><i>vcsDir</i></dt> @@ -953,7 +953,7 @@ <h4>Hg.vcsLog</h4> <b>vcsLog</b>(<i>name</i>) <p> - Public method used to view the log of a file/directory from the + Public method used to view the log of a file/directory from the Mercurial repository. </p><dl> <dt><i>name</i></dt> @@ -972,7 +972,7 @@ </dd> </dl><a NAME="Hg.vcsMove" ID="Hg.vcsMove"></a> <h4>Hg.vcsMove</h4> -<b>vcsMove</b>(<i>name, project, target = None, noDialog = False</i>) +<b>vcsMove</b>(<i>name, project, target=None, noDialog=False</i>) <p> Public method used to move a file/directory. </p><dl> @@ -1006,7 +1006,7 @@ </dd> </dl><a NAME="Hg.vcsNewProjectOptionsDialog" ID="Hg.vcsNewProjectOptionsDialog"></a> <h4>Hg.vcsNewProjectOptionsDialog</h4> -<b>vcsNewProjectOptionsDialog</b>(<i>parent = None</i>) +<b>vcsNewProjectOptionsDialog</b>(<i>parent=None</i>) <p> Public method to get a dialog to enter repository info for getting a new project. </p><dl> @@ -1016,7 +1016,7 @@ </dd> </dl><a NAME="Hg.vcsOptionsDialog" ID="Hg.vcsOptionsDialog"></a> <h4>Hg.vcsOptionsDialog</h4> -<b>vcsOptionsDialog</b>(<i>project, archive, editable = False, parent = None</i>) +<b>vcsOptionsDialog</b>(<i>project, archive, editable=False, parent=None</i>) <p> Public method to get a dialog to enter repository info. </p><dl> @@ -1050,7 +1050,7 @@ </dd> </dl><a NAME="Hg.vcsRemove" ID="Hg.vcsRemove"></a> <h4>Hg.vcsRemove</h4> -<b>vcsRemove</b>(<i>name, project = False, noDialog = False</i>) +<b>vcsRemove</b>(<i>name, project=False, noDialog=False</i>) <p> Public method used to remove a file/directory from the Mercurial repository. </p><p> @@ -1105,7 +1105,7 @@ <h4>Hg.vcsStatus</h4> <b>vcsStatus</b>(<i>name</i>) <p> - Public method used to view the status of files/directories in the + Public method used to view the status of files/directories in the Mercurial repository. </p><dl> <dt><i>name</i></dt> @@ -1135,7 +1135,7 @@ </dd> </dl><a NAME="Hg.vcsUpdate" ID="Hg.vcsUpdate"></a> <h4>Hg.vcsUpdate</h4> -<b>vcsUpdate</b>(<i>name, noDialog = False, revision = None</i>) +<b>vcsUpdate</b>(<i>name, noDialog=False, revision=None</i>) <p> Public method used to update a file/directory with the Mercurial repository. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -147,7 +147,7 @@ </table> <a NAME="SvnProjectBrowserHelper.__init__" ID="SvnProjectBrowserHelper.__init__"></a> <h4>SvnProjectBrowserHelper (Constructor)</h4> -<b>SvnProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None</i>) +<b>SvnProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -213,7 +213,7 @@ <h4>SvnProjectBrowserHelper.__SVNInfo</h4> <b>__SVNInfo</b>(<i></i>) <p> - Private slot called by the context menu to show repository information of + Private slot called by the context menu to show repository information of a file or directory. </p><a NAME="SvnProjectBrowserHelper.__SVNListProps" ID="SvnProjectBrowserHelper.__SVNListProps"></a> <h4>SvnProjectBrowserHelper.__SVNListProps</h4> @@ -333,7 +333,7 @@ <h4>SvnProjectBrowserHelper._addVCSMenuMulti</h4> <b>_addVCSMenuMulti</b>(<i>mainMenu</i>) <p> - Protected method used to add the VCS menu for multi selection to all + Protected method used to add the VCS menu for multi selection to all project browsers. </p><dl> <dt><i>mainMenu</i></dt> @@ -344,9 +344,9 @@ <h4>SvnProjectBrowserHelper.showContextMenu</h4> <b>showContextMenu</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. </p><dl> <dt><i>menu</i></dt> @@ -361,9 +361,9 @@ <h4>SvnProjectBrowserHelper.showContextMenuDir</h4> <b>showContextMenuDir</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -378,9 +378,9 @@ <h4>SvnProjectBrowserHelper.showContextMenuDirMulti</h4> <b>showContextMenuDirMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -395,9 +395,9 @@ <h4>SvnProjectBrowserHelper.showContextMenuMulti</h4> <b>showContextMenuMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. </p><dl> <dt><i>menu</i></dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="SvnProjectHelper.__init__" ID="SvnProjectHelper.__init__"></a> <h4>SvnProjectHelper (Constructor)</h4> -<b>SvnProjectHelper</b>(<i>vcsObject, projectObject, parent = None, name = None</i>) +<b>SvnProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="SvnBlameDialog.__init__" ID="SvnBlameDialog.__init__"></a> <h4>SvnBlameDialog (Constructor)</h4> -<b>SvnBlameDialog</b>(<i>vcs, parent = None</i>) +<b>SvnBlameDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommandDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -73,7 +73,7 @@ </table> <a NAME="SvnCommandDialog.__init__" ID="SvnCommandDialog.__init__"></a> <h4>SvnCommandDialog (Constructor)</h4> -<b>SvnCommandDialog</b>(<i>argvList, wdList, ppath, parent = None</i>) +<b>SvnCommandDialog</b>(<i>argvList, wdList, ppath, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCommitDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="SvnCommitDialog.__init__" ID="SvnCommitDialog.__init__"></a> <h4>SvnCommitDialog (Constructor)</h4> -<b>SvnCommitDialog</b>(<i>parent = None</i>) +<b>SvnCommitDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnCopyDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnCopyDialog.__init__" ID="SvnCopyDialog.__init__"></a> <h4>SvnCopyDialog (Constructor)</h4> -<b>SvnCopyDialog</b>(<i>source, parent = None, move = False, force = False</i>) +<b>SvnCopyDialog</b>(<i>source, parent=None, move=False, force=False</i>) <p> Constructor </p><dl> @@ -98,7 +98,7 @@ <h4>SvnCopyDialog.on_dirButton_clicked</h4> <b>on_dirButton_clicked</b>(<i></i>) <p> - Private slot to handle the button press for selecting the target via a + Private slot to handle the button press for selecting the target via a selection dialog. </p> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="SvnDialog.__init__" ID="SvnDialog.__init__"></a> <h4>SvnDialog (Constructor)</h4> -<b>SvnDialog</b>(<i>text, command, pysvnClient, parent = None, log = ""</i>) +<b>SvnDialog</b>(<i>text, command, pysvnClient, parent=None, log=""</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.Plugins.VcsPlugins.vcsPySvn.SvnDialogMixin</h1> <p> -Module implementing a dialog mixin class providing common callback methods for +Module implementing a dialog mixin class providing common callback methods for the pysvn client. </p> <h3>Global Attributes</h3> @@ -44,7 +44,7 @@ <a NAME="SvnDialogMixin" ID="SvnDialogMixin"></a> <h2>SvnDialogMixin</h2> <p> - Class implementing a dialog mixin providing common callback methods for + Class implementing a dialog mixin providing common callback methods for the pysvn client. </p> <h3>Derived from</h3> @@ -80,7 +80,7 @@ </table> <a NAME="SvnDialogMixin.__init__" ID="SvnDialogMixin.__init__"></a> <h4>SvnDialogMixin (Constructor)</h4> -<b>SvnDialogMixin</b>(<i>log = ""</i>) +<b>SvnDialogMixin</b>(<i>log=""</i>) <p> Constructor </p><dl> @@ -134,8 +134,8 @@ <dt>Returns:</dt> <dd> tuple of four values (retcode, username, password, save). - Retcode should be True, if username and password should be used - by subversion, username and password contain the relevant data + Retcode should be True, if username and password should be used + by subversion, username and password contain the relevant data as strings and save is a flag indicating, that username and password should be saved. </dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="SvnDiffDialog.__init__" ID="SvnDiffDialog.__init__"></a> <h4>SvnDiffDialog (Constructor)</h4> -<b>SvnDiffDialog</b>(<i>vcs, parent = None</i>) +<b>SvnDiffDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -170,7 +170,7 @@ filesystem. </p><a NAME="SvnDiffDialog.start" ID="SvnDiffDialog.start"></a> <h4>SvnDiffDialog.start</h4> -<b>start</b>(<i>fn, versions = None, urls = None, summary = False, pegRev = None</i>) +<b>start</b>(<i>fn, versions=None, urls=None, summary=False, pegRev=None</i>) <p> Public slot to start the svn diff command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="SvnInfoDialog" ID="SvnInfoDialog"></a> <h2>SvnInfoDialog</h2> <p> - Class implementing a dialog to show repository related information + Class implementing a dialog to show repository related information for a file/directory. </p> <h3>Derived from</h3> @@ -67,7 +67,7 @@ </table> <a NAME="SvnInfoDialog.__init__" ID="SvnInfoDialog.__init__"></a> <h4>SvnInfoDialog (Constructor)</h4> -<b>SvnInfoDialog</b>(<i>vcs, parent = None</i>) +<b>SvnInfoDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -135,7 +135,7 @@ </table> <a NAME="SvnLogBrowserDialog.__init__" ID="SvnLogBrowserDialog.__init__"></a> <h4>SvnLogBrowserDialog (Constructor)</h4> -<b>SvnLogBrowserDialog</b>(<i>vcs, parent = None</i>) +<b>SvnLogBrowserDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -217,7 +217,7 @@ </dd><dt><i>changedPaths</i></dt> <dd> list of pysvn dictionary like objects containing - info about the changed files/directories + info about the changed files/directories </dd> </dl><dl> <dt>Returns:</dt> @@ -226,7 +226,7 @@ </dd> </dl><a NAME="SvnLogBrowserDialog.__getLogEntries" ID="SvnLogBrowserDialog.__getLogEntries"></a> <h4>SvnLogBrowserDialog.__getLogEntries</h4> -<b>__getLogEntries</b>(<i>startRev = None</i>) +<b>__getLogEntries</b>(<i>startRev=None</i>) <p> Private method to retrieve log entries from the repository. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -45,7 +45,7 @@ <p> Class implementing a dialog to show the output of the svn log command. </p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows + The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the versions. </p> <h3>Derived from</h3> @@ -78,7 +78,7 @@ </table> <a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> <h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, parent = None</i>) +<b>SvnLogDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -126,7 +126,7 @@ </dd> </dl><a NAME="SvnLogDialog.start" ID="SvnLogDialog.start"></a> <h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries = 0</i>) +<b>start</b>(<i>fn, noEntries=0</i>) <p> Public slot to start the svn log command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnLoginDialog.__init__" ID="SvnLoginDialog.__init__"></a> <h4>SvnLoginDialog (Constructor)</h4> -<b>SvnLoginDialog</b>(<i>realm, username, may_save, parent = None</i>) +<b>SvnLoginDialog</b>(<i>realm, username, may_save, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> <h4>SvnMergeDialog (Constructor)</h4> -<b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force = False, parent = None</i>) +<b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="SvnNewProjectOptionsDialog.__init__" ID="SvnNewProjectOptionsDialog.__init__"></a> <h4>SvnNewProjectOptionsDialog (Constructor)</h4> -<b>SvnNewProjectOptionsDialog</b>(<i>vcs, parent = None</i>) +<b>SvnNewProjectOptionsDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -70,7 +70,7 @@ </table> <a NAME="SvnOptionsDialog.__init__" ID="SvnOptionsDialog.__init__"></a> <h4>SvnOptionsDialog (Constructor)</h4> -<b>SvnOptionsDialog</b>(<i>vcs, project, parent = None</i>) +<b>SvnOptionsDialog</b>(<i>vcs, project, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnPropDelDialog.__init__" ID="SvnPropDelDialog.__init__"></a> <h4>SvnPropDelDialog (Constructor)</h4> -<b>SvnPropDelDialog</b>(<i>recursive, parent = None</i>) +<b>SvnPropDelDialog</b>(<i>recursive, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropListDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="SvnPropListDialog.__init__" ID="SvnPropListDialog.__init__"></a> <h4>SvnPropListDialog (Constructor)</h4> -<b>SvnPropListDialog</b>(<i>vcs, parent = None</i>) +<b>SvnPropListDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -145,7 +145,7 @@ </dd> </dl><a NAME="SvnPropListDialog.start" ID="SvnPropListDialog.start"></a> <h4>SvnPropListDialog.start</h4> -<b>start</b>(<i>fn, recursive = False</i>) +<b>start</b>(<i>fn, recursive=False</i>) <p> Public slot to start the svn status command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropSetDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropSetDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnPropSetDialog.__init__" ID="SvnPropSetDialog.__init__"></a> <h4>SvnPropSetDialog (Constructor)</h4> -<b>SvnPropSetDialog</b>(<i>recursive, parent = None</i>) +<b>SvnPropSetDialog</b>(<i>recursive, parent=None</i>) <p> Constructor </p><dl> @@ -83,7 +83,7 @@ <dt>Returns:</dt> <dd> tuple of three values giving the property name, the text - of the property and a flag indicating, that this property + of the property and a flag indicating, that this property should be applied recursively. (string, string, boolean) </dd> </dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnRelocateDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnRelocateDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnRelocateDialog.__init__" ID="SvnRelocateDialog.__init__"></a> <h4>SvnRelocateDialog (Constructor)</h4> -<b>SvnRelocateDialog</b>(<i>currUrl, parent = None</i>) +<b>SvnRelocateDialog</b>(<i>currUrl, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnRepoBrowserDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="SvnRepoBrowserDialog.__init__" ID="SvnRepoBrowserDialog.__init__"></a> <h4>SvnRepoBrowserDialog (Constructor)</h4> -<b>SvnRepoBrowserDialog</b>(<i>vcs, mode = "browse", parent = None</i>) +<b>SvnRepoBrowserDialog</b>(<i>vcs, mode="browse", parent=None</i>) <p> Constructor </p><dl> @@ -151,7 +151,7 @@ </dd> </dl><a NAME="SvnRepoBrowserDialog.__listRepo" ID="SvnRepoBrowserDialog.__listRepo"></a> <h4>SvnRepoBrowserDialog.__listRepo</h4> -<b>__listRepo</b>(<i>url, parent = None</i>) +<b>__listRepo</b>(<i>url, parent=None</i>) <p> Private method to perform the svn list command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnRevisionSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnRevisionSelectionDialog.__init__" ID="SvnRevisionSelectionDialog.__init__"></a> <h4>SvnRevisionSelectionDialog (Constructor)</h4> -<b>SvnRevisionSelectionDialog</b>(<i>parent = None</i>) +<b>SvnRevisionSelectionDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -176,7 +176,7 @@ </table> <a NAME="SvnStatusDialog.__init__" ID="SvnStatusDialog.__init__"></a> <h4>SvnStatusDialog (Constructor)</h4> -<b>SvnStatusDialog</b>(<i>vcs, parent = None</i>) +<b>SvnStatusDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusMonitorThread.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnStatusMonitorThread.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="SvnStatusMonitorThread.__init__" ID="SvnStatusMonitorThread.__init__"></a> <h4>SvnStatusMonitorThread (Constructor)</h4> -<b>SvnStatusMonitorThread</b>(<i>interval, project, vcs, parent = None</i>) +<b>SvnStatusMonitorThread</b>(<i>interval, project, vcs, parent=None</i>) <p> Constructor </p><dl> @@ -107,8 +107,8 @@ <dt>Returns:</dt> <dd> tuple of four values (retcode, username, password, save). - Retcode should be True, if username and password should be used - by subversion, username and password contain the relevant data + Retcode should be True, if username and password should be used + by subversion, username and password contain the relevant data as strings and save is a flag indicating, that username and password should be saved. Always returns (False, "", "", False). </dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnSwitchDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnSwitchDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnSwitchDialog.__init__" ID="SvnSwitchDialog.__init__"></a> <h4>SvnSwitchDialog (Constructor)</h4> -<b>SvnSwitchDialog</b>(<i>taglist, reposURL, standardLayout, parent = None</i>) +<b>SvnSwitchDialog</b>(<i>taglist, reposURL, standardLayout, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagBranchListDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="SvnTagBranchListDialog.__init__" ID="SvnTagBranchListDialog.__init__"></a> <h4>SvnTagBranchListDialog (Constructor)</h4> -<b>SvnTagBranchListDialog</b>(<i>vcs, parent = None</i>) +<b>SvnTagBranchListDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -161,7 +161,7 @@ </dd> </dl><a NAME="SvnTagBranchListDialog.start" ID="SvnTagBranchListDialog.start"></a> <h4>SvnTagBranchListDialog.start</h4> -<b>start</b>(<i>path, tags = True</i>) +<b>start</b>(<i>path, tags=True</i>) <p> Public slot to start the svn status command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnTagDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnTagDialog.__init__" ID="SvnTagDialog.__init__"></a> <h4>SvnTagDialog (Constructor)</h4> -<b>SvnTagDialog</b>(<i>taglist, reposURL, standardLayout, parent = None</i>) +<b>SvnTagDialog</b>(<i>taglist, reposURL, standardLayout, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="SvnUrlSelectionDialog.__init__" ID="SvnUrlSelectionDialog.__init__"></a> <h4>SvnUrlSelectionDialog (Constructor)</h4> -<b>SvnUrlSelectionDialog</b>(<i>vcs, tagsList, branchesList, path, parent = None</i>) +<b>SvnUrlSelectionDialog</b>(<i>vcs, tagsList, branchesList, path, parent=None</i>) <p> Constructor </p><dl> @@ -96,7 +96,7 @@ <h4>SvnUrlSelectionDialog.__changeLabelCombo</h4> <b>__changeLabelCombo</b>(<i>labelCombo, type_</i>) <p> - Private method used to change the label combo depending on the + Private method used to change the label combo depending on the selected type. </p><dl> <dt><i>labelCombo</i></dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Mar 11 16:51:57 2011 +0100 @@ -237,7 +237,7 @@ </table> <a NAME="Subversion.__init__" ID="Subversion.__init__"></a> <h4>Subversion (Constructor)</h4> -<b>Subversion</b>(<i>plugin, parent = None, name = None</i>) +<b>Subversion</b>(<i>plugin, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -357,7 +357,7 @@ </dd> </dl><a NAME="Subversion.svnDelProp" ID="Subversion.svnDelProp"></a> <h4>Subversion.svnDelProp</h4> -<b>svnDelProp</b>(<i>name, recursive = False</i>) +<b>svnDelProp</b>(<i>name, recursive=False</i>) <p> Public method used to delete a property of a file/directory. </p><dl> @@ -372,11 +372,11 @@ <h4>Subversion.svnExtendedDiff</h4> <b>svnExtendedDiff</b>(<i>name</i>) <p> - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><p> This method gives the chance to enter the revisions to be compared. @@ -415,7 +415,7 @@ </dd> </dl><a NAME="Subversion.svnListProps" ID="Subversion.svnListProps"></a> <h4>Subversion.svnListProps</h4> -<b>svnListProps</b>(<i>name, recursive = False</i>) +<b>svnListProps</b>(<i>name, recursive=False</i>) <p> Public method used to list the properties of a file/directory. </p><dl> @@ -428,7 +428,7 @@ </dd> </dl><a NAME="Subversion.svnListTagBranch" ID="Subversion.svnListTagBranch"></a> <h4>Subversion.svnListTagBranch</h4> -<b>svnListTagBranch</b>(<i>path, tags = True</i>) +<b>svnListTagBranch</b>(<i>path, tags=True</i>) <p> Public method used to list the available tags or branches. </p><dl> @@ -460,7 +460,7 @@ <h4>Subversion.svnLogBrowser</h4> <b>svnLogBrowser</b>(<i>path</i>) <p> - Public method used to browse the log of a file/directory from the + Public method used to browse the log of a file/directory from the Subversion repository. </p><dl> <dt><i>path</i></dt> @@ -471,7 +471,7 @@ <h4>Subversion.svnLogLimited</h4> <b>svnLogLimited</b>(<i>name</i>) <p> - Public method used to view the (limited) log of a file/directory from the + Public method used to view the (limited) log of a file/directory from the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -518,7 +518,7 @@ </dd> </dl><a NAME="Subversion.svnRepoBrowser" ID="Subversion.svnRepoBrowser"></a> <h4>Subversion.svnRepoBrowser</h4> -<b>svnRepoBrowser</b>(<i>projectPath = None</i>) +<b>svnRepoBrowser</b>(<i>projectPath=None</i>) <p> Public method to open the repository browser. </p><dl> @@ -538,7 +538,7 @@ </dd> </dl><a NAME="Subversion.svnSetProp" ID="Subversion.svnSetProp"></a> <h4>Subversion.svnSetProp</h4> -<b>svnSetProp</b>(<i>name, recursive = False</i>) +<b>svnSetProp</b>(<i>name, recursive=False</i>) <p> Public method used to add a property to a file/directory. </p><dl> @@ -573,7 +573,7 @@ repository URLs. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><p> This method gives the chance to enter the revisions to be compared. @@ -584,7 +584,7 @@ </dd> </dl><a NAME="Subversion.vcsAdd" ID="Subversion.vcsAdd"></a> <h4>Subversion.vcsAdd</h4> -<b>vcsAdd</b>(<i>name, isDir = False, noDialog = False</i>) +<b>vcsAdd</b>(<i>name, isDir=False, noDialog=False</i>) <p> Public method used to add a file/directory to the Subversion repository. </p><dl> @@ -600,7 +600,7 @@ </dd> </dl><a NAME="Subversion.vcsAddBinary" ID="Subversion.vcsAddBinary"></a> <h4>Subversion.vcsAddBinary</h4> -<b>vcsAddBinary</b>(<i>name, isDir = False</i>) +<b>vcsAddBinary</b>(<i>name, isDir=False</i>) <p> Public method used to add a file/directory in binary mode to the Subversion repository. @@ -624,7 +624,7 @@ </dd> </dl><a NAME="Subversion.vcsAllRegisteredStates" ID="Subversion.vcsAllRegisteredStates"></a> <h4>Subversion.vcsAllRegisteredStates</h4> -<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut = True</i>) +<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut=True</i>) <p> Public method used to get the registered states of a number of files in the vcs. </p><p> @@ -650,7 +650,7 @@ </dd> </dl><a NAME="Subversion.vcsCheckout" ID="Subversion.vcsCheckout"></a> <h4>Subversion.vcsCheckout</h4> -<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to check the project out of the Subversion repository. </p><dl> @@ -691,7 +691,7 @@ </dd> </dl><a NAME="Subversion.vcsCommit" ID="Subversion.vcsCommit"></a> <h4>Subversion.vcsCommit</h4> -<b>vcsCommit</b>(<i>name, message, noDialog = False</i>) +<b>vcsCommit</b>(<i>name, message, noDialog=False</i>) <p> Public method used to make the change of a file/directory permanent in the Subversion repository. @@ -723,11 +723,11 @@ <h4>Subversion.vcsDiff</h4> <b>vcsDiff</b>(<i>name</i>) <p> - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><dl> <dt><i>name</i></dt> @@ -764,7 +764,7 @@ </dd> </dl><a NAME="Subversion.vcsGetProjectBrowserHelper" ID="Subversion.vcsGetProjectBrowserHelper"></a> <h4>Subversion.vcsGetProjectBrowserHelper</h4> -<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser = False</i>) +<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) <p> Public method to instanciate a helper object for the different project browsers. </p><dl> @@ -801,7 +801,7 @@ </dd> </dl><a NAME="Subversion.vcsImport" ID="Subversion.vcsImport"></a> <h4>Subversion.vcsImport</h4> -<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to import the project into the Subversion repository. </p><dl> @@ -823,7 +823,7 @@ </dd> </dl><a NAME="Subversion.vcsInit" ID="Subversion.vcsInit"></a> <h4>Subversion.vcsInit</h4> -<b>vcsInit</b>(<i>vcsDir, noDialog = False</i>) +<b>vcsInit</b>(<i>vcsDir, noDialog=False</i>) <p> Public method used to initialize the subversion repository. </p><p> @@ -847,7 +847,7 @@ <h4>Subversion.vcsLog</h4> <b>vcsLog</b>(<i>name</i>) <p> - Public method used to view the log of a file/directory from the + Public method used to view the log of a file/directory from the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -866,7 +866,7 @@ </dd> </dl><a NAME="Subversion.vcsMove" ID="Subversion.vcsMove"></a> <h4>Subversion.vcsMove</h4> -<b>vcsMove</b>(<i>name, project, target = None, noDialog = False</i>) +<b>vcsMove</b>(<i>name, project, target=None, noDialog=False</i>) <p> Public method used to move a file/directory. </p><dl> @@ -900,7 +900,7 @@ </dd> </dl><a NAME="Subversion.vcsNewProjectOptionsDialog" ID="Subversion.vcsNewProjectOptionsDialog"></a> <h4>Subversion.vcsNewProjectOptionsDialog</h4> -<b>vcsNewProjectOptionsDialog</b>(<i>parent = None</i>) +<b>vcsNewProjectOptionsDialog</b>(<i>parent=None</i>) <p> Public method to get a dialog to enter repository info for getting a new project. </p><dl> @@ -910,7 +910,7 @@ </dd> </dl><a NAME="Subversion.vcsOptionsDialog" ID="Subversion.vcsOptionsDialog"></a> <h4>Subversion.vcsOptionsDialog</h4> -<b>vcsOptionsDialog</b>(<i>project, archive, editable = False, parent = None</i>) +<b>vcsOptionsDialog</b>(<i>project, archive, editable=False, parent=None</i>) <p> Public method to get a dialog to enter repository info. </p><dl> @@ -944,7 +944,7 @@ </dd> </dl><a NAME="Subversion.vcsRemove" ID="Subversion.vcsRemove"></a> <h4>Subversion.vcsRemove</h4> -<b>vcsRemove</b>(<i>name, project = False, noDialog = False</i>) +<b>vcsRemove</b>(<i>name, project=False, noDialog=False</i>) <p> Public method used to remove a file/directory from the Subversion repository. </p><p> @@ -999,7 +999,7 @@ <h4>Subversion.vcsStatus</h4> <b>vcsStatus</b>(<i>name</i>) <p> - Public method used to view the status of files/directories in the + Public method used to view the status of files/directories in the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -1021,7 +1021,7 @@ <h4>Subversion.vcsTag</h4> <b>vcsTag</b>(<i>name</i>) <p> - Public method used to set the tag of a file/directory in the + Public method used to set the tag of a file/directory in the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -1030,7 +1030,7 @@ </dd> </dl><a NAME="Subversion.vcsUpdate" ID="Subversion.vcsUpdate"></a> <h4>Subversion.vcsUpdate</h4> -<b>vcsUpdate</b>(<i>name, noDialog = False</i>) +<b>vcsUpdate</b>(<i>name, noDialog=False</i>) <p> Public method used to update a file/directory with the Subversion repository. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -144,7 +144,7 @@ </table> <a NAME="SvnProjectBrowserHelper.__init__" ID="SvnProjectBrowserHelper.__init__"></a> <h4>SvnProjectBrowserHelper (Constructor)</h4> -<b>SvnProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None</i>) +<b>SvnProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -324,7 +324,7 @@ <h4>SvnProjectBrowserHelper._addVCSMenuMulti</h4> <b>_addVCSMenuMulti</b>(<i>mainMenu</i>) <p> - Protected method used to add the VCS menu for multi selection to all + Protected method used to add the VCS menu for multi selection to all project browsers. </p><dl> <dt><i>mainMenu</i></dt> @@ -335,9 +335,9 @@ <h4>SvnProjectBrowserHelper.showContextMenu</h4> <b>showContextMenu</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. </p><dl> <dt><i>menu</i></dt> @@ -352,9 +352,9 @@ <h4>SvnProjectBrowserHelper.showContextMenuDir</h4> <b>showContextMenuDir</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -369,9 +369,9 @@ <h4>SvnProjectBrowserHelper.showContextMenuDirMulti</h4> <b>showContextMenuDirMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -386,9 +386,9 @@ <h4>SvnProjectBrowserHelper.showContextMenuMulti</h4> <b>showContextMenuMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. </p><dl> <dt><i>menu</i></dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -108,7 +108,7 @@ </table> <a NAME="SvnProjectHelper.__init__" ID="SvnProjectHelper.__init__"></a> <h4>SvnProjectHelper (Constructor)</h4> -<b>SvnProjectHelper</b>(<i>vcsObject, projectObject, parent = None, name = None</i>) +<b>SvnProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="SvnBlameDialog.__init__" ID="SvnBlameDialog.__init__"></a> <h4>SvnBlameDialog (Constructor)</h4> -<b>SvnBlameDialog</b>(<i>vcs, parent = None</i>) +<b>SvnBlameDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommandDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -73,7 +73,7 @@ </table> <a NAME="SvnCommandDialog.__init__" ID="SvnCommandDialog.__init__"></a> <h4>SvnCommandDialog (Constructor)</h4> -<b>SvnCommandDialog</b>(<i>argvList, wdList, ppath, parent = None</i>) +<b>SvnCommandDialog</b>(<i>argvList, wdList, ppath, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCommitDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="SvnCommitDialog.__init__" ID="SvnCommitDialog.__init__"></a> <h4>SvnCommitDialog (Constructor)</h4> -<b>SvnCommitDialog</b>(<i>vcs, parent = None</i>) +<b>SvnCommitDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnCopyDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnCopyDialog.__init__" ID="SvnCopyDialog.__init__"></a> <h4>SvnCopyDialog (Constructor)</h4> -<b>SvnCopyDialog</b>(<i>source, parent = None, move = False, force = False</i>) +<b>SvnCopyDialog</b>(<i>source, parent=None, move=False, force=False</i>) <p> Constructor </p><dl> @@ -98,7 +98,7 @@ <h4>SvnCopyDialog.on_dirButton_clicked</h4> <b>on_dirButton_clicked</b>(<i></i>) <p> - Private slot to handle the button press for selecting the target via a + Private slot to handle the button press for selecting the target via a selection dialog. </p> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -100,7 +100,7 @@ </table> <a NAME="SvnDialog.__init__" ID="SvnDialog.__init__"></a> <h4>SvnDialog (Constructor)</h4> -<b>SvnDialog</b>(<i>text, parent = None</i>) +<b>SvnDialog</b>(<i>text, parent=None</i>) <p> Constructor </p><dl> @@ -141,7 +141,7 @@ <h4>SvnDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStdout signal. + Private slot to handle the readyReadStdout signal. </p><p> It reads the output of the process, formats it and inserts it into the contents pane. @@ -207,7 +207,7 @@ Private slot to send the input to the subversion process. </p><a NAME="SvnDialog.startProcess" ID="SvnDialog.startProcess"></a> <h4>SvnDialog.startProcess</h4> -<b>startProcess</b>(<i>args, workingDir = None</i>) +<b>startProcess</b>(<i>args, workingDir=None</i>) <p> Public slot used to start the process. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="SvnDiffDialog.__init__" ID="SvnDiffDialog.__init__"></a> <h4>SvnDiffDialog (Constructor)</h4> -<b>SvnDiffDialog</b>(<i>vcs, parent = None</i>) +<b>SvnDiffDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -163,7 +163,7 @@ <h4>SvnDiffDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process, formats it and inserts it into the contents pane. @@ -227,7 +227,7 @@ Private slot to send the input to the subversion process. </p><a NAME="SvnDiffDialog.start" ID="SvnDiffDialog.start"></a> <h4>SvnDiffDialog.start</h4> -<b>start</b>(<i>fn, versions = None, urls = None, summary = False</i>) +<b>start</b>(<i>fn, versions=None, urls=None, summary=False</i>) <p> Public slot to start the svn diff command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -156,7 +156,7 @@ </table> <a NAME="SvnLogBrowserDialog.__init__" ID="SvnLogBrowserDialog.__init__"></a> <h4>SvnLogBrowserDialog (Constructor)</h4> -<b>SvnLogBrowserDialog</b>(<i>vcs, parent = None</i>) +<b>SvnLogBrowserDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -235,7 +235,7 @@ </dd><dt><i>changedPaths</i></dt> <dd> list of dictionary objects containing - info about the changed files/directories + info about the changed files/directories </dd> </dl><dl> <dt>Returns:</dt> @@ -244,7 +244,7 @@ </dd> </dl><a NAME="SvnLogBrowserDialog.__getLogEntries" ID="SvnLogBrowserDialog.__getLogEntries"></a> <h4>SvnLogBrowserDialog.__getLogEntries</h4> -<b>__getLogEntries</b>(<i>startRev = None</i>) +<b>__getLogEntries</b>(<i>startRev=None</i>) <p> Private method to retrieve log entries from the repository. </p><dl> @@ -282,7 +282,7 @@ <h4>SvnLogBrowserDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process and inserts it into a buffer. </p><a NAME="SvnLogBrowserDialog.__resizeColumnsFiles" ID="SvnLogBrowserDialog.__resizeColumnsFiles"></a>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -45,7 +45,7 @@ <p> Class implementing a dialog to show the output of the svn log command process. </p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows + The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the versions. </p> <h3>Derived from</h3> @@ -93,7 +93,7 @@ </table> <a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> <h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, parent = None</i>) +<b>SvnLogDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -129,7 +129,7 @@ <h4>SvnLogDialog.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. </p><p> It reads the output of the process and inserts it into a buffer. </p><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> @@ -184,7 +184,7 @@ Private slot to send the input to the subversion process. </p><a NAME="SvnLogDialog.start" ID="SvnLogDialog.start"></a> <h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries = 0</i>) +<b>start</b>(<i>fn, noEntries=0</i>) <p> Public slot to start the cvs log command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> <h4>SvnMergeDialog (Constructor)</h4> -<b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force = False, parent = None</i>) +<b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="SvnNewProjectOptionsDialog.__init__" ID="SvnNewProjectOptionsDialog.__init__"></a> <h4>SvnNewProjectOptionsDialog (Constructor)</h4> -<b>SvnNewProjectOptionsDialog</b>(<i>vcs, parent = None</i>) +<b>SvnNewProjectOptionsDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -70,7 +70,7 @@ </table> <a NAME="SvnOptionsDialog.__init__" ID="SvnOptionsDialog.__init__"></a> <h4>SvnOptionsDialog (Constructor)</h4> -<b>SvnOptionsDialog</b>(<i>vcs, project, parent = None</i>) +<b>SvnOptionsDialog</b>(<i>vcs, project, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -90,7 +90,7 @@ </table> <a NAME="SvnPropListDialog.__init__" ID="SvnPropListDialog.__init__"></a> <h4>SvnPropListDialog (Constructor)</h4> -<b>SvnPropListDialog</b>(<i>vcs, parent = None</i>) +<b>SvnPropListDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl> @@ -183,7 +183,7 @@ </dd> </dl><a NAME="SvnPropListDialog.start" ID="SvnPropListDialog.start"></a> <h4>SvnPropListDialog.start</h4> -<b>start</b>(<i>fn, recursive = False</i>) +<b>start</b>(<i>fn, recursive=False</i>) <p> Public slot to start the svn status command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropSetDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropSetDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnPropSetDialog.__init__" ID="SvnPropSetDialog.__init__"></a> <h4>SvnPropSetDialog (Constructor)</h4> -<b>SvnPropSetDialog</b>(<i>parent = None</i>) +<b>SvnPropSetDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnRelocateDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnRelocateDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnRelocateDialog.__init__" ID="SvnRelocateDialog.__init__"></a> <h4>SvnRelocateDialog (Constructor)</h4> -<b>SvnRelocateDialog</b>(<i>currUrl, parent = None</i>) +<b>SvnRelocateDialog</b>(<i>currUrl, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnRepoBrowserDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -126,7 +126,7 @@ </table> <a NAME="SvnRepoBrowserDialog.__init__" ID="SvnRepoBrowserDialog.__init__"></a> <h4>SvnRepoBrowserDialog (Constructor)</h4> -<b>SvnRepoBrowserDialog</b>(<i>vcs, mode = "browse", parent = None</i>) +<b>SvnRepoBrowserDialog</b>(<i>vcs, mode="browse", parent=None</i>) <p> Constructor </p><dl> @@ -183,7 +183,7 @@ </dd> </dl><a NAME="SvnRepoBrowserDialog.__listRepo" ID="SvnRepoBrowserDialog.__listRepo"></a> <h4>SvnRepoBrowserDialog.__listRepo</h4> -<b>__listRepo</b>(<i>url, parent = None</i>) +<b>__listRepo</b>(<i>url, parent=None</i>) <p> Private method to perform the svn list command. </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnRevisionSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnRevisionSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnRevisionSelectionDialog.__init__" ID="SvnRevisionSelectionDialog.__init__"></a> <h4>SvnRevisionSelectionDialog (Constructor)</h4> -<b>SvnRevisionSelectionDialog</b>(<i>parent = None</i>) +<b>SvnRevisionSelectionDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -197,7 +197,7 @@ </table> <a NAME="SvnStatusDialog.__init__" ID="SvnStatusDialog.__init__"></a> <h4>SvnStatusDialog (Constructor)</h4> -<b>SvnStatusDialog</b>(<i>vcs, parent = None</i>) +<b>SvnStatusDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusMonitorThread.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnStatusMonitorThread.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnStatusMonitorThread.__init__" ID="SvnStatusMonitorThread.__init__"></a> <h4>SvnStatusMonitorThread (Constructor)</h4> -<b>SvnStatusMonitorThread</b>(<i>interval, project, vcs, parent = None</i>) +<b>SvnStatusMonitorThread</b>(<i>interval, project, vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnSwitchDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnSwitchDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="SvnSwitchDialog.__init__" ID="SvnSwitchDialog.__init__"></a> <h4>SvnSwitchDialog (Constructor)</h4> -<b>SvnSwitchDialog</b>(<i>taglist, reposURL, standardLayout, parent = None</i>) +<b>SvnSwitchDialog</b>(<i>taglist, reposURL, standardLayout, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagBranchListDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="SvnTagBranchListDialog.__init__" ID="SvnTagBranchListDialog.__init__"></a> <h4>SvnTagBranchListDialog (Constructor)</h4> -<b>SvnTagBranchListDialog</b>(<i>vcs, parent = None</i>) +<b>SvnTagBranchListDialog</b>(<i>vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnTagDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="SvnTagDialog.__init__" ID="SvnTagDialog.__init__"></a> <h4>SvnTagDialog (Constructor)</h4> -<b>SvnTagDialog</b>(<i>taglist, reposURL, standardLayout, parent = None</i>) +<b>SvnTagDialog</b>(<i>taglist, reposURL, standardLayout, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="SvnUrlSelectionDialog.__init__" ID="SvnUrlSelectionDialog.__init__"></a> <h4>SvnUrlSelectionDialog (Constructor)</h4> -<b>SvnUrlSelectionDialog</b>(<i>vcs, tagsList, branchesList, path, parent = None</i>) +<b>SvnUrlSelectionDialog</b>(<i>vcs, tagsList, branchesList, path, parent=None</i>) <p> Constructor </p><dl> @@ -96,7 +96,7 @@ <h4>SvnUrlSelectionDialog.__changeLabelCombo</h4> <b>__changeLabelCombo</b>(<i>labelCombo, type_</i>) <p> - Private method used to change the label combo depending on the + Private method used to change the label combo depending on the selected type. </p><dl> <dt><i>labelCombo</i></dt>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Mar 11 16:51:57 2011 +0100 @@ -341,7 +341,7 @@ </dd> </dl><a NAME="Subversion.svnDelProp" ID="Subversion.svnDelProp"></a> <h4>Subversion.svnDelProp</h4> -<b>svnDelProp</b>(<i>name, recursive = False</i>) +<b>svnDelProp</b>(<i>name, recursive=False</i>) <p> Public method used to delete a property of a file/directory. </p><dl> @@ -356,11 +356,11 @@ <h4>Subversion.svnExtendedDiff</h4> <b>svnExtendedDiff</b>(<i>name</i>) <p> - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><p> This method gives the chance to enter the revisions to be compared. @@ -386,7 +386,7 @@ </dd> </dl><a NAME="Subversion.svnListProps" ID="Subversion.svnListProps"></a> <h4>Subversion.svnListProps</h4> -<b>svnListProps</b>(<i>name, recursive = False</i>) +<b>svnListProps</b>(<i>name, recursive=False</i>) <p> Public method used to list the properties of a file/directory. </p><dl> @@ -399,7 +399,7 @@ </dd> </dl><a NAME="Subversion.svnListTagBranch" ID="Subversion.svnListTagBranch"></a> <h4>Subversion.svnListTagBranch</h4> -<b>svnListTagBranch</b>(<i>path, tags = True</i>) +<b>svnListTagBranch</b>(<i>path, tags=True</i>) <p> Public method used to list the available tags or branches. </p><dl> @@ -431,7 +431,7 @@ <h4>Subversion.svnLogBrowser</h4> <b>svnLogBrowser</b>(<i>path</i>) <p> - Public method used to browse the log of a file/directory from the + Public method used to browse the log of a file/directory from the Subversion repository. </p><dl> <dt><i>path</i></dt> @@ -442,7 +442,7 @@ <h4>Subversion.svnLogLimited</h4> <b>svnLogLimited</b>(<i>name</i>) <p> - Public method used to view the (limited) log of a file/directory from the + Public method used to view the (limited) log of a file/directory from the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -489,7 +489,7 @@ </dd> </dl><a NAME="Subversion.svnRepoBrowser" ID="Subversion.svnRepoBrowser"></a> <h4>Subversion.svnRepoBrowser</h4> -<b>svnRepoBrowser</b>(<i>projectPath = None</i>) +<b>svnRepoBrowser</b>(<i>projectPath=None</i>) <p> Public method to open the repository browser. </p><dl> @@ -509,7 +509,7 @@ </dd> </dl><a NAME="Subversion.svnSetProp" ID="Subversion.svnSetProp"></a> <h4>Subversion.svnSetProp</h4> -<b>svnSetProp</b>(<i>name, recursive = False</i>) +<b>svnSetProp</b>(<i>name, recursive=False</i>) <p> Public method used to add a property to a file/directory. </p><dl> @@ -544,7 +544,7 @@ repository URLs. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><p> This method gives the chance to enter the revisions to be compared. @@ -555,7 +555,7 @@ </dd> </dl><a NAME="Subversion.vcsAdd" ID="Subversion.vcsAdd"></a> <h4>Subversion.vcsAdd</h4> -<b>vcsAdd</b>(<i>name, isDir = False, noDialog = False</i>) +<b>vcsAdd</b>(<i>name, isDir=False, noDialog=False</i>) <p> Public method used to add a file/directory to the Subversion repository. </p><dl> @@ -571,7 +571,7 @@ </dd> </dl><a NAME="Subversion.vcsAddBinary" ID="Subversion.vcsAddBinary"></a> <h4>Subversion.vcsAddBinary</h4> -<b>vcsAddBinary</b>(<i>name, isDir = False</i>) +<b>vcsAddBinary</b>(<i>name, isDir=False</i>) <p> Public method used to add a file/directory in binary mode to the Subversion repository. @@ -595,7 +595,7 @@ </dd> </dl><a NAME="Subversion.vcsAllRegisteredStates" ID="Subversion.vcsAllRegisteredStates"></a> <h4>Subversion.vcsAllRegisteredStates</h4> -<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut = True</i>) +<b>vcsAllRegisteredStates</b>(<i>names, dname, shortcut=True</i>) <p> Public method used to get the registered states of a number of files in the vcs. </p><p> @@ -621,7 +621,7 @@ </dd> </dl><a NAME="Subversion.vcsCheckout" ID="Subversion.vcsCheckout"></a> <h4>Subversion.vcsCheckout</h4> -<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to check the project out of the Subversion repository. </p><dl> @@ -662,7 +662,7 @@ </dd> </dl><a NAME="Subversion.vcsCommit" ID="Subversion.vcsCommit"></a> <h4>Subversion.vcsCommit</h4> -<b>vcsCommit</b>(<i>name, message, noDialog = False</i>) +<b>vcsCommit</b>(<i>name, message, noDialog=False</i>) <p> Public method used to make the change of a file/directory permanent in the Subversion repository. @@ -694,11 +694,11 @@ <h4>Subversion.vcsDiff</h4> <b>vcsDiff</b>(<i>name</i>) <p> - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. </p><p> If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. </p><dl> <dt><i>name</i></dt> @@ -735,7 +735,7 @@ </dd> </dl><a NAME="Subversion.vcsGetProjectBrowserHelper" ID="Subversion.vcsGetProjectBrowserHelper"></a> <h4>Subversion.vcsGetProjectBrowserHelper</h4> -<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser = False</i>) +<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) <p> Public method to instanciate a helper object for the different project browsers. </p><dl> @@ -772,7 +772,7 @@ </dd> </dl><a NAME="Subversion.vcsImport" ID="Subversion.vcsImport"></a> <h4>Subversion.vcsImport</h4> -<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to import the project into the Subversion repository. </p><dl> @@ -794,7 +794,7 @@ </dd> </dl><a NAME="Subversion.vcsInit" ID="Subversion.vcsInit"></a> <h4>Subversion.vcsInit</h4> -<b>vcsInit</b>(<i>vcsDir, noDialog = False</i>) +<b>vcsInit</b>(<i>vcsDir, noDialog=False</i>) <p> Public method used to initialize the subversion repository. </p><p> @@ -818,7 +818,7 @@ <h4>Subversion.vcsLog</h4> <b>vcsLog</b>(<i>name</i>) <p> - Public method used to view the log of a file/directory from the + Public method used to view the log of a file/directory from the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -837,7 +837,7 @@ </dd> </dl><a NAME="Subversion.vcsMove" ID="Subversion.vcsMove"></a> <h4>Subversion.vcsMove</h4> -<b>vcsMove</b>(<i>name, project, target = None, noDialog = False</i>) +<b>vcsMove</b>(<i>name, project, target=None, noDialog=False</i>) <p> Public method used to move a file/directory. </p><dl> @@ -871,7 +871,7 @@ </dd> </dl><a NAME="Subversion.vcsNewProjectOptionsDialog" ID="Subversion.vcsNewProjectOptionsDialog"></a> <h4>Subversion.vcsNewProjectOptionsDialog</h4> -<b>vcsNewProjectOptionsDialog</b>(<i>parent = None</i>) +<b>vcsNewProjectOptionsDialog</b>(<i>parent=None</i>) <p> Public method to get a dialog to enter repository info for getting a new project. </p><dl> @@ -881,7 +881,7 @@ </dd> </dl><a NAME="Subversion.vcsOptionsDialog" ID="Subversion.vcsOptionsDialog"></a> <h4>Subversion.vcsOptionsDialog</h4> -<b>vcsOptionsDialog</b>(<i>project, archive, editable = False, parent = None</i>) +<b>vcsOptionsDialog</b>(<i>project, archive, editable=False, parent=None</i>) <p> Public method to get a dialog to enter repository info. </p><dl> @@ -915,7 +915,7 @@ </dd> </dl><a NAME="Subversion.vcsRemove" ID="Subversion.vcsRemove"></a> <h4>Subversion.vcsRemove</h4> -<b>vcsRemove</b>(<i>name, project = False, noDialog = False</i>) +<b>vcsRemove</b>(<i>name, project=False, noDialog=False</i>) <p> Public method used to remove a file/directory from the Subversion repository. </p><p> @@ -970,7 +970,7 @@ <h4>Subversion.vcsStatus</h4> <b>vcsStatus</b>(<i>name</i>) <p> - Public method used to view the status of files/directories in the + Public method used to view the status of files/directories in the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -992,7 +992,7 @@ <h4>Subversion.vcsTag</h4> <b>vcsTag</b>(<i>name</i>) <p> - Public method used to set the tag of a file/directory in the + Public method used to set the tag of a file/directory in the Subversion repository. </p><dl> <dt><i>name</i></dt> @@ -1001,7 +1001,7 @@ </dd> </dl><a NAME="Subversion.vcsUpdate" ID="Subversion.vcsUpdate"></a> <h4>Subversion.vcsUpdate</h4> -<b>vcsUpdate</b>(<i>name, noDialog = False</i>) +<b>vcsUpdate</b>(<i>name, noDialog=False</i>) <p> Public method used to update a file/directory with the Subversion repository. </p><dl>
--- a/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html Fri Mar 11 16:51:57 2011 +0100 @@ -218,7 +218,7 @@ <h4>Listspace.__captionChange</h4> <b>__captionChange</b>(<i>cap, editor</i>) <p> - Private method to handle caption change signals from the editor. + Private method to handle caption change signals from the editor. </p><p> Updates the listwidget text to reflect the new caption information. </p><dl> @@ -291,7 +291,7 @@ </dd> </dl><a NAME="Listspace._addView" ID="Listspace._addView"></a> <h4>Listspace._addView</h4> -<b>_addView</b>(<i>win, fn = None, noName = ""</i>) +<b>_addView</b>(<i>win, fn=None, noName=""</i>) <p> Protected method to add a view (i.e. window) </p><dl> @@ -340,7 +340,7 @@ </dd> </dl><a NAME="Listspace._showView" ID="Listspace._showView"></a> <h4>Listspace._showView</h4> -<b>_showView</b>(<i>win, fn = None</i>) +<b>_showView</b>(<i>win, fn=None</i>) <p> Protected method to show a view (i.e. window) </p><dl>
--- a/Documentation/Source/eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.ViewManagerPlugins.MdiArea.MdiArea.html Fri Mar 11 16:51:57 2011 +0100 @@ -223,7 +223,7 @@ </dd> </dl><a NAME="MdiArea._addView" ID="MdiArea._addView"></a> <h4>MdiArea._addView</h4> -<b>_addView</b>(<i>win, fn = None, noName = ""</i>) +<b>_addView</b>(<i>win, fn=None, noName=""</i>) <p> Protected method to add a view (i.e. window) </p><dl> @@ -272,7 +272,7 @@ </dd> </dl><a NAME="MdiArea._showView" ID="MdiArea._showView"></a> <h4>MdiArea._showView</h4> -<b>_showView</b>(<i>win, fn = None</i>) +<b>_showView</b>(<i>win, fn=None</i>) <p> Private method to show a view (i.e. window) </p><dl>
--- a/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="TabBar.__init__" ID="TabBar.__init__"></a> <h4>TabBar (Constructor)</h4> -<b>TabBar</b>(<i>parent = None</i>) +<b>TabBar</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -272,7 +272,7 @@ <h4>TabWidget.__captionChange</h4> <b>__captionChange</b>(<i>cap, editor</i>) <p> - Private method to handle Caption change signals from the editor. + Private method to handle Caption change signals from the editor. </p><p> Updates the tab text and tooltip text to reflect the new caption information. </p><dl> @@ -701,7 +701,7 @@ </dd> </dl><a NAME="Tabview._addView" ID="Tabview._addView"></a> <h4>Tabview._addView</h4> -<b>_addView</b>(<i>win, fn = None, noName = ""</i>) +<b>_addView</b>(<i>win, fn=None, noName=""</i>) <p> Protected method to add a view (i.e. window) </p><dl> @@ -750,7 +750,7 @@ </dd> </dl><a NAME="Tabview._showView" ID="Tabview._showView"></a> <h4>Tabview._showView</h4> -<b>_showView</b>(<i>win, fn = None</i>) +<b>_showView</b>(<i>win, fn=None</i>) <p> Protected method to show a view (i.e. window) </p><dl> @@ -856,7 +856,7 @@ </dd> </dl><a NAME="Tabview.insertView" ID="Tabview.insertView"></a> <h4>Tabview.insertView</h4> -<b>insertView</b>(<i>win, tabWidget, index, fn = None, noName = ""</i>) +<b>insertView</b>(<i>win, tabWidget, index, fn=None, noName=""</i>) <p> Protected method to add a view (i.e. window) </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="E5MessageBoxWizardDialog.__init__" ID="E5MessageBoxWizardDialog.__init__"></a> <h4>E5MessageBoxWizardDialog (Constructor)</h4> -<b>E5MessageBoxWizardDialog</b>(<i>parent = None</i>) +<b>E5MessageBoxWizardDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -144,7 +144,7 @@ </dd> </dl><a NAME="E5MessageBoxWizardDialog.__getStandardButtonCode" ID="E5MessageBoxWizardDialog.__getStandardButtonCode"></a> <h4>E5MessageBoxWizardDialog.__getStandardButtonCode</h4> -<b>__getStandardButtonCode</b>(<i>istring, indString, withIntro = True</i>) +<b>__getStandardButtonCode</b>(<i>istring, indString, withIntro=True</i>) <p> Private method to generate the button code for the standard buttons. </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -133,7 +133,7 @@ <h4>FontDialogWizardDialog.on_fontButton_clicked</h4> <b>on_fontButton_clicked</b>(<i></i>) <p> - Private slot to handle the button press to select a font via a font selection + Private slot to handle the button press to select a font via a font selection dialog. </p> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardCharactersDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="PyRegExpWizardCharactersDialog.__init__" ID="PyRegExpWizardCharactersDialog.__init__"></a> <h4>PyRegExpWizardCharactersDialog (Constructor)</h4> -<b>PyRegExpWizardCharactersDialog</b>(<i>parent = None</i>) +<b>PyRegExpWizardCharactersDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="PyRegExpWizardDialog.__init__" ID="PyRegExpWizardDialog.__init__"></a> <h4>PyRegExpWizardDialog (Constructor)</h4> -<b>PyRegExpWizardDialog</b>(<i>parent = None, fromEric = True</i>) +<b>PyRegExpWizardDialog</b>(<i>parent=None, fromEric=True</i>) <p> Constructor </p><dl> @@ -211,7 +211,7 @@ </table> <a NAME="PyRegExpWizardWidget.__init__" ID="PyRegExpWizardWidget.__init__"></a> <h4>PyRegExpWizardWidget (Constructor)</h4> -<b>PyRegExpWizardWidget</b>(<i>parent = None, fromEric = True</i>) +<b>PyRegExpWizardWidget</b>(<i>parent=None, fromEric=True</i>) <p> Constructor </p><dl> @@ -224,7 +224,7 @@ </dd> </dl><a NAME="PyRegExpWizardWidget.__insertString" ID="PyRegExpWizardWidget.__insertString"></a> <h4>PyRegExpWizardWidget.__insertString</h4> -<b>__insertString</b>(<i>s, steps = 0</i>) +<b>__insertString</b>(<i>s, steps=0</i>) <p> Private method to insert a string into line edit and move cursor. </p><dl> @@ -304,7 +304,7 @@ Private slot to handle the end line toolbutton. </p><a NAME="PyRegExpWizardWidget.on_executeButton_clicked" ID="PyRegExpWizardWidget.on_executeButton_clicked"></a> <h4>PyRegExpWizardWidget.on_executeButton_clicked</h4> -<b>on_executeButton_clicked</b>(<i>startpos = 0</i>) +<b>on_executeButton_clicked</b>(<i>startpos=0</i>) <p> Private slot to execute the entered regexp on the test text. </p><p> @@ -438,7 +438,7 @@ </table> <a NAME="PyRegExpWizardWindow.__init__" ID="PyRegExpWizardWindow.__init__"></a> <h4>PyRegExpWizardWindow (Constructor)</h4> -<b>PyRegExpWizardWindow</b>(<i>parent = None</i>) +<b>PyRegExpWizardWindow</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardRepeatDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="PyRegExpWizardRepeatDialog.__init__" ID="PyRegExpWizardRepeatDialog.__init__"></a> <h4>PyRegExpWizardRepeatDialog (Constructor)</h4> -<b>PyRegExpWizardRepeatDialog</b>(<i>parent = None</i>) +<b>PyRegExpWizardRepeatDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="QRegExpWizardCharactersDialog.__init__" ID="QRegExpWizardCharactersDialog.__init__"></a> <h4>QRegExpWizardCharactersDialog (Constructor)</h4> -<b>QRegExpWizardCharactersDialog</b>(<i>parent = None</i>) +<b>QRegExpWizardCharactersDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="QRegExpWizardDialog.__init__" ID="QRegExpWizardDialog.__init__"></a> <h4>QRegExpWizardDialog (Constructor)</h4> -<b>QRegExpWizardDialog</b>(<i>parent = None, fromEric = True</i>) +<b>QRegExpWizardDialog</b>(<i>parent=None, fromEric=True</i>) <p> Constructor </p><dl> @@ -187,7 +187,7 @@ </table> <a NAME="QRegExpWizardWidget.__init__" ID="QRegExpWizardWidget.__init__"></a> <h4>QRegExpWizardWidget (Constructor)</h4> -<b>QRegExpWizardWidget</b>(<i>parent = None, fromEric = True</i>) +<b>QRegExpWizardWidget</b>(<i>parent=None, fromEric=True</i>) <p> Constructor </p><dl> @@ -275,7 +275,7 @@ Private slot to handle the end line toolbutton. </p><a NAME="QRegExpWizardWidget.on_executeButton_clicked" ID="QRegExpWizardWidget.on_executeButton_clicked"></a> <h4>QRegExpWizardWidget.on_executeButton_clicked</h4> -<b>on_executeButton_clicked</b>(<i>startpos = 0</i>) +<b>on_executeButton_clicked</b>(<i>startpos=0</i>) <p> Private slot to execute the entered regexp on the test text. </p><p> @@ -374,7 +374,7 @@ </table> <a NAME="QRegExpWizardWindow.__init__" ID="QRegExpWizardWindow.__init__"></a> <h4>QRegExpWizardWindow (Constructor)</h4> -<b>QRegExpWizardWindow</b>(<i>parent = None</i>) +<b>QRegExpWizardWindow</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardRepeatDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="QRegExpWizardRepeatDialog.__init__" ID="QRegExpWizardRepeatDialog.__init__"></a> <h4>QRegExpWizardRepeatDialog (Constructor)</h4> -<b>QRegExpWizardRepeatDialog</b>(<i>parent = None</i>) +<b>QRegExpWizardRepeatDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Preferences.ConfigurationDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="ConfigurationDialog.__init__" ID="ConfigurationDialog.__init__"></a> <h4>ConfigurationDialog (Constructor)</h4> -<b>ConfigurationDialog</b>(<i>parent = None, name = None, modal = False, fromEric = True, displayMode = ConfigurationWidget.DefaultMode</i>) +<b>ConfigurationDialog</b>(<i>parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode</i>) <p> Constructor </p><dl> @@ -263,7 +263,7 @@ </table> <a NAME="ConfigurationWidget.__init__" ID="ConfigurationWidget.__init__"></a> <h4>ConfigurationWidget (Constructor)</h4> -<b>ConfigurationWidget</b>(<i>parent = None, fromEric = True, displayMode = DefaultMode</i>) +<b>ConfigurationWidget</b>(<i>parent=None, fromEric=True, displayMode=DefaultMode</i>) <p> Constructor </p><dl> @@ -442,7 +442,7 @@ </table> <a NAME="ConfigurationWindow.__init__" ID="ConfigurationWindow.__init__"></a> <h4>ConfigurationWindow (Constructor)</h4> -<b>ConfigurationWindow</b>(<i>parent = None</i>) +<b>ConfigurationWindow</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -454,7 +454,7 @@ <h4>ConfigurationWindow.accept</h4> <b>accept</b>(<i></i>) <p> - Protected slot called by the Ok button. + Protected slot called by the Ok button. </p><a NAME="ConfigurationWindow.showConfigurationPageByName" ID="ConfigurationWindow.showConfigurationPageByName"></a> <h4>ConfigurationWindow.showConfigurationPageByName</h4> <b>showConfigurationPageByName</b>(<i>pageName</i>)
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.ConfigurationPageBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.ConfigurationPageBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -114,7 +114,7 @@ Public method to save the current state of the widget. </p><a NAME="ConfigurationPageBase.selectColour" ID="ConfigurationPageBase.selectColour"></a> <h4>ConfigurationPageBase.selectColour</h4> -<b>selectColour</b>(<i>button, colourVar, showAlpha = False</i>) +<b>selectColour</b>(<i>button, colourVar, showAlpha=False</i>) <p> Public method used by the colour selection buttons. </p><dl> @@ -136,7 +136,7 @@ </dd> </dl><a NAME="ConfigurationPageBase.selectFont" ID="ConfigurationPageBase.selectFont"></a> <h4>ConfigurationPageBase.selectFont</h4> -<b>selectFont</b>(<i>fontSample, fontVar, showFontInfo = False</i>) +<b>selectFont</b>(<i>fontSample, fontVar, showFontInfo=False</i>) <p> Public method used by the font selection buttons. </p><dl>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.CooperationPage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.CooperationPage.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>CooperationPage.on_deleteBannedUsersButton_clicked</h4> <b>on_deleteBannedUsersButton_clicked</b>(<i></i>) <p> - Private slot to remove the selected users from the list of + Private slot to remove the selected users from the list of banned users. </p><a NAME="CooperationPage.save" ID="CooperationPage.save"></a> <h4>CooperationPage.save</h4>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorFilePage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorFilePage.html Fri Mar 11 16:51:57 2011 +0100 @@ -115,7 +115,7 @@ Private method to extract the file filters. </p><a NAME="EditorFilePage.__setDefaultFiltersLists" ID="EditorFilePage.__setDefaultFiltersLists"></a> <h4>EditorFilePage.__setDefaultFiltersLists</h4> -<b>__setDefaultFiltersLists</b>(<i>keepSelection = False</i>) +<b>__setDefaultFiltersLists</b>(<i>keepSelection=False</i>) <p> Private slot to set the default file filter combo boxes. </p><dl>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html Fri Mar 11 16:51:57 2011 +0100 @@ -213,7 +213,7 @@ <h4>EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked</h4> <b>on_allBackgroundColoursButton_clicked</b>(<i></i>) <p> - Private method used to select the background colour of all styles of a + Private method used to select the background colour of all styles of a selected lexer. </p><a NAME="EditorHighlightingStylesPage.on_allDefaultButton_clicked" ID="EditorHighlightingStylesPage.on_allDefaultButton_clicked"></a> <h4>EditorHighlightingStylesPage.on_allDefaultButton_clicked</h4> @@ -229,7 +229,7 @@ <h4>EditorHighlightingStylesPage.on_backgroundButton_clicked</h4> <b>on_backgroundButton_clicked</b>(<i></i>) <p> - Private method used to select the background colour of the selected style + Private method used to select the background colour of the selected style and lexer. </p><a NAME="EditorHighlightingStylesPage.on_defaultButton_clicked" ID="EditorHighlightingStylesPage.on_defaultButton_clicked"></a> <h4>EditorHighlightingStylesPage.on_defaultButton_clicked</h4> @@ -260,7 +260,7 @@ <h4>EditorHighlightingStylesPage.on_foregroundButton_clicked</h4> <b>on_foregroundButton_clicked</b>(<i></i>) <p> - Private method used to select the foreground colour of the selected style + Private method used to select the foreground colour of the selected style and lexer. </p><a NAME="EditorHighlightingStylesPage.on_importAllButton_clicked" ID="EditorHighlightingStylesPage.on_importAllButton_clicked"></a> <h4>EditorHighlightingStylesPage.on_importAllButton_clicked</h4>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.InterfacePage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.InterfacePage.html Fri Mar 11 16:51:57 2011 +0100 @@ -88,7 +88,7 @@ <h4>InterfacePage.__populateLanguageCombo</h4> <b>__populateLanguageCombo</b>(<i></i>) <p> - Private method to initialize the language combobox of the Interface + Private method to initialize the language combobox of the Interface configuration page. </p><a NAME="InterfacePage.__populateStyleCombo" ID="InterfacePage.__populateStyleCombo"></a> <h4>InterfacePage.__populateStyleCombo</h4>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.ProjectBrowserPage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.ProjectBrowserPage.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ <h4>ProjectBrowserPage.on_pbHighlightedButton_clicked</h4> <b>on_pbHighlightedButton_clicked</b>(<i></i>) <p> - Private slot to set the colour for highlighted entries of the + Private slot to set the colour for highlighted entries of the project others browser. </p><a NAME="ProjectBrowserPage.on_projectTypeCombo_activated" ID="ProjectBrowserPage.on_projectTypeCombo_activated"></a> <h4>ProjectBrowserPage.on_projectTypeCombo_activated</h4>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.TrayStarterPage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.TrayStarterPage.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="TrayStarterPage.__init__" ID="TrayStarterPage.__init__"></a> <h4>TrayStarterPage (Constructor)</h4> -<b>TrayStarterPage</b>(<i>parent = None</i>) +<b>TrayStarterPage</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.VcsPage.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.VcsPage.html Fri Mar 11 16:51:57 2011 +0100 @@ -91,37 +91,37 @@ <h4>VcsPage.on_pbVcsAddedButton_clicked</h4> <b>on_pbVcsAddedButton_clicked</b>(<i></i>) <p> - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "added". </p><a NAME="VcsPage.on_pbVcsConflictButton_clicked" ID="VcsPage.on_pbVcsConflictButton_clicked"></a> <h4>VcsPage.on_pbVcsConflictButton_clicked</h4> <b>on_pbVcsConflictButton_clicked</b>(<i></i>) <p> - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "conflict". </p><a NAME="VcsPage.on_pbVcsModifiedButton_clicked" ID="VcsPage.on_pbVcsModifiedButton_clicked"></a> <h4>VcsPage.on_pbVcsModifiedButton_clicked</h4> <b>on_pbVcsModifiedButton_clicked</b>(<i></i>) <p> - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "modified". </p><a NAME="VcsPage.on_pbVcsRemovedButton_clicked" ID="VcsPage.on_pbVcsRemovedButton_clicked"></a> <h4>VcsPage.on_pbVcsRemovedButton_clicked</h4> <b>on_pbVcsRemovedButton_clicked</b>(<i></i>) <p> - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "removed". </p><a NAME="VcsPage.on_pbVcsReplacedButton_clicked" ID="VcsPage.on_pbVcsReplacedButton_clicked"></a> <h4>VcsPage.on_pbVcsReplacedButton_clicked</h4> <b>on_pbVcsReplacedButton_clicked</b>(<i></i>) <p> - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "replaced". </p><a NAME="VcsPage.on_pbVcsUpdateButton_clicked" ID="VcsPage.on_pbVcsUpdateButton_clicked"></a> <h4>VcsPage.on_pbVcsUpdateButton_clicked</h4> <b>on_pbVcsUpdateButton_clicked</b>(<i></i>) <p> - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "needs update". </p><a NAME="VcsPage.save" ID="VcsPage.save"></a> <h4>VcsPage.save</h4>
--- a/Documentation/Source/eric5.Preferences.PreferencesLexer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.PreferencesLexer.html Fri Mar 11 16:51:57 2011 +0100 @@ -49,8 +49,6 @@ <a NAME="PreferencesLexer" ID="PreferencesLexer"></a> <h2>PreferencesLexer</h2> <p> - -</p><p> Subclass of QsciLexer to implement preferences specific lexer methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.Preferences.ProgramsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ProgramsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="ProgramsDialog.__init__" ID="ProgramsDialog.__init__"></a> <h4>ProgramsDialog (Constructor)</h4> -<b>ProgramsDialog</b>(<i>parent = None</i>) +<b>ProgramsDialog</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -101,7 +101,7 @@ </dd> </dl><a NAME="ProgramsDialog.__createProgramEntry" ID="ProgramsDialog.__createProgramEntry"></a> <h4>ProgramsDialog.__createProgramEntry</h4> -<b>__createProgramEntry</b>(<i>description, exe, versionCommand = "", versionStartsWith = "", versionPosition = 0, version = "", versionCleanup = None, versionRe = None</i>) +<b>__createProgramEntry</b>(<i>description, exe, versionCommand="", versionStartsWith="", versionPosition=0, version="", versionCleanup=None, versionRe=None</i>) <p> Private method to generate a program entry. </p><dl>
--- a/Documentation/Source/eric5.Preferences.ShortcutDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ShortcutDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -88,7 +88,7 @@ </table> <a NAME="ShortcutDialog.__init__" ID="ShortcutDialog.__init__"></a> <h4>ShortcutDialog (Constructor)</h4> -<b>ShortcutDialog</b>(<i>parent = None, name = None, modal = False</i>) +<b>ShortcutDialog</b>(<i>parent=None, name=None, modal=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Preferences.Shortcuts.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.Shortcuts.html Fri Mar 11 16:51:57 2011 +0100 @@ -143,7 +143,7 @@ <hr /><hr /> <a NAME="readShortcuts" ID="readShortcuts"></a> <h2>readShortcuts</h2> -<b>readShortcuts</b>(<i>prefClass = Prefs, helpViewer = None, pluginName = None</i>) +<b>readShortcuts</b>(<i>prefClass=Prefs, helpViewer=None, pluginName=None</i>) <p> Module function to read the keyboard shortcuts for the defined QActions. </p><dl> @@ -162,7 +162,7 @@ <hr /><hr /> <a NAME="saveShortcuts" ID="saveShortcuts"></a> <h2>saveShortcuts</h2> -<b>saveShortcuts</b>(<i>prefClass = Prefs</i>) +<b>saveShortcuts</b>(<i>prefClass=Prefs</i>) <p> Module function to write the keyboard shortcuts for the defined QActions. </p><dl>
--- a/Documentation/Source/eric5.Preferences.ShortcutsDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ShortcutsDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -114,7 +114,7 @@ </table> <a NAME="ShortcutsDialog.__init__" ID="ShortcutsDialog.__init__"></a> <h4>ShortcutsDialog (Constructor)</h4> -<b>ShortcutsDialog</b>(<i>parent = None, name = None, modal = False</i>) +<b>ShortcutsDialog</b>(<i>parent=None, name=None, modal=False</i>) <p> Constructor </p><dl> @@ -168,7 +168,7 @@ </dd> </dl><a NAME="ShortcutsDialog.__generateShortcutItem" ID="ShortcutsDialog.__generateShortcutItem"></a> <h4>ShortcutsDialog.__generateShortcutItem</h4> -<b>__generateShortcutItem</b>(<i>category, action, noCheck = False, objectType = ""</i>) +<b>__generateShortcutItem</b>(<i>category, action, noCheck=False, objectType=""</i>) <p> Private method to generate a keyboard shortcut item. </p><dl>
--- a/Documentation/Source/eric5.Preferences.ToolConfigurationDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ToolConfigurationDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -165,7 +165,7 @@ <h4>ToolConfigurationDialog.getToollist</h4> <b>getToollist</b>(<i></i>) <p> - Public method to retrieve the tools list. + Public method to retrieve the tools list. </p><dl> <dt>Returns:</dt> <dd>
--- a/Documentation/Source/eric5.Preferences.ToolGroupConfigurationDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ToolGroupConfigurationDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="ToolGroupConfigurationDialog.__init__" ID="ToolGroupConfigurationDialog.__init__"></a> <h4>ToolGroupConfigurationDialog (Constructor)</h4> -<b>ToolGroupConfigurationDialog</b>(<i>toolGroups, currentGroup, parent = None</i>) +<b>ToolGroupConfigurationDialog</b>(<i>toolGroups, currentGroup, parent=None</i>) <p> Constructor </p><dl> @@ -118,7 +118,7 @@ <h4>ToolGroupConfigurationDialog.getToolGroups</h4> <b>getToolGroups</b>(<i></i>) <p> - Public method to retrieve the tool groups. + Public method to retrieve the tool groups. </p><dl> <dt>Returns:</dt> <dd>
--- a/Documentation/Source/eric5.Preferences.ViewProfileDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.ViewProfileDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="ViewProfileDialog.__init__" ID="ViewProfileDialog.__init__"></a> <h4>ViewProfileDialog (Constructor)</h4> -<b>ViewProfileDialog</b>(<i>layout, profiles, separateShell, separateBrowser, parent = None</i>) +<b>ViewProfileDialog</b>(<i>layout, profiles, separateShell, separateBrowser, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Preferences.__init__.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Preferences.__init__.html Fri Mar 11 16:51:57 2011 +0100 @@ -27,8 +27,8 @@ The preferences interface consists of a class, which defines the default values for all configuration items and stores the actual values. These values are read and written to the eric5 preferences file by module -functions. The data is stored in a file in a subdirectory of the users home -directory. The individual configuration data is accessed by accessor functions +functions. The data is stored in a file in a subdirectory of the users home +directory. The individual configuration data is accessed by accessor functions defined on the module level. The module is simply imported wherever it is needed with the statement 'import Preferences'. Do not use 'from Preferences import *' to import it. @@ -357,7 +357,7 @@ <hr /><hr /> <a NAME="exportPreferences" ID="exportPreferences"></a> <h2>exportPreferences</h2> -<b>exportPreferences</b>(<i>prefClass = Prefs</i>) +<b>exportPreferences</b>(<i>prefClass=Prefs</i>) <p> Module function to export the current preferences. </p><dl> @@ -370,7 +370,7 @@ <hr /><hr /> <a NAME="getCooperation" ID="getCooperation"></a> <h2>getCooperation</h2> -<b>getCooperation</b>(<i>key, prefClass = Prefs</i>) +<b>getCooperation</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various Cooperation settings. </p><dl> @@ -391,7 +391,7 @@ <hr /><hr /> <a NAME="getCorba" ID="getCorba"></a> <h2>getCorba</h2> -<b>getCorba</b>(<i>key, prefClass = Prefs</i>) +<b>getCorba</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various corba settings. </p><dl> @@ -412,7 +412,7 @@ <hr /><hr /> <a NAME="getDebugger" ID="getDebugger"></a> <h2>getDebugger</h2> -<b>getDebugger</b>(<i>key, prefClass = Prefs</i>) +<b>getDebugger</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the debugger settings. </p><dl> @@ -433,7 +433,7 @@ <hr /><hr /> <a NAME="getEditor" ID="getEditor"></a> <h2>getEditor</h2> -<b>getEditor</b>(<i>key, prefClass = Prefs</i>) +<b>getEditor</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various editor settings. </p><dl> @@ -454,7 +454,7 @@ <hr /><hr /> <a NAME="getEditorAPI" ID="getEditorAPI"></a> <h2>getEditorAPI</h2> -<b>getEditorAPI</b>(<i>key, prefClass = Prefs</i>) +<b>getEditorAPI</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various lists of api files. </p><dl> @@ -475,7 +475,7 @@ <hr /><hr /> <a NAME="getEditorColour" ID="getEditorColour"></a> <h2>getEditorColour</h2> -<b>getEditorColour</b>(<i>key, prefClass = Prefs</i>) +<b>getEditorColour</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various editor marker colours. </p><dl> @@ -496,7 +496,7 @@ <hr /><hr /> <a NAME="getEditorExporter" ID="getEditorExporter"></a> <h2>getEditorExporter</h2> -<b>getEditorExporter</b>(<i>key, prefClass = Prefs</i>) +<b>getEditorExporter</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various editor exporters settings. </p><dl> @@ -517,7 +517,7 @@ <hr /><hr /> <a NAME="getEditorKeywords" ID="getEditorKeywords"></a> <h2>getEditorKeywords</h2> -<b>getEditorKeywords</b>(<i>key, prefClass = Prefs</i>) +<b>getEditorKeywords</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various lists of language keywords. </p><dl> @@ -538,7 +538,7 @@ <hr /><hr /> <a NAME="getEditorLexerAssoc" ID="getEditorLexerAssoc"></a> <h2>getEditorLexerAssoc</h2> -<b>getEditorLexerAssoc</b>(<i>filename, prefClass = Prefs</i>) +<b>getEditorLexerAssoc</b>(<i>filename, prefClass=Prefs</i>) <p> Module function to retrieve a lexer association. </p><dl> @@ -559,7 +559,7 @@ <hr /><hr /> <a NAME="getEditorLexerAssocs" ID="getEditorLexerAssocs"></a> <h2>getEditorLexerAssocs</h2> -<b>getEditorLexerAssocs</b>(<i>prefClass = Prefs</i>) +<b>getEditorLexerAssocs</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve all lexer associations. </p><dl> @@ -578,7 +578,7 @@ <hr /><hr /> <a NAME="getEditorOtherFonts" ID="getEditorOtherFonts"></a> <h2>getEditorOtherFonts</h2> -<b>getEditorOtherFonts</b>(<i>key, prefClass = Prefs</i>) +<b>getEditorOtherFonts</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various editor fonts except the lexer fonts. </p><dl> @@ -599,7 +599,7 @@ <hr /><hr /> <a NAME="getEditorTyping" ID="getEditorTyping"></a> <h2>getEditorTyping</h2> -<b>getEditorTyping</b>(<i>key, prefClass = Prefs</i>) +<b>getEditorTyping</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various editor typing settings. </p><dl> @@ -620,7 +620,7 @@ <hr /><hr /> <a NAME="getFlakes" ID="getFlakes"></a> <h2>getFlakes</h2> -<b>getFlakes</b>(<i>key, prefClass = Prefs</i>) +<b>getFlakes</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the py3flakes related settings. </p><dl> @@ -641,7 +641,7 @@ <hr /><hr /> <a NAME="getGeometry" ID="getGeometry"></a> <h2>getGeometry</h2> -<b>getGeometry</b>(<i>key, prefClass = Prefs</i>) +<b>getGeometry</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the display geometry. </p><dl> @@ -662,7 +662,7 @@ <hr /><hr /> <a NAME="getGraphics" ID="getGraphics"></a> <h2>getGraphics</h2> -<b>getGraphics</b>(<i>key, prefClass = Prefs</i>) +<b>getGraphics</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the Graphics related settings. </p><dl> @@ -683,7 +683,7 @@ <hr /><hr /> <a NAME="getHelp" ID="getHelp"></a> <h2>getHelp</h2> -<b>getHelp</b>(<i>key, prefClass = Prefs</i>) +<b>getHelp</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various help settings. </p><dl> @@ -704,7 +704,7 @@ <hr /><hr /> <a NAME="getIconEditor" ID="getIconEditor"></a> <h2>getIconEditor</h2> -<b>getIconEditor</b>(<i>key, prefClass = Prefs</i>) +<b>getIconEditor</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the Icon Editor related settings. </p><dl> @@ -725,7 +725,7 @@ <hr /><hr /> <a NAME="getIcons" ID="getIcons"></a> <h2>getIcons</h2> -<b>getIcons</b>(<i>key, prefClass = Prefs</i>) +<b>getIcons</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various Icons settings. </p><dl> @@ -746,7 +746,7 @@ <hr /><hr /> <a NAME="getMultiProject" ID="getMultiProject"></a> <h2>getMultiProject</h2> -<b>getMultiProject</b>(<i>key, prefClass = Prefs</i>) +<b>getMultiProject</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various project handling settings. </p><dl> @@ -767,7 +767,7 @@ <hr /><hr /> <a NAME="getPluginManager" ID="getPluginManager"></a> <h2>getPluginManager</h2> -<b>getPluginManager</b>(<i>key, prefClass = Prefs</i>) +<b>getPluginManager</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the plugin manager related settings. </p><dl> @@ -788,7 +788,7 @@ <hr /><hr /> <a NAME="getPrinter" ID="getPrinter"></a> <h2>getPrinter</h2> -<b>getPrinter</b>(<i>key, prefClass = Prefs</i>) +<b>getPrinter</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various printer settings. </p><dl> @@ -809,7 +809,7 @@ <hr /><hr /> <a NAME="getProject" ID="getProject"></a> <h2>getProject</h2> -<b>getProject</b>(<i>key, prefClass = Prefs</i>) +<b>getProject</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various project handling settings. </p><dl> @@ -830,7 +830,7 @@ <hr /><hr /> <a NAME="getProjectBrowserColour" ID="getProjectBrowserColour"></a> <h2>getProjectBrowserColour</h2> -<b>getProjectBrowserColour</b>(<i>key, prefClass = Prefs</i>) +<b>getProjectBrowserColour</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various project browser colours. </p><dl> @@ -851,7 +851,7 @@ <hr /><hr /> <a NAME="getProjectBrowserFlags" ID="getProjectBrowserFlags"></a> <h2>getProjectBrowserFlags</h2> -<b>getProjectBrowserFlags</b>(<i>key, prefClass = Prefs</i>) +<b>getProjectBrowserFlags</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various project browser flags settings. </p><dl> @@ -872,7 +872,7 @@ <hr /><hr /> <a NAME="getPython" ID="getPython"></a> <h2>getPython</h2> -<b>getPython</b>(<i>key, prefClass = Prefs</i>) +<b>getPython</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the Python settings. </p><dl> @@ -893,7 +893,7 @@ <hr /><hr /> <a NAME="getQt" ID="getQt"></a> <h2>getQt</h2> -<b>getQt</b>(<i>key, prefClass = Prefs</i>) +<b>getQt</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various Qt settings. </p><dl> @@ -914,7 +914,7 @@ <hr /><hr /> <a NAME="getQt4DocDir" ID="getQt4DocDir"></a> <h2>getQt4DocDir</h2> -<b>getQt4DocDir</b>(<i>prefClass = Prefs</i>) +<b>getQt4DocDir</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve the Qt4DocDir setting. </p><dl> @@ -932,7 +932,7 @@ <hr /><hr /> <a NAME="getQt4TranslationsDir" ID="getQt4TranslationsDir"></a> <h2>getQt4TranslationsDir</h2> -<b>getQt4TranslationsDir</b>(<i>prefClass = Prefs</i>) +<b>getQt4TranslationsDir</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve the Qt4TranslationsDir setting. </p><dl> @@ -950,7 +950,7 @@ <hr /><hr /> <a NAME="getShell" ID="getShell"></a> <h2>getShell</h2> -<b>getShell</b>(<i>key, prefClass = Prefs</i>) +<b>getShell</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various shell settings. </p><dl> @@ -971,7 +971,7 @@ <hr /><hr /> <a NAME="getSystem" ID="getSystem"></a> <h2>getSystem</h2> -<b>getSystem</b>(<i>key, prefClass = Prefs</i>) +<b>getSystem</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various system settings. </p><dl> @@ -992,7 +992,7 @@ <hr /><hr /> <a NAME="getTasks" ID="getTasks"></a> <h2>getTasks</h2> -<b>getTasks</b>(<i>key, prefClass = Prefs</i>) +<b>getTasks</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the Tasks related settings. </p><dl> @@ -1013,7 +1013,7 @@ <hr /><hr /> <a NAME="getTemplates" ID="getTemplates"></a> <h2>getTemplates</h2> -<b>getTemplates</b>(<i>key, prefClass = Prefs</i>) +<b>getTemplates</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the Templates related settings. </p><dl> @@ -1034,7 +1034,7 @@ <hr /><hr /> <a NAME="getTerminal" ID="getTerminal"></a> <h2>getTerminal</h2> -<b>getTerminal</b>(<i>key, prefClass = Prefs</i>) +<b>getTerminal</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various terminal settings. </p><dl> @@ -1055,7 +1055,7 @@ <hr /><hr /> <a NAME="getTrayStarter" ID="getTrayStarter"></a> <h2>getTrayStarter</h2> -<b>getTrayStarter</b>(<i>key, prefClass = Prefs</i>) +<b>getTrayStarter</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the tray starter related settings. </p><dl> @@ -1076,7 +1076,7 @@ <hr /><hr /> <a NAME="getUI" ID="getUI"></a> <h2>getUI</h2> -<b>getUI</b>(<i>key, prefClass = Prefs</i>) +<b>getUI</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various UI settings. </p><dl> @@ -1097,7 +1097,7 @@ <hr /><hr /> <a NAME="getUILanguage" ID="getUILanguage"></a> <h2>getUILanguage</h2> -<b>getUILanguage</b>(<i>prefClass = Prefs</i>) +<b>getUILanguage</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve the language for the user interface. </p><dl> @@ -1115,7 +1115,7 @@ <hr /><hr /> <a NAME="getUILayout" ID="getUILayout"></a> <h2>getUILayout</h2> -<b>getUILayout</b>(<i>prefClass = Prefs</i>) +<b>getUILayout</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve the layout for the user interface. </p><dl> @@ -1134,7 +1134,7 @@ <hr /><hr /> <a NAME="getUser" ID="getUser"></a> <h2>getUser</h2> -<b>getUser</b>(<i>key, prefClass = Prefs</i>) +<b>getUser</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the various user settings. </p><dl> @@ -1155,7 +1155,7 @@ <hr /><hr /> <a NAME="getVCS" ID="getVCS"></a> <h2>getVCS</h2> -<b>getVCS</b>(<i>key, prefClass = Prefs</i>) +<b>getVCS</b>(<i>key, prefClass=Prefs</i>) <p> Module function to retrieve the VCS related settings. </p><dl> @@ -1176,7 +1176,7 @@ <hr /><hr /> <a NAME="getVarFilters" ID="getVarFilters"></a> <h2>getVarFilters</h2> -<b>getVarFilters</b>(<i>prefClass = Prefs</i>) +<b>getVarFilters</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve the variables filter settings. </p><dl> @@ -1194,7 +1194,7 @@ <hr /><hr /> <a NAME="getViewManager" ID="getViewManager"></a> <h2>getViewManager</h2> -<b>getViewManager</b>(<i>prefClass = Prefs</i>) +<b>getViewManager</b>(<i>prefClass=Prefs</i>) <p> Module function to retrieve the selected viewmanager type. </p><dl> @@ -1212,7 +1212,7 @@ <hr /><hr /> <a NAME="importPreferences" ID="importPreferences"></a> <h2>importPreferences</h2> -<b>importPreferences</b>(<i>prefClass = Prefs</i>) +<b>importPreferences</b>(<i>prefClass=Prefs</i>) <p> Module function to import preferences from a file previously saved by the export function. @@ -1228,7 +1228,7 @@ <h2>initPreferences</h2> <b>initPreferences</b>(<i></i>) <p> - Module function to initialize the central configuration store. + Module function to initialize the central configuration store. </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -1237,7 +1237,7 @@ <b>initRecentSettings</b>(<i></i>) <p> Module function to initialize the central configuration store for recently - opened files and projects. + opened files and projects. </p><p> This function is called once upon import of the module. </p> @@ -1245,7 +1245,7 @@ <hr /><hr /> <a NAME="isConfigured" ID="isConfigured"></a> <h2>isConfigured</h2> -<b>isConfigured</b>(<i>prefClass = Prefs</i>) +<b>isConfigured</b>(<i>prefClass=Prefs</i>) <p> Module function to check, if the the application has been configured. </p><dl> @@ -1263,7 +1263,7 @@ <hr /><hr /> <a NAME="readToolGroups" ID="readToolGroups"></a> <h2>readToolGroups</h2> -<b>readToolGroups</b>(<i>prefClass = Prefs</i>) +<b>readToolGroups</b>(<i>prefClass=Prefs</i>) <p> Module function to read the tool groups configuration. </p><dl> @@ -1281,7 +1281,7 @@ <hr /><hr /> <a NAME="removeProjectBrowserFlags" ID="removeProjectBrowserFlags"></a> <h2>removeProjectBrowserFlags</h2> -<b>removeProjectBrowserFlags</b>(<i>key, prefClass = Prefs</i>) +<b>removeProjectBrowserFlags</b>(<i>key, prefClass=Prefs</i>) <p> Module function to remove a project browser flags setting. </p><dl> @@ -1297,7 +1297,7 @@ <hr /><hr /> <a NAME="resetLayout" ID="resetLayout"></a> <h2>resetLayout</h2> -<b>resetLayout</b>(<i>prefClass = Prefs</i>) +<b>resetLayout</b>(<i>prefClass=Prefs</i>) <p> Module function to set a flag not storing the current layout. </p><dl> @@ -1310,7 +1310,7 @@ <hr /><hr /> <a NAME="saveResetLayout" ID="saveResetLayout"></a> <h2>saveResetLayout</h2> -<b>saveResetLayout</b>(<i>prefClass = Prefs</i>) +<b>saveResetLayout</b>(<i>prefClass=Prefs</i>) <p> Module function to save the reset layout. </p> @@ -1318,7 +1318,7 @@ <hr /><hr /> <a NAME="saveToolGroups" ID="saveToolGroups"></a> <h2>saveToolGroups</h2> -<b>saveToolGroups</b>(<i>toolGroups, currentGroup, prefClass = Prefs</i>) +<b>saveToolGroups</b>(<i>toolGroups, currentGroup, prefClass=Prefs</i>) <p> Module function to write the tool groups configuration. </p><dl> @@ -1337,7 +1337,7 @@ <hr /><hr /> <a NAME="setCooperation" ID="setCooperation"></a> <h2>setCooperation</h2> -<b>setCooperation</b>(<i>key, value, prefClass = Prefs</i>) +<b>setCooperation</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various Cooperation settings. </p><dl> @@ -1356,7 +1356,7 @@ <hr /><hr /> <a NAME="setCorba" ID="setCorba"></a> <h2>setCorba</h2> -<b>setCorba</b>(<i>key, value, prefClass = Prefs</i>) +<b>setCorba</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various corba settings. </p><dl> @@ -1375,7 +1375,7 @@ <hr /><hr /> <a NAME="setDebugger" ID="setDebugger"></a> <h2>setDebugger</h2> -<b>setDebugger</b>(<i>key, value, prefClass = Prefs</i>) +<b>setDebugger</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the debugger settings. </p><dl> @@ -1394,7 +1394,7 @@ <hr /><hr /> <a NAME="setEditor" ID="setEditor"></a> <h2>setEditor</h2> -<b>setEditor</b>(<i>key, value, prefClass = Prefs</i>) +<b>setEditor</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various editor settings. </p><dl> @@ -1413,7 +1413,7 @@ <hr /><hr /> <a NAME="setEditorAPI" ID="setEditorAPI"></a> <h2>setEditorAPI</h2> -<b>setEditorAPI</b>(<i>key, apilist, prefClass = Prefs</i>) +<b>setEditorAPI</b>(<i>key, apilist, prefClass=Prefs</i>) <p> Module function to store the various lists of api files. </p><dl> @@ -1432,7 +1432,7 @@ <hr /><hr /> <a NAME="setEditorColour" ID="setEditorColour"></a> <h2>setEditorColour</h2> -<b>setEditorColour</b>(<i>key, value, prefClass = Prefs</i>) +<b>setEditorColour</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various editor marker colours. </p><dl> @@ -1451,7 +1451,7 @@ <hr /><hr /> <a NAME="setEditorExporter" ID="setEditorExporter"></a> <h2>setEditorExporter</h2> -<b>setEditorExporter</b>(<i>key, value, prefClass = Prefs</i>) +<b>setEditorExporter</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various editor exporters settings. </p><dl> @@ -1470,7 +1470,7 @@ <hr /><hr /> <a NAME="setEditorKeywords" ID="setEditorKeywords"></a> <h2>setEditorKeywords</h2> -<b>setEditorKeywords</b>(<i>key, keywordsLists, prefClass = Prefs</i>) +<b>setEditorKeywords</b>(<i>key, keywordsLists, prefClass=Prefs</i>) <p> Module function to store the various lists of language keywords. </p><dl> @@ -1489,7 +1489,7 @@ <hr /><hr /> <a NAME="setEditorLexerAssocs" ID="setEditorLexerAssocs"></a> <h2>setEditorLexerAssocs</h2> -<b>setEditorLexerAssocs</b>(<i>assocs, prefClass = Prefs</i>) +<b>setEditorLexerAssocs</b>(<i>assocs, prefClass=Prefs</i>) <p> Module function to retrieve all lexer associations. </p><dl> @@ -1505,7 +1505,7 @@ <hr /><hr /> <a NAME="setEditorOtherFonts" ID="setEditorOtherFonts"></a> <h2>setEditorOtherFonts</h2> -<b>setEditorOtherFonts</b>(<i>key, font, prefClass = Prefs</i>) +<b>setEditorOtherFonts</b>(<i>key, font, prefClass=Prefs</i>) <p> Module function to store the various editor fonts except the lexer fonts. </p><dl> @@ -1524,7 +1524,7 @@ <hr /><hr /> <a NAME="setEditorTyping" ID="setEditorTyping"></a> <h2>setEditorTyping</h2> -<b>setEditorTyping</b>(<i>key, value, prefClass = Prefs</i>) +<b>setEditorTyping</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various editor typing settings. </p><dl> @@ -1543,7 +1543,7 @@ <hr /><hr /> <a NAME="setFlakes" ID="setFlakes"></a> <h2>setFlakes</h2> -<b>setFlakes</b>(<i>key, value, prefClass = Prefs</i>) +<b>setFlakes</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the py3flakes related settings. </p><dl> @@ -1562,7 +1562,7 @@ <hr /><hr /> <a NAME="setGeometry" ID="setGeometry"></a> <h2>setGeometry</h2> -<b>setGeometry</b>(<i>key, value, prefClass = Prefs</i>) +<b>setGeometry</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the display geometry. </p><dl> @@ -1581,7 +1581,7 @@ <hr /><hr /> <a NAME="setGraphics" ID="setGraphics"></a> <h2>setGraphics</h2> -<b>setGraphics</b>(<i>key, value, prefClass = Prefs</i>) +<b>setGraphics</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the Graphics related settings. </p><dl> @@ -1600,7 +1600,7 @@ <hr /><hr /> <a NAME="setHelp" ID="setHelp"></a> <h2>setHelp</h2> -<b>setHelp</b>(<i>key, value, prefClass = Prefs</i>) +<b>setHelp</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various help settings. </p><dl> @@ -1619,7 +1619,7 @@ <hr /><hr /> <a NAME="setIconEditor" ID="setIconEditor"></a> <h2>setIconEditor</h2> -<b>setIconEditor</b>(<i>key, value, prefClass = Prefs</i>) +<b>setIconEditor</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the Icon Editor related settings. </p><dl> @@ -1638,7 +1638,7 @@ <hr /><hr /> <a NAME="setIcons" ID="setIcons"></a> <h2>setIcons</h2> -<b>setIcons</b>(<i>key, value, prefClass = Prefs</i>) +<b>setIcons</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various Icons settings. </p><dl> @@ -1657,7 +1657,7 @@ <hr /><hr /> <a NAME="setMultiProject" ID="setMultiProject"></a> <h2>setMultiProject</h2> -<b>setMultiProject</b>(<i>key, value, prefClass = Prefs</i>) +<b>setMultiProject</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various project handling settings. </p><dl> @@ -1676,7 +1676,7 @@ <hr /><hr /> <a NAME="setPluginManager" ID="setPluginManager"></a> <h2>setPluginManager</h2> -<b>setPluginManager</b>(<i>key, value, prefClass = Prefs</i>) +<b>setPluginManager</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the plugin manager related settings. </p><dl> @@ -1695,7 +1695,7 @@ <hr /><hr /> <a NAME="setPrinter" ID="setPrinter"></a> <h2>setPrinter</h2> -<b>setPrinter</b>(<i>key, value, prefClass = Prefs</i>) +<b>setPrinter</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various printer settings. </p><dl> @@ -1714,7 +1714,7 @@ <hr /><hr /> <a NAME="setProject" ID="setProject"></a> <h2>setProject</h2> -<b>setProject</b>(<i>key, value, prefClass = Prefs</i>) +<b>setProject</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various project handling settings. </p><dl> @@ -1733,7 +1733,7 @@ <hr /><hr /> <a NAME="setProjectBrowserColour" ID="setProjectBrowserColour"></a> <h2>setProjectBrowserColour</h2> -<b>setProjectBrowserColour</b>(<i>key, value, prefClass = Prefs</i>) +<b>setProjectBrowserColour</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various project browser colours. </p><dl> @@ -1752,7 +1752,7 @@ <hr /><hr /> <a NAME="setProjectBrowserFlags" ID="setProjectBrowserFlags"></a> <h2>setProjectBrowserFlags</h2> -<b>setProjectBrowserFlags</b>(<i>key, value, prefClass = Prefs</i>) +<b>setProjectBrowserFlags</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various project browser flags settings. </p><dl> @@ -1771,7 +1771,7 @@ <hr /><hr /> <a NAME="setProjectBrowserFlagsDefault" ID="setProjectBrowserFlagsDefault"></a> <h2>setProjectBrowserFlagsDefault</h2> -<b>setProjectBrowserFlagsDefault</b>(<i>key, value, prefClass = Prefs</i>) +<b>setProjectBrowserFlagsDefault</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various project browser flags settings. </p><dl> @@ -1790,7 +1790,7 @@ <hr /><hr /> <a NAME="setPython" ID="setPython"></a> <h2>setPython</h2> -<b>setPython</b>(<i>key, value, prefClass = Prefs</i>) +<b>setPython</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the Python settings. </p><dl> @@ -1809,7 +1809,7 @@ <hr /><hr /> <a NAME="setQt" ID="setQt"></a> <h2>setQt</h2> -<b>setQt</b>(<i>key, value, prefClass = Prefs</i>) +<b>setQt</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various Qt settings. </p><dl> @@ -1828,7 +1828,7 @@ <hr /><hr /> <a NAME="setShell" ID="setShell"></a> <h2>setShell</h2> -<b>setShell</b>(<i>key, value, prefClass = Prefs</i>) +<b>setShell</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various shell settings. </p><dl> @@ -1847,7 +1847,7 @@ <hr /><hr /> <a NAME="setSystem" ID="setSystem"></a> <h2>setSystem</h2> -<b>setSystem</b>(<i>key, value, prefClass = Prefs</i>) +<b>setSystem</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various system settings. </p><dl> @@ -1866,7 +1866,7 @@ <hr /><hr /> <a NAME="setTasks" ID="setTasks"></a> <h2>setTasks</h2> -<b>setTasks</b>(<i>key, value, prefClass = Prefs</i>) +<b>setTasks</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the Tasks related settings. </p><dl> @@ -1885,7 +1885,7 @@ <hr /><hr /> <a NAME="setTemplates" ID="setTemplates"></a> <h2>setTemplates</h2> -<b>setTemplates</b>(<i>key, value, prefClass = Prefs</i>) +<b>setTemplates</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the Templates related settings. </p><dl> @@ -1904,7 +1904,7 @@ <hr /><hr /> <a NAME="setTerminal" ID="setTerminal"></a> <h2>setTerminal</h2> -<b>setTerminal</b>(<i>key, value, prefClass = Prefs</i>) +<b>setTerminal</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various terminal settings. </p><dl> @@ -1923,7 +1923,7 @@ <hr /><hr /> <a NAME="setTrayStarter" ID="setTrayStarter"></a> <h2>setTrayStarter</h2> -<b>setTrayStarter</b>(<i>key, value, prefClass = Prefs</i>) +<b>setTrayStarter</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the tray starter related settings. </p><dl> @@ -1942,7 +1942,7 @@ <hr /><hr /> <a NAME="setUI" ID="setUI"></a> <h2>setUI</h2> -<b>setUI</b>(<i>key, value, prefClass = Prefs</i>) +<b>setUI</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various UI settings. </p><dl> @@ -1961,7 +1961,7 @@ <hr /><hr /> <a NAME="setUILanguage" ID="setUILanguage"></a> <h2>setUILanguage</h2> -<b>setUILanguage</b>(<i>lang, prefClass = Prefs</i>) +<b>setUILanguage</b>(<i>lang, prefClass=Prefs</i>) <p> Module function to store the language for the user interface. </p><dl> @@ -1977,7 +1977,7 @@ <hr /><hr /> <a NAME="setUILayout" ID="setUILayout"></a> <h2>setUILayout</h2> -<b>setUILayout</b>(<i>layout, prefClass = Prefs</i>) +<b>setUILayout</b>(<i>layout, prefClass=Prefs</i>) <p> Module function to store the layout for the user interface. </p><dl> @@ -1993,7 +1993,7 @@ <hr /><hr /> <a NAME="setUser" ID="setUser"></a> <h2>setUser</h2> -<b>setUser</b>(<i>key, value, prefClass = Prefs</i>) +<b>setUser</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the various user settings. </p><dl> @@ -2012,7 +2012,7 @@ <hr /><hr /> <a NAME="setVCS" ID="setVCS"></a> <h2>setVCS</h2> -<b>setVCS</b>(<i>key, value, prefClass = Prefs</i>) +<b>setVCS</b>(<i>key, value, prefClass=Prefs</i>) <p> Module function to store the VCS related settings. </p><dl> @@ -2031,7 +2031,7 @@ <hr /><hr /> <a NAME="setVarFilters" ID="setVarFilters"></a> <h2>setVarFilters</h2> -<b>setVarFilters</b>(<i>filters, prefClass = Prefs</i>) +<b>setVarFilters</b>(<i>filters, prefClass=Prefs</i>) <p> Module function to store the variables filter settings. </p><dl> @@ -2044,7 +2044,7 @@ <hr /><hr /> <a NAME="setViewManager" ID="setViewManager"></a> <h2>setViewManager</h2> -<b>setViewManager</b>(<i>vm, prefClass = Prefs</i>) +<b>setViewManager</b>(<i>vm, prefClass=Prefs</i>) <p> Module function to store the selected viewmanager type. </p><dl> @@ -2060,7 +2060,7 @@ <hr /><hr /> <a NAME="shouldResetLayout" ID="shouldResetLayout"></a> <h2>shouldResetLayout</h2> -<b>shouldResetLayout</b>(<i>prefClass = Prefs</i>) +<b>shouldResetLayout</b>(<i>prefClass=Prefs</i>) <p> Module function to indicate a reset of the layout. </p><dl> @@ -2078,7 +2078,7 @@ <hr /><hr /> <a NAME="syncPreferences" ID="syncPreferences"></a> <h2>syncPreferences</h2> -<b>syncPreferences</b>(<i>prefClass = Prefs</i>) +<b>syncPreferences</b>(<i>prefClass=Prefs</i>) <p> Module function to sync the preferences to disk. </p><p>
--- a/Documentation/Source/eric5.Project.AddDirectoryDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.AddDirectoryDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="AddDirectoryDialog.__init__" ID="AddDirectoryDialog.__init__"></a> <h4>AddDirectoryDialog (Constructor)</h4> -<b>AddDirectoryDialog</b>(<i>pro, filter = 'source', parent = None, name = None, startdir = None</i>) +<b>AddDirectoryDialog</b>(<i>pro, filter='source', parent=None, name=None, startdir=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.AddFileDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.AddFileDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="AddFileDialog.__init__" ID="AddFileDialog.__init__"></a> <h4>AddFileDialog (Constructor)</h4> -<b>AddFileDialog</b>(<i>pro, parent = None, filter = None, name = None, startdir = None</i>) +<b>AddFileDialog</b>(<i>pro, parent=None, filter=None, name=None, startdir=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.AddFoundFilesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.AddFoundFilesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -77,7 +77,7 @@ </table> <a NAME="AddFoundFilesDialog.__init__" ID="AddFoundFilesDialog.__init__"></a> <h4>AddFoundFilesDialog (Constructor)</h4> -<b>AddFoundFilesDialog</b>(<i>files, parent = None, name = None</i>) +<b>AddFoundFilesDialog</b>(<i>files, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -105,7 +105,7 @@ <h4>AddFoundFilesDialog.on_addAllButton_clicked</h4> <b>on_addAllButton_clicked</b>(<i></i>) <p> - Private slot to handle the 'Add All' button press. + Private slot to handle the 'Add All' button press. </p><dl> <dt>Returns:</dt> <dd>
--- a/Documentation/Source/eric5.Project.AddLanguageDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.AddLanguageDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="AddLanguageDialog.__init__" ID="AddLanguageDialog.__init__"></a> <h4>AddLanguageDialog (Constructor)</h4> -<b>AddLanguageDialog</b>(<i>parent = None, name = None</i>) +<b>AddLanguageDialog</b>(<i>parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.CreateDialogCodeDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.CreateDialogCodeDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="CreateDialogCodeDialog.__init__" ID="CreateDialogCodeDialog.__init__"></a> <h4>CreateDialogCodeDialog (Constructor)</h4> -<b>CreateDialogCodeDialog</b>(<i>formName, project, parent = None</i>) +<b>CreateDialogCodeDialog</b>(<i>formName, project, parent=None</i>) <p> Constructor </p><dl> @@ -137,7 +137,7 @@ <h4>CreateDialogCodeDialog.__mapType</h4> <b>__mapType</b>(<i>type_</i>) <p> - Private method to map a type as reported by Qt's meta object to the + Private method to map a type as reported by Qt's meta object to the correct Python type. </p><dl> <dt><i>type_</i></dt>
--- a/Documentation/Source/eric5.Project.DebuggerPropertiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.DebuggerPropertiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="DebuggerPropertiesDialog.__init__" ID="DebuggerPropertiesDialog.__init__"></a> <h4>DebuggerPropertiesDialog (Constructor)</h4> -<b>DebuggerPropertiesDialog</b>(<i>project, parent = None, name = None</i>) +<b>DebuggerPropertiesDialog</b>(<i>project, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.FiletypeAssociationDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.FiletypeAssociationDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="FiletypeAssociationDialog.__init__" ID="FiletypeAssociationDialog.__init__"></a> <h4>FiletypeAssociationDialog (Constructor)</h4> -<b>FiletypeAssociationDialog</b>(<i>project, parent = None</i>) +<b>FiletypeAssociationDialog</b>(<i>project, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.LexerAssociationDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.LexerAssociationDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="LexerAssociationDialog.__init__" ID="LexerAssociationDialog.__init__"></a> <h4>LexerAssociationDialog (Constructor)</h4> -<b>LexerAssociationDialog</b>(<i>project, parent = None</i>) +<b>LexerAssociationDialog</b>(<i>project, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.NewDialogClassDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.NewDialogClassDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="NewDialogClassDialog.__init__" ID="NewDialogClassDialog.__init__"></a> <h4>NewDialogClassDialog (Constructor)</h4> -<b>NewDialogClassDialog</b>(<i>defaultClassName, defaultFile, defaultPath, parent = None</i>) +<b>NewDialogClassDialog</b>(<i>defaultClassName, defaultFile, defaultPath, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.NewPythonPackageDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.NewPythonPackageDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="NewPythonPackageDialog.__init__" ID="NewPythonPackageDialog.__init__"></a> <h4>NewPythonPackageDialog (Constructor)</h4> -<b>NewPythonPackageDialog</b>(<i>relPath, parent = None</i>) +<b>NewPythonPackageDialog</b>(<i>relPath, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.Project.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.Project.html Fri Mar 11 16:51:57 2011 +0100 @@ -617,7 +617,7 @@ </table> <a NAME="Project.__init__" ID="Project.__init__"></a> <h4>Project (Constructor)</h4> -<b>Project</b>(<i>parent = None, filename = None</i>) +<b>Project</b>(<i>parent=None, filename=None</i>) <p> Constructor </p><dl> @@ -649,7 +649,7 @@ </dd> </dl><a NAME="Project.__addSingleDirectory" ID="Project.__addSingleDirectory"></a> <h4>Project.__addSingleDirectory</h4> -<b>__addSingleDirectory</b>(<i>filetype, source, target, quiet = False</i>) +<b>__addSingleDirectory</b>(<i>filetype, source, target, quiet=False</i>) <p> Private method used to add all files of a single directory to the project. </p><dl> @@ -686,7 +686,7 @@ <h4>Project.__checkFilesExist</h4> <b>__checkFilesExist</b>(<i>index</i>) <p> - Private method to check, if the files in a list exist. + Private method to check, if the files in a list exist. </p><p> The files in the indicated list are checked for existance in the filesystem. Non existant files are removed from the list and the @@ -750,7 +750,7 @@ Private method to delete the session file. </p><a NAME="Project.__doSearchNewFiles" ID="Project.__doSearchNewFiles"></a> <h4>Project.__doSearchNewFiles</h4> -<b>__doSearchNewFiles</b>(<i>AI = True, onUserDemand = False</i>) +<b>__doSearchNewFiles</b>(<i>AI=True, onUserDemand=False</i>) <p> Private method to search for new files in the project directory. </p><p> @@ -805,7 +805,7 @@ </dd> </dl><a NAME="Project.__pluginCreateArchive" ID="Project.__pluginCreateArchive"></a> <h4>Project.__pluginCreateArchive</h4> -<b>__pluginCreateArchive</b>(<i>snapshot = False</i>) +<b>__pluginCreateArchive</b>(<i>snapshot=False</i>) <p> Private slot to create an eric5 plugin archive. </p><dl> @@ -840,7 +840,7 @@ </dd> </dl><a NAME="Project.__readDebugProperties" ID="Project.__readDebugProperties"></a> <h4>Project.__readDebugProperties</h4> -<b>__readDebugProperties</b>(<i>quiet = False</i>) +<b>__readDebugProperties</b>(<i>quiet=False</i>) <p> Private method to read in the project debugger properties file (.e4d) </p><dl> @@ -866,7 +866,7 @@ </dd> </dl><a NAME="Project.__readSession" ID="Project.__readSession"></a> <h4>Project.__readSession</h4> -<b>__readSession</b>(<i>quiet = False, indicator = ""</i>) +<b>__readSession</b>(<i>quiet=False, indicator=""</i>) <p> Private method to read in the project session file (.e4s) </p><dl> @@ -1001,7 +1001,7 @@ with the central store. </p><a NAME="Project.__writeDebugProperties" ID="Project.__writeDebugProperties"></a> <h4>Project.__writeDebugProperties</h4> -<b>__writeDebugProperties</b>(<i>quiet = False</i>) +<b>__writeDebugProperties</b>(<i>quiet=False</i>) <p> Private method to write the project debugger properties file (.e4d) </p><dl> @@ -1012,7 +1012,7 @@ </dd> </dl><a NAME="Project.__writeProject" ID="Project.__writeProject"></a> <h4>Project.__writeProject</h4> -<b>__writeProject</b>(<i>fn = None</i>) +<b>__writeProject</b>(<i>fn=None</i>) <p> Private method to save the project infos to a project file. </p><dl> @@ -1031,7 +1031,7 @@ </dd> </dl><a NAME="Project.__writeSession" ID="Project.__writeSession"></a> <h4>Project.__writeSession</h4> -<b>__writeSession</b>(<i>quiet = False, indicator = ""</i>) +<b>__writeSession</b>(<i>quiet=False, indicator=""</i>) <p> Private method to write the session data to an XML file (.e4s). </p><dl> @@ -1055,7 +1055,7 @@ Private method to write the project data to an XML file. </p><a NAME="Project.addDirectory" ID="Project.addDirectory"></a> <h4>Project.addDirectory</h4> -<b>addDirectory</b>(<i>filter = None, startdir = None</i>) +<b>addDirectory</b>(<i>filter=None, startdir=None</i>) <p> Public method used to add all files of a directory to the project. </p><dl> @@ -1079,7 +1079,7 @@ </dd> </dl><a NAME="Project.addFiles" ID="Project.addFiles"></a> <h4>Project.addFiles</h4> -<b>addFiles</b>(<i>filter = None, startdir = None</i>) +<b>addFiles</b>(<i>filter=None, startdir=None</i>) <p> Public slot used to add files to the project. </p><dl> @@ -1158,7 +1158,7 @@ Public slot to add forms to the current project. </p><a NAME="Project.appendFile" ID="Project.appendFile"></a> <h4>Project.appendFile</h4> -<b>appendFile</b>(<i>fn, isSourceFile = False, updateModel = True</i>) +<b>appendFile</b>(<i>fn, isSourceFile=False, updateModel=True</i>) <p> Public method to append a file to the project. </p><dl> @@ -1205,7 +1205,7 @@ </dd> </dl><a NAME="Project.closeProject" ID="Project.closeProject"></a> <h4>Project.closeProject</h4> -<b>closeProject</b>(<i>reopen = False, noSave = False</i>) +<b>closeProject</b>(<i>reopen=False, noSave=False</i>) <p> Public slot to close the current project. </p><dl> @@ -1286,7 +1286,7 @@ <h4>Project.getAbsoluteUniversalPath</h4> <b>getAbsoluteUniversalPath</b>(<i>fn</i>) <p> - Public method to convert a project relative file path with universal + Public method to convert a project relative file path with universal separators to an absolute file path. </p><dl> <dt><i>fn</i></dt> @@ -1401,7 +1401,7 @@ </dd> </dl><a NAME="Project.getMainScript" ID="Project.getMainScript"></a> <h4>Project.getMainScript</h4> -<b>getMainScript</b>(<i>normalized = False</i>) +<b>getMainScript</b>(<i>normalized=False</i>) <p> Public method to return the main script filename. </p><dl> @@ -1566,7 +1566,7 @@ </dd> </dl><a NAME="Project.getSources" ID="Project.getSources"></a> <h4>Project.getSources</h4> -<b>getSources</b>(<i>normalized = False</i>) +<b>getSources</b>(<i>normalized=False</i>) <p> Public method to return the source script files. </p><dl> @@ -1681,7 +1681,7 @@ </dd> </dl><a NAME="Project.initVCS" ID="Project.initVCS"></a> <h4>Project.initVCS</h4> -<b>initVCS</b>(<i>vcsSystem = None, nooverride = False</i>) +<b>initVCS</b>(<i>vcsSystem=None, nooverride=False</i>) <p> Public method used to instantiate a vcs system. </p><dl> @@ -1831,7 +1831,7 @@ </dd> </dl><a NAME="Project.openProject" ID="Project.openProject"></a> <h4>Project.openProject</h4> -<b>openProject</b>(<i>fn = None, restoreSession = True, reopen = False</i>) +<b>openProject</b>(<i>fn=None, restoreSession=True, reopen=False</i>) <p> Public slot to open a project. </p><dl> @@ -1848,7 +1848,7 @@ </dd> </dl><a NAME="Project.othersAdded" ID="Project.othersAdded"></a> <h4>Project.othersAdded</h4> -<b>othersAdded</b>(<i>fn, updateModel = True</i>) +<b>othersAdded</b>(<i>fn, updateModel=True</i>) <p> Public slot to be called, if something was added to the OTHERS project data area. </p><dl> @@ -1861,7 +1861,7 @@ </dd> </dl><a NAME="Project.registerProjectType" ID="Project.registerProjectType"></a> <h4>Project.registerProjectType</h4> -<b>registerProjectType</b>(<i>type_, description, fileTypeCallback = None, binaryTranslationsCallback = None, lexerAssociationCallback = None</i>) +<b>registerProjectType</b>(<i>type_, description, fileTypeCallback=None, binaryTranslationsCallback=None, lexerAssociationCallback=None</i>) <p> Public method to register a project type. </p><dl> @@ -1878,7 +1878,7 @@ </dd><dt><i>binaryTranslationsCallback=</i></dt> <dd> reference to a method returning the - name of the binary translation file given the name of the raw + name of the binary translation file given the name of the raw translation file </dd><dt><i>lexerAssociationCallback=</i></dt> <dd> @@ -1910,7 +1910,7 @@ </dd> </dl><a NAME="Project.removeFile" ID="Project.removeFile"></a> <h4>Project.removeFile</h4> -<b>removeFile</b>(<i>fn, updateModel = True</i>) +<b>removeFile</b>(<i>fn, updateModel=True</i>) <p> Public slot to remove a file from the project. </p><p> @@ -1937,7 +1937,7 @@ </dd> </dl><a NAME="Project.renameFile" ID="Project.renameFile"></a> <h4>Project.renameFile</h4> -<b>renameFile</b>(<i>oldfn, newfn = None</i>) +<b>renameFile</b>(<i>oldfn, newfn=None</i>) <p> Public slot to rename a file of the project. </p><dl> @@ -1955,7 +1955,7 @@ </dd> </dl><a NAME="Project.renameFileInPdata" ID="Project.renameFileInPdata"></a> <h4>Project.renameFileInPdata</h4> -<b>renameFileInPdata</b>(<i>oldname, newname, isSourceFile = False</i>) +<b>renameFileInPdata</b>(<i>oldname, newname, isSourceFile=False</i>) <p> Public method to rename a file in the pdata structure. </p><dl> @@ -2000,7 +2000,7 @@ </dd> </dl><a NAME="Project.saveAllScripts" ID="Project.saveAllScripts"></a> <h4>Project.saveAllScripts</h4> -<b>saveAllScripts</b>(<i>reportSyntaxErrors = False</i>) +<b>saveAllScripts</b>(<i>reportSyntaxErrors=False</i>) <p> Public method to save all scripts belonging to the project. </p><dl> @@ -2059,7 +2059,7 @@ </dd> </dl><a NAME="Project.setDbgInfo" ID="Project.setDbgInfo"></a> <h4>Project.setDbgInfo</h4> -<b>setDbgInfo</b>(<i>argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython = None, autoContinue = None</i>) +<b>setDbgInfo</b>(<i>argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython=None, autoContinue=None</i>) <p> Public method to set the debugging information. </p><dl>
--- a/Documentation/Source/eric5.Project.ProjectBaseBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectBaseBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -183,7 +183,7 @@ </table> <a NAME="ProjectBaseBrowser.__init__" ID="ProjectBaseBrowser.__init__"></a> <h4>ProjectBaseBrowser (Constructor)</h4> -<b>ProjectBaseBrowser</b>(<i>project, type_, parent = None</i>) +<b>ProjectBaseBrowser</b>(<i>project, type_, parent=None</i>) <p> Constructor </p><dl> @@ -342,7 +342,7 @@ Protected method to rename a file of the project. </p><a NAME="ProjectBaseBrowser._selectEntries" ID="ProjectBaseBrowser._selectEntries"></a> <h4>ProjectBaseBrowser._selectEntries</h4> -<b>_selectEntries</b>(<i>local = True, filter = None</i>) +<b>_selectEntries</b>(<i>local=True, filter=None</i>) <p> Protected method to select entries based on their VCS status. </p><dl> @@ -397,9 +397,9 @@ <h4>ProjectBaseBrowser._showContextMenu</h4> <b>_showContextMenu</b>(<i>menu</i>) <p> - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. </p><dl> <dt><i>menu</i></dt> @@ -410,7 +410,7 @@ <h4>ProjectBaseBrowser._showContextMenuBack</h4> <b>_showContextMenuBack</b>(<i>menu</i>) <p> - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. </p><dl> <dt><i>menu</i></dt> <dd> @@ -420,9 +420,9 @@ <h4>ProjectBaseBrowser._showContextMenuDir</h4> <b>_showContextMenuDir</b>(<i>menu</i>) <p> - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -433,9 +433,9 @@ <h4>ProjectBaseBrowser._showContextMenuDirMulti</h4> <b>_showContextMenuDirMulti</b>(<i>menu</i>) <p> - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -446,9 +446,9 @@ <h4>ProjectBaseBrowser._showContextMenuMulti</h4> <b>_showContextMenuMulti</b>(<i>menu</i>) <p> - Protected slot called before the context menu (multiple selections) is shown. + Protected slot called before the context menu (multiple selections) is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. </p><dl> <dt><i>menu</i></dt>
--- a/Documentation/Source/eric5.Project.ProjectBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -106,7 +106,7 @@ </table> <a NAME="ProjectBrowser.__init__" ID="ProjectBrowser.__init__"></a> <h4>ProjectBrowser (Constructor)</h4> -<b>ProjectBrowser</b>(<i>project, parent = None, embeddedBrowser = True</i>) +<b>ProjectBrowser</b>(<i>project, parent=None, embeddedBrowser=True</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.ProjectBrowserModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectBrowserModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="ProjectBrowserDirectoryItem.__init__" ID="ProjectBrowserDirectoryItem.__init__"></a> <h4>ProjectBrowserDirectoryItem (Constructor)</h4> -<b>ProjectBrowserDirectoryItem</b>(<i>parent, dinfo, projectType, full = True, bold = False</i>) +<b>ProjectBrowserDirectoryItem</b>(<i>parent, dinfo, projectType, full=True, bold=False</i>) <p> Constructor </p><dl> @@ -115,7 +115,7 @@ </table> <a NAME="ProjectBrowserFileItem.__init__" ID="ProjectBrowserFileItem.__init__"></a> <h4>ProjectBrowserFileItem (Constructor)</h4> -<b>ProjectBrowserFileItem</b>(<i>parent, finfo, projectType, full = True, bold = False, sourceLanguage = ""</i>) +<b>ProjectBrowserFileItem</b>(<i>parent, finfo, projectType, full=True, bold=False, sourceLanguage=""</i>) <p> Constructor </p><dl> @@ -181,7 +181,7 @@ </table> <a NAME="ProjectBrowserItemMixin.__init__" ID="ProjectBrowserItemMixin.__init__"></a> <h4>ProjectBrowserItemMixin (Constructor)</h4> -<b>ProjectBrowserItemMixin</b>(<i>type_, bold = False</i>) +<b>ProjectBrowserItemMixin</b>(<i>type_, bold=False</i>) <p> Constructor </p><dl> @@ -381,7 +381,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.__updateVCSStatus" ID="ProjectBrowserModel.__updateVCSStatus"></a> <h4>ProjectBrowserModel.__updateVCSStatus</h4> -<b>__updateVCSStatus</b>(<i>item, name, recursive = True</i>) +<b>__updateVCSStatus</b>(<i>item, name, recursive=True</i>) <p> Private method used to update the vcs status of a node. </p><dl> @@ -397,7 +397,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.addNewItem" ID="ProjectBrowserModel.addNewItem"></a> <h4>ProjectBrowserModel.addNewItem</h4> -<b>addNewItem</b>(<i>typeString, name, additionalTypeStrings = []</i>) +<b>addNewItem</b>(<i>typeString, name, additionalTypeStrings=[]</i>) <p> Public method to add a new item to the model. </p><dl> @@ -420,8 +420,8 @@ <dt><i>statesList</i></dt> <dd> list of VCS state entries (list of strings) giving the - states in the first column and the path relative to the project - directory starting with the third column. The allowed status flags + states in the first column and the path relative to the project + directory starting with the third column. The allowed status flags are: <ul> <li>"A" path was added but not yet comitted</li> @@ -463,7 +463,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.findChildItem" ID="ProjectBrowserModel.findChildItem"></a> <h4>ProjectBrowserModel.findChildItem</h4> -<b>findChildItem</b>(<i>text, column, parentItem = None</i>) +<b>findChildItem</b>(<i>text, column, parentItem=None</i>) <p> Public method to find a child item given some text. </p><dl> @@ -499,7 +499,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.findParentItemByName" ID="ProjectBrowserModel.findParentItemByName"></a> <h4>ProjectBrowserModel.findParentItemByName</h4> -<b>findParentItemByName</b>(<i>type_, name, dontSplit = False</i>) +<b>findParentItemByName</b>(<i>type_, name, dontSplit=False</i>) <p> Public method to find an item given it's name. </p><p> @@ -538,7 +538,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.populateItem" ID="ProjectBrowserModel.populateItem"></a> <h4>ProjectBrowserModel.populateItem</h4> -<b>populateItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate an item's subtree. </p><dl> @@ -551,7 +551,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.populateProjectDirectoryItem" ID="ProjectBrowserModel.populateProjectDirectoryItem"></a> <h4>ProjectBrowserModel.populateProjectDirectoryItem</h4> -<b>populateProjectDirectoryItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateProjectDirectoryItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a directory item's subtree. </p><dl> @@ -617,7 +617,7 @@ </dd> </dl><a NAME="ProjectBrowserModel.updateVCSStatus" ID="ProjectBrowserModel.updateVCSStatus"></a> <h4>ProjectBrowserModel.updateVCSStatus</h4> -<b>updateVCSStatus</b>(<i>name, recursive = True</i>) +<b>updateVCSStatus</b>(<i>name, recursive=True</i>) <p> Public method used to update the vcs status of a node. </p><dl> @@ -660,7 +660,7 @@ </table> <a NAME="ProjectBrowserSimpleDirectoryItem.__init__" ID="ProjectBrowserSimpleDirectoryItem.__init__"></a> <h4>ProjectBrowserSimpleDirectoryItem (Constructor)</h4> -<b>ProjectBrowserSimpleDirectoryItem</b>(<i>parent, projectType, text, path = ""</i>) +<b>ProjectBrowserSimpleDirectoryItem</b>(<i>parent, projectType, text, path=""</i>) <p> Constructor </p><dl> @@ -710,7 +710,7 @@ </dd> </dl><a NAME="ProjectBrowserSimpleDirectoryItem.setName" ID="ProjectBrowserSimpleDirectoryItem.setName"></a> <h4>ProjectBrowserSimpleDirectoryItem.setName</h4> -<b>setName</b>(<i>dinfo, full = True</i>) +<b>setName</b>(<i>dinfo, full=True</i>) <p> Public method to set the directory name. </p><dl>
--- a/Documentation/Source/eric5.Project.ProjectBrowserSortFilterProxyModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectBrowserSortFilterProxyModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="ProjectBrowserSortFilterProxyModel.__init__" ID="ProjectBrowserSortFilterProxyModel.__init__"></a> <h4>ProjectBrowserSortFilterProxyModel (Constructor)</h4> -<b>ProjectBrowserSortFilterProxyModel</b>(<i>filterType, parent = None</i>) +<b>ProjectBrowserSortFilterProxyModel</b>(<i>filterType, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.ProjectFormsBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectFormsBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="ProjectFormsBrowser" ID="ProjectFormsBrowser"></a> <h2>ProjectFormsBrowser</h2> <p> - A class used to display the forms part of the project. + A class used to display the forms part of the project. </p><h4>Signals</h4> <dl> <dt>appendStderr(str)</dt> @@ -173,7 +173,7 @@ </table> <a NAME="ProjectFormsBrowser.__init__" ID="ProjectFormsBrowser.__init__"></a> <h4>ProjectFormsBrowser (Constructor)</h4> -<b>ProjectFormsBrowser</b>(<i>project, parent = None</i>) +<b>ProjectFormsBrowser</b>(<i>project, parent=None</i>) <p> Constructor </p><dl> @@ -221,7 +221,7 @@ Private method to compile selected forms to source files. </p><a NAME="ProjectFormsBrowser.__compileUI" ID="ProjectFormsBrowser.__compileUI"></a> <h4>ProjectFormsBrowser.__compileUI</h4> -<b>__compileUI</b>(<i>fn, noDialog = False, progress = None</i>) +<b>__compileUI</b>(<i>fn, noDialog=False, progress=None</i>) <p> Privat method to compile a .ui file to a .py/.rb file. </p><dl> @@ -292,13 +292,13 @@ <h4>ProjectFormsBrowser.__readStderr</h4> <b>__readStderr</b>(<i></i>) <p> - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the pyuic/rbuic process. </p><a NAME="ProjectFormsBrowser.__readStdout" ID="ProjectFormsBrowser.__readStdout"></a> <h4>ProjectFormsBrowser.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the pyuic/rbuic process. </p><a NAME="ProjectFormsBrowser.__showContextMenu" ID="ProjectFormsBrowser.__showContextMenu"></a> <h4>ProjectFormsBrowser.__showContextMenu</h4>
--- a/Documentation/Source/eric5.Project.ProjectInterfacesBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectInterfacesBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="ProjectInterfacesBrowser" ID="ProjectInterfacesBrowser"></a> <h2>ProjectInterfacesBrowser</h2> <p> - A class used to display the interfaces (IDL) part of the project. + A class used to display the interfaces (IDL) part of the project. </p><h4>Signals</h4> <dl> <dt>appendStderr(str)</dt> @@ -139,7 +139,7 @@ </table> <a NAME="ProjectInterfacesBrowser.__init__" ID="ProjectInterfacesBrowser.__init__"></a> <h4>ProjectInterfacesBrowser (Constructor)</h4> -<b>ProjectInterfacesBrowser</b>(<i>project, parent = None</i>) +<b>ProjectInterfacesBrowser</b>(<i>project, parent=None</i>) <p> Constructor </p><dl> @@ -167,7 +167,7 @@ Private method to compile all interfaces to python. </p><a NAME="ProjectInterfacesBrowser.__compileIDL" ID="ProjectInterfacesBrowser.__compileIDL"></a> <h4>ProjectInterfacesBrowser.__compileIDL</h4> -<b>__compileIDL</b>(<i>fn, noDialog = False, progress = None</i>) +<b>__compileIDL</b>(<i>fn, noDialog=False, progress=None</i>) <p> Privat method to compile a .idl file to python. </p><dl>
--- a/Documentation/Source/eric5.Project.ProjectOthersBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectOthersBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.Project.ProjectOthersBrowser</h1> <p> -Module implementing a class used to display the parts of the project, that don't fit +Module implementing a class used to display the parts of the project, that don't fit the other categories. </p> <h3>Global Attributes</h3> @@ -187,9 +187,9 @@ <h4>ProjectOthersBrowser._showContextMenu</h4> <b>_showContextMenu</b>(<i>menu</i>) <p> - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. </p><dl> <dt><i>menu</i></dt>
--- a/Documentation/Source/eric5.Project.ProjectResourcesBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectResourcesBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="ProjectResourcesBrowser" ID="ProjectResourcesBrowser"></a> <h2>ProjectResourcesBrowser</h2> <p> - A class used to display the resources part of the project. + A class used to display the resources part of the project. </p><h4>Signals</h4> <dl> <dt>appendStderr(str)</dt> @@ -150,7 +150,7 @@ </table> <a NAME="ProjectResourcesBrowser.__init__" ID="ProjectResourcesBrowser.__init__"></a> <h4>ProjectResourcesBrowser (Constructor)</h4> -<b>ProjectResourcesBrowser</b>(<i>project, parent = None</i>) +<b>ProjectResourcesBrowser</b>(<i>project, parent=None</i>) <p> Constructor </p><dl> @@ -197,7 +197,7 @@ Private method to compile all resources to source files. </p><a NAME="ProjectResourcesBrowser.__compileQRC" ID="ProjectResourcesBrowser.__compileQRC"></a> <h4>ProjectResourcesBrowser.__compileQRC</h4> -<b>__compileQRC</b>(<i>fn, noDialog = False, progress = None</i>) +<b>__compileQRC</b>(<i>fn, noDialog=False, progress=None</i>) <p> Privat method to compile a .qrc file to a .py file. </p><dl> @@ -258,13 +258,13 @@ <h4>ProjectResourcesBrowser.__readStderr</h4> <b>__readStderr</b>(<i></i>) <p> - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the pyrcc4/rbrcc process. </p><a NAME="ProjectResourcesBrowser.__readStdout" ID="ProjectResourcesBrowser.__readStdout"></a> <h4>ProjectResourcesBrowser.__readStdout</h4> <b>__readStdout</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the pyrcc4/rbrcc process. </p><a NAME="ProjectResourcesBrowser.__showContextMenu" ID="ProjectResourcesBrowser.__showContextMenu"></a> <h4>ProjectResourcesBrowser.__showContextMenu</h4>
--- a/Documentation/Source/eric5.Project.ProjectSourcesBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectSourcesBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="ProjectSourcesBrowser" ID="ProjectSourcesBrowser"></a> <h2>ProjectSourcesBrowser</h2> <p> - A class used to display the Sources part of the project. + A class used to display the Sources part of the project. </p><h4>Signals</h4> <dl> <dt>closeSourceWindow(str)</dt> @@ -159,7 +159,7 @@ </table> <a NAME="ProjectSourcesBrowser.__init__" ID="ProjectSourcesBrowser.__init__"></a> <h4>ProjectSourcesBrowser (Constructor)</h4> -<b>ProjectSourcesBrowser</b>(<i>project, parent = None</i>) +<b>ProjectSourcesBrowser</b>(<i>project, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.ProjectTranslationsBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.ProjectTranslationsBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="ProjectTranslationsBrowser" ID="ProjectTranslationsBrowser"></a> <h2>ProjectTranslationsBrowser</h2> <p> - A class used to display the translations part of the project. + A class used to display the translations part of the project. </p><h4>Signals</h4> <dl> <dt>appendStderr(str)</dt> @@ -199,7 +199,7 @@ </dd> </dl><a NAME="ProjectTranslationsBrowser.__TRPreview" ID="ProjectTranslationsBrowser.__TRPreview"></a> <h4>ProjectTranslationsBrowser.__TRPreview</h4> -<b>__TRPreview</b>(<i>previewAll = False</i>) +<b>__TRPreview</b>(<i>previewAll=False</i>) <p> Private slot to handle the Preview translations action. </p><dl> @@ -258,7 +258,7 @@ All obsolete strings are removed from the .ts file. </p><a NAME="ProjectTranslationsBrowser.__generateTSFile" ID="ProjectTranslationsBrowser.__generateTSFile"></a> <h4>ProjectTranslationsBrowser.__generateTSFile</h4> -<b>__generateTSFile</b>(<i>noobsolete = False, generateAll = True</i>) +<b>__generateTSFile</b>(<i>noobsolete=False, generateAll=True</i>) <p> Private method used to run pylupdate/pylupdate4 to generate the .ts files. </p><dl> @@ -306,13 +306,13 @@ <h4>ProjectTranslationsBrowser.__readStderrLrelease</h4> <b>__readStderrLrelease</b>(<i></i>) <p> - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the lrelease process. </p><a NAME="ProjectTranslationsBrowser.__readStderrLupdate" ID="ProjectTranslationsBrowser.__readStderrLupdate"></a> <h4>ProjectTranslationsBrowser.__readStderrLupdate</h4> <b>__readStderrLupdate</b>(<i></i>) <p> - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the pylupdate process. </p><a NAME="ProjectTranslationsBrowser.__readStdout" ID="ProjectTranslationsBrowser.__readStdout"></a> <h4>ProjectTranslationsBrowser.__readStdout</h4> @@ -331,13 +331,13 @@ <h4>ProjectTranslationsBrowser.__readStdoutLrelease</h4> <b>__readStdoutLrelease</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the lrelease process. </p><a NAME="ProjectTranslationsBrowser.__readStdoutLupdate" ID="ProjectTranslationsBrowser.__readStdoutLupdate"></a> <h4>ProjectTranslationsBrowser.__readStdoutLupdate</h4> <b>__readStdoutLupdate</b>(<i></i>) <p> - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the pylupdate process. </p><a NAME="ProjectTranslationsBrowser.__releaseAll" ID="ProjectTranslationsBrowser.__releaseAll"></a> <h4>ProjectTranslationsBrowser.__releaseAll</h4> @@ -351,7 +351,7 @@ Private method to release the translation files (.qm). </p><a NAME="ProjectTranslationsBrowser.__releaseTSFile" ID="ProjectTranslationsBrowser.__releaseTSFile"></a> <h4>ProjectTranslationsBrowser.__releaseTSFile</h4> -<b>__releaseTSFile</b>(<i>generateAll = False</i>) +<b>__releaseTSFile</b>(<i>generateAll=False</i>) <p> Private method to run lrelease to release the translation files (.qm). </p><dl> @@ -400,7 +400,7 @@ <dt><i>langs</i></dt> <dd> list of languages to include in the process. An empty list (default) - means that all translations should be included. + means that all translations should be included. (list of ProjectBrowserFileItem) </dd><dt><i>filter</i></dt> <dd>
--- a/Documentation/Source/eric5.Project.PropertiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.PropertiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -84,7 +84,7 @@ </table> <a NAME="PropertiesDialog.__init__" ID="PropertiesDialog.__init__"></a> <h4>PropertiesDialog (Constructor)</h4> -<b>PropertiesDialog</b>(<i>project, new = True, parent = None, name = None</i>) +<b>PropertiesDialog</b>(<i>project, new=True, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Project.UserPropertiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Project.UserPropertiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="UserPropertiesDialog.__init__" ID="UserPropertiesDialog.__init__"></a> <h4>UserPropertiesDialog (Constructor)</h4> -<b>UserPropertiesDialog</b>(<i>project, parent = None, name = None</i>) +<b>UserPropertiesDialog</b>(<i>project, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.PyUnit.UnittestDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.PyUnit.UnittestDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -217,7 +217,7 @@ </table> <a NAME="UnittestDialog.__init__" ID="UnittestDialog.__init__"></a> <h4>UnittestDialog (Constructor)</h4> -<b>UnittestDialog</b>(<i>prog = None, dbs = None, ui = None, parent = None, name = None</i>) +<b>UnittestDialog</b>(<i>prog=None, dbs=None, ui=None, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -434,7 +434,7 @@ </table> <a NAME="UnittestWindow.__init__" ID="UnittestWindow.__init__"></a> <h4>UnittestWindow (Constructor)</h4> -<b>UnittestWindow</b>(<i>prog = None, parent = None</i>) +<b>UnittestWindow</b>(<i>prog=None, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.APIsManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.APIsManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ </table> <a NAME="APIs.__init__" ID="APIs.__init__"></a> <h4>APIs (Constructor)</h4> -<b>APIs</b>(<i>language, forPreparation = False, parent = None</i>) +<b>APIs</b>(<i>language, forPreparation=False, parent=None</i>) <p> Constructor </p><dl> @@ -177,7 +177,7 @@ </dd> </dl><a NAME="APIs.prepareAPIs" ID="APIs.prepareAPIs"></a> <h4>APIs.prepareAPIs</h4> -<b>prepareAPIs</b>(<i>ondemand = False, rawList = None</i>) +<b>prepareAPIs</b>(<i>ondemand=False, rawList=None</i>) <p> Public method to prepare the APIs if necessary. </p><dl> @@ -223,7 +223,7 @@ </table> <a NAME="APIsManager.__init__" ID="APIsManager.__init__"></a> <h4>APIsManager (Constructor)</h4> -<b>APIsManager</b>(<i>parent = None</i>) +<b>APIsManager</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -233,11 +233,11 @@ </dd> </dl><a NAME="APIsManager.getAPIs" ID="APIsManager.getAPIs"></a> <h4>APIsManager.getAPIs</h4> -<b>getAPIs</b>(<i>language, forPreparation = False</i>) +<b>getAPIs</b>(<i>language, forPreparation=False</i>) <p> Public method to get an apis object for autocompletion/calltips. </p><p> - This method creates and loads an APIs object dynamically upon request. + This method creates and loads an APIs object dynamically upon request. This saves memory for languages, that might not be needed at the moment. </p><dl> <dt><i>language</i></dt>
--- a/Documentation/Source/eric5.QScintilla.Editor.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Editor.html Fri Mar 11 16:51:57 2011 +0100 @@ -955,7 +955,7 @@ </table> <a NAME="Editor.__init__" ID="Editor.__init__"></a> <h4>Editor (Constructor)</h4> -<b>Editor</b>(<i>dbs, fn = None, vm = None, filetype = "", editor = None, tv = None</i>) +<b>Editor</b>(<i>dbs, fn=None, vm=None, filetype="", editor=None, tv=None</i>) <p> Constructor </p><dl> @@ -1089,7 +1089,7 @@ </dd> </dl><a NAME="Editor.__bindLexer" ID="Editor.__bindLexer"></a> <h4>Editor.__bindLexer</h4> -<b>__bindLexer</b>(<i>filename, pyname = ""</i>) +<b>__bindLexer</b>(<i>filename, pyname=""</i>) <p> Private slot to set the correct lexer depending on language. </p><dl> @@ -1249,9 +1249,9 @@ <h4>Editor.__cursorPositionChanged</h4> <b>__cursorPositionChanged</b>(<i>line, index</i>) <p> - Private slot to handle the cursorPositionChanged signal. + Private slot to handle the cursorPositionChanged signal. </p><p> - It emits the signal cursorChanged with parameters fileName, + It emits the signal cursorChanged with parameters fileName, line and pos. </p><dl> <dt><i>line</i></dt> @@ -1294,7 +1294,7 @@ </dd> </dl><a NAME="Editor.__encodingChanged" ID="Editor.__encodingChanged"></a> <h4>Editor.__encodingChanged</h4> -<b>__encodingChanged</b>(<i>encoding, propagate = True</i>) +<b>__encodingChanged</b>(<i>encoding, propagate=True</i>) <p> Private slot to handle a change of the encoding. </p><dl> @@ -1382,9 +1382,9 @@ Private to always ignore the word below the spelling context menu. </p><a NAME="Editor.__indentLine" ID="Editor.__indentLine"></a> <h4>Editor.__indentLine</h4> -<b>__indentLine</b>(<i>indent = True</i>) +<b>__indentLine</b>(<i>indent=True</i>) <p> - Private method to indent or unindent the current line. + Private method to indent or unindent the current line. </p><dl> <dt><i>indent</i></dt> <dd> @@ -1394,9 +1394,9 @@ </dd> </dl><a NAME="Editor.__indentSelection" ID="Editor.__indentSelection"></a> <h4>Editor.__indentSelection</h4> -<b>__indentSelection</b>(<i>indent = True</i>) +<b>__indentSelection</b>(<i>indent=True</i>) <p> - Private method to indent or unindent the current selection. + Private method to indent or unindent the current selection. </p><dl> <dt><i>indent</i></dt> <dd> @@ -1486,7 +1486,7 @@ </dd> </dl><a NAME="Editor.__languageChanged" ID="Editor.__languageChanged"></a> <h4>Editor.__languageChanged</h4> -<b>__languageChanged</b>(<i>language, propagate = True</i>) +<b>__languageChanged</b>(<i>language, propagate=True</i>) <p> Private slot handling a change of a connected editor's language. </p><dl> @@ -1580,7 +1580,7 @@ <h4>Editor.__modificationChanged</h4> <b>__modificationChanged</b>(<i>m</i>) <p> - Private slot to handle the modificationChanged signal. + Private slot to handle the modificationChanged signal. </p><p> It emits the signal modificationStatusChanged with parameters m and self. @@ -1696,7 +1696,7 @@ Private method to remove trailing whitespace. </p><a NAME="Editor.__resetLanguage" ID="Editor.__resetLanguage"></a> <h4>Editor.__resetLanguage</h4> -<b>__resetLanguage</b>(<i>propagate = True</i>) +<b>__resetLanguage</b>(<i>propagate=True</i>) <p> Private method used to reset the language selection. </p><dl> @@ -1726,7 +1726,7 @@ </dd> </dl><a NAME="Editor.__send" ID="Editor.__send"></a> <h4>Editor.__send</h4> -<b>__send</b>(<i>token, args = None</i>) +<b>__send</b>(<i>token, args=None</i>) <p> Private method to send an editor command to remote editors. </p><dl> @@ -1784,7 +1784,7 @@ Private method to initialize the spell checking functionality. </p><a NAME="Editor.__setSpellingLanguage" ID="Editor.__setSpellingLanguage"></a> <h4>Editor.__setSpellingLanguage</h4> -<b>__setSpellingLanguage</b>(<i>language, pwl = "", pel = ""</i>) +<b>__setSpellingLanguage</b>(<i>language, pwl="", pel=""</i>) <p> Private slot to set the spell checking language. </p><dl> @@ -1880,7 +1880,7 @@ Private slot to set up the spelling menu before it is shown. </p><a NAME="Editor.__showFlakesWarning" ID="Editor.__showFlakesWarning"></a> <h4>Editor.__showFlakesWarning</h4> -<b>__showFlakesWarning</b>(<i>line = -1</i>) +<b>__showFlakesWarning</b>(<i>line=-1</i>) <p> Private slot to handle the 'Show warning' context menu action. </p><dl> @@ -1905,7 +1905,7 @@ Private method to handle the show profile data context menu action. </p><a NAME="Editor.__showSyntaxError" ID="Editor.__showSyntaxError"></a> <h4>Editor.__showSyntaxError</h4> -<b>__showSyntaxError</b>(<i>line = -1</i>) +<b>__showSyntaxError</b>(<i>line=-1</i>) <p> Private slot to handle the 'Show syntax error message' context menu action. @@ -1941,7 +1941,7 @@ Private slot to handle the Enable Autocompletion context menu entry. </p><a NAME="Editor.__toggleBreakpoint" ID="Editor.__toggleBreakpoint"></a> <h4>Editor.__toggleBreakpoint</h4> -<b>__toggleBreakpoint</b>(<i>line, temporary = False</i>) +<b>__toggleBreakpoint</b>(<i>line, temporary=False</i>) <p> Private method to toggle a breakpoint. </p><dl> @@ -1969,9 +1969,9 @@ Private slot to toggle the typing aids. </p><a NAME="Editor.__updateReadOnly" ID="Editor.__updateReadOnly"></a> <h4>Editor.__updateReadOnly</h4> -<b>__updateReadOnly</b>(<i>bForce = True</i>) +<b>__updateReadOnly</b>(<i>bForce=True</i>) <p> - Private method to update the readOnly information for this editor. + Private method to update the readOnly information for this editor. </p><p> If bForce is True, then updates everything regardless if the attributes have actually changed, such as during @@ -2000,7 +2000,7 @@ Public method to signal, that this editor has been added to a project. </p><a NAME="Editor.autoComplete" ID="Editor.autoComplete"></a> <h4>Editor.autoComplete</h4> -<b>autoComplete</b>(<i>auto = False, context = True</i>) +<b>autoComplete</b>(<i>auto=False, context=True</i>) <p> Public method to start autocompletion. </p><dl> @@ -2068,7 +2068,7 @@ </dd> </dl><a NAME="Editor.cancelSharedEdit" ID="Editor.cancelSharedEdit"></a> <h4>Editor.cancelSharedEdit</h4> -<b>cancelSharedEdit</b>(<i>send = True</i>) +<b>cancelSharedEdit</b>(<i>send=True</i>) <p> Public slot to cancel a shared edit session for the editor. </p><dl> @@ -2147,7 +2147,7 @@ Public slot to handle the 'Clear all syntax error' context menu action. </p><a NAME="Editor.close" ID="Editor.close"></a> <h4>Editor.close</h4> -<b>close</b>(<i>alsoDelete = False</i>) +<b>close</b>(<i>alsoDelete=False</i>) <p> Public method called when the window gets closed. </p><p> @@ -2389,7 +2389,7 @@ <dt>Returns:</dt> <dd> type of the displayed file, if set by an eflag: marker or an empty - string (string) + string (string) </dd> </dl><a NAME="Editor.getFlakesWarnings" ID="Editor.getFlakesWarnings"></a> <h4>Editor.getFlakesWarnings</h4> @@ -2414,7 +2414,7 @@ </dd> </dl><a NAME="Editor.getLanguage" ID="Editor.getLanguage"></a> <h4>Editor.getLanguage</h4> -<b>getLanguage</b>(<i>normalized = True</i>) +<b>getLanguage</b>(<i>normalized=True</i>) <p> Public method to retrieve the language of the editor. </p><dl> @@ -2465,9 +2465,9 @@ </dd> </dl><a NAME="Editor.getSearchText" ID="Editor.getSearchText"></a> <h4>Editor.getSearchText</h4> -<b>getSearchText</b>(<i>selectionOnly = False</i>) +<b>getSearchText</b>(<i>selectionOnly=False</i>) <p> - Public method to determine the selection or the current word for the next + Public method to determine the selection or the current word for the next search operation. </p><dl> <dt><i>selectionOnly</i></dt> @@ -2506,7 +2506,7 @@ </dd> </dl><a NAME="Editor.getWord" ID="Editor.getWord"></a> <h4>Editor.getWord</h4> -<b>getWord</b>(<i>line, index, direction = 0, useWordChars = True</i>) +<b>getWord</b>(<i>line, index, direction=0, useWordChars=True</i>) <p> Public method to get the word at a position. </p><dl> @@ -2531,7 +2531,7 @@ </dd> </dl><a NAME="Editor.getWordBoundaries" ID="Editor.getWordBoundaries"></a> <h4>Editor.getWordBoundaries</h4> -<b>getWordBoundaries</b>(<i>line, index, useWordChars = True</i>) +<b>getWordBoundaries</b>(<i>line, index, useWordChars=True</i>) <p> Public method to get the word boundaries at a position. </p><dl> @@ -2590,7 +2590,7 @@ </dd> </dl><a NAME="Editor.gotoLine" ID="Editor.gotoLine"></a> <h4>Editor.gotoLine</h4> -<b>gotoLine</b>(<i>line, pos = 1</i>) +<b>gotoLine</b>(<i>line, pos=1</i>) <p> Public slot to jump to the beginning of a line. </p><dl> @@ -2688,7 +2688,7 @@ </dd> </dl><a NAME="Editor.highlight" ID="Editor.highlight"></a> <h4>Editor.highlight</h4> -<b>highlight</b>(<i>line = None, error = False, syntaxError = False</i>) +<b>highlight</b>(<i>line=None, error=False, syntaxError=False</i>) <p> Public method to highlight (or de-highlight) a particular line. </p><dl> @@ -2746,7 +2746,7 @@ <h4>Editor.isSpellCheckRegion</h4> <b>isSpellCheckRegion</b>(<i>pos</i>) <p> - Public method to check, if the given position is within a region, that should + Public method to check, if the given position is within a region, that should be spell checked. </p><dl> <dt><i>pos</i></dt> @@ -2805,7 +2805,7 @@ Public method to save a macro to a file. </p><a NAME="Editor.menuEditBreakpoint" ID="Editor.menuEditBreakpoint"></a> <h4>Editor.menuEditBreakpoint</h4> -<b>menuEditBreakpoint</b>(<i>line = None</i>) +<b>menuEditBreakpoint</b>(<i>line=None</i>) <p> Public slot to handle the 'Edit breakpoint' context menu action. </p><dl> @@ -2914,7 +2914,7 @@ Public slot to handle changes of the project lexer associations. </p><a NAME="Editor.readFile" ID="Editor.readFile"></a> <h4>Editor.readFile</h4> -<b>readFile</b>(<i>fn, createIt = False</i>) +<b>readFile</b>(<i>fn, createIt=False</i>) <p> Public slot to read the text from a file. </p><dl> @@ -2968,7 +2968,7 @@ Public method to revert back to the last saved state. </p><a NAME="Editor.saveFile" ID="Editor.saveFile"></a> <h4>Editor.saveFile</h4> -<b>saveFile</b>(<i>saveas = False, path = None</i>) +<b>saveFile</b>(<i>saveas=False, path=None</i>) <p> Public slot to save the text to a file. </p><dl> @@ -2986,7 +2986,7 @@ </dd> </dl><a NAME="Editor.saveFileAs" ID="Editor.saveFileAs"></a> <h4>Editor.saveFileAs</h4> -<b>saveFileAs</b>(<i>path = None, toProject = False</i>) +<b>saveFileAs</b>(<i>path=None, toProject=False</i>) <p> Public slot to save a file with a new name. </p><dl> @@ -3046,7 +3046,7 @@ <dt><i>func</i></dt> <dd> Function to be set to handle autocompletion. func - should be a function taking a reference to the editor and + should be a function taking a reference to the editor and a boolean indicating to complete a context. </dd> </dl><a NAME="Editor.setAutoSpellChecking" ID="Editor.setAutoSpellChecking"></a> @@ -3070,7 +3070,7 @@ </dd> </dl><a NAME="Editor.setLanguage" ID="Editor.setLanguage"></a> <h4>Editor.setLanguage</h4> -<b>setLanguage</b>(<i>filename, initTextDisplay = True, propagate = True, pyname = ""</i>) +<b>setLanguage</b>(<i>filename, initTextDisplay=True, propagate=True, pyname=""</i>) <p> Public method to set a lexer language. </p><dl> @@ -3199,7 +3199,7 @@ </dd> </dl><a NAME="Editor.toggleFlakesWarning" ID="Editor.toggleFlakesWarning"></a> <h4>Editor.toggleFlakesWarning</h4> -<b>toggleFlakesWarning</b>(<i>line, warning, msg = ""</i>) +<b>toggleFlakesWarning</b>(<i>line, warning, msg=""</i>) <p> Public method to toggle a flakes warning indicator. </p><p> @@ -3218,7 +3218,7 @@ </dd> </dl><a NAME="Editor.toggleSyntaxError" ID="Editor.toggleSyntaxError"></a> <h4>Editor.toggleSyntaxError</h4> -<b>toggleSyntaxError</b>(<i>line, index, error, msg = "", show = False</i>) +<b>toggleSyntaxError</b>(<i>line, index, error, msg="", show=False</i>) <p> Public method to toggle a syntax error indicator. </p><dl> @@ -3254,7 +3254,7 @@ <h4>Editor.uncommentSelection</h4> <b>uncommentSelection</b>(<i></i>) <p> - Public slot to uncomment the current selection. + Public slot to uncomment the current selection. </p><a NAME="Editor.undo" ID="Editor.undo"></a> <h4>Editor.undo</h4> <b>undo</b>(<i></i>)
--- a/Documentation/Source/eric5.QScintilla.Exporters.ExporterBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Exporters.ExporterBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="ExporterBase.__init__" ID="ExporterBase.__init__"></a> <h4>ExporterBase (Constructor)</h4> -<b>ExporterBase</b>(<i>editor, parent = None</i>) +<b>ExporterBase</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Exporters.ExporterHTML.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Exporters.ExporterHTML.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="ExporterHTML.__init__" ID="ExporterHTML.__init__"></a> <h4>ExporterHTML (Constructor)</h4> -<b>ExporterHTML</b>(<i>editor, parent = None</i>) +<b>ExporterHTML</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl> @@ -118,7 +118,7 @@ </dd> </dl><a NAME="HTMLGenerator.generate" ID="HTMLGenerator.generate"></a> <h4>HTMLGenerator.generate</h4> -<b>generate</b>(<i>tabSize = 4, useTabs = False, wysiwyg = True, folding = False, onlyStylesUsed = False, titleFullPath = False</i>) +<b>generate</b>(<i>tabSize=4, useTabs=False, wysiwyg=True, folding=False, onlyStylesUsed=False, titleFullPath=False</i>) <p> Public method to generate HTML for the source editor. </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Exporters.ExporterODT.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Exporters.ExporterODT.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="ExporterODT.__init__" ID="ExporterODT.__init__"></a> <h4>ExporterODT (Constructor)</h4> -<b>ExporterODT</b>(<i>editor, parent = None</i>) +<b>ExporterODT</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Exporters.ExporterPDF.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Exporters.ExporterPDF.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="ExporterPDF.__init__" ID="ExporterPDF.__init__"></a> <h4>ExporterPDF (Constructor)</h4> -<b>ExporterPDF</b>(<i>editor, parent = None</i>) +<b>ExporterPDF</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl> @@ -189,7 +189,7 @@ <a NAME="PDFRender" ID="PDFRender"></a> <h2>PDFRender</h2> <p> - Class to manage line and page rendering. + Class to manage line and page rendering. </p><p> Apart from startPDF, endPDF everything goes in via add() and nextLine() so that line formatting and pagination can be done properly.
--- a/Documentation/Source/eric5.QScintilla.Exporters.ExporterRTF.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Exporters.ExporterRTF.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="ExporterRTF.__init__" ID="ExporterRTF.__init__"></a> <h4>ExporterRTF (Constructor)</h4> -<b>ExporterRTF</b>(<i>editor, parent = None</i>) +<b>ExporterRTF</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Exporters.ExporterTEX.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Exporters.ExporterTEX.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="ExporterTEX.__init__" ID="ExporterTEX.__init__"></a> <h4>ExporterTEX (Constructor)</h4> -<b>ExporterTEX</b>(<i>editor, parent = None</i>) +<b>ExporterTEX</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.GotoDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.GotoDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="GotoDialog.__init__" ID="GotoDialog.__init__"></a> <h4>GotoDialog (Constructor)</h4> -<b>GotoDialog</b>(<i>maximum, parent, name = None, modal = False</i>) +<b>GotoDialog</b>(<i>maximum, parent, name=None, modal=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.Lexer.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="Lexer" ID="Lexer"></a> <h2>Lexer</h2> <p> - -</p><p> Class to implement the lexer mixin class. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerBash.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerBash.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerBash" ID="LexerBash"></a> <h2>LexerBash</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -74,7 +72,7 @@ </table> <a NAME="LexerBash.__init__" ID="LexerBash.__init__"></a> <h4>LexerBash (Constructor)</h4> -<b>LexerBash</b>(<i>parent = None</i>) +<b>LexerBash</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerBatch.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerBatch.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerBatch" ID="LexerBatch"></a> <h2>LexerBatch</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCMake.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCMake.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerCMake" ID="LexerCMake"></a> <h2>LexerCMake</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCPP.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCPP.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerCPP" ID="LexerCPP"></a> <h2>LexerCPP</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -77,7 +75,7 @@ </table> <a NAME="LexerCPP.__init__" ID="LexerCPP.__init__"></a> <h4>LexerCPP (Constructor)</h4> -<b>LexerCPP</b>(<i>parent=None, caseInsensitiveKeywords = False</i>) +<b>LexerCPP</b>(<i>parent=None, caseInsensitiveKeywords=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCSS.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCSS.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerCSS" ID="LexerCSS"></a> <h2>LexerCSS</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerCSharp.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerCSharp.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerCSharp" ID="LexerCSharp"></a> <h2>LexerCSharp</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerContainer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerContainer.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerContainer" ID="LexerContainer"></a> <h2>LexerContainer</h2> <p> - -</p><p> Subclass as a base for the implementation of custom lexers. </p> <h3>Derived from</h3> @@ -77,7 +75,7 @@ </table> <a NAME="LexerContainer.__init__" ID="LexerContainer.__init__"></a> <h4>LexerContainer (Constructor)</h4> -<b>LexerContainer</b>(<i>parent = None</i>) +<b>LexerContainer</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerD.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerD.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerD" ID="LexerD"></a> <h2>LexerD</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerDiff.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerDiff.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerDiff" ID="LexerDiff"></a> <h2>LexerDiff</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerFortran" ID="LexerFortran"></a> <h2>LexerFortran</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -77,7 +75,7 @@ </table> <a NAME="LexerFortran.__init__" ID="LexerFortran.__init__"></a> <h4>LexerFortran (Constructor)</h4> -<b>LexerFortran</b>(<i>parent = None</i>) +<b>LexerFortran</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran77.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerFortran77.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerFortran77" ID="LexerFortran77"></a> <h2>LexerFortran77</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -77,7 +75,7 @@ </table> <a NAME="LexerFortran77.__init__" ID="LexerFortran77.__init__"></a> <h4>LexerFortran77 (Constructor)</h4> -<b>LexerFortran77</b>(<i>parent = None</i>) +<b>LexerFortran77</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerHTML.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerHTML.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerHTML" ID="LexerHTML"></a> <h2>LexerHTML</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerIDL.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerIDL.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerIDL" ID="LexerIDL"></a> <h2>LexerIDL</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerJava.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerJava.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerJava" ID="LexerJava"></a> <h2>LexerJava</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerJavaScript.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerJavaScript.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerJavaScript" ID="LexerJavaScript"></a> <h2>LexerJavaScript</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerLua.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerLua.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerLua" ID="LexerLua"></a> <h2>LexerLua</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerMakefile.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerMakefile.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerMakefile" ID="LexerMakefile"></a> <h2>LexerMakefile</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPOV.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPOV.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerPOV" ID="LexerPOV"></a> <h2>LexerPOV</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPascal.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPascal.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerPascal" ID="LexerPascal"></a> <h2>LexerPascal</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -77,7 +75,7 @@ </table> <a NAME="LexerPascal.__init__" ID="LexerPascal.__init__"></a> <h4>LexerPascal (Constructor)</h4> -<b>LexerPascal</b>(<i>parent = None</i>) +<b>LexerPascal</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPerl.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPerl.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerPerl" ID="LexerPerl"></a> <h2>LexerPerl</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPostScript.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPostScript.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerPostScript" ID="LexerPostScript"></a> <h2>LexerPostScript</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -74,7 +72,7 @@ </table> <a NAME="LexerPostScript.__init__" ID="LexerPostScript.__init__"></a> <h4>LexerPostScript (Constructor)</h4> -<b>LexerPostScript</b>(<i>parent = None</i>) +<b>LexerPostScript</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerProperties.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerProperties.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerProperties" ID="LexerProperties"></a> <h2>LexerProperties</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPygments.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerPygments" ID="LexerPygments"></a> <h2>LexerPygments</h2> <p> - -</p><p> Class implementing a custom lexer using pygments. </p> <h3>Derived from</h3> @@ -104,7 +102,7 @@ </table> <a NAME="LexerPygments.__init__" ID="LexerPygments.__init__"></a> <h4>LexerPygments (Constructor)</h4> -<b>LexerPygments</b>(<i>parent = None, name = ""</i>) +<b>LexerPygments</b>(<i>parent=None, name=""</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerPython.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerPython.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerPython" ID="LexerPython"></a> <h2>LexerPython</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -83,7 +81,7 @@ </table> <a NAME="LexerPython.__init__" ID="LexerPython.__init__"></a> <h4>LexerPython (Constructor)</h4> -<b>LexerPython</b>(<i>variant = "", parent = None</i>) +<b>LexerPython</b>(<i>variant="", parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerRuby.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerRuby.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerRuby" ID="LexerRuby"></a> <h2>LexerRuby</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerSQL.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerSQL.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerSQL" ID="LexerSQL"></a> <h2>LexerSQL</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerTCL.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerTCL.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerTCL" ID="LexerTCL"></a> <h2>LexerTCL</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerTeX.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerTeX.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerTeX" ID="LexerTeX"></a> <h2>LexerTeX</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerVHDL.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerVHDL.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerVHDL" ID="LexerVHDL"></a> <h2>LexerVHDL</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerXML.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerXML.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerXML" ID="LexerXML"></a> <h2>LexerXML</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.QScintilla.Lexers.LexerYAML.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.LexerYAML.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="LexerYAML" ID="LexerYAML"></a> <h2>LexerYAML</h2> <p> - -</p><p> Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> @@ -74,7 +72,7 @@ </table> <a NAME="LexerYAML.__init__" ID="LexerYAML.__init__"></a> <h4>LexerYAML (Constructor)</h4> -<b>LexerYAML</b>(<i>parent = None</i>) +<b>LexerYAML</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Lexers.__init__.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Lexers.__init__.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ <hr /><hr /> <a NAME="__getPygmentsLexer" ID="__getPygmentsLexer"></a> <h2>__getPygmentsLexer</h2> -<b>__getPygmentsLexer</b>(<i>parent, name = ""</i>) +<b>__getPygmentsLexer</b>(<i>parent, name=""</i>) <p> Private module function to instantiate a pygments lexer. </p><dl> @@ -90,7 +90,7 @@ <hr /><hr /> <a NAME="getLexer" ID="getLexer"></a> <h2>getLexer</h2> -<b>getLexer</b>(<i>language, parent = None, pyname = ""</i>) +<b>getLexer</b>(<i>language, parent=None, pyname=""</i>) <p> Module function to instantiate a lexer object for a given language. </p><dl> @@ -114,7 +114,7 @@ <hr /><hr /> <a NAME="getOpenFileFiltersList" ID="getOpenFileFiltersList"></a> <h2>getOpenFileFiltersList</h2> -<b>getOpenFileFiltersList</b>(<i>includeAll = False, asString = False, withAdditional = True</i>) +<b>getOpenFileFiltersList</b>(<i>includeAll=False, asString=False, withAdditional=True</i>) <p> Module function to get the file filter list for an open file operation. </p><dl> @@ -141,7 +141,7 @@ <hr /><hr /> <a NAME="getSaveFileFiltersList" ID="getSaveFileFiltersList"></a> <h2>getSaveFileFiltersList</h2> -<b>getSaveFileFiltersList</b>(<i>includeAll = False, asString = False, withAdditional = True</i>) +<b>getSaveFileFiltersList</b>(<i>includeAll=False, asString=False, withAdditional=True</i>) <p> Module function to get the file filter list for a save file operation. </p><dl> @@ -185,7 +185,7 @@ <hr /><hr /> <a NAME="registerLexer" ID="registerLexer"></a> <h2>registerLexer</h2> -<b>registerLexer</b>(<i>name, displayString, filenameSample, getLexerFunc, openFilters = [], saveFilters = [], defaultAssocs = []</i>) +<b>registerLexer</b>(<i>name, displayString, filenameSample, getLexerFunc, openFilters=[], saveFilters=[], defaultAssocs=[]</i>) <p> Module function to register a custom QScintilla lexer. </p><dl>
--- a/Documentation/Source/eric5.QScintilla.MiniEditor.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.MiniEditor.html Fri Mar 11 16:51:57 2011 +0100 @@ -267,7 +267,7 @@ </table> <a NAME="MiniEditor.__init__" ID="MiniEditor.__init__"></a> <h4>MiniEditor (Constructor)</h4> -<b>MiniEditor</b>(<i>filename = "", filetype = "", parent = None, name = None</i>) +<b>MiniEditor</b>(<i>filename="", filetype="", parent=None, name=None</i>) <p> Constructor </p><dl> @@ -296,7 +296,7 @@ Private slot to handle the About Qt dialog. </p><a NAME="MiniEditor.__bindLexer" ID="MiniEditor.__bindLexer"></a> <h4>MiniEditor.__bindLexer</h4> -<b>__bindLexer</b>(<i>filename, pyname = ""</i>) +<b>__bindLexer</b>(<i>filename, pyname=""</i>) <p> Private slot to set the correct lexer depending on language. </p><dl> @@ -319,7 +319,7 @@ </dd> </dl><a NAME="MiniEditor.__checkActions" ID="MiniEditor.__checkActions"></a> <h4>MiniEditor.__checkActions</h4> -<b>__checkActions</b>(<i>setSb = True</i>) +<b>__checkActions</b>(<i>setSb=True</i>) <p> Private slot to check some actions for their enable/disable status and set the statusbar info. @@ -387,7 +387,7 @@ <h4>MiniEditor.__cursorPositionChanged</h4> <b>__cursorPositionChanged</b>(<i>line, pos</i>) <p> - Private slot to handle the cursorPositionChanged signal. + Private slot to handle the cursorPositionChanged signal. </p><dl> <dt><i>line</i></dt> <dd> @@ -456,7 +456,7 @@ </dd> </dl><a NAME="MiniEditor.__loadFile" ID="MiniEditor.__loadFile"></a> <h4>MiniEditor.__loadFile</h4> -<b>__loadFile</b>(<i>fileName, filetype = None</i>) +<b>__loadFile</b>(<i>fileName, filetype=None</i>) <p> Private method to load the given file. </p><dl> @@ -486,7 +486,7 @@ <h4>MiniEditor.__modificationChanged</h4> <b>__modificationChanged</b>(<i>m</i>) <p> - Private slot to handle the modificationChanged signal. + Private slot to handle the modificationChanged signal. </p><dl> <dt><i>m</i></dt> <dd> @@ -640,7 +640,7 @@ </dd> </dl><a NAME="MiniEditor.__setSbFile" ID="MiniEditor.__setSbFile"></a> <h4>MiniEditor.__setSbFile</h4> -<b>__setSbFile</b>(<i>line = None, pos = None</i>) +<b>__setSbFile</b>(<i>line=None, pos=None</i>) <p> Private method to set the file info in the status bar. </p><dl> @@ -763,7 +763,7 @@ </dd> </dl><a NAME="MiniEditor.setLanguage" ID="MiniEditor.setLanguage"></a> <h4>MiniEditor.setLanguage</h4> -<b>setLanguage</b>(<i>filename, initTextDisplay = True, pyname = ""</i>) +<b>setLanguage</b>(<i>filename, initTextDisplay=True, pyname=""</i>) <p> Public method to set a lexer language. </p><dl> @@ -793,7 +793,7 @@ </dd> </dl><a NAME="MiniEditor.setText" ID="MiniEditor.setText"></a> <h4>MiniEditor.setText</h4> -<b>setText</b>(<i>txt, filetype = None</i>) +<b>setText</b>(<i>txt, filetype=None</i>) <p> Public method to set the text programatically. </p><dl> @@ -808,7 +808,7 @@ <h4>MiniEditor.textForFind</h4> <b>textForFind</b>(<i></i>) <p> - Public method to determine the selection or the current word for the next + Public method to determine the selection or the current word for the next find operation. </p><dl> <dt>Returns:</dt> @@ -847,7 +847,7 @@ </table> <a NAME="MiniScintilla.__init__" ID="MiniScintilla.__init__"></a> <h4>MiniScintilla (Constructor)</h4> -<b>MiniScintilla</b>(<i>parent = None</i>) +<b>MiniScintilla</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Printer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Printer.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,8 +43,6 @@ <a NAME="Printer" ID="Printer"></a> <h2>Printer</h2> <p> - -</p><p> Class implementing the QextScintillaPrinter with a header. </p> <h3>Derived from</h3> @@ -65,7 +63,7 @@ </table> <a NAME="Printer.__init__" ID="Printer.__init__"></a> <h4>Printer (Constructor)</h4> -<b>Printer</b>(<i>mode = QPrinter.ScreenResolution</i>) +<b>Printer</b>(<i>mode=QPrinter.ScreenResolution</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.QsciScintillaCompat.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.QsciScintillaCompat.html Fri Mar 11 16:51:57 2011 +0100 @@ -307,7 +307,7 @@ </table> <a NAME="QsciScintillaCompat.__init__" ID="QsciScintillaCompat.__init__"></a> <h4>QsciScintillaCompat (Constructor)</h4> -<b>QsciScintillaCompat</b>(<i>parent = None</i>) +<b>QsciScintillaCompat</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -333,7 +333,7 @@ </dd> </dl><a NAME="QsciScintillaCompat.__setFoldMarker" ID="QsciScintillaCompat.__setFoldMarker"></a> <h4>QsciScintillaCompat.__setFoldMarker</h4> -<b>__setFoldMarker</b>(<i>marknr, mark = QsciScintilla.SC_MARK_EMPTY</i>) +<b>__setFoldMarker</b>(<i>marknr, mark=QsciScintilla.SC_MARK_EMPTY</i>) <p> Private method to define a fold marker. </p><dl> @@ -380,7 +380,7 @@ <h4>QsciScintillaCompat.charAt</h4> <b>charAt</b>(<i>pos</i>) <p> - Public method to get the character at a position in the text observing + Public method to get the character at a position in the text observing multibyte characters. </p><dl> <dt><i>pos</i></dt> @@ -576,7 +576,7 @@ Public method to extend the selection one word to the right. </p><a NAME="QsciScintillaCompat.findFirstTarget" ID="QsciScintillaCompat.findFirstTarget"></a> <h4>QsciScintillaCompat.findFirstTarget</h4> -<b>findFirstTarget</b>(<i>expr_, re_, cs_, wo_, begline = -1, begindex = -1, endline = -1, endindex = -1, ws_ = False</i>) +<b>findFirstTarget</b>(<i>expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False</i>) <p> Public method to search in a specified range of text without setting the selection. @@ -706,7 +706,7 @@ Public method to get the flash (blink) time of the cursor in milliseconds. </p><p> - The flash time is the time required to display, invert and restore the + The flash time is the time required to display, invert and restore the caret display. Usually the text cursor is displayed for half the cursor flash time, then hidden for the same amount of time. </p><dl> @@ -1018,7 +1018,7 @@ <h4>QsciScintillaCompat.setContractedFolds</h4> <b>setContractedFolds</b>(<i>folds</i>) <p> - Public method to set a list of line numbers of collapsed folds. + Public method to set a list of line numbers of collapsed folds. </p><dl> <dt><i>folds</i></dt> <dd> @@ -1047,7 +1047,7 @@ Public method to get the flash (blink) time of the cursor in milliseconds. </p><p> - The flash time is the time required to display, invert and restore the + The flash time is the time required to display, invert and restore the caret display. Usually the text cursor is displayed for half the cursor flash time, then hidden for the same amount of time. </p><dl> @@ -1081,7 +1081,7 @@ </dd> </dl><a NAME="QsciScintillaCompat.setFolding" ID="QsciScintillaCompat.setFolding"></a> <h4>QsciScintillaCompat.setFolding</h4> -<b>setFolding</b>(<i>style, margin = 2</i>) +<b>setFolding</b>(<i>style, margin=2</i>) <p> Public method to set the folding style and margin. </p><dl> @@ -1155,7 +1155,7 @@ </dd> </dl><a NAME="QsciScintillaCompat.setLexer" ID="QsciScintillaCompat.setLexer"></a> <h4>QsciScintillaCompat.setLexer</h4> -<b>setLexer</b>(<i>lex = None</i>) +<b>setLexer</b>(<i>lex=None</i>) <p> Public method to set the lexer. </p><dl> @@ -1230,7 +1230,7 @@ </dd> </dl><a NAME="QsciScintillaCompat.zoomIn" ID="QsciScintillaCompat.zoomIn"></a> <h4>QsciScintillaCompat.zoomIn</h4> -<b>zoomIn</b>(<i>zoom = 1</i>) +<b>zoomIn</b>(<i>zoom=1</i>) <p> Public method used to increase the zoom factor. </p><dl> @@ -1240,7 +1240,7 @@ </dd> </dl><a NAME="QsciScintillaCompat.zoomOut" ID="QsciScintillaCompat.zoomOut"></a> <h4>QsciScintillaCompat.zoomOut</h4> -<b>zoomOut</b>(<i>zoom = 1</i>) +<b>zoomOut</b>(<i>zoom=1</i>) <p> Public method used to decrease the zoom factor. </p><dl>
--- a/Documentation/Source/eric5.QScintilla.SearchReplaceWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.SearchReplaceWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -117,7 +117,7 @@ </table> <a NAME="SearchReplaceWidget.__init__" ID="SearchReplaceWidget.__init__"></a> <h4>SearchReplaceWidget (Constructor)</h4> -<b>SearchReplaceWidget</b>(<i>replace, vm, parent = None</i>) +<b>SearchReplaceWidget</b>(<i>replace, vm, parent=None</i>) <p> Constructor </p><dl> @@ -166,7 +166,7 @@ </dd> </dl><a NAME="SearchReplaceWidget.__showFind" ID="SearchReplaceWidget.__showFind"></a> <h4>SearchReplaceWidget.__showFind</h4> -<b>__showFind</b>(<i>text = ''</i>) +<b>__showFind</b>(<i>text=''</i>) <p> Private method to display this widget in find mode. </p><dl> @@ -241,7 +241,7 @@ Public slot tracking changes of selected text. </p><a NAME="SearchReplaceWidget.show" ID="SearchReplaceWidget.show"></a> <h4>SearchReplaceWidget.show</h4> -<b>show</b>(<i>text = ''</i>) +<b>show</b>(<i>text=''</i>) <p> Overridden slot from QWidget. </p><dl>
--- a/Documentation/Source/eric5.QScintilla.Shell.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Shell.html Fri Mar 11 16:51:57 2011 +0100 @@ -45,8 +45,8 @@ <p> Class implementing a graphical Python shell. </p><p> - A user can enter commands that are executed in the remote - Python interpreter. + A user can enter commands that are executed in the remote + Python interpreter. </p> <h3>Derived from</h3> QsciScintillaCompat @@ -315,7 +315,7 @@ </table> <a NAME="Shell.__init__" ID="Shell.__init__"></a> <h4>Shell (Constructor)</h4> -<b>Shell</b>(<i>dbs, vm, parent = None</i>) +<b>Shell</b>(<i>dbs, vm, parent=None</i>) <p> Constructor </p><dl> @@ -386,7 +386,7 @@ Private method to handle the Delete Word Right command. </p><a NAME="Shell.__QScintillaLeftCommand" ID="Shell.__QScintillaLeftCommand"></a> <h4>Shell.__QScintillaLeftCommand</h4> -<b>__QScintillaLeftCommand</b>(<i>method, allLinesAllowed = False</i>) +<b>__QScintillaLeftCommand</b>(<i>method, allLinesAllowed=False</i>) <p> Private method to handle a QScintilla command working to the left. </p><dl> @@ -500,7 +500,7 @@ Private method to handle the Cursor Word Right command. </p><a NAME="Shell.__bindLexer" ID="Shell.__bindLexer"></a> <h4>Shell.__bindLexer</h4> -<b>__bindLexer</b>(<i>language = 'Python3'</i>) +<b>__bindLexer</b>(<i>language='Python3'</i>) <p> Private slot to set the lexer. </p><dl> @@ -672,7 +672,7 @@ Private slot to handle the 'reset and clear' context menu entry. </p><a NAME="Shell.__rsearchHistory" ID="Shell.__rsearchHistory"></a> <h4>Shell.__rsearchHistory</h4> -<b>__rsearchHistory</b>(<i>txt, startIdx = -1</i>) +<b>__rsearchHistory</b>(<i>txt, startIdx=-1</i>) <p> Private method used to reverse search the history. </p><dl> @@ -690,7 +690,7 @@ </dd> </dl><a NAME="Shell.__searchHistory" ID="Shell.__searchHistory"></a> <h4>Shell.__searchHistory</h4> -<b>__searchHistory</b>(<i>txt, startIdx = -1</i>) +<b>__searchHistory</b>(<i>txt, startIdx=-1</i>) <p> Private method used to search the history. </p><dl> @@ -713,7 +713,7 @@ Private slot to select a history entry to execute. </p><a NAME="Shell.__setAutoCompletion" ID="Shell.__setAutoCompletion"></a> <h4>Shell.__setAutoCompletion</h4> -<b>__setAutoCompletion</b>(<i>language = 'Python'</i>) +<b>__setAutoCompletion</b>(<i>language='Python'</i>) <p> Private method to configure the autocompletion function. </p><dl> @@ -723,7 +723,7 @@ </dd> </dl><a NAME="Shell.__setCallTips" ID="Shell.__setCallTips"></a> <h4>Shell.__setCallTips</h4> -<b>__setCallTips</b>(<i>language = 'Python'</i>) +<b>__setCallTips</b>(<i>language='Python'</i>) <p> Private method to configure the calltips function. </p><dl> @@ -844,7 +844,7 @@ <h4>Shell.closeShell</h4> <b>closeShell</b>(<i></i>) <p> - Public method to shutdown the shell. + Public method to shutdown the shell. </p><a NAME="Shell.contextMenuEvent" ID="Shell.contextMenuEvent"></a> <h4>Shell.contextMenuEvent</h4> <b>contextMenuEvent</b>(<i>ev</i>)
--- a/Documentation/Source/eric5.QScintilla.SpellChecker.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.SpellChecker.html Fri Mar 11 16:51:57 2011 +0100 @@ -149,7 +149,7 @@ </table> <a NAME="SpellChecker.__init__" ID="SpellChecker.__init__"></a> <h4>SpellChecker (Constructor)</h4> -<b>SpellChecker</b>(<i>editor, indicator, defaultLanguage = None, checkRegion = None</i>) +<b>SpellChecker</b>(<i>editor, indicator, defaultLanguage=None, checkRegion=None</i>) <p> Constructor </p><dl> @@ -221,7 +221,7 @@ </dd> </dl><a NAME="SpellChecker._getDict" ID="SpellChecker._getDict"></a> <h4>SpellChecker._getDict</h4> -<b>_getDict</b>(<i>lang, pwl = "", pel = ""</i>) +<b>_getDict</b>(<i>lang, pwl="", pel=""</i>) <p> Protected classmethod to get a new dictionary. </p><dl> @@ -243,7 +243,7 @@ </dd> </dl><a NAME="SpellChecker.add" ID="SpellChecker.add"></a> <h4>SpellChecker.add</h4> -<b>add</b>(<i>word = None</i>) +<b>add</b>(<i>word=None</i>) <p> Public method to add a word to the personal word list. </p><dl> @@ -286,7 +286,7 @@ Private method to check the current selection. </p><a NAME="SpellChecker.checkWord" ID="SpellChecker.checkWord"></a> <h4>SpellChecker.checkWord</h4> -<b>checkWord</b>(<i>pos, atEnd = False</i>) +<b>checkWord</b>(<i>pos, atEnd=False</i>) <p> Public method to check the word at position pos. </p><dl> @@ -369,7 +369,7 @@ </dd> </dl><a NAME="SpellChecker.ignoreAlways" ID="SpellChecker.ignoreAlways"></a> <h4>SpellChecker.ignoreAlways</h4> -<b>ignoreAlways</b>(<i>word = None</i>) +<b>ignoreAlways</b>(<i>word=None</i>) <p> Public method to tell the checker, to always ignore the given word or the current word. @@ -420,7 +420,7 @@ <h4>SpellChecker.replace</h4> <b>replace</b>(<i>replacement</i>) <p> - Public method to tell the checker to replace the current word with + Public method to tell the checker to replace the current word with the replacement string. </p><dl> <dt><i>replacement</i></dt> @@ -451,7 +451,7 @@ </dd> </dl><a NAME="SpellChecker.setLanguage" ID="SpellChecker.setLanguage"></a> <h4>SpellChecker.setLanguage</h4> -<b>setLanguage</b>(<i>language, pwl = "", pel = ""</i>) +<b>setLanguage</b>(<i>language, pwl="", pel=""</i>) <p> Public method to set the current language. </p><dl>
--- a/Documentation/Source/eric5.QScintilla.SpellCheckingDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.SpellCheckingDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -87,7 +87,7 @@ </table> <a NAME="SpellCheckingDialog.__init__" ID="SpellCheckingDialog.__init__"></a> <h4>SpellCheckingDialog (Constructor)</h4> -<b>SpellCheckingDialog</b>(<i>spellChecker, startPos, endPos, parent = None</i>) +<b>SpellCheckingDialog</b>(<i>spellChecker, startPos, endPos, parent=None</i>) <p> Constructor </p><a NAME="SpellCheckingDialog.__advance" ID="SpellCheckingDialog.__advance"></a>
--- a/Documentation/Source/eric5.QScintilla.Terminal.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.Terminal.html Fri Mar 11 16:51:57 2011 +0100 @@ -45,7 +45,7 @@ <p> Class implementing a simple terminal based on QScintilla. </p><p> - A user can enter commands that are executed by a shell process. + A user can enter commands that are executed by a shell process. </p> <h3>Derived from</h3> QsciScintillaCompat @@ -248,7 +248,7 @@ </table> <a NAME="Terminal.__init__" ID="Terminal.__init__"></a> <h4>Terminal (Constructor)</h4> -<b>Terminal</b>(<i>vm, parent = None</i>) +<b>Terminal</b>(<i>vm, parent=None</i>) <p> Constructor </p><dl> @@ -306,7 +306,7 @@ Private method to handle the Delete Word Right command. </p><a NAME="Terminal.__QScintillaLeftCommand" ID="Terminal.__QScintillaLeftCommand"></a> <h4>Terminal.__QScintillaLeftCommand</h4> -<b>__QScintillaLeftCommand</b>(<i>method, allLinesAllowed = False</i>) +<b>__QScintillaLeftCommand</b>(<i>method, allLinesAllowed=False</i>) <p> Private method to handle a QScintilla command working to the left. </p><dl> @@ -496,7 +496,7 @@ Private slot to handle the 'reset' context menu entry. </p><a NAME="Terminal.__rsearchHistory" ID="Terminal.__rsearchHistory"></a> <h4>Terminal.__rsearchHistory</h4> -<b>__rsearchHistory</b>(<i>txt, startIdx = -1</i>) +<b>__rsearchHistory</b>(<i>txt, startIdx=-1</i>) <p> Private method used to reverse search the history. </p><dl> @@ -514,7 +514,7 @@ </dd> </dl><a NAME="Terminal.__searchHistory" ID="Terminal.__searchHistory"></a> <h4>Terminal.__searchHistory</h4> -<b>__searchHistory</b>(<i>txt, startIdx = -1</i>) +<b>__searchHistory</b>(<i>txt, startIdx=-1</i>) <p> Private method used to search the history. </p><dl> @@ -619,7 +619,7 @@ <h4>Terminal.closeTerminal</h4> <b>closeTerminal</b>(<i></i>) <p> - Public method to shutdown the terminal. + Public method to shutdown the terminal. </p><a NAME="Terminal.contextMenuEvent" ID="Terminal.contextMenuEvent"></a> <h4>Terminal.contextMenuEvent</h4> <b>contextMenuEvent</b>(<i>ev</i>)
--- a/Documentation/Source/eric5.QScintilla.TypingCompleters.CompleterBase.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.TypingCompleters.CompleterBase.html Fri Mar 11 16:51:57 2011 +0100 @@ -76,7 +76,7 @@ </table> <a NAME="CompleterBase.__init__" ID="CompleterBase.__init__"></a> <h4>CompleterBase (Constructor)</h4> -<b>CompleterBase</b>(<i>editor, parent = None</i>) +<b>CompleterBase</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.TypingCompleters.CompleterPython.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.TypingCompleters.CompleterPython.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="CompleterPython.__init__" ID="CompleterPython.__init__"></a> <h4>CompleterPython (Constructor)</h4> -<b>CompleterPython</b>(<i>editor, parent = None</i>) +<b>CompleterPython</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl> @@ -129,7 +129,7 @@ <h4>CompleterPython.__dedentExceptToTry</h4> <b>__dedentExceptToTry</b>(<i>hasColon</i>) <p> - Private method to dedent the line of the except statement to the last + Private method to dedent the line of the except statement to the last try statement with less (or equal) indentation. </p><dl> <dt><i>hasColon</i></dt> @@ -140,7 +140,7 @@ <h4>CompleterPython.__dedentFinallyToTry</h4> <b>__dedentFinallyToTry</b>(<i></i>) <p> - Private method to dedent the line of the except statement to the last + Private method to dedent the line of the except statement to the last try statement with less (or equal) indentation. </p><a NAME="CompleterPython.__dedentToIf" ID="CompleterPython.__dedentToIf"></a> <h4>CompleterPython.__dedentToIf</h4> @@ -224,7 +224,7 @@ <h4>CompleterPython.__isClassmethodDef</h4> <b>__isClassmethodDef</b>(<i></i>) <p> - Private method to check, if the user is defing a classmethod + Private method to check, if the user is defing a classmethod (@classmethod) method. </p><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric5.QScintilla.TypingCompleters.CompleterRuby.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.TypingCompleters.CompleterRuby.html Fri Mar 11 16:51:57 2011 +0100 @@ -81,7 +81,7 @@ </table> <a NAME="CompleterRuby.__init__" ID="CompleterRuby.__init__"></a> <h4>CompleterRuby (Constructor)</h4> -<b>CompleterRuby</b>(<i>editor, parent = None</i>) +<b>CompleterRuby</b>(<i>editor, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.QScintilla.TypingCompleters.__init__.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.TypingCompleters.__init__.html Fri Mar 11 16:51:57 2011 +0100 @@ -42,7 +42,7 @@ <hr /><hr /> <a NAME="getCompleter" ID="getCompleter"></a> <h2>getCompleter</h2> -<b>getCompleter</b>(<i>language, editor, parent = None</i>) +<b>getCompleter</b>(<i>language, editor, parent=None</i>) <p> Module function to instantiate a lexer object for a given language. </p><dl>
--- a/Documentation/Source/eric5.QScintilla.ZoomDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.QScintilla.ZoomDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="ZoomDialog.__init__" ID="ZoomDialog.__init__"></a> <h4>ZoomDialog (Constructor)</h4> -<b>ZoomDialog</b>(<i>zoom, parent, name = None, modal = False</i>) +<b>ZoomDialog</b>(<i>zoom, parent, name=None, modal=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.SqlBrowser.SqlBrowser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.SqlBrowser.SqlBrowser.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="SqlBrowser.__init__" ID="SqlBrowser.__init__"></a> <h4>SqlBrowser (Constructor)</h4> -<b>SqlBrowser</b>(<i>connections = [], parent = None</i>) +<b>SqlBrowser</b>(<i>connections=[], parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.SqlBrowser.SqlBrowserWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.SqlBrowser.SqlBrowserWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="SqlBrowserWidget.__init__" ID="SqlBrowserWidget.__init__"></a> <h4>SqlBrowserWidget (Constructor)</h4> -<b>SqlBrowserWidget</b>(<i>parent = None</i>) +<b>SqlBrowserWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.SqlBrowser.SqlConnectionDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.SqlBrowser.SqlConnectionDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -75,7 +75,7 @@ </table> <a NAME="SqlConnectionDialog.__init__" ID="SqlConnectionDialog.__init__"></a> <h4>SqlConnectionDialog (Constructor)</h4> -<b>SqlConnectionDialog</b>(<i>parent = None</i>) +<b>SqlConnectionDialog</b>(<i>parent=None</i>) <p> Constructor </p><a NAME="SqlConnectionDialog.__updateDialog" ID="SqlConnectionDialog.__updateDialog"></a>
--- a/Documentation/Source/eric5.SqlBrowser.SqlConnectionWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.SqlBrowser.SqlConnectionWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -96,7 +96,7 @@ </table> <a NAME="SqlConnectionWidget.__init__" ID="SqlConnectionWidget.__init__"></a> <h4>SqlConnectionWidget (Constructor)</h4> -<b>SqlConnectionWidget</b>(<i>parent = None</i>) +<b>SqlConnectionWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Tasks.TaskFilterConfigDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tasks.TaskFilterConfigDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="TaskFilterConfigDialog.__init__" ID="TaskFilterConfigDialog.__init__"></a> <h4>TaskFilterConfigDialog (Constructor)</h4> -<b>TaskFilterConfigDialog</b>(<i>taskFilter, parent = None</i>) +<b>TaskFilterConfigDialog</b>(<i>taskFilter, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Tasks.TaskPropertiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tasks.TaskPropertiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ </table> <a NAME="TaskPropertiesDialog.__init__" ID="TaskPropertiesDialog.__init__"></a> <h4>TaskPropertiesDialog (Constructor)</h4> -<b>TaskPropertiesDialog</b>(<i>task = None, parent = None, projectOpen = False</i>) +<b>TaskPropertiesDialog</b>(<i>task=None, parent=None, projectOpen=False</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Tasks.TaskViewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tasks.TaskViewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -100,7 +100,7 @@ </table> <a NAME="Task.__init__" ID="Task.__init__"></a> <h4>Task (Constructor)</h4> -<b>Task</b>(<i>description, priority = 1, filename = "", lineno = 0, completed = False, _time = 0, isProjectTask = False, isBugfixTask = False, project = None, longtext = ""</i>) +<b>Task</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, project=None, longtext=""</i>) <p> Constructor </p><dl> @@ -596,7 +596,7 @@ <h4>TaskViewer.__taskItemActivated</h4> <b>__taskItemActivated</b>(<i>itm, col</i>) <p> - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. </p><dl> <dt><i>itm</i></dt> <dd> @@ -607,7 +607,7 @@ </dd> </dl><a NAME="TaskViewer.addFileTask" ID="TaskViewer.addFileTask"></a> <h4>TaskViewer.addFileTask</h4> -<b>addFileTask</b>(<i>description, filename, lineno, isBugfixTask = False, longtext = ""</i>) +<b>addFileTask</b>(<i>description, filename, lineno, isBugfixTask=False, longtext=""</i>) <p> Public slot to add a file related task. </p><dl> @@ -629,7 +629,7 @@ </dd> </dl><a NAME="TaskViewer.addTask" ID="TaskViewer.addTask"></a> <h4>TaskViewer.addTask</h4> -<b>addTask</b>(<i>description, priority = 1, filename = "", lineno = 0, completed = False, _time = 0, isProjectTask = False, isBugfixTask = False, longtext = ""</i>) +<b>addTask</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, longtext=""</i>) <p> Public slot to add a task. </p><dl> @@ -709,7 +709,7 @@ Public slot to react to changes of the preferences. </p><a NAME="TaskViewer.setProjectOpen" ID="TaskViewer.setProjectOpen"></a> <h4>TaskViewer.setProjectOpen</h4> -<b>setProjectOpen</b>(<i>o = False</i>) +<b>setProjectOpen</b>(<i>o=False</i>) <p> Public slot to set the project status. </p><dl>
--- a/Documentation/Source/eric5.Templates.TemplateMultipleVariablesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Templates.TemplateMultipleVariablesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="TemplateMultipleVariablesDialog.__init__" ID="TemplateMultipleVariablesDialog.__init__"></a> <h4>TemplateMultipleVariablesDialog (Constructor)</h4> -<b>TemplateMultipleVariablesDialog</b>(<i>variables, parent = None</i>) +<b>TemplateMultipleVariablesDialog</b>(<i>variables, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Templates.TemplatePropertiesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Templates.TemplatePropertiesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -72,7 +72,7 @@ </table> <a NAME="TemplatePropertiesDialog.__init__" ID="TemplatePropertiesDialog.__init__"></a> <h4>TemplatePropertiesDialog (Constructor)</h4> -<b>TemplatePropertiesDialog</b>(<i>parent, groupMode = False, itm = None</i>) +<b>TemplatePropertiesDialog</b>(<i>parent, groupMode=False, itm=None</i>) <p> Constructor </p><dl> @@ -96,7 +96,7 @@ <dt>Returns:</dt> <dd> a tuple of two strings (name, language), if the dialog is in group mode, - and a tuple of four strings (name, description, group name, template) + and a tuple of four strings (name, description, group name, template) otherwise. </dd> </dl><a NAME="TemplatePropertiesDialog.keyPressEvent" ID="TemplatePropertiesDialog.keyPressEvent"></a>
--- a/Documentation/Source/eric5.Templates.TemplateSingleVariableDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Templates.TemplateSingleVariableDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -63,7 +63,7 @@ </table> <a NAME="TemplateSingleVariableDialog.__init__" ID="TemplateSingleVariableDialog.__init__"></a> <h4>TemplateSingleVariableDialog (Constructor)</h4> -<b>TemplateSingleVariableDialog</b>(<i>variable, parent = None</i>) +<b>TemplateSingleVariableDialog</b>(<i>variable, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Templates.TemplateViewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Templates.TemplateViewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -307,7 +307,7 @@ </table> <a NAME="TemplateGroup.__init__" ID="TemplateGroup.__init__"></a> <h4>TemplateGroup (Constructor)</h4> -<b>TemplateGroup</b>(<i>parent, name, language = "All"</i>) +<b>TemplateGroup</b>(<i>parent, name, language="All"</i>) <p> Constructor </p><dl> @@ -323,7 +323,7 @@ </dd> </dl><a NAME="TemplateGroup.addEntry" ID="TemplateGroup.addEntry"></a> <h4>TemplateGroup.addEntry</h4> -<b>addEntry</b>(<i>name, description, template, quiet = False</i>) +<b>addEntry</b>(<i>name, description, template, quiet=False</i>) <p> Public method to add a template entry to this group. </p><dl> @@ -369,7 +369,7 @@ <h4>TemplateGroup.getEntryNames</h4> <b>getEntryNames</b>(<i>beginning</i>) <p> - Public method to get the names of all entries, who's name starts with the + Public method to get the names of all entries, who's name starts with the given string. </p><dl> <dt><i>beginning</i></dt> @@ -639,9 +639,9 @@ Private method to show some help. </p><a NAME="TemplateViewer.__templateItemActivated" ID="TemplateViewer.__templateItemActivated"></a> <h4>TemplateViewer.__templateItemActivated</h4> -<b>__templateItemActivated</b>(<i>itm = None, col = 0</i>) +<b>__templateItemActivated</b>(<i>itm=None, col=0</i>) <p> - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. </p><dl> <dt><i>itm</i></dt> <dd> @@ -652,7 +652,7 @@ </dd> </dl><a NAME="TemplateViewer.addEntry" ID="TemplateViewer.addEntry"></a> <h4>TemplateViewer.addEntry</h4> -<b>addEntry</b>(<i>groupName, name, description, template, quiet = False</i>) +<b>addEntry</b>(<i>groupName, name, description, template, quiet=False</i>) <p> Public method to add a template entry. </p><dl> @@ -674,7 +674,7 @@ </dd> </dl><a NAME="TemplateViewer.addGroup" ID="TemplateViewer.addGroup"></a> <h4>TemplateViewer.addGroup</h4> -<b>addGroup</b>(<i>name, language = "All"</i>) +<b>addGroup</b>(<i>name, language="All"</i>) <p> Public method to add a group. </p><dl> @@ -730,7 +730,7 @@ </dd> </dl><a NAME="TemplateViewer.changeGroup" ID="TemplateViewer.changeGroup"></a> <h4>TemplateViewer.changeGroup</h4> -<b>changeGroup</b>(<i>oldname, newname, language = "All"</i>) +<b>changeGroup</b>(<i>oldname, newname, language="All"</i>) <p> Public method to rename a group. </p><dl> @@ -796,7 +796,7 @@ </dd> </dl><a NAME="TemplateViewer.readTemplates" ID="TemplateViewer.readTemplates"></a> <h4>TemplateViewer.readTemplates</h4> -<b>readTemplates</b>(<i>filename = None</i>) +<b>readTemplates</b>(<i>filename=None</i>) <p> Public method to read in the templates file (.e4c) </p><dl> @@ -826,7 +826,7 @@ </dd> </dl><a NAME="TemplateViewer.writeTemplates" ID="TemplateViewer.writeTemplates"></a> <h4>TemplateViewer.writeTemplates</h4> -<b>writeTemplates</b>(<i>filename = None</i>) +<b>writeTemplates</b>(<i>filename=None</i>) <p> Public method to write the templates data to an XML file (.e4c). </p><dl>
--- a/Documentation/Source/eric5.Tools.TRPreviewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tools.TRPreviewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -114,7 +114,7 @@ </table> <a NAME="TRPreviewer.__init__" ID="TRPreviewer.__init__"></a> <h4>TRPreviewer (Constructor)</h4> -<b>TRPreviewer</b>(<i>filenames = [], parent = None, name = None</i>) +<b>TRPreviewer</b>(<i>filenames=[], parent=None, name=None</i>) <p> Constructor </p><dl> @@ -399,7 +399,7 @@ </dd> </dl><a NAME="TranslationsDict.add" ID="TranslationsDict.add"></a> <h4>TranslationsDict.add</h4> -<b>add</b>(<i>fileName, setTranslation = True</i>) +<b>add</b>(<i>fileName, setTranslation=True</i>) <p> Public method to add a translation to the list. </p><p> @@ -510,7 +510,7 @@ </table> <a NAME="WidgetArea.__init__" ID="WidgetArea.__init__"></a> <h4>WidgetArea (Constructor)</h4> -<b>WidgetArea</b>(<i>parent = None</i>) +<b>WidgetArea</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -646,7 +646,7 @@ </table> <a NAME="WidgetView.__init__" ID="WidgetView.__init__"></a> <h4>WidgetView (Constructor)</h4> -<b>WidgetView</b>(<i>uiFileName, parent = None, name = None</i>) +<b>WidgetView</b>(<i>uiFileName, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Tools.TRSingleApplication.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tools.TRSingleApplication.html Fri Mar 11 16:51:57 2011 +0100 @@ -85,7 +85,7 @@ <a NAME="TRSingleApplicationServer" ID="TRSingleApplicationServer"></a> <h2>TRSingleApplicationServer</h2> <p> - Class implementing the single application server embedded within the + Class implementing the single application server embedded within the Translations Previewer. </p><h4>Signals</h4> <dl>
--- a/Documentation/Source/eric5.Tools.TrayStarter.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tools.TrayStarter.html Fri Mar 11 16:51:57 2011 +0100 @@ -184,7 +184,7 @@ <h4>TrayStarter.__openRecent</h4> <b>__openRecent</b>(<i>act</i>) <p> - Private method to open a project or file from the list of rencently opened + Private method to open a project or file from the list of rencently opened projects or files. </p><dl> <dt><i>act</i></dt>
--- a/Documentation/Source/eric5.Tools.UIPreviewer.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Tools.UIPreviewer.html Fri Mar 11 16:51:57 2011 +0100 @@ -117,7 +117,7 @@ </table> <a NAME="UIPreviewer.__init__" ID="UIPreviewer.__init__"></a> <h4>UIPreviewer (Constructor)</h4> -<b>UIPreviewer</b>(<i>filename = None, parent = None, name = None</i>) +<b>UIPreviewer</b>(<i>filename=None, parent=None, name=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.UI.AuthenticationDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.AuthenticationDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -69,7 +69,7 @@ </table> <a NAME="AuthenticationDialog.__init__" ID="AuthenticationDialog.__init__"></a> <h4>AuthenticationDialog (Constructor)</h4> -<b>AuthenticationDialog</b>(<i>info, username, showSave = False, saveIt = False, parent = None</i>) +<b>AuthenticationDialog</b>(<i>info, username, showSave=False, saveIt=False, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.UI.Browser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.Browser.html Fri Mar 11 16:51:57 2011 +0100 @@ -43,7 +43,7 @@ <a NAME="Browser" ID="Browser"></a> <h2>Browser</h2> <p> - Class used to display a file system tree. + Class used to display a file system tree. </p><p> Via the context menu that is displayed by a right click the user can select various actions on @@ -172,7 +172,7 @@ </table> <a NAME="Browser.__init__" ID="Browser.__init__"></a> <h4>Browser (Constructor)</h4> -<b>Browser</b>(<i>parent = None</i>) +<b>Browser</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -340,7 +340,7 @@ <h4>Browser.mouseDoubleClickEvent</h4> <b>mouseDoubleClickEvent</b>(<i>mouseEvent</i>) <p> - Protected method of QAbstractItemView. + Protected method of QAbstractItemView. </p><p> Reimplemented to disable expanding/collapsing of items when double-clicking. Instead the double-clicked entry is opened.
--- a/Documentation/Source/eric5.UI.BrowserModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.BrowserModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -448,7 +448,7 @@ </table> <a NAME="BrowserDirectoryItem.__init__" ID="BrowserDirectoryItem.__init__"></a> <h4>BrowserDirectoryItem (Constructor)</h4> -<b>BrowserDirectoryItem</b>(<i>parent, dinfo, full = True</i>) +<b>BrowserDirectoryItem</b>(<i>parent, dinfo, full=True</i>) <p> Constructor </p><dl> @@ -505,7 +505,7 @@ </dd> </dl><a NAME="BrowserDirectoryItem.setName" ID="BrowserDirectoryItem.setName"></a> <h4>BrowserDirectoryItem.setName</h4> -<b>setName</b>(<i>dinfo, full = True</i>) +<b>setName</b>(<i>dinfo, full=True</i>) <p> Public method to set the directory name. </p><dl> @@ -596,7 +596,7 @@ </table> <a NAME="BrowserFileItem.__init__" ID="BrowserFileItem.__init__"></a> <h4>BrowserFileItem (Constructor)</h4> -<b>BrowserFileItem</b>(<i>parent, finfo, full = True, sourceLanguage = ""</i>) +<b>BrowserFileItem</b>(<i>parent, finfo, full=True, sourceLanguage=""</i>) <p> Constructor </p><dl> @@ -806,7 +806,7 @@ </dd> </dl><a NAME="BrowserFileItem.setName" ID="BrowserFileItem.setName"></a> <h4>BrowserFileItem.setName</h4> -<b>setName</b>(<i>finfo, full = True</i>) +<b>setName</b>(<i>finfo, full=True</i>) <p> Public method to set the directory name. </p><dl> @@ -1298,7 +1298,7 @@ </table> <a NAME="BrowserModel.__init__" ID="BrowserModel.__init__"></a> <h4>BrowserModel (Constructor)</h4> -<b>BrowserModel</b>(<i>parent = None</i>) +<b>BrowserModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -1346,7 +1346,7 @@ </dd> </dl><a NAME="BrowserModel.addItem" ID="BrowserModel.addItem"></a> <h4>BrowserModel.addItem</h4> -<b>addItem</b>(<i>itm, parent = QModelIndex()</i>) +<b>addItem</b>(<i>itm, parent=QModelIndex()</i>) <p> Puplic slot to add an item. </p><dl> @@ -1432,7 +1432,7 @@ </dd> </dl><a NAME="BrowserModel.hasChildren" ID="BrowserModel.hasChildren"></a> <h4>BrowserModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check for the presence of child items. </p><p> @@ -1450,7 +1450,7 @@ </dd> </dl><a NAME="BrowserModel.headerData" ID="BrowserModel.headerData"></a> <h4>BrowserModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get the header data. </p><dl> @@ -1471,7 +1471,7 @@ </dd> </dl><a NAME="BrowserModel.index" ID="BrowserModel.index"></a> <h4>BrowserModel.index</h4> -<b>index</b>(<i>row, column, parent = QModelIndex()</i>) +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> Public method to create an index. </p><dl> @@ -1522,7 +1522,7 @@ </dd> </dl><a NAME="BrowserModel.populateClassAttributesItem" ID="BrowserModel.populateClassAttributesItem"></a> <h4>BrowserModel.populateClassAttributesItem</h4> -<b>populateClassAttributesItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateClassAttributesItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a class attributes item's subtree. </p><dl> @@ -1535,7 +1535,7 @@ </dd> </dl><a NAME="BrowserModel.populateClassItem" ID="BrowserModel.populateClassItem"></a> <h4>BrowserModel.populateClassItem</h4> -<b>populateClassItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateClassItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a class item's subtree. </p><dl> @@ -1548,7 +1548,7 @@ </dd> </dl><a NAME="BrowserModel.populateDirectoryItem" ID="BrowserModel.populateDirectoryItem"></a> <h4>BrowserModel.populateDirectoryItem</h4> -<b>populateDirectoryItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateDirectoryItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a directory item's subtree. </p><dl> @@ -1561,7 +1561,7 @@ </dd> </dl><a NAME="BrowserModel.populateFileItem" ID="BrowserModel.populateFileItem"></a> <h4>BrowserModel.populateFileItem</h4> -<b>populateFileItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateFileItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a file item's subtree. </p><dl> @@ -1574,7 +1574,7 @@ </dd> </dl><a NAME="BrowserModel.populateItem" ID="BrowserModel.populateItem"></a> <h4>BrowserModel.populateItem</h4> -<b>populateItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate an item's subtree. </p><dl> @@ -1587,7 +1587,7 @@ </dd> </dl><a NAME="BrowserModel.populateMethodItem" ID="BrowserModel.populateMethodItem"></a> <h4>BrowserModel.populateMethodItem</h4> -<b>populateMethodItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateMethodItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a method item's subtree. </p><dl> @@ -1600,7 +1600,7 @@ </dd> </dl><a NAME="BrowserModel.populateSysPathItem" ID="BrowserModel.populateSysPathItem"></a> <h4>BrowserModel.populateSysPathItem</h4> -<b>populateSysPathItem</b>(<i>parentItem, repopulate = False</i>) +<b>populateSysPathItem</b>(<i>parentItem, repopulate=False</i>) <p> Public method to populate a sys.path item's subtree. </p><dl> @@ -1633,7 +1633,7 @@ </dd> </dl><a NAME="BrowserModel.rowCount" ID="BrowserModel.rowCount"></a> <h4>BrowserModel.rowCount</h4> -<b>rowCount</b>(<i>parent = QModelIndex()</i>) +<b>rowCount</b>(<i>parent=QModelIndex()</i>) <p> Public method to get the number of rows. </p><dl>
--- a/Documentation/Source/eric5.UI.BrowserSortFilterProxyModel.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.BrowserSortFilterProxyModel.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="BrowserSortFilterProxyModel.__init__" ID="BrowserSortFilterProxyModel.__init__"></a> <h4>BrowserSortFilterProxyModel (Constructor)</h4> -<b>BrowserSortFilterProxyModel</b>(<i>parent = None</i>) +<b>BrowserSortFilterProxyModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -110,7 +110,7 @@ </dd> </dl><a NAME="BrowserSortFilterProxyModel.hasChildren" ID="BrowserSortFilterProxyModel.hasChildren"></a> <h4>BrowserSortFilterProxyModel.hasChildren</h4> -<b>hasChildren</b>(<i>parent = QModelIndex()</i>) +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) <p> Public method to check for the presence of child items. </p><p>
--- a/Documentation/Source/eric5.UI.CompareDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.CompareDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -114,7 +114,7 @@ </table> <a NAME="CompareDialog.__init__" ID="CompareDialog.__init__"></a> <h4>CompareDialog (Constructor)</h4> -<b>CompareDialog</b>(<i>files = [], parent = None</i>) +<b>CompareDialog</b>(<i>files=[], parent=None</i>) <p> Constructor </p><dl> @@ -128,7 +128,7 @@ </dd> </dl><a NAME="CompareDialog.__appendText" ID="CompareDialog.__appendText"></a> <h4>CompareDialog.__appendText</h4> -<b>__appendText</b>(<i>pane, linenumber, line, format, interLine = False</i>) +<b>__appendText</b>(<i>pane, linenumber, line, format, interLine=False</i>) <p> Private method to append text to the end of the contents pane. </p><dl> @@ -237,7 +237,7 @@ Private slot to go to the previous difference. </p><a NAME="CompareDialog.show" ID="CompareDialog.show"></a> <h4>CompareDialog.show</h4> -<b>show</b>(<i>filename = None</i>) +<b>show</b>(<i>filename=None</i>) <p> Public slot to show the dialog. </p><dl> @@ -271,7 +271,7 @@ </table> <a NAME="CompareWindow.__init__" ID="CompareWindow.__init__"></a> <h4>CompareWindow (Constructor)</h4> -<b>CompareWindow</b>(<i>files = [], parent = None</i>) +<b>CompareWindow</b>(<i>files=[], parent=None</i>) <p> Constructor </p><dl> @@ -324,7 +324,7 @@ <hr /><hr /> <a NAME="sbsdiff" ID="sbsdiff"></a> <h2>sbsdiff</h2> -<b>sbsdiff</b>(<i>a, b, linenumberwidth = 4</i>) +<b>sbsdiff</b>(<i>a, b, linenumberwidth=4</i>) <p> Compare two sequences of lines; generate the delta for display side by side. </p><dl>
--- a/Documentation/Source/eric5.UI.DiffDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.DiffDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="DiffDialog.__init__" ID="DiffDialog.__init__"></a> <h4>DiffDialog (Constructor)</h4> -<b>DiffDialog</b>(<i>parent = None</i>) +<b>DiffDialog</b>(<i>parent=None</i>) <p> Constructor </p><a NAME="DiffDialog.__appendText" ID="DiffDialog.__appendText"></a> @@ -219,7 +219,7 @@ filesystem. </p><a NAME="DiffDialog.show" ID="DiffDialog.show"></a> <h4>DiffDialog.show</h4> -<b>show</b>(<i>filename = None</i>) +<b>show</b>(<i>filename=None</i>) <p> Public slot to show the dialog. </p><dl> @@ -253,7 +253,7 @@ </table> <a NAME="DiffWindow.__init__" ID="DiffWindow.__init__"></a> <h4>DiffWindow (Constructor)</h4> -<b>DiffWindow</b>(<i>parent = None</i>) +<b>DiffWindow</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.UI.EmailDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.EmailDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -105,7 +105,7 @@ </table> <a NAME="EmailDialog.__init__" ID="EmailDialog.__init__"></a> <h4>EmailDialog (Constructor)</h4> -<b>EmailDialog</b>(<i>mode = "bug", parent = None</i>) +<b>EmailDialog</b>(<i>mode="bug", parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.UI.FindFileDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.FindFileDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -140,7 +140,7 @@ </table> <a NAME="FindFileDialog.__init__" ID="FindFileDialog.__init__"></a> <h4>FindFileDialog (Constructor)</h4> -<b>FindFileDialog</b>(<i>project, replaceMode = False, parent=None</i>) +<b>FindFileDialog</b>(<i>project, replaceMode=False, parent=None</i>) <p> Constructor </p><dl> @@ -298,7 +298,7 @@ <h4>FindFileDialog.on_findList_itemDoubleClicked</h4> <b>on_findList_itemDoubleClicked</b>(<i>itm, column</i>) <p> - Private slot to handle the double click on a file item. + Private slot to handle the double click on a file item. </p><p> It emits the signal sourceFile or designerFile depending on the file extension. @@ -354,7 +354,7 @@ </dd> </dl><a NAME="FindFileDialog.show" ID="FindFileDialog.show"></a> <h4>FindFileDialog.show</h4> -<b>show</b>(<i>txt = ""</i>) +<b>show</b>(<i>txt=""</i>) <p> Overwritten method to enable/disable the project button. </p><dl>
--- a/Documentation/Source/eric5.UI.FindFileNameDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.FindFileNameDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -112,7 +112,7 @@ </table> <a NAME="FindFileNameDialog.__init__" ID="FindFileNameDialog.__init__"></a> <h4>FindFileNameDialog (Constructor)</h4> -<b>FindFileNameDialog</b>(<i>project, parent = None</i>) +<b>FindFileNameDialog</b>(<i>project, parent=None</i>) <p> Constructor </p><dl> @@ -127,7 +127,7 @@ <h4>FindFileNameDialog.__openFile</h4> <b>__openFile</b>(<i></i>) <p> - Private slot to open a file. + Private slot to open a file. </p><p> It emits the signal sourceFile or designerFile depending on the file extension. @@ -170,7 +170,7 @@ <h4>FindFileNameDialog.on_fileList_itemActivated</h4> <b>on_fileList_itemActivated</b>(<i>itm, column</i>) <p> - Private slot to handle the double click on a file item. + Private slot to handle the double click on a file item. </p><p> It emits the signal sourceFile or designerFile depending on the file extension. @@ -206,7 +206,7 @@ <h4>FindFileNameDialog.on_searchDirButton_clicked</h4> <b>on_searchDirButton_clicked</b>(<i></i>) <p> - Private slot to handle the clicked signal of the search directory selection + Private slot to handle the clicked signal of the search directory selection button. </p><a NAME="FindFileNameDialog.on_searchDirCheckBox_toggled" ID="FindFileNameDialog.on_searchDirCheckBox_toggled"></a> <h4>FindFileNameDialog.on_searchDirCheckBox_toggled</h4>
--- a/Documentation/Source/eric5.UI.LogView.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.LogView.html Fri Mar 11 16:51:57 2011 +0100 @@ -78,7 +78,7 @@ </table> <a NAME="LogViewer.__init__" ID="LogViewer.__init__"></a> <h4>LogViewer (Constructor)</h4> -<b>LogViewer</b>(<i>parent = None</i>) +<b>LogViewer</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -88,7 +88,7 @@ </dd> </dl><a NAME="LogViewer.__appendText" ID="LogViewer.__appendText"></a> <h4>LogViewer.__appendText</h4> -<b>__appendText</b>(<i>txt, error = False</i>) +<b>__appendText</b>(<i>txt, error=False</i>) <p> Public method to append text to the end. </p><dl>
--- a/Documentation/Source/eric5.UI.NumbersWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.NumbersWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ </table> <a NAME="BinaryModel.__init__" ID="BinaryModel.__init__"></a> <h4>BinaryModel (Constructor)</h4> -<b>BinaryModel</b>(<i>parent = None</i>) +<b>BinaryModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -118,7 +118,7 @@ </dd> </dl><a NAME="BinaryModel.data" ID="BinaryModel.data"></a> <h4>BinaryModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -161,7 +161,7 @@ </dd> </dl><a NAME="BinaryModel.headerData" ID="BinaryModel.headerData"></a> <h4>BinaryModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get header data from the model. </p><dl> @@ -220,7 +220,7 @@ </dd> </dl><a NAME="BinaryModel.setData" ID="BinaryModel.setData"></a> <h4>BinaryModel.setData</h4> -<b>setData</b>(<i>index, value, role = Qt.EditRole</i>) +<b>setData</b>(<i>index, value, role=Qt.EditRole</i>) <p> Public method to set the data of a node cell. </p><dl> @@ -330,7 +330,7 @@ </table> <a NAME="NumbersWidget.__init__" ID="NumbersWidget.__init__"></a> <h4>NumbersWidget (Constructor)</h4> -<b>NumbersWidget</b>(<i>parent = None</i>) +<b>NumbersWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.UI.PixmapCache.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.PixmapCache.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ <hr /><hr /> <a NAME="addSearchPath" ID="addSearchPath"></a> <h2>addSearchPath</h2> -<b>addSearchPath</b>(<i>path, cache = pixCache</i>) +<b>addSearchPath</b>(<i>path, cache=pixCache</i>) <p> Module function to add a path to the search path. </p><dl> @@ -124,7 +124,7 @@ <hr /><hr /> <a NAME="getIcon" ID="getIcon"></a> <h2>getIcon</h2> -<b>getIcon</b>(<i>key, cache = pixCache</i>) +<b>getIcon</b>(<i>key, cache=pixCache</i>) <p> Module function to retrieve an icon. </p><dl> @@ -142,7 +142,7 @@ <hr /><hr /> <a NAME="getPixmap" ID="getPixmap"></a> <h2>getPixmap</h2> -<b>getPixmap</b>(<i>key, cache = pixCache</i>) +<b>getPixmap</b>(<i>key, cache=pixCache</i>) <p> Module function to retrieve a pixmap. </p><dl> @@ -160,7 +160,7 @@ <hr /><hr /> <a NAME="getSymlinkIcon" ID="getSymlinkIcon"></a> <h2>getSymlinkIcon</h2> -<b>getSymlinkIcon</b>(<i>key, cache = pixCache</i>) +<b>getSymlinkIcon</b>(<i>key, cache=pixCache</i>) <p> Module function to retrieve a symbolic link icon. </p><dl>
--- a/Documentation/Source/eric5.UI.SymbolsWidget.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.SymbolsWidget.html Fri Mar 11 16:51:57 2011 +0100 @@ -102,7 +102,7 @@ </table> <a NAME="SymbolsModel.__init__" ID="SymbolsModel.__init__"></a> <h4>SymbolsModel (Constructor)</h4> -<b>SymbolsModel</b>(<i>parent = None</i>) +<b>SymbolsModel</b>(<i>parent=None</i>) <p> Constructor </p><dl> @@ -202,7 +202,7 @@ </dd> </dl><a NAME="SymbolsModel.data" ID="SymbolsModel.data"></a> <h4>SymbolsModel.data</h4> -<b>data</b>(<i>index, role = Qt.DisplayRole</i>) +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) <p> Public method to get data from the model. </p><dl> @@ -256,7 +256,7 @@ </dd> </dl><a NAME="SymbolsModel.headerData" ID="SymbolsModel.headerData"></a> <h4>SymbolsModel.headerData</h4> -<b>headerData</b>(<i>section, orientation, role = Qt.DisplayRole</i>) +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> Public method to get header data from the model. </p><dl> @@ -341,7 +341,7 @@ </table> <a NAME="SymbolsWidget.__init__" ID="SymbolsWidget.__init__"></a> <h4>SymbolsWidget (Constructor)</h4> -<b>SymbolsWidget</b>(<i>parent = None</i>) +<b>SymbolsWidget</b>(<i>parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.UI.UserInterface.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UI.UserInterface.html Fri Mar 11 16:51:57 2011 +0100 @@ -749,7 +749,7 @@ </dd> </dl><a NAME="UserInterface.__TRPreviewer" ID="UserInterface.__TRPreviewer"></a> <h4>UserInterface.__TRPreviewer</h4> -<b>__TRPreviewer</b>(<i>fileNames = None, ignore = False</i>) +<b>__TRPreviewer</b>(<i>fileNames=None, ignore=False</i>) <p> Private slot to start the Translation Previewer executable. </p><dl> @@ -833,7 +833,7 @@ Private slot to handle the activation of the Terminal window. </p><a NAME="UserInterface.__activateViewProfile" ID="UserInterface.__activateViewProfile"></a> <h4>UserInterface.__activateViewProfile</h4> -<b>__activateViewProfile</b>(<i>name, save = True</i>) +<b>__activateViewProfile</b>(<i>name, save=True</i>) <p> Private slot to activate a view profile. </p><dl> @@ -852,7 +852,7 @@ Private slot to handle the activation of the current editor. </p><a NAME="UserInterface.__assistant" ID="UserInterface.__assistant"></a> <h4>UserInterface.__assistant</h4> -<b>__assistant</b>(<i>home = None, version = 0</i>) +<b>__assistant</b>(<i>home=None, version=0</i>) <p> Private slot to start the Qt-Assistant executable. </p><dl> @@ -985,7 +985,7 @@ </dd> </dl><a NAME="UserInterface.__customViewer" ID="UserInterface.__customViewer"></a> <h4>UserInterface.__customViewer</h4> -<b>__customViewer</b>(<i>home = None</i>) +<b>__customViewer</b>(<i>home=None</i>) <p> Private slot to start a custom viewer. </p><dl> @@ -1005,7 +1005,7 @@ Private slot to show a dialog to uninstall a plugin. </p><a NAME="UserInterface.__designer" ID="UserInterface.__designer"></a> <h4>UserInterface.__designer</h4> -<b>__designer</b>(<i>fn = None, version = 0</i>) +<b>__designer</b>(<i>fn=None, version=0</i>) <p> Private slot to start the Qt-Designer executable. </p><dl> @@ -1023,7 +1023,7 @@ Private slot to start the Qt-Designer 4 executable. </p><a NAME="UserInterface.__editPixmap" ID="UserInterface.__editPixmap"></a> <h4>UserInterface.__editPixmap</h4> -<b>__editPixmap</b>(<i>fn = ""</i>) +<b>__editPixmap</b>(<i>fn=""</i>) <p> Private slot to show a pixmap in a dialog. </p><dl> @@ -1138,7 +1138,7 @@ Private slot to create the toolbars. </p><a NAME="UserInterface.__installPlugins" ID="UserInterface.__installPlugins"></a> <h4>UserInterface.__installPlugins</h4> -<b>__installPlugins</b>(<i>pluginFileNames = []</i>) +<b>__installPlugins</b>(<i>pluginFileNames=[]</i>) <p> Private slot to show a dialog to install a new plugin. </p><dl> @@ -1154,7 +1154,7 @@ Private slot to handle the lastEditorClosed signal. </p><a NAME="UserInterface.__linguist" ID="UserInterface.__linguist"></a> <h4>UserInterface.__linguist</h4> -<b>__linguist</b>(<i>fn = None, version = 0</i>) +<b>__linguist</b>(<i>fn=None, version=0</i>) <p> Private slot to start the Qt-Linguist executable. </p><dl> @@ -1167,7 +1167,7 @@ </dd> </dl><a NAME="UserInterface.__linguist4" ID="UserInterface.__linguist4"></a> <h4>UserInterface.__linguist4</h4> -<b>__linguist4</b>(<i>fn = None</i>) +<b>__linguist4</b>(<i>fn=None</i>) <p> Private slot to start the Qt-Linguist 4 executable. </p><dl> @@ -1187,7 +1187,7 @@ Private slot to show a mini editor window. </p><a NAME="UserInterface.__openOnStartup" ID="UserInterface.__openOnStartup"></a> <h4>UserInterface.__openOnStartup</h4> -<b>__openOnStartup</b>(<i>startupType = None</i>) +<b>__openOnStartup</b>(<i>startupType=None</i>) <p> Private method to open the last file, project or multiproject. </p><dl> @@ -1286,7 +1286,7 @@ </dd> </dl><a NAME="UserInterface.__setEditProfile" ID="UserInterface.__setEditProfile"></a> <h4>UserInterface.__setEditProfile</h4> -<b>__setEditProfile</b>(<i>save = True</i>) +<b>__setEditProfile</b>(<i>save=True</i>) <p> Private slot to activate the edit view profile. </p><dl> @@ -1302,7 +1302,7 @@ Private slot to set the style of the interface. </p><a NAME="UserInterface.__setWindowCaption" ID="UserInterface.__setWindowCaption"></a> <h4>UserInterface.__setWindowCaption</h4> -<b>__setWindowCaption</b>(<i>editor = None, project = None</i>) +<b>__setWindowCaption</b>(<i>editor=None, project=None</i>) <p> Private method to set the caption of the Main Window. </p><dl> @@ -1344,7 +1344,7 @@ </dd> </dl><a NAME="UserInterface.__showEmailDialog" ID="UserInterface.__showEmailDialog"></a> <h4>UserInterface.__showEmailDialog</h4> -<b>__showEmailDialog</b>(<i>mode, attachFile = None, deleteAttachFile = False</i>) +<b>__showEmailDialog</b>(<i>mode, attachFile=None, deleteAttachFile=False</i>) <p> Private slot to show the email dialog in a given mode. </p><dl> @@ -1451,7 +1451,7 @@ </dd> </dl><a NAME="UserInterface.__showSystemEmailClient" ID="UserInterface.__showSystemEmailClient"></a> <h4>UserInterface.__showSystemEmailClient</h4> -<b>__showSystemEmailClient</b>(<i>mode, attachFile = None, deleteAttachFile = False</i>) +<b>__showSystemEmailClient</b>(<i>mode, attachFile=None, deleteAttachFile=False</i>) <p> Private slot to show the system email dialog. </p><dl> @@ -1537,7 +1537,7 @@ </dd> </dl><a NAME="UserInterface.__startWebBrowser" ID="UserInterface.__startWebBrowser"></a> <h4>UserInterface.__startWebBrowser</h4> -<b>__startWebBrowser</b>(<i>home = ""</i>) +<b>__startWebBrowser</b>(<i>home=""</i>) <p> Private slot to start the eric5 web browser. </p><dl> @@ -1710,7 +1710,7 @@ Private slot to display the unittest dialog and rerun the last test. </p><a NAME="UserInterface.__unittestScript" ID="UserInterface.__unittestScript"></a> <h4>UserInterface.__unittestScript</h4> -<b>__unittestScript</b>(<i>prog = None</i>) +<b>__unittestScript</b>(<i>prog=None</i>) <p> Private slot for displaying the unittest dialog and run the current script. </p><dl> @@ -1812,7 +1812,7 @@ <h4>UserInterface.checkConfigurationStatus</h4> <b>checkConfigurationStatus</b>(<i></i>) <p> - Public method to check, if eric5 has been configured. If it is not, + Public method to check, if eric5 has been configured. If it is not, the configuration dialog is shown. </p><a NAME="UserInterface.checkForErrorLog" ID="UserInterface.checkForErrorLog"></a> <h4>UserInterface.checkForErrorLog</h4> @@ -1974,7 +1974,7 @@ </dd> </dl><a NAME="UserInterface.launchHelpViewer" ID="UserInterface.launchHelpViewer"></a> <h4>UserInterface.launchHelpViewer</h4> -<b>launchHelpViewer</b>(<i>home, searchWord = None</i>) +<b>launchHelpViewer</b>(<i>home, searchWord=None</i>) <p> Public slot to start the help viewer. </p><dl> @@ -1987,7 +1987,7 @@ </dd> </dl><a NAME="UserInterface.performVersionCheck" ID="UserInterface.performVersionCheck"></a> <h4>UserInterface.performVersionCheck</h4> -<b>performVersionCheck</b>(<i>manual = True, alternative = 0, showVersions = False</i>) +<b>performVersionCheck</b>(<i>manual=True, alternative=0, showVersions=False</i>) <p> Public method to check the internet for an eric5 update. </p><dl> @@ -2011,10 +2011,10 @@ <dd> list of files to open<br /> The args are processed one at a time. All arguments after a - '--' option are considered debug arguments to the program + '--' option are considered debug arguments to the program for the debugger. All files named before the '--' option - are opened in a text editor, unless the argument ends in - .e4p, then it is opened as a project file. If it ends in + are opened in a text editor, unless the argument ends in + .e4p, then it is opened as a project file. If it ends in .e4m, it is opened as a multiproject. </dd> </dl><a NAME="UserInterface.registerToolbar" ID="UserInterface.registerToolbar"></a> @@ -2045,7 +2045,7 @@ </dd> </dl><a NAME="UserInterface.removeE5Actions" ID="UserInterface.removeE5Actions"></a> <h4>UserInterface.removeE5Actions</h4> -<b>removeE5Actions</b>(<i>actions, type = 'ui'</i>) +<b>removeE5Actions</b>(<i>actions, type='ui'</i>) <p> Public method to remove actions from the list of actions. </p><dl> @@ -2072,7 +2072,7 @@ </dd> </dl><a NAME="UserInterface.setDebugProfile" ID="UserInterface.setDebugProfile"></a> <h4>UserInterface.setDebugProfile</h4> -<b>setDebugProfile</b>(<i>save = True</i>) +<b>setDebugProfile</b>(<i>save=True</i>) <p> Public slot to activate the debug view profile. </p><dl> @@ -2108,7 +2108,7 @@ </dd> </dl><a NAME="UserInterface.showPreferences" ID="UserInterface.showPreferences"></a> <h4>UserInterface.showPreferences</h4> -<b>showPreferences</b>(<i>pageName = None</i>) +<b>showPreferences</b>(<i>pageName=None</i>) <p> Public slot to set the preferences. </p><dl> @@ -2128,7 +2128,7 @@ </dd> </dl><a NAME="UserInterface.versionIsNewer" ID="UserInterface.versionIsNewer"></a> <h4>UserInterface.versionIsNewer</h4> -<b>versionIsNewer</b>(<i>required, snapshot = None</i>) +<b>versionIsNewer</b>(<i>required, snapshot=None</i>) <p> Public method to check, if the eric5 version is good compared to the required version.
--- a/Documentation/Source/eric5.Utilities.ClassBrowsers.ClbrBaseClasses.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.ClassBrowsers.ClbrBaseClasses.html Fri Mar 11 16:51:57 2011 +0100 @@ -437,7 +437,7 @@ </table> <a NAME="Function.__init__" ID="Function.__init__"></a> <h4>Function (Constructor)</h4> -<b>Function</b>(<i>module, name, file, lineno, signature = '', separator = ', '</i>) +<b>Function</b>(<i>module, name, file, lineno, signature='', separator=', '</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Utilities.ClassBrowsers.__init__.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.ClassBrowsers.__init__.html Fri Mar 11 16:51:57 2011 +0100 @@ -54,7 +54,7 @@ <hr /><hr /> <a NAME="find_module" ID="find_module"></a> <h2>find_module</h2> -<b>find_module</b>(<i>name, path, isPyFile = False</i>) +<b>find_module</b>(<i>name, path, isPyFile=False</i>) <p> Module function to extend the Python module finding mechanism. </p><p> @@ -86,7 +86,7 @@ <hr /><hr /> <a NAME="readmodule" ID="readmodule"></a> <h2>readmodule</h2> -<b>readmodule</b>(<i>module, path=[], isPyFile = False</i>) +<b>readmodule</b>(<i>module, path=[], isPyFile=False</i>) <p> Read a source file and return a dictionary of classes, functions, modules, etc. . </p><p>
--- a/Documentation/Source/eric5.Utilities.ClassBrowsers.idlclbr.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.ClassBrowsers.idlclbr.html Fri Mar 11 16:51:57 2011 +0100 @@ -120,7 +120,7 @@ </table> <a NAME="Function.__init__" ID="Function.__init__"></a> <h4>Function (Constructor)</h4> -<b>Function</b>(<i>module, name, file, lineno, signature = '', separator = ', '</i>) +<b>Function</b>(<i>module, name, file, lineno, signature='', separator=', '</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Utilities.ClassBrowsers.pyclbr.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.ClassBrowsers.pyclbr.html Fri Mar 11 16:51:57 2011 +0100 @@ -166,7 +166,7 @@ </table> <a NAME="Function.__init__" ID="Function.__init__"></a> <h4>Function (Constructor)</h4> -<b>Function</b>(<i>module, name, file, lineno, signature = '', separator = ', '</i>) +<b>Function</b>(<i>module, name, file, lineno, signature='', separator=', '</i>) <p> Constructor </p><dl> @@ -278,7 +278,7 @@ <hr /><hr /> <a NAME="readmodule_ex" ID="readmodule_ex"></a> <h2>readmodule_ex</h2> -<b>readmodule_ex</b>(<i>module, path=[], inpackage = False, isPyFile = False</i>) +<b>readmodule_ex</b>(<i>module, path=[], inpackage=False, isPyFile=False</i>) <p> Read a module file and return a dictionary of classes. </p><p>
--- a/Documentation/Source/eric5.Utilities.ClassBrowsers.rbclbr.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.ClassBrowsers.rbclbr.html Fri Mar 11 16:51:57 2011 +0100 @@ -163,7 +163,7 @@ </table> <a NAME="Function.__init__" ID="Function.__init__"></a> <h4>Function (Constructor)</h4> -<b>Function</b>(<i>module, name, file, lineno, signature = '', separator = ', '</i>) +<b>Function</b>(<i>module, name, file, lineno, signature='', separator=', '</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.Utilities.ModuleParser.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.ModuleParser.html Fri Mar 11 16:51:57 2011 +0100 @@ -99,7 +99,7 @@ </table> <a NAME="Attribute.__init__" ID="Attribute.__init__"></a> <h4>Attribute (Constructor)</h4> -<b>Attribute</b>(<i>module, name, file, lineno, isSignal = False</i>) +<b>Attribute</b>(<i>module, name, file, lineno, isSignal=False</i>) <p> Constructor </p><dl> @@ -299,7 +299,7 @@ </table> <a NAME="Function.__init__" ID="Function.__init__"></a> <h4>Function (Constructor)</h4> -<b>Function</b>(<i>module, name, file, lineno, signature = '', pyqtSignature = None</i>) +<b>Function</b>(<i>module, name, file, lineno, signature='', pyqtSignature=None</i>) <p> Constructor </p><dl> @@ -418,7 +418,7 @@ <h4>Module.__py_scan</h4> <b>__py_scan</b>(<i>src</i>) <p> - Private method to scan the source text of a Python module and retrieve the + Private method to scan the source text of a Python module and retrieve the relevant information. </p><dl> <dt><i>src</i></dt> @@ -439,7 +439,7 @@ <h4>Module.__rb_scan</h4> <b>__rb_scan</b>(<i>src</i>) <p> - Private method to scan the source text of a Python module and retrieve the + Private method to scan the source text of a Python module and retrieve the relevant information. </p><dl> <dt><i>src</i></dt> @@ -796,7 +796,7 @@ <hr /><hr /> <a NAME="readModule" ID="readModule"></a> <h2>readModule</h2> -<b>readModule</b>(<i>module, path = [], inpackage = False, basename = "", extensions = None, caching = True</i>) +<b>readModule</b>(<i>module, path=[], inpackage=False, basename="", extensions=None, caching=True</i>) <p> Function to read a module file and parse it. </p><p> @@ -838,7 +838,7 @@ <hr /><hr /> <a NAME="resetParsedModule" ID="resetParsedModule"></a> <h2>resetParsedModule</h2> -<b>resetParsedModule</b>(<i>module, basename = ""</i>) +<b>resetParsedModule</b>(<i>module, basename=""</i>) <p> Module function to clear one module from the list of parsed modules. </p><dl>
--- a/Documentation/Source/eric5.Utilities.Startup.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.Startup.html Fri Mar 11 16:51:57 2011 +0100 @@ -118,7 +118,7 @@ <hr /><hr /> <a NAME="loadTranslators" ID="loadTranslators"></a> <h2>loadTranslators</h2> -<b>loadTranslators</b>(<i>qtTransDir, app, translationFiles = ()</i>) +<b>loadTranslators</b>(<i>qtTransDir, app, translationFiles=()</i>) <p> Module function to load all required translations. </p><dl> @@ -143,7 +143,7 @@ <hr /><hr /> <a NAME="makeAppInfo" ID="makeAppInfo"></a> <h2>makeAppInfo</h2> -<b>makeAppInfo</b>(<i>argv, name, arg, description, options = []</i>) +<b>makeAppInfo</b>(<i>argv, name, arg, description, options=[]</i>) <p> Module function to generate a dictionary describing the application. </p><dl> @@ -184,7 +184,7 @@ <hr /><hr /> <a NAME="simpleAppStartup" ID="simpleAppStartup"></a> <h2>simpleAppStartup</h2> -<b>simpleAppStartup</b>(<i>argv, appinfo, mwFactory, quitOnLastWindowClosed = True, app = None</i>) +<b>simpleAppStartup</b>(<i>argv, appinfo, mwFactory, quitOnLastWindowClosed=True, app=None</i>) <p> Module function to start up an application that doesn't need a specialized start up. </p><p> @@ -217,7 +217,7 @@ <hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> -<b>usage</b>(<i>appinfo, optlen = 12</i>) +<b>usage</b>(<i>appinfo, optlen=12</i>) <p> Module function to show the usage information. </p><dl>
--- a/Documentation/Source/eric5.Utilities.__init__.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.__init__.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.Utilities.__init__</h1> <p> -Package implementing various functions/classes needed everywhere within eric5. +Package implementing various functions/classes needed everywhere within eric5. </p> <h3>Global Attributes</h3> <table> @@ -277,7 +277,7 @@ <hr /><hr /> <a NAME="__showwarning" ID="__showwarning"></a> <h2>__showwarning</h2> -<b>__showwarning</b>(<i>message, category, filename, lineno, file = None, line = ""</i>) +<b>__showwarning</b>(<i>message, category, filename, lineno, file=None, line=""</i>) <p> Module function to raise a SyntaxError for a SyntaxWarning. </p><dl> @@ -341,7 +341,7 @@ <hr /><hr /> <a NAME="compactPath" ID="compactPath"></a> <h2>compactPath</h2> -<b>compactPath</b>(<i>path, width, measure = len</i>) +<b>compactPath</b>(<i>path, width, measure=len</i>) <p> Function to return a compacted path fitting inside the given width. </p><dl> @@ -365,7 +365,7 @@ <hr /><hr /> <a NAME="compile" ID="compile"></a> <h2>compile</h2> -<b>compile</b>(<i>file, codestring = ""</i>) +<b>compile</b>(<i>file, codestring=""</i>) <p> Function to compile one Python source file to Python bytecode. </p><dl> @@ -471,7 +471,7 @@ <dt>Returns:</dt> <dd> list of all files and directories in the tree rooted - at path. The names are expanded to start with path. + at path. The names are expanded to start with path. </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -545,7 +545,7 @@ Flags are contained in comments and are introduced by 'eflag:'. The rest of the line is interpreted as 'key = value'. value is analyzed for being an integer or float value. If that fails, it - is assumed to be a string. If a key does not contain a '=' + is assumed to be a string. If a key does not contain a '=' character, it is assumed to be a boolean flag. Flags are expected at the very end of a file. The search is ended, if a line without the 'eflag:' marker is found. @@ -582,7 +582,7 @@ <hr /><hr /> <a NAME="generateDistroInfo" ID="generateDistroInfo"></a> <h2>generateDistroInfo</h2> -<b>generateDistroInfo</b>(<i>linesep = '\n'</i>) +<b>generateDistroInfo</b>(<i>linesep='\n'</i>) <p> Module function to generate a string with distribution infos. </p><dl> @@ -600,7 +600,7 @@ <hr /><hr /> <a NAME="generatePluginsVersionInfo" ID="generatePluginsVersionInfo"></a> <h2>generatePluginsVersionInfo</h2> -<b>generatePluginsVersionInfo</b>(<i>linesep = '\n'</i>) +<b>generatePluginsVersionInfo</b>(<i>linesep='\n'</i>) <p> Module function to generate a string with plugins version infos. </p><dl> @@ -636,7 +636,7 @@ <hr /><hr /> <a NAME="generateVersionInfo" ID="generateVersionInfo"></a> <h2>generateVersionInfo</h2> -<b>generateVersionInfo</b>(<i>linesep = '\n'</i>) +<b>generateVersionInfo</b>(<i>linesep='\n'</i>) <p> Module function to generate a string with various version infos. </p><dl> @@ -688,7 +688,7 @@ <hr /><hr /> <a NAME="getEnvironmentEntry" ID="getEnvironmentEntry"></a> <h2>getEnvironmentEntry</h2> -<b>getEnvironmentEntry</b>(<i>key, default = None</i>) +<b>getEnvironmentEntry</b>(<i>key, default=None</i>) <p> Module function to get an environment entry. </p><dl> @@ -1059,7 +1059,7 @@ <h2>normcaseabspath</h2> <b>normcaseabspath</b>(<i>path</i>) <p> - Function returning an absolute path, that is normalized with respect to its case + Function returning an absolute path, that is normalized with respect to its case and references. </p><dl> <dt><i>path</i></dt> @@ -1232,7 +1232,7 @@ <hr /><hr /> <a NAME="py2compile" ID="py2compile"></a> <h2>py2compile</h2> -<b>py2compile</b>(<i>file, checkFlakes = False</i>) +<b>py2compile</b>(<i>file, checkFlakes=False</i>) <p> Function to compile one Python 2 source file to Python 2 bytecode. </p><dl> @@ -1296,7 +1296,7 @@ <hr /><hr /> <a NAME="relpath" ID="relpath"></a> <h2>relpath</h2> -<b>relpath</b>(<i>path, start = os.path.curdir</i>) +<b>relpath</b>(<i>path, start=os.path.curdir</i>) <p> Return a relative version of a path. </p><dl>
--- a/Documentation/Source/eric5.Utilities.py3flakes.checker.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.py3flakes.checker.html Fri Mar 11 16:51:57 2011 +0100 @@ -273,7 +273,7 @@ </table> <a NAME="Checker.__init__" ID="Checker.__init__"></a> <h4>Checker (Constructor)</h4> -<b>Checker</b>(<i>module, filename = '(none)'</i>) +<b>Checker</b>(<i>module, filename='(none)'</i>) <p> Constructor </p><dl> @@ -346,7 +346,7 @@ <b>addArgs</b>(<i></i>) <a NAME="Checker.addBinding" ID="Checker.addBinding"></a> <h4>Checker.addBinding</h4> -<b>addBinding</b>(<i>lineno, value, reportRedef = True</i>) +<b>addBinding</b>(<i>lineno, value, reportRedef=True</i>) <p> Called when a binding is altered. </p><dl>
--- a/Documentation/Source/eric5.Utilities.uic.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.Utilities.uic.html Fri Mar 11 16:51:57 2011 +0100 @@ -52,7 +52,7 @@ <hr /><hr /> <a NAME="compileUiDir" ID="compileUiDir"></a> <h2>compileUiDir</h2> -<b>compileUiDir</b>(<i>dir, recurse = False, map = None, **compileUi_args</i>) +<b>compileUiDir</b>(<i>dir, recurse = False, map = None, ** compileUi_args</i>) <p> Creates Python modules from Qt Designer .ui files in a directory or directory tree. @@ -84,7 +84,7 @@ <hr /><hr /> <a NAME="compileUiFiles" ID="compileUiFiles"></a> <h2>compileUiFiles</h2> -<b>compileUiFiles</b>(<i>dir, recurse = False</i>) +<b>compileUiFiles</b>(<i>dir, recurse=False</i>) <p> Module function to compile the .ui files of a directory tree to Python sources. </p><dl>
--- a/Documentation/Source/eric5.UtilitiesPython2.Tabnanny.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.UtilitiesPython2.Tabnanny.html Fri Mar 11 16:51:57 2011 +0100 @@ -226,7 +226,7 @@ <h4>Whitespace.less</h4> <b>less</b>(<i>other</i>) <p> - Method to compare the indentation level against another Whitespace objects to + Method to compare the indentation level against another Whitespace objects to be smaller. </p><dl> <dt><i>other</i></dt>
--- a/Documentation/Source/eric5.VCS.ProjectBrowserHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.VCS.ProjectBrowserHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -111,7 +111,7 @@ </table> <a NAME="VcsProjectBrowserHelper.__init__" ID="VcsProjectBrowserHelper.__init__"></a> <h4>VcsProjectBrowserHelper (Constructor)</h4> -<b>VcsProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent = None, name = None</i>) +<b>VcsProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -235,9 +235,9 @@ <h4>VcsProjectBrowserHelper.showContextMenu</h4> <b>showContextMenu</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. </p><dl> <dt><i>menu</i></dt> @@ -252,9 +252,9 @@ <h4>VcsProjectBrowserHelper.showContextMenuDir</h4> <b>showContextMenuDir</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -269,9 +269,9 @@ <h4>VcsProjectBrowserHelper.showContextMenuDirMulti</h4> <b>showContextMenuDirMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu is shown. + Slot called before the context menu is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. </p><dl> <dt><i>menu</i></dt> @@ -286,9 +286,9 @@ <h4>VcsProjectBrowserHelper.showContextMenuMulti</h4> <b>showContextMenuMulti</b>(<i>menu, standardItems</i>) <p> - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. </p><p> - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. </p><dl> <dt><i>menu</i></dt>
--- a/Documentation/Source/eric5.VCS.ProjectHelper.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.VCS.ProjectHelper.html Fri Mar 11 16:51:57 2011 +0100 @@ -126,7 +126,7 @@ </table> <a NAME="VcsProjectHelper.__init__" ID="VcsProjectHelper.__init__"></a> <h4>VcsProjectHelper (Constructor)</h4> -<b>VcsProjectHelper</b>(<i>vcsObject, projectObject, parent = None, name = None</i>) +<b>VcsProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -145,7 +145,7 @@ </dd> </dl><a NAME="VcsProjectHelper._vcsCheckout" ID="VcsProjectHelper._vcsCheckout"></a> <h4>VcsProjectHelper._vcsCheckout</h4> -<b>_vcsCheckout</b>(<i>export = False</i>) +<b>_vcsCheckout</b>(<i>export=False</i>) <p> Protected slot used to create a local project from the repository. </p><dl> @@ -190,9 +190,9 @@ <p> Protected slot used to import the local project into the repository. </p><p> - <b>NOTE</b>: + <b>NOTE</b>: This does not necessarily make the local project a vcs controlled - project. You may have to checkout the project from the repository in + project. You may have to checkout the project from the repository in order to accomplish that. </p><a NAME="VcsProjectHelper._vcsInfoDisplay" ID="VcsProjectHelper._vcsInfoDisplay"></a> <h4>VcsProjectHelper._vcsInfoDisplay</h4>
--- a/Documentation/Source/eric5.VCS.StatusMonitorThread.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.VCS.StatusMonitorThread.html Fri Mar 11 16:51:57 2011 +0100 @@ -97,7 +97,7 @@ </table> <a NAME="VcsStatusMonitorThread.__init__" ID="VcsStatusMonitorThread.__init__"></a> <h4>VcsStatusMonitorThread (Constructor)</h4> -<b>VcsStatusMonitorThread</b>(<i>interval, project, vcs, parent = None</i>) +<b>VcsStatusMonitorThread</b>(<i>interval, project, vcs, parent=None</i>) <p> Constructor </p><dl>
--- a/Documentation/Source/eric5.VCS.VersionControl.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.VCS.VersionControl.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric5.VCS.VersionControl</h1> <p> -Module implementing an abstract base class to be subclassed by all specific +Module implementing an abstract base class to be subclassed by all specific VCS interfaces. </p> <h3>Global Attributes</h3> @@ -44,7 +44,7 @@ <a NAME="VersionControl" ID="VersionControl"></a> <h2>VersionControl</h2> <p> - Class implementing an abstract base class to be subclassed by all specific + Class implementing an abstract base class to be subclassed by all specific VCS interfaces. </p><p> It defines the vcs interface to be implemented by subclasses @@ -240,7 +240,7 @@ </table> <a NAME="VersionControl.__init__" ID="VersionControl.__init__"></a> <h4>VersionControl (Constructor)</h4> -<b>VersionControl</b>(<i>parent = None, name = None</i>) +<b>VersionControl</b>(<i>parent=None, name=None</i>) <p> Constructor </p><dl> @@ -394,7 +394,7 @@ <h4>VersionControl.splitPathList</h4> <b>splitPathList</b>(<i>names</i>) <p> - Public method splitting the list of names into a common directory part and + Public method splitting the list of names into a common directory part and a file list. </p><dl> <dt><i>names</i></dt> @@ -423,7 +423,7 @@ </dd> </dl><a NAME="VersionControl.startSynchronizedProcess" ID="VersionControl.startSynchronizedProcess"></a> <h4>VersionControl.startSynchronizedProcess</h4> -<b>startSynchronizedProcess</b>(<i>proc, program, arguments, workingDir = None</i>) +<b>startSynchronizedProcess</b>(<i>proc, program, arguments, workingDir=None</i>) <p> Public method to start a synchroneous process </p><p> @@ -455,7 +455,7 @@ Public method to stop the VCS status monitor thread. </p><a NAME="VersionControl.vcsAdd" ID="VersionControl.vcsAdd"></a> <h4>VersionControl.vcsAdd</h4> -<b>vcsAdd</b>(<i>name, isDir = False, noDialog = False</i>) +<b>vcsAdd</b>(<i>name, isDir=False, noDialog=False</i>) <p> Public method used to add a file/directory in the vcs. </p><p> @@ -478,7 +478,7 @@ </dd> </dl><a NAME="VersionControl.vcsAddBinary" ID="VersionControl.vcsAddBinary"></a> <h4>VersionControl.vcsAddBinary</h4> -<b>vcsAddBinary</b>(<i>name, isDir = False</i>) +<b>vcsAddBinary</b>(<i>name, isDir=False</i>) <p> Public method used to add a file/directory in binary mode in the vcs. </p><p> @@ -539,7 +539,7 @@ </dd> </dl><a NAME="VersionControl.vcsCheckout" ID="VersionControl.vcsCheckout"></a> <h4>VersionControl.vcsCheckout</h4> -<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsCheckout</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to check the project out of the vcs. </p><dl> @@ -595,7 +595,7 @@ </dd> </dl><a NAME="VersionControl.vcsCommit" ID="VersionControl.vcsCommit"></a> <h4>VersionControl.vcsCommit</h4> -<b>vcsCommit</b>(<i>name, message, noDialog = False</i>) +<b>vcsCommit</b>(<i>name, message, noDialog=False</i>) <p> Public method used to make the change of a file/directory permanent in the vcs. </p><p> @@ -725,7 +725,7 @@ </dd> </dl><a NAME="VersionControl.vcsGetProjectBrowserHelper" ID="VersionControl.vcsGetProjectBrowserHelper"></a> <h4>VersionControl.vcsGetProjectBrowserHelper</h4> -<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser = False</i>) +<b>vcsGetProjectBrowserHelper</b>(<i>browser, project, isTranslationsBrowser=False</i>) <p> Public method to instanciate a helper object for the different project browsers. </p><dl> @@ -779,7 +779,7 @@ </dd> </dl><a NAME="VersionControl.vcsImport" ID="VersionControl.vcsImport"></a> <h4>VersionControl.vcsImport</h4> -<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog = False</i>) +<b>vcsImport</b>(<i>vcsDataDict, projectDir, noDialog=False</i>) <p> Public method used to import the project into the vcs. </p><dl> @@ -806,7 +806,7 @@ </dd> </dl><a NAME="VersionControl.vcsInit" ID="VersionControl.vcsInit"></a> <h4>VersionControl.vcsInit</h4> -<b>vcsInit</b>(<i>vcsDir, noDialog = False</i>) +<b>vcsInit</b>(<i>vcsDir, noDialog=False</i>) <p> Public method used to initialize the vcs. </p><p> @@ -860,7 +860,7 @@ </dd> </dl><a NAME="VersionControl.vcsMove" ID="VersionControl.vcsMove"></a> <h4>VersionControl.vcsMove</h4> -<b>vcsMove</b>(<i>name, project, target = None, noDialog = False</i>) +<b>vcsMove</b>(<i>name, project, target=None, noDialog=False</i>) <p> Public method used to move a file/directory. </p><dl> @@ -904,7 +904,7 @@ </dd> </dl><a NAME="VersionControl.vcsNewProjectOptionsDialog" ID="VersionControl.vcsNewProjectOptionsDialog"></a> <h4>VersionControl.vcsNewProjectOptionsDialog</h4> -<b>vcsNewProjectOptionsDialog</b>(<i>parent = None</i>) +<b>vcsNewProjectOptionsDialog</b>(<i>parent=None</i>) <p> Public method to get a dialog to enter repository info for getting a new project. </p><dl> @@ -914,7 +914,7 @@ </dd> </dl><a NAME="VersionControl.vcsOptionsDialog" ID="VersionControl.vcsOptionsDialog"></a> <h4>VersionControl.vcsOptionsDialog</h4> -<b>vcsOptionsDialog</b>(<i>project, archive, editable = False, parent = None</i>) +<b>vcsOptionsDialog</b>(<i>project, archive, editable=False, parent=None</i>) <p> Public method to get a dialog to enter repository info. </p><dl> @@ -954,7 +954,7 @@ </dd> </dl><a NAME="VersionControl.vcsRemove" ID="VersionControl.vcsRemove"></a> <h4>VersionControl.vcsRemove</h4> -<b>vcsRemove</b>(<i>name, project = False, noDialog = False</i>) +<b>vcsRemove</b>(<i>name, project=False, noDialog=False</i>) <p> Public method used to add a file/directory in the vcs. </p><p> @@ -1109,7 +1109,7 @@ </dd> </dl><a NAME="VersionControl.vcsUpdate" ID="VersionControl.vcsUpdate"></a> <h4>VersionControl.vcsUpdate</h4> -<b>vcsUpdate</b>(<i>name, noDialog = False</i>) +<b>vcsUpdate</b>(<i>name, noDialog=False</i>) <p> Public method used to update a file/directory in the vcs. </p><p>
--- a/Documentation/Source/eric5.VCS.__init__.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.VCS.__init__.html Fri Mar 11 16:51:57 2011 +0100 @@ -26,7 +26,7 @@ </p><p> The general part of the VCS interface defines classes to implement common dialogs. These are a dialog to enter command options, a dialog to display -some repository information and an abstract base class. The individual +some repository information and an abstract base class. The individual interfaces (i.e. CVS) have to be subclasses of this base class. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.ViewManager.BookmarkedFilesDialog.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.ViewManager.BookmarkedFilesDialog.html Fri Mar 11 16:51:57 2011 +0100 @@ -90,7 +90,7 @@ </table> <a NAME="BookmarkedFilesDialog.__init__" ID="BookmarkedFilesDialog.__init__"></a> <h4>BookmarkedFilesDialog (Constructor)</h4> -<b>BookmarkedFilesDialog</b>(<i>bookmarks, parent = None</i>) +<b>BookmarkedFilesDialog</b>(<i>bookmarks, parent=None</i>) <p> Constructor </p><dl> @@ -118,7 +118,7 @@ <h4>BookmarkedFilesDialog.getBookmarkedFiles</h4> <b>getBookmarkedFiles</b>(<i></i>) <p> - Public method to retrieve the tools list. + Public method to retrieve the tools list. </p><dl> <dt>Returns:</dt> <dd>
--- a/Documentation/Source/eric5.ViewManager.ViewManager.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.ViewManager.ViewManager.html Fri Mar 11 16:51:57 2011 +0100 @@ -905,7 +905,7 @@ <h4>ViewManager.__cursorChanged</h4> <b>__cursorChanged</b>(<i>fn, line, pos</i>) <p> - Private slot to handle the cursorChanged signal. + Private slot to handle the cursorChanged signal. </p><p> It emits the signal cursorChanged with parameter editor. </p><dl> @@ -1344,7 +1344,7 @@ Private slot to set the automatic spell checking of all editors. </p><a NAME="ViewManager.__setSbFile" ID="ViewManager.__setSbFile"></a> <h4>ViewManager.__setSbFile</h4> -<b>__setSbFile</b>(<i>fn = None, line = None, pos = None, encoding = None, language = None, eol = None</i>) +<b>__setSbFile</b>(<i>fn=None, line=None, pos=None, encoding=None, language=None, eol=None</i>) <p> Private method to set the file info in the status bar. </p><dl> @@ -1480,7 +1480,7 @@ </dd> </dl><a NAME="ViewManager._checkActions" ID="ViewManager._checkActions"></a> <h4>ViewManager._checkActions</h4> -<b>_checkActions</b>(<i>editor, setSb = True</i>) +<b>_checkActions</b>(<i>editor, setSb=True</i>) <p> Protected slot to check some actions for their enable/disable status and set the statusbar info. @@ -1509,7 +1509,7 @@ <h4>ViewManager._getOpenStartDir</h4> <b>_getOpenStartDir</b>(<i></i>) <p> - Protected method to return the starting directory for a file open dialog. + Protected method to return the starting directory for a file open dialog. </p><p> The appropriate starting directory is calculated using the following search order, until a match is found:<br /> @@ -1719,7 +1719,7 @@ </dd> </dl><a NAME="ViewManager.checkDirty" ID="ViewManager.checkDirty"></a> <h4>ViewManager.checkDirty</h4> -<b>checkDirty</b>(<i>editor, autosave = False</i>) +<b>checkDirty</b>(<i>editor, autosave=False</i>) <p> Public method to check dirty status and open a message window. </p><dl> @@ -1801,7 +1801,7 @@ <h4>ViewManager.closeViewManager</h4> <b>closeViewManager</b>(<i></i>) <p> - Public method to shutdown the viewmanager. + Public method to shutdown the viewmanager. </p><p> If it cannot close all editor windows, it aborts the shutdown process. </p><dl> @@ -1828,7 +1828,7 @@ <h4>ViewManager.editorsCheckFocusInEnabled</h4> <b>editorsCheckFocusInEnabled</b>(<i></i>) <p> - Public method returning the flag indicating editors should perform + Public method returning the flag indicating editors should perform focus in checks. </p><dl> <dt>Returns:</dt> @@ -1908,7 +1908,7 @@ </dd> </dl><a NAME="ViewManager.getEditor" ID="ViewManager.getEditor"></a> <h4>ViewManager.getEditor</h4> -<b>getEditor</b>(<i>fn, filetype = ""</i>) +<b>getEditor</b>(<i>fn, filetype=""</i>) <p> Public method to return the editor displaying the given file. </p><p> @@ -2211,7 +2211,7 @@ Public slot to generate a new empty editor. </p><a NAME="ViewManager.newEditorView" ID="ViewManager.newEditorView"></a> <h4>ViewManager.newEditorView</h4> -<b>newEditorView</b>(<i>fn, caller, filetype = ""</i>) +<b>newEditorView</b>(<i>fn, caller, filetype=""</i>) <p> Public method to create a new editor displaying the given document. </p><dl> @@ -2232,7 +2232,7 @@ Public slot used to move to the next split. </p><a NAME="ViewManager.openFiles" ID="ViewManager.openFiles"></a> <h4>ViewManager.openFiles</h4> -<b>openFiles</b>(<i>prog = None</i>) +<b>openFiles</b>(<i>prog=None</i>) <p> Public slot to open some files. </p><dl> @@ -2242,7 +2242,7 @@ </dd> </dl><a NAME="ViewManager.openSourceFile" ID="ViewManager.openSourceFile"></a> <h4>ViewManager.openSourceFile</h4> -<b>openSourceFile</b>(<i>fn, lineno = None, filetype = "", selStart = 0, selEnd = 0, pos = 0</i>) +<b>openSourceFile</b>(<i>fn, lineno=None, filetype="", selStart=0, selEnd=0, pos=0</i>) <p> Public slot to display a file in an editor. </p><dl> @@ -2464,7 +2464,7 @@ </dd> </dl><a NAME="ViewManager.setFileLine" ID="ViewManager.setFileLine"></a> <h4>ViewManager.setFileLine</h4> -<b>setFileLine</b>(<i>fn, line, error = False, syntaxError = False</i>) +<b>setFileLine</b>(<i>fn, line, error=False, syntaxError=False</i>) <p> Public method to update the user interface when the current program or line changes. @@ -2592,9 +2592,9 @@ Public slot to start a shared edit session for the current editor. </p><a NAME="ViewManager.textForFind" ID="ViewManager.textForFind"></a> <h4>ViewManager.textForFind</h4> -<b>textForFind</b>(<i>getCurrentWord = True</i>) +<b>textForFind</b>(<i>getCurrentWord=True</i>) <p> - Public method to determine the selection or the current word for the next + Public method to determine the selection or the current word for the next find operation. </p><dl> <dt><i>getCurrentWord</i></dt> @@ -2619,7 +2619,7 @@ </dd> </dl><a NAME="ViewManager.unhighlight" ID="ViewManager.unhighlight"></a> <h4>ViewManager.unhighlight</h4> -<b>unhighlight</b>(<i>current = False</i>) +<b>unhighlight</b>(<i>current=False</i>) <p> Public method to switch off all highlights. </p><dl>
--- a/Documentation/Source/eric5.compileUiFiles.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.compileUiFiles.html Fri Mar 11 16:51:57 2011 +0100 @@ -54,7 +54,7 @@ <hr /><hr /> <a NAME="compileUiDir" ID="compileUiDir"></a> <h2>compileUiDir</h2> -<b>compileUiDir</b>(<i>dir, recurse = False, map = None, **compileUi_args</i>) +<b>compileUiDir</b>(<i>dir, recurse = False, map = None, ** compileUi_args</i>) <p> Creates Python modules from Qt Designer .ui files in a directory or directory tree.
--- a/Documentation/Source/eric5.eric5_compare.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.eric5_compare.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Eric5 Compare </p><p> This is the main Python script that performs the necessary initialization -of the Compare module and starts the Qt event loop. This is a standalone +of the Compare module and starts the Qt event loop. This is a standalone version of the integrated Compare module. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.eric5_diff.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.eric5_diff.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Eric5 Diff </p><p> This is the main Python script that performs the necessary initialization -of the Diff module and starts the Qt event loop. This is a standalone +of the Diff module and starts the Qt event loop. This is a standalone version of the integrated Diff module. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.eric5_editor.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.eric5_editor.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Eric5 Editor </p><p> This is the main Python script that performs the necessary initialization -of the MiniEditor module and starts the Qt event loop. This is a standalone +of the MiniEditor module and starts the Qt event loop. This is a standalone version of the integrated MiniEditor module. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.eric5_qregexp.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.eric5_qregexp.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Eric5 QRegExp </p><p> This is the main Python script that performs the necessary initialization -of the QRegExp wizard module and starts the Qt event loop. This is a standalone +of the QRegExp wizard module and starts the Qt event loop. This is a standalone version of the integrated QRegExp wizard. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.eric5_re.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.eric5_re.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Eric5 Re </p><p> This is the main Python script that performs the necessary initialization -of the PyRegExp wizard module and starts the Qt event loop. This is a standalone +of the PyRegExp wizard module and starts the Qt event loop. This is a standalone version of the integrated PyRegExp wizard. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.eric5_unittest.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.eric5_unittest.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Eric5 Unittest </p><p> This is the main Python script that performs the necessary initialization -of the unittest module and starts the Qt event loop. This is a standalone +of the unittest module and starts the Qt event loop. This is a standalone version of the integrated unittest module. </p> <h3>Global Attributes</h3>
--- a/Documentation/Source/eric5.install-i18n.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.install-i18n.html Fri Mar 11 16:51:57 2011 +0100 @@ -85,7 +85,7 @@ <hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> -<b>usage</b>(<i>rcode = 2</i>) +<b>usage</b>(<i>rcode=2</i>) <p> Display a usage message and exit. </p><dl>
--- a/Documentation/Source/eric5.install.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.install.html Fri Mar 11 16:51:57 2011 +0100 @@ -101,7 +101,7 @@ <hr /><hr /> <a NAME="compileUiDir" ID="compileUiDir"></a> <h2>compileUiDir</h2> -<b>compileUiDir</b>(<i>dir, recurse = False, map = None, **compileUi_args</i>) +<b>compileUiDir</b>(<i>dir, recurse = False, map = None, ** compileUi_args</i>) <p> Creates Python modules from Qt Designer .ui files in a directory or directory tree. @@ -220,7 +220,7 @@ <hr /><hr /> <a NAME="createPyWrapper" ID="createPyWrapper"></a> <h2>createPyWrapper</h2> -<b>createPyWrapper</b>(<i>pydir, wfile, isGuiScript = True</i>) +<b>createPyWrapper</b>(<i>pydir, wfile, isGuiScript=True</i>) <p> Create an executable wrapper for a Python script. </p><dl> @@ -254,7 +254,7 @@ <hr /><hr /> <a NAME="exit" ID="exit"></a> <h2>exit</h2> -<b>exit</b>(<i>rcode = 0</i>) +<b>exit</b>(<i>rcode=0</i>) <p> Exit the install script. </p> @@ -312,7 +312,7 @@ <hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> -<b>usage</b>(<i>rcode = 2</i>) +<b>usage</b>(<i>rcode=2</i>) <p> Display a usage message and exit. </p><dl>
--- a/Documentation/Source/eric5.patch_modpython.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.patch_modpython.html Fri Mar 11 16:51:57 2011 +0100 @@ -66,7 +66,7 @@ <hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> -<b>usage</b>(<i>rcode = 2</i>) +<b>usage</b>(<i>rcode=2</i>) <p> Display a usage message and exit. </p><p>
--- a/Documentation/Source/eric5.uninstall.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/eric5.uninstall.html Fri Mar 11 16:51:57 2011 +0100 @@ -80,7 +80,7 @@ <hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> -<b>usage</b>(<i>rcode = 2</i>) +<b>usage</b>(<i>rcode=2</i>) <p> Display a usage message and exit. </p><p>
--- a/Documentation/Source/index-eric5.MultiProject.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.MultiProject.html Fri Mar 11 16:51:57 2011 +0100 @@ -26,8 +26,8 @@ </p><p> The multi project management module consists of the main part, which is used for reading and writing of eric5 multi project files (*.e4m) and -for performing all operations on the multi project. It is accompanied by -various UI related modules implementing different dialogs and a browser +for performing all operations on the multi project. It is accompanied by +various UI related modules implementing different dialogs and a browser for the display of projects belonging to the current multi project. </p>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsMercurial.html Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ <p> Package implementing the vcs interface to Mercurial </p><p> -It consists of the hg class, the project helper classes and some +It consists of the hg class, the project helper classes and some Mercurial specific dialogs. </p>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsPySvn.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsPySvn.html Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ <p> Package implementing the vcs interface to Subversion </p><p> -It consists of the subversion class, the project helper classes and some +It consists of the subversion class, the project helper classes and some Subversion specific dialogs. This package is based upon the pysvn interface. </p>
--- a/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsSubversion.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.Plugins.VcsPlugins.vcsSubversion.html Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ <p> Package implementing the vcs interface to Subversion </p><p> -It consists of the subversion class, the project helper classes and some +It consists of the subversion class, the project helper classes and some Subversion specific dialogs. </p>
--- a/Documentation/Source/index-eric5.Preferences.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.Preferences.html Fri Mar 11 16:51:57 2011 +0100 @@ -27,8 +27,8 @@ The preferences interface consists of a class, which defines the default values for all configuration items and stores the actual values. These values are read and written to the eric5 preferences file by module -functions. The data is stored in a file in a subdirectory of the users home -directory. The individual configuration data is accessed by accessor functions +functions. The data is stored in a file in a subdirectory of the users home +directory. The individual configuration data is accessed by accessor functions defined on the module level. The module is simply imported wherever it is needed with the statement 'import Preferences'. Do not use 'from Preferences import *' to import it.
--- a/Documentation/Source/index-eric5.Project.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.Project.html Fri Mar 11 16:51:57 2011 +0100 @@ -26,8 +26,8 @@ </p><p> The project management module consists of the main part, which is used for reading and writing of eric4 and eric5 project files (*.e4p) -and for performing all operations on the project. It is accompanied by -various UI related modules implementing different dialogs and a tabbed +and for performing all operations on the project. It is accompanied by +various UI related modules implementing different dialogs and a tabbed tree browser for the display of files belonging to the current project as well as the project model related modules. </p>
--- a/Documentation/Source/index-eric5.PyUnit.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.PyUnit.html Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ <p> Package implementing an interface to the pyunit unittest package. </p><p> -The package consist of a single dialog, which may be called as a +The package consist of a single dialog, which may be called as a standalone version using the eric5_unittest script or from within the eric5 IDE. If it is called from within eric5, it has the additional function to open a source file that failed a test.
--- a/Documentation/Source/index-eric5.UI.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.UI.html Fri Mar 11 16:51:57 2011 +0100 @@ -25,7 +25,7 @@ Package implementing the main user interface and general purpose dialogs. </p><p> This package contains the main user interface and some general purpose -dialogs as well as dialogs not fitting the other more specific categories. +dialogs as well as dialogs not fitting the other more specific categories. </p>
--- a/Documentation/Source/index-eric5.Utilities.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.Utilities.html Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,7 @@ <body> <h1>eric5.Utilities</h1> <p> -Package implementing various functions/classes needed everywhere within eric5. +Package implementing various functions/classes needed everywhere within eric5. </p> <h3>Packages</h3>
--- a/Documentation/Source/index-eric5.VCS.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.VCS.html Fri Mar 11 16:51:57 2011 +0100 @@ -26,7 +26,7 @@ </p><p> The general part of the VCS interface defines classes to implement common dialogs. These are a dialog to enter command options, a dialog to display -some repository information and an abstract base class. The individual +some repository information and an abstract base class. The individual interfaces (i.e. CVS) have to be subclasses of this base class. </p>
--- a/Documentation/Source/index-eric5.html Fri Mar 11 08:55:14 2011 +0100 +++ b/Documentation/Source/index-eric5.html Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ <p> Package implementing the eric5 Python IDE (version 5.2). </p><p> -To get more information about eric5 please see the +To get more information about eric5 please see the <a href="http://eric-ide.python-projects.org/index.html">eric web site</a>. </p>
--- a/DocumentationTools/APIGenerator.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DocumentationTools/APIGenerator.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from QScintilla.Editor import Editor + class APIGenerator(object): """ Class implementing the builtin documentation generator. @@ -26,10 +27,10 @@ """ Method to generate the source code documentation. - @param newStyle flag indicating the api generation for QScintilla 1.7 and + @param newStyle flag indicating the api generation for QScintilla 1.7 and newer (boolean) (ignored) @param basePackage name of the base package (string) - @param includePrivate flag indicating to include + @param includePrivate flag indicating to include private methods/functions (boolean) @return The API information. (string) """ @@ -58,7 +59,7 @@ def __addGlobalsAPI(self): """ - Private method to generate the api section for global variables. + Private method to generate the api section for global variables. """ moduleNameStr = "{0}".format(self.moduleName) @@ -99,12 +100,12 @@ else: id = Editor.ClassPrivateID self.api.append('{0}{1}?{2:d}({3})'.format( - self.moduleName, _class.name, id, + self.moduleName, _class.name, id, ', '.join(_class.methods['__init__'].parameters[1:]))) classNameStr = "{0}{1}.".format(self.moduleName, className) for method in methods: - if not self.__isPrivate(_class.methods[method]): + if not self.__isPrivate(_class.methods[method]): if _class.methods[method].isPublic(): id = Editor.MethodID elif _class.methods[method].isProtected(): @@ -112,7 +113,7 @@ else: id = Editor.MethodPrivateID self.api.append('{0}{1}?{2:d}({3})'.format( - classNameStr, method, id, + classNameStr, method, id, ', '.join(_class.methods[method].parameters[1:]))) def __addClassVariablesAPI(self, className): @@ -124,7 +125,7 @@ _class = self.module.classes[className] classNameStr = "{0}{1}.".format(self.moduleName, className) for variable in sorted(_class.globals.keys()): - if not self.__isPrivate(_class.globals[variable]): + if not self.__isPrivate(_class.globals[variable]): if _class.globals[variable].isPublic(): id = Editor.AttributeID elif _class.globals[variable].isProtected(): @@ -139,7 +140,7 @@ """ funcNames = sorted(list(self.module.functions.keys())) for funcName in funcNames: - if not self.__isPrivate(self.module.functions[funcName]): + if not self.__isPrivate(self.module.functions[funcName]): if self.module.functions[funcName].isPublic(): id = Editor.MethodID elif self.module.functions[funcName].isProtected(): @@ -147,5 +148,5 @@ else: id = Editor.MethodPrivateID self.api.append('{0}{1}?{2:d}({3})'.format( - self.moduleName, self.module.functions[funcName].name, id, + self.moduleName, self.module.functions[funcName].name, id, ', '.join(self.module.functions[funcName].parameters)))
--- a/DocumentationTools/Config.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DocumentationTools/Config.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,26 +9,26 @@ # the default colors for the eric5 documentation generator eric5docDefaultColors = { \ - 'BodyColor' : '#000000', - 'BodyBgColor' : '#FFFFFF', - 'Level1HeaderColor' : '#0000FF', - 'Level1HeaderBgColor' : '#FFFFFF', - 'Level2HeaderColor' : '#FF0000', - 'Level2HeaderBgColor' : '#FFFFFF', - 'CFColor' : '#0000FF', - 'CFBgColor' : '#FFFFFF', - 'LinkColor' : '#0000FF', + 'BodyColor': '#000000', + 'BodyBgColor': '#FFFFFF', + 'Level1HeaderColor': '#0000FF', + 'Level1HeaderBgColor': '#FFFFFF', + 'Level2HeaderColor': '#FF0000', + 'Level2HeaderBgColor': '#FFFFFF', + 'CFColor': '#0000FF', + 'CFBgColor': '#FFFFFF', + 'LinkColor': '#0000FF', } eric5docColorParameterNames = { \ - 'BodyColor' : 'body-color', - 'BodyBgColor' : 'body-background-color', - 'Level1HeaderColor' : 'l1header-color', - 'Level1HeaderBgColor' : 'l1header-background-color', - 'Level2HeaderColor' : 'l2header-color', - 'Level2HeaderBgColor' : 'l2header-background-color', - 'CFColor' : 'cfheader-color', - 'CFBgColor' : 'cfheader-background-color', - 'LinkColor' : 'link-color', + 'BodyColor': 'body-color', + 'BodyBgColor': 'body-background-color', + 'Level1HeaderColor': 'l1header-color', + 'Level1HeaderBgColor': 'l1header-background-color', + 'Level2HeaderColor': 'l2header-color', + 'Level2HeaderBgColor': 'l2header-background-color', + 'CFColor': 'cfheader-color', + 'CFBgColor': 'cfheader-background-color', + 'LinkColor': 'link-color', -} \ No newline at end of file +}
--- a/DocumentationTools/IndexGenerator.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DocumentationTools/IndexGenerator.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ from Utilities import joinext + class IndexGenerator(object): """ Class implementing the index generator for the builtin documentation generator. """ - def __init__(self, outputDir, colors, stylesheet = None): + def __init__(self, outputDir, colors, stylesheet=None): """ Constructor @@ -30,10 +31,10 @@ """ self.outputDir = outputDir self.packages = { - "00index" : { - "description" : "", - "subpackages" : {}, - "modules" : {} + "00index": { + "description": "", + "subpackages": {}, + "modules": {} } } self.remembered = False @@ -66,7 +67,7 @@ Public method to remember a documentation file. @param file The filename to be remembered. (string) - @param moduleDocument The ModuleDocument object containing the + @param moduleDocument The ModuleDocument object containing the information for the file. @param basename The basename of the file hierarchy to be documented. The basename is stripped off the filename if it starts with @@ -91,9 +92,9 @@ elt["subpackages"][package] = moduleDocument.shortDescription() self.packages[package] = { - "description" : moduleDocument.description(), - "subpackages" : {}, - "modules" : {} + "description": moduleDocument.description(), + "subpackages": {}, + "modules": {} } if moduleDocument.isEmpty(): @@ -107,7 +108,7 @@ elt["modules"][moduleDocument.name()] = \ moduleDocument.shortDescription() - def __writeIndex(self, packagename, package, newline = None): + def __writeIndex(self, packagename, package, newline=None): """ Private method to generate an index file for a package. @@ -136,12 +137,12 @@ for name in names: link = joinext("index-{0}".format(name), ".html") lst.append(self.indexListEntryTemplate.format(**{ - "Description" : subpacks[name], - "Name" : name.split(".")[-1], - "Link" : link, + "Description": subpacks[name], + "Name": name.split(".")[-1], + "Link": link, })) subpackages = self.indexListPackagesTemplate.format(**{ - "Entries" : "".join(lst), + "Entries": "".join(lst), }) # 2) modules @@ -155,32 +156,32 @@ if nam == "__init__": nam = name.split(".")[-2] lst.append(self.indexListEntryTemplate.format(**{ - "Description" : mods[name], - "Name" : nam, - "Link" : link, + "Description": mods[name], + "Name": nam, + "Link": link, })) modules = self.indexListModulesTemplate.format(**{ - "Entries" : "".join(lst), + "Entries": "".join(lst), }) doc = self.headerTemplate.format(**{ \ - "Title" : title, - "Style" : self.stylesheet}) + \ + "Title": title, + "Style": self.stylesheet}) + \ self.indexBodyTemplate.format(**{ \ - "Title" : title, - "Description" : package["description"], - "Subpackages" : subpackages, - "Modules" : modules, + "Title": title, + "Description": package["description"], + "Subpackages": subpackages, + "Modules": modules, }) + \ self.footerTemplate - f = open(filename, "w", encoding = "utf-8", newline = newline) + f = open(filename, "w", encoding="utf-8", newline=newline) f.write(doc) f.close() return filename - def writeIndices(self, basename = "", newline = None): + def writeIndices(self, basename="", newline=None): """ Public method to generate all index files. @@ -200,7 +201,7 @@ for package, element in list(self.packages.items()): try: if basename: - package = package.replace(basename,"") + package = package.replace(basename, "") out = self.__writeIndex(package, element, newline) except IOError as v: sys.stderr.write("{0} error: {1}\n".format(package, v[1]))
--- a/DocumentationTools/ModuleDocumentor.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DocumentationTools/ModuleDocumentor.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,13 +21,13 @@ from Utilities.ModuleParser import RB_SOURCE _signal = re.compile(r""" - ^@signal [ \t]+ + ^@signal [ \t]+ (?P<SignalName1> [a-zA-Z_] \w* [ \t]* \( [^)]* \) ) [ \t]* (?P<SignalDescription1> .*) | - ^@signal [ \t]+ + ^@signal [ \t]+ (?P<SignalName2> [a-zA-Z_] \w* ) @@ -35,29 +35,31 @@ """, re.VERBOSE | re.DOTALL | re.MULTILINE).search _event = re.compile(r""" - ^@event [ \t]+ + ^@event [ \t]+ (?P<EventName1> [a-zA-Z_] \w* [ \t]* \( [^)]* \) ) [ \t]* (?P<EventDescription1> .*) | - ^@event [ \t]+ + ^@event [ \t]+ (?P<EventName2> [a-zA-Z_] \w* ) [ \t]+ (?P<EventDescription2> .*) """, re.VERBOSE | re.DOTALL | re.MULTILINE).search + class TagError(Exception): """ Exception class raised, if an invalid documentation tag was found. """ + class ModuleDocument(object): """ Class implementing the builtin documentation generator. """ - def __init__(self, module, colors, stylesheet = None): + def __init__(self, module, colors, stylesheet=None): """ Constructor @@ -159,7 +161,7 @@ self.sinceInfoTemplate = \ TemplatesListsStyle.sinceInfoTemplate.format(**colors) - self.keywords = [] # list of tuples containing the name (string) and + self.keywords = [] # list of tuples containing the name (string) and # the ref (string). The ref is without the filename part. self.generated = False @@ -206,8 +208,8 @@ @return The source code documentation. (string) """ doc = self.headerTemplate.format(**{ \ - 'Title' : self.module.name, - 'Style' : self.stylesheet}) + \ + 'Title': self.module.name, + 'Style': self.stylesheet}) + \ self.__genModuleSection() + \ self.footerTemplate self.generated = True @@ -226,22 +228,22 @@ if self.module.type == RB_SOURCE: rbModulesList = self.__genRbModulesListSection() modBody = self.rbFileTemplate.format(**{ \ - 'Module' : self.module.name, - 'ModuleDescription' : \ + 'Module': self.module.name, + 'ModuleDescription': \ self.__formatDescription(self.module.description), - 'GlobalsList' : globalsList, - 'ClassList' : classList, - 'RbModulesList' : rbModulesList, - 'FunctionList' : functionList, + 'GlobalsList': globalsList, + 'ClassList': classList, + 'RbModulesList': rbModulesList, + 'FunctionList': functionList, }) else: modBody = self.moduleTemplate.format(**{ \ - 'Module' : self.module.name, - 'ModuleDescription' : \ + 'Module': self.module.name, + 'ModuleDescription': \ self.__formatDescription(self.module.description), - 'GlobalsList' : globalsList, - 'ClassList' : classList, - 'FunctionList' : functionList, + 'GlobalsList': globalsList, + 'ClassList': classList, + 'FunctionList': functionList, }) except TagError as e: sys.stderr.write("Error in tags of description of module {0}.\n".format( @@ -258,7 +260,7 @@ return "{0}{1}{2}{3}".format( modBody, classesSection, rbModulesSection, functionsSection) - def __genListSection(self, names, dict, kwSuffix = ""): + def __genListSection(self, names, dict, kwSuffix=""): """ Private method to generate a list section of the document. @@ -270,10 +272,10 @@ lst = [] for name in names: lst.append(self.listEntryTemplate.format(**{ \ - 'Link' : "{0}".format(name), - 'Name' : dict[name].name, - 'Description' : self.__getShortDescription(dict[name].description), - 'Deprecated' : self.__checkDeprecated(dict[name].description) and \ + 'Link': "{0}".format(name), + 'Name': dict[name].name, + 'Description': self.__getShortDescription(dict[name].description), + 'Deprecated': self.__checkDeprecated(dict[name].description) and \ self.listEntryDeprecatedTemplate or "", })) if kwSuffix: @@ -283,7 +285,7 @@ self.keywords.append((n, "#{0}".format(name))) return ''.join(lst) - def __genGlobalsListSection(self, class_ = None): + def __genGlobalsListSection(self, class_=None): """ Private method to generate the section listing all global attributes of the module. @@ -296,16 +298,16 @@ scope = class_ else: scope = self.module - attrNames = sorted([attr for attr in scope.globals.keys() + attrNames = sorted([attr for attr in scope.globals.keys() if not scope.globals[attr].isSignal]) if attrNames: s = ''.join( - [self.listEntrySimpleTemplate.format(**{'Name' : name}) \ + [self.listEntrySimpleTemplate.format(**{'Name': name}) \ for name in attrNames]) else: s = self.listEntryNoneTemplate return self.listTemplate.format(**{ \ - 'Entries' : s, + 'Entries': s, }) def __genClassListSection(self): @@ -321,12 +323,12 @@ else: s = self.listEntryNoneTemplate return self.listTemplate.format(**{ \ - 'Entries' : s, + 'Entries': s, }) def __genRbModulesListSection(self): """ - Private method to generate the section listing all modules of the file + Private method to generate the section listing all modules of the file (Ruby only). @return The modules list section. (string) @@ -338,7 +340,7 @@ else: s = self.listEntryNoneTemplate return self.listTemplate.format(**{ \ - 'Entries' : s, + 'Entries': s, }) def __genFunctionListSection(self): @@ -354,7 +356,7 @@ else: s = self.listEntryNoneTemplate return self.listTemplate.format(**{ \ - 'Entries' : s, + 'Entries': s, }) def __genClassesSection(self): @@ -378,13 +380,13 @@ try: clsBody = self.classTemplate.format(**{ \ - 'Anchor' : className, - 'Class' : _class.name, - 'ClassSuper' : supers, - 'ClassDescription' : self.__formatDescription(_class.description), - 'GlobalsList' : globalsList, - 'MethodList' : methList, - 'MethodDetails' : methBodies, + 'Anchor': className, + 'Class': _class.name, + 'ClassSuper': supers, + 'ClassDescription': self.__formatDescription(_class.description), + 'GlobalsList': globalsList, + 'MethodList': methList, + 'MethodDetails': methBodies, }) except TagError as e: sys.stderr.write("Error in tags of description of class {0}.\n".format( @@ -409,26 +411,26 @@ lst = [] try: lst.append(self.listEntryTemplate.format(**{ \ - 'Link' : "{0}.{1}".format(className, '__init__'), - 'Name' : clsName, - 'Description' : self.__getShortDescription(dict['__init__'].description), - 'Deprecated' : self.__checkDeprecated(dict['__init__'].description) and \ + 'Link': "{0}.{1}".format(className, '__init__'), + 'Name': clsName, + 'Description': self.__getShortDescription(dict['__init__'].description), + 'Deprecated': self.__checkDeprecated(dict['__init__'].description) and \ self.listEntryDeprecatedTemplate or "", })) - self.keywords.append(("{0} (Constructor)".format(className), + self.keywords.append(("{0} (Constructor)".format(className), "#{0}.{1}".format(className, '__init__'))) except KeyError: pass for name in names: lst.append(self.listEntryTemplate.format(**{ \ - 'Link' : "{0}.{1}".format(className, name), - 'Name' : dict[name].name, - 'Description' : self.__getShortDescription(dict[name].description), - 'Deprecated' : self.__checkDeprecated(dict[name].description) and \ + 'Link': "{0}.{1}".format(className, name), + 'Name': dict[name].name, + 'Description': self.__getShortDescription(dict[name].description), + 'Deprecated': self.__checkDeprecated(dict[name].description) and \ self.listEntryDeprecatedTemplate or "", })) - self.keywords.append(("{0}.{1}".format(className, name), + self.keywords.append(("{0}.{1}".format(className, name), "#{0}.{1}".format(className, name))) return ''.join(lst) @@ -447,12 +449,12 @@ methods.remove('__init__') try: methBody = self.constructorTemplate.format(**{ \ - 'Anchor' : className, - 'Class' : obj.name, - 'Method' : '__init__', - 'MethodDescription' : \ + 'Anchor': className, + 'Class': obj.name, + 'Method': '__init__', + 'MethodDescription': \ self.__formatDescription(obj.methods['__init__'].description), - 'Params' : ', '.join(obj.methods['__init__'].parameters[1:]), + 'Params': ', '.join(obj.methods['__init__'].parameters[1:]), }) except TagError as e: sys.stderr.write( @@ -465,12 +467,12 @@ for method in methods: try: methBody = self.methodTemplate.format(**{ \ - 'Anchor' : className, - 'Class' : obj.name, - 'Method' : obj.methods[method].name, - 'MethodDescription' : \ + 'Anchor': className, + 'Class': obj.name, + 'Method': obj.methods[method].name, + 'MethodDescription': \ self.__formatDescription(obj.methods[method].description), - 'Params' : ', '.join(obj.methods[method].parameters[1:]), + 'Params': ', '.join(obj.methods[method].parameters[1:]), }) except TagError as e: sys.stderr.write( @@ -485,7 +487,7 @@ if not methList: methList = self.listEntryNoneTemplate return self.listTemplate.format(**{ \ - 'Entries' : methList, + 'Entries': methList, }), ''.join(methBodies) def __genRbModulesSection(self): @@ -505,14 +507,14 @@ try: rbmBody = self.rbModuleTemplate.format(**{ \ - 'Anchor' : rbModuleName, - 'Module' : rbModule.name, - 'ModuleDescription' : self.__formatDescription(rbModule.description), - 'GlobalsList' : globalsList, - 'ClassesList' : classList, - 'ClassesDetails' : classBodies, - 'FunctionsList' : methList, - 'FunctionsDetails' : methBodies, + 'Anchor': rbModuleName, + 'Module': rbModule.name, + 'ModuleDescription': self.__formatDescription(rbModule.description), + 'GlobalsList': globalsList, + 'ClassesList': classList, + 'ClassesDetails': classBodies, + 'FunctionsList': methList, + 'FunctionsDetails': methBodies, }) except TagError as e: sys.stderr.write( @@ -547,12 +549,12 @@ try: clsBody = self.rbModulesClassTemplate.format(**{ \ - 'Anchor' : className, - 'Class' : _class.name, - 'ClassSuper' : supers, - 'ClassDescription' : self.__formatDescription(_class.description), - 'MethodList' : methList, - 'MethodDetails' : methBodies, + 'Anchor': className, + 'Class': _class.name, + 'ClassSuper': supers, + 'ClassDescription': self.__formatDescription(_class.description), + 'MethodList': methList, + 'MethodDetails': methBodies, }) except TagError as e: sys.stderr.write("Error in tags of description of class {0}.\n".format( @@ -562,14 +564,13 @@ classes.append(clsBody) - classesList = \ self.__genRbModulesClassesListSection(classNames, obj.classes, modName) if not classesList: classesList = self.listEntryNoneTemplate return self.listTemplate.format(**{ \ - 'Entries' : classesList, + 'Entries': classesList, }), ''.join(classes) def __genRbModulesClassesListSection(self, names, dict, moduleName): @@ -584,13 +585,13 @@ lst = [] for name in names: lst.append(self.listEntryTemplate.format(**{ \ - 'Link' : "{0}.{1}".format(moduleName, name), - 'Name' : dict[name].name, - 'Description' : self.__getShortDescription(dict[name].description), - 'Deprecated' : self.__checkDeprecated(dict[name].description) and \ + 'Link': "{0}.{1}".format(moduleName, name), + 'Name': dict[name].name, + 'Description': self.__getShortDescription(dict[name].description), + 'Deprecated': self.__checkDeprecated(dict[name].description) and \ self.listEntryDeprecatedTemplate or "", })) - self.keywords.append(("{0}.{1}".format(moduleName, name), + self.keywords.append(("{0}.{1}".format(moduleName, name), "#{0}.{1}".format(moduleName, name))) return ''.join(lst) @@ -605,11 +606,11 @@ for funcName in funcNames: try: funcBody = self.functionTemplate.format(**{ \ - 'Anchor' : funcName, - 'Function' : self.module.functions[funcName].name, - 'FunctionDescription' : self.__formatDescription( + 'Anchor': funcName, + 'Function': self.module.functions[funcName].name, + 'FunctionDescription': self.__formatDescription( self.module.functions[funcName].description), - 'Params' : ', '.join(self.module.functions[funcName].parameters), + 'Params': ', '.join(self.module.functions[funcName].parameters), }) except TagError as e: sys.stderr.write("Error in tags of description of function {0}.\n".format( @@ -642,15 +643,15 @@ if dotpos == -1: sdlist.append(desc.strip()) else: - while dotpos+1 < len(desc) and not desc[dotpos+1].isspace(): + while dotpos + 1 < len(desc) and not desc[dotpos + 1].isspace(): # don't recognize '.' inside a number or word as stop condition - dotpos = desc.find('.', dotpos+1) + dotpos = desc.find('.', dotpos + 1) if dotpos == -1: break if dotpos == -1: sdlist.append(desc.strip()) else: - sdlist.append(desc[:dotpos+1].strip()) + sdlist.append(desc[:dotpos + 1].strip()) break # break if a '.' is found else: if descfound: @@ -662,7 +663,7 @@ def __checkDeprecated(self, descr): """ - Private method to check, if the object to be documented contains a + Private method to check, if the object to be documented contains a deprecated flag. @param desc The documentation string. (string) @@ -696,12 +697,12 @@ linelist.append(html_uencode(line)) else: lst.append(self.paragraphTemplate.format(**{ \ - 'Lines' : '\n'.join(linelist) + 'Lines': '\n'.join(linelist) })) linelist = [] if linelist: lst.append(self.paragraphTemplate.format(**{ \ - 'Lines' : '\n'.join(linelist) + 'Lines': '\n'.join(linelist) })) return ''.join(lst) @@ -718,8 +719,8 @@ keys = sorted(list(dictionary.keys())) for key in keys: lst.append(template.format(**{ \ - 'Name' : key, - 'Description' : html_uencode('\n'.join(dictionary[key])), + 'Name': key, + 'Description': html_uencode('\n'.join(dictionary[key])), })) return ''.join(lst) @@ -735,8 +736,8 @@ lst = [] for name, lines in _list: lst.append(template.format(**{ \ - 'Name' : name, - 'Description' : html_uencode('\n'.join(lines)), + 'Name': name, + 'Description': html_uencode('\n'.join(lines)), })) return ''.join(lst) @@ -770,7 +771,7 @@ entry = 'href="{0}">{1}</a>'.format(reference, label) return self.seeLinkTemplate.format(**{ \ - 'Link' : entry, + 'Link': entry, }) def __genSeeListSection(self, _list, template): @@ -785,7 +786,7 @@ for seeEntry in _list: seeEntryString = ''.join(seeEntry) lst.append(template.format(**{ \ - 'Link' : html_uencode(self.__formatCrossReferenceEntry(seeEntryString)), + 'Link': html_uencode(self.__formatCrossReferenceEntry(seeEntryString)), })) return '\n'.join(lst) @@ -887,7 +888,7 @@ lastItem = exceptionDict[excName] elif desc.startswith("@signal"): inTagSection = True - m = _signal(desc,0) + m = _signal(desc, 0) if m is None: raise TagError("Wrong format in {0} line.\n".format(parts[0])) signalName = 1 and m.group("SignalName1") \ @@ -900,7 +901,7 @@ lastItem = signalDict[signalName] elif desc.startswith("@event"): inTagSection = True - m = _event(desc,0) + m = _event(desc, 0) if m is None: raise TagError("Wrong format in {0} line.\n".format(parts[0])) eventName = 1 and m.group("EventName1") \ @@ -956,7 +957,7 @@ if paramList: parameterSect = self.parametersListTemplate.format(**{ \ - 'Parameters' : self.__genParamDescriptionListSection(paramList, + 'Parameters': self.__genParamDescriptionListSection(paramList, self.parametersListEntryTemplate) }) else: @@ -969,7 +970,7 @@ if exceptionDict: exceptionSect = self.exceptionsListTemplate.format(**{ \ - 'Exceptions' : self.__genDescriptionListSection(exceptionDict, + 'Exceptions': self.__genDescriptionListSection(exceptionDict, self.exceptionsListEntryTemplate) }) else: @@ -977,7 +978,7 @@ if signalDict: signalSect = self.signalsListTemplate.format(**{ \ - 'Signals' : self.__genDescriptionListSection(signalDict, + 'Signals': self.__genDescriptionListSection(signalDict, self.signalsListEntryTemplate) }) else: @@ -985,7 +986,7 @@ if eventDict: eventSect = self.eventsListTemplate.format(**{ \ - 'Events' : self.__genDescriptionListSection(eventDict, + 'Events': self.__genDescriptionListSection(eventDict, self.eventsListEntryTemplate) }) else: @@ -993,28 +994,28 @@ if deprecated: deprecatedSect = self.deprecatedTemplate.format(**{ \ - 'Lines' : html_uencode('\n'.join(deprecated)), + 'Lines': html_uencode('\n'.join(deprecated)), }) else: deprecatedSect = "" if authorInfo: authorInfoSect = self.authorInfoTemplate.format(**{ \ - 'Authors' : html_uencode('\n'.join(authorInfo)), + 'Authors': html_uencode('\n'.join(authorInfo)), }) else: authorInfoSect = "" if sinceInfo: sinceInfoSect = self.sinceInfoTemplate.format(**{ \ - 'Info' : html_uencode(sinceInfo[0]), + 'Info': html_uencode(sinceInfo[0]), }) else: sinceInfoSect = "" if seeList: seeSect = self.seeListTemplate.format(**{ \ - 'Links' : self.__genSeeListSection(seeList, self.seeListEntryTemplate), + 'Links': self.__genSeeListSection(seeList, self.seeListEntryTemplate), }) else: seeSect = ''
--- a/DocumentationTools/QtHelpGenerator.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DocumentationTools/QtHelpGenerator.py Fri Mar 11 16:51:57 2011 +0100 @@ -51,12 +51,13 @@ HelpCollectionProjectFile = 'source.qhcp' HelpCollectionFile = 'collection.qhc' + class QtHelpGenerator(object): """ Class implementing the QtHelp generator for the builtin documentation generator. """ - def __init__(self, htmlDir, - outputDir, namespace, virtualFolder, filterName, filterAttributes, + def __init__(self, htmlDir, + outputDir, namespace, virtualFolder, filterName, filterAttributes, title, createCollection): """ Constructor @@ -82,9 +83,9 @@ self.createCollection = createCollection self.packages = { - "00index" : { - "subpackages" : {}, - "modules" : {} + "00index": { + "subpackages": {}, + "modules": {} } } self.remembered = False @@ -95,7 +96,7 @@ Public method to remember a documentation file. @param file The filename to be remembered. (string) - @param moduleDocument The ModuleDocument object containing the + @param moduleDocument The ModuleDocument object containing the information for the file. @param basename The basename of the file hierarchy to be documented. The basename is stripped off the filename if it starts with @@ -120,11 +121,11 @@ elt["subpackages"][package] = moduleDocument.name() self.packages[package] = { - "subpackages" : {}, - "modules" : {} + "subpackages": {}, + "modules": {} } - kwEntry = ("{0} (Package)".format(package.split('.')[-1]), + kwEntry = ("{0} (Package)".format(package.split('.')[-1]), joinext("index-{0}".format(package), ".html")) if kwEntry not in self.keywords: self.keywords.append(kwEntry) @@ -140,7 +141,7 @@ elt["modules"][moduleDocument.name()] = moduleDocument.name() if "__init__" not in file: - kwEntry = ("{0} (Module)".format(moduleDocument.name().split('.')[-1]), + kwEntry = ("{0} (Module)".format(moduleDocument.name().split('.')[-1]), joinext(moduleDocument.name(), ".html")) if kwEntry not in self.keywords: self.keywords.append(kwEntry) @@ -160,8 +161,8 @@ """ indent = level * ' ' indent1 = indent + ' ' - s = indent + '<section title="{0}" ref="{1}">\n'.format( - package == "00index" and self.title or package, + s = indent + '<section title="{0}" ref="{1}">\n'.format( + package == "00index" and self.title or package, package == "00index" and \ joinext("index", ".html") or \ joinext("index-{0}".format(package), ".html")) @@ -193,7 +194,7 @@ else: return txt - def generateFiles(self, basename = "", newline = None): + def generateFiles(self, basename="", newline=None): """ Public method to generate all index files. @@ -222,30 +223,30 @@ for kw in self.keywords]) helpAttribs = { - "namespace" : self.namespace, - "folder" : self.virtualFolder, - "filter_name" : self.filterName, - "filter_attributes" : filterAttribs, - "sections" : sections, - "keywords" : keywords, - "files" : files, + "namespace": self.namespace, + "folder": self.virtualFolder, + "filter_name": self.filterName, + "filter_attributes": filterAttribs, + "sections": sections, + "keywords": keywords, + "files": files, } txt = self.__convertEol(HelpProject.format(**helpAttribs), newline) - f = open(os.path.join(self.outputDir, HelpProjectFile), "w", - encoding = "utf-8", newline = newline) + f = open(os.path.join(self.outputDir, HelpProjectFile), "w", + encoding="utf-8", newline=newline) f.write(txt) f.close() if self.createCollection and \ not os.path.exists(os.path.join(self.outputDir, HelpCollectionProjectFile)): collectionAttribs = { - "helpfile" : HelpHelpFile, + "helpfile": HelpHelpFile, } txt = self.__convertEol(HelpCollection.format(**collectionAttribs), newline) - f = open(os.path.join(self.outputDir, HelpCollectionProjectFile), - "w", encoding = "utf-8", newline = newline) + f = open(os.path.join(self.outputDir, HelpCollectionProjectFile), + "w", encoding="utf-8", newline=newline) f.write(txt) f.close() @@ -258,7 +259,7 @@ # generate the compressed files shutil.copy(os.path.join(self.outputDir, HelpProjectFile), self.htmlDir) os.chdir(self.htmlDir) - subprocess.call(["qhelpgenerator", "source.qhp", + subprocess.call(["qhelpgenerator", "source.qhp", "-o", os.path.join(self.outputDir, HelpHelpFile)]) os.remove(HelpProjectFile)
--- a/DocumentationTools/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/DocumentationTools/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ """ supportedExtensionsDictForApis = { - "Python2" : [".py2", ".pyw2", ".ptl"], - "Python3" : [".py", ".pyw", ".py3", ".pyw3"], - "Ruby" : [".rb"] + "Python2": [".py2", ".pyw2", ".ptl"], + "Python3": [".py", ".pyw", ".py3", ".pyw3"], + "Ruby": [".rb"] }
--- a/E5Graphics/E5ArrowItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Graphics/E5ArrowItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,12 +17,13 @@ ArrowheadAngleFactor = 0.26179938779914941 # 0.5 * atan(sqrt(3.0) / 3.0) + class E5ArrowItem(QAbstractGraphicsShapeItem): """ Class implementing an arrow graphics item subclass. """ - def __init__(self, origin = QPointF(), end = QPointF(), - filled = False, type = NormalArrow, parent = None): + def __init__(self, origin=QPointF(), end=QPointF(), + filled=False, type=NormalArrow, parent=None): """ Constructor @@ -92,7 +93,7 @@ .normalized()\ .adjusted(-extra, -extra, extra, extra) - def paint(self, painter, option, widget = None): + def paint(self, painter, option, widget=None): """ Public method to paint the item in local coordinates. @@ -132,4 +133,4 @@ polygon.append(line.p2()) polygon.append(a1) polygon.append(a2) - painter.drawPolygon(polygon) \ No newline at end of file + painter.drawPolygon(polygon)
--- a/E5Graphics/E5GraphicsView.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Graphics/E5GraphicsView.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,11 +14,12 @@ import Preferences + class E5GraphicsView(QGraphicsView): """ Class implementing a graphics view. """ - def __init__(self, scene, parent = None): + def __init__(self, scene, parent=None): """ Constructor @@ -92,7 +93,7 @@ """ return self.matrix().m11() - def resizeScene(self, amount, isWidth = True): + def resizeScene(self, amount, isWidth=True): """ Public method to resize the scene. @@ -126,7 +127,7 @@ rect.setWidth(width) self.setSceneRect(rect) - def _getDiagramRect(self, border = 0): + def _getDiagramRect(self, border=0): """ Protected method to calculate the minimum rectangle fitting the diagram. @@ -141,7 +142,7 @@ for itm in items: rect = itm.sceneBoundingRect() itmEndX = rect.x() + rect.width() - itmEndY = rect.y()+ rect.height() + itmEndY = rect.y() + rect.height() itmStartX = rect.x() itmStartY = rect.y() if startx >= itmStartX: @@ -160,7 +161,7 @@ return QRectF(startx, starty, endx - startx + 1, endy - starty + 1) - def _getDiagramSize(self, border = 0): + def _getDiagramSize(self, border=0): """ Protected method to calculate the minimum size fitting the diagram. @@ -173,7 +174,7 @@ for itm in items: rect = itm.sceneBoundingRect() itmEndX = rect.x() + rect.width() - itmEndY = rect.y()+ rect.height() + itmEndY = rect.y() + rect.height() if endx <= itmEndX: endx = itmEndX if endy <= itmEndY: @@ -184,9 +185,9 @@ return QSizeF(endx + 1, endy + 1) - def __getDiagram(self, rect, format = "PNG", filename = None): + def __getDiagram(self, rect, format="PNG", filename=None): """ - Private method to retrieve the diagram from the scene fitting it + Private method to retrieve the diagram from the scene fitting it in the minimum rectangle. @param rect minimum rectangle fitting the diagram (QRectF) @@ -222,7 +223,7 @@ return paintDevice - def saveImage(self, filename, format = "PNG"): + def saveImage(self, filename, format="PNG"): """ Public method to save the scene to a file. @@ -232,13 +233,13 @@ """ rect = self._getDiagramRect(self.border) if format == "SVG": - self.__getDiagram(rect, format = format, filename = filename) + self.__getDiagram(rect, format=format, filename=filename) return True else: pixmap = self.__getDiagram(rect) return pixmap.save(filename, format) - def printDiagram(self, printer, diagramName = ""): + def printDiagram(self, printer, diagramName=""): """ Public method to print the diagram. @@ -314,7 +315,7 @@ tc = QColor(50, 50, 50) painter.setPen(tc) painter.drawRect(marginX, marginY, width, height) - painter.drawLine(marginX, marginY + height + 2, + painter.drawLine(marginX, marginY + height + 2, marginX + width, marginY + height + 2) painter.setFont(font) painter.drawText(marginX, marginY + height + 4, width,
--- a/E5Gui/E5Action.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5Action.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence, qApp + class ArgumentsError(RuntimeError): """ Class implementing an exception, which is raised, if the wrong number of arguments @@ -39,6 +40,7 @@ """ return str(self.errorMessage) + class E5Action(QAction): """ Class implementing an Action class extending QAction. @@ -49,17 +51,17 @@ @param args argument list of the constructor. This list is one of <ul> - <li>text (string), icon (QIcon), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), icon (QIcon), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string), toggle (boolean)</li> - <li>text (string), icon (QIcon), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), icon (QIcon), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string)</li> - <li>text (string), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string), toggle (boolean)</li> - <li>text (string), menu text (string), - accelarator (QKeySequence), alternative accelerator (QKeySequence), + <li>text (string), menu text (string), + accelarator (QKeySequence), alternative accelerator (QKeySequence), parent (QObject), name (string)</li> </ul> """ @@ -69,37 +71,37 @@ else: icon = None incr = 0 - if len(args) < 6+incr: + if len(args) < 6 + incr: raise ArgumentsError( "Not enough arguments, {0:d} expected, got {1:d}".format( 6 + incr, len(args))) - elif len(args) > 7+incr: + elif len(args) > 7 + incr: raise ArgumentsError( "Too many arguments, max. {0:d} expected, got {1:d}".format( 7 + incr, len(args))) - parent = args[4+incr] + parent = args[4 + incr] QAction.__init__(self, parent) - name = args[5+incr] + name = args[5 + incr] if name: self.setObjectName(name) - if args[1+incr]: - self.setText(args[1+incr]) + if args[1 + incr]: + self.setText(args[1 + incr]) if args[0]: self.setIconText(args[0]) - if args[2+incr]: - self.setShortcut(QKeySequence(args[2+incr])) + if args[2 + incr]: + self.setShortcut(QKeySequence(args[2 + incr])) - if args[3+incr]: - self.setAlternateShortcut(QKeySequence(args[3+incr])) + if args[3 + incr]: + self.setAlternateShortcut(QKeySequence(args[3 + incr])) if icon: self.setIcon(icon) - if len(args) == 7+incr: - self.setCheckable(args[6+incr]) + if len(args) == 7 + incr: + self.setCheckable(args[6 + incr]) self.__ammendToolTip() @@ -144,7 +146,7 @@ Public slot to set the list of keyboard shortcuts. @param shortcuts list of keyboard accelerators (list of QKeySequence) - or key for a platform dependent list of accelerators + or key for a platform dependent list of accelerators (QKeySequence.StandardKey) """ QAction.setShortcuts(self, shortcuts) @@ -162,6 +164,7 @@ fmt = "({1}) {0}" self.setToolTip(fmt.format(self.iconText(), shortcut)) + def addActions(target, actions): """ Module function to add a list of actions to a widget. @@ -179,7 +182,8 @@ else: target.addAction(action) -def createActionGroup(parent, name = None, exclusive = False): + +def createActionGroup(parent, name=None, exclusive=False): """ Module function to create an action group.
--- a/E5Gui/E5Application.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5Application.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtCore import QCoreApplication from PyQt4.QtGui import QApplication + class E5Application(QApplication): """ Eric application class with an object registry. @@ -51,7 +52,7 @@ else: raise KeyError('Object "{0}" is not registered.'.format(name)) - def registerPluginObject(self, name, object, pluginType = None): + def registerPluginObject(self, name, object, pluginType=None): """ Public method to register a plugin object in the object registry.
--- a/E5Gui/E5Completers.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5Completers.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,18 +12,19 @@ from Globals import isWindowsPlatform + class E5FileCompleter(QCompleter): """ Class implementing a completer for file names. """ - def __init__(self, parent = None, - completionMode = QCompleter.PopupCompletion, - showHidden = False): + def __init__(self, parent=None, + completionMode=QCompleter.PopupCompletion, + showHidden=False): """ Constructor @param parent parent widget of the completer (QWidget) - @keyparam completionMode completion mode of the + @keyparam completionMode completion mode of the completer (QCompleter.CompletionMode) @keyparam showHidden flag indicating to show hidden entries as well (boolean) """ @@ -43,18 +44,19 @@ if parent: parent.setCompleter(self) + class E5DirCompleter(QCompleter): """ Class implementing a completer for directory names. """ - def __init__(self, parent = None, - completionMode = QCompleter.PopupCompletion, - showHidden = False): + def __init__(self, parent=None, + completionMode=QCompleter.PopupCompletion, + showHidden=False): """ Constructor @param parent parent widget of the completer (QWidget) - @keyparam completionMode completion mode of the + @keyparam completionMode completion mode of the completer (QCompleter.CompletionMode) @keyparam showHidden flag indicating to show hidden entries as well (boolean) """ @@ -73,18 +75,19 @@ if parent: parent.setCompleter(self) + class E5StringListCompleter(QCompleter): """ Class implementing a completer for string lists. """ - def __init__(self, parent = None, strings = [], - completionMode = QCompleter.PopupCompletion): + def __init__(self, parent=None, strings=[], + completionMode=QCompleter.PopupCompletion): """ Constructor @param parent parent widget of the completer (QWidget) @param strings list of string to load into the completer (list of strings) - @keyparam completionMode completion mode of the + @keyparam completionMode completion mode of the completer (QCompleter.CompletionMode) """ QCompleter.__init__(self, parent) @@ -92,4 +95,4 @@ self.setModel(self.__model) self.setCompletionMode(completionMode) if parent: - parent.setCompleter(self) \ No newline at end of file + parent.setCompleter(self)
--- a/E5Gui/E5FileDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5FileDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,8 @@ HideNameFilterDetails = QFileDialog.HideNameFilterDetails DontUseSheet = QFileDialog.DontUseSheet -def __reorderFilter(filter, initialFilter = ""): + +def __reorderFilter(filter, initialFilter=""): """ Private function to reorder the file filter to cope with a KDE issue introduced by distributor's usage of KDE file dialogs. @@ -40,8 +41,9 @@ else: return filter -def getOpenFileName(parent = None, caption = "", directory = "", - filter = "", options = QFileDialog.Options()): + +def getOpenFileName(parent=None, caption="", directory="", + filter="", options=QFileDialog.Options()): """ Module function to get the name of a file for opening it. @@ -54,12 +56,13 @@ """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - return QFileDialog.getOpenFileName(parent, caption, directory, + return QFileDialog.getOpenFileName(parent, caption, directory, filter, options) -def getOpenFileNameAndFilter(parent = None, caption = "", directory = "", - filter = "", initialFilter = "", - options = QFileDialog.Options()): + +def getOpenFileNameAndFilter(parent=None, caption="", directory="", + filter="", initialFilter="", + options=QFileDialog.Options()): """ Module function to get the name of a file for opening it and the selected file name filter. @@ -75,12 +78,13 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog newfilter = __reorderFilter(filter, initialFilter) - return QFileDialog.getOpenFileNameAndFilter(parent, caption, directory, - newfilter, initialFilter, + return QFileDialog.getOpenFileNameAndFilter(parent, caption, directory, + newfilter, initialFilter, options) -def getOpenFileNames(parent = None, caption = "", directory = "", - filter = "", options = QFileDialog.Options()): + +def getOpenFileNames(parent=None, caption="", directory="", + filter="", options=QFileDialog.Options()): """ Module function to get a list of names of files for opening. @@ -93,12 +97,13 @@ """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - return QFileDialog.getOpenFileNames(parent, caption, directory, + return QFileDialog.getOpenFileNames(parent, caption, directory, filter, options) -def getOpenFileNamesAndFilter(parent = None, caption = "", directory = "", - filter = "", initialFilter = "", - options = QFileDialog.Options()): + +def getOpenFileNamesAndFilter(parent=None, caption="", directory="", + filter="", initialFilter="", + options=QFileDialog.Options()): """ Module function to get a list of names of files for opening and the selected file name filter. @@ -109,18 +114,19 @@ @param filter filter string for the dialog (string) @param initialFilter initial filter for the dialog (string) @param options various options for the dialog (QFileDialog.Options) - @return list of file names to be opened and selected filter + @return list of file names to be opened and selected filter (list of string, string) """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog newfilter = __reorderFilter(filter, initialFilter) - return QFileDialog.getOpenFileNamesAndFilter(parent, caption, directory, + return QFileDialog.getOpenFileNamesAndFilter(parent, caption, directory, newfilter, initialFilter, options) -def getSaveFileName(parent = None, caption = "", directory = "", - filter = "", options = QFileDialog.Options()): + +def getSaveFileName(parent=None, caption="", directory="", + filter="", options=QFileDialog.Options()): """ Module function to get the name of a file for saving it. @@ -133,12 +139,13 @@ """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - return QFileDialog.getSaveFileName(parent, caption, directory, + return QFileDialog.getSaveFileName(parent, caption, directory, filter, options) -def getSaveFileNameAndFilter(parent = None, caption = "", directory = "", - filter = "", initialFilter = "", - options = QFileDialog.Options()): + +def getSaveFileNameAndFilter(parent=None, caption="", directory="", + filter="", initialFilter="", + options=QFileDialog.Options()): """ Module function to get the name of a file for saving it and the selected file name filter. @@ -154,12 +161,13 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog newfilter = __reorderFilter(filter, initialFilter) - return QFileDialog.getSaveFileNameAndFilter(parent, caption, directory, + return QFileDialog.getSaveFileNameAndFilter(parent, caption, directory, newfilter, initialFilter, options) -def getExistingDirectory(parent = None, caption = "", - directory = "", options = QFileDialog.ShowDirsOnly): + +def getExistingDirectory(parent=None, caption="", + directory="", options=QFileDialog.ShowDirsOnly): """ Module function to get the name of a directory. @@ -171,5 +179,5 @@ """ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog - return QFileDialog.getExistingDirectory(parent, caption, directory, + return QFileDialog.getExistingDirectory(parent, caption, directory, options)
--- a/E5Gui/E5Led.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5Led.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,13 +13,14 @@ from PyQt4.QtCore import * E5LedRectangular = 0 -E5LedCircular = 1 +E5LedCircular = 1 + class E5Led(QWidget): """ Class implementing a LED widget. """ - def __init__(self, parent = None, color = None, shape = E5LedCircular, rectRatio = 1): + def __init__(self, parent=None, color=None, shape=E5LedCircular, rectRatio=1): """ Constructor @@ -265,4 +266,4 @@ @return size hint (QSize) """ - return QSize(18, 18) \ No newline at end of file + return QSize(18, 18)
--- a/E5Gui/E5LineEdit.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5LineEdit.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,20 +4,21 @@ # """ -Module implementing specialized line edits. +Module implementing specialized line edits. """ from PyQt4.QtCore import pyqtSignal, Qt, QEvent from PyQt4.QtGui import QLineEdit, QStyleOptionFrameV2, QStyle, QPainter, QPalette, \ QWidget, QHBoxLayout, QBoxLayout, QLayout, QApplication, QSpacerItem, QSizePolicy + class SideWidget(QWidget): """ Class implementing the side widgets for the line edit class. """ sizeHintChanged = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -36,14 +37,15 @@ self.sizeHintChanged.emit() return QWidget.event(self, evt) + class E5LineEdit(QLineEdit): """ Class implementing a line edit widget showing some inactive text. """ - LeftSide = 0 + LeftSide = 0 RightSide = 1 - def __init__(self, parent = None, inactiveText = ""): + def __init__(self, parent=None, inactiveText=""): """ Constructor
--- a/E5Gui/E5LineEditButton.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5LineEditButton.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtCore import Qt, QPoint, QPointF from PyQt4.QtGui import QAbstractButton, QPainter, QPainterPath + class E5LineEditButton(QAbstractButton): """ Class implementing a button to be used with E5LineEdit. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/E5Gui/E5ListView.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5ListView.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,12 +4,13 @@ # """ -Module implementing specialized list views. +Module implementing specialized list views. """ from PyQt4.QtCore import Qt from PyQt4.QtGui import QListView, QItemSelectionModel + class E5ListView(QListView): """ Class implementing a list view supporting removal of entries. @@ -44,7 +45,7 @@ idx = self.model().index(row, 0, self.rootIndex()) if not idx.isValid(): idx = self.model().index(row - 1, 0, self.rootIndex()) - self.selectionModel().select(idx, + self.selectionModel().select(idx, QItemSelectionModel.SelectCurrent | QItemSelectionModel.Rows) self.setCurrentIndex(idx) @@ -53,5 +54,5 @@ Public method to clear the view. """ if self.model() is not None: - self.model().removeRows(0, self.model().rowCount(self.rootIndex()), - self.rootIndex()) \ No newline at end of file + self.model().removeRows(0, self.model().rowCount(self.rootIndex()), + self.rootIndex())
--- a/E5Gui/E5MessageBox.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5MessageBox.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,57 +15,58 @@ ################################################################################ # QMessageBox.Icon -Critical = QMessageBox.Critical +Critical = QMessageBox.Critical Information = QMessageBox.Information -Question = QMessageBox.Question -Warning = QMessageBox.Warning +Question = QMessageBox.Question +Warning = QMessageBox.Warning StandardButtons = QMessageBox.StandardButtons # QMessageBox.StandardButton -Abort = QMessageBox.Abort -Apply = QMessageBox.Apply -Cancel = QMessageBox.Cancel -Close = QMessageBox.Close -Discard = QMessageBox.Discard -Help = QMessageBox.Help -Ignore = QMessageBox.Ignore -No = QMessageBox.No -NoToAll = QMessageBox.NoToAll -Ok = QMessageBox.Ok -Open = QMessageBox.Open -Reset = QMessageBox.Reset +Abort = QMessageBox.Abort +Apply = QMessageBox.Apply +Cancel = QMessageBox.Cancel +Close = QMessageBox.Close +Discard = QMessageBox.Discard +Help = QMessageBox.Help +Ignore = QMessageBox.Ignore +No = QMessageBox.No +NoToAll = QMessageBox.NoToAll +Ok = QMessageBox.Ok +Open = QMessageBox.Open +Reset = QMessageBox.Reset RestoreDefaults = QMessageBox.RestoreDefaults -Retry = QMessageBox.Retry -Save = QMessageBox.Save -SaveAll = QMessageBox.SaveAll -Yes = QMessageBox.Yes -YesToAll = QMessageBox.YesToAll -NoButton = QMessageBox.NoButton +Retry = QMessageBox.Retry +Save = QMessageBox.Save +SaveAll = QMessageBox.SaveAll +Yes = QMessageBox.Yes +YesToAll = QMessageBox.YesToAll +NoButton = QMessageBox.NoButton # QMessageBox.ButtonRole -AcceptRole = QMessageBox.AcceptRole -ActionRole = QMessageBox.ActionRole -ApplyRole = QMessageBox.ApplyRole +AcceptRole = QMessageBox.AcceptRole +ActionRole = QMessageBox.ActionRole +ApplyRole = QMessageBox.ApplyRole DestructiveRole = QMessageBox.DestructiveRole -InvalidRole = QMessageBox.InvalidRole -HelpRole = QMessageBox.HelpRole -NoRole = QMessageBox.NoRole -RejectRole = QMessageBox.RejectRole -ResetRole = QMessageBox.ResetRole -YesRole = QMessageBox.YesRole +InvalidRole = QMessageBox.InvalidRole +HelpRole = QMessageBox.HelpRole +NoRole = QMessageBox.NoRole +RejectRole = QMessageBox.RejectRole +ResetRole = QMessageBox.ResetRole +YesRole = QMessageBox.YesRole ################################################################################ ## Replacement for the QMessageBox class ## ################################################################################ + class E5MessageBox(QMessageBox): """ Class implementing a replacement for QMessageBox. """ - def __init__(self, icon, title, text, modal = False, - buttons = QMessageBox.StandardButtons(QMessageBox.NoButton), - parent = None): + def __init__(self, icon, title, text, modal=False, + buttons=QMessageBox.StandardButtons(QMessageBox.NoButton), + parent=None): """ Constructor @@ -98,8 +99,9 @@ ## Replacements for QMessageBox static methods ## ################################################################################ -def __messageBox(parent, title, text, icon, - buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton): + +def __messageBox(parent, title, text, icon, + buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton): """ Private module function to show a modal message box. @@ -107,7 +109,7 @@ @param title caption of the message box (string) @param text text to be shown by the message box (string) @param icon type of icon to be shown (QMessageBox.Icon) - @param buttons flags indicating which buttons to show + @param buttons flags indicating which buttons to show (QMessageBox.StandardButtons) @param defaultButton flag indicating the default button (QMessageBox.StandardButton) @@ -137,79 +139,84 @@ about = QMessageBox.about aboutQt = QMessageBox.aboutQt -def critical(parent, title, text, - buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton): + +def critical(parent, title, text, + buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton): """ Function to show a modal critical message box. @param parent parent widget of the message box (QWidget) @param title caption of the message box (string) @param text text to be shown by the message box (string) - @param buttons flags indicating which buttons to show + @param buttons flags indicating which buttons to show (QMessageBox.StandardButtons) @param defaultButton flag indicating the default button (QMessageBox.StandardButton) @return button pressed by the user (QMessageBox.StandardButton) """ - return __messageBox(parent, title, text, QMessageBox.Critical, + return __messageBox(parent, title, text, QMessageBox.Critical, buttons, defaultButton) -def information(parent, title, text, - buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton): + +def information(parent, title, text, + buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton): """ Function to show a modal information message box. @param parent parent widget of the message box (QWidget) @param title caption of the message box (string) @param text text to be shown by the message box (string) - @param buttons flags indicating which buttons to show + @param buttons flags indicating which buttons to show (QMessageBox.StandardButtons) @param defaultButton flag indicating the default button (QMessageBox.StandardButton) @return button pressed by the user (QMessageBox.StandardButton) """ - return __messageBox(parent, title, text, QMessageBox.Information, + return __messageBox(parent, title, text, QMessageBox.Information, buttons, defaultButton) -def question(parent, title, text, - buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton): + +def question(parent, title, text, + buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton): """ Function to show a modal question message box. @param parent parent widget of the message box (QWidget) @param title caption of the message box (string) @param text text to be shown by the message box (string) - @param buttons flags indicating which buttons to show + @param buttons flags indicating which buttons to show (QMessageBox.StandardButtons) @param defaultButton flag indicating the default button (QMessageBox.StandardButton) @return button pressed by the user (QMessageBox.StandardButton) """ - return __messageBox(parent, title, text, QMessageBox.Question, + return __messageBox(parent, title, text, QMessageBox.Question, buttons, defaultButton) -def warning(parent, title, text, - buttons = QMessageBox.Ok, defaultButton = QMessageBox.NoButton): + +def warning(parent, title, text, + buttons=QMessageBox.Ok, defaultButton=QMessageBox.NoButton): """ Function to show a modal warning message box. @param parent parent widget of the message box (QWidget) @param title caption of the message box (string) @param text text to be shown by the message box (string) - @param buttons flags indicating which buttons to show + @param buttons flags indicating which buttons to show (QMessageBox.StandardButtons) @param defaultButton flag indicating the default button (QMessageBox.StandardButton) @return button pressed by the user (QMessageBox.StandardButton) """ - return __messageBox(parent, title, text, QMessageBox.Warning, + return __messageBox(parent, title, text, QMessageBox.Warning, buttons, defaultButton) ################################################################################ ## Additional convenience functions ## ################################################################################ -def yesNo(parent, title, text, icon = Question, yesDefault = False): + +def yesNo(parent, title, text, icon=Question, yesDefault=False): """ Function to show a model yes/no message box. @@ -223,12 +230,13 @@ """ assert icon in [Critical, Information, Question, Warning] - res = __messageBox(parent, title, text, icon, - QMessageBox.StandardButtons(QMessageBox.Yes | QMessageBox.No), + res = __messageBox(parent, title, text, icon, + QMessageBox.StandardButtons(QMessageBox.Yes | QMessageBox.No), yesDefault and QMessageBox.Yes or QMessageBox.No) return res == QMessageBox.Yes -def retryAbort(parent, title, text, icon = Question): + +def retryAbort(parent, title, text, icon=Question): """ Function to show a model abort/retry message box. @@ -240,11 +248,12 @@ """ assert icon in [Critical, Information, Question, Warning] - res = __messageBox(parent, title, text, icon, - QMessageBox.StandardButtons(QMessageBox.Retry | QMessageBox.Abort), + res = __messageBox(parent, title, text, icon, + QMessageBox.StandardButtons(QMessageBox.Retry | QMessageBox.Abort), QMessageBox.Retry) return res == QMessageBox.Retry + def okToClearData(parent, title, text, saveFunc): """ Function to show a model message box to ask for clearing the data. @@ -256,9 +265,9 @@ must be a parameterless function returning a flag indicating success. @return flag indicating that it is ok to clear the data (boolean) """ - res = __messageBox(parent, title, text, QMessageBox.Warning, + res = __messageBox(parent, title, text, QMessageBox.Warning, QMessageBox.StandardButtons( - QMessageBox.Abort | QMessageBox.Discard | QMessageBox.Save), + QMessageBox.Abort | QMessageBox.Discard | QMessageBox.Save), QMessageBox.Save) if res == QMessageBox.Abort: return False
--- a/E5Gui/E5ModelMenu.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5ModelMenu.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import UI.PixmapCache + class E5ModelMenu(QMenu): """ Class implementing a menu populated from a QAbstractItemModel. @@ -20,7 +21,7 @@ """ activated = pyqtSignal(QModelIndex) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -179,7 +180,7 @@ """ return E5ModelMenu(self) - def createMenu(self, parent, max_, parentMenu = None, menu = None): + def createMenu(self, parent, max_, parentMenu=None, menu=None): """ Public method to put all the children of a parent into a menu of a given length. @@ -329,7 +330,7 @@ self.__dropRow = row self.__dropIndex = parentIndex evt.acceptProposedAction() - self.__model.dropMimeData(evt.mimeData(), evt.dropAction(), + self.__model.dropMimeData(evt.mimeData(), evt.dropAction(), row, 0, parentIndex) self.close()
--- a/E5Gui/E5ModelToolBar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5ModelToolBar.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .E5ModelMenu import E5ModelMenu + class E5ModelToolBar(QToolBar): """ Class implementing a tool bar populated from a QAbstractItemModel. @@ -20,7 +21,7 @@ """ activated = pyqtSignal(QModelIndex) - def __init__(self, title = None, parent = None): + def __init__(self, title=None, parent=None): """ Constructor @@ -206,7 +207,7 @@ self.__dropRow = row self.__dropIndex = parentIndex evt.acceptProposedAction() - self.__model.dropMimeData(evt.mimeData(), evt.dropAction(), + self.__model.dropMimeData(evt.mimeData(), evt.dropAction(), row, 0, parentIndex) QToolBar.dropEvent(self, evt)
--- a/E5Gui/E5PassivePopup.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5PassivePopup.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,16 +4,17 @@ # """ -Module implementing dialog-like popup that displays messages without +Module implementing dialog-like popup that displays messages without interrupting the user. """ from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect from PyQt4.QtGui import QFrame, QVBoxLayout, QApplication + class E5PassivePopup(QFrame): """ - Class implementing dialog-like popup that displays messages without + Class implementing dialog-like popup that displays messages without interrupting the user. """ Boxed = 0 @@ -21,7 +22,7 @@ clicked = pyqtSignal((), (QPoint, )) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -87,7 +88,7 @@ if delay > 0: self.__hideTimer.start(delay) - def show(self, p = None): + def show(self, p=None): """ Public slot to show the popup. @@ -167,7 +168,7 @@ def __calculateNearbyPoint(self, target): """ - Private method to calculate the position to place the popup near the + Private method to calculate the position to place the popup near the specified rectangle. @param target rectangle to be placed at (QRect) @@ -179,7 +180,7 @@ w = self.minimumSizeHint().width() h = self.minimumSizeHint().height() - r = QApplication.desktop().screenGeometry(QPoint(x + w // 2, y + h // 2)) + r = QApplication.desktop().screenGeometry(QPoint(x + w // 2, y + h // 2)) if x < r.center().x(): x += target.width()
--- a/E5Gui/E5SideBar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5SideBar.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import UI.PixmapCache + class E5SideBar(QWidget): """ Class implementing a sidebar with a widget area, that is hidden or shown, if the @@ -22,11 +23,11 @@ Version = 1 North = 0 - East = 1 + East = 1 South = 2 - West = 3 + West = 3 - def __init__(self, orientation = None, parent = None): + def __init__(self, orientation=None, parent=None): """ Constructor @@ -65,7 +66,7 @@ self.splitter = None self.splitterSizes = [] - self.__hasFocus = False # flag storing if this widget or any child has the focus + self.__hasFocus = False # flag storing if this widget or any child has the focus self.__autoHide = False self.__tabBar.installEventFilter(self) @@ -184,7 +185,7 @@ return QWidget.eventFilter(self, obj, evt) - def addTab(self, widget, iconOrLabel, label = None): + def addTab(self, widget, iconOrLabel, label=None): """ Public method to add a tab to the sidebar. @@ -200,7 +201,7 @@ self.__tabBar.addTab(iconOrLabel) self.__stackedWidget.addWidget(widget) - def insertTab(self, index, widget, iconOrLabel, label = None): + def insertTab(self, index, widget, iconOrLabel, label=None): """ Public method to insert a tab into the sidebar. @@ -488,7 +489,7 @@ data = QByteArray(state) stream = QDataStream(data, QIODevice.ReadOnly) - stream.readUInt16() # version + stream.readUInt16() # version minimized = stream.readBool() if minimized:
--- a/E5Gui/E5SingleApplication.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5SingleApplication.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,9 +22,10 @@ SAFile = "eric5" # define the protocol tokens -SAOpenFile = '>OpenFile<' -SAOpenProject = '>OpenProject<' -SAArguments = '>Arguments<' +SAOpenFile = '>OpenFile<' +SAOpenProject = '>OpenProject<' +SAArguments = '>Arguments<' + class E5SingleApplicationServer(SingleApplicationServer): """ @@ -79,6 +80,7 @@ """ e5App().getObject("DebugUI").setArgvHistory(argsStr) + class E5SingleApplicationClient(SingleApplicationClient): """ Class implementing the single application client of the IDE.
--- a/E5Gui/E5SqueezeLabels.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5SqueezeLabels.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from Utilities import compactPath + class E5SqueezeLabel(QLabel): """ Class implementing a label that squeezes its contents to fit it's size. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -50,11 +51,12 @@ self.__text = txt QLabel.setText(self, self.__text) + class E5SqueezeLabelPath(QLabel): """ Class implementing a label showing a file path compacted to fit it's size. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -102,9 +104,9 @@ """ fm = self.fontMetrics() if fm.width(self.__surrounding.format(self.__path)) > self.contentsRect().width(): - QLabel.setText(self, - self.__surrounding.format(compactPath(self.__path, - self.contentsRect().width(), + QLabel.setText(self, + self.__surrounding.format(compactPath(self.__path, + self.contentsRect().width(), self.length)) ) else: @@ -118,4 +120,4 @@ @param txt text to calculate the length for after wrapped (string) @return length of the wrapped text in pixels (integer) """ - return self.fontMetrics().width(self.__surrounding.format(txt)) \ No newline at end of file + return self.fontMetrics().width(self.__surrounding.format(txt))
--- a/E5Gui/E5TabWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5TabWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtGui import QTabWidget, QTabBar, QApplication, QDrag, QStyle, QLabel, QMovie from PyQt4.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal + class E5WheelTabBar(QTabBar): """ Class implementing a tab bar class substituting QTabBar to support wheel events. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -39,6 +40,7 @@ except AttributeError: pass + class E5DnDTabBar(E5WheelTabBar): """ Class implementing a tab bar class substituting QTabBar. @@ -48,7 +50,7 @@ """ tabMoveRequested = pyqtSignal(int, int) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -116,6 +118,7 @@ event.acceptProposedAction() E5WheelTabBar.dropEvent(self, event) + class E5TabWidget(QTabWidget): """ Class implementing a tab widget class substituting QTabWidget. @@ -128,7 +131,7 @@ """ customTabContextMenuRequested = pyqtSignal(QPoint, int) - def __init__(self, parent = None, dnd = False): + def __init__(self, parent=None, dnd=False): """ Constructor @@ -287,7 +290,7 @@ @return free side (QTabBar.ButtonPosition) """ - side = self.__tabBar.style().styleHint(QStyle.SH_TabBar_CloseButtonPosition, + side = self.__tabBar.style().styleHint(QStyle.SH_TabBar_CloseButtonPosition, None, None, None) if side == QTabBar.LeftSide: side = QTabBar.RightSide
--- a/E5Gui/E5TableView.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5TableView.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,12 +4,13 @@ # """ -Module implementing specialized table views. +Module implementing specialized table views. """ from PyQt4.QtCore import Qt from PyQt4.QtGui import QTableView, QItemSelectionModel + class E5TableView(QTableView): """ Class implementing a table view supporting removal of entries. @@ -44,7 +45,7 @@ idx = self.model().index(row, 0, self.rootIndex()) if not idx.isValid(): idx = self.model().index(row - 1, 0, self.rootIndex()) - self.selectionModel().select(idx, + self.selectionModel().select(idx, QItemSelectionModel.SelectCurrent | QItemSelectionModel.Rows) self.setCurrentIndex(idx) @@ -53,5 +54,5 @@ Public method to clear the view. """ if self.model() is not None: - self.model().removeRows(0, self.model().rowCount(self.rootIndex()), - self.rootIndex()) \ No newline at end of file + self.model().removeRows(0, self.model().rowCount(self.rootIndex()), + self.rootIndex())
--- a/E5Gui/E5TextSpinBox.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5TextSpinBox.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,11 +5,12 @@ from PyQt4.QtGui import QSpinBox + class E5TextSpinBox(QSpinBox): """ Class implementing a spinbox with textual entries. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -22,7 +23,7 @@ self.setMinimum(0) self.setMaximum(0) - def addItem(self, txt, data = None): + def addItem(self, txt, data=None): """ Public method to add an item with item data.
--- a/E5Gui/E5ToolBarDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5ToolBarDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import UI.PixmapCache + class E5ToolBarItem(object): """ Class storing data belonging to a toolbar entry of the toolbar dialog. @@ -34,6 +35,7 @@ self.title = "" self.isChanged = False + class E5ToolBarDialog(QDialog, Ui_E5ToolBarDialog): """ Class implementing a toolbar configuration dialog. @@ -41,7 +43,7 @@ ActionIdRole = Qt.UserRole WidgetActionRole = Qt.UserRole + 1 - def __init__(self, toolBarManager, parent = None): + def __init__(self, toolBarManager, parent=None): """ Constructor @@ -56,8 +58,8 @@ self.__currentToolBarItem = None self.__removedToolBarIDs = [] # remember custom toolbars to be deleted - self.__widgetActionToToolBarItemID = {} # maps widget action IDs to toolbar item IDs - self.__toolBarItemToWidgetActionID = {} # maps toolbar item IDs to widget action IDs + self.__widgetActionToToolBarItemID = {} # maps widget action IDs to toolbar item IDs + self.__toolBarItemToWidgetActionID = {} # maps toolbar item IDs to widget action IDs self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) @@ -107,7 +109,7 @@ tbItem.actionIDs = actionIDs self.toolbarComboBox.addItem(tb.windowTitle(), int(id(tbItem))) if default: - self.toolbarComboBox.setItemData(self.toolbarComboBox.count() - 1, + self.toolbarComboBox.setItemData(self.toolbarComboBox.count() - 1, QColor(Qt.darkGreen), Qt.ForegroundRole) self.toolbarComboBox.model().sort(0) @@ -452,4 +454,4 @@ tbID = self.__currentToolBarItem.toolBarId actions = self.__manager.defaultToolBarActions(tbID) self.__restoreCurrentToolbar(actions) - self.__currentToolBarItem.isChanged = True \ No newline at end of file + self.__currentToolBarItem.isChanged = True
--- a/E5Gui/E5ToolBarManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5ToolBarManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * + class E5ToolBarManager(QObject): """ Class implementing a toolbar manager. @@ -18,7 +19,7 @@ ToolBarMarker = 0xfefe CustomToolBarMarker = 0xfdfd - def __init__(self, ui = None, parent = None): + def __init__(self, ui=None, parent=None): """ Constructor @@ -31,7 +32,7 @@ self.__ui = ui self.__toolBars = {} # maps toolbar IDs to actions - self.__toolBarsWithSeparators = {} # maps toolbar IDs to actions incl. separators + self.__toolBarsWithSeparators = {} # maps toolbar IDs to actions incl. separators self.__defaultToolBars = {} # maps default toolbar IDs to actions self.__customToolBars = [] # list of custom toolbars self.__allToolBars = {} # maps toolbar IDs to toolbars @@ -434,7 +435,7 @@ if action in self.__categoryToActions[category]: self.__categoryToActions[category].remove(action) - def saveState(self, version = 0): + def saveState(self, version=0): """ Public method to save the state of the toolbar manager. @@ -485,7 +486,7 @@ return data - def restoreState(self, state, version = 0): + def restoreState(self, state, version=0): """ Public method to restore the state of the toolbar manager.
--- a/E5Gui/E5ToolBox.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5ToolBox.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .E5TabWidget import E5TabWidget + class E5VerticalToolBox(QToolBox): """ Class implementing a ToolBox class substituting QToolBox to support wheel events. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -43,11 +44,12 @@ event.accept() + class E5HorizontalToolBox(E5TabWidget): """ Class implementing a vertical QToolBox like widget. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -99,4 +101,4 @@ @param index index of the item (integer) @param enabled flag indicating the enabled state (boolean) """ - self.setTabEnabled(index, enabled) \ No newline at end of file + self.setTabEnabled(index, enabled)
--- a/E5Gui/E5TreeSortFilterProxyModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5TreeSortFilterProxyModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtCore import Qt, QModelIndex from PyQt4.QtGui import QSortFilterProxyModel + class E5TreeSortFilterProxyModel(QSortFilterProxyModel): """ Class implementing a modified QSortFilterProxyModel. @@ -17,7 +18,7 @@ It always accepts the root nodes in the tree so filtering is only done on the children. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -41,7 +42,7 @@ return QSortFilterProxyModel.filterAcceptsRow(self, sourceRow, sourceParent) - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check, if a parent node has some children. @@ -49,4 +50,4 @@ @return flag indicating the presence of children (boolean) """ sindex = self.mapToSource(parent) - return self.sourceModel().hasChildren(sindex) \ No newline at end of file + return self.sourceModel().hasChildren(sindex)
--- a/E5Gui/E5TreeView.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Gui/E5TreeView.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,12 +4,13 @@ # """ -Module implementing specialized tree views. +Module implementing specialized tree views. """ from PyQt4.QtCore import Qt from PyQt4.QtGui import QTreeView + class E5TreeView(QTreeView): """ Class implementing a tree view supporting removal of entries. @@ -46,5 +47,5 @@ Public method to clear the view. """ if self.model() is not None: - self.model().removeRows(0, self.model().rowCount(self.rootIndex()), + self.model().removeRows(0, self.model().rowCount(self.rootIndex()), self.rootIndex())
--- a/E5Network/E5NetworkHeaderDetailsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Network/E5NetworkHeaderDetailsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_E5NetworkHeaderDetailsDialog import Ui_E5NetworkHeaderDetailsDialog + class E5NetworkHeaderDetailsDialog(QDialog, Ui_E5NetworkHeaderDetailsDialog): """ Class implementing a dialog to show the data of a response or reply header. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/E5Network/E5NetworkMonitor.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Network/E5NetworkMonitor.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ from .Ui_E5NetworkMonitor import Ui_E5NetworkMonitor + class E5NetworkRequest(object): """ Class for storing all data related to a specific request. @@ -35,6 +36,7 @@ self.info = "" self.replyHeaders = [] # list of tuple of two items + class E5NetworkMonitor(QDialog, Ui_E5NetworkMonitor): """ Class implementing a network monitor dialog. @@ -63,7 +65,7 @@ if cls._monitor is not None: cls._monitor.close() - def __init__(self, networkAccessManager, parent = None): + def __init__(self, networkAccessManager, parent=None): """ Constructor @@ -108,9 +110,9 @@ fm = self.fontMetrics() em = fm.width("m") - self.requestsList.horizontalHeader().resizeSection(0, em * 5) + self.requestsList.horizontalHeader().resizeSection(0, em * 5) self.requestsList.horizontalHeader().resizeSection(1, em * 20) - self.requestsList.horizontalHeader().resizeSection(3, em * 5) + self.requestsList.horizontalHeader().resizeSection(3, em * 5) self.requestsList.horizontalHeader().resizeSection(4, em * 15) self.__headersDlg = None @@ -151,10 +153,10 @@ for header in req.rawHeaderList(): self.__requestHeaders.insertRows(0, 1, QModelIndex()) self.__requestHeaders.setData( - self.__requestHeaders.index(0, 0), + self.__requestHeaders.index(0, 0), str(header, "utf-8")) self.__requestHeaders.setData( - self.__requestHeaders.index(0, 1), + self.__requestHeaders.index(0, 1), str(req.rawHeader(header), "utf-8")) self.__requestHeaders.item(0, 0).setFlags( Qt.ItemIsSelectable | Qt.ItemIsEnabled) @@ -164,10 +166,10 @@ for header in self.__model.requests[row].replyHeaders: self.__replyHeaders.insertRows(0, 1, QModelIndex()) self.__replyHeaders.setData( - self.__replyHeaders.index(0, 0), + self.__replyHeaders.index(0, 0), header[0]) self.__replyHeaders.setData( - self.__replyHeaders.index(0, 1), + self.__replyHeaders.index(0, 1), header[1]) self.__replyHeaders.item(0, 0).setFlags( Qt.ItemIsSelectable | Qt.ItemIsEnabled) @@ -195,11 +197,12 @@ self.__headersDlg.setData(name, value) self.__headersDlg.show() + class E5RequestModel(QAbstractTableModel): """ Class implementing a model storing request objects. """ - def __init__(self, networkAccessManager, parent = None): + def __init__(self, networkAccessManager, parent=None): """ Constructor @@ -210,19 +213,19 @@ QAbstractTableModel.__init__(self, parent) self.__headerData = [ - self.trUtf8("Method"), - self.trUtf8("Address"), - self.trUtf8("Response"), - self.trUtf8("Length"), - self.trUtf8("Content Type"), - self.trUtf8("Info"), + self.trUtf8("Method"), + self.trUtf8("Address"), + self.trUtf8("Response"), + self.trUtf8("Length"), + self.trUtf8("Content Type"), + self.trUtf8("Info"), ] self.__operations = { - QNetworkAccessManager.HeadOperation : "HEAD", - QNetworkAccessManager.GetOperation : "GET", - QNetworkAccessManager.PutOperation : "PUT", - QNetworkAccessManager.PostOperation : "POST", + QNetworkAccessManager.HeadOperation: "HEAD", + QNetworkAccessManager.GetOperation: "GET", + QNetworkAccessManager.PutOperation: "PUT", + QNetworkAccessManager.PostOperation: "POST", } self.requests = [] @@ -288,7 +291,7 @@ self.requests[offset].info = \ self.trUtf8("Redirect: {0}").format(target.toString()) - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get header data from the model. @@ -302,7 +305,7 @@ return QAbstractTableModel.headerData(self, section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model.
--- a/E5Network/E5NetworkProxyFactory.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5Network/E5NetworkProxyFactory.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import Preferences import Globals + def schemeFromProxyType(proxyType): """ Module function to determine the scheme name from the proxy type. @@ -38,6 +39,7 @@ scheme = "NoProxy" return scheme + def proxyAuthenticationRequired(proxy, auth): """ Module slot to handle a proxy authentication request. @@ -45,7 +47,7 @@ @param proxy reference to the proxy object (QNetworkProxy) @param auth reference to the authenticator object (QAuthenticator) """ - info = QCoreApplication.translate("E5NetworkProxyFactory", + info = QCoreApplication.translate("E5NetworkProxyFactory", "<b>Connect to proxy '{0}' using:</b>")\ .format(Qt.escape(proxy.hostName())) @@ -62,6 +64,7 @@ proxy.setUser(username) proxy.setPassword(password) + class E5NetworkProxyFactory(QNetworkProxyFactory): """ Class implementing a network proxy factory. @@ -104,7 +107,7 @@ proxyType = QNetworkProxy.FtpCachingProxy else: proxyType = QNetworkProxy.HttpProxy - proxy = QNetworkProxy(proxyType, url.host(), url.port(), + proxy = QNetworkProxy(proxyType, url.host(), url.port(), url.userName(), url.password()) proxyList = [proxy] break @@ -128,26 +131,26 @@ host = Preferences.getUI("ProxyHost/{0}".format(protocol)) if not host: E5MessageBox.critical(None, - QCoreApplication.translate("E5NetworkProxyFactory", + QCoreApplication.translate("E5NetworkProxyFactory", "Proxy Configuration Error"), - QCoreApplication.translate("E5NetworkProxyFactory", + QCoreApplication.translate("E5NetworkProxyFactory", """Proxy usage was activated""" """ but no proxy host for protocol""" """ '{0}' configured.""").format(protocol)) return [QNetworkProxy(QNetworkProxy.DefaultProxy)] else: if protocol == "Http": - proxy = QNetworkProxy(QNetworkProxy.HttpProxy, host, + proxy = QNetworkProxy(QNetworkProxy.HttpProxy, host, Preferences.getUI("ProxyPort/Http"), Preferences.getUI("ProxyUser/Http"), Preferences.getUI("ProxyPassword/Http")) elif protocol == "Https": - proxy = QNetworkProxy(QNetworkProxy.HttpCachingProxy, host, + proxy = QNetworkProxy(QNetworkProxy.HttpCachingProxy, host, Preferences.getUI("ProxyPort/Https"), Preferences.getUI("ProxyUser/Https"), Preferences.getUI("ProxyPassword/Https")) elif protocol == "Ftp": - proxy = QNetworkProxy(QNetworkProxy.FtpCachingProxy, host, + proxy = QNetworkProxy(QNetworkProxy.FtpCachingProxy, host, Preferences.getUI("ProxyPort/Ftp"), Preferences.getUI("ProxyUser/Ftp"), Preferences.getUI("ProxyPassword/Ftp"))
--- a/E5XML/DebuggerPropertiesReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/DebuggerPropertiesReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from .Config import debuggerPropertiesFileFormatVersion from .XMLStreamReaderBase import XMLStreamReaderBase + class DebuggerPropertiesReader(XMLStreamReaderBase): """ Class for reading an XML project debugger properties file. @@ -30,7 +31,7 @@ self.version = "" - def readXML(self, quiet = False): + def readXML(self, quiet=False): """ Public method to read and parse the XML document.
--- a/E5XML/DebuggerPropertiesWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/DebuggerPropertiesWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class DebuggerPropertiesWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML project debugger properties @@ -58,41 +59,41 @@ self.writeTextElement("DebugClient", self.project.debugProperties["DEBUGCLIENT"]) self.writeStartElement("Environment") - self.writeAttribute("override", + self.writeAttribute("override", str(int(self.project.debugProperties["ENVIRONMENTOVERRIDE"]))) self.writeCharacters(self.project.debugProperties["ENVIRONMENTSTRING"]) self.writeEndElement() self.writeStartElement("RemoteDebugger") - self.writeAttribute("on", + self.writeAttribute("on", str(int(self.project.debugProperties["REMOTEDEBUGGER"]))) - self.writeTextElement("RemoteHost", + self.writeTextElement("RemoteHost", self.project.debugProperties["REMOTEHOST"]) - self.writeTextElement("RemoteCommand", + self.writeTextElement("RemoteCommand", self.project.debugProperties["REMOTECOMMAND"]) self.writeEndElement() self.writeStartElement("PathTranslation") - self.writeAttribute("on", + self.writeAttribute("on", str(int(self.project.debugProperties["PATHTRANSLATION"]))) - self.writeTextElement("RemotePath", + self.writeTextElement("RemotePath", self.project.debugProperties["REMOTEPATH"]) - self.writeTextElement("LocalPath", + self.writeTextElement("LocalPath", self.project.debugProperties["LOCALPATH"]) self.writeEndElement() self.writeStartElement("ConsoleDebugger") - self.writeAttribute("on", + self.writeAttribute("on", str(int(self.project.debugProperties["CONSOLEDEBUGGER"]))) self.writeCharacters(self.project.debugProperties["CONSOLECOMMAND"]) self.writeEndElement() self.writeEmptyElement("Redirect") - self.writeAttribute("on", + self.writeAttribute("on", str(int(self.project.debugProperties["REDIRECT"]))) self.writeEmptyElement("Noencoding") - self.writeAttribute("on", + self.writeAttribute("on", str(int(self.project.debugProperties["NOENCODING"]))) self.writeEndElement()
--- a/E5XML/HighlightingStylesReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/HighlightingStylesReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ from .Config import highlightingStylesFileFormatVersion from .XMLStreamReaderBase import XMLStreamReaderBase + class HighlightingStylesReader(XMLStreamReaderBase): """ Class for reading a highlighting styles XML file. @@ -40,7 +41,7 @@ self.readNext() if self.isStartElement(): if self.name() == "HighlightingStyles": - self.version = self.attribute("version", + self.version = self.attribute("version", highlightingStylesFileFormatVersion) if self.version not in self.supportedVersions: self.raiseUnsupportedFormatVersion(self.version)
--- a/E5XML/HighlightingStylesWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/HighlightingStylesWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class HighlightingStylesWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing a highlighting styles XML file.
--- a/E5XML/MultiProjectReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/MultiProjectReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Utilities + class MultiProjectReader(XMLStreamReaderBase): """ Class for reading an XML multi project file. @@ -40,7 +41,7 @@ self.readNext() if self.isStartElement(): if self.name() == "MultiProject": - self.version = self.attribute("version", + self.version = self.attribute("version", multiProjectFileFormatVersion) if self.version not in self.supportedVersions: self.raiseUnsupportedFormatVersion(self.version)
--- a/E5XML/MultiProjectWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/MultiProjectWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ import Preferences import Utilities + class MultiProjectWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML project file. @@ -61,7 +62,7 @@ self.writeStartElement("Project") self.writeAttribute("isMaster", str(project['master'])) self.writeTextElement("ProjectName", project['name']) - self.writeTextElement("ProjectFile", + self.writeTextElement("ProjectFile", Utilities.fromNativeSeparators(project['file'])) self.writeTextElement("ProjectDescription", project['description']) self.writeEndElement()
--- a/E5XML/PluginRepositoryReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/PluginRepositoryReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class PluginRepositoryReader(XMLStreamReaderBase): """ Class to read the plug-in repository contents file. @@ -39,7 +40,7 @@ self.readNext() if self.isStartElement(): if self.name() == "Plugins": - self.version = self.attribute("version", + self.version = self.attribute("version", pluginRepositoryFileFormatVersion) if self.version not in self.supportedVersions: self.raiseUnsupportedFormatVersion(self.version) @@ -57,21 +58,21 @@ """ Private method to read the plug-in info. """ - pluginInfo = {"name" : "", - "short" : "", - "description" : "", - "url" : "", - "author" : "", - "version" : "", - "filename" : "", + pluginInfo = {"name": "", + "short": "", + "description": "", + "url": "", + "author": "", + "version": "", + "filename": "", } pluginInfo["status"] = self.attribute("status", "unknown") while not self.atEnd(): self.readNext() if self.isEndElement() and self.name() == "Plugin": - self.dlg.addEntry(pluginInfo["name"], pluginInfo["short"], - pluginInfo["description"], pluginInfo["url"], + self.dlg.addEntry(pluginInfo["name"], pluginInfo["short"], + pluginInfo["description"], pluginInfo["url"], pluginInfo["author"], pluginInfo["version"], pluginInfo["filename"], pluginInfo["status"]) break
--- a/E5XML/ProjectReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/ProjectReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Utilities + class ProjectReader(XMLStreamReaderBase): """ Class for reading an XML project file. @@ -86,7 +87,7 @@ elif self.name() == "Translations": self.__readFiles("Translations", "Translation", "TRANSLATIONS") elif self.name() == "TranslationExceptions": - self.__readFiles("TranslationExceptions", "TranslationException", + self.__readFiles("TranslationExceptions", "TranslationException", "TRANSLATIONEXCEPTIONS") elif self.name() == "Resources": self.__readFiles("Resources", "Resource", "RESOURCES") @@ -104,19 +105,19 @@ elif self.name() == "LexerAssociations": self.__readLexerAssociations() elif self.name() == "ProjectTypeSpecific": - self.__readBasicDataField("ProjectTypeSpecific", + self.__readBasicDataField("ProjectTypeSpecific", "ProjectTypeSpecificData", "PROJECTTYPESPECIFICDATA") elif self.name() == "Documentation": - self.__readBasicDataField("Documentation", + self.__readBasicDataField("Documentation", "DocumentationParams", "DOCUMENTATIONPARMS") elif self.name() == "Packagers": - self.__readBasicDataField("Packagers", + self.__readBasicDataField("Packagers", "PackagersParams", "PACKAGERSPARMS") elif self.name() == "Checkers": - self.__readBasicDataField("Checkers", + self.__readBasicDataField("Checkers", "CheckersParams", "CHECKERSPARMS") elif self.name() == "OtherTools": - self.__readBasicDataField("OtherTools", + self.__readBasicDataField("OtherTools", "OtherToolsParams", "OTHERTOOLSPARMS") else: self.raiseUnexpectedStartTag(self.name())
--- a/E5XML/ProjectWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/ProjectWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ import Preferences import Utilities + class ProjectWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML project file. @@ -47,8 +48,8 @@ if Preferences.getProject("XMLTimestamp"): self.writeComment(" Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S'))) self.writeComment(" Copyright (C) {0} {1}, {2} ".format( - time.strftime('%Y'), - self.pdata["AUTHOR"][0], + time.strftime('%Y'), + self.pdata["AUTHOR"][0], self.pdata["EMAIL"][0])) # add the main tag @@ -58,10 +59,10 @@ # do the language (used for spell checking) self.writeTextElement("Language", self.pdata["SPELLLANGUAGE"][0]) if len(self.pdata["SPELLWORDS"][0]) > 0: - self.writeTextElement("ProjectWordList", + self.writeTextElement("ProjectWordList", Utilities.fromNativeSeparators(self.pdata["SPELLWORDS"][0])) if len(self.pdata["SPELLEXCLUDES"][0]) > 0: - self.writeTextElement("ProjectExcludeList", + self.writeTextElement("ProjectExcludeList", Utilities.fromNativeSeparators(self.pdata["SPELLEXCLUDES"][0])) # do the hash @@ -87,12 +88,12 @@ # do the translation pattern if self.pdata["TRANSLATIONPATTERN"]: - self.writeTextElement("TranslationPattern", + self.writeTextElement("TranslationPattern", Utilities.fromNativeSeparators(self.pdata["TRANSLATIONPATTERN"][0])) # do the binary translations path if self.pdata["TRANSLATIONSBINPATH"]: - self.writeTextElement("TranslationsBinPath", + self.writeTextElement("TranslationsBinPath", Utilities.fromNativeSeparators(self.pdata["TRANSLATIONSBINPATH"][0])) # do the eol setting @@ -122,7 +123,7 @@ if self.pdata["TRANSLATIONEXCEPTIONS"]: self.writeStartElement("TranslationExceptions") for name in self.pdata["TRANSLATIONEXCEPTIONS"]: - self.writeTextElement("TranslationException", + self.writeTextElement("TranslationException", Utilities.fromNativeSeparators(name)) self.writeEndElement() @@ -146,7 +147,7 @@ # do the main script if self.pdata["MAINSCRIPT"]: - self.writeTextElement("MainScript", + self.writeTextElement("MainScript", Utilities.fromNativeSeparators(self.pdata["MAINSCRIPT"][0])) # do the vcs stuff @@ -180,7 +181,7 @@ if len(self.pdata["PROJECTTYPESPECIFICDATA"]): self.writeStartElement("ProjectTypeSpecific") if self.pdata["PROJECTTYPESPECIFICDATA"]: - self.writeBasics("ProjectTypeSpecificData", + self.writeBasics("ProjectTypeSpecificData", self.pdata["PROJECTTYPESPECIFICDATA"]) self.writeEndElement() @@ -188,7 +189,7 @@ if len(self.pdata["DOCUMENTATIONPARMS"]): self.writeStartElement("Documentation") if self.pdata["DOCUMENTATIONPARMS"]: - self.writeBasics("DocumentationParams", + self.writeBasics("DocumentationParams", self.pdata["DOCUMENTATIONPARMS"]) self.writeEndElement() @@ -196,7 +197,7 @@ if len(self.pdata["PACKAGERSPARMS"]): self.writeStartElement("Packagers") if self.pdata["PACKAGERSPARMS"]: - self.writeBasics("PackagersParams", + self.writeBasics("PackagersParams", self.pdata["PACKAGERSPARMS"]) self.writeEndElement() @@ -204,7 +205,7 @@ if len(self.pdata["CHECKERSPARMS"]): self.writeStartElement("Checkers") if self.pdata["CHECKERSPARMS"]: - self.writeBasics("CheckersParams", + self.writeBasics("CheckersParams", self.pdata["CHECKERSPARMS"]) self.writeEndElement() @@ -212,7 +213,7 @@ if len(self.pdata["OTHERTOOLSPARMS"]): self.writeStartElement("OtherTools") if self.pdata["OTHERTOOLSPARMS"]: - self.writeBasics("OtherToolsParams", + self.writeBasics("OtherToolsParams", self.pdata["OTHERTOOLSPARMS"]) self.writeEndElement()
--- a/E5XML/SessionReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/SessionReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .Config import sessionFileFormatVersion from .XMLStreamReaderBase import XMLStreamReaderBase + class SessionReader(XMLStreamReaderBase): """ Class for reading an XML session file. @@ -47,7 +48,7 @@ self.dbs.getBreakPointModel().deleteAll() self.dbs.getWatchPointModel().deleteAll() - def readXML(self, quiet = False): + def readXML(self, quiet=False): """ Public method to read and parse the XML document. @@ -203,7 +204,7 @@ while not self.atEnd(): self.readNext() if self.isEndElement() and self.name() == "Watchexpression": - self.dbs.getWatchPointModel().addWatchPoint(weCond, + self.dbs.getWatchPointModel().addWatchPoint(weCond, (weTemp, weEnabled, weCount, weSpecialCond)) break
--- a/E5XML/SessionWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/SessionWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class SessionWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML session file. @@ -62,7 +63,7 @@ # step 0: save open multi project and project for the global session if isGlobal: if self.multiProject.isOpen(): - self.writeTextElement("MultiProject", + self.writeTextElement("MultiProject", self.multiProject.getMultiProjectFile()) if self.project.isOpen(): self.writeTextElement("Project", self.project.getProjectFile())
--- a/E5XML/ShortcutsReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/ShortcutsReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from .Config import shortcutsFileFormatVersion from .XMLStreamReaderBase import XMLStreamReaderBase + class ShortcutsReader(XMLStreamReaderBase): """ Class for reading an XML shortcuts file.
--- a/E5XML/ShortcutsWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/ShortcutsWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class ShortcutsWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML shortcuts file. @@ -48,36 +49,36 @@ self.writeStartElement("Shortcuts") self.writeAttribute("version", shortcutsFileFormatVersion) - self.__writeActions("Project", + self.__writeActions("Project", e5App().getObject("Project").getActions()) - self.__writeActions("General", + self.__writeActions("General", e5App().getObject("UserInterface").getActions('ui')) - self.__writeActions("Wizards", + self.__writeActions("Wizards", e5App().getObject("UserInterface").getActions('wizards')) - self.__writeActions("Debug", + self.__writeActions("Debug", e5App().getObject("DebugUI").getActions()) - self.__writeActions("Edit", + self.__writeActions("Edit", e5App().getObject("ViewManager").getActions('edit')) - self.__writeActions("File", + self.__writeActions("File", e5App().getObject("ViewManager").getActions('file')) - self.__writeActions("Search", + self.__writeActions("Search", e5App().getObject("ViewManager").getActions('search')) - self.__writeActions("View", + self.__writeActions("View", e5App().getObject("ViewManager").getActions('view')) - self.__writeActions("Macro", + self.__writeActions("Macro", e5App().getObject("ViewManager").getActions('macro')) - self.__writeActions("Bookmarks", + self.__writeActions("Bookmarks", e5App().getObject("ViewManager").getActions('bookmark')) - self.__writeActions("Spelling", + self.__writeActions("Spelling", e5App().getObject("ViewManager").getActions('spelling')) - self.__writeActions("Window", + self.__writeActions("Window", e5App().getObject("ViewManager").getActions('window')) for category, ref in e5App().getPluginObjects(): if hasattr(ref, "getActions"): self.__writeActions(category, ref.getActions()) - self.__writeActions("HelpViewer", + self.__writeActions("HelpViewer", e5App().getObject("DummyHelpViewer").getActions()) # add the main end tag
--- a/E5XML/TasksReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/TasksReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,13 +16,14 @@ import Utilities + class TasksReader(XMLStreamReaderBase): """ Class for reading an XML tasks file. """ supportedVersions = ["4.2"] - def __init__(self, device, forProject = False, viewer = None): + def __init__(self, device, forProject=False, viewer=None): """ Constructor @@ -64,14 +65,14 @@ """ Private method to read the task info. """ - task = {"summary" : "", - "priority" : 1, - "completed" : False, - "created" : 0, - "filename" : "", - "linenumber" : 0, - "bugfix" : False, - "description" : "", + task = {"summary": "", + "priority": 1, + "completed": False, + "created": 0, + "filename": "", + "linenumber": 0, + "bugfix": False, + "description": "", } task["priority"] = int(self.attribute("priority", "1")) task["completed"] = self.toBool(self.attribute("completed", "False")) @@ -80,11 +81,11 @@ while not self.atEnd(): self.readNext() if self.isEndElement() and self.name() == "Task": - self.viewer.addTask(task["summary"], priority = task["priority"], - filename = task["filename"], lineno = task["linenumber"], - completed = task["completed"], _time = task["created"], - isProjectTask = self.forProject, isBugfixTask = task["bugfix"], - longtext = task["description"]) + self.viewer.addTask(task["summary"], priority=task["priority"], + filename=task["filename"], lineno=task["linenumber"], + completed=task["completed"], _time=task["created"], + isProjectTask=self.forProject, isBugfixTask=task["bugfix"], + longtext=task["description"]) break if self.isStartElement():
--- a/E5XML/TasksWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/TasksWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Preferences import Utilities + class TasksWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML tasks file. """ - def __init__(self, device, forProject = False, projectName = ""): + def __init__(self, device, forProject=False, projectName=""): """ Constructor @@ -69,11 +70,11 @@ self.writeAttribute("bugfix", str(task.isBugfixTask)) self.writeTextElement("Summary", task.description.strip()) self.writeTextElement("Description", task.longtext.strip()) - self.writeTextElement("Created", + self.writeTextElement("Created", time.strftime("%Y-%m-%d, %H:%M:%S", time.localtime(task.created))) if task.filename: self.writeStartElement("Resource") - self.writeTextElement("Filename", + self.writeTextElement("Filename", Utilities.fromNativeSeparators(task.filename)) self.writeTextElement("Linenumber", str(task.lineno)) self.writeEndElement()
--- a/E5XML/TemplatesReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/TemplatesReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,13 +12,14 @@ from .Config import templatesFileFormatVersion from .XMLStreamReaderBase import XMLStreamReaderBase + class TemplatesReader(XMLStreamReaderBase): """ Class for reading an XML tasks file. """ supportedVersions = ["4.0"] - def __init__(self, device, viewer = None): + def __init__(self, device, viewer=None): """ Constructor @@ -83,9 +84,9 @@ while not self.atEnd(): self.readNext() if self.isEndElement() and self.name() == "Template" and templateName: - self.viewer.addEntry(self.groupName, templateName, + self.viewer.addEntry(self.groupName, templateName, templateDescription, templateText, - quiet = True) + quiet=True) break if self.isStartElement():
--- a/E5XML/TemplatesWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/TemplatesWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .XMLStreamWriterBase import XMLStreamWriterBase from .Config import templatesFileFormatVersion + class TemplatesWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML templates file.
--- a/E5XML/UserProjectReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/UserProjectReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class UserProjectReader(XMLStreamReaderBase): """ Class for reading an XML user project properties file. @@ -46,7 +47,7 @@ elif self.name() == "VcsType": self.project.pudata["VCSOVERRIDE"] = [self.readElementText()] elif self.name() == "VcsStatusMonitorInterval": - interval = int(self.attribute("value", + interval = int(self.attribute("value", Preferences.getVCS("StatusMonitorInterval"))) self.project.pudata["VCSSTATUSMONITORINTERVAL"] = [interval] else:
--- a/E5XML/UserProjectWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/UserProjectWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class UserProjectWriter(XMLStreamWriterBase): """ Class implementing the writer class for writing an XML user project properties file.
--- a/E5XML/XMLStreamReaderBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/XMLStreamReaderBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from E5Gui import E5MessageBox + class XMLStreamReaderBase(QXmlStreamReader): """ Class implementing a base class for all of eric5s XML stream readers. @@ -49,7 +50,7 @@ if self.hasError(): msg = QCoreApplication.translate("XMLStreamReaderBase", "<p>XML parse error in file <b>{0}</b>, line {1}, column {2}</p>" - "<p>Error: {3}</p>").format(self.device().fileName(), + "<p>Error: {3}</p>").format(self.device().fileName(), self.lineNumber(), self.columnNumber(), self.errorString()) E5MessageBox.warning(None, QCoreApplication.translate("XMLStreamReaderBase", "XML parse error"), @@ -88,7 +89,7 @@ """ pass - def attribute(self, name, default = ""): + def attribute(self, name, default=""): """ Public method to read the given attribute of the current tag. @@ -141,7 +142,7 @@ val = float(self.readElementText()) elif self.name() == "complex": real, imag = self.readElementText().split() - val = float(real) + float(imag)*1j + val = float(real) + float(imag) * 1j elif self.name() == "string": val = self.readElementText() elif self.name() == "unicode": # backward compatibility to 4.6 @@ -173,7 +174,7 @@ encoding = self.attribute("encoding") if encoding != "base64": self.raiseError(QCoreApplication.translate( - "XMLStreamReaderBase", + "XMLStreamReaderBase", "Pickle data encoding '{0}' is not supported.")\ .format(encoding)) continue
--- a/E5XML/XMLStreamWriterBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/XMLStreamWriterBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from PyQt4.QtCore import QXmlStreamWriter + class XMLStreamWriterBase(QXmlStreamWriter): """ Class implementing a base class for all of eric5s XML stream writers. @@ -25,19 +26,19 @@ QXmlStreamWriter.__init__(self, device) self.basics = { - type(None) : self._write_none, - int : self._write_int, - float : self._write_float, - complex : self._write_complex, - bool : self._write_bool, - str : self._write_string, - bytes : self._write_bytes, - bytearray : self._write_bytearray, - tuple : self._write_tuple, - list : self._write_list, - dict : self._write_dictionary, - set : self._write_set, - frozenset : self._write_frozenset, + type(None): self._write_none, + int: self._write_int, + float: self._write_float, + complex: self._write_complex, + bool: self._write_bool, + str: self._write_string, + bytes: self._write_bytes, + bytearray: self._write_bytearray, + tuple: self._write_tuple, + list: self._write_list, + dict: self._write_dictionary, + set: self._write_set, + frozenset: self._write_frozenset, } self.setAutoFormatting(True)
--- a/E5XML/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/E5XML/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,4 +19,4 @@ <li>Highlighting styles</li> <li>Plugiin repository (handler only)</li> </ul> -""" \ No newline at end of file +"""
--- a/Globals/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Globals/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ recentNameFiles = "Files" recentNameHosts = "Hosts" + def isWindowsPlatform(): """ Function to check, if this is a Windows platform. @@ -28,6 +29,7 @@ """ return sys.platform.startswith("win") + def isMacPlatform(): """ Function to check, if this is a Mac platform. @@ -36,6 +38,7 @@ """ return sys.platform == "darwin" + def isLinuxPlatform(): """ Function to check, if this is a Linux platform.
--- a/Graphics/ApplicationDiagram.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/ApplicationDiagram.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,18 +20,19 @@ import Utilities.ModuleParser import Utilities + class ApplicationDiagram(UMLDialog): """ Class implementing a dialog showing an imports diagram of the application. """ - def __init__(self, project, parent = None, name = None, noModules = False): + def __init__(self, project, parent=None, name=None, noModules=False): """ Constructor @param project reference to the project object @param parent parent widget of the view (QWidget) @param name name of the view widget (string) - @keyparam noModules flag indicating, that no module names should be + @keyparam noModules flag indicating, that no module names should be shown (boolean) """ self.project = project @@ -70,7 +71,7 @@ prog += 1 if module.endswith("__init__.py"): continue - try: + try: mod = Utilities.ModuleParser.readModule(module) except ImportError: continue @@ -220,7 +221,7 @@ """ modules.sort() pm = PackageModel(name, modules) - pw = PackageItem(pm, x, y, noModules = self.noModules, scene = self.scene) + pw = PackageItem(pm, x, y, noModules=self.noModules, scene=self.scene) return pw def __createAssociations(self, shapes): @@ -247,4 +248,4 @@ """ Method to relayout the diagram. """ - self.__buildPackages() \ No newline at end of file + self.__buildPackages()
--- a/Graphics/AssociationItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/AssociationItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,6 +27,7 @@ SouthWest = 8 Center = 9 + class AssociationItem(E5ArrowItem): """ Class implementing a graphics item for an association between two items. @@ -34,7 +35,7 @@ The association is drawn as an arrow starting at the first items and ending at the second. """ - def __init__(self, itemA, itemB, type = Normal, parent = None): + def __init__(self, itemA, itemB, type=Normal, parent=None): """ Constructor @@ -58,7 +59,7 @@ arrowType = WideArrow arrowFilled = False - E5ArrowItem.__init__(self, QPointF(0, 0), QPointF(100, 100), + E5ArrowItem.__init__(self, QPointF(0, 0), QPointF(100, 100), arrowFilled, arrowType, parent) self.setFlag(QGraphicsItem.ItemIsMovable, False) @@ -141,7 +142,7 @@ Each diagonal is defined by two corners of the bounding rectangle To calculate the start point we have to find out in which - region (defined by itemA's diagonals) is itemB's TopLeft corner + region (defined by itemA's diagonals) is itemB's TopLeft corner (lets call it region M). After that the start point will be the middle point of rectangle's side contained in region M. @@ -197,7 +198,7 @@ def __findPointRegion(self, rect, posX, posY): """ - Private method to find out, which region of rectangle rect contains the point + Private method to find out, which region of rectangle rect contains the point (PosX, PosY) and returns the region number. @param rect rectangle to calculate the region for (QRectF)
--- a/Graphics/ClassItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/ClassItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .UMLItem import UMLItem + class ClassModel(object): """ Class implementing the class model. """ - def __init__(self, name, methods = [], attributes = []): + def __init__(self, name, methods=[], attributes=[]): """ Constructor @@ -70,12 +71,13 @@ """ return self.name + class ClassItem(UMLItem): """ Class implementing an UML like class item. """ - def __init__(self, model = None, external = False, x = 0, y = 0, - rounded = False, noAttrs = False, parent = None, scene = None): + def __init__(self, model=None, external=False, x=0, y=0, + rounded=False, noAttrs=False, parent=None, scene=None): """ Constructor @@ -175,7 +177,7 @@ self.__createTexts() self.__calculateSize() - def paint(self, painter, option, widget = None): + def paint(self, painter, option, widget=None): """ Public method to paint the item in local coordinates.
--- a/Graphics/GraphicsUtilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/GraphicsUtilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,12 +7,14 @@ Module implementing some graphical utility functions. """ + class RecursionError(OverflowError, ValueError): """ Unable to calculate result because of recursive structure. """ -def sort(nodes, routes, noRecursion = False): + +def sort(nodes, routes, noRecursion=False): """ Function to sort widgets topographically. @@ -42,7 +44,7 @@ stage.append(nodes[0]) taken.extend(stage) - nodes = list(filter(lambda x, l = stage: x not in l, nodes)) + nodes = list(filter(lambda x, l=stage: x not in l, nodes)) while nodes: previousStageChildren = [] nodelen = len(nodes) @@ -73,7 +75,7 @@ stages.append(stage) taken.extend(stage) - nodes = list(filter(lambda x, l = stage: x not in l, nodes)) + nodes = list(filter(lambda x, l=stage: x not in l, nodes)) if nodelen == len(nodes): if noRecursion: raise RecursionError(nodes) @@ -83,6 +85,7 @@ return stages + def _buildChildrenLists(routes): """ Function to build up parent - child relationships.
--- a/Graphics/ImportsDiagram.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/ImportsDiagram.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ import Utilities import Preferences + class ImportsDiagram(UMLDialog): """ Class implementing a dialog showing an imports diagram of a package. @@ -28,11 +29,11 @@ Note: Only package internal imports are show in order to maintain some readability. """ - def __init__(self, package, parent = None, name = None, showExternalImports = False): + def __init__(self, package, parent=None, name=None, showExternalImports=False): """ Constructor - @param package name of a python package to show the import + @param package name of a python package to show the import relationships (string) @param parent parent widget of the view (QWidget) @param name name of the view widget (string) @@ -82,8 +83,8 @@ progress.setValue(prog) QApplication.processEvents() prog = prog + 1 - try: - mod = Utilities.ModuleParser.readModule(module, caching = False) + try: + mod = Utilities.ModuleParser.readModule(module, caching=False) except ImportError: continue else: @@ -211,7 +212,7 @@ """ classes.sort() impM = ModuleModel(name, classes) - impW = ModuleItem(impM, x, y, scene = self.scene) + impW = ModuleItem(impM, x, y, scene=self.scene) return impW def __createAssociations(self, shapes): @@ -238,4 +239,4 @@ """ Method to relayout the diagram. """ - self.__buildImports() \ No newline at end of file + self.__buildImports()
--- a/Graphics/ModuleItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/ModuleItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .UMLItem import UMLItem + class ModuleModel(object): """ Class implementing the module model. @@ -50,12 +51,13 @@ """ return self.name + class ModuleItem(UMLItem): """ Class implementing a module item. """ - def __init__(self, model = None, x = 0, y = 0, rounded = False, - parent = None, scene = None): + def __init__(self, model=None, x=0, y=0, rounded=False, + parent=None, scene=None): """ Constructor @@ -132,7 +134,7 @@ self.__createTexts() self.__calculateSize() - def paint(self, painter, option, widget = None): + def paint(self, painter, option, widget=None): """ Public method to paint the item in local coordinates.
--- a/Graphics/PackageDiagram.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/PackageDiagram.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,11 +23,12 @@ import Utilities import Preferences + class PackageDiagram(UMLDialog): """ Class implementing a dialog showing a UML like class diagram of a package. """ - def __init__(self, package, parent = None, name = None, noAttrs = False): + def __init__(self, package, parent=None, name=None, noAttrs=False): """ Constructor @@ -84,7 +85,7 @@ progress.setValue(prog) QApplication.processEvents() prog += 1 - try: + try: mod = Utilities.ModuleParser.readModule(module) except ImportError: continue @@ -160,11 +161,11 @@ else: if className in module.classes: # this is a local class (defined in this module) - self.__addLocalClass(className, module.classes[className], + self.__addLocalClass(className, module.classes[className], 0, 0) elif className in module.modules: # this is a local module (defined in this module) - self.__addLocalClass(className, module.modules[className], + self.__addLocalClass(className, module.modules[className], 0, 0, True) else: self.__addExternalClass(className, 0, 0) @@ -182,7 +183,7 @@ self.__arrangeClasses(nodes, routes[:]) self.__createAssociations(routes) - def __arrangeClasses(self, nodes, routes, whiteSpaceFactor = 1.2): + def __arrangeClasses(self, nodes, routes, whiteSpaceFactor=1.2): """ Private method to arrange the shapes on the canvas. @@ -248,7 +249,7 @@ x = x + rect.width() + whiteSpace y = y + currentHeight + verticalWhiteSpace - def __addLocalClass(self, className, _class, x, y, isRbModule = False): + def __addLocalClass(self, className, _class, x, y, isRbModule=False): """ Private method to add a class defined in the module. @@ -264,7 +265,7 @@ if isRbModule: name = "{0} (Module)".format(name) cl = ClassModel(name, meths[:], attrs[:]) - cw = ClassItem(cl, False, x, y, noAttrs = self.noAttrs, scene = self.scene) + cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene) self.allClasses[className] = cw def __addExternalClass(self, _class, x, y): @@ -279,7 +280,7 @@ @param y y-coordinate (float) """ cl = ClassModel(_class) - cw = ClassItem(cl, True, x, y, noAttrs = self.noAttrs, scene = self.scene) + cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene) self.allClasses[_class] = cw def __createAssociations(self, routes): @@ -308,4 +309,4 @@ Method to relayout the diagram. """ self.allClasses.clear() - self.__buildClasses() \ No newline at end of file + self.__buildClasses()
--- a/Graphics/PackageItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/PackageItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .UMLItem import UMLItem + class PackageModel(object): """ Class implementing the package model. """ - def __init__(self, name, moduleslist = []): + def __init__(self, name, moduleslist=[]): """ Constructor @@ -50,12 +51,13 @@ """ return self.name + class PackageItem(UMLItem): """ Class implementing a package item. """ - def __init__(self, model = None, x = 0, y = 0, rounded = False, - noModules = False, parent = None, scene = None): + def __init__(self, model=None, x=0, y=0, rounded=False, + noModules=False, parent=None, scene=None): """ Constructor @@ -63,7 +65,7 @@ @param x x-coordinate (integer) @param y y-coordinate (integer) @param rounded flag indicating a rounded corner (boolean) - @keyparam noModules flag indicating, that no module names should be + @keyparam noModules flag indicating, that no module names should be shown (boolean) @keyparam parent reference to the parent object (QGraphicsItem) @keyparam scene reference to the scene object (QGraphicsScene) @@ -148,7 +150,7 @@ self.__createTexts() self.__calculateSize() - def paint(self, painter, option, widget = None): + def paint(self, painter, option, widget=None): """ Public method to paint the item in local coordinates.
--- a/Graphics/PixmapDiagram.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/PixmapDiagram.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ import Preferences + class PixmapDiagram(QMainWindow): """ Class implementing a dialog showing a pixmap. """ - def __init__(self, pixmap, parent = None, name = None): + def __init__(self, pixmap, parent=None, name=None): """ Constructor @@ -194,7 +195,7 @@ @param factor factor to adjust by (float) """ scrollBar.setValue(int(factor * scrollBar.value() - + ((factor - 1) * scrollBar.pageStep()/2))) + + ((factor - 1) * scrollBar.pageStep() / 2))) def __doZoom(self, factor): """ @@ -241,7 +242,7 @@ """ Private slot called to print the diagram. """ - printer = QPrinter(mode = QPrinter.ScreenResolution) + printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) @@ -263,7 +264,7 @@ """ from PyQt4.QtGui import QPrintPreviewDialog - printer = QPrinter(mode = QPrinter.ScreenResolution) + printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) @@ -312,7 +313,7 @@ tc = QColor(50, 50, 50) painter.setPen(tc) painter.drawRect(marginX, marginY, width, height) - painter.drawLine(marginX, marginY + height + 2, + painter.drawLine(marginX, marginY + height + 2, marginX + width, marginY + height + 2) painter.setFont(font) painter.drawText(marginX, marginY + height + 4, width, @@ -325,4 +326,4 @@ painter.setViewport(marginX + 5, marginY + 5, size.width(), size.height()) painter.setWindow(self.pixmapLabel.pixmap().rect()) painter.drawPixmap(0, 0, self.pixmapLabel.pixmap()) - painter.end() \ No newline at end of file + painter.end()
--- a/Graphics/SvgDiagram.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/SvgDiagram.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Preferences + class SvgDiagram(QMainWindow): """ Class implementing a dialog showing a SVG graphic. """ - def __init__(self, svgFile, parent = None, name = None): + def __init__(self, svgFile, parent=None, name=None): """ Constructor @@ -166,7 +167,7 @@ @param factor factor to adjust by (float) """ scrollBar.setValue(int(factor * scrollBar.value() - + ((factor - 1) * scrollBar.pageStep()/2))) + + ((factor - 1) * scrollBar.pageStep() / 2))) def __doZoom(self, factor): """ @@ -213,7 +214,7 @@ """ Private slot called to print the diagram. """ - printer = QPrinter(mode = QPrinter.ScreenResolution) + printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) @@ -235,7 +236,7 @@ """ from PyQt4.QtGui import QPrintPreviewDialog - printer = QPrinter(mode = QPrinter.ScreenResolution) + printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) @@ -284,7 +285,7 @@ tc = QColor(50, 50, 50) painter.setPen(tc) painter.drawRect(marginX, marginY, width, height) - painter.drawLine(marginX, marginY + height + 2, + painter.drawLine(marginX, marginY + height + 2, marginX + width, marginY + height + 2) painter.setFont(font) painter.drawText(marginX, marginY + height + 4, width,
--- a/Graphics/UMLClassDiagram.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/UMLClassDiagram.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,11 +19,12 @@ from .AssociationItem import AssociationItem, Generalisation from . import GraphicsUtilities + class UMLClassDiagram(UMLDialog): """ Class implementing a dialog showing a UML like class diagram. """ - def __init__(self, file, parent = None, name = None, noAttrs = False): + def __init__(self, file, parent=None, name=None, noAttrs=False): """ Constructor @@ -131,7 +132,7 @@ self.trUtf8("The module <b>'{0}'</b> does not contain any classes.")\ .format(self.file)) - def __arrangeClasses(self, nodes, routes, whiteSpaceFactor = 1.2): + def __arrangeClasses(self, nodes, routes, whiteSpaceFactor=1.2): """ Private method to arrange the shapes on the canvas. @@ -197,7 +198,7 @@ x = x + rect.width() + whiteSpace y = y + currentHeight + verticalWhiteSpace - def __addLocalClass(self, className, _class, x, y, isRbModule = False): + def __addLocalClass(self, className, _class, x, y, isRbModule=False): """ Private method to add a class defined in the module. @@ -213,7 +214,7 @@ if isRbModule: name = "{0} (Module)".format(name) cl = ClassModel(name, meths[:], attrs[:]) - cw = ClassItem(cl, False, x, y, noAttrs = self.noAttrs, scene = self.scene) + cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene) self.allClasses[className] = cw if _class.name not in self.allModules[self.file]: self.allModules[self.file].append(_class.name) @@ -230,7 +231,7 @@ @param y y-coordinate (float) """ cl = ClassModel(_class) - cw = ClassItem(cl, True, x, y, noAttrs = self.noAttrs, scene = self.scene) + cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene) self.allClasses[_class] = cw if _class not in self.allModules[self.file]: self.allModules[self.file].append(_class) @@ -262,4 +263,4 @@ """ self.allClasses.clear() self.allModules.clear() - self.__buildClasses() \ No newline at end of file + self.__buildClasses()
--- a/Graphics/UMLDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/UMLDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ import UI.Config import UI.PixmapCache + class UMLDialog(QMainWindow): """ Class implementing a dialog showing UML like diagrams. """ - def __init__(self, diagramName = "Unnamed", parent = None, name = None): + def __init__(self, diagramName="Unnamed", parent=None, name=None): """ Constructor @@ -50,4 +51,4 @@ self.addToolBar(Qt.TopToolBarArea, self.windowToolBar) self.addToolBar(Qt.TopToolBarArea, self.umlToolBar) - self.setCentralWidget(self.umlView) \ No newline at end of file + self.setCentralWidget(self.umlView)
--- a/Graphics/UMLGraphicsView.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/UMLGraphicsView.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ import Preferences + class UMLGraphicsView(E5GraphicsView): """ Class implementing a specialized E5GraphicsView for our diagrams. @@ -32,7 +33,7 @@ """ relayout = pyqtSignal() - def __init__(self, scene, diagramName = "Unnamed", parent = None, name = None): + def __init__(self, scene, diagramName="Unnamed", parent=None, name=None): """ Constructor @@ -103,25 +104,25 @@ self.incWidthAct = \ QAction(UI.PixmapCache.getIcon("sceneWidthInc.png"), - self.trUtf8("Increase width by {0} points").format(self.deltaSize), + self.trUtf8("Increase width by {0} points").format(self.deltaSize), self) self.incWidthAct.triggered[()].connect(self.__incWidth) self.incHeightAct = \ QAction(UI.PixmapCache.getIcon("sceneHeightInc.png"), - self.trUtf8("Increase height by {0} points").format(self.deltaSize), + self.trUtf8("Increase height by {0} points").format(self.deltaSize), self) self.incHeightAct.triggered[()].connect(self.__incHeight) self.decWidthAct = \ QAction(UI.PixmapCache.getIcon("sceneWidthDec.png"), - self.trUtf8("Decrease width by {0} points").format(self.deltaSize), + self.trUtf8("Decrease width by {0} points").format(self.deltaSize), self) self.decWidthAct.triggered[()].connect(self.__decWidth) self.decHeightAct = \ QAction(UI.PixmapCache.getIcon("sceneHeightDec.png"), - self.trUtf8("Decrease height by {0} points").format(self.deltaSize), + self.trUtf8("Decrease height by {0} points").format(self.deltaSize), self) self.decHeightAct.triggered[()].connect(self.__decHeight) @@ -136,37 +137,37 @@ self.relayoutAct.triggered[()].connect(self.__relayout) self.alignLeftAct = \ - QAction(UI.PixmapCache.getIcon("shapesAlignLeft.png"), + QAction(UI.PixmapCache.getIcon("shapesAlignLeft.png"), self.trUtf8("Align Left"), self) self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft) self.alignLeftAct.triggered[()].connect(self.alignMapper.map) self.alignHCenterAct = \ - QAction(UI.PixmapCache.getIcon("shapesAlignHCenter.png"), + QAction(UI.PixmapCache.getIcon("shapesAlignHCenter.png"), self.trUtf8("Align Center Horizontal"), self) self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter) self.alignHCenterAct.triggered[()].connect(self.alignMapper.map) self.alignRightAct = \ - QAction(UI.PixmapCache.getIcon("shapesAlignRight.png"), + QAction(UI.PixmapCache.getIcon("shapesAlignRight.png"), self.trUtf8("Align Right"), self) self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight) self.alignRightAct.triggered[()].connect(self.alignMapper.map) self.alignTopAct = \ - QAction(UI.PixmapCache.getIcon("shapesAlignTop.png"), + QAction(UI.PixmapCache.getIcon("shapesAlignTop.png"), self.trUtf8("Align Top"), self) self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop) self.alignTopAct.triggered[()].connect(self.alignMapper.map) self.alignVCenterAct = \ - QAction(UI.PixmapCache.getIcon("shapesAlignVCenter.png"), + QAction(UI.PixmapCache.getIcon("shapesAlignVCenter.png"), self.trUtf8("Align Center Vertical"), self) self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter) self.alignVCenterAct.triggered[()].connect(self.alignMapper.map) self.alignBottomAct = \ - QAction(UI.PixmapCache.getIcon("shapesAlignBottom.png"), + QAction(UI.PixmapCache.getIcon("shapesAlignBottom.png"), self.trUtf8("Align Bottom"), self) self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom) self.alignBottomAct.triggered[()].connect(self.alignMapper.map) @@ -341,7 +342,7 @@ self.trUtf8("Save Diagram"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return @@ -366,7 +367,7 @@ """ Private slot called to print the diagram. """ - printer = QPrinter(mode = QPrinter.ScreenResolution) + printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) @@ -388,7 +389,7 @@ """ from PyQt4.QtGui import QPrintPreviewDialog - printer = QPrinter(mode = QPrinter.ScreenResolution) + printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color)
--- a/Graphics/UMLItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/UMLItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ import Preferences + class UMLItem(QGraphicsRectItem): """ Class implementing the UMLItem base class. """ - def __init__(self, x = 0, y = 0, rounded = False, parent = None): + def __init__(self, x=0, y=0, rounded=False, parent=None): """ Constructor @@ -125,7 +126,7 @@ self.shouldAdjustAssociations = True return QGraphicsItem.itemChange(self, change, value) - def paint(self, painter, option, widget = None): + def paint(self, painter, option, widget=None): """ Public method to paint the item in local coordinates.
--- a/Graphics/UMLSceneSizeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/UMLSceneSizeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,7 +16,7 @@ """ Class implementing a dialog to set the scene sizes. """ - def __init__(self, w, h, minW, minH, parent = None, name = None): + def __init__(self, w, h, minW, minH, parent=None, name=None): """ Constructor
--- a/Graphics/ZoomDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Graphics/ZoomDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_ZoomDialog import Ui_ZoomDialog + class ZoomDialog(QDialog, Ui_ZoomDialog): """ Class implementing a zoom dialog for a graphics canvas. """ - def __init__(self, zoom, parent = None, name = None): + def __init__(self, zoom, parent=None, name=None): """ Constructor
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import Helpviewer.HelpWindow from Helpviewer.Network.SchemeAccessHandler import SchemeAccessHandler + class AdBlockAccessHandler(SchemeAccessHandler): """ Class implementing a scheme access handler for AdBlock URLs. """ - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request. @@ -36,7 +37,7 @@ if request.url().path() != "subscribe": return None - subscription = AdBlockSubscription(request.url(), + subscription = AdBlockSubscription(request.url(), Helpviewer.HelpWindow.HelpWindow.adblockManager()) res = E5MessageBox.yesNo(None,
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtCore import * from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager + class AdBlockBlockedNetworkReply(QNetworkReply): """ Class implementing a QNetworkReply subclass reporting a blocked request. """ - def __init__(self, request, rule, parent = None): + def __init__(self, request, rule, parent=None): """ Constructor @@ -26,7 +27,7 @@ self.setOperation(QNetworkAccessManager.GetOperation) self.setRequest(request) self.setUrl(request.url()) - self.setError(QNetworkReply.ContentAccessDenied, + self.setError(QNetworkReply.ContentAccessDenied, self.trUtf8("Blocked by AdBlock rule: {0}.").format(rule.filter())) QTimer.singleShot(0, self.__fireSignals)
--- a/Helpviewer/AdBlock/AdBlockDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,11 +21,12 @@ import UI.PixmapCache + class AdBlockDialog(QDialog, Ui_AdBlockDialog): """ Class implementing the AdBlock configuration dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor """ @@ -80,14 +81,14 @@ menu.addAction(self.trUtf8("Add Custom Rule"), self.addCustomRule) - menu.addAction(self.trUtf8("Learn more about writing rules..."), + menu.addAction(self.trUtf8("Learn more about writing rules..."), self.__learnAboutWritingFilters) menu.addSeparator() idx = self.__proxyModel.mapToSource(self.subscriptionsTree.currentIndex()) - act = menu.addAction(self.trUtf8("Update Subscription"), + act = menu.addAction(self.trUtf8("Update Subscription"), self.__updateSubscription) act.setEnabled(idx.isValid()) @@ -95,11 +96,11 @@ menu.addSeparator() - act = menu.addAction(self.trUtf8("Remove Subscription"), + act = menu.addAction(self.trUtf8("Remove Subscription"), self.__removeSubscription) act.setEnabled(idx.isValid()) - def addCustomRule(self, rule = ""): + def addCustomRule(self, rule=""): """ Public slot to add a custom AdBlock rule.
--- a/Helpviewer/AdBlock/AdBlockManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import Utilities import Preferences + class AdBlockManager(QObject): """ Class implementing the AdBlock manager. @@ -28,7 +29,7 @@ """ rulesChanged = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/AdBlock/AdBlockModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ import Helpviewer.HelpWindow + class AdBlockModel(QAbstractItemModel): """ Class implementing a model for the AdBlock dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -73,7 +74,7 @@ except ValueError: return QModelIndex() - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -87,7 +88,7 @@ return self.trUtf8("Rule") return QAbstractItemModel.headerData(self, section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -124,7 +125,7 @@ return None - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -136,7 +137,7 @@ else: return 1 - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -158,7 +159,7 @@ return 0 - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to get a model index for a node cell. @@ -177,7 +178,7 @@ parentNode = self.subscription(parent) return self.createIndex(row, column, parentNode) - def parent(self, index = QModelIndex()): + def parent(self, index=QModelIndex()): """ Public method to get the index of the parent node. @@ -217,7 +218,7 @@ return flags - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove bookmarks from the model. @@ -250,7 +251,7 @@ return False - def setData(self, index, value, role = Qt.EditRole): + def setData(self, index, value, role=Qt.EditRole): """ Public method to set the data of a node cell. @@ -303,7 +304,7 @@ self.__manager.rulesChanged.connect(self.__rulesChanged) return changed - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check, if a parent node has some children.
--- a/Helpviewer/AdBlock/AdBlockNetwork.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockNetwork.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ from .AdBlockBlockedNetworkReply import AdBlockBlockedNetworkReply + class AdBlockNetwork(QObject): """ Class implementing a network block.
--- a/Helpviewer/AdBlock/AdBlockPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Helpviewer.HelpWindow + class AdBlockPage(QObject): """ Class to apply AdBlock rules to a web page.
--- a/Helpviewer/AdBlock/AdBlockRule.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockRule.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from PyQt4.QtCore import * + class AdBlockRule(object): """ Class implementing the AdBlock rule. """ - def __init__(self, filter = ""): + def __init__(self, filter=""): """ Constructor """ @@ -178,8 +179,8 @@ pattern = re.sub(r"(\*)$", "", pattern) # remove trailing wildcards pattern = re.sub(r"(\W)", "", pattern) # escape special symbols pattern = re.sub(r"^\\\|\\\|", - r"^[\w\-]+:\/+(?!\/)(?:[^\/]+\.)?", pattern) # process extended anchor at expression start - pattern = re.sub(r"\\\^", + r"^[\w\-]+:\/+(?!\/)(?:[^\/]+\.)?", pattern) # process extended anchor at expression start + pattern = re.sub(r"\\\^", r"(?:[^\w\d\-.%]|$)", pattern) # process separator placeholders pattern = re.sub(r"^\\\|", "^", pattern) # process anchor at expression start pattern = re.sub(r"\\\|$", "$", pattern) # process anchor at expression end @@ -197,5 +198,5 @@ if isRegExp: self.__regExp = QRegExp(pattern, Qt.CaseInsensitive, QRegExp.RegExp2) else: - self.__regExp = QRegExp(self.__convertPatternToRegExp(pattern), + self.__regExp = QRegExp(self.__convertPatternToRegExp(pattern), Qt.CaseInsensitive, QRegExp.RegExp2)
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import Utilities + class AdBlockSubscription(QObject): """ Class implementing the AdBlock subscription. @@ -30,7 +31,7 @@ changed = pyqtSignal() rulesChanged = pyqtSignal() - def __init__(self, url, parent = None): + def __init__(self, url, parent=None): """ Constructor @@ -96,7 +97,7 @@ if not self.__enabled: queryItems.append(("enabled", "false")) if self.__lastUpdate.isValid(): - queryItems.append(("lastUpdate", + queryItems.append(("lastUpdate", self.__lastUpdate.toString(Qt.ISODate))) url.setQueryItems(queryItems) return url
--- a/Helpviewer/Bookmarks/AddBookmarkDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/AddBookmarkDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from .Ui_AddBookmarkDialog import Ui_AddBookmarkDialog + class AddBookmarkProxyModel(QSortFilterProxyModel): """ Class implementing a proxy model used by the AddBookmarkDialog dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -58,7 +59,7 @@ """ return sourceColumn == 0 - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check, if a parent node has some children. @@ -68,16 +69,17 @@ sindex = self.mapToSource(parent) return self.sourceModel().hasChildren(sindex) + class AddBookmarkDialog(QDialog, Ui_AddBookmarkDialog): """ Class implementing a dialog to add a bookmark or a bookmark folder. """ - def __init__(self, parent = None, bookmarksManager = None): + def __init__(self, parent=None, bookmarksManager=None): """ Constructor @param parent reference to the parent widget (QWidget) - @param bookmarksManager reference to the bookmarks manager + @param bookmarksManager reference to the bookmarks manager object (BookmarksManager) """ QDialog.__init__(self, parent)
--- a/Helpviewer/Bookmarks/BookmarkNode.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarkNode.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,17 +9,18 @@ from PyQt4.QtCore import * + class BookmarkNode(object): """ Class implementing the bookmark node type. """ # possible bookmark node types - Root = 0 - Folder = 1 - Bookmark = 2 + Root = 0 + Folder = 1 + Bookmark = 2 Separator = 3 - def __init__(self, type_ = Root, parent = None): + def __init__(self, type_=Root, parent=None): """ Constructor @@ -70,7 +71,7 @@ """ return self._parent - def add(self, child, offset = -1): + def add(self, child, offset=-1): """ Public method to add/insert a child node.
--- a/Helpviewer/Bookmarks/BookmarksDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import UI.PixmapCache + class BookmarksDialog(QDialog, Ui_BookmarksDialog): """ Class implementing a dialog to manage bookmarks. @@ -30,7 +31,7 @@ openUrl = pyqtSignal(QUrl, str) newUrl = pyqtSignal(QUrl, str) - def __init__(self, parent = None, manager = None): + def __init__(self, parent=None, manager=None): """ Constructor @@ -186,11 +187,11 @@ return if newTab: self.newUrl.emit( - idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), + idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), idx.sibling(idx.row(), 0).data(Qt.DisplayRole)) else: self.openUrl.emit( - idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), + idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), idx.sibling(idx.row(), 0).data(Qt.DisplayRole)) def __editName(self):
--- a/Helpviewer/Bookmarks/BookmarksManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,11 +25,11 @@ import Utilities import Preferences -BOOKMARKBAR = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Bar") +BOOKMARKBAR = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Bar") BOOKMARKMENU = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Menu") -StartRoot = 0 -StartMenu = 1 +StartRoot = 0 +StartMenu = 1 StartToolBar = 2 ########################################################################################## @@ -87,6 +87,7 @@ ########################################################################################## + class BookmarksManager(QObject): """ Class implementing the bookmarks manager. @@ -100,7 +101,7 @@ entryRemoved = pyqtSignal(BookmarkNode, int, BookmarkNode) entryChanged = pyqtSignal(BookmarkNode) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -162,8 +163,8 @@ self.trUtf8("Loading Bookmarks"), self.trUtf8("""Error when loading bookmarks on line {0}, column {1}:\n""" """{2}""")\ - .format(reader.lineNumber(), - reader.columnNumber(), + .format(reader.lineNumber(), + reader.columnNumber(), reader.errorString())) others = [] @@ -228,7 +229,7 @@ self.__menu.title = self.trUtf8(BOOKMARKMENU) self.__toolbar.title = self.trUtf8(BOOKMARKBAR) - def addBookmark(self, parent, node, row = -1): + def addBookmark(self, parent, node, row=-1): """ Public method to add a bookmark. @@ -330,7 +331,7 @@ Public method to import bookmarks. """ supportedFormats = [ - self.trUtf8("XBEL bookmarks") + " (*.xbel *.xml)", + self.trUtf8("XBEL bookmarks") + " (*.xbel *.xml)", self.trUtf8("HTML Netscape bookmarks") + " (*.html)" ] @@ -368,8 +369,8 @@ self.trUtf8("Import Bookmarks"), self.trUtf8("""Error when importing bookmarks on""" """ line {0}, column [1}:\n{2}""")\ - .format(reader.lineNumber(), - reader.columnNumber(), + .format(reader.lineNumber(), + reader.columnNumber(), reader.errorString())) return @@ -438,12 +439,12 @@ for node in nodes: self.bookmarksModel().entryChanged(node) - def bookmarkForUrl(self, url, start = StartRoot): + def bookmarkForUrl(self, url, start=StartRoot): """ Public method to get a bookmark node for a given URL. @param url URL of the bookmark to search for (QUrl or string) - @keyparam start indicator for the start of the search + @keyparam start indicator for the start of the search (StartRoot, StartMenu, StartToolBar) @return bookmark node for the given url (BookmarkNode) """ @@ -480,12 +481,12 @@ return bm return None - def bookmarksForUrl(self, url, start = StartRoot): + def bookmarksForUrl(self, url, start=StartRoot): """ Public method to get a list of bookmark nodes for a given URL. @param url URL of the bookmarks to search for (QUrl or string) - @keyparam start indicator for the start of the search + @keyparam start indicator for the start of the search (StartRoot, StartMenu, StartToolBar) @return list of bookmark nodes for the given url (list of BookmarkNode) """ @@ -520,6 +521,7 @@ bm.append(node) return bm + class RemoveBookmarksCommand(QUndoCommand): """ Class implementing the Remove undo command. @@ -532,7 +534,7 @@ @param parent reference to the parent node (BookmarkNode) @param row row number of bookmark (integer) """ - QUndoCommand.__init__(self, + QUndoCommand.__init__(self, QApplication.translate("BookmarksManager", "Remove Bookmark")) self._row = row @@ -557,6 +559,7 @@ self._parent.remove(self._node) self._bookmarksManager.entryRemoved.emit(self._parent, self._row, self._node) + class InsertBookmarksCommand(RemoveBookmarksCommand): """ Class implementing the Insert undo command. @@ -586,6 +589,7 @@ """ RemoveBookmarksCommand.undo(self) + class ChangeBookmarkCommand(QUndoCommand): """ Class implementing the Insert undo command. @@ -597,7 +601,7 @@ @param bookmarksManager reference to the bookmarks manager (BookmarksManager) @param node reference to the node to be changed (BookmarkNode) @param newValue new value to be set (string) - @param title flag indicating a change of the title (True) or + @param title flag indicating a change of the title (True) or the URL (False) (boolean) """ QUndoCommand.__init__(self)
--- a/Helpviewer/Bookmarks/BookmarksMenu.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ from .BookmarksModel import BookmarksModel from .BookmarkNode import BookmarkNode + class BookmarksMenu(E5ModelMenu): """ Class implementing the bookmarks menu base class. @@ -27,7 +28,7 @@ openUrl = pyqtSignal(QUrl, str) newUrl = pyqtSignal(QUrl, str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -61,11 +62,11 @@ """ if self._keyboardModifiers & Qt.ControlModifier: self.newUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) else: self.openUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) self.resetFlags() @@ -114,11 +115,11 @@ if i == 0: self.openUrl.emit( - child.data(BookmarksModel.UrlRole), + child.data(BookmarksModel.UrlRole), child.data(Qt.DisplayRole)) else: self.newUrl.emit( - child.data(BookmarksModel.UrlRole), + child.data(BookmarksModel.UrlRole), child.data(Qt.DisplayRole)) def __contextMenuRequested(self, pos): @@ -136,7 +137,7 @@ menuAction = menu.addAction(self.trUtf8("&Open"), self.__openBookmark) menuAction.setData(v) - menuAction = menu.addAction(self.trUtf8("Open in New &Tab\tCtrl+LMB"), + menuAction = menu.addAction(self.trUtf8("Open in New &Tab\tCtrl+LMB"), self.__openBookmarkInNewTab) menuAction.setData(v) @@ -160,7 +161,7 @@ idx = self.index(self.sender()) self.openUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) def __openBookmarkInNewTab(self): @@ -170,7 +171,7 @@ idx = self.index(self.sender()) self.newUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) def __removeBookmark(self): @@ -182,11 +183,12 @@ ########################################################################################## + class BookmarksMenuBarMenu(BookmarksMenu): """ Class implementing a dynamically populated menu for bookmarks. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/Bookmarks/BookmarksModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarksModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,18 +17,19 @@ import UI.PixmapCache + class BookmarksModel(QAbstractItemModel): """ Class implementing the bookmark model. """ - TypeRole = Qt.UserRole + 1 - UrlRole = Qt.UserRole + 2 + TypeRole = Qt.UserRole + 1 + UrlRole = Qt.UserRole + 2 UrlStringRole = Qt.UserRole + 3 SeparatorRole = Qt.UserRole + 4 MIMETYPE = "application/bookmarks.xbel" - def __init__(self, manager, parent = None): + def __init__(self, manager, parent=None): """ Constructor @@ -45,8 +46,8 @@ manager.entryChanged.connect(self.entryChanged) self.__headers = [ - self.trUtf8("Title"), - self.trUtf8("Address"), + self.trUtf8("Title"), + self.trUtf8("Address"), ] def bookmarksManager(self): @@ -109,7 +110,7 @@ idx = self.nodeIndex(node) self.dataChanged.emit(idx, idx) - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove bookmarks from the model. @@ -135,7 +136,7 @@ return True - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -151,7 +152,7 @@ pass return QAbstractItemModel.headerData(self, section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -196,7 +197,7 @@ return None - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -208,7 +209,7 @@ else: return len(self.__headers) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -224,7 +225,7 @@ itm = parent.internalPointer() return len(itm.children()) - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to get a model index for a node cell. @@ -240,7 +241,7 @@ parentNode = self.node(parent) return self.createIndex(row, column, parentNode.children()[row]) - def parent(self, index = QModelIndex()): + def parent(self, index=QModelIndex()): """ Public method to get the index of the parent node. @@ -264,7 +265,7 @@ parentRow = grandParentNode.children().index(parentNode) return self.createIndex(parentRow, 0, parentNode) - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check, if a parent node has some children. @@ -409,7 +410,7 @@ return True - def setData(self, index, value, role = Qt.EditRole): + def setData(self, index, value, role=Qt.EditRole): """ Public method to set the data of a node cell.
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarksToolBar.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ from .BookmarksMenu import BookmarksMenu from .AddBookmarkDialog import AddBookmarkDialog + class BookmarksToolBar(E5ModelToolBar): """ Class implementing a tool bar showing bookmarks. @@ -28,14 +29,14 @@ openUrl = pyqtSignal(QUrl, str) newUrl = pyqtSignal(QUrl, str) - def __init__(self, model, parent = None): + def __init__(self, model, parent=None): """ Constructor @param model reference to the bookmarks model (BookmarksModel) @param parent reference to the parent widget (QWidget) """ - E5ModelToolBar.__init__(self, + E5ModelToolBar.__init__(self, QApplication.translate("BookmarksToolBar", "Bookmarks"), parent) self.__bookmarksModel = model @@ -69,7 +70,7 @@ menuAction = menu.addAction(self.trUtf8("&Open"), self.__openBookmark) menuAction.setData(v) - menuAction = menu.addAction(self.trUtf8("Open in New &Tab\tCtrl+LMB"), + menuAction = menu.addAction(self.trUtf8("Open in New &Tab\tCtrl+LMB"), self.__openBookmarkInNewTab) menuAction.setData(v) @@ -95,11 +96,11 @@ if self._keyboardModifiers & Qt.ControlModifier: self.newUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) else: self.openUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) def __openToolBarBookmark(self): @@ -110,11 +111,11 @@ if self._keyboardModifiers & Qt.ControlModifier: self.newUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) else: self.openUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) self.resetFlags() @@ -125,7 +126,7 @@ idx = self.index(self.sender()) self.openUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) def __openBookmarkInNewTab(self): @@ -135,7 +136,7 @@ idx = self.index(self.sender()) self.newUrl.emit( - idx.data(BookmarksModel.UrlRole), + idx.data(BookmarksModel.UrlRole), idx.data(Qt.DisplayRole)) def __removeBookmark(self):
--- a/Helpviewer/Bookmarks/XbelReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/XbelReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ from .BookmarkNode import BookmarkNode + class XmlEntityResolver(QXmlStreamEntityResolver): """ Class implementing an XML entity resolver for bookmark files. @@ -26,6 +27,7 @@ return " " return "" + class XbelReader(QXmlStreamReader): """ Class implementing a reader object for XBEL bookmark files.
--- a/Helpviewer/Bookmarks/XbelWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Bookmarks/XbelWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ from .BookmarkNode import BookmarkNode + class XbelWriter(QXmlStreamWriter): """ Class implementing a writer object to generate XBEL bookmark files.
--- a/Helpviewer/CookieJar/CookieDetailsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookieDetailsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_CookieDetailsDialog import Ui_CookieDetailsDialog + class CookieDetailsDialog(QDialog, Ui_CookieDetailsDialog): """ Class implementing a dialog showing the cookie data. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookieExceptionsModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .CookieJar import CookieJar + class CookieExceptionsModel(QAbstractTableModel): """ Class implementing the cookie exceptions model. """ - def __init__(self, cookieJar, parent = None): + def __init__(self, cookieJar, parent=None): """ Constructor @@ -31,8 +32,8 @@ self.__sessionCookies = self.__cookieJar.allowForSessionCookies() self.__headers = [ - self.trUtf8("Website"), - self.trUtf8("Status"), + self.trUtf8("Website"), + self.trUtf8("Status"), ] def headerData(self, section, orientation, role): @@ -102,7 +103,7 @@ return None - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns of the model. @@ -114,7 +115,7 @@ else: return len(self.__headers) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the number of rows of the model. @@ -128,7 +129,7 @@ len(self.__blockedCookies) + \ len(self.__sessionCookies) - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove entries from the model. @@ -178,15 +179,15 @@ return if rule == CookieJar.Allow: - self.__addHost(host, + self.__addHost(host, self.__allowedCookies, self.__blockedCookies, self.__sessionCookies) return elif rule == CookieJar.Block: - self.__addHost(host, + self.__addHost(host, self.__blockedCookies, self.__allowedCookies, self.__sessionCookies) return elif rule == CookieJar.AllowForSession: - self.__addHost(host, + self.__addHost(host, self.__sessionCookies, self.__allowedCookies, self.__blockedCookies) return
--- a/Helpviewer/CookieJar/CookieJar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookieJar.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Utilities import Preferences + class CookieJar(QNetworkCookieJar): """ Class implementing a QNetworkCookieJar subclass with various accept policies. @@ -28,19 +29,19 @@ JAR_VERSION = 23 - AcceptAlways = 0 - AcceptNever = 1 - AcceptOnlyFromSitesNavigatedTo = 2 + AcceptAlways = 0 + AcceptNever = 1 + AcceptOnlyFromSitesNavigatedTo = 2 - KeepUntilExpire = 0 - KeepUntilExit = 1 - KeepUntilTimeLimit = 2 + KeepUntilExpire = 0 + KeepUntilExit = 1 + KeepUntilTimeLimit = 2 - Allow = 0 - Block = 1 + Allow = 0 + Block = 1 AllowForSession = 2 - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -52,7 +53,7 @@ self.__acceptCookies = self.AcceptOnlyFromSitesNavigatedTo self.__saveTimer = AutoSaver(self, self.save) - self.__cookiesFile = os.path.join(Utilities.getConfigDir(), + self.__cookiesFile = os.path.join(Utilities.getConfigDir(), "browser", "cookies.ini") def saveCookies(self, cookiesList): @@ -89,7 +90,7 @@ if version != self.JAR_VERSION: return [] - stream.readUInt32() # number of cookies + stream.readUInt32() # number of cookies rawCookie = QByteArray() while not stream.atEnd(): @@ -170,7 +171,7 @@ cookieSettings = QSettings(self.__cookiesFile, QSettings.IniFormat) cookiesList = self.allCookies() - for index in range(len(cookiesList) -1, -1, -1): + for index in range(len(cookiesList) - 1, -1, -1): if cookiesList[index].isSessionCookie(): del cookiesList[index] cookies = self.saveCookies(cookiesList) @@ -178,7 +179,7 @@ cookieSettings.setValue("Cookies", cookies) cookieSettings.setValue("Exceptions/block", self.__exceptionsBlock) cookieSettings.setValue("Exceptions/allow", self.__exceptionsAllow) - cookieSettings.setValue("Exceptions/allowForSession", + cookieSettings.setValue("Exceptions/allowForSession", self.__exceptionsAllowForSession) Preferences.setHelp("AcceptCookies", self.__acceptCookies)
--- a/Helpviewer/CookieJar/CookieModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookieModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * + class CookieModel(QAbstractTableModel): """ Class implementing the cookie model. """ - def __init__(self, cookieJar, parent = None): + def __init__(self, cookieJar, parent=None): """ Constructor @@ -24,12 +25,12 @@ QAbstractTableModel.__init__(self, parent) self.__headers = [ - self.trUtf8("Website"), - self.trUtf8("Name"), - self.trUtf8("Path"), - self.trUtf8("Secure"), - self.trUtf8("Expires"), - self.trUtf8("Contents"), + self.trUtf8("Website"), + self.trUtf8("Name"), + self.trUtf8("Path"), + self.trUtf8("Secure"), + self.trUtf8("Expires"), + self.trUtf8("Contents"), ] self.__cookieJar = cookieJar self.__cookieJar.cookiesChanged.connect(self.__cookiesChanged) @@ -96,7 +97,7 @@ return None - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns of the model. @@ -108,7 +109,7 @@ else: return len(self.__headers) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the number of rows of the model. @@ -120,7 +121,7 @@ else: return len(self.__cookieJar.cookies()) - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove entries from the model.
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ from .Ui_CookiesConfigurationDialog import Ui_CookiesConfigurationDialog + class CookiesConfigurationDialog(QDialog, Ui_CookiesConfigurationDialog): """ Class implementing the cookies configuration dialog.
--- a/Helpviewer/CookieJar/CookiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ import UI.PixmapCache + class CookiesDialog(QDialog, Ui_CookiesDialog): """ Class implementing a dialog to show all cookies. """ - def __init__(self, cookieJar, parent = None): + def __init__(self, cookieJar, parent=None): """ Constructor @@ -68,7 +69,7 @@ self.cookiesTable.horizontalHeader().resizeSection(section, header) self.cookiesTable.horizontalHeader().setStretchLastSection(True) self.cookiesTable.model().sort( - self.cookiesTable.horizontalHeader().sortIndicatorSection(), + self.cookiesTable.horizontalHeader().sortIndicatorSection(), Qt.AscendingOrder) self.__detailsDialog = None
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ import UI.PixmapCache + class CookiesExceptionsDialog(QDialog, Ui_CookiesExceptionsDialog): """ Class implementing a dialog for the configuration of cookie exceptions. """ - def __init__(self, cookieJar, parent = None): + def __init__(self, cookieJar, parent=None): """ Constructor
--- a/Helpviewer/Download/DownloadItem.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Download/DownloadItem.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ import UI.PixmapCache import Preferences + class DownloadItem(QWidget, Ui_DownloadItem): """ Class implementing a widget controlling a download. @@ -35,14 +36,14 @@ downloadFinished = pyqtSignal() progress = pyqtSignal(int, int) - def __init__(self, reply = None, requestFilename = False, webPage = None, - download = False, parent = None): + def __init__(self, reply=None, requestFilename=False, webPage=None, + download=False, parent=None): """ Constructor @param reply reference to the network reply object (QNetworkReply) @param requestFilename flag indicating to ask the user for a filename (boolean) - @param webPage reference to the web page object the download originated + @param webPage reference to the web page object the download originated from (QWebPage) @param download flag indicating a download operation (boolean) @param parent reference to the parent widget (QWidget) @@ -88,7 +89,7 @@ self.__initialize() - def __initialize(self, tryAgain = False): + def __initialize(self, tryAgain=False): """ Private method to (re)initialize the widget. @@ -286,7 +287,7 @@ self.__output.remove() self.__output = QFile() self.__reply = reply - self.__initialize(tryAgain = True) + self.__initialize(tryAgain=True) self.statusChanged.emit() @pyqtSlot() @@ -477,10 +478,10 @@ info = self.trUtf8("{0} of {1} ({2}/sec) - {3}")\ .format( - dataString(self.__bytesReceived), + dataString(self.__bytesReceived), bytesTotal == -1 and self.trUtf8("?") \ - or dataString(bytesTotal), - dataString(int(speed)), + or dataString(bytesTotal), + dataString(int(speed)), remaining) else: if self.__bytesReceived == bytesTotal or bytesTotal == -1: @@ -488,7 +489,7 @@ .format(dataString(self.__output.size())) else: info = self.trUtf8("{0} of {1} - Stopped")\ - .format(dataString(self.__bytesReceived), + .format(dataString(self.__bytesReceived), dataString(bytesTotal)) self.infoLabel.setText(info) @@ -578,7 +579,7 @@ @return tuple of URL, save location, flag and the URL of the related web page (QUrl, string, boolean,QUrl) """ - return (self.__url, QFileInfo(self.__fileName).filePath(), + return (self.__url, QFileInfo(self.__fileName).filePath(), self.downloadedSuccessfully(), self.__pageUrl) def setData(self, data):
--- a/Helpviewer/Download/DownloadManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Download/DownloadManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,15 +22,16 @@ import UI.PixmapCache import Preferences + class DownloadManager(QDialog, Ui_DownloadManager): """ Class implementing the download manager """ - RemoveNever = 0 - RemoveExit = 1 + RemoveNever = 0 + RemoveExit = 1 RemoveSuccessFullDownload = 2 - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -77,22 +78,22 @@ row = self.downloadsView.selectionModel().selectedRows()[0].row() itm = self.__downloads[row] if itm.downloadCanceled(): - menu.addAction(UI.PixmapCache.getIcon("restart.png"), + menu.addAction(UI.PixmapCache.getIcon("restart.png"), self.trUtf8("Retry"), self.__contextMenuRetry) else: if itm.downloadedSuccessfully(): - menu.addAction(UI.PixmapCache.getIcon("open.png"), + menu.addAction(UI.PixmapCache.getIcon("open.png"), self.trUtf8("Open"), self.__contextMenuOpen) elif itm.downloading(): - menu.addAction(UI.PixmapCache.getIcon("stopLoading.png"), + menu.addAction(UI.PixmapCache.getIcon("stopLoading.png"), self.trUtf8("Cancel"), self.__contextMenuCancel) menu.addSeparator() - menu.addAction(self.trUtf8("Open Containing Folder"), + menu.addAction(self.trUtf8("Open Containing Folder"), self.__contextMenuOpenFolder) menu.addSeparator() - menu.addAction(self.trUtf8("Go to Download Page"), + menu.addAction(self.trUtf8("Go to Download Page"), self.__contextMenuGotoPage) - menu.addAction(self.trUtf8("Copy Download Link"), + menu.addAction(self.trUtf8("Copy Download Link"), self.__contextMenuCopyLink) menu.addSeparator() menu.addAction(self.trUtf8("Select All"), self.__contextMenuSelectAll) @@ -102,7 +103,7 @@ self.downloadsView.selectionModel().selectedRows()[0].row()]\ .downloading()): menu.addSeparator() - menu.addAction(self.trUtf8("Remove From List"), + menu.addAction(self.trUtf8("Remove From List"), self.__contextMenuRemoveSelected) menu.exec_(QCursor.pos()) @@ -138,32 +139,32 @@ res = E5MessageBox.yesNo(self, self.trUtf8(""), self.trUtf8("""There are %n downloads in progress.\n""" - """Do you want to quit anyway?""", "", + """Do you want to quit anyway?""", "", self.activeDownloads()), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: self.show() return False return True - def download(self, requestOrUrl, requestFileName = False): + def download(self, requestOrUrl, requestFileName=False): """ Public method to download a file. @param requestOrUrl reference to a request object (QNetworkRequest) or a URL to be downloaded (QUrl) - @keyparam requestFileName flag indicating to ask for the + @keyparam requestFileName flag indicating to ask for the download file name (boolean) """ request = QNetworkRequest(requestOrUrl) if request.url().isEmpty(): return - self.handleUnsupportedContent(self.__manager.get(request), - requestFileName = requestFileName, - download = True) + self.handleUnsupportedContent(self.__manager.get(request), + requestFileName=requestFileName, + download=True) - def handleUnsupportedContent(self, reply, requestFileName = False, - webPage = None, download = False): + def handleUnsupportedContent(self, reply, requestFileName=False, + webPage=None, download=False): if reply is None or reply.url().isEmpty(): return @@ -171,8 +172,8 @@ if size == 0: return - itm = DownloadItem(reply = reply, requestFilename = requestFileName, - webPage = webPage, download = download, parent = self) + itm = DownloadItem(reply=reply, requestFilename=requestFileName, + webPage=webPage, download=download, parent=self) self.__addItem(itm) if itm.canceledFileSelect(): @@ -207,7 +208,7 @@ self.changeOccurred() self.__updateActiveItemCount() - def __updateRow(self, itm = None): + def __updateRow(self, itm=None): """ Private slot to update a download item. @@ -230,7 +231,7 @@ itm.setIcon(icon) oldHeight = self.downloadsView.rowHeight(row) - self.downloadsView.setRowHeight(row, + self.downloadsView.setRowHeight(row, max(oldHeight, itm.minimumSizeHint().height())) remove = False @@ -264,11 +265,11 @@ """ Public method to set the remove policy. - @param policy policy to be set - (DownloadManager.RemoveExit, DownloadManager.RemoveNever, + @param policy policy to be set + (DownloadManager.RemoveExit, DownloadManager.RemoveNever, DownloadManager.RemoveSuccessFullDownload) """ - assert policy in (DownloadManager.RemoveExit, DownloadManager.RemoveNever, + assert policy in (DownloadManager.RemoveExit, DownloadManager.RemoveNever, DownloadManager.RemoveSuccessFullDownload) if policy == self.removePolicy(): @@ -310,7 +311,7 @@ for download in downloads: if not download[0].isEmpty() and \ download[1] != "": - itm = DownloadItem(parent = self) + itm = DownloadItem(parent=self) itm.setData(download) self.__addItem(itm) self.cleanupButton.setEnabled( @@ -485,4 +486,3 @@ Private method to remove the selected downloads from the list. """ self.downloadsView.removeSelected() -
--- a/Helpviewer/Download/DownloadModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Download/DownloadModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,11 +9,12 @@ from PyQt4.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl + class DownloadModel(QAbstractListModel): """ Class implementing the download model. """ - def __init__(self, manager, parent = None): + def __init__(self, manager, parent=None): """ Constructor @@ -41,7 +42,7 @@ return None - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the number of rows of the model. @@ -53,7 +54,7 @@ else: return self.__manager.count() - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove bookmarks from the model.
--- a/Helpviewer/Download/DownloadUtilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Download/DownloadUtilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,6 +5,7 @@ from PyQt4.QtCore import QCoreApplication + def timeString(timeRemaining): """ Module function to format the given time. @@ -25,6 +26,7 @@ return remaining + def dataString(size): """ Module function to generate a formatted size string.
--- a/Helpviewer/HelpBrowserWV.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpBrowserWV.py Fri Mar 11 16:51:57 2011 +0100 @@ -40,11 +40,12 @@ ########################################################################################## + class JavaScriptExternalObject(QObject): """ Class implementing an external javascript object to add search providers. """ - def __init__(self, mw, parent = None): + def __init__(self, mw, parent=None): """ Constructor @@ -64,6 +65,7 @@ """ self.__mw.openSearchManager().addEngine(QUrl(url)) + class LinkedResource(object): """ Class defining a data structure for linked resources. @@ -79,19 +81,20 @@ ########################################################################################## + class JavaScriptEricObject(QObject): """ Class implementing an external javascript object to search via the startpage. """ # these must be in line with the strings used by the javascript part of the start page translations = [ - QT_TRANSLATE_NOOP("JavaScriptEricObject", "Welcome to Eric Web Browser!"), - QT_TRANSLATE_NOOP("JavaScriptEricObject", "Eric Web Browser"), - QT_TRANSLATE_NOOP("JavaScriptEricObject", "Search!"), - QT_TRANSLATE_NOOP("JavaScriptEricObject", "About Eric"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", "Welcome to Eric Web Browser!"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", "Eric Web Browser"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", "Search!"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", "About Eric"), ] - def __init__(self, mw, parent = None): + def __init__(self, mw, parent=None): """ Constructor @@ -102,7 +105,7 @@ self.__mw = mw - @pyqtSlot(str, result = str) + @pyqtSlot(str, result=str) def translate(self, trans): """ Public method to translate the given string. @@ -119,7 +122,7 @@ return self.trUtf8(trans) - @pyqtSlot(result = str) + @pyqtSlot(result=str) def providerString(self): """ Public method to get a string for the search provider. @@ -129,7 +132,7 @@ return self.trUtf8("Search results provided by {0}")\ .format(self.__mw.openSearchManager().currentEngineName()) - @pyqtSlot(str, result = str) + @pyqtSlot(str, result=str) def searchUrl(self, searchStr): """ Public method to get the search URL for the given search term. @@ -143,11 +146,12 @@ ########################################################################################## + class HelpWebPage(QWebPage): """ Class implementing an enhanced web page. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -192,7 +196,7 @@ """ to some unexpected behaviour of the site e.g. the""" """ same action might be performed once again. Do you want""" """ to continue anyway?"""), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return False @@ -256,20 +260,20 @@ imageBuffer = QBuffer() imageBuffer.open(QIODevice.ReadWrite) if pixmap.save(imageBuffer, "PNG"): - html = html.replace("IMAGE_BINARY_DATA_HERE", + html = html.replace("IMAGE_BINARY_DATA_HERE", str(imageBuffer.buffer().toBase64(), encoding="ascii")) errorPage.content = QByteArray(html.format( - title, - info.errorString, - self.trUtf8("When connecting to: {0}.").format(urlString), + title, + info.errorString, + self.trUtf8("When connecting to: {0}.").format(urlString), self.trUtf8("Check the address for errors such as " "<b>ww</b>.example.org instead of " - "<b>www</b>.example.org"), + "<b>www</b>.example.org"), self.trUtf8("If the address is correct, try checking the network " - "connection."), + "connection."), self.trUtf8("If your computer or network is protected by a firewall " "or proxy, make sure that the browser is permitted to " - "access the network."), + "access the network."), self.trUtf8("If your cache policy is set to offline browsing," "only pages in the local cache are available.") ).encode("utf8")) @@ -279,11 +283,11 @@ return QWebPage.extension(self, extension, option, output) - def userAgent(self, resolveEmpty = False): + def userAgent(self, resolveEmpty=False): """ Public method to get the current user agent setting. - @param resolveEmpty flag indicating to resolve an empty + @param resolveEmpty flag indicating to resolve an empty user agent (boolean) @return user agent string (string) """ @@ -356,12 +360,13 @@ dlg = SslInfoDialog(self.__sslInfo, self.view()) dlg.exec_() else: - E5MessageBox.warning(self.view(), - self.trUtf8("SSL Certificate Info"), + E5MessageBox.warning(self.view(), + self.trUtf8("SSL Certificate Info"), self.trUtf8("""There is no SSL Certificate Info available.""")) ########################################################################################## + class HelpBrowser(QWebView): """ Class implementing the helpbrowser widget. @@ -381,7 +386,7 @@ highlighted = pyqtSignal(str) search = pyqtSignal(QUrl) - def __init__(self, mainWindow, parent = None, name = ""): + def __init__(self, mainWindow, parent=None, name=""): """ Constructor @@ -406,9 +411,9 @@ self.__currentZoom = 100 self.__zoomLevels = [ - 30, 50, 67, 80, 90, - 100, - 110, 120, 133, 150, 170, 200, 240, 300, + 30, 50, 67, 80, 90, + 100, + 110, 120, 133, 150, 170, 200, 240, 300, ] self.__javaScriptBinding = None @@ -439,7 +444,7 @@ self.mw.openSearchManager().currentEngineChanged.connect( self.__currentEngineChanged) - def __addExternalBinding(self, frame = None): + def __addExternalBinding(self, frame=None): """ Private slot to add javascript bindings for adding search providers. @@ -467,7 +472,7 @@ frame.javaScriptWindowObjectCleared.connect(self.__addExternalBinding) frame.addToJavaScriptWindowObject("external", self.__javaScriptBinding) - def linkedResources(self, relation = ""): + def linkedResources(self, relation=""): """ Public method to extract linked resources. @@ -508,7 +513,7 @@ rel = m["rel"] type_ = m["type"] href = m["href"] - title = m["title"] + title = m["title"] if href == "" or type_ == "": continue @@ -711,7 +716,7 @@ self.__currentZoom = self.__zoomLevels[index - 1] self.__applyZoom() - def zoomReset(self): + def zoomReset(self): """ Public method to reset the zoom factor. """ @@ -792,13 +797,13 @@ if not hit.imageUrl().isEmpty(): if not menu.isEmpty(): menu.addSeparator() - act = menu.addAction(self.trUtf8("Open Image in New Tab"), + act = menu.addAction(self.trUtf8("Open Image in New Tab"), self.__openLinkInNewTab) act.setData(hit.imageUrl()) menu.addSeparator() menu.addAction(self.trUtf8("Save Image"), self.__downloadImage) menu.addAction(self.trUtf8("Copy Image to Clipboard"), self.__copyImage) - act = menu.addAction(self.trUtf8("Copy Image Location to Clipboard"), + act = menu.addAction(self.trUtf8("Copy Image Location to Clipboard"), self.__copyImageLocation) act.setData(hit.imageUrl().toString()) menu.addSeparator() @@ -843,7 +848,7 @@ if not element.isNull() and \ element.tagName().lower() == "input" and \ element.attribute("type", "text") == "text": - act = menu.addAction(self.trUtf8("Add to web search toolbar"), + act = menu.addAction(self.trUtf8("Add to web search toolbar"), self.__addSearchEngine) act.setData(element) menu.addSeparator() @@ -998,9 +1003,9 @@ ok = True if len(searchEngines) > 1: searchEngine, ok = QInputDialog.getItem( - self, - self.trUtf8("Search engine"), - self.trUtf8("Choose the desired search engine"), + self, + self.trUtf8("Search engine"), + self.trUtf8("Choose the desired search engine"), sorted(searchEngines.keys()), 0, False) if not ok: @@ -1164,12 +1169,12 @@ self.mw.downloadManager().download(url, True) - def __unsupportedContent(self, reply, requestFilename = None, download = False): + def __unsupportedContent(self, reply, requestFilename=None, download=False): """ Private slot to handle the unsupportedContent signal. @param reply reference to the reply object (QNetworkReply) - @keyparam requestFilename indicating to ask for a filename + @keyparam requestFilename indicating to ask for a filename (boolean or None). If it is None, the behavior is determined by a configuration option. @keyparam download flag indicating a download operation (boolean) @@ -1185,7 +1190,7 @@ if reply.error() == QNetworkReply.NoError: if reply.header(QNetworkRequest.ContentTypeHeader): self.mw.downloadManager().handleUnsupportedContent( - reply, webPage = self.page()) + reply, webPage=self.page()) return replyUrl = reply.url() @@ -1199,7 +1204,7 @@ if reply.header(QNetworkRequest.ContentTypeHeader): data = reply.readAll() if contentSniff(data): - notFoundFrame.setHtml(str(data, encoding = "utf-8"), replyUrl) + notFoundFrame.setHtml(str(data, encoding="utf-8"), replyUrl) return html = notFoundPage_html @@ -1211,19 +1216,19 @@ imageBuffer = QBuffer() imageBuffer.open(QIODevice.ReadWrite) if pixmap.save(imageBuffer, "PNG"): - html = html.replace("IMAGE_BINARY_DATA_HERE", + html = html.replace("IMAGE_BINARY_DATA_HERE", str(imageBuffer.buffer().toBase64(), encoding="ascii")) html = html.format( - title, - reply.errorString(), - self.trUtf8("When connecting to: {0}.").format(urlString), + title, + reply.errorString(), + self.trUtf8("When connecting to: {0}.").format(urlString), self.trUtf8("Check the address for errors such as <b>ww</b>.example.org " - "instead of <b>www</b>.example.org"), + "instead of <b>www</b>.example.org"), self.trUtf8("If the address is correct, try checking the network " - "connection."), + "connection."), self.trUtf8("If your computer or network is protected by a firewall or " "proxy, make sure that the browser is permitted to access " - "the network."), + "the network."), self.trUtf8("If your cache policy is set to offline browsing," "only pages in the local cache are available.") ) @@ -1259,14 +1264,14 @@ """ been exceeded while accessing database <strong>{1}""" """</strong>.</p><p>Shall it be changed?</p>""")\ .format(self.__dataString(securityOrigin.databaseQuota()), databaseName), - yesDefault = True) + yesDefault=True) if res: newQuota, ok = QInputDialog.getInteger( self, self.trUtf8("New Web Database Quota"), self.trUtf8("Enter the new quota in MB (current = {0}, used = {1}; " "step size = 5 MB):"\ - .format(self.__dataString(securityOrigin.databaseQuota()), + .format(self.__dataString(securityOrigin.databaseQuota()), self.__dataString(securityOrigin.databaseUsage()))), securityOrigin.databaseQuota() // (1024 * 1024), 0, 2147483647, 5) if ok: @@ -1309,6 +1314,7 @@ """ self.reload() + def contentSniff(data): """ Module function to do some content sniffing to check, if the data is HTML.
--- a/Helpviewer/HelpClearPrivateDataDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpClearPrivateDataDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_HelpClearPrivateDataDialog import Ui_HelpClearPrivateDataDialog + class HelpClearPrivateDataDialog(QDialog, Ui_HelpClearPrivateDataDialog): """ Class implementing a dialog to select which private data to clear. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -29,14 +30,14 @@ Public method to get the data from the dialog. @return tuple of flags indicating which data to clear (browsing history, - search history, favicons, disk cache, cookies, passwords, web + search history, favicons, disk cache, cookies, passwords, web databases, downloads) (list of boolean) """ - return (self.historyCheckBox.isChecked(), - self.searchCheckBox.isChecked(), - self.iconsCheckBox.isChecked(), - self.cacheCheckBox.isChecked(), - self.cookiesCheckBox.isChecked(), - self.passwordsCheckBox.isChecked(), - self.databasesCheckBox.isChecked(), + return (self.historyCheckBox.isChecked(), + self.searchCheckBox.isChecked(), + self.iconsCheckBox.isChecked(), + self.cacheCheckBox.isChecked(), + self.cookiesCheckBox.isChecked(), + self.passwordsCheckBox.isChecked(), + self.databasesCheckBox.isChecked(), self.downloadsCheckBox.isChecked())
--- a/Helpviewer/HelpDocsInstaller.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpDocsInstaller.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from eric5config import getConfig + class HelpDocsInstaller(QThread): """ Class implementing the worker thread populating and updating the QtHelp @@ -104,7 +105,7 @@ files = docsPath.entryList(["*.qch"]) if not files: - engine.setCustomValue(versionKey, + engine.setCustomValue(versionKey, QDateTime().toString(Qt.ISODate) + '|') return False @@ -132,7 +133,7 @@ ) return False - engine.setCustomValue(versionKey, + engine.setCustomValue(versionKey, fi.lastModified().toString(Qt.ISODate) + '|' + \ fi.absoluteFilePath()) return True @@ -162,7 +163,7 @@ files = docsPath.entryList(["*.qch"]) if not files: - engine.setCustomValue(versionKey, + engine.setCustomValue(versionKey, QDateTime().toString(Qt.ISODate) + '|') return False @@ -189,7 +190,7 @@ ) return False - engine.setCustomValue(versionKey, + engine.setCustomValue(versionKey, fi.lastModified().toString(Qt.ISODate) + '|' + \ fi.absoluteFilePath()) return True
--- a/Helpviewer/HelpIndexWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpIndexWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .HelpTopicDialog import HelpTopicDialog + class HelpIndexWidget(QWidget): """ Class implementing a window for showing the QtHelp index. @@ -25,7 +26,7 @@ linksActivated = pyqtSignal(dict, str) escapePressed = pyqtSignal() - def __init__(self, engine, mainWindow, parent = None): + def __init__(self, engine, mainWindow, parent=None): """ Constructor
--- a/Helpviewer/HelpLanguagesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpLanguagesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,11 +14,12 @@ import Preferences + class HelpLanguagesDialog(QDialog, Ui_HelpLanguagesDialog): """ Class implementing a dialog to configure the preferred languages. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -96,7 +97,7 @@ return self.__model.insertRow(self.__model.rowCount()) - self.__model.setData(self.__model.index(self.__model.rowCount() - 1), + self.__model.setData(self.__model.index(self.__model.rowCount() - 1), language) self.languagesList.setCurrentIndex( self.__model.index(self.__model.rowCount() - 1)) @@ -160,13 +161,13 @@ allLanguages = [] countries = QLocale.countriesForLanguage(language) languageString = "{0} [{1}]"\ - .format(QLocale.languageToString(language), + .format(QLocale.languageToString(language), QLocale(language).name().split('_')[0]) allLanguages.append(languageString) for country in countries: languageString = "{0}/{1} [{2}]"\ - .format(QLocale.languageToString(language), - QLocale.countryToString(country), + .format(QLocale.languageToString(language), + QLocale.countryToString(country), '-'.join(QLocale(language, country).name().split('_')).lower()) if languageString not in allLanguages: allLanguages.append(languageString)
--- a/Helpviewer/HelpSearchWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpSearchWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * + class HelpSearchWidget(QWidget): """ Class implementing a window for showing the QtHelp index. @@ -20,7 +21,7 @@ linkActivated = pyqtSignal(QUrl) escapePressed = pyqtSignal() - def __init__(self, engine, mainWindow, parent = None): + def __init__(self, engine, mainWindow, parent=None): """ Constructor
--- a/Helpviewer/HelpSnap.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpSnap.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ from PyQt4.QtGui import QPixmap, QPainter from PyQt4.QtWebKit import QWebFrame + def renderTabPreview(page, w, h): """ Public function to render a pixmap of a page. @@ -27,6 +28,7 @@ page.setViewportSize(oldSize) return pageImage.scaled(w, h, Qt.IgnoreAspectRatio, Qt.SmoothTransformation) + def __render(page, w, h): """ Private function to render a pixmap of given size for a web page.
--- a/Helpviewer/HelpTabBar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpTabBar.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Preferences + class HelpTabBar(E5WheelTabBar): """ Class implementing the tab bar of the web browser. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -136,7 +137,7 @@ """ Protected method to handle event. - This event handler just handles the tooltip event and passes the + This event handler just handles the tooltip event and passes the handling of all others to the superclass. @param evt reference to the event to be handled (QEvent)
--- a/Helpviewer/HelpTabWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpTabWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -33,6 +33,7 @@ from eric5config import getConfig + class HelpTabWidget(E5TabWidget): """ Class implementing the central widget showing the web pages. @@ -47,7 +48,7 @@ @param parent reference to the parent widget (QWidget) """ - E5TabWidget.__init__(self, parent, dnd = True) + E5TabWidget.__init__(self, parent, dnd=True) self.__tabBar = HelpTabBar(self) self.setCustomTabBar(True, self.__tabBar) @@ -120,7 +121,7 @@ self.trUtf8('Move Right'), self.__tabContextMenuMoveRight) self.__tabContextMenu.addSeparator() self.tabContextCloneAct = \ - self.__tabContextMenu.addAction(self.trUtf8("Duplicate Page"), + self.__tabContextMenu.addAction(self.trUtf8("Duplicate Page"), self.__tabContextMenuClone) self.__tabContextMenu.addSeparator() self.tabContextCloseAct = \ @@ -129,7 +130,7 @@ self.tabContextCloseOthersAct = \ self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("tabCloseOther.png"), self.trUtf8("Close Others"), self.__tabContextMenuCloseOthers) - self.__tabContextMenu.addAction(self.trUtf8('Close All'), + self.__tabContextMenu.addAction(self.trUtf8('Close All'), self.closeAllBrowsers) self.__tabContextMenu.addSeparator() self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("printPreview.png"), @@ -139,7 +140,7 @@ self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("printPdf.png"), self.trUtf8('Print as PDF'), self.__tabContextMenuPrintPdf) self.__tabContextMenu.addSeparator() - self.__tabContextMenu.addAction(self.trUtf8('Bookmark All Tabs'), + self.__tabContextMenu.addAction(self.trUtf8('Bookmark All Tabs'), self.__mainWindow.bookmarkAll) def __showContextMenu(self, coord, index): @@ -218,7 +219,7 @@ browser = self.widget(self.__tabContextMenuIndex) self.printPreviewBrowser(browser) - def newBrowser(self, link = None): + def newBrowser(self, link=None): """ Public method to create a new web browser tab. @@ -275,7 +276,7 @@ self.setTabText(index, self.__elide(linkName, Qt.ElideMiddle)) self.setTabToolTip(index, linkName) else: - self.setTabText(index, + self.setTabText(index, self.__elide(browser.documentTitle().replace("&", "&&"))) self.setTabToolTip(index, browser.documentTitle()) @@ -374,7 +375,7 @@ l.append(self.widget(index)) return l - def printBrowser(self, browser = None): + def printBrowser(self, browser=None): """ Public slot called to print the displayed page. @@ -391,7 +392,7 @@ @param frame reference to the frame to be printed (QWebFrame) """ - printer = QPrinter(mode = QPrinter.HighResolution) + printer = QPrinter(mode=QPrinter.HighResolution) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) else: @@ -413,7 +414,7 @@ """Please upgrade.</p>""")) return - def printBrowserPdf(self, browser = None): + def printBrowserPdf(self, browser=None): """ Public slot called to print the displayed page to PDF. @@ -430,7 +431,7 @@ @param frame reference to the frame to be printed (QWebFrame) """ - printer = QPrinter(mode = QPrinter.HighResolution) + printer = QPrinter(mode=QPrinter.HighResolution) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) else: @@ -454,7 +455,7 @@ """Please upgrade.</p>""")) return - def printPreviewBrowser(self, browser = None): + def printPreviewBrowser(self, browser=None): """ Public slot called to show a print preview of the displayed file. @@ -465,7 +466,7 @@ if browser is None: browser = self.currentBrowser() - printer = QPrinter(mode = QPrinter.HighResolution) + printer = QPrinter(mode=QPrinter.HighResolution) if Preferences.getPrinter("ColorMode"): printer.setColorMode(QPrinter.Color) else: @@ -518,7 +519,7 @@ self.titleChanged.emit(title) - def __elide(self, txt, mode = Qt.ElideRight, length = 40): + def __elide(self, txt, mode=Qt.ElideRight, length=40): """ Private method to elide some text. @@ -617,19 +618,19 @@ @return flag indicating a shut down (boolean) """ if self.count() > 1: - 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""" + self.trUtf8("""Are you sure you want to close the window?\n""" """You have %n tab(s) open.""", "", self.count()), - modal = True, - parent = self) + modal=True, + parent=self) if self.__mainWindow.fromEric: quitButton = mb.addButton(self.trUtf8("&Close"), E5MessageBox.AcceptRole) quitButton.setIcon(UI.PixmapCache.getIcon("close.png")) else: quitButton = mb.addButton(self.trUtf8("&Quit"), E5MessageBox.AcceptRole) quitButton.setIcon(UI.PixmapCache.getIcon("exit.png")) - closeTabButton = mb.addButton(self.trUtf8("C&lose Current Tab"), + closeTabButton = mb.addButton(self.trUtf8("C&lose Current Tab"), E5MessageBox.AcceptRole) closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose.png")) mb.addButton(E5MessageBox.Cancel)
--- a/Helpviewer/HelpTocWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpTocWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * + class HelpTocWidget(QWidget): """ Class implementing a window for showing the QtHelp TOC. @@ -20,7 +21,7 @@ linkActivated = pyqtSignal(QUrl) escapePressed = pyqtSignal() - def __init__(self, engine, mainWindow, parent = None): + def __init__(self, engine, mainWindow, parent=None): """ Constructor
--- a/Helpviewer/HelpTopicDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpTopicDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .Ui_HelpTopicDialog import Ui_HelpTopicDialog + class HelpTopicDialog(QDialog, Ui_HelpTopicDialog): """ Class implementing a dialog to select a help topic to display.
--- a/Helpviewer/HelpWebSearchWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpWebSearchWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ from .OpenSearch.OpenSearchManager import OpenSearchManager from .OpenSearch.OpenSearchEngineAction import OpenSearchEngineAction + class HelpWebSearchWidget(QWidget): """ Class implementing a web search widget for the web browser. @@ -29,7 +30,7 @@ """ search = pyqtSignal(QUrl) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -51,7 +52,7 @@ self.__enginesMenu = QMenu(self) - self.__searchEdit = E5LineEdit(parent = self) + self.__searchEdit = E5LineEdit(parent=self) self.__layout.addWidget(self.__searchEdit) self.__engineButton = E5LineEditButton(self) @@ -278,7 +279,7 @@ else: title = ct.title() - action = self.__enginesMenu.addAction(self.trUtf8("Add '{0}'").format(title), + action = self.__enginesMenu.addAction(self.trUtf8("Add '{0}'").format(title), self.__addEngineFromUrl) action.setData(url) action.setIcon(ct.icon()) @@ -287,7 +288,7 @@ self.__enginesMenu.addAction(self.mw.searchEnginesAction()) if self.__recentSearches: - self.__enginesMenu.addAction(self.trUtf8("Clear Recent Searches"), + self.__enginesMenu.addAction(self.trUtf8("Clear Recent Searches"), self.clear) def __changeCurrentEngine(self): @@ -307,7 +308,7 @@ if action is not None: url = action.data() if not isinstance(url, QUrl): - return + return self.__openSearchManager.addEngine(url)
--- a/Helpviewer/HelpWindow.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/HelpWindow.py Fri Mar 11 16:51:57 2011 +0100 @@ -57,6 +57,7 @@ import UI.PixmapCache import UI.Config + class HelpWindow(QMainWindow): """ Class implementing the web browser main window. @@ -82,8 +83,8 @@ _adblockManager = None _downloadManager = None - def __init__(self, home, path, parent, name, fromEric = False, - initShortcutsOnly = False, searchWord = None): + def __init__(self, home, path, parent, name, fromEric=False, + initShortcutsOnly=False, searchWord=None): """ Constructor @@ -112,7 +113,7 @@ self.__initActions() else: self.__helpEngine = \ - QHelpEngine(os.path.join(Utilities.getConfigDir(), + QHelpEngine(os.path.join(Utilities.getConfigDir(), "browser", "eric5help.qhc"), self) self.__helpEngine.warning.connect(self.__warning) self.__helpInstaller = None @@ -209,14 +210,14 @@ if self.__searchWord is not None: QTimer.singleShot(0, self.__searchForWord) - def __setIconDatabasePath(self, enable = True): + def __setIconDatabasePath(self, enable=True): """ Private method to set the favicons path. @param enable flag indicating to enabled icon storage (boolean) """ if enable: - iconDatabasePath = os.path.join(Utilities.getConfigDir(), + iconDatabasePath = os.path.join(Utilities.getConfigDir(), "browser", "favicons") if not os.path.exists(iconDatabasePath): os.makedirs(iconDatabasePath) @@ -243,25 +244,25 @@ if styleSheet: settings.setUserStyleSheetUrl(QUrl(styleSheet)) - settings.setAttribute(QWebSettings.AutoLoadImages, + settings.setAttribute(QWebSettings.AutoLoadImages, Preferences.getHelp("AutoLoadImages")) - settings.setAttribute(QWebSettings.JavaEnabled, + settings.setAttribute(QWebSettings.JavaEnabled, Preferences.getHelp("JavaEnabled")) - settings.setAttribute(QWebSettings.JavascriptEnabled, + settings.setAttribute(QWebSettings.JavascriptEnabled, Preferences.getHelp("JavaScriptEnabled")) - settings.setAttribute(QWebSettings.JavascriptCanOpenWindows, + settings.setAttribute(QWebSettings.JavascriptCanOpenWindows, Preferences.getHelp("JavaScriptCanOpenWindows")) - settings.setAttribute(QWebSettings.JavascriptCanAccessClipboard, + settings.setAttribute(QWebSettings.JavascriptCanAccessClipboard, Preferences.getHelp("JavaScriptCanAccessClipboard")) - settings.setAttribute(QWebSettings.PluginsEnabled, + settings.setAttribute(QWebSettings.PluginsEnabled, Preferences.getHelp("PluginsEnabled")) if hasattr(QWebSettings, "PrintElementBackgrounds"): - settings.setAttribute(QWebSettings.PrintElementBackgrounds, + settings.setAttribute(QWebSettings.PrintElementBackgrounds, Preferences.getHelp("PrintBackgrounds")) if hasattr(QWebSettings, "setOfflineStoragePath"): - settings.setAttribute(QWebSettings.OfflineStorageDatabaseEnabled, + settings.setAttribute(QWebSettings.OfflineStorageDatabaseEnabled, Preferences.getHelp("OfflineStorageDatabaseEnabled")) webDatabaseDir = os.path.join( Utilities.getConfigDir(), "browser", "webdatabases") @@ -272,7 +273,7 @@ Preferences.getHelp("OfflineStorageDatabaseQuota") * 1024 * 1024) if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"): - settings.setAttribute(QWebSettings.OfflineWebApplicationCacheEnabled, + settings.setAttribute(QWebSettings.OfflineWebApplicationCacheEnabled, Preferences.getHelp("OfflineWebApplicationCacheEnabled")) appCacheDir = os.path.join( Utilities.getConfigDir(), "browser", "webappcaches") @@ -283,7 +284,7 @@ Preferences.getHelp("OfflineWebApplicationCacheQuota") * 1024 * 1024) if hasattr(QWebSettings, "LocalStorageEnabled"): - settings.setAttribute(QWebSettings.LocalStorageEnabled, + settings.setAttribute(QWebSettings.LocalStorageEnabled, Preferences.getHelp("LocalStorageEnabled")) localStorageDir = os.path.join( Utilities.getConfigDir(), "browser", "weblocalstorage") @@ -292,7 +293,7 @@ settings.setLocalStoragePath(localStorageDir) if hasattr(QWebSettings, "DnsPrefetchEnabled"): - settings.setAttribute(QWebSettings.DnsPrefetchEnabled, + settings.setAttribute(QWebSettings.DnsPrefetchEnabled, Preferences.getHelp("DnsPrefetchEnabled")) if hasattr(QWebSettings, "defaultTextEncoding"): @@ -306,10 +307,10 @@ # list of all actions self.__actions = [] - self.newTabAct = E5Action(self.trUtf8('New Tab'), + self.newTabAct = E5Action(self.trUtf8('New Tab'), UI.PixmapCache.getIcon("tabNew.png"), - self.trUtf8('&New Tab'), - QKeySequence(self.trUtf8("Ctrl+T","File|New Tab")), + self.trUtf8('&New Tab'), + QKeySequence(self.trUtf8("Ctrl+T", "File|New Tab")), 0, self, 'help_file_new_tab') self.newTabAct.setStatusTip(self.trUtf8('Open a new help window tab')) self.newTabAct.setWhatsThis(self.trUtf8( @@ -320,10 +321,10 @@ self.newTabAct.triggered[()].connect(self.newTab) self.__actions.append(self.newTabAct) - self.newAct = E5Action(self.trUtf8('New Window'), + self.newAct = E5Action(self.trUtf8('New Window'), UI.PixmapCache.getIcon("newWindow.png"), - self.trUtf8('New &Window'), - QKeySequence(self.trUtf8("Ctrl+N","File|New Window")), + self.trUtf8('New &Window'), + QKeySequence(self.trUtf8("Ctrl+N", "File|New Window")), 0, self, 'help_file_new_window') self.newAct.setStatusTip(self.trUtf8('Open a new help browser window')) self.newAct.setWhatsThis(self.trUtf8( @@ -334,10 +335,10 @@ self.newAct.triggered[()].connect(self.newWindow) self.__actions.append(self.newAct) - self.openAct = E5Action(self.trUtf8('Open File'), + self.openAct = E5Action(self.trUtf8('Open File'), UI.PixmapCache.getIcon("open.png"), - self.trUtf8('&Open File'), - QKeySequence(self.trUtf8("Ctrl+O","File|Open")), + self.trUtf8('&Open File'), + QKeySequence(self.trUtf8("Ctrl+O", "File|Open")), 0, self, 'help_file_open') self.openAct.setStatusTip(self.trUtf8('Open a help file for display')) self.openAct.setWhatsThis(self.trUtf8( @@ -349,10 +350,10 @@ self.openAct.triggered[()].connect(self.__openFile) self.__actions.append(self.openAct) - self.openTabAct = E5Action(self.trUtf8('Open File in New Tab'), + self.openTabAct = E5Action(self.trUtf8('Open File in New Tab'), UI.PixmapCache.getIcon("openNewTab.png"), - self.trUtf8('Open File in New &Tab'), - QKeySequence(self.trUtf8("Shift+Ctrl+O","File|Open in new tab")), + self.trUtf8('Open File in New &Tab'), + QKeySequence(self.trUtf8("Shift+Ctrl+O", "File|Open in new tab")), 0, self, 'help_file_open_tab') self.openTabAct.setStatusTip( self.trUtf8('Open a help file for display in a new tab')) @@ -365,10 +366,10 @@ self.openTabAct.triggered[()].connect(self.__openFileNewTab) self.__actions.append(self.openTabAct) - self.saveAsAct = E5Action(self.trUtf8('Save As '), + self.saveAsAct = E5Action(self.trUtf8('Save As '), UI.PixmapCache.getIcon("fileSaveAs.png"), - self.trUtf8('&Save As...'), - QKeySequence(self.trUtf8("Shift+Ctrl+S","File|Save As")), + self.trUtf8('&Save As...'), + QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")), 0, self, 'help_file_save_as') self.saveAsAct.setStatusTip( self.trUtf8('Save the current page to disk')) @@ -381,8 +382,8 @@ self.__actions.append(self.saveAsAct) bookmarksManager = self.bookmarksManager() - self.importBookmarksAct = E5Action(self.trUtf8('Import Bookmarks'), - self.trUtf8('&Import Bookmarks...'), + self.importBookmarksAct = E5Action(self.trUtf8('Import Bookmarks'), + self.trUtf8('&Import Bookmarks...'), 0, 0, self, 'help_file_import_bookmarks') self.importBookmarksAct.setStatusTip( self.trUtf8('Import bookmarks from other browsers')) @@ -395,8 +396,8 @@ bookmarksManager.importBookmarks) self.__actions.append(self.importBookmarksAct) - self.exportBookmarksAct = E5Action(self.trUtf8('Export Bookmarks'), - self.trUtf8('&Export Bookmarks...'), + self.exportBookmarksAct = E5Action(self.trUtf8('Export Bookmarks'), + self.trUtf8('&Export Bookmarks...'), 0, 0, self, 'help_file_export_bookmarks') self.exportBookmarksAct.setStatusTip( self.trUtf8('Export the bookmarks into a file')) @@ -409,10 +410,10 @@ bookmarksManager.exportBookmarks) self.__actions.append(self.exportBookmarksAct) - self.printAct = E5Action(self.trUtf8('Print'), + self.printAct = E5Action(self.trUtf8('Print'), UI.PixmapCache.getIcon("print.png"), - self.trUtf8('&Print'), - QKeySequence(self.trUtf8("Ctrl+P","File|Print")), + self.trUtf8('&Print'), + QKeySequence(self.trUtf8("Ctrl+P", "File|Print")), 0, self, 'help_file_print') self.printAct.setStatusTip(self.trUtf8('Print the displayed help')) self.printAct.setWhatsThis(self.trUtf8( @@ -423,9 +424,9 @@ self.printAct.triggered[()].connect(self.tabWidget.printBrowser) self.__actions.append(self.printAct) - self.printPdfAct = E5Action(self.trUtf8('Print as PDF'), + self.printPdfAct = E5Action(self.trUtf8('Print as PDF'), UI.PixmapCache.getIcon("printPdf.png"), - self.trUtf8('Print as PDF'), + self.trUtf8('Print as PDF'), 0, 0, self, 'help_file_print_pdf') self.printPdfAct.setStatusTip(self.trUtf8('Print the displayed help as PDF')) self.printPdfAct.setWhatsThis(self.trUtf8( @@ -436,9 +437,9 @@ self.printPdfAct.triggered[()].connect(self.tabWidget.printBrowserPdf) self.__actions.append(self.printPdfAct) - self.printPreviewAct = E5Action(self.trUtf8('Print Preview'), + self.printPreviewAct = E5Action(self.trUtf8('Print Preview'), UI.PixmapCache.getIcon("printPreview.png"), - self.trUtf8('Print Preview'), + self.trUtf8('Print Preview'), 0, 0, self, 'help_file_print_preview') self.printPreviewAct.setStatusTip(self.trUtf8( 'Print preview of the displayed help')) @@ -450,10 +451,10 @@ self.printPreviewAct.triggered[()].connect(self.tabWidget.printPreviewBrowser) self.__actions.append(self.printPreviewAct) - self.closeAct = E5Action(self.trUtf8('Close'), + self.closeAct = E5Action(self.trUtf8('Close'), UI.PixmapCache.getIcon("close.png"), - self.trUtf8('&Close'), - QKeySequence(self.trUtf8("Ctrl+W","File|Close")), + self.trUtf8('&Close'), + QKeySequence(self.trUtf8("Ctrl+W", "File|Close")), 0, self, 'help_file_close') self.closeAct.setStatusTip(self.trUtf8('Close the current help window')) self.closeAct.setWhatsThis(self.trUtf8( @@ -464,8 +465,8 @@ self.closeAct.triggered[()].connect(self.tabWidget.closeBrowser) self.__actions.append(self.closeAct) - self.closeAllAct = E5Action(self.trUtf8('Close All'), - self.trUtf8('Close &All'), + self.closeAllAct = E5Action(self.trUtf8('Close All'), + self.trUtf8('Close &All'), 0, 0, self, 'help_file_close_all') self.closeAllAct.setStatusTip(self.trUtf8('Close all help windows')) self.closeAllAct.setWhatsThis(self.trUtf8( @@ -476,9 +477,9 @@ self.closeAllAct.triggered[()].connect(self.tabWidget.closeAllBrowsers) self.__actions.append(self.closeAllAct) - self.privateBrowsingAct = E5Action(self.trUtf8('Private Browsing'), + self.privateBrowsingAct = E5Action(self.trUtf8('Private Browsing'), UI.PixmapCache.getIcon("privateBrowsing.png"), - self.trUtf8('Private &Browsing'), + self.trUtf8('Private &Browsing'), 0, 0, self, 'help_file_private_browsing') self.privateBrowsingAct.setStatusTip(self.trUtf8('Private Browsing')) self.privateBrowsingAct.setWhatsThis(self.trUtf8( @@ -491,10 +492,10 @@ self.privateBrowsingAct.setCheckable(True) self.__actions.append(self.privateBrowsingAct) - self.exitAct = E5Action(self.trUtf8('Quit'), + self.exitAct = E5Action(self.trUtf8('Quit'), UI.PixmapCache.getIcon("exit.png"), - self.trUtf8('&Quit'), - QKeySequence(self.trUtf8("Ctrl+Q","File|Quit")), + self.trUtf8('&Quit'), + QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit")), 0, self, 'help_file_quit') self.exitAct.setStatusTip(self.trUtf8('Quit the web browser')) self.exitAct.setWhatsThis(self.trUtf8( @@ -508,11 +509,11 @@ self.exitAct.triggered[()].connect(qApp.closeAllWindows) self.__actions.append(self.exitAct) - self.backAct = E5Action(self.trUtf8('Backward'), + self.backAct = E5Action(self.trUtf8('Backward'), UI.PixmapCache.getIcon("back.png"), - self.trUtf8('&Backward'), - QKeySequence(self.trUtf8("Alt+Left","Go|Backward")), - QKeySequence(self.trUtf8("Backspace","Go|Backward")), + self.trUtf8('&Backward'), + QKeySequence(self.trUtf8("Alt+Left", "Go|Backward")), + QKeySequence(self.trUtf8("Backspace", "Go|Backward")), self, 'help_go_backward') self.backAct.setStatusTip(self.trUtf8('Move one help screen backward')) self.backAct.setWhatsThis(self.trUtf8( @@ -524,11 +525,11 @@ self.backAct.triggered[()].connect(self.__backward) self.__actions.append(self.backAct) - self.forwardAct = E5Action(self.trUtf8('Forward'), + self.forwardAct = E5Action(self.trUtf8('Forward'), UI.PixmapCache.getIcon("forward.png"), - self.trUtf8('&Forward'), - QKeySequence(self.trUtf8("Alt+Right","Go|Forward")), - QKeySequence(self.trUtf8("Shift+Backspace","Go|Forward")), + self.trUtf8('&Forward'), + QKeySequence(self.trUtf8("Alt+Right", "Go|Forward")), + QKeySequence(self.trUtf8("Shift+Backspace", "Go|Forward")), self, 'help_go_foreward') self.forwardAct.setStatusTip(self.trUtf8('Move one help screen forward')) self.forwardAct.setWhatsThis(self.trUtf8( @@ -540,10 +541,10 @@ self.forwardAct.triggered[()].connect(self.__forward) self.__actions.append(self.forwardAct) - self.homeAct = E5Action(self.trUtf8('Home'), + self.homeAct = E5Action(self.trUtf8('Home'), UI.PixmapCache.getIcon("home.png"), - self.trUtf8('&Home'), - QKeySequence(self.trUtf8("Ctrl+Home","Go|Home")), + self.trUtf8('&Home'), + QKeySequence(self.trUtf8("Ctrl+Home", "Go|Home")), 0, self, 'help_go_home') self.homeAct.setStatusTip(self.trUtf8('Move to the initial help screen')) self.homeAct.setWhatsThis(self.trUtf8( @@ -554,11 +555,11 @@ self.homeAct.triggered[()].connect(self.__home) self.__actions.append(self.homeAct) - self.reloadAct = E5Action(self.trUtf8('Reload'), + self.reloadAct = E5Action(self.trUtf8('Reload'), UI.PixmapCache.getIcon("reload.png"), - self.trUtf8('&Reload'), - QKeySequence(self.trUtf8("Ctrl+R","Go|Reload")), - QKeySequence(self.trUtf8("F5","Go|Reload")), + self.trUtf8('&Reload'), + QKeySequence(self.trUtf8("Ctrl+R", "Go|Reload")), + QKeySequence(self.trUtf8("F5", "Go|Reload")), self, 'help_go_reload') self.reloadAct.setStatusTip(self.trUtf8('Reload the current help screen')) self.reloadAct.setWhatsThis(self.trUtf8( @@ -569,11 +570,11 @@ self.reloadAct.triggered[()].connect(self.__reload) self.__actions.append(self.reloadAct) - self.stopAct = E5Action(self.trUtf8('Stop'), + self.stopAct = E5Action(self.trUtf8('Stop'), UI.PixmapCache.getIcon("stopLoading.png"), - self.trUtf8('&Stop'), - QKeySequence(self.trUtf8("Ctrl+.","Go|Stop")), - QKeySequence(self.trUtf8("Esc","Go|Stop")), + self.trUtf8('&Stop'), + QKeySequence(self.trUtf8("Ctrl+.", "Go|Stop")), + QKeySequence(self.trUtf8("Esc", "Go|Stop")), self, 'help_go_stop') self.stopAct.setStatusTip(self.trUtf8('Stop loading')) self.stopAct.setWhatsThis(self.trUtf8( @@ -584,10 +585,10 @@ self.stopAct.triggered[()].connect(self.__stopLoading) self.__actions.append(self.stopAct) - self.copyAct = E5Action(self.trUtf8('Copy'), + self.copyAct = E5Action(self.trUtf8('Copy'), UI.PixmapCache.getIcon("editCopy.png"), - self.trUtf8('&Copy'), - QKeySequence(self.trUtf8("Ctrl+C","Edit|Copy")), + self.trUtf8('&Copy'), + QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")), 0, self, 'help_edit_copy') self.copyAct.setStatusTip(self.trUtf8('Copy the selected text')) self.copyAct.setWhatsThis(self.trUtf8( @@ -598,10 +599,10 @@ self.copyAct.triggered[()].connect(self.__copy) self.__actions.append(self.copyAct) - self.findAct = E5Action(self.trUtf8('Find...'), + self.findAct = E5Action(self.trUtf8('Find...'), UI.PixmapCache.getIcon("find.png"), - self.trUtf8('&Find...'), - QKeySequence(self.trUtf8("Ctrl+F","Edit|Find")), + self.trUtf8('&Find...'), + QKeySequence(self.trUtf8("Ctrl+F", "Edit|Find")), 0, self, 'help_edit_find') self.findAct.setStatusTip(self.trUtf8('Find text in page')) self.findAct.setWhatsThis(self.trUtf8( @@ -612,10 +613,10 @@ self.findAct.triggered[()].connect(self.__find) self.__actions.append(self.findAct) - self.findNextAct = E5Action(self.trUtf8('Find next'), + self.findNextAct = E5Action(self.trUtf8('Find next'), UI.PixmapCache.getIcon("findNext.png"), - self.trUtf8('Find &next'), - QKeySequence(self.trUtf8("F3","Edit|Find next")), + self.trUtf8('Find &next'), + QKeySequence(self.trUtf8("F3", "Edit|Find next")), 0, self, 'help_edit_find_next') self.findNextAct.setStatusTip(self.trUtf8('Find next occurrence of text in page')) self.findNextAct.setWhatsThis(self.trUtf8( @@ -626,10 +627,10 @@ self.findNextAct.triggered[()].connect(self.findDlg.findNext) self.__actions.append(self.findNextAct) - self.findPrevAct = E5Action(self.trUtf8('Find previous'), + self.findPrevAct = E5Action(self.trUtf8('Find previous'), UI.PixmapCache.getIcon("findPrev.png"), - self.trUtf8('Find &previous'), - QKeySequence(self.trUtf8("Shift+F3","Edit|Find previous")), + self.trUtf8('Find &previous'), + QKeySequence(self.trUtf8("Shift+F3", "Edit|Find previous")), 0, self, 'help_edit_find_previous') self.findPrevAct.setStatusTip( self.trUtf8('Find previous occurrence of text in page')) @@ -641,9 +642,9 @@ self.findPrevAct.triggered[()].connect(self.findDlg.findPrevious) self.__actions.append(self.findPrevAct) - self.bookmarksManageAct = E5Action(self.trUtf8('Manage Bookmarks'), - self.trUtf8('&Manage Bookmarks...'), - QKeySequence(self.trUtf8("Ctrl+Shift+B", "Help|Manage bookmarks")), + self.bookmarksManageAct = E5Action(self.trUtf8('Manage Bookmarks'), + self.trUtf8('&Manage Bookmarks...'), + QKeySequence(self.trUtf8("Ctrl+Shift+B", "Help|Manage bookmarks")), 0, self, 'help_bookmarks_manage') self.bookmarksManageAct.setStatusTip(self.trUtf8( 'Open a dialog to manage the bookmarks.')) @@ -655,10 +656,10 @@ self.bookmarksManageAct.triggered[()].connect(self.__showBookmarksDialog) self.__actions.append(self.bookmarksManageAct) - self.bookmarksAddAct = E5Action(self.trUtf8('Add Bookmark'), + self.bookmarksAddAct = E5Action(self.trUtf8('Add Bookmark'), UI.PixmapCache.getIcon("addBookmark.png"), - self.trUtf8('Add &Bookmark...'), - QKeySequence(self.trUtf8("Ctrl+D", "Help|Add bookmark")), + self.trUtf8('Add &Bookmark...'), + QKeySequence(self.trUtf8("Ctrl+D", "Help|Add bookmark")), 0, self, 'help_bookmark_add') self.bookmarksAddAct.setIconVisibleInMenu(False) self.bookmarksAddAct.setStatusTip(self.trUtf8('Open a dialog to add a bookmark.')) @@ -670,8 +671,8 @@ self.bookmarksAddAct.triggered[()].connect(self.__addBookmark) self.__actions.append(self.bookmarksAddAct) - self.bookmarksAddFolderAct = E5Action(self.trUtf8('Add Folder'), - self.trUtf8('Add &Folder...'), + self.bookmarksAddFolderAct = E5Action(self.trUtf8('Add Folder'), + self.trUtf8('Add &Folder...'), 0, 0, self, 'help_bookmark_show_all') self.bookmarksAddFolderAct.setStatusTip(self.trUtf8( 'Open a dialog to add a new bookmarks folder.')) @@ -683,8 +684,8 @@ self.bookmarksAddFolderAct.triggered[()].connect(self.__addBookmarkFolder) self.__actions.append(self.bookmarksAddFolderAct) - self.bookmarksAllTabsAct = E5Action(self.trUtf8('Bookmark All Tabs'), - self.trUtf8('Bookmark All Tabs...'), + self.bookmarksAllTabsAct = E5Action(self.trUtf8('Bookmark All Tabs'), + self.trUtf8('Bookmark All Tabs...'), 0, 0, self, 'help_bookmark_all_tabs') self.bookmarksAllTabsAct.setStatusTip(self.trUtf8( 'Bookmark all open tabs.')) @@ -697,10 +698,10 @@ self.bookmarksAllTabsAct.triggered[()].connect(self.bookmarkAll) self.__actions.append(self.bookmarksAllTabsAct) - self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), + self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), UI.PixmapCache.getIcon("whatsThis.png"), - self.trUtf8('&What\'s This?'), - QKeySequence(self.trUtf8("Shift+F1","Help|What's This?'")), + self.trUtf8('&What\'s This?'), + QKeySequence(self.trUtf8("Shift+F1", "Help|What's This?'")), 0, self, 'help_help_whats_this') self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help')) self.whatsThisAct.setWhatsThis(self.trUtf8( @@ -715,8 +716,8 @@ self.whatsThisAct.triggered[()].connect(self.__whatsThis) self.__actions.append(self.whatsThisAct) - self.aboutAct = E5Action(self.trUtf8('About'), - self.trUtf8('&About'), + self.aboutAct = E5Action(self.trUtf8('About'), + self.trUtf8('&About'), 0, 0, self, 'help_help_about') self.aboutAct.setStatusTip(self.trUtf8('Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( @@ -727,8 +728,8 @@ self.aboutAct.triggered[()].connect(self.__about) self.__actions.append(self.aboutAct) - self.aboutQtAct = E5Action(self.trUtf8('About Qt'), - self.trUtf8('About &Qt'), + self.aboutQtAct = E5Action(self.trUtf8('About Qt'), + self.trUtf8('About &Qt'), 0, 0, self, 'help_help_about_qt') self.aboutQtAct.setStatusTip( self.trUtf8('Display information about the Qt toolkit')) @@ -740,10 +741,10 @@ self.aboutQtAct.triggered[()].connect(self.__aboutQt) self.__actions.append(self.aboutQtAct) - self.zoomInAct = E5Action(self.trUtf8('Zoom in'), + self.zoomInAct = E5Action(self.trUtf8('Zoom in'), UI.PixmapCache.getIcon("zoomIn.png"), - self.trUtf8('Zoom &in'), - QKeySequence(self.trUtf8("Ctrl++","View|Zoom in")), + self.trUtf8('Zoom &in'), + QKeySequence(self.trUtf8("Ctrl++", "View|Zoom in")), 0, self, 'help_view_zoom_in') self.zoomInAct.setStatusTip(self.trUtf8('Zoom in on the text')) self.zoomInAct.setWhatsThis(self.trUtf8( @@ -754,10 +755,10 @@ self.zoomInAct.triggered[()].connect(self.__zoomIn) self.__actions.append(self.zoomInAct) - self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), + self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), UI.PixmapCache.getIcon("zoomOut.png"), - self.trUtf8('Zoom &out'), - QKeySequence(self.trUtf8("Ctrl+-","View|Zoom out")), + self.trUtf8('Zoom &out'), + QKeySequence(self.trUtf8("Ctrl+-", "View|Zoom out")), 0, self, 'help_view_zoom_out') self.zoomOutAct.setStatusTip(self.trUtf8('Zoom out on the text')) self.zoomOutAct.setWhatsThis(self.trUtf8( @@ -768,10 +769,10 @@ self.zoomOutAct.triggered[()].connect(self.__zoomOut) self.__actions.append(self.zoomOutAct) - self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), + self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), UI.PixmapCache.getIcon("zoomReset.png"), - self.trUtf8('Zoom &reset'), - QKeySequence(self.trUtf8("Ctrl+0","View|Zoom reset")), + self.trUtf8('Zoom &reset'), + QKeySequence(self.trUtf8("Ctrl+0", "View|Zoom reset")), 0, self, 'help_view_zoom_reset') self.zoomResetAct.setStatusTip(self.trUtf8('Reset the zoom of the text')) self.zoomResetAct.setWhatsThis(self.trUtf8( @@ -784,8 +785,8 @@ self.__actions.append(self.zoomResetAct) if hasattr(QWebSettings, 'ZoomTextOnly'): - self.zoomTextOnlyAct = E5Action(self.trUtf8('Zoom text only'), - self.trUtf8('Zoom &text only'), + self.zoomTextOnlyAct = E5Action(self.trUtf8('Zoom text only'), + self.trUtf8('Zoom &text only'), 0, 0, self, 'help_view_zoom_text_only') self.zoomTextOnlyAct.setCheckable(True) self.zoomTextOnlyAct.setStatusTip(self.trUtf8( @@ -800,8 +801,8 @@ else: self.zoomTextOnlyAct = None - self.pageSourceAct = E5Action(self.trUtf8('Show page source'), - self.trUtf8('Show page source'), + self.pageSourceAct = E5Action(self.trUtf8('Show page source'), + self.trUtf8('Show page source'), QKeySequence(self.trUtf8('Ctrl+U')), 0, self, 'help_show_page_source') self.pageSourceAct.setStatusTip(self.trUtf8('Show the page source in an editor')) @@ -814,9 +815,9 @@ self.__actions.append(self.pageSourceAct) self.addAction(self.pageSourceAct) - self.fullScreenAct = E5Action(self.trUtf8('Full Screen'), + self.fullScreenAct = E5Action(self.trUtf8('Full Screen'), UI.PixmapCache.getIcon("windowFullscreen.png"), - self.trUtf8('&Full Screen'), + self.trUtf8('&Full Screen'), QKeySequence(self.trUtf8('F11')), 0, self, 'help_view_full_scree') if not self.initShortcutsOnly: @@ -824,8 +825,8 @@ self.__actions.append(self.fullScreenAct) self.addAction(self.fullScreenAct) - self.nextTabAct = E5Action(self.trUtf8('Show next tab'), - self.trUtf8('Show next tab'), + self.nextTabAct = E5Action(self.trUtf8('Show next tab'), + self.trUtf8('Show next tab'), QKeySequence(self.trUtf8('Ctrl+Alt+Tab')), 0, self, 'help_view_next_tab') if not self.initShortcutsOnly: @@ -833,8 +834,8 @@ self.__actions.append(self.nextTabAct) self.addAction(self.nextTabAct) - self.prevTabAct = E5Action(self.trUtf8('Show previous tab'), - self.trUtf8('Show previous tab'), + self.prevTabAct = E5Action(self.trUtf8('Show previous tab'), + self.trUtf8('Show previous tab'), QKeySequence(self.trUtf8('Shift+Ctrl+Alt+Tab')), 0, self, 'help_view_previous_tab') if not self.initShortcutsOnly: @@ -842,8 +843,8 @@ self.__actions.append(self.prevTabAct) self.addAction(self.prevTabAct) - self.switchTabAct = E5Action(self.trUtf8('Switch between tabs'), - self.trUtf8('Switch between tabs'), + self.switchTabAct = E5Action(self.trUtf8('Switch between tabs'), + self.trUtf8('Switch between tabs'), QKeySequence(self.trUtf8('Ctrl+1')), 0, self, 'help_switch_tabs') if not self.initShortcutsOnly: @@ -903,9 +904,9 @@ self.offlineStorageAct.triggered[()].connect(self.__showOfflineStorageConfiguration) self.__actions.append(self.offlineStorageAct) - self.syncTocAct = E5Action(self.trUtf8('Sync with Table of Contents'), + self.syncTocAct = E5Action(self.trUtf8('Sync with Table of Contents'), UI.PixmapCache.getIcon("syncToc.png"), - self.trUtf8('Sync with Table of Contents'), + self.trUtf8('Sync with Table of Contents'), 0, 0, self, 'help_sync_toc') self.syncTocAct.setStatusTip(self.trUtf8( 'Synchronizes the table of contents with current page')) @@ -917,8 +918,8 @@ self.syncTocAct.triggered[()].connect(self.__syncTOC) self.__actions.append(self.syncTocAct) - self.showTocAct = E5Action(self.trUtf8('Table of Contents'), - self.trUtf8('Table of Contents'), + self.showTocAct = E5Action(self.trUtf8('Table of Contents'), + self.trUtf8('Table of Contents'), 0, 0, self, 'help_show_toc') self.showTocAct.setStatusTip(self.trUtf8( 'Shows the table of contents window')) @@ -930,8 +931,8 @@ self.showTocAct.triggered[()].connect(self.__showTocWindow) self.__actions.append(self.showTocAct) - self.showIndexAct = E5Action(self.trUtf8('Index'), - self.trUtf8('Index'), + self.showIndexAct = E5Action(self.trUtf8('Index'), + self.trUtf8('Index'), 0, 0, self, 'help_show_index') self.showIndexAct.setStatusTip(self.trUtf8( 'Shows the index window')) @@ -943,8 +944,8 @@ self.showIndexAct.triggered[()].connect(self.__showIndexWindow) self.__actions.append(self.showIndexAct) - self.showSearchAct = E5Action(self.trUtf8('Search'), - self.trUtf8('Search'), + self.showSearchAct = E5Action(self.trUtf8('Search'), + self.trUtf8('Search'), 0, 0, self, 'help_show_search') self.showSearchAct.setStatusTip(self.trUtf8( 'Shows the search window')) @@ -956,8 +957,8 @@ self.showSearchAct.triggered[()].connect(self.__showSearchWindow) self.__actions.append(self.showSearchAct) - self.manageQtHelpDocsAct = E5Action(self.trUtf8('Manage QtHelp Documents'), - self.trUtf8('Manage QtHelp &Documents'), + self.manageQtHelpDocsAct = E5Action(self.trUtf8('Manage QtHelp Documents'), + self.trUtf8('Manage QtHelp &Documents'), 0, 0, self, 'help_qthelp_documents') self.manageQtHelpDocsAct.setStatusTip(self.trUtf8( 'Shows a dialog to manage the QtHelp documentation set')) @@ -969,8 +970,8 @@ self.manageQtHelpDocsAct.triggered[()].connect(self.__manageQtHelpDocumentation) self.__actions.append(self.manageQtHelpDocsAct) - self.manageQtHelpFiltersAct = E5Action(self.trUtf8('Manage QtHelp Filters'), - self.trUtf8('Manage QtHelp &Filters'), + self.manageQtHelpFiltersAct = E5Action(self.trUtf8('Manage QtHelp Filters'), + self.trUtf8('Manage QtHelp &Filters'), 0, 0, self, 'help_qthelp_filters') self.manageQtHelpFiltersAct.setStatusTip(self.trUtf8( 'Shows a dialog to manage the QtHelp filters')) @@ -982,8 +983,8 @@ self.manageQtHelpFiltersAct.triggered[()].connect(self.__manageQtHelpFilters) self.__actions.append(self.manageQtHelpFiltersAct) - self.reindexDocumentationAct = E5Action(self.trUtf8('Reindex Documentation'), - self.trUtf8('&Reindex Documentation'), + self.reindexDocumentationAct = E5Action(self.trUtf8('Reindex Documentation'), + self.trUtf8('&Reindex Documentation'), 0, 0, self, 'help_qthelp_reindex') self.reindexDocumentationAct.setStatusTip(self.trUtf8( 'Reindexes the documentation set')) @@ -996,8 +997,8 @@ self.__searchEngine.reindexDocumentation) self.__actions.append(self.reindexDocumentationAct) - self.clearPrivateDataAct = E5Action(self.trUtf8('Clear private data'), - self.trUtf8('&Clear private data'), + self.clearPrivateDataAct = E5Action(self.trUtf8('Clear private data'), + self.trUtf8('&Clear private data'), 0, 0, self, 'help_clear_private_data') self.clearPrivateDataAct.setStatusTip(self.trUtf8('Clear private data')) @@ -1010,8 +1011,8 @@ self.clearPrivateDataAct.triggered[()].connect(self.__clearPrivateData) self.__actions.append(self.clearPrivateDataAct) - self.clearIconsAct = E5Action(self.trUtf8('Clear icons database'), - self.trUtf8('Clear &icons database'), + self.clearIconsAct = E5Action(self.trUtf8('Clear icons database'), + self.trUtf8('Clear &icons database'), 0, 0, self, 'help_clear_icons_db') self.clearIconsAct.setStatusTip(self.trUtf8('Clear the database of favicons')) @@ -1023,8 +1024,8 @@ self.clearIconsAct.triggered[()].connect(self.__clearIconsDatabase) self.__actions.append(self.clearIconsAct) - self.searchEnginesAct = E5Action(self.trUtf8('Configure Search Engines'), - self.trUtf8('Configure Search &Engines...'), + self.searchEnginesAct = E5Action(self.trUtf8('Configure Search Engines'), + self.trUtf8('Configure Search &Engines...'), 0, 0, self, 'help_search_engines') self.searchEnginesAct.setStatusTip(self.trUtf8( @@ -1037,8 +1038,8 @@ self.searchEnginesAct.triggered[()].connect(self.__showEnginesConfigurationDialog) self.__actions.append(self.searchEnginesAct) - self.passwordsAct = E5Action(self.trUtf8('Manage Saved Passwords'), - self.trUtf8('Manage Saved Passwords...'), + self.passwordsAct = E5Action(self.trUtf8('Manage Saved Passwords'), + self.trUtf8('Manage Saved Passwords...'), 0, 0, self, 'help_manage_passwords') self.passwordsAct.setStatusTip(self.trUtf8( @@ -1051,8 +1052,8 @@ self.passwordsAct.triggered[()].connect(self.__showPasswordsDialog) self.__actions.append(self.passwordsAct) - self.adblockAct = E5Action(self.trUtf8('Ad Block'), - self.trUtf8('&Ad Block...'), + self.adblockAct = E5Action(self.trUtf8('Ad Block'), + self.trUtf8('&Ad Block...'), 0, 0, self, 'help_adblock') self.adblockAct.setStatusTip(self.trUtf8( @@ -1066,8 +1067,8 @@ self.__actions.append(self.adblockAct) if SSL_AVAILABLE: - self.certificatesAct = E5Action(self.trUtf8('Manage Certificates'), - self.trUtf8('Manage Certificates...'), + self.certificatesAct = E5Action(self.trUtf8('Manage Certificates'), + self.trUtf8('Manage Certificates...'), 0, 0, self, 'help_manage_certificates') self.certificatesAct.setStatusTip(self.trUtf8( @@ -1080,8 +1081,8 @@ self.certificatesAct.triggered[()].connect(self.__showCertificatesDialog) self.__actions.append(self.certificatesAct) - self.toolsMonitorAct = E5Action(self.trUtf8('Show Network Monitor'), - self.trUtf8('Show &Network Monitor'), + self.toolsMonitorAct = E5Action(self.trUtf8('Show Network Monitor'), + self.trUtf8('Show &Network Monitor'), 0, 0, self, 'help_tools_network_monitor') self.toolsMonitorAct.setStatusTip(self.trUtf8('Show the network monitor dialog')) @@ -1093,8 +1094,8 @@ self.toolsMonitorAct.triggered[()].connect(self.__showNetworkMonitor) self.__actions.append(self.toolsMonitorAct) - self.showDownloadManagerAct = E5Action(self.trUtf8('Downloads'), - self.trUtf8('Downloads'), + self.showDownloadManagerAct = E5Action(self.trUtf8('Downloads'), + self.trUtf8('Downloads'), 0, 0, self, 'help_show_downloads') self.showDownloadManagerAct.setStatusTip(self.trUtf8( 'Shows the downloads window')) @@ -1110,7 +1111,7 @@ self.forwardAct.setEnabled(False) # now read the keyboard shortcuts for the actions - Shortcuts.readShortcuts(helpViewer = self) + Shortcuts.readShortcuts(helpViewer=self) def getActions(self): """ @@ -1429,7 +1430,7 @@ self.historyManager().updateHistoryEntry( self.currentBrowser().url().toString(), title) - def newTab(self, link = None): + def newTab(self, link=None): """ Public slot called to open a new help window tab. @@ -1437,7 +1438,7 @@ """ self.tabWidget.newBrowser(link) - def newWindow(self, link = None): + def newWindow(self, link=None): """ Public slot called to open a new help browser dialog. @@ -1457,7 +1458,7 @@ Private slot called to open a file. """ fn = E5FileDialog.getOpenFileName( - self, + self, self.trUtf8("Open File"), "", self.trUtf8("Help Files (*.html *.htm);;" @@ -1477,7 +1478,7 @@ Private slot called to open a file in a new tab. """ fn = E5FileDialog.getOpenFileName( - self, + self, self.trUtf8("Open File"), "", self.trUtf8("Help Files (*.html *.htm);;" @@ -1831,9 +1832,9 @@ """ Private slot to set the preferences. """ - dlg = ConfigurationDialog(self, 'Configuration', True, - fromEric = self.fromEric, - displayMode = ConfigurationDialog.HelpBrowserMode) + dlg = ConfigurationDialog(self, 'Configuration', True, + fromEric=self.fromEric, + displayMode=ConfigurationDialog.HelpBrowserMode) dlg.preferencesChanged.connect(self.preferencesChanged) dlg.show() if self.__lastConfigurationPageName: @@ -1895,7 +1896,7 @@ """ if cls._helpEngine is None: cls._helpEngine = \ - QHelpEngine(os.path.join(Utilities.getConfigDir(), + QHelpEngine(os.path.join(Utilities.getConfigDir(), "browser", "eric5help.qhc")) return cls._helpEngine @@ -2043,7 +2044,7 @@ dlg = QtHelpDocumentationDialog(self.__helpEngine, self) dlg.exec_() if dlg.hasChanges(): - for i in sorted(dlg.getTabsToClose(), reverse = True): + for i in sorted(dlg.getTabsToClose(), reverse=True): self.tabWidget.closeBrowserAt(i) self.__helpEngine.setupData() @@ -2233,9 +2234,9 @@ """ dlg = HelpClearPrivateDataDialog(self) if dlg.exec_() == QDialog.Accepted: - # browsing history, search history, favicons, disk cache, cookies, + # browsing history, search history, favicons, disk cache, cookies, # passwords, web databases, downloads - history, searches, favicons, cache, cookies, + history, searches, favicons, cache, cookies, passwords, databases, downloads = \ dlg.getData() if history: @@ -2330,7 +2331,7 @@ """ from QScintilla.MiniEditor import MiniEditor src = self.currentBrowser().page().mainFrame().toHtml() - editor = MiniEditor(parent = self) + editor = MiniEditor(parent=self) editor.setText(src, "Html") editor.setLanguage("dummy.html") editor.show() @@ -2395,7 +2396,7 @@ def openUrlNewTab(self, url, title): """ - Public slot to load a URL from the bookmarks menu or bookmarks toolbar + Public slot to load a URL from the bookmarks menu or bookmarks toolbar in a new tab. @param url url to be opened (QUrl) @@ -2479,7 +2480,7 @@ codecs = [] for codec in QTextCodec.availableCodecs(): - codecs.append(str(codec, encoding = "utf-8").lower()) + codecs.append(str(codec, encoding="utf-8").lower()) codecs.sort() defaultTextEncoding = QWebSettings.globalSettings().defaultTextEncoding().lower()
--- a/Helpviewer/History/HistoryCompleter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryCompleter.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ from .HistoryModel import HistoryModel from .HistoryFilterModel import HistoryFilterModel + class HistoryCompletionView(QTableView): """ Class implementing a special completer view for history based completions. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -57,13 +58,14 @@ metrics = self.fontMetrics() return metrics.height() + class HistoryCompletionModel(QSortFilterProxyModel): """ Class implementing a special model for history based completions. """ HistoryCompletionRole = HistoryFilterModel.MaxRole + 1 - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -78,7 +80,7 @@ self.setDynamicSortFilter(True) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -173,7 +175,7 @@ """ Protected method used to sort the displayed items. - It implements a special sorting function based on the history entry's + It implements a special sorting function based on the history entry's frequency giving a bonus to hits that match on a word boundary so that e.g. "dot.python-projects.org" is a better result for typing "dot" than "slashdot.org". However, it only looks for the string in the host name, @@ -206,8 +208,9 @@ # Sort results in descending frequency-derived score. return frequency_R < frequency_L + class HistoryCompleter(QCompleter): - def __init__(self, model, parent = None): + def __init__(self, model, parent=None): """ Constructor
--- a/Helpviewer/History/HistoryDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,6 +19,7 @@ import UI.PixmapCache + class HistoryDialog(QDialog, Ui_HistoryDialog): """ Class implementing a dialog to manage history. @@ -29,7 +30,7 @@ openUrl = pyqtSignal(QUrl, str) newUrl = pyqtSignal(QUrl, str) - def __init__(self, parent = None, manager = None): + def __init__(self, parent=None, manager=None): """ Constructor @@ -120,11 +121,11 @@ idx = self.historyTree.currentIndex() if newTab: self.newUrl.emit( - idx.data(HistoryModel.UrlRole), + idx.data(HistoryModel.UrlRole), idx.data(HistoryModel.TitleRole)) else: self.openUrl.emit( - idx.data(HistoryModel.UrlRole), + idx.data(HistoryModel.UrlRole), idx.data(HistoryModel.TitleRole)) def __copyHistory(self):
--- a/Helpviewer/History/HistoryFilterModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryFilterModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .HistoryModel import HistoryModel + class HistoryData(object): """ Class storing some history data. """ - def __init__(self, offset, frequency = 0): + def __init__(self, offset, frequency=0): """ Constructor @@ -41,7 +42,7 @@ """ Special method determining less relation. - Note: Like the actual history entries the index mapping is sorted in reverse + Note: Like the actual history entries the index mapping is sorted in reverse order by offset @param other reference to the history data object to compare against @@ -50,6 +51,7 @@ """ return self.tailOffset > other.tailOffset + class HistoryFilterModel(QAbstractProxyModel): """ Class implementing the history filter model. @@ -57,7 +59,7 @@ FrequencyRole = HistoryModel.MaxRole + 1 MaxRole = FrequencyRole - def __init__(self, sourceModel, parent = None): + def __init__(self, sourceModel, parent=None): """ Constructor @@ -96,7 +98,7 @@ return self.sourceModel().rowCount() - self.__historyDict[url] - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -140,7 +142,7 @@ self.dataChanged.emit( self.mapFromSource(topLeft), self.mapFromSource(bottomRight)) - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -164,7 +166,7 @@ self.__loaded = False self.reset() - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -176,7 +178,7 @@ return 0 return len(self.__historyDict) - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -217,7 +219,7 @@ return self.createIndex(row, sourceIndex.column(), sourceOffset) - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to create an index. @@ -292,7 +294,7 @@ self.endRemoveRows() self.beginInsertRows(QModelIndex(), 0, 0) - self.__filteredRows.insert(0, HistoryData(self.sourceModel().rowCount(), + self.__filteredRows.insert(0, HistoryData(self.sourceModel().rowCount(), self.__frequencyScore(idx) + currentFrequency)) self.__historyDict[url] = self.sourceModel().rowCount() self.endInsertRows() @@ -307,7 +309,7 @@ """ self.__sourceReset() - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove entries from the model.
--- a/Helpviewer/History/HistoryManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,11 +23,12 @@ HISTORY_VERSION = 42 + class HistoryEntry(object): """ Class implementing a history entry. """ - def __init__(self, url = None, dateTime = None, title = None): + def __init__(self, url=None, dateTime=None, title=None): """ Constructor @@ -74,6 +75,7 @@ return self.url return self.title + class HistoryManager(QWebHistoryInterface): """ Class implementing the history manager. @@ -90,7 +92,7 @@ entryRemoved = pyqtSignal(HistoryEntry) entryUpdated = pyqtSignal(int) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -140,7 +142,7 @@ """ return self.__history[:] - def setHistory(self, history, loadedAndSorted = False): + def setHistory(self, history, loadedAndSorted=False): """ Public method to set a new history. @@ -227,7 +229,7 @@ self.entryUpdated.emit(index) break - def removeHistoryEntry(self, url, title = ""): + def removeHistoryEntry(self, url, title=""): """ Public method to remove a history entry.
--- a/Helpviewer/History/HistoryMenu.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryMenu.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ import UI.PixmapCache + class HistoryMenuModel(QAbstractProxyModel): """ Class implementing a model for the history menu. @@ -29,7 +30,7 @@ """ MOVEDROWS = 15 - def __init__(self, sourceModel, parent = None): + def __init__(self, sourceModel, parent=None): """ Constructor @@ -53,7 +54,7 @@ return 0 return min(self.__treeModel.rowCount(first), self.MOVEDROWS) - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -62,7 +63,7 @@ """ return self.__treeModel.columnCount(self.mapToSource(parent)) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -115,12 +116,12 @@ if proxyIndex.internalId() == sys.maxsize: bumpedItems = self.bumpedRows() if proxyIndex.row() < bumpedItems: - return self.__treeModel.index(proxyIndex.row(), proxyIndex.column(), + return self.__treeModel.index(proxyIndex.row(), proxyIndex.column(), self.__treeModel.index(0, 0)) if bumpedItems <= self.MOVEDROWS and \ bumpedItems == self.sourceModel().rowCount(self.__treeModel.index(0, 0)): bumpedItems -= 1 - return self.__treeModel.index(proxyIndex.row() - bumpedItems, + return self.__treeModel.index(proxyIndex.row() - bumpedItems, proxyIndex.column()) historyIndex = self.__treeModel.sourceModel()\ @@ -128,7 +129,7 @@ treeIndex = self.__treeModel.mapFromSource(historyIndex) return treeIndex - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to create an index. @@ -179,8 +180,8 @@ bumpedItems == self.sourceModel().rowCount(self.sourceModel().index(0, 0)): bumpedItems -= 1 - return self.createIndex(bumpedItems + treeIndexParent.row(), - treeIndexParent.column(), + return self.createIndex(bumpedItems + treeIndexParent.row(), + treeIndexParent.column(), sourceRow) def mimeData(self, indexes): @@ -199,6 +200,7 @@ mdata.setUrls(urls) return mdata + class HistoryMenu(E5ModelMenu): """ Class implementing the history menu. @@ -209,7 +211,7 @@ openUrl = pyqtSignal(QUrl, str) newUrl = pyqtSignal(QUrl, str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -234,11 +236,11 @@ """ if self._keyboardModifiers & Qt.ControlModifier: self.newUrl.emit( - idx.data(HistoryModel.UrlRole), + idx.data(HistoryModel.UrlRole), idx.data(HistoryModel.TitleRole)) else: self.openUrl.emit( - idx.data(HistoryModel.UrlRole), + idx.data(HistoryModel.UrlRole), idx.data(HistoryModel.TitleRole)) def prePopulated(self): @@ -269,10 +271,10 @@ if len(self.__historyManager.history()) > 0: self.addSeparator() - act = self.addAction(UI.PixmapCache.getIcon("history.png"), + act = self.addAction(UI.PixmapCache.getIcon("history.png"), self.trUtf8("Show All History...")) act.triggered[()].connect(self.__showHistoryDialog) - act = self.addAction(UI.PixmapCache.getIcon("historyClear.png"), + act = self.addAction(UI.PixmapCache.getIcon("historyClear.png"), self.trUtf8("Clear History...")) act.triggered[()].connect(self.__clearHistoryDialog)
--- a/Helpviewer/History/HistoryModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ import Helpviewer.HelpWindow + class HistoryModel(QAbstractTableModel): """ Class implementing the history model. @@ -22,7 +23,7 @@ TitleRole = Qt.UserRole + 5 MaxRole = TitleRole - def __init__(self, historyManager, parent = None): + def __init__(self, historyManager, parent=None): """ Constructor @@ -34,8 +35,8 @@ self.__historyManager = historyManager self.__headers = [ - self.trUtf8("Title"), - self.trUtf8("Address"), + self.trUtf8("Title"), + self.trUtf8("Address"), ] self.__historyManager.historyReset.connect(self.historyReset) @@ -65,7 +66,7 @@ idx = self.index(row, 0) self.dataChanged.emit(idx, idx) - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -81,7 +82,7 @@ pass return QAbstractTableModel.headerData(self, section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -115,7 +116,7 @@ return None - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -127,7 +128,7 @@ else: return len(self.__headers) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -139,7 +140,7 @@ else: return len(self.__historyManager.history()) - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove history entries from the model.
--- a/Helpviewer/History/HistoryTreeModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/History/HistoryTreeModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import UI.PixmapCache + class HistoryTreeModel(QAbstractProxyModel): """ Class implementing the history tree model. """ - def __init__(self, sourceModel, parent = None): + def __init__(self, sourceModel, parent=None): """ Constructor @@ -34,7 +35,7 @@ self.setSourceModel(sourceModel) - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -45,7 +46,7 @@ """ return self.sourceModel().headerData(section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -79,7 +80,7 @@ return QAbstractProxyModel.data(self, index, role) - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -88,7 +89,7 @@ """ return self.sourceModel().columnCount(self.mapToSource(parent)) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -125,7 +126,7 @@ def __sourceDateRow(self, row): """ - Private method to translate the top level date row into the offset + Private method to translate the top level date row into the offset where that date starts. @param row row number of the date (integer) @@ -158,7 +159,7 @@ return self.sourceModel().index( startDateRow + proxyIndex.row(), proxyIndex.column()) - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to create an index. @@ -189,7 +190,7 @@ return QModelIndex() return self.createIndex(offset - 1, 0, 0) - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check, if an entry has some children. @@ -290,7 +291,7 @@ row = sourceIndex.row() - self.__sourceRowCache[dateRow] return self.createIndex(row, sourceIndex.column(), dateRow + 1) - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove entries from the model.
--- a/Helpviewer/Network/AboutAccessHandler.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/AboutAccessHandler.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .NetworkProtocolUnknownErrorReply import NetworkProtocolUnknownErrorReply + class AboutAccessHandler(SchemeAccessHandler): """ Class implementing a scheme access handler for about schemes. """ - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request.
--- a/Helpviewer/Network/FtpAccessHandler.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/FtpAccessHandler.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .SchemeAccessHandler import SchemeAccessHandler from .FtpReply import FtpReply + class FtpAccessHandler(SchemeAccessHandler): """ Class implementing a scheme access handler for FTP. """ - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request.
--- a/Helpviewer/Network/FtpReply.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/FtpReply.py Fri Mar 11 16:51:57 2011 +0100 @@ -90,11 +90,12 @@ </html> """ + class FtpReply(QNetworkReply): """ Class implementing a network reply for FTP resources. """ - def __init__(self, url, parent = None): + def __init__(self, url, parent=None): """ Constructor @@ -129,7 +130,7 @@ ftpProxy = proxy break if ftpProxy.type() == QNetworkProxy.DefaultProxy: - self.setError(QNetworkReply.ProxyNotFoundError, + self.setError(QNetworkReply.ProxyNotFoundError, self.trUtf8("No suitable proxy found.")) QTimer.singleShot(0, self.__errorSignals) return @@ -284,7 +285,7 @@ self.setAttribute(QNetworkRequest.HttpReasonPhraseAttribute, "Ok") self.metaDataChanged.emit() - def __cssLinkClass(self, icon, size = 32): + def __cssLinkClass(self, icon, size=32): """ Private method to generate a link class with an icon. @@ -307,7 +308,7 @@ pixmap.fill(Qt.transparent) imageBuffer.buffer().clear() pixmap.save(imageBuffer, "PNG") - return cssString.format(size + 4, + return cssString.format(size + 4, str(imageBuffer.buffer().toBase64(), encoding="ascii")) def __setListContent(self): @@ -384,19 +385,19 @@ self.__cssLinkClass(icon, iconSize).format(linkClass) table += row.format( i == 0 and "odd" or "even", - linkClass, - child.toString(), - Qt.escape(item.name()), + linkClass, + child.toString(), + Qt.escape(item.name()), sizeStr, - item.lastModified().toString("yyyy-MM-dd hh:mm"), + item.lastModified().toString("yyyy-MM-dd hh:mm"), ) i = 1 - i content = ftpListPage_html.format( - Qt.escape(baseUrl), - "".join(linkClasses.values()), - self.trUtf8("Listing of {0}").format(basePath), - parentStr, + Qt.escape(baseUrl), + "".join(linkClasses.values()), + self.trUtf8("Listing of {0}").format(basePath), + parentStr, table ) self.__content = QByteArray(content.encode("utf8"))
--- a/Helpviewer/Network/NetworkAccessManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/NetworkAccessManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -42,6 +42,7 @@ import Preferences import Utilities + class NetworkAccessManager(QNetworkAccessManager): """ Class implementing a QNetworkAccessManager subclass. @@ -52,7 +53,7 @@ requestCreated = pyqtSignal( QNetworkAccessManager.Operation, QNetworkRequest, QNetworkReply) - def __init__(self, engine, parent = None): + def __init__(self, engine, parent=None): """ Constructor @@ -104,7 +105,7 @@ """ self.__schemeHandlers[scheme] = handler - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request. @@ -137,7 +138,7 @@ req.setRawHeader("Accept-Language", self.__acceptLanguage) # set cache policy - req.setAttribute(QNetworkRequest.CacheLoadControlAttribute, + req.setAttribute(QNetworkRequest.CacheLoadControlAttribute, Preferences.getHelp("CachePolicy")) # AdBlock code @@ -171,8 +172,8 @@ info = self.trUtf8("<b>Enter username and password for '{0}', " "realm '{1}'</b>").format(urlRoot, auth.realm()) - dlg = AuthenticationDialog(info, auth.user(), - Preferences.getHelp("SavePasswords"), + dlg = AuthenticationDialog(info, auth.user(), + Preferences.getHelp("SavePasswords"), Preferences.getHelp("SavePasswords")) if Preferences.getHelp("SavePasswords"): username, password = \ @@ -228,7 +229,7 @@ """<ul><li>{1}</li></ul></p>""" """<p>Do you want to ignore these errors?</p>""")\ .format(reply.url().toString(), errorString), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if ret: if len(caNew) > 0: @@ -260,7 +261,7 @@ for cert in caMerge[server]: pems.append(cert.toPem() + '\n') certificateDict[server] = pems - Preferences.Prefs.settings.setValue("Help/CaCertificatesDict", + Preferences.Prefs.settings.setValue("Help/CaCertificatesDict", certificateDict) else: reply.abort() @@ -293,7 +294,7 @@ cert.issuerInfo(QSslCertificate.CommonName))) result += self.trUtf8("<br/>Not valid before: {0}<br/>Valid Until: {1}")\ - .format(cert.effectiveDate().toString("yyyy-MM-dd"), + .format(cert.effectiveDate().toString("yyyy-MM-dd"), cert.expiryDate().toString("yyyy-MM-dd")) result += "</p>" @@ -323,7 +324,7 @@ Public slot to (re-)load the list of accepted languages. """ languages = Preferences.toList( - Preferences.Prefs.settings.value("Help/AcceptLanguages", + Preferences.Prefs.settings.value("Help/AcceptLanguages", HelpLanguagesDialog.defaultAcceptLanguages())) self.__acceptLanguage = HelpLanguagesDialog.httpString(languages)
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/NetworkAccessManagerProxy.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,13 +14,14 @@ except ImportError: SSL_AVAILABLE = False + class NetworkAccessManagerProxy(QNetworkAccessManager): """ Class implementing a network access manager proxy for web pages. """ primaryManager = None - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -60,7 +61,7 @@ self.__class__.primaryManager.authenticationRequired) self.finished.connect(self.__class__.primaryManager.finished) - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request.
--- a/Helpviewer/Network/NetworkDiskCache.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/NetworkDiskCache.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtWebKit import QWebSettings from PyQt4.QtNetwork import QNetworkDiskCache + class NetworkDiskCache(QNetworkDiskCache): """ Class implementing a disk cache respecting privacy.
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtCore import * from PyQt4.QtNetwork import QNetworkReply + class NetworkProtocolUnknownErrorReply(QNetworkReply): """ Class implementing a QNetworkReply subclass reporting an unknown protocol error. """ - def __init__(self, protocol, parent = None): + def __init__(self, protocol, parent=None): """ Constructor @@ -22,7 +23,7 @@ @param parent reference to the parent object (QObject) """ QNetworkReply.__init__(self, parent) - self.setError(QNetworkReply.ProtocolUnknownError, + self.setError(QNetworkReply.ProtocolUnknownError, self.trUtf8("Protocol '{0}' not supported.").format(protocol)) QTimer.singleShot(0, self.__fireSignals)
--- a/Helpviewer/Network/NetworkReply.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/NetworkReply.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtCore import * from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest + class NetworkReply(QNetworkReply): """ Class implementing a QNetworkReply subclass for special data. """ - def __init__(self, request, fileData, mimeType, parent = None): + def __init__(self, request, fileData, mimeType, parent=None): """ Constructor @@ -31,7 +32,7 @@ self.setOpenMode(QIODevice.ReadOnly) self.setHeader(QNetworkRequest.ContentTypeHeader, mimeType) - self.setHeader(QNetworkRequest.ContentLengthHeader, + self.setHeader(QNetworkRequest.ContentLengthHeader, QByteArray.number(fileData.length())) self.setAttribute(QNetworkRequest.HttpStatusCodeAttribute, 200) self.setAttribute(QNetworkRequest.HttpReasonPhraseAttribute, "OK")
--- a/Helpviewer/Network/PyrcAccessHandler.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/PyrcAccessHandler.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ import UI.PixmapCache + class PyrcAccessHandler(SchemeAccessHandler): """ Class implementing a scheme access handler for Python resources. """ - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request. @@ -38,7 +39,7 @@ imageBuffer = QBuffer() imageBuffer.open(QIODevice.ReadWrite) if pixmap.save(imageBuffer, "PNG"): - html = html.replace("IMAGE_BINARY_DATA_HERE", + html = html.replace("IMAGE_BINARY_DATA_HERE", bytes(imageBuffer.buffer().toBase64()).decode()) return NetworkReply(request, QByteArray(html), "text/html", self.parent())
--- a/Helpviewer/Network/QtHelpAccessHandler.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/QtHelpAccessHandler.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,42 +19,43 @@ QtDocPath = "qthelp://com.trolltech." ExtensionMap = { - ".bmp" : "image/bmp", - ".css" : "text/css", - ".gif" : "image/gif", - ".html" : "text/html", - ".htm" : "text/html", - ".ico" : "image/x-icon", - ".jpeg" : "image/jpeg", - ".jpg" : "image/jpeg", - ".js" : "application/x-javascript", - ".mng" : "video/x-mng", - ".pbm" : "image/x-portable-bitmap", - ".pgm" : "image/x-portable-graymap", - ".pdf" : "application/pdf", - ".png" : "image/png", - ".ppm" : "image/x-portable-pixmap", - ".rss" : "application/rss+xml", - ".svg" : "image/svg+xml", - ".svgz" : "image/svg+xml", - ".text" : "text/plain", - ".tif" : "image/tiff", - ".tiff" : "image/tiff", - ".txt" : "text/plain", - ".xbm" : "image/x-xbitmap", - ".xml" : "text/xml", - ".xpm" : "image/x-xpm", - ".xsl" : "text/xsl", - ".xhtml" : "application/xhtml+xml", - ".wml" : "text/vnd.wap.wml", - ".wmlc" : "application/vnd.wap.wmlc", + ".bmp": "image/bmp", + ".css": "text/css", + ".gif": "image/gif", + ".html": "text/html", + ".htm": "text/html", + ".ico": "image/x-icon", + ".jpeg": "image/jpeg", + ".jpg": "image/jpeg", + ".js": "application/x-javascript", + ".mng": "video/x-mng", + ".pbm": "image/x-portable-bitmap", + ".pgm": "image/x-portable-graymap", + ".pdf": "application/pdf", + ".png": "image/png", + ".ppm": "image/x-portable-pixmap", + ".rss": "application/rss+xml", + ".svg": "image/svg+xml", + ".svgz": "image/svg+xml", + ".text": "text/plain", + ".tif": "image/tiff", + ".tiff": "image/tiff", + ".txt": "text/plain", + ".xbm": "image/x-xbitmap", + ".xml": "text/xml", + ".xpm": "image/x-xpm", + ".xsl": "text/xsl", + ".xhtml": "application/xhtml+xml", + ".wml": "text/vnd.wap.wml", + ".wmlc": "application/vnd.wap.wmlc", } + class QtHelpAccessHandler(SchemeAccessHandler): """ Class implementing a scheme access handler for QtHelp. """ - def __init__(self, engine, parent = None): + def __init__(self, engine, parent=None): """ Constructor @@ -78,7 +79,7 @@ else: return "application/octet-stream" - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request. @@ -92,7 +93,7 @@ strUrl = url.toString() # For some reason the url to load is already wrong (passed from webkit) - # though the css file and the references inside should work that way. One + # though the css file and the references inside should work that way. One # possible problem might be that the css is loaded at the same level as the # html, thus a path inside the css like (../images/foo.png) might cd out of # the virtual folder @@ -117,4 +118,3 @@ """<h1>The page could not be found</h1><br>""" """<h3>'{0}'</h3></div>""").format(strUrl).encode("utf-8")) return NetworkReply(request, data, mimeType, self.parent()) -
--- a/Helpviewer/Network/SchemeAccessHandler.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Network/SchemeAccessHandler.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,11 +9,12 @@ from PyQt4.QtCore import QObject + class SchemeAccessHandler(QObject): """ Clase implementing the base class for specific scheme access handlers. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -21,7 +22,7 @@ """ QObject.__init__(self, parent) - def createRequest(self, op, request, outgoingData = None): + def createRequest(self, op, request, outgoingData=None): """ Protected method to create a request.
--- a/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import Preferences + class OfflineStorageConfigDialog(QDialog, Ui_OfflineStorageConfigDialog): """ Class implementing a dialog to configure the offline storage. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -52,19 +53,19 @@ """ Public slot to store the configuration data. """ - Preferences.setHelp("OfflineStorageDatabaseEnabled", + Preferences.setHelp("OfflineStorageDatabaseEnabled", self.databaseEnabledCheckBox.isChecked()) - Preferences.setHelp("OfflineStorageDatabaseQuota", + Preferences.setHelp("OfflineStorageDatabaseQuota", self.databaseQuotaSpinBox.value()) if self.applicationCacheGroup.isEnabled(): - Preferences.setHelp("OfflineWebApplicationCacheEnabled", + Preferences.setHelp("OfflineWebApplicationCacheEnabled", self.applicationCacheEnabledCheckBox.isChecked()) - Preferences.setHelp("OfflineWebApplicationCacheQuota", + Preferences.setHelp("OfflineWebApplicationCacheQuota", self.applicationCacheQuotaSpinBox.value()) if self.localStorageGroup.isEnabled(): - Preferences.setHelp("LocalStorageEnabled", + Preferences.setHelp("LocalStorageEnabled", self.localStorageEnabledCheckBox.isChecked()) @pyqtSlot()
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ import UI.PixmapCache + class WebDatabasesDialog(QDialog, Ui_WebDatabasesDialog): """ Class implementing a dialog to show all web databases. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -48,6 +49,6 @@ header = fm.width("m") * 30 self.databasesTree.header().resizeSection(0, header) self.databasesTree.model().sort( - self.databasesTree.header().sortIndicatorSection(), + self.databasesTree.header().sortIndicatorSection(), Qt.AscendingOrder) self.databasesTree.expandAll()
--- a/Helpviewer/OfflineStorage/WebDatabasesModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OfflineStorage/WebDatabasesModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from PyQt4.QtCore import QAbstractItemModel, QModelIndex, Qt from PyQt4.QtWebKit import QWebSecurityOrigin, QWebDatabase + class WebDatabasesModel(QAbstractItemModel): """ Class implementing the web databases model. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -24,7 +25,7 @@ """ QAbstractItemModel.__init__(self, parent) self.__headers = [ - self.trUtf8("Name"), + self.trUtf8("Name"), self.trUtf8("Size") ] @@ -32,7 +33,7 @@ for origin in QWebSecurityOrigin.allOrigins(): self.__data.append([origin, origin.databases()]) - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove databases from the model. @@ -53,7 +54,7 @@ self.endRemoveRows() else: for parentRow in range(row, row + count): - self.beginRemoveRows(self.index(parentRow, 0, parent), + self.beginRemoveRows(self.index(parentRow, 0, parent), 0, len(self.__data[parentRow][1]) - 1) for db in self.__data[parentRow][1]: QWebDatabase.removeDatabase(db) @@ -62,7 +63,7 @@ return True - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -78,7 +79,7 @@ pass return QAbstractItemModel.headerData(self, section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -99,14 +100,14 @@ return self.trUtf8("Local") elif origin.port() == 0: return "{0}://{1}".format( - origin.scheme(), - origin.host(), + origin.scheme(), + origin.host(), ) else: return "{0}://{1}:{2}".format( - origin.scheme(), - origin.host(), - origin.port(), + origin.scheme(), + origin.host(), + origin.port(), ) elif index.column() == 1: return self.__dataString(origin.databaseUsage()) @@ -118,7 +119,7 @@ elif index.column() == 1: return self.__dataString(db.size()) - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns. @@ -130,7 +131,7 @@ else: return len(self.__headers) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to determine the number of rows. @@ -145,7 +146,7 @@ else: return len(self.__data[parent.row()][1]) - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to get a model index for an entry. @@ -163,7 +164,7 @@ else: return self.createIndex(row, column, sys.maxsize) - def parent(self, index = QModelIndex()): + def parent(self, index=QModelIndex()): """ Public method to get the index of the parent entry. @@ -178,7 +179,7 @@ return self.createIndex(index.internalId(), 0) - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check, if a parent node has some children.
--- a/Helpviewer/OpenSearch/OpenSearchDefaultEngines.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchDefaultEngines.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,80 +8,80 @@ """ OpenSearchDefaultEngines = { - "Amazon_com" : """<?xml version="1.0" encoding="UTF-8"?> + "Amazon_com": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Amazon.com</ShortName> <Description>Amazon.com Search</Description> <Url method="get" type="text/html" template="http://www.amazon.com/exec/obidos/external-search/?field-keywords={searchTerms}" /> <Image width="16" height="16">http://www.amazon.com/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "Bing" : """<?xml version="1.0" encoding="UTF-8"?> + "Bing": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Bing</ShortName> <Description>Bing Web Search</Description> <Url method="get" type="text/html" template="http://www.bing.com/search?cc={language}&q={searchTerms}" /> <Image width="16" height="16">http://www.bing.com/s/wlflag.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "Google" : """<?xml version="1.0" encoding="UTF-8"?> + "Google": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Google</ShortName> <Description>Google Web Search</Description> <Url method="get" type="text/html" template="http://www.google.com/search?hl={language}&lr=lang_{language}&q={searchTerms}" /> <Url method="get" type="application/x-suggestions+json" template="http://suggestqueries.google.com/complete/search?json=t&hl={language}&q={searchTerms}&nolabels=t" /> <Image width="16" height="16">http://www.google.com/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "Google_Im_Feeling_Lucky" : """<?xml version="1.0" encoding="UTF-8"?> + "Google_Im_Feeling_Lucky": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Google (I'm Feeling Lucky)</ShortName> <Description>Google Web Search</Description> <Url method="get" type="text/html" template="http://www.google.com/search?btnI=&hl={language}&lr=lang_{language}&q={searchTerms}" /> <Url method="get" type="application/x-suggestions+json" template="http://suggestqueries.google.com/complete/search?json=t&hl={language}&q={searchTerms}&nolabels=t" /> <Image width="16" height="16">http://www.google.com/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "LinuxMagazin_de" : """<?xml version="1.0" encoding="UTF-8"?> + "LinuxMagazin_de": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Linux-Magazin</ShortName> <Description>Suche auf www.linux-magazin.de</Description> <Url type="text/html" method="GET" template="http://www.linux-magazin.de/content/search?SearchText={searchTerms}" /> <Image width="16" height="16">http://www.linux-magazin.de/extension/lnm/design/linux_magazin/images/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "Reddit" : """<?xml version="1.0" encoding="UTF-8"?> + "Reddit": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Reddit</ShortName> <Description>Reddit Site Search</Description> <Url method="get" type="text/html" template="http://www.reddit.com/search?q={searchTerms}" /> <Image width="16" height="16">http://www.reddit.com/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "Wikipedia_en" : """<?xml version="1.0" encoding="UTF-8"?> + "Wikipedia_en": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Wikipedia (en)</ShortName> <Description>Full text search in the English Wikipedia</Description> <Url method="get" type="text/html" template="http://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&fulltext=Search" /> <Url method="get" type="application/x-suggestions+json" template="http://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}&namespace=0" /> <Image width="16" height="16">http://en.wikipedia.org/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "Yahoo" : """<?xml version="1.0" encoding="UTF-8"?> + "Yahoo": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Yahoo!</ShortName> <Description>Yahoo Web Search</Description> <Url method="get" type="text/html" template="http://search.yahoo.com/search?ei=utf-8&fr=sfp&iscqry=&p={searchTerms}" /> <Url method="get" type="application/x-suggestions+json" template="http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}" /> <Image width="16" height="16">http://m.www.yahoo.com/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", - "YouTube" : """<?xml version="1.0" encoding="UTF-8"?> + "YouTube": """<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>YouTube</ShortName> <Description>YouTube</Description> <Url method="get" type="text/html" template="http://www.youtube.com/results?search_query={searchTerms}&search=Search" /> <Url method="get" type="application/x-suggestions+json" template="http://suggestqueries.google.com/complete/search?ds=yt&json=t&hl={language}&q={searchTerms}&nolabels=t" /> <Image width="16" height="16">http://www.youtube.com/favicon.ico</Image> - </OpenSearchDescription>""", + </OpenSearchDescription>""", }
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .Ui_OpenSearchDialog import Ui_OpenSearchDialog + class OpenSearchDialog(QDialog, Ui_OpenSearchDialog): """ Class implementing a dialog for the configuration of search engines. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor """
--- a/Helpviewer/OpenSearch/OpenSearchEditDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchEditDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_OpenSearchEditDialog import Ui_OpenSearchEditDialog + class OpenSearchEditDialog(QDialog, Ui_OpenSearchEditDialog): """ Class implementing a dialog to edit the data of a search engine. """ - def __init__(self, engine, parent = None): + def __init__(self, engine, parent=None): """ Constructor """
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,12 +18,13 @@ import Preferences + class OpenSearchEngine(QObject): """ Class implementing the open search engine. @signal imageChanged() emitted after the icon has been changed - @signal suggestions(list of strings) emitted after the suggestions have + @signal suggestions(list of strings) emitted after the suggestions have been received """ imageChanged = pyqtSignal() @@ -39,7 +40,7 @@ else: _language = loc[:2] - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -61,8 +62,8 @@ self.__searchMethod = "get" self.__suggestionsMethod = "get" self.__requestMethods = { - "get" : QNetworkAccessManager.GetOperation, - "post" : QNetworkAccessManager.PostOperation, + "get": QNetworkAccessManager.GetOperation, + "post": QNetworkAccessManager.PostOperation, } self.__replies = [] @@ -83,13 +84,13 @@ result = result.replace("{language}", cls._language) result = result.replace("{inputEncoding}", "UTF-8") result = result.replace("{outputEncoding}", "UTF-8") - result = result.replace("{searchTerms}", + result = result.replace("{searchTerms}", bytes(QUrl.toPercentEncoding(searchTerm)).decode()) result = re.sub(r"""\{([^\}]*:|)source\??\}""", Program, result) return result - @pyqtSlot(result = str) + @pyqtSlot(result=str) def name(self): """ Public method to get the name of the engine. @@ -152,7 +153,7 @@ if self.__searchMethod != "post": for parameter in self._searchParameters: - ret.addQueryItem(parameter[0], + ret.addQueryItem(parameter[0], self.parseTemplate(searchTerm, parameter[1])) return ret @@ -197,7 +198,7 @@ if self.__searchMethod != "post": for parameter in self._suggestionsParameters: - ret.addQueryItem(parameter[0], + ret.addQueryItem(parameter[0], self.parseTemplate(searchTerm, parameter[1])) return ret @@ -230,7 +231,7 @@ """ Public method to set the engine suggestions parameters. - @param suggestionsParameters suggestions parameters of the + @param suggestionsParameters suggestions parameters of the engine (list of two tuples) """ self._suggestionsParameters = suggestionsParameters[:] @@ -387,7 +388,7 @@ self._description == other._description and \ self._imageUrl == other._imageUrl and \ self._searchUrlTemplate == other._searchUrlTemplate and \ - self._suggestionsUrlTemplate ==other._suggestionsUrlTemplate and \ + self._suggestionsUrlTemplate == other._suggestionsUrlTemplate and \ self._searchParameters == other._searchParameters and \ self._suggestionsParameters == other._suggestionsParameters @@ -473,7 +474,7 @@ """ Public method to set the reference to the network access manager. - @param networkAccessManager reference to the network access manager + @param networkAccessManager reference to the network access manager object (QNetworkAccessManager) """ self.__networkAccessManager = networkAccessManager
--- a/Helpviewer/OpenSearch/OpenSearchEngineAction.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchEngineAction.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ import Helpviewer.HelpWindow + class OpenSearchEngineAction(QAction): """ Class implementing a QAction subclass for open search. """ - def __init__(self, engine, parent = None): + def __init__(self, engine, parent=None): """ Constructor
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from PyQt4.QtCore import * from PyQt4.QtGui import QPixmap, QIcon + class OpenSearchEngineModel(QAbstractTableModel): """ Class implementing a model for search engines. """ - def __init__(self, manager, parent = None): + def __init__(self, manager, parent=None): """ Constructor @@ -29,11 +30,11 @@ manager.changed.connect(self.__enginesChanged) self.__headers = [ - self.trUtf8("Name"), - self.trUtf8("Keywords"), + self.trUtf8("Name"), + self.trUtf8("Keywords"), ] - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove entries from the model. @@ -64,7 +65,7 @@ return True - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the number of rows of the model. @@ -76,7 +77,7 @@ else: return self.__manager.enginesCount() - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns of the model. @@ -145,7 +146,7 @@ return None - def setData(self, index, value, role = Qt.EditRole): + def setData(self, index, value, role=Qt.EditRole): """ Public method to set the data of a model cell. @@ -169,7 +170,7 @@ return True - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data.
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,18 +24,19 @@ import Utilities import Preferences + class OpenSearchManager(QObject): """ Class implementing a manager for open search engines. @signal changed() emitted to indicate a change - @signal currentEngineChanged() emitted to indicate a change of + @signal currentEngineChanged() emitted to indicate a change of the current search engine """ changed = pyqtSignal() currentEngineChanged = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/OpenSearch/OpenSearchReader.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchReader.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ from .OpenSearchEngine import OpenSearchEngine + class OpenSearchReader(QXmlStreamReader): """ Class implementing a reader for open search engine descriptions. @@ -109,7 +110,6 @@ elif self.name() == "Image": engine.setImageUrl(self.readElementText()) - if engine.name() and \ engine.description() and \
--- a/Helpviewer/OpenSearch/OpenSearchWriter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchWriter.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtCore import * + class OpenSearchWriter(QXmlStreamWriter): """ Class implementing a writer for open search engine descriptions.
--- a/Helpviewer/Passwords/PasswordManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Passwords/PasswordManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ import Utilities import Preferences + class LoginForm(object): """ Class implementing a data structure for login forms. @@ -32,7 +33,7 @@ self.url = QUrl() self.name = "" self.hasAPassword = False - self.elements = [] # list of tuples of element name and value + self.elements = [] # list of tuples of element name and value # (string, string) self.elementTypes = {} # dict of element name as key and type as value @@ -71,6 +72,7 @@ for element in self.elements: f.write("{0} = {1}\n".format(element[0], element[1])) + class PasswordManager(QObject): """ Class implementing the password manager. @@ -83,7 +85,7 @@ FORMS = "=====FORMS=====" NEVER = "=====NEVER=====" - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -170,7 +172,7 @@ loginFile = os.path.join(Utilities.getConfigDir(), "browser", "logins") try: - f = open(loginFile, "w", encoding = "utf-8") + f = open(loginFile, "w", encoding="utf-8") for key, login in list(self.__logins.items()): f.write("{0}\n".format(key)) f.write("{0}\n".format(login[0])) @@ -201,7 +203,7 @@ loginFile = os.path.join(Utilities.getConfigDir(), "browser", "logins") if os.path.exists(loginFile): try: - f = open(loginFile, "r", encoding = "utf-8") + f = open(loginFile, "r", encoding="utf-8") lines = f.read() f.close() except IOError as err: @@ -361,7 +363,7 @@ boundary = None # find the matching form on the web page - form = self.__findForm(webPage, data, boundary = boundary) + form = self.__findForm(webPage, data, boundary=boundary) if not form.isValid(): return form.url = QUrl(url) @@ -374,12 +376,12 @@ key = self.__createKey(url, "") if key not in self.__loginForms: mb = E5MessageBox.E5MessageBox(E5MessageBox.Question, - self.trUtf8("Save password"), + self.trUtf8("Save password"), self.trUtf8( """<b>Would you like to save this password?</b><br/>""" """To review passwords you have saved and remove them, """ - """use the password management dialog of the Settings menu."""), - modal = True) + """use the password management dialog of the Settings menu."""), + modal=True) neverButton = mb.addButton( self.trUtf8("Never for this site"), E5MessageBox.DestructiveRole) noButton = mb.addButton(self.trUtf8("Not now"), E5MessageBox.RejectRole) @@ -422,7 +424,7 @@ cleanUrl.setUserInfo("") return cleanUrl - def __findForm(self, webPage, data, boundary = None): + def __findForm(self, webPage, data, boundary=None): """ Private method to find the form used for logging in.
--- a/Helpviewer/Passwords/PasswordModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Passwords/PasswordModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,11 +9,12 @@ from PyQt4.QtCore import * + class PasswordModel(QAbstractTableModel): """ Class implementing a model for password management. """ - def __init__(self, manager, parent = None): + def __init__(self, manager, parent=None): """ Constructor @@ -26,8 +27,8 @@ manager.changed.connect(self.__passwordsChanged) self.__headers = [ - self.trUtf8("Website"), - self.trUtf8("Username"), + self.trUtf8("Website"), + self.trUtf8("Username"), self.trUtf8("Password") ] @@ -56,7 +57,7 @@ """ self.reset() - def removeRows(self, row, count, parent = QModelIndex()): + def removeRows(self, row, count, parent=QModelIndex()): """ Public method to remove entries from the model. @@ -84,7 +85,7 @@ return True - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the number of rows of the model. @@ -96,7 +97,7 @@ else: return self.__manager.sitesCount() - def columnCount(self, parent = QModelIndex()): + def columnCount(self, parent=QModelIndex()): """ Public method to get the number of columns of the model. @@ -133,7 +134,7 @@ return None - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data.
--- a/Helpviewer/Passwords/PasswordsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/Passwords/PasswordsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import UI.PixmapCache + class PasswordsDialog(QDialog, Ui_PasswordsDialog): """ Class implementing a dialog to show all saved logins. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/QtHelpDocumentationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ from .Ui_QtHelpDocumentationDialog import Ui_QtHelpDocumentationDialog + class QtHelpDocumentationDialog(QDialog, Ui_QtHelpDocumentationDialog): """ Class implementing a dialog to manage the QtHelp documentation database. @@ -109,7 +110,7 @@ """documentation you are attempting to remove. """ """Removing the documentation will close those """ """documents. Remove anyway?"""), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return self.__unregisteredDocs.append(ns)
--- a/Helpviewer/QtHelpFiltersDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/QtHelpFiltersDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ from .Ui_QtHelpFiltersDialog import Ui_QtHelpFiltersDialog + class QtHelpFiltersDialog(QDialog, Ui_QtHelpFiltersDialog): """ Class implementing a dialog to manage the QtHelp filters """ - def __init__(self, engine, parent = None): + def __init__(self, engine, parent=None): """ Constructor @@ -163,4 +164,4 @@ self.__engine.setupData() - self.accept() \ No newline at end of file + self.accept()
--- a/Helpviewer/SearchWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/SearchWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ import UI.PixmapCache + class SearchWidget(QWidget, Ui_SearchWidget): """ Class implementing the search bar for the web browser. """ - def __init__(self, mainWindow, parent = None): + def __init__(self, mainWindow, parent=None): """ Constructor @@ -82,10 +83,10 @@ return if not self.__mainWindow.currentBrowser().findNextPrev( - self.findtextCombo.currentText(), - self.caseCheckBox.isChecked(), - self.__findBackwards, - self.wrapCheckBox.isChecked(), + self.findtextCombo.currentText(), + self.caseCheckBox.isChecked(), + self.__findBackwards, + self.wrapCheckBox.isChecked(), False): self.infoLabel.setText(self.trUtf8("Expression was not found.")) self.__setFindtextComboBackground(True) @@ -102,7 +103,7 @@ "", False, False, False, True) if self.highlightAllCheckBox.isChecked(): cbr.findNextPrev( - self.findtextCombo.currentText(), + self.findtextCombo.currentText(), self.caseCheckBox.isChecked(), False, False, True)
--- a/Helpviewer/SslCertificatesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/SslCertificatesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -26,13 +26,14 @@ import Preferences import Utilities + class SslCertificatesDialog(QDialog, Ui_SslCertificatesDialog): """ Class implementing a dialog to show and edit all certificates. """ CertRole = Qt.UserRole + 1 - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -77,7 +78,7 @@ expiryDate = cert.expiryDate().toString("yyyy-MM-dd") # step 2: create the entry - items = self.serversCertificatesTree.findItems(organisation, + items = self.serversCertificatesTree.findItems(organisation, Qt.MatchFixedString | Qt.MatchCaseSensitive) if len(items) == 0: parent = QTreeWidgetItem(self.serversCertificatesTree, [organisation]) @@ -149,7 +150,7 @@ certificateDict[server] = pems else: del certificateDict[server] - Preferences.Prefs.settings.setValue("Help/CaCertificatesDict", + Preferences.Prefs.settings.setValue("Help/CaCertificatesDict", certificateDict) # delete the certificate from the default certificates @@ -184,7 +185,7 @@ if server not in certificateDict: certificateDict[server] = QByteArray() certificateDict[server].append(pems) - Preferences.Prefs.settings.setValue("Help/CaCertificatesDict", + Preferences.Prefs.settings.setValue("Help/CaCertificatesDict", certificateDict) self.serversCertificatesTree.clear() @@ -259,7 +260,7 @@ expiryDate = cert.expiryDate().toString("yyyy-MM-dd") # step 2: create the entry - items = self.caCertificatesTree.findItems(organisation, + items = self.caCertificatesTree.findItems(organisation, Qt.MatchFixedString | Qt.MatchCaseSensitive) if len(items) == 0: parent = QTreeWidgetItem(self.caCertificatesTree, [organisation]) @@ -272,7 +273,7 @@ @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) def on_caCertificatesTree_currentItemChanged(self, current, previous): """ - Private slot handling a change of the current item + Private slot handling a change of the current item in the CA certificates list. @param current new current item (QTreeWidgetItem) @@ -394,7 +395,7 @@ self.trUtf8("Export Certificate"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return
--- a/Helpviewer/SslInfoDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/SslInfoDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ import Utilities + class SslInfoDialog(QDialog, Ui_SslInfoDialog): """ Class implementing a dialog to show SSL certificate infos. """ - def __init__(self, certificate, parent = None): + def __init__(self, certificate, parent=None): """ Constructor @@ -45,9 +46,9 @@ self.effectiveLabel.setText(certificate.effectiveDate().toString("yyyy-MM-dd")) self.expiresLabel.setText(certificate.expiryDate().toString("yyyy-MM-dd")) self.sha1Label.setText(self.__formatHexString( - str(certificate.digest(QCryptographicHash.Sha1).toHex(), encoding = "ascii"))) + str(certificate.digest(QCryptographicHash.Sha1).toHex(), encoding="ascii"))) self.md5Label.setText(self.__formatHexString( - str(certificate.digest(QCryptographicHash.Md5).toHex(), encoding = "ascii"))) + str(certificate.digest(QCryptographicHash.Md5).toHex(), encoding="ascii"))) def __certificateString(self, txt): """ @@ -73,7 +74,7 @@ return self.trUtf8("<not part of the certificate>") if ':' in serial: - return str(serial, encoding = "ascii").upper() + return str(serial, encoding="ascii").upper() else: hexString = hex(int(serial))[2:] return self.__formatHexString(hexString)
--- a/Helpviewer/UrlBar/BookmarkInfoDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/UrlBar/BookmarkInfoDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import UI.PixmapCache + class BookmarkInfoDialog(QDialog, Ui_BookmarkInfoDialog): """ Class implementing a dialog to show some bookmark info. """ - def __init__(self, bookmark, parent = None): + def __init__(self, bookmark, parent=None): """ Constructor
--- a/Helpviewer/UrlBar/FavIconLabel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/UrlBar/FavIconLabel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ import Helpviewer.HelpWindow + class FavIconLabel(QLabel): """ Class implementing the label to show the web site icon. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -77,7 +78,7 @@ mimeData = QMimeData() title = self.__browser.title() if title == "": - title = str(self.__browser.url().toEncoded(), encoding = "utf-8") + title = str(self.__browser.url().toEncoded(), encoding="utf-8") mimeData.setText(title) mimeData.setUrls([self.__browser.url()]) p = self.pixmap()
--- a/Helpviewer/UrlBar/SslLabel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/UrlBar/SslLabel.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,13 +10,14 @@ from PyQt4.QtCore import Qt, pyqtSignal from PyQt4.QtGui import QLabel + class SslLabel(QLabel): """ Class implementing the label to show some SSL info. """ clicked = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/UrlBar/StackedUrlBar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/UrlBar/StackedUrlBar.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,11 +9,12 @@ from PyQt4.QtGui import QStackedWidget, QSizePolicy + class StackedUrlBar(QStackedWidget): """ Class implementing a widget to stack url bars. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Helpviewer/UrlBar/UrlBar.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/UrlBar/UrlBar.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,18 +28,19 @@ import Preferences import Utilities + class UrlBar(E5LineEdit): """ Class implementing a line edit for entering URLs. """ - def __init__(self, mainWindow, parent = None): + def __init__(self, mainWindow, parent=None): """ Constructor @param mainWindow reference to the main window (HelpWindow) @param parent reference to the parent widget (HelpBrowser) """ - E5LineEdit.__init__(self, parent) + E5LineEdit.__init__(self, parent) self.setInactiveText(self.trUtf8("Enter the location here.")) self.__mw = mainWindow @@ -114,7 +115,7 @@ @param url new URL of the browser (QUrl) """ - self.setText(str(url.toEncoded(), encoding = "utf-8")) + self.setText(str(url.toEncoded(), encoding="utf-8")) self.setCursorPosition(0) def __loadStarted(self): @@ -242,7 +243,7 @@ b = (highlight.blue() + 2 * backgroundColor.blue()) // 3 loadingColor = QColor(r, g, b) - if abs(loadingColor.lightness() - backgroundColor.lightness()) < 20: + if abs(loadingColor.lightness() - backgroundColor.lightness()) < 20: # special handling for special color schemes (e.g Gaia) r = (2 * highlight.red() + backgroundColor.red()) // 3 g = (2 * highlight.green() + backgroundColor.green()) // 3 @@ -287,7 +288,7 @@ @param evt reference to the key press event (QKeyEvent) """ if evt.key() == Qt.Key_Escape and self.__browser is not None: - self.setText(str(self.__browser.url().toEncoded(), encoding = "utf-8")) + self.setText(str(self.__browser.url().toEncoded(), encoding="utf-8")) self.selectAll() return @@ -343,7 +344,7 @@ E5LineEdit.dropEvent(self, evt) return - self.setText(str(url.toEncoded(), encoding = "utf-8")) + self.setText(str(url.toEncoded(), encoding="utf-8")) self.selectAll() evt.acceptProposedAction()
--- a/Helpviewer/UserAgent/UserAgentMenu.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Helpviewer/UserAgent/UserAgentMenu.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from Helpviewer.HelpBrowserWV import HelpWebPage + class UserAgentMenu(QMenu): """ Class implementing a menu to select the user agent string. """ - def __init__(self, title, parent = None): + def __init__(self, title, parent=None): """ Constructor @@ -79,7 +80,7 @@ self.trUtf8("Custom user agent"), self.trUtf8("User agent:"), QLineEdit.Normal, - HelpWebPage().userAgent(resolveEmpty = True)) + HelpWebPage().userAgent(resolveEmpty=True)) if ok: HelpWebPage().setUserAgent(userAgent)
--- a/IconEditor/IconEditorGrid.py Fri Mar 11 08:55:14 2011 +0100 +++ b/IconEditor/IconEditorGrid.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from .IconSizeDialog import IconSizeDialog + class IconEditCommand(QUndoCommand): """ Class implementing an undo command for the icon editor. """ - def __init__(self, grid, text, oldImage, parent = None): + def __init__(self, grid, text, oldImage, parent=None): """ Constructor @@ -47,22 +48,23 @@ """ Public method to perform the undo. """ - self.__grid.setIconImage(self.__imageBefore, undoRedo = True) + self.__grid.setIconImage(self.__imageBefore, undoRedo=True) def redo(self): """ Public method to perform the redo. """ if self.__imageAfter: - self.__grid.setIconImage(self.__imageAfter, undoRedo = True) + self.__grid.setIconImage(self.__imageAfter, undoRedo=True) + class IconEditorGrid(QWidget): """ Class implementing the icon editor grid. @signal canRedoChanged(bool) emitted after the redo status has changed @signal canUndoChanged(bool) emitted after the undo status has changed - @signal clipboardImageAvailable(bool) emitted to signal the availability of an + @signal clipboardImageAvailable(bool) emitted to signal the availability of an image to be pasted @signal colorChanged(QColor) emitted after the drawing color was changed @signal imageChanged(bool) emitted after the image was modified @@ -99,7 +101,7 @@ MarkColor = QColor(255, 255, 255, 255) NoMarkColor = QColor(0, 0, 0, 0) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -187,16 +189,16 @@ the various drawing tools. """ self.__undoTexts = { - self.Pencil : self.trUtf8("Set Pixel"), - self.Rubber : self.trUtf8("Erase Pixel"), - self.Line : self.trUtf8("Draw Line"), - self.Rectangle : self.trUtf8("Draw Rectangle"), - self.FilledRectangle : self.trUtf8("Draw Filled Rectangle"), - self.Circle : self.trUtf8("Draw Circle"), - self.FilledCircle : self.trUtf8("Draw Filled Circle"), - self.Ellipse : self.trUtf8("Draw Ellipse"), - self.FilledEllipse : self.trUtf8("Draw Filled Ellipse"), - self.Fill : self.trUtf8("Fill Region"), + self.Pencil: self.trUtf8("Set Pixel"), + self.Rubber: self.trUtf8("Erase Pixel"), + self.Line: self.trUtf8("Draw Line"), + self.Rectangle: self.trUtf8("Draw Rectangle"), + self.FilledRectangle: self.trUtf8("Draw Filled Rectangle"), + self.Circle: self.trUtf8("Draw Circle"), + self.FilledCircle: self.trUtf8("Draw Filled Circle"), + self.Ellipse: self.trUtf8("Draw Ellipse"), + self.FilledEllipse: self.trUtf8("Draw Filled Ellipse"), + self.Fill: self.trUtf8("Fill Region"), } def isDirty(self): @@ -207,7 +209,7 @@ """ return self.__dirty - def setDirty(self, dirty, setCleanState = False): + def setDirty(self, dirty, setCleanState=False): """ Public slot to set the dirty flag. @@ -279,9 +281,9 @@ else: self.__selecting = False - if self.__curTool in [self.RectangleSelection, self.CircleSelection, self.Line, - self.Rectangle, self.FilledRectangle, - self.Circle, self.FilledCircle, + if self.__curTool in [self.RectangleSelection, self.CircleSelection, self.Line, + self.Rectangle, self.FilledRectangle, + self.Circle, self.FilledCircle, self.Ellipse, self.FilledEllipse]: self.setCursor(self.__aimCursor) elif self.__curTool == self.Fill: @@ -292,7 +294,7 @@ self.setCursor(self.__paintCursor) elif self.__curTool == self.Rubber: self.setCursor(self.__rubberCursor) - else: + else: self.setCursor(self.__normalCursor) def tool(self): @@ -304,7 +306,7 @@ """ return self.__curTool - def setIconImage(self, newImage, undoRedo = False, clearUndo = False): + def setIconImage(self, newImage, undoRedo=False, clearUndo=False): """ Public method to set a new icon image. @@ -398,12 +400,12 @@ painter.setPen(self.palette().windowText().color()) i = 0 while i <= self.__image.width(): - painter.drawLine(self.__zoom * i, 0, + painter.drawLine(self.__zoom * i, 0, self.__zoom * i, self.__zoom * self.__image.height()) i += 1 j = 0 while j <= self.__image.height(): - painter.drawLine(0, self.__zoom * j, + painter.drawLine(0, self.__zoom * j, self.__zoom * self.__image.width(), self.__zoom * j) j += 1 @@ -433,7 +435,7 @@ return rectangle for the given pixel coordinates (QRect) """ if self.__zoom >= 3 and self.__gridEnabled: - return QRect(self.__zoom * i + 1, self.__zoom * j + 1, + return QRect(self.__zoom * i + 1, self.__zoom * j + 1, self.__zoom - 1, self.__zoom - 1) else: return QRect(self.__zoom * i, self.__zoom * j, self.__zoom, self.__zoom) @@ -454,14 +456,14 @@ return if self.__curTool == self.Pencil: - cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], + cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], self.__image) self.__setImagePixel(evt.pos(), True) self.setDirty(True) self.__undoStack.push(cmd) self.__currentUndoCmd = cmd elif self.__curTool == self.Rubber: - cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], + cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], self.__image) self.__setImagePixel(evt.pos(), False) self.setDirty(True) @@ -471,7 +473,7 @@ i, j = self.__imageCoordinates(evt.pos()) col = QColor() col.setRgba(self.__image.pixel(i, j)) - cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], + cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], self.__image) self.__drawFlood(i, j, col) self.setDirty(True) @@ -523,10 +525,10 @@ self.__currentUndoCmd.setAfterImage(self.__image) self.__currentUndoCmd = None - if self.__curTool not in [self.Pencil, self.Rubber, - self.Fill, self.ColorPicker, + if self.__curTool not in [self.Pencil, self.Rubber, + self.Fill, self.ColorPicker, self.RectangleSelection, self.CircleSelection]: - cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], + cmd = IconEditCommand(self, self.__undoTexts[self.__curTool], self.__image) if self.__drawTool(evt.pos(), False): self.__undoStack.push(cmd) @@ -573,7 +575,7 @@ """ self.__markImage.fill(self.NoMarkColor.rgba()) if self.__pasteRect.isValid(): - self.__updateImageRect(self.__pasteRect.topLeft(), + self.__updateImageRect(self.__pasteRect.topLeft(), self.__pasteRect.bottomRight() + QPoint(1, 1)) x, y = self.__imageCoordinates(pos) @@ -594,7 +596,7 @@ painter.drawRect(self.__pasteRect) painter.end() - self.__updateImageRect(self.__pasteRect.topLeft(), + self.__updateImageRect(self.__pasteRect.topLeft(), self.__pasteRect.bottomRight() + QPoint(1, 1)) def __drawTool(self, pos, mark): @@ -625,7 +627,7 @@ if self.__curTool == self.Line: painter.drawLine(start, end) - elif self.__curTool in [self.Rectangle, self.FilledRectangle, + elif self.__curTool in [self.Rectangle, self.FilledRectangle, self.RectangleSelection]: l = min(start.x(), end.x()) t = min(start.y(), end.y()) @@ -643,7 +645,7 @@ self.__selectionAvailable = True self.selectionAvailable.emit(True) - elif self.__curTool in [self.Circle, self.FilledCircle, + elif self.__curTool in [self.Circle, self.FilledCircle, self.CircleSelection]: r = max(abs(start.x() - end.x()), abs(start.y() - end.y())) if self.__curTool in [self.FilledCircle, self.CircleSelection]: @@ -665,7 +667,7 @@ painter.end() - if self.__curTool in [self.Circle, self.FilledCircle, + if self.__curTool in [self.Circle, self.FilledCircle, self.Ellipse, self.FilledEllipse]: self.update() else: @@ -673,7 +675,7 @@ return True - def __drawFlood(self, i, j, oldColor, doUpdate = True): + def __drawFlood(self, i, j, oldColor, doUpdate=True): """ Private method to perform a flood fill operation. @@ -705,7 +707,7 @@ @param pos1 top, left position for the update in widget coordinates (QPoint) @param pos2 bottom, right position for the update in widget coordinates (QPoint) """ - self.__updateImageRect(QPoint(*self.__imageCoordinates(pos1)), + self.__updateImageRect(QPoint(*self.__imageCoordinates(pos1)), QPoint(*self.__imageCoordinates(pos2))) def __updateImageRect(self, ipos1, ipos2): @@ -729,8 +731,8 @@ Private slot to remove the mark indicator. """ self.__markImage.fill(self.NoMarkColor.rgba()) - if self.__curTool in [self.Circle, self.FilledCircle, - self.Ellipse, self.FilledEllipse, + if self.__curTool in [self.Circle, self.FilledCircle, + self.Ellipse, self.FilledEllipse, self.CircleSelection]: self.update() else: @@ -788,7 +790,7 @@ """ Private method to get an image from the clipboard. - @return tuple with the image (QImage) and a flag indicating a + @return tuple with the image (QImage) and a flag indicating a valid image (boolean) """ img = QApplication.clipboard().image() @@ -812,14 +814,14 @@ img.fill(qRgba(0, 0, 0, 0)) for i in range(0, self.__selRect.width()): for j in range(0, self.__selRect.height()): - if self.__image.rect().contains(self.__selRect.x() + i, + if self.__image.rect().contains(self.__selRect.x() + i, self.__selRect.y() + j): if self.__isMarked(self.__selRect.x() + i, self.__selRect.y() + j): - img.setPixel(i, j, self.__image.pixel(self.__selRect.x() + i, + img.setPixel(i, j, self.__image.pixel(self.__selRect.x() + i, self.__selRect.y() + j)) if cut: - self.__image.setPixel(self.__selRect.x() + i, - self.__selRect.y() + j, + self.__image.setPixel(self.__selRect.x() + i, + self.__selRect.y() + j, qRgba(0, 0, 0, 0)) if cut: @@ -849,13 +851,13 @@ img = self.__getSelectionImage(True) QApplication.clipboard().setImage(img) - def editPaste(self, pasting = False): + def editPaste(self, pasting=False): """ Public slot to paste an image from the clipboard. @param pasting flag indicating part two of the paste operation (boolean) """ - img, ok = self.__clipboardImage() + img, ok = self.__clipboardImage() if ok: if img.width() > self.__image.width() or img.height() > self.__image.height(): res = E5MessageBox.yesNo(self, @@ -874,13 +876,13 @@ painter = QPainter(self.__image) painter.setPen(self.penColor()) painter.setCompositionMode(self.__compositingMode) - painter.drawImage(self.__pasteRect.x(), self.__pasteRect.y(), img, 0, 0, + painter.drawImage(self.__pasteRect.x(), self.__pasteRect.y(), img, 0, 0, self.__pasteRect.width() + 1, self.__pasteRect.height() + 1) self.__undoStack.push(cmd) cmd.setAfterImage(self.__image) - self.__updateImageRect(self.__pasteRect.topLeft(), + self.__updateImageRect(self.__pasteRect.topLeft(), self.__pasteRect.bottomRight() + QPoint(1, 1)) else: E5MessageBox.warning(self, @@ -891,9 +893,9 @@ """ Public slot to paste the clipboard as a new image. """ - img, ok = self.__clipboardImage() + img, ok = self.__clipboardImage() if ok: - cmd = IconEditCommand(self, self.trUtf8("Paste Clipboard as New Image"), + cmd = IconEditCommand(self, self.trUtf8("Paste Clipboard as New Image"), self.__image) self.setIconImage(img) self.setDirty(True) @@ -938,7 +940,7 @@ newWidth, newHeight = dlg.getData() if newWidth != self.__image.width() or newHeight != self.__image.height(): cmd = IconEditCommand(self, self.trUtf8("Resize Image"), self.__image) - img = self.__image.scaled(newWidth, newHeight, Qt.IgnoreAspectRatio, + img = self.__image.scaled(newWidth, newHeight, Qt.IgnoreAspectRatio, Qt.SmoothTransformation) self.setIconImage(img) self.setDirty(True)
--- a/IconEditor/IconEditorPalette.py Fri Mar 11 08:55:14 2011 +0100 +++ b/IconEditor/IconEditorPalette.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,6 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * + class IconEditorPalette(QWidget): """ Class implementing a palette widget for the icon editor. @@ -21,7 +22,7 @@ colorSelected = pyqtSignal(QColor) compositingChanged = pyqtSignal(QPainter.CompositionMode) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -84,7 +85,7 @@ self.__compositingGroup = QGroupBox(self.trUtf8("Compositing"), self) self.__compositingGroupLayout = QVBoxLayout(self.__compositingGroup) self.__compositingGroup.setLayout(self.__compositingGroupLayout) - self.__sourceButton = QRadioButton(self.trUtf8("Replace"), + self.__sourceButton = QRadioButton(self.trUtf8("Replace"), self.__compositingGroup) self.__sourceButton.setWhatsThis(self.trUtf8( """<b>Replace</b>""" @@ -92,7 +93,7 @@ )) self.__sourceButton.clicked[bool].connect(self.__compositingChanged) self.__compositingGroupLayout.addWidget(self.__sourceButton) - self.__sourceOverButton = QRadioButton(self.trUtf8("Blend"), + self.__sourceOverButton = QRadioButton(self.trUtf8("Blend"), self.__compositingGroup) self.__sourceOverButton.setWhatsThis(self.trUtf8( """<b>Blend</b>""" @@ -146,7 +147,7 @@ @param val value of the alpha channel """ if val != self.__currentAlpha: - col = QColor(self.__currentColor) + col = QColor(self.__currentColor) col.setAlpha(val) self.colorSelected.emit(col)
--- a/IconEditor/IconEditorWindow.py Fri Mar 11 08:55:14 2011 +0100 +++ b/IconEditor/IconEditorWindow.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ import Preferences + class IconEditorWindow(QMainWindow): """ Class implementing the web browser main window. @@ -32,14 +33,14 @@ windows = [] - def __init__(self, fileName = "", parent = None, fromEric = False, - initShortcutsOnly = False): + def __init__(self, fileName="", parent=None, fromEric=False, + initShortcutsOnly=False): """ Constructor @param fileName name of a file to load on startup (string) @param parent parent widget of this window (QWidget) - @keyparam fromEric flag indicating whether it was called from within + @keyparam fromEric flag indicating whether it was called from within eric5 (boolean) @keyparam initShortcutsOnly flag indicating to just initialize the keyboard shortcuts (boolean) @@ -104,22 +105,22 @@ Private method to define the supported image file filters. """ filters = { - 'bmp' : self.trUtf8("Windows Bitmap File (*.bmp)"), - 'gif' : self.trUtf8("Graphic Interchange Format File (*.gif)"), - 'ico' : self.trUtf8("Windows Icon File (*.ico)"), - 'jpg' : self.trUtf8("JPEG File (*.jpg)"), - 'mng' : self.trUtf8("Multiple-Image Network Graphics File (*.mng)"), - 'pbm' : self.trUtf8("Portable Bitmap File (*.pbm)"), - 'pcx' : self.trUtf8("Paintbrush Bitmap File (*.pcx)"), - 'pgm' : self.trUtf8("Portable Graymap File (*.pgm)"), - 'png' : self.trUtf8("Portable Network Graphics File (*.png)"), - 'ppm' : self.trUtf8("Portable Pixmap File (*.ppm)"), - 'sgi' : self.trUtf8("Silicon Graphics Image File (*.sgi)"), - 'svg' : self.trUtf8("Scalable Vector Graphics File (*.svg)"), - 'tga' : self.trUtf8("Targa Graphic File (*.tga)"), - 'tif' : self.trUtf8("TIFF File (*.tif)"), - 'xbm' : self.trUtf8("X11 Bitmap File (*.xbm)"), - 'xpm' : self.trUtf8("X11 Pixmap File (*.xpm)"), + 'bmp': self.trUtf8("Windows Bitmap File (*.bmp)"), + 'gif': self.trUtf8("Graphic Interchange Format File (*.gif)"), + 'ico': self.trUtf8("Windows Icon File (*.ico)"), + 'jpg': self.trUtf8("JPEG File (*.jpg)"), + 'mng': self.trUtf8("Multiple-Image Network Graphics File (*.mng)"), + 'pbm': self.trUtf8("Portable Bitmap File (*.pbm)"), + 'pcx': self.trUtf8("Paintbrush Bitmap File (*.pcx)"), + 'pgm': self.trUtf8("Portable Graymap File (*.pgm)"), + 'png': self.trUtf8("Portable Network Graphics File (*.png)"), + 'ppm': self.trUtf8("Portable Pixmap File (*.ppm)"), + 'sgi': self.trUtf8("Silicon Graphics Image File (*.sgi)"), + 'svg': self.trUtf8("Scalable Vector Graphics File (*.svg)"), + 'tga': self.trUtf8("Targa Graphic File (*.tga)"), + 'tif': self.trUtf8("TIFF File (*.tif)"), + 'xbm': self.trUtf8("X11 Bitmap File (*.xbm)"), + 'xpm': self.trUtf8("X11 Pixmap File (*.xpm)"), } inputFormats = [] @@ -162,10 +163,10 @@ """ Private method to define the file related user interface actions. """ - self.newAct = E5Action(self.trUtf8('New'), + self.newAct = E5Action(self.trUtf8('New'), UI.PixmapCache.getIcon("new.png"), - self.trUtf8('&New'), - QKeySequence(self.trUtf8("Ctrl+N","File|New")), + self.trUtf8('&New'), + QKeySequence(self.trUtf8("Ctrl+N", "File|New")), 0, self, 'iconEditor_file_new') self.newAct.setStatusTip(self.trUtf8('Create a new icon')) self.newAct.setWhatsThis(self.trUtf8( @@ -175,9 +176,9 @@ self.newAct.triggered[()].connect(self.__newIcon) self.__actions.append(self.newAct) - self.newWindowAct = E5Action(self.trUtf8('New Window'), + self.newWindowAct = E5Action(self.trUtf8('New Window'), UI.PixmapCache.getIcon("newWindow.png"), - self.trUtf8('New &Window'), + self.trUtf8('New &Window'), 0, 0, self, 'iconEditor_file_new_window') self.newWindowAct.setStatusTip(self.trUtf8('Open a new icon editor window')) self.newWindowAct.setWhatsThis(self.trUtf8( @@ -187,10 +188,10 @@ self.newWindowAct.triggered[()].connect(self.__newWindow) self.__actions.append(self.newWindowAct) - self.openAct = E5Action(self.trUtf8('Open'), + self.openAct = E5Action(self.trUtf8('Open'), UI.PixmapCache.getIcon("open.png"), - self.trUtf8('&Open...'), - QKeySequence(self.trUtf8("Ctrl+O","File|Open")), + self.trUtf8('&Open...'), + QKeySequence(self.trUtf8("Ctrl+O", "File|Open")), 0, self, 'iconEditor_file_open') self.openAct.setStatusTip(self.trUtf8('Open an icon file for editing')) self.openAct.setWhatsThis(self.trUtf8( @@ -204,7 +205,7 @@ self.saveAct = E5Action(self.trUtf8('Save'), UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8('&Save'), - QKeySequence(self.trUtf8("Ctrl+S", "File|Save")), + QKeySequence(self.trUtf8("Ctrl+S", "File|Save")), 0, self, 'iconEditor_file_save') self.saveAct.setStatusTip(self.trUtf8('Save the current icon')) self.saveAct.setWhatsThis(self.trUtf8( @@ -214,10 +215,10 @@ self.saveAct.triggered[()].connect(self.__saveIcon) self.__actions.append(self.saveAct) - self.saveAsAct = E5Action(self.trUtf8('Save As'), + self.saveAsAct = E5Action(self.trUtf8('Save As'), UI.PixmapCache.getIcon("fileSaveAs.png"), - self.trUtf8('Save &As...'), - QKeySequence(self.trUtf8("Shift+Ctrl+S","File|Save As")), + self.trUtf8('Save &As...'), + QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")), 0, self, 'iconEditor_file_save_as') self.saveAsAct.setStatusTip( self.trUtf8('Save the current icon to a new file')) @@ -228,10 +229,10 @@ self.saveAsAct.triggered[()].connect(self.__saveIconAs) self.__actions.append(self.saveAsAct) - self.closeAct = E5Action(self.trUtf8('Close'), + self.closeAct = E5Action(self.trUtf8('Close'), UI.PixmapCache.getIcon("close.png"), - self.trUtf8('&Close'), - QKeySequence(self.trUtf8("Ctrl+W","File|Close")), + self.trUtf8('&Close'), + QKeySequence(self.trUtf8("Ctrl+W", "File|Close")), 0, self, 'iconEditor_file_close') self.closeAct.setStatusTip(self.trUtf8('Close the current icon editor window')) self.closeAct.setWhatsThis(self.trUtf8( @@ -241,8 +242,8 @@ self.closeAct.triggered[()].connect(self.close) self.__actions.append(self.closeAct) - self.closeAllAct = E5Action(self.trUtf8('Close All'), - self.trUtf8('Close &All'), + self.closeAllAct = E5Action(self.trUtf8('Close All'), + self.trUtf8('Close &All'), 0, 0, self, 'iconEditor_file_close_all') self.closeAllAct.setStatusTip(self.trUtf8('Close all icon editor windows')) self.closeAllAct.setWhatsThis(self.trUtf8( @@ -252,10 +253,10 @@ self.closeAllAct.triggered[()].connect(self.__closeAll) self.__actions.append(self.closeAllAct) - self.exitAct = E5Action(self.trUtf8('Quit'), + self.exitAct = E5Action(self.trUtf8('Quit'), UI.PixmapCache.getIcon("exit.png"), - self.trUtf8('&Quit'), - QKeySequence(self.trUtf8("Ctrl+Q","File|Quit")), + self.trUtf8('&Quit'), + QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit")), 0, self, 'iconEditor_file_quit') self.exitAct.setStatusTip(self.trUtf8('Quit the icon editor')) self.exitAct.setWhatsThis(self.trUtf8( @@ -275,8 +276,8 @@ self.undoAct = E5Action(self.trUtf8('Undo'), UI.PixmapCache.getIcon("editUndo.png"), self.trUtf8('&Undo'), - QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")), - QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")), + QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")), + QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")), self, 'iconEditor_edit_undo') self.undoAct.setStatusTip(self.trUtf8('Undo the last change')) self.undoAct.setWhatsThis(self.trUtf8( @@ -289,7 +290,7 @@ self.redoAct = E5Action(self.trUtf8('Redo'), UI.PixmapCache.getIcon("editRedo.png"), self.trUtf8('&Redo'), - QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")), + QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")), 0, self, 'iconEditor_edit_redo') self.redoAct.setStatusTip(self.trUtf8('Redo the last change')) self.redoAct.setWhatsThis(self.trUtf8( @@ -316,8 +317,8 @@ self.copyAct = E5Action(self.trUtf8('Copy'), UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8('&Copy'), - QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")), - QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")), + QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")), + QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")), self, 'iconEditor_edit_copy') self.copyAct.setStatusTip(self.trUtf8('Copy the selection')) self.copyAct.setWhatsThis(self.trUtf8( @@ -330,8 +331,8 @@ self.pasteAct = E5Action(self.trUtf8('Paste'), UI.PixmapCache.getIcon("editPaste.png"), self.trUtf8('&Paste'), - QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")), - QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")), + QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")), + QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")), self, 'iconEditor_edit_paste') self.pasteAct.setStatusTip(self.trUtf8('Paste the clipboard image')) self.pasteAct.setWhatsThis(self.trUtf8( @@ -356,7 +357,7 @@ self.deleteAct = E5Action(self.trUtf8('Clear'), UI.PixmapCache.getIcon("editDelete.png"), self.trUtf8('Cl&ear'), - QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")), + QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")), 0, self, 'iconEditor_edit_clear') self.deleteAct.setStatusTip(self.trUtf8('Clear the icon image')) @@ -369,7 +370,7 @@ self.selectAllAct = E5Action(self.trUtf8('Select All'), self.trUtf8('&Select All'), - QKeySequence(self.trUtf8("Ctrl+A", "Edit|Select All")), + QKeySequence(self.trUtf8("Ctrl+A", "Edit|Select All")), 0, self, 'iconEditor_edit_select_all') self.selectAllAct.setStatusTip(self.trUtf8('Select the complete icon image')) @@ -428,10 +429,10 @@ """ Private method to create the View actions. """ - self.zoomInAct = E5Action(self.trUtf8('Zoom in'), + self.zoomInAct = E5Action(self.trUtf8('Zoom in'), UI.PixmapCache.getIcon("zoomIn.png"), - self.trUtf8('Zoom &in'), - QKeySequence(self.trUtf8("Ctrl++", "View|Zoom in")), + self.trUtf8('Zoom &in'), + QKeySequence(self.trUtf8("Ctrl++", "View|Zoom in")), 0, self, 'iconEditor_view_zoom_in') self.zoomInAct.setStatusTip(self.trUtf8('Zoom in on the icon')) self.zoomInAct.setWhatsThis(self.trUtf8( @@ -441,10 +442,10 @@ self.zoomInAct.triggered[()].connect(self.__zoomIn) self.__actions.append(self.zoomInAct) - self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), + self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), UI.PixmapCache.getIcon("zoomOut.png"), - self.trUtf8('Zoom &out'), - QKeySequence(self.trUtf8("Ctrl+-", "View|Zoom out")), + self.trUtf8('Zoom &out'), + QKeySequence(self.trUtf8("Ctrl+-", "View|Zoom out")), 0, self, 'iconEditor_view_zoom_out') self.zoomOutAct.setStatusTip(self.trUtf8('Zoom out on the icon')) self.zoomOutAct.setWhatsThis(self.trUtf8( @@ -454,10 +455,10 @@ self.zoomOutAct.triggered[()].connect(self.__zoomOut) self.__actions.append(self.zoomOutAct) - self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), + self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), UI.PixmapCache.getIcon("zoomReset.png"), - self.trUtf8('Zoom &reset'), - QKeySequence(self.trUtf8("Ctrl+0", "View|Zoom reset")), + self.trUtf8('Zoom &reset'), + QKeySequence(self.trUtf8("Ctrl+0", "View|Zoom reset")), 0, self, 'iconEditor_view_zoom_reset') self.zoomResetAct.setStatusTip(self.trUtf8('Reset the zoom of the icon')) self.zoomResetAct.setWhatsThis(self.trUtf8( @@ -471,7 +472,7 @@ self.zoomToAct = E5Action(self.trUtf8('Zoom'), UI.PixmapCache.getIcon("zoomTo.png"), self.trUtf8('&Zoom...'), - QKeySequence(self.trUtf8("Ctrl+#", "View|Zoom")), + QKeySequence(self.trUtf8("Ctrl+#", "View|Zoom")), 0, self, 'iconEditor_view_zoom') self.zoomToAct.setStatusTip(self.trUtf8('Zoom the icon')) @@ -508,10 +509,10 @@ self.drawingActGrp = createActionGroup(self) self.drawingActGrp.setExclusive(True) - self.drawPencilAct = E5Action(self.trUtf8('Freehand'), + self.drawPencilAct = E5Action(self.trUtf8('Freehand'), UI.PixmapCache.getIcon("drawBrush.png"), - self.trUtf8('&Freehand'), - 0, 0, + self.trUtf8('&Freehand'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_pencil') self.drawPencilAct.setWhatsThis(self.trUtf8( """<b>Free hand</b>""" @@ -522,10 +523,10 @@ self.drawPencilAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawPencilAct) - self.drawColorPickerAct = E5Action(self.trUtf8('Color Picker'), + self.drawColorPickerAct = E5Action(self.trUtf8('Color Picker'), UI.PixmapCache.getIcon("colorPicker.png"), - self.trUtf8('&Color Picker'), - 0, 0, + self.trUtf8('&Color Picker'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_color_picker') self.drawColorPickerAct.setWhatsThis(self.trUtf8( """<b>Color Picker</b>""" @@ -537,10 +538,10 @@ self.drawColorPickerAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawColorPickerAct) - self.drawRectangleAct = E5Action(self.trUtf8('Rectangle'), + self.drawRectangleAct = E5Action(self.trUtf8('Rectangle'), UI.PixmapCache.getIcon("drawRectangle.png"), - self.trUtf8('&Rectangle'), - 0, 0, + self.trUtf8('&Rectangle'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_rectangle') self.drawRectangleAct.setWhatsThis(self.trUtf8( """<b>Rectangle</b>""" @@ -551,10 +552,10 @@ self.drawRectangleAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawRectangleAct) - self.drawFilledRectangleAct = E5Action(self.trUtf8('Filled Rectangle'), + self.drawFilledRectangleAct = E5Action(self.trUtf8('Filled Rectangle'), UI.PixmapCache.getIcon("drawRectangleFilled.png"), - self.trUtf8('F&illed Rectangle'), - 0, 0, + self.trUtf8('F&illed Rectangle'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_rectangle') self.drawFilledRectangleAct.setWhatsThis(self.trUtf8( """<b>Filled Rectangle</b>""" @@ -565,10 +566,10 @@ self.drawFilledRectangleAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawFilledRectangleAct) - self.drawCircleAct = E5Action(self.trUtf8('Circle'), + self.drawCircleAct = E5Action(self.trUtf8('Circle'), UI.PixmapCache.getIcon("drawCircle.png"), - self.trUtf8('Circle'), - 0, 0, + self.trUtf8('Circle'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_circle') self.drawCircleAct.setWhatsThis(self.trUtf8( """<b>Circle</b>""" @@ -579,10 +580,10 @@ self.drawCircleAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawCircleAct) - self.drawFilledCircleAct = E5Action(self.trUtf8('Filled Circle'), + self.drawFilledCircleAct = E5Action(self.trUtf8('Filled Circle'), UI.PixmapCache.getIcon("drawCircleFilled.png"), - self.trUtf8('Fille&d Circle'), - 0, 0, + self.trUtf8('Fille&d Circle'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_circle') self.drawFilledCircleAct.setWhatsThis(self.trUtf8( """<b>Filled Circle</b>""" @@ -593,10 +594,10 @@ self.drawFilledCircleAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawFilledCircleAct) - self.drawEllipseAct = E5Action(self.trUtf8('Ellipse'), + self.drawEllipseAct = E5Action(self.trUtf8('Ellipse'), UI.PixmapCache.getIcon("drawEllipse.png"), - self.trUtf8('&Ellipse'), - 0, 0, + self.trUtf8('&Ellipse'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_ellipse') self.drawEllipseAct.setWhatsThis(self.trUtf8( """<b>Ellipse</b>""" @@ -607,10 +608,10 @@ self.drawEllipseAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawEllipseAct) - self.drawFilledEllipseAct = E5Action(self.trUtf8('Filled Ellipse'), + self.drawFilledEllipseAct = E5Action(self.trUtf8('Filled Ellipse'), UI.PixmapCache.getIcon("drawEllipseFilled.png"), - self.trUtf8('Fille&d Elli&pse'), - 0, 0, + self.trUtf8('Fille&d Elli&pse'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_ellipse') self.drawFilledEllipseAct.setWhatsThis(self.trUtf8( """<b>Filled Ellipse</b>""" @@ -621,10 +622,10 @@ self.drawFilledEllipseAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawFilledEllipseAct) - self.drawFloodFillAct = E5Action(self.trUtf8('Flood Fill'), + self.drawFloodFillAct = E5Action(self.trUtf8('Flood Fill'), UI.PixmapCache.getIcon("drawFill.png"), - self.trUtf8('Fl&ood Fill'), - 0, 0, + self.trUtf8('Fl&ood Fill'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_flood_fill') self.drawFloodFillAct.setWhatsThis(self.trUtf8( """<b>Flood Fill</b>""" @@ -636,10 +637,10 @@ self.drawFloodFillAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawFloodFillAct) - self.drawLineAct = E5Action(self.trUtf8('Line'), + self.drawLineAct = E5Action(self.trUtf8('Line'), UI.PixmapCache.getIcon("drawLine.png"), - self.trUtf8('&Line'), - 0, 0, + self.trUtf8('&Line'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_line') self.drawLineAct.setWhatsThis(self.trUtf8( """<b>Line</b>""" @@ -650,10 +651,10 @@ self.drawLineAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawLineAct) - self.drawEraserAct = E5Action(self.trUtf8('Eraser (Transparent)'), + self.drawEraserAct = E5Action(self.trUtf8('Eraser (Transparent)'), UI.PixmapCache.getIcon("drawEraser.png"), - self.trUtf8('Eraser (&Transparent)'), - 0, 0, + self.trUtf8('Eraser (&Transparent)'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_eraser') self.drawEraserAct.setWhatsThis(self.trUtf8( """<b>Eraser (Transparent)</b>""" @@ -664,32 +665,32 @@ self.drawEraserAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawEraserAct) - self.drawRectangleSelectionAct = E5Action(self.trUtf8('Rectangular Selection'), + self.drawRectangleSelectionAct = E5Action(self.trUtf8('Rectangular Selection'), UI.PixmapCache.getIcon("selectRectangle.png"), - self.trUtf8('Rect&angular Selection'), - 0, 0, + self.trUtf8('Rect&angular Selection'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_selection_rectangle') self.drawRectangleSelectionAct.setWhatsThis(self.trUtf8( """<b>Rectangular Selection</b>""" """<p>Select a rectangular section of the icon using the mouse.</p>""" )) self.drawRectangleSelectionAct.setCheckable(True) - self.esm.setMapping(self.drawRectangleSelectionAct, + self.esm.setMapping(self.drawRectangleSelectionAct, IconEditorGrid.RectangleSelection) self.drawRectangleSelectionAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawRectangleSelectionAct) - self.drawCircleSelectionAct = E5Action(self.trUtf8('Circular Selection'), + self.drawCircleSelectionAct = E5Action(self.trUtf8('Circular Selection'), UI.PixmapCache.getIcon("selectCircle.png"), - self.trUtf8('Rect&angular Selection'), - 0, 0, + self.trUtf8('Rect&angular Selection'), + 0, 0, self.drawingActGrp, 'iconEditor_tools_selection_circle') self.drawCircleSelectionAct.setWhatsThis(self.trUtf8( """<b>Circular Selection</b>""" """<p>Select a circular section of the icon using the mouse.</p>""" )) self.drawCircleSelectionAct.setCheckable(True) - self.esm.setMapping(self.drawCircleSelectionAct, + self.esm.setMapping(self.drawCircleSelectionAct, IconEditorGrid.CircleSelection) self.drawCircleSelectionAct.triggered[()].connect(self.esm.map) self.__actions.append(self.drawCircleSelectionAct) @@ -711,7 +712,7 @@ self.__actions.append(self.aboutAct) self.aboutQtAct = E5Action(self.trUtf8('About Qt'), - self.trUtf8('About &Qt'), + self.trUtf8('About &Qt'), 0, 0, self, 'iconEditor_help_about_qt') self.aboutQtAct.setStatusTip( self.trUtf8('Display information about the Qt toolkit')) @@ -722,10 +723,10 @@ self.aboutQtAct.triggered[()].connect(self.__aboutQt) self.__actions.append(self.aboutQtAct) - self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), + self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), UI.PixmapCache.getIcon("whatsThis.png"), - self.trUtf8('&What\'s This?'), - QKeySequence(self.trUtf8("Shift+F1","Help|What's This?'")), + self.trUtf8('&What\'s This?'), + QKeySequence(self.trUtf8("Shift+F1", "Help|What's This?'")), 0, self, 'iconEditor_help_whats_this') self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help')) self.whatsThisAct.setWhatsThis(self.trUtf8( @@ -956,7 +957,7 @@ """ Public slot called to open a new icon editor window. """ - ie = IconEditorWindow(parent = self.parent(), fromEric = self.fromEric) + ie = IconEditorWindow(parent=self.parent(), fromEric=self.fromEric) ie.show() def __openIcon(self): @@ -1007,7 +1008,7 @@ self.trUtf8("Save icon file"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fileName), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return False @@ -1027,7 +1028,7 @@ @param fileName name of the icon file to load (string). """ - file= QFile(fileName) + file = QFile(fileName) if not file.exists(): E5MessageBox.warning(self, self.trUtf8("eric5 Icon Editor"), self.trUtf8("The file '{0}' does not exist.")\ @@ -1042,7 +1043,7 @@ file.close() img = QImage(fileName) - self.__editor.setIconImage(img, clearUndo = True) + self.__editor.setIconImage(img, clearUndo=True) self.__setCurrentFile(fileName) def __saveIconFile(self, fileName): @@ -1075,7 +1076,7 @@ return False - self.__editor.setDirty(False, setCleanState = True) + self.__editor.setDirty(False, setCleanState=True) self.__setCurrentFile(fileName) self.__statusBar.showMessage(self.trUtf8("Icon saved"), 2000) @@ -1120,7 +1121,7 @@ if self.__editor.isDirty(): ret = E5MessageBox.okToClearData(self, self.trUtf8("eric5 Icon Editor"), - self.trUtf8("""The icon image has unsaved changes."""), + self.trUtf8("""The icon image has unsaved changes."""), self.__saveIcon) if not ret: return False @@ -1134,7 +1135,7 @@ def __modificationChanged(self, m): """ - Private slot to handle the modificationChanged signal. + Private slot to handle the modificationChanged signal. @param m modification status """
--- a/IconEditor/IconSizeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/IconEditor/IconSizeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,11 +8,12 @@ from .Ui_IconSizeDialog import Ui_IconSizeDialog + class IconSizeDialog(QDialog, Ui_IconSizeDialog): """ Class implementing a dialog to enter the icon size. """ - def __init__(self, width, height, parent = None): + def __init__(self, width, height, parent=None): """ Constructor
--- a/IconEditor/IconZoomDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/IconEditor/IconZoomDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_IconZoomDialog import Ui_IconZoomDialog + class IconZoomDialog(QDialog, Ui_IconZoomDialog): """ Class implementing a dialog to select the zoom factor. """ - def __init__(self, zoom, parent = None): + def __init__(self, zoom, parent=None): """ Constructor
--- a/IconEditor/cursors/cursors_rc.py Fri Mar 11 08:55:14 2011 +0100 +++ b/IconEditor/cursors/cursors_rc.py Fri Mar 11 16:51:57 2011 +0100 @@ -319,9 +319,11 @@ \x00\x00\x00\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x08\x94\ " + def qInitResources(): QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data) + def qCleanupResources(): QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
--- a/MultiProject/AddProjectDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/MultiProject/AddProjectDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Utilities + class AddProjectDialog(QDialog, Ui_AddProjectDialog): """ Class implementing the add project dialog. """ - def __init__(self, parent = None, startdir = None, project = None): + def __init__(self, parent=None, startdir=None, project=None): """ Constructor @@ -71,13 +72,13 @@ """ Public slot to retrieve the dialogs data. - @return tuple of four values (string, string, boolean, string) giving the + @return tuple of four values (string, string, boolean, string) giving the project name, the name of the project file, a flag telling, whether the project shall be the master project and a short description for the project """ - return (self.nameEdit.text(), self.filenameEdit.text(), - self.masterCheckBox.isChecked(), + return (self.nameEdit.text(), self.filenameEdit.text(), + self.masterCheckBox.isChecked(), self.descriptionEdit.toPlainText()) @pyqtSlot(str)
--- a/MultiProject/MultiProject.py Fri Mar 11 08:55:14 2011 +0100 +++ b/MultiProject/MultiProject.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,6 +28,7 @@ import Preferences import Utilities + class MultiProject(QObject): """ Class implementing the project management functionality. @@ -36,9 +37,9 @@ @signal newMultiProject() emitted after a new multi project was generated @signal multiProjectOpened() emitted after a multi project file was read @signal multiProjectClosed() emitted after a multi project was closed - @signal multiProjectPropertiesChanged() emitted after the multi project + @signal multiProjectPropertiesChanged() emitted after the multi project properties were changed - @signal showMenu(string, QMenu) emitted when a menu is about to be shown. + @signal showMenu(string, QMenu) emitted when a menu is about to be shown. The name of the menu and a reference to the menu are given. @signal projectDataChanged(project data dict) emitted after a project entry has been changed @@ -59,7 +60,7 @@ projectRemoved = pyqtSignal(dict) projectOpened = pyqtSignal(str) - def __init__(self, project, parent = None, filename = None): + def __init__(self, project, parent=None, filename=None): """ Constructor @@ -173,7 +174,7 @@ def __checkFilesExist(self): """ - Private method to check, if the files in a list exist. + Private method to check, if the files in a list exist. The project files are checked for existance in the filesystem. Non existant projects are removed from the list and the @@ -224,7 +225,7 @@ return True - def __writeMultiProject(self, fn = None): + def __writeMultiProject(self, fn=None): """ Private method to save the multi project infos to a multi project file. @@ -261,7 +262,7 @@ return res - def addProject(self, startdir = None): + def addProject(self, startdir=None): """ Public slot used to add files to the project. @@ -269,7 +270,7 @@ """ if startdir is None: startdir = self.ppath - dlg = AddProjectDialog(self.ui, startdir = startdir) + dlg = AddProjectDialog(self.ui, startdir=startdir) if dlg.exec_() == QDialog.Accepted: name, filename, isMaster, description = dlg.getData() @@ -289,10 +290,10 @@ # step 3: add the project entry project = { - 'name' : name, - 'file' : filename, - 'master' : isMaster, - 'description' : description, + 'name': name, + 'file': filename, + 'master': isMaster, + 'description': description, } self.projects.append(project) self.projectAdded.emit(project) @@ -390,12 +391,12 @@ self.setDirty(True) self.multiProjectPropertiesChanged.emit() - def openMultiProject(self, fn = None, openMaster = True): + def openMultiProject(self, fn=None, openMaster=True): """ Public slot to open a multi project. @param fn optional filename of the multi project file to be read (string) - @param openMaster flag indicating, that the master project + @param openMaster flag indicating, that the master project should be opened depending on the configuration (boolean) """ if not self.checkDirty(): @@ -475,7 +476,7 @@ self.trUtf8("Save File"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fileName), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return False @@ -495,7 +496,7 @@ @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) @@ -551,7 +552,7 @@ act = E5Action(self.trUtf8('New multiproject'), UI.PixmapCache.getIcon("multiProjectNew.png"), self.trUtf8('&New...'), 0, 0, - self.actGrp1,'multi_project_new') + self.actGrp1, 'multi_project_new') act.setStatusTip(self.trUtf8('Generate a new multiproject')) act.setWhatsThis(self.trUtf8( """<b>New...</b>""" @@ -564,7 +565,7 @@ act = E5Action(self.trUtf8('Open multiproject'), UI.PixmapCache.getIcon("multiProjectOpen.png"), self.trUtf8('&Open...'), 0, 0, - self.actGrp1,'multi_project_open') + self.actGrp1, 'multi_project_open') act.setStatusTip(self.trUtf8('Open an existing multiproject')) act.setWhatsThis(self.trUtf8( """<b>Open...</b>""" @@ -610,7 +611,7 @@ self.addProjectAct = E5Action(self.trUtf8('Add project to multiproject'), UI.PixmapCache.getIcon("fileProject.png"), self.trUtf8('Add &project...'), 0, 0, - self,'multi_project_add_project') + self, 'multi_project_add_project') self.addProjectAct.setStatusTip(self.trUtf8( 'Add a project to the current multiproject')) self.addProjectAct.setWhatsThis(self.trUtf8( @@ -648,8 +649,8 @@ self.recentMenu = QMenu(self.trUtf8('Open &Recent Multiprojects'), menu) self.__menus = { - "Main" : menu, - "Recent" : self.recentMenu, + "Main": menu, + "Recent": self.recentMenu, } # connect the aboutToShow signals @@ -735,7 +736,7 @@ else: formatStr = '{0:d}. {1}' act = self.recentMenu.addAction( - formatStr.format(idx, + formatStr.format(idx, Utilities.compactPath(rp, self.ui.maxMenuFilePathLen))) act.setData(rp) act.setEnabled(QFileInfo(rp).exists()) @@ -746,7 +747,7 @@ def __openRecent(self, act): """ - Private method to open a multi project from the list of rencently + Private method to open a multi project from the list of rencently opened multi projects. @param act reference to the action that triggered (QAction) @@ -810,7 +811,7 @@ self.projectObject.openProject(filename) self.projectOpened.emit(filename) - def __openMasterProject(self, reopen = True): + def __openMasterProject(self, reopen=True): """ Public slot to open the master project.
--- a/MultiProject/MultiProjectBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/MultiProject/MultiProjectBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import UI.PixmapCache + class MultiProjectBrowser(QListWidget): """ Class implementing the multi project browser. """ - def __init__(self, multiProject, parent = None): + def __init__(self, multiProject, parent=None): """ Constructor @@ -108,10 +109,10 @@ Private slot to handle the opening of a project. """ project = { - 'name' : "", - 'file' : projectfile, - 'master' : False, - 'description' : "", + 'name': "", + 'file': projectfile, + 'master': False, + 'description': "", } row = self.__findProjectItem(project) if row > -1: @@ -129,7 +130,7 @@ else: self.__menu.popup(self.mapToGlobal(coord)) - def __openItem(self, itm = None): + def __openItem(self, itm=None): """ Private slot to open a project. @@ -209,14 +210,14 @@ if filename: project = self.multiProject.getProject(filename) if project is not None: - dlg = AddProjectDialog(self, project = project) + dlg = AddProjectDialog(self, project=project) if dlg.exec_() == QDialog.Accepted: name, filename, isMaster, description = dlg.getData() project = { - 'name' : name, - 'file' : filename, - 'master' : isMaster, - 'description' : description, + 'name': name, + 'file': filename, + 'master': isMaster, + 'description': description, } self.multiProject.changeProjectProperties(project)
--- a/MultiProject/PropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/MultiProject/PropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_PropertiesDialog import Ui_PropertiesDialog + class PropertiesDialog(QDialog, Ui_PropertiesDialog): """ Class implementing the multi project properties dialog. """ - def __init__(self, multiProject, new = True, parent = None): + def __init__(self, multiProject, new=True, parent=None): """ Constructor
--- a/MultiProject/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/MultiProject/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ The multi project management module consists of the main part, which is used for reading and writing of eric5 multi project files (*.e4m) and -for performing all operations on the multi project. It is accompanied by -various UI related modules implementing different dialogs and a browser +for performing all operations on the multi project. It is accompanied by +various UI related modules implementing different dialogs and a browser for the display of projects belonging to the current multi project. """
--- a/PluginManager/PluginDetailsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginDetailsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ from .Ui_PluginDetailsDialog import Ui_PluginDetailsDialog + class PluginDetailsDialog(QDialog, Ui_PluginDetailsDialog): """ Class implementing the Plugin Details Dialog. """ - def __init__(self, details, parent = None): + def __init__(self, details, parent=None): """ Constructor
--- a/PluginManager/PluginExceptions.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginExceptions.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtGui import QApplication + class PluginError(Exception): """ Class defining a special error for the plugin classes. @@ -36,12 +37,13 @@ """ return str(self._errorMessage) + class PluginPathError(PluginError): """ Class defining an error raised, when the plugin paths were not found and could not be created. """ - def __init__(self, msg = None): + def __init__(self, msg=None): """ Constructor @@ -51,9 +53,10 @@ self._errorMessage = msg else: self._errorMessage = \ - QApplication.translate("PluginError", + QApplication.translate("PluginError", "Plugin paths not found or not creatable.") + class PluginModulesError(PluginError): """ Class defining an error raised, when no plugin modules were found. @@ -65,6 +68,7 @@ self._errorMessage = \ QApplication.translate("PluginError", "No plugin modules found.") + class PluginLoadError(PluginError): """ Class defining an error raised, when there was an error during plugin loading. @@ -79,6 +83,7 @@ QApplication.translate("PluginError", "Error loading plugin module: {0}")\ .format(name) + class PluginActivationError(PluginError): """ Class defining an error raised, when there was an error during plugin activation. @@ -93,6 +98,7 @@ QApplication.translate("PluginError", "Error activating plugin module: {0}")\ .format(name) + class PluginModuleFormatError(PluginError): """ Class defining an error raised, when the plugin module is invalid. @@ -105,10 +111,11 @@ @param missing description of the missing element (string) """ self._errorMessage = \ - QApplication.translate("PluginError", + QApplication.translate("PluginError", "The plugin module {0} is missing {1}.")\ .format(name, missing) + class PluginClassFormatError(PluginError): """ Class defining an error raised, when the plugin module's class is invalid. @@ -122,6 +129,6 @@ @param missing description of the missing element (string) """ self._errorMessage = \ - QApplication.translate("PluginError", + QApplication.translate("PluginError", "The plugin class {0} of module {1} is missing {2}.")\ .format(class_, name, missing)
--- a/PluginManager/PluginInfoDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginInfoDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from .Ui_PluginInfoDialog import Ui_PluginInfoDialog + class PluginInfoDialog(QDialog, Ui_PluginInfoDialog): """ Class implementing the Plugin Info Dialog. """ - def __init__(self, pluginManager, parent = None): + def __init__(self, pluginManager, parent=None): """ Constructor @@ -57,7 +58,7 @@ self.pluginList.clear() for info in self.pm.getPluginInfos(): self.__createEntry(info) - self.pluginList.sortItems(self.pluginList.sortColumn(), + self.pluginList.sortItems(self.pluginList.sortColumn(), self.pluginList.header().sortIndicatorOrder()) def __createEntry(self, info): @@ -67,11 +68,11 @@ @param info tuple giving the info for the entry """ infoList = [ - info[0], - info[1], - info[2], - (info[3] and self.trUtf8("Yes") or self.trUtf8("No")), - (info[4] and self.trUtf8("Yes") or self.trUtf8("No")), + info[0], + info[1], + info[2], + (info[3] and self.trUtf8("Yes") or self.trUtf8("No")), + (info[4] and self.trUtf8("Yes") or self.trUtf8("No")), info[5] ] itm = QTreeWidgetItem(self.pluginList, infoList)
--- a/PluginManager/PluginInstallDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginInstallDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,16 +27,17 @@ from Utilities.uic import compileUiFiles + class PluginInstallWidget(QWidget, Ui_PluginInstallDialog): """ Class implementing the Plugin installation dialog. """ - def __init__(self, pluginManager, pluginFileNames, parent = None): + def __init__(self, pluginManager, pluginFileNames, parent=None): """ Constructor @param pluginManager reference to the plugin manager object - @param pluginFileNames list of plugin files suggested for + @param pluginFileNames list of plugin files suggested for installation (list of strings) @param parent parent of this dialog (QWidget) """ @@ -45,7 +46,7 @@ if pluginManager is None: # started as external plugin installer - self.__pluginManager = PluginManager(doLoadPlugins = False) + self.__pluginManager = PluginManager(doLoadPlugins=False) self.__external = True else: self.__pluginManager = pluginManager @@ -63,12 +64,12 @@ userDir = self.__pluginManager.getPluginDir("user") if userDir is not None: - self.destinationCombo.addItem(self.trUtf8("User plugins directory"), + self.destinationCombo.addItem(self.trUtf8("User plugins directory"), userDir) globalDir = self.__pluginManager.getPluginDir("global") if globalDir is not None and os.access(globalDir, os.W_OK): - self.destinationCombo.addItem(self.trUtf8("Global plugins directory"), + self.destinationCombo.addItem(self.trUtf8("Global plugins directory"), globalDir) self.__installedDirs = [] @@ -131,8 +132,8 @@ self.__cancelButton.show() msg = self.trUtf8("Plugin ZIP-Archives:\n{0}\n\nDestination:\n{1} ({2})")\ - .format("\n".join(self.__createArchivesList()), - self.destinationCombo.currentText(), + .format("\n".join(self.__createArchivesList()), + self.destinationCombo.currentText(), self.destinationCombo.itemData( self.destinationCombo.currentIndex()) ) @@ -229,7 +230,7 @@ """ Private slot to install the selected plugin. - @param archiveFilename name of the plugin archive + @param archiveFilename name of the plugin archive file (string) @return flag indicating success (boolean), error message upon failure (string) and flag indicating a restart @@ -404,7 +405,7 @@ compileUiFiles(os.path.join(destination, packageName), True) else: outname = os.path.join(destination, pluginFileName) - f = open(outname, "w", encoding = "utf-8") + f = open(outname, "w", encoding="utf-8") f.write(pluginSource) f.close() self.__installedFiles.append(outname) @@ -431,7 +432,7 @@ False # now compile the plugins - compileall.compile_dir(destination, quiet = True) + compileall.compile_dir(destination, quiet=True) if not self.__external: # now load and activate the plugin @@ -452,7 +453,7 @@ if os.path.exists(dname): shutil.rmtree(dname) - def __makedirs(self, name, mode = 0o777): + def __makedirs(self, name, mode=0o777): """ Private method to create a directory and all intermediate ones. @@ -504,16 +505,17 @@ # ignore some exceptions pass + class PluginInstallDialog(QDialog): """ Class for the dialog variant. """ - def __init__(self, pluginManager, pluginFileNames, parent = None): + def __init__(self, pluginManager, pluginFileNames, parent=None): """ Constructor @param pluginManager reference to the plugin manager object - @param pluginFileNames list of plugin files suggested for + @param pluginFileNames list of plugin files suggested for installation (list of strings) @param parent reference to the parent widget (QWidget) """ @@ -540,15 +542,16 @@ """ return self.cw.restartNeeded() + class PluginInstallWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, pluginFileNames, parent = None): + def __init__(self, pluginFileNames, parent=None): """ Constructor - @param pluginFileNames list of plugin files suggested for + @param pluginFileNames list of plugin files suggested for installation (list of strings) @param parent reference to the parent widget (QWidget) """
--- a/PluginManager/PluginManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,6 +25,7 @@ from eric5config import getConfig + class PluginManager(QObject): """ Class implementing the Plugin Manager. @@ -48,21 +49,21 @@ pluginAboutToBeDeactivated = pyqtSignal(str, object) pluginDeactivated = pyqtSignal(str, object) - def __init__(self, parent = None, doLoadPlugins = True, develPlugin = None): + def __init__(self, parent=None, doLoadPlugins=True, develPlugin=None): """ Constructor The Plugin Manager deals with three different plugin directories. The first is the one, that is part of eric5 (eric5/Plugins). The - second one is the global plugin directory called 'eric5plugins', + second one is the global plugin directory called 'eric5plugins', which is located inside the site-packages directory. The last one is the user plugin directory located inside the .eric5 directory of the users home directory. @param parent reference to the parent object (QObject) - @keyparam doLoadPlugins flag indicating, that plugins should + @keyparam doLoadPlugins flag indicating, that plugins should be loaded (boolean) - @keyparam develPlugin filename of a plugin to be loaded for + @keyparam develPlugin filename of a plugin to be loaded for development (string) """ QObject.__init__(self, parent) @@ -74,10 +75,10 @@ self.__inactivePluginsKey = "PluginManager/InactivePlugins" self.pluginDirs = { - "eric5" : os.path.join(getConfig('ericDir'), "Plugins"), - "global" : os.path.join(Utilities.getPythonModulesDirectory(), - "eric5plugins"), - "user" : os.path.join(Utilities.getConfigDir(), "eric5plugins"), + "eric5": os.path.join(getConfig('ericDir'), "Plugins"), + "global": os.path.join(Utilities.getPythonModulesDirectory(), + "eric5plugins"), + "user": os.path.join(Utilities.getConfigDir(), "eric5plugins"), } self.__priorityOrder = ["eric5", "global", "user"] @@ -142,7 +143,7 @@ If the plugin folders don't exist, they are created (if possible). - @return tuple of a flag indicating existence of any of the plugin + @return tuple of a flag indicating existence of any of the plugin directories (boolean) and a message (string) """ if self.__develPluginFile: @@ -153,7 +154,7 @@ f = open(fname, "w") f.close() except IOError: - return (False, + return (False, self.trUtf8("Could not create a package for {0}.")\ .format(self.__develPluginFile)) @@ -173,7 +174,7 @@ # create the global plugins directory os.mkdir(self.pluginDirs["global"], 0o755) fname = os.path.join(self.pluginDirs["global"], "__init__.py") - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write('# -*- coding: utf-8 -*-' + "\n") f.write("\n") f.write('"""' + "\n") @@ -187,7 +188,7 @@ del self.pluginDirs["global"] if not os.path.exists(self.pluginDirs["eric5"]): - return (False, + return (False, self.trUtf8("The internal plugin directory <b>{0}</b> does not exits.")\ .format(self.pluginDirs["eric5"])) @@ -283,7 +284,7 @@ self.loadPlugin(develPluginName, develPluginPath) self.__develPluginName = develPluginName - def loadPlugin(self, name, directory, reload_ = False): + def loadPlugin(self, name, directory, reload_=False): """ Public method to load a plugin module. @@ -441,12 +442,12 @@ self.activatePlugin(name) self.allPlugginsActivated.emit() - def activatePlugin(self, name, onDemand = False): + def activatePlugin(self, name, onDemand=False): """ Public method to activate a plugin. @param name name of the module to be activated - @keyparam onDemand flag indicating activation of an + @keyparam onDemand flag indicating activation of an on demand plugin (boolean) @return reference to the initialized plugin object """ @@ -528,13 +529,13 @@ raise PluginModuleFormatError(module.eric5PluginModuleName, className) pluginClass = getattr(module, className) if not hasattr(pluginClass, "__init__"): - raise PluginClassFormatError(module.eric5PluginModuleName, + raise PluginClassFormatError(module.eric5PluginModuleName, className, "__init__") if not hasattr(pluginClass, "activate"): - raise PluginClassFormatError(module.eric5PluginModuleName, + raise PluginClassFormatError(module.eric5PluginModuleName, className, "activate") if not hasattr(pluginClass, "deactivate"): - raise PluginClassFormatError(module.eric5PluginModuleName, + raise PluginClassFormatError(module.eric5PluginModuleName, className, "deactivate") return True except PluginModuleFormatError as e: @@ -544,12 +545,12 @@ print(repr(e)) return False - def deactivatePlugin(self, name, onDemand = False): + def deactivatePlugin(self, name, onDemand=False): """ Public method to deactivate a plugin. @param name name of the module to be deactivated - @keyparam onDemand flag indicating deactivation of an + @keyparam onDemand flag indicating deactivation of an on demand plugin (boolean) """ try: @@ -595,7 +596,7 @@ """ return getattr(module, "deactivateable", True) - def getPluginObject(self, type_, typename, maybeActive = False): + def getPluginObject(self, type_, typename, maybeActive=False): """ Public method to activate an ondemand plugin given by type and typename. @@ -608,14 +609,14 @@ for name, module in list(self.__onDemandInactiveModules.items()): if getattr(module, "pluginType") == type_ and \ getattr(module, "pluginTypename") == typename: - return self.activatePlugin(name, onDemand = True) + return self.activatePlugin(name, onDemand=True) if maybeActive: for name, module in list(self.__onDemandActiveModules.items()): if getattr(module, "pluginType") == type_ and \ getattr(module, "pluginTypename") == typename: - self.deactivatePlugin(name, onDemand = True) - return self.activatePlugin(name, onDemand = True) + self.deactivatePlugin(name, onDemand=True) + return self.activatePlugin(name, onDemand=True) return None @@ -624,7 +625,7 @@ Public method to get infos about all loaded plugins. @return list of tuples giving module name (string), plugin name (string), - version (string), autoactivate (boolean), active (boolean), + version (string), autoactivate (boolean), active (boolean), short description (string), error flag (boolean) """ infos = [] @@ -656,7 +657,7 @@ Private method to extract the short info from a module. @param module module to extract short info from - @return short info as a tuple giving plugin name (string), + @return short info as a tuple giving plugin name (string), short description (string), error flag (boolean) and version (string) """ @@ -799,7 +800,7 @@ <li>versionCommand - commandline parameter for the exe (string)</li> <li>versionStartsWith - indicator for the output line containing the version (string)</li> - <li>versionPosition - number of element containing the + <li>versionPosition - number of element containing the version (integer)</li> <li>version - version to be used as default (string)</li> <li>versionCleanup - tuple of two integers giving string positions @@ -847,12 +848,12 @@ <dd>filename of the pixmap to be shown next to the display string</dd> <dt>page creation function</dt> <dd>plugin module function to be called to create the configuration - page. The page must be subclasses from + page. The page must be subclasses from Preferences.ConfigurationPages.ConfigurationPageBase and must implement a method called 'save' to save the settings. A parent entry will be created in the selection list, if this value is None.</dd> <dt>parent key</dt> - <dd>dictionary key of the parent entry or None, if this defines a + <dd>dictionary key of the parent entry or None, if this defines a toplevel entry.</dd> <dt>reference to configuration page</dt> <dd>This will be used by the configuration dialog and must always be None</dd>
--- a/PluginManager/PluginRepositoryDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginRepositoryDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -36,10 +36,11 @@ from eric5config import getConfig -descrRole = Qt.UserRole -urlRole = Qt.UserRole + 1 +descrRole = Qt.UserRole +urlRole = Qt.UserRole + 1 filenameRole = Qt.UserRole + 2 -authorRole = Qt.UserRole + 3 +authorRole = Qt.UserRole + 3 + class PluginRepositoryWidget(QWidget, Ui_PluginRepositoryDialog): """ @@ -49,7 +50,7 @@ """ closeAndInstall = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -66,7 +67,7 @@ self.__downloadCancelButton = \ self.buttonBox.addButton(self.trUtf8("Cancel"), QDialogButtonBox.ActionRole) self.__installButton = \ - self.buttonBox.addButton(self.trUtf8("Close && Install"), + self.buttonBox.addButton(self.trUtf8("Close && Install"), QDialogButtonBox.ActionRole) self.__downloadCancelButton.setEnabled(False) self.__installButton.setEnabled(False) @@ -171,8 +172,8 @@ Private slot to download a new list and display the contents. """ url = Preferences.getUI("PluginRepositoryUrl5") - self.__downloadFile(url, - self.pluginRepositoryFile, + self.__downloadFile(url, + self.pluginRepositoryFile, self.__downloadRepositoryFileDone) def __downloadRepositoryFileDone(self, status, filename): @@ -204,8 +205,8 @@ """ Private method to download the next plugin. """ - self.__downloadFile(self.__pluginsToDownload[0][0], - self.__pluginsToDownload[0][1], + self.__downloadFile(self.__pluginsToDownload[0][0], + self.__pluginsToDownload[0][1], self.__downloadPluginDone) def __downloadPlugins(self): @@ -244,7 +245,7 @@ """ Private method to resort the tree. """ - self.repositoryList.sortItems(self.repositoryList.sortColumn(), + self.repositoryList.sortItems(self.repositoryList.sortColumn(), self.repositoryList.header().sortIndicatorOrder()) def __populateList(self): @@ -277,13 +278,13 @@ .format(self.pluginRepositoryFile)) else: self.__repositoryMissing = True - QTreeWidgetItem(self.repositoryList, - ["", + QTreeWidgetItem(self.repositoryList, + ["", self.trUtf8("No plugin repository file available.\nSelect Update.") ]) self.repositoryList.resizeColumnToContents(1) - def __downloadFile(self, url, filename, doneMethod = None): + def __downloadFile(self, url, filename, doneMethod=None): """ Private slot to download the given file. @@ -464,7 +465,7 @@ """<p>{0}</p>""" """<p>Do you want to ignore these errors?</p>""")\ .format(errorString), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if ret: reply.ignoreSslErrors() else: @@ -479,11 +480,12 @@ """ return self.__pluginsDownloaded + class PluginRepositoryDialog(QDialog): """ Class for the dialog variant. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -519,11 +521,12 @@ """ return self.cw.getDownloadedPlugins() + class PluginRepositoryWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/PluginManager/PluginUninstallDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PluginManager/PluginUninstallDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ from .PluginManager import PluginManager from .Ui_PluginUninstallDialog import Ui_PluginUninstallDialog + class PluginUninstallWidget(QWidget, Ui_PluginUninstallDialog): """ Class implementing a dialog for plugin deinstallation. """ - def __init__(self, pluginManager, parent = None): + def __init__(self, pluginManager, parent=None): """ Constructor @@ -36,18 +37,18 @@ if pluginManager is None: # started as external plugin deinstaller - self.__pluginManager = PluginManager(doLoadPlugins = False) + self.__pluginManager = PluginManager(doLoadPlugins=False) self.__external = True else: self.__pluginManager = pluginManager self.__external = False - self.pluginDirectoryCombo.addItem(self.trUtf8("User plugins directory"), + self.pluginDirectoryCombo.addItem(self.trUtf8("User plugins directory"), self.__pluginManager.getPluginDir("user")) globalDir = self.__pluginManager.getPluginDir("global") if globalDir is not None and os.access(globalDir, os.W_OK): - self.pluginDirectoryCombo.addItem(self.trUtf8("Global plugins directory"), + self.pluginDirectoryCombo.addItem(self.trUtf8("Global plugins directory"), globalDir) @pyqtSlot(int) @@ -151,11 +152,12 @@ .format(pluginName, pluginDirectory)) return True + class PluginUninstallDialog(QDialog): """ Class for the dialog variant. """ - def __init__(self, pluginManager, parent = None): + def __init__(self, pluginManager, parent=None): """ Constructor @@ -177,11 +179,12 @@ self.cw.buttonBox.accepted[()].connect(self.accept) self.cw.buttonBox.rejected[()].connect(self.reject) + class PluginUninstallWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Plugins/AboutPlugin/AboutDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/AboutPlugin/AboutDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -93,7 +93,7 @@ """Eric is {0} You may use, distribute and copy Eric under the terms of the GNU -General Public License as published by the Free Software Foundation, +General Public License as published by the Free Software Foundation, either version 3 of the License, which is shown below, or (at your option) any later version. @@ -729,11 +729,12 @@ from .Ui_AboutDialog import Ui_AboutDialog + class AboutDialog(QDialog, Ui_AboutDialog): """ Class implementing an 'About Eric' dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -746,25 +747,25 @@ self.ericPixmap.setPixmap(UI.PixmapCache.getPixmap("eric.png")) #################################################################### - ## ABOUT + ## ABOUT #################################################################### self.aboutEdit.setHtml(aboutText) #################################################################### - ## Copyright, Authors + ## Copyright, Authors #################################################################### self.authorsEdit.setPlainText(authorsText) #################################################################### - ## THANKS + ## THANKS #################################################################### self.thanksEdit.setPlainText(thanksText) #################################################################### - ## LICENSE + ## LICENSE #################################################################### if Utilities.isWindowsPlatform():
--- a/Plugins/CheckerPlugins/Pep8/Pep8Checker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Checker.py Fri Mar 11 16:51:57 2011 +0100 @@ -115,6 +115,7 @@ offset + 1, text) ) + class Pep8Py2Checker(object): """ Class implementing the PEP 8 checker interface for Python 2. @@ -141,7 +142,7 @@ self.trUtf8("Python2 interpreter not configured.")) return - checker = os.path.join(getConfig('ericDir'), + checker = os.path.join(getConfig('ericDir'), "UtilitiesPython2", "Pep8Checker.py") args = [checker] @@ -162,8 +163,8 @@ finished = proc.waitForFinished(15000) if finished: output = \ - str(proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace').splitlines() if output[0] == "ERROR": self.messages.append(filename, "1", "1", output[2])
--- a/Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ from .Ui_Pep8CodeSelectionDialog import Ui_Pep8CodeSelectionDialog + class Pep8CodeSelectionDialog(QDialog, Ui_Pep8CodeSelectionDialog): """ Class implementing a dialog to select PEP 8 message codes. """ - def __init__(self, codes, showFixCodes, parent = None): + def __init__(self, codes, showFixCodes, parent=None): """ Constructor @@ -39,11 +40,11 @@ selectableCodes = pep8.pep8_messages.keys() for code in sorted(selectableCodes, key=lambda a: a[1:]): if code in pep8.pep8_messages_sample_args: - message = QCoreApplication.translate("pep8", + message = QCoreApplication.translate("pep8", pep8.pep8_messages[code]).format( *pep8.pep8_messages_sample_args[code]) else: - message = QCoreApplication.translate("pep8", + message = QCoreApplication.translate("pep8", pep8.pep8_messages[code]) itm = QTreeWidgetItem(self.codeTable, [code, message]) if code in codeList:
--- a/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Dialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,18 +29,19 @@ import Preferences import Utilities + class Pep8Dialog(QDialog, Ui_Pep8Dialog): """ Class implementing a dialog to show the results of the PEP 8 check. """ filenameRole = Qt.UserRole + 1 - lineRole = Qt.UserRole + 2 + lineRole = Qt.UserRole + 2 positionRole = Qt.UserRole + 3 - messageRole = Qt.UserRole + 4 + messageRole = Qt.UserRole + 4 settingsKey = "PEP8/" - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -89,7 +90,7 @@ """ Private method to resort the tree. """ - self.resultList.sortItems(self.resultList.sortColumn(), + self.resultList.sortItems(self.resultList.sortColumn(), self.resultList.header().sortIndicatorOrder() ) @@ -111,7 +112,7 @@ self.__lastFileItem.setData(0, self.filenameRole, file) code, message = message.split(None, 1) - itm = QTreeWidgetItem(self.__lastFileItem, + itm = QTreeWidgetItem(self.__lastFileItem, ["{0:6}".format(line), code, message]) if code.startswith("W"): itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) @@ -183,12 +184,12 @@ len(self.__data) != 6: # initialize the data structure self.__data = { - "ExcludeFiles" : "", - "ExcludeMessages" : pep8.DEFAULT_IGNORE, - "IncludeMessages" : "", - "RepeatMessages" : False, - "FixCodes" : "", - "FixIssues" : False, + "ExcludeFiles": "", + "ExcludeMessages": pep8.DEFAULT_IGNORE, + "IncludeMessages": "", + "RepeatMessages": False, + "FixCodes": "", + "FixIssues": False, } self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"]) @@ -197,13 +198,13 @@ self.fixIssuesEdit.setText(self.__data["FixCodes"]) self.fixIssuesCheckBox.setChecked(self.__data["FixIssues"]) - def start(self, fn, save = False, repeat = None): + def start(self, fn, save=False, repeat=None): """ Public slot to start the PEP 8 check. @param fn file or list of files or directory to be checked (string or list of strings) - @keyparam save flag indicating to save the given + @keyparam save flag indicating to save the given file/file list/directory (boolean) @keyparam repeat state of the repeat check box if it is not None (None or boolean) @@ -242,11 +243,11 @@ # filter the list depending on the filter string if files: filterString = self.excludeFilesEdit.text() - filterList = [f.strip() for f in filterString.split(",") + filterList = [f.strip() for f in filterString.split(",") if f.strip()] for filter in filterList: files = \ - [f for f in files + [f for f in files if not fnmatch.fnmatch(f, filter.strip())] py3files = [f for f in files \ @@ -289,7 +290,7 @@ source = source.splitlines(True) except (UnicodeError, IOError) as msg: self.noResults = False - self.__createResultItem(file, "1", "1", + self.__createResultItem(file, "1", "1", self.trUtf8("Error: {0}").format(str(msg))\ .rstrip()[1:-1], False) progress += 1 @@ -298,30 +299,30 @@ flags = Utilities.extractFlags(source) ext = os.path.splitext(file)[1] if fixIssues: - fixer = Pep8Fixer(self.__project, file, source, + fixer = Pep8Fixer(self.__project, file, source, fixCodes, True) # always fix in place else: fixer = None - if ("FileType" in flags and + if ("FileType" in flags and flags["FileType"] in ["Python", "Python2"]) or \ file in py2files or \ (ext in [".py", ".pyw"] and \ Preferences.getProject("DeterminePyFromProject") and \ self.__project.isOpen() and \ self.__project.isProjectFile(file) and \ - self.__project.getProjectLanguage() in ["Python", + self.__project.getProjectLanguage() in ["Python", "Python2"]): - checker = Pep8Py2Checker(file, [], - repeat = repeatMessages, - select = includeMessages, - ignore = excludeMessages) + checker = Pep8Py2Checker(file, [], + repeat=repeatMessages, + select=includeMessages, + ignore=excludeMessages) else: - checker = Pep8Checker(file, source, - repeat = repeatMessages, - select = includeMessages, - ignore = excludeMessages) + checker = Pep8Checker(file, source, + repeat=repeatMessages, + select=includeMessages, + ignore=excludeMessages) checker.check_all() - checker.messages.sort(key = lambda a: a[1]) + checker.messages.sort(key=lambda a: a[1]) for message in checker.messages: fname, lineno, position, text = message if not source[lineno - 1].strip()\ @@ -381,16 +382,16 @@ """ if self.__forProject: data = { - "ExcludeFiles" : self.excludeFilesEdit.text(), - "ExcludeMessages" : self.excludeMessagesEdit.text(), - "IncludeMessages" : self.includeMessagesEdit.text(), - "RepeatMessages" : self.repeatCheckBox.isChecked(), - "FixCodes" : self.fixIssuesEdit.text(), - "FixIssues" : self.fixIssuesCheckBox.isChecked(), + "ExcludeFiles": self.excludeFilesEdit.text(), + "ExcludeMessages": self.excludeMessagesEdit.text(), + "IncludeMessages": self.includeMessagesEdit.text(), + "RepeatMessages": self.repeatCheckBox.isChecked(), + "FixCodes": self.fixIssuesEdit.text(), + "FixIssues": self.fixIssuesCheckBox.isChecked(), } if data != self.__data: self.__data = data - self.__project.setData("CHECKERSPARMS", "Pep8Checker", + self.__project.setData("CHECKERSPARMS", "Pep8Checker", self.__data) self.resultList.clear() @@ -434,7 +435,7 @@ @pyqtSlot(QTreeWidgetItem, int) def on_resultList_itemActivated(self, item, column): """ - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. @param item reference to the activated item (QTreeWidgetItem) @param column column the item was activated in (integer) @@ -449,7 +450,7 @@ message = item.data(0, self.messageRole) vm = e5App().getObject("ViewManager") - vm.openSourceFile(fn, lineno = lineno, pos = position) + vm.openSourceFile(fn, lineno=lineno, pos=position) editor = vm.getOpenEditor(fn) editor.toggleFlakesWarning(lineno, True, message)
--- a/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,9 +18,10 @@ Pep8FixableIssues = ["E101", "W191", "E201", "E202", "E203", "E211", "E221", "E222", "E225", "E231", "E241", "E251", "E261", "E262", - "W291", "W292", "W293", "E301", "E302", "E303", "E304", + "W291", "W292", "W293", "E301", "E302", "E303", "E304", "W391", "W603"] + class Pep8Fixer(QObject): """ Class implementing a fixer for certain PEP 8 issues. @@ -48,33 +49,33 @@ if not inPlace: self.__origName = self.__filename - self.__filename = os.path.join(os.path.dirname(self.__filename), + self.__filename = os.path.join(os.path.dirname(self.__filename), "fixed_" + os.path.basename(self.__filename)) self.__fixes = { - "E101" : self.__fixTabs, - "W191" : self.__fixTabs, - "E201" : self.__fixWhitespaceAfter, - "E202" : self.__fixWhitespaceBefore, - "E203" : self.__fixWhitespaceBefore, - "E211" : self.__fixWhitespaceBefore, - "E221" : self.__fixWhitespaceAroundOperator, - "E222" : self.__fixWhitespaceAroundOperator, - "E225" : self.__fixMissingWhitespaceAroundOperator, - "E231" : self.__fixMissingWhitespaceAfter, - "E241" : self.__fixWhitespaceAroundOperator, - "E251" : self.__fixWhitespaceAroundEquals, - "E261" : self.__fixWhitespaceBeforeInline, - "E262" : self.__fixWhitespaceAfterInline, - "W291" : self.__fixWhitespace, - "W292" : self.__fixNewline, - "W293" : self.__fixWhitespace, - "E301" : self.__fixOneBlankLine, - "E302" : self.__fixTwoBlankLines, - "E303" : self.__fixTooManyBlankLines, - "E304" : self.__fixBlankLinesAfterDecorator, - "W391" : self.__fixTrailingBlankLines, - "W603" : self.__fixNotEqual, + "E101": self.__fixTabs, + "W191": self.__fixTabs, + "E201": self.__fixWhitespaceAfter, + "E202": self.__fixWhitespaceBefore, + "E203": self.__fixWhitespaceBefore, + "E211": self.__fixWhitespaceBefore, + "E221": self.__fixWhitespaceAroundOperator, + "E222": self.__fixWhitespaceAroundOperator, + "E225": self.__fixMissingWhitespaceAroundOperator, + "E231": self.__fixMissingWhitespaceAfter, + "E241": self.__fixWhitespaceAroundOperator, + "E251": self.__fixWhitespaceAroundEquals, + "E261": self.__fixWhitespaceBeforeInline, + "E262": self.__fixWhitespaceAfterInline, + "W291": self.__fixWhitespace, + "W292": self.__fixNewline, + "W293": self.__fixWhitespace, + "E301": self.__fixOneBlankLine, + "E302": self.__fixTwoBlankLines, + "E303": self.__fixTooManyBlankLines, + "E304": self.__fixBlankLinesAfterDecorator, + "W391": self.__fixTrailingBlankLines, + "W603": self.__fixNotEqual, } self.__modified = False self.__stack = [] # these need to be fixed before the file is saved @@ -179,7 +180,7 @@ @return flag indicating an applied fix (boolean) and a message for the fix (string) """ - self.__source[line - 1] = re.sub(r'[\t ]*$', "", + self.__source[line - 1] = re.sub(r'[\t ]*$', "", self.__source[line - 1]) return (True, self.trUtf8("Whitespace stripped from end of line.")) @@ -413,7 +414,7 @@ pos -= 1 return (True, self.trUtf8("Extraneous whitespace removed.")) - def __fixMissingWhitespaceAroundOperator(self, code, line, pos, + def __fixMissingWhitespaceAroundOperator(self, code, line, pos, apply=False): """ Private method to fix missing whitespace after ',;:'.
--- a/Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,12 +16,13 @@ import UI.PixmapCache + class Pep8StatisticsDialog(QDialog, Ui_Pep8StatisticsDialog): """ Class implementing a dialog showing statistical data for the last PEP 8 run. """ - def __init__(self, statistics, parent = None): + def __init__(self, statistics, parent=None): """ Constructor @@ -43,11 +44,11 @@ for code in sorted(stats.keys(), key=lambda a: a[1:]): if code in pep8.pep8_messages_sample_args: - message = QCoreApplication.translate("pep8", + message = QCoreApplication.translate("pep8", pep8.pep8_messages[code]).format( *pep8.pep8_messages_sample_args[code]) else: - message = QCoreApplication.translate("pep8", + message = QCoreApplication.translate("pep8", pep8.pep8_messages[code]) self.__createItem(stats[code], code, message) totalIssues += stats[code] @@ -72,7 +73,7 @@ @param code of a PEP 8 message (string) @param message PEP 8 message to be shown (string) """ - itm = QTreeWidgetItem(self.statisticsList, + itm = QTreeWidgetItem(self.statisticsList, ["{0:6}".format(count), code, message]) if code.startswith("W"): itm.setIcon(1, UI.PixmapCache.getIcon("warning.png"))
--- a/Plugins/CheckerPlugins/Pep8/pep8.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/pep8.py Fri Mar 11 16:51:57 2011 +0100 @@ -161,91 +161,91 @@ pep8_messages = { - "E101" : QT_TRANSLATE_NOOP("pep8", + "E101": QT_TRANSLATE_NOOP("pep8", "indentation contains mixed spaces and tabs"), - "E111" : QT_TRANSLATE_NOOP("pep8", + "E111": QT_TRANSLATE_NOOP("pep8", "indentation is not a multiple of four"), - "E112" : QT_TRANSLATE_NOOP("pep8", + "E112": QT_TRANSLATE_NOOP("pep8", "expected an indented block"), - "E113" : QT_TRANSLATE_NOOP("pep8", + "E113": QT_TRANSLATE_NOOP("pep8", "unexpected indentation"), - "W191" : QT_TRANSLATE_NOOP("pep8", + "W191": QT_TRANSLATE_NOOP("pep8", "indentation contains tabs"), - "E201" : QT_TRANSLATE_NOOP("pep8", + "E201": QT_TRANSLATE_NOOP("pep8", "whitespace after '{0}'"), - "E202" : QT_TRANSLATE_NOOP("pep8", + "E202": QT_TRANSLATE_NOOP("pep8", "whitespace before '{0}'"), - "E203" : QT_TRANSLATE_NOOP("pep8", + "E203": QT_TRANSLATE_NOOP("pep8", "whitespace before '{0}'"), - "E211" : QT_TRANSLATE_NOOP("pep8", + "E211": QT_TRANSLATE_NOOP("pep8", "whitespace before '{0}'"), - "E221" : QT_TRANSLATE_NOOP("pep8", + "E221": QT_TRANSLATE_NOOP("pep8", "multiple spaces before operator"), - "E222" : QT_TRANSLATE_NOOP("pep8", + "E222": QT_TRANSLATE_NOOP("pep8", "multiple spaces after operator"), - "E223" : QT_TRANSLATE_NOOP("pep8", + "E223": QT_TRANSLATE_NOOP("pep8", "tab before operator"), - "E224" : QT_TRANSLATE_NOOP("pep8", + "E224": QT_TRANSLATE_NOOP("pep8", "tab after operator"), - "E225" : QT_TRANSLATE_NOOP("pep8", + "E225": QT_TRANSLATE_NOOP("pep8", "missing whitespace around operator"), - "E231" : QT_TRANSLATE_NOOP("pep8", + "E231": QT_TRANSLATE_NOOP("pep8", "missing whitespace after '{0}'"), - "E241" : QT_TRANSLATE_NOOP("pep8", + "E241": QT_TRANSLATE_NOOP("pep8", "multiple spaces after '{0}'"), - "E242" : QT_TRANSLATE_NOOP("pep8", + "E242": QT_TRANSLATE_NOOP("pep8", "tab after '{0}'"), - "E251" : QT_TRANSLATE_NOOP("pep8", + "E251": QT_TRANSLATE_NOOP("pep8", "no spaces around keyword / parameter equals"), - "E261" : QT_TRANSLATE_NOOP("pep8", + "E261": QT_TRANSLATE_NOOP("pep8", "at least two spaces before inline comment"), - "E262" : QT_TRANSLATE_NOOP("pep8", + "E262": QT_TRANSLATE_NOOP("pep8", "inline comment should start with '# '"), - "W291" : QT_TRANSLATE_NOOP("pep8", + "W291": QT_TRANSLATE_NOOP("pep8", "trailing whitespace"), - "W292" : QT_TRANSLATE_NOOP("pep8", + "W292": QT_TRANSLATE_NOOP("pep8", "no newline at end of file"), - "W293" : QT_TRANSLATE_NOOP("pep8", + "W293": QT_TRANSLATE_NOOP("pep8", "blank line contains whitespace"), - "E301" : QT_TRANSLATE_NOOP("pep8", + "E301": QT_TRANSLATE_NOOP("pep8", "expected 1 blank line, found 0"), - "E302" : QT_TRANSLATE_NOOP("pep8", + "E302": QT_TRANSLATE_NOOP("pep8", "expected 2 blank lines, found {0}"), - "E303" : QT_TRANSLATE_NOOP("pep8", + "E303": QT_TRANSLATE_NOOP("pep8", "too many blank lines ({0})"), - "E304" : QT_TRANSLATE_NOOP("pep8", + "E304": QT_TRANSLATE_NOOP("pep8", "blank lines found after function decorator"), - "W391" : QT_TRANSLATE_NOOP("pep8", + "W391": QT_TRANSLATE_NOOP("pep8", "blank line at end of file"), - "E401" : QT_TRANSLATE_NOOP("pep8", + "E401": QT_TRANSLATE_NOOP("pep8", "multiple imports on one line"), - "E501" : QT_TRANSLATE_NOOP("pep8", + "E501": QT_TRANSLATE_NOOP("pep8", "line too long ({0} characters)"), - "W601" : QT_TRANSLATE_NOOP("pep8", + "W601": QT_TRANSLATE_NOOP("pep8", ".has_key() is deprecated, use 'in'"), - "W602" : QT_TRANSLATE_NOOP("pep8", + "W602": QT_TRANSLATE_NOOP("pep8", "deprecated form of raising exception"), - "W603" : QT_TRANSLATE_NOOP("pep8", + "W603": QT_TRANSLATE_NOOP("pep8", "'<>' is deprecated, use '!='"), - "W604" : QT_TRANSLATE_NOOP("pep8", + "W604": QT_TRANSLATE_NOOP("pep8", "backticks are deprecated, use 'repr()'"), - "E701" : QT_TRANSLATE_NOOP("pep8", + "E701": QT_TRANSLATE_NOOP("pep8", "multiple statements on one line (colon)"), - "E702" : QT_TRANSLATE_NOOP("pep8", + "E702": QT_TRANSLATE_NOOP("pep8", "multiple statements on one line (semicolon)"), } pep8_messages_sample_args = { - "E201" : ["([{"], - "E202" : ["}])"], - "E203" : [",;:"], - "E211" : ["(["], - "E231" : [",;:"], - "E241" : [",;:"], - "E242" : [",;:"], - "E302" : [1], - "E303" : [3], - "E501" : [85], + "E201": ["([{"], + "E202": ["}])"], + "E203": [",;:"], + "E211": ["(["], + "E231": [",;:"], + "E241": [",;:"], + "E242": [",;:"], + "E302": [1], + "E303": [3], + "E501": [85], } @@ -987,7 +987,7 @@ result = self.run_check(check, argument_names) if result is not None: offset, code, *args = result - self.report_error_args(self.line_number, offset, code, check, + self.report_error_args(self.line_number, offset, code, check, *args) def build_tokens_line(self):
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,17 +23,18 @@ import Preferences import UI.PixmapCache + class SyntaxCheckerDialog(QDialog, Ui_SyntaxCheckerDialog): """ Class implementing a dialog to display the results of a syntax check run. """ filenameRole = Qt.UserRole + 1 - lineRole = Qt.UserRole + 2 - indexRole = Qt.UserRole + 3 - errorRole = Qt.UserRole + 4 - warningRole = Qt.UserRole + 5 + lineRole = Qt.UserRole + 2 + indexRole = Qt.UserRole + 3 + errorRole = Qt.UserRole + 4 + warningRole = Qt.UserRole + 5 - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -65,12 +66,12 @@ """ Private method to resort the tree. """ - self.resultList.sortItems(self.resultList.sortColumn(), + self.resultList.sortItems(self.resultList.sortColumn(), self.resultList.header().sortIndicatorOrder() ) - def __createResultItem(self, file, line, index, error, sourcecode, - isWarning = False): + def __createResultItem(self, file, line, index, error, sourcecode, + isWarning=False): """ Private method to create an entry in the result list. @@ -88,7 +89,7 @@ self.__lastFileItem.setExpanded(True) self.__lastFileItem.setData(0, self.filenameRole, file) - itm = QTreeWidgetItem(self.__lastFileItem, + itm = QTreeWidgetItem(self.__lastFileItem, ["{0:6}".format(line), error, sourcecode]) if isWarning: itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) @@ -118,10 +119,10 @@ self.__data = self.__project.getData("CHECKERSPARMS", "SyntaxChecker") if self.__data is None or "ExcludeFiles" not in self.__data: - self.__data = {"ExcludeFiles" : ""} + self.__data = {"ExcludeFiles": ""} self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) - def start(self, fn, codestring = ""): + def start(self, fn, codestring=""): """ Public slot to start the syntax check. @@ -188,7 +189,7 @@ source = Utilities.convertLineEnds(source, "\n") except (UnicodeError, IOError) as msg: self.noResults = False - self.__createResultItem(file, "1", 0, + self.__createResultItem(file, "1", 0, self.trUtf8("Error: {0}").format(str(msg))\ .rstrip()[1:-1], "") progress += 1 @@ -196,20 +197,19 @@ flags = Utilities.extractFlags(source) ext = os.path.splitext(file)[1] - if ("FileType" in flags and + if ("FileType" in flags and flags["FileType"] in ["Python", "Python2"]) or \ file in py2files or \ (ext in [".py", ".pyw"] and \ Preferences.getProject("DeterminePyFromProject") and \ self.__project.isOpen() and \ self.__project.isProjectFile(file) and \ - self.__project.getProjectLanguage() in ["Python", + self.__project.getProjectLanguage() in ["Python", "Python2"]): isPy3 = False nok, fname, line, index, code, error, warnings = \ - Utilities.py2compile(file, - checkFlakes = \ - Preferences.getFlakes("IncludeInSyntaxCheck")) + Utilities.py2compile(file, + checkFlakes=Preferences.getFlakes("IncludeInSyntaxCheck")) else: isPy3 = True nok, fname, line, index, code, error = \ @@ -223,7 +223,7 @@ try: sourceLines = source.splitlines() warnings = Checker(source, file) - warnings.messages.sort(key = lambda a: a.lineno) + warnings.messages.sort(key=lambda a: a.lineno) for warning in warnings.messages: if ignoreStarImportWarnings and \ isinstance(warning, ImportStarUsed): @@ -234,8 +234,8 @@ .endswith("__IGNORE_WARNING__"): self.noResults = False self.__createResultItem( - fname, lineno, 0, message, "", - isWarning = True) + fname, lineno, 0, message, "", + isWarning=True) except SyntaxError as err: if err.text.strip(): msg = err.text.strip() @@ -247,8 +247,8 @@ for warning in warnings: self.noResults = False self.__createResultItem( - warning[0], int(warning[1]), 0, - warning[2], "", isWarning = True) + warning[0], int(warning[1]), 0, + warning[2], "", isWarning=True) progress += 1 self.checkProgress.setValue(progress) QApplication.processEvents() @@ -302,9 +302,9 @@ if "ExcludeFiles" not in self.__data or \ filterString != self.__data["ExcludeFiles"]: self.__data["ExcludeFiles"] = filterString - self.__project.setData("CHECKERSPARMS", "SyntaxChecker", + self.__project.setData("CHECKERSPARMS", "SyntaxChecker", self.__data) - filterList = [f.strip() for f in filterString.split(",") + filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: for filter in filterList: @@ -318,7 +318,7 @@ def on_resultList_itemActivated(self, itm, col): """ - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. @param itm reference to the activated item (QTreeWidgetItem) @param col column the item was activated in (integer) @@ -353,7 +353,7 @@ fn = Utilities.normabspath(itm.data(0, self.filenameRole)) vm.openSourceFile(fn, 1) - # go through the list again to clear syntax error and + # go through the list again to clear syntax error and # py3flakes warning markers for files, that are ok openFiles = vm.getOpenFilenames() errorFiles = []
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Fri Mar 11 16:51:57 2011 +0100 @@ -50,6 +50,7 @@ __all__ = ["check", "NannyNag", "process_tokens"] + class NannyNag(Exception): """ Raised by tokeneater() if detecting an ambiguous indent. @@ -89,7 +90,8 @@ """ return self.line -def check(file, text = ""): + +def check(file, text=""): """ Private function to check one Python source file for whitespace related problems. @@ -133,6 +135,7 @@ return (False, None, None, None) + class Whitespace(object): """ Class implementing the whitespace checker. @@ -165,7 +168,7 @@ @param ws The string to be checked. """ - self.raw = ws + self.raw = ws S, T = Whitespace.S, Whitespace.T count = [] b = n = nt = 0 @@ -182,8 +185,8 @@ b = 0 else: break - self.n = n - self.nt = nt + self.n = n + self.nt = nt self.norm = tuple(count), b self.is_simple = len(count) <= 1 @@ -197,7 +200,7 @@ preceding a tab) """ count, trailing = self.norm - return max(len(count)-1, trailing) + return max(len(count) - 1, trailing) def indent_level(self, tabsize): """ @@ -223,7 +226,7 @@ count, trailing = self.norm il = 0 for i in range(tabsize, len(count)): - il = il + i/tabsize * count[i] + il = il + i / tabsize * count[i] return trailing + tabsize * (il + self.nt) # return true iff self.indent_level(t) == other.indent_level(t) @@ -255,11 +258,11 @@ n = max(self.longest_run_of_spaces(), other.longest_run_of_spaces()) + 1 a = [] - for ts in range(1, n+1): + for ts in range(1, n + 1): if self.indent_level(ts) != other.indent_level(ts): - a.append( (ts, + a.append((ts, self.indent_level(ts), - other.indent_level(ts)) ) + other.indent_level(ts))) return a # Return True iff self.indent_level(t) < other.indent_level(t) @@ -277,7 +280,7 @@ # Note that M is of the form (T*)(S*) iff len(M.norm[0]) <= 1. def less(self, other): """ - Method to compare the indentation level against another Whitespace objects to + Method to compare the indentation level against another Whitespace objects to be smaller. @param other Whitespace object to compare against. @@ -290,7 +293,7 @@ n = max(self.longest_run_of_spaces(), other.longest_run_of_spaces()) + 1 # the self.n >= other.n test already did it for ts=1 - for ts in range(2, n+1): + for ts in range(2, n + 1): if self.indent_level(ts) >= other.indent_level(ts): return False return True @@ -313,13 +316,14 @@ n = max(self.longest_run_of_spaces(), other.longest_run_of_spaces()) + 1 a = [] - for ts in range(1, n+1): + for ts in range(1, n + 1): if self.indent_level(ts) >= other.indent_level(ts): - a.append( (ts, + a.append((ts, self.indent_level(ts), - other.indent_level(ts)) ) + other.indent_level(ts))) return a + def format_witnesses(w): """ Function to format the witnesses as a readable string. @@ -333,6 +337,7 @@ prefix = prefix + "s" return prefix + " " + ', '.join(firsts) + def process_tokens(tokens): """ Function processing all tokens generated by a tokenizer run.
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,11 +24,12 @@ from eric5config import getConfig + class TabnannyDialog(QDialog, Ui_TabnannyDialog): """ Class implementing a dialog to show the results of the tabnanny check run. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -55,7 +56,7 @@ """ Private method to resort the tree. """ - self.resultList.sortItems(self.resultList.sortColumn(), + self.resultList.sortItems(self.resultList.sortColumn(), self.resultList.header().sortIndicatorOrder()) def __createResultItem(self, file, line, sourcecode): @@ -87,7 +88,7 @@ self.__data = self.__project.getData("CHECKERSPARMS", "Tabnanny") if self.__data is None or "ExcludeFiles" not in self.__data: - self.__data = {"ExcludeFiles" : ""} + self.__data = {"ExcludeFiles": ""} self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) def start(self, fn): @@ -141,14 +142,14 @@ source = Utilities.convertLineEnds(source, "\n") except (UnicodeError, IOError) as msg: self.noResults = False - self.__createResultItem(file, "1", + self.__createResultItem(file, "1", "Error: {0}".format(str(msg)).rstrip()[1:-1]) progress += 1 continue flags = Utilities.extractFlags(source) ext = os.path.splitext(file)[1] - if ("FileType" in flags and + if ("FileType" in flags and flags["FileType"] in ["Python", "Python2"]) or \ file in py2files or \ (ext in [".py", ".pyw"] and \ @@ -210,7 +211,7 @@ filterString != self.__data["ExcludeFiles"]: self.__data["ExcludeFiles"] = filterString self.__project.setData("CHECKERSPARMS", "Tabnanny", self.__data) - filterList = [f.strip() for f in filterString.split(",") + filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: for filter in filterList: @@ -224,7 +225,7 @@ def on_resultList_itemActivated(self, itm, col): """ - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. @param itm reference to the activated item (QTreeWidgetItem) @param col column the item was activated in (integer) @@ -253,10 +254,10 @@ """ interpreter = Preferences.getDebugger("PythonInterpreter") if interpreter == "" or not Utilities.isExecutable(interpreter): - return (True, filename, "1", + return (True, filename, "1", self.trUtf8("Python2 interpreter not configured.")) - checker = os.path.join(getConfig('ericDir'), + checker = os.path.join(getConfig('ericDir'), "UtilitiesPython2", "TabnannyChecker.py") proc = QProcess() @@ -265,8 +266,8 @@ finished = proc.waitForFinished(15000) if finished: output = \ - str(proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace').splitlines() nok = output[0] == "ERROR" @@ -278,5 +279,5 @@ else: return (False, None, None, None) - return (True, filename, "1", + return (True, filename, "1", self.trUtf8("Python2 interpreter did not finish within 15s."))
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,11 +23,12 @@ from eric5config import getConfig + class EricapiConfigDialog(QDialog, Ui_EricapiConfigDialog): """ Class implementing a dialog to enter the parameters for eric5_api. """ - def __init__(self, project, parms = None, parent = None): + def __init__(self, project, parms=None, parent=None): """ Constructor @@ -35,7 +36,7 @@ @param parms parameters to set in the dialog @param parent parent widget of this dialog """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) @@ -78,19 +79,19 @@ def __initializeDefaults(self): """ - Private method to set the default values. + Private method to set the default values. These are needed later on to generate the commandline parameters. """ self.defaults = { - 'useRecursion' : False, - 'includePrivate' : False, - 'outputFile' : '', - 'basePackage' : '', - 'ignoreDirectories' : [], - 'ignoreFilePatterns' : [], - 'sourceExtensions' : [], + 'useRecursion': False, + 'includePrivate': False, + 'outputFile': '', + 'basePackage': '', + 'ignoreDirectories': [], + 'ignoreFilePatterns': [], + 'sourceExtensions': [], } lang = self.project.getProjectLanguage() @@ -173,7 +174,7 @@ self.trUtf8("API files (*.api);;All files (*)")) if filename: - # make it relative, if it is in a subdirectory of the project path + # make it relative, if it is in a subdirectory of the project path fn = Utilities.toNativeSeparators(filename) fn = self.project.getRelativePath(fn) self.outputFileEdit.setText(fn) @@ -204,7 +205,7 @@ E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if directory: - # make it relative, if it is a subdirectory of the project path + # make it relative, if it is a subdirectory of the project path dn = Utilities.toNativeSeparators(directory) dn = self.project.getRelativePath(dn) while dn.endswith(os.sep): @@ -232,7 +233,7 @@ def accept(self): """ - Protected slot called by the Ok button. + Protected slot called by the Ok button. It saves the values in the parameters dictionary. """
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences + class EricapiExecDialog(QDialog, Ui_EricapiExecDialog): """ Class implementing a dialog to show the output of the ericapi process. @@ -25,7 +26,7 @@ This class starts a QProcess and displays a dialog that shows the output of the documentation command process. """ - def __init__(self, cmdname, parent = None): + def __init__(self, cmdname, parent=None): """ Constructor @@ -125,7 +126,7 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process, formats it and inserts it into the contents pane. @@ -133,15 +134,15 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.contents.insertPlainText(s) self.contents.ensureCursorVisible() def __readStderr(self): """ - Private slot to handle the readyReadStandardError signal. + Private slot to handle the readyReadStandardError signal. It reads the error output of the process and inserts it into the error pane. @@ -150,8 +151,8 @@ while self.process.canReadLine(): self.errorGroup.show() - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) - self.errors.ensureCursorVisible() \ No newline at end of file + self.errors.ensureCursorVisible()
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,11 +23,12 @@ from eric5config import getConfig + class EricdocConfigDialog(QDialog, Ui_EricdocConfigDialog): """ Class implementing a dialog to enter the parameters for eric5_doc. """ - def __init__(self, project, parms = None, parent = None): + def __init__(self, project, parms=None, parent=None): """ Constructor @@ -35,7 +36,7 @@ @param parms parameters to set in the dialog @param parent parent widget of this dialog """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok) @@ -113,29 +114,29 @@ def __initializeDefaults(self): """ - Private method to set the default values. + Private method to set the default values. These are needed later on to generate the commandline parameters. """ self.defaults = { - 'useRecursion' : 0, - 'noindex' : 0, - 'noempty' : 0, - 'outputDirectory' : '', - 'ignoreDirectories' : [], - 'ignoreFilePatterns' : [], - 'cssFile' : '', - 'sourceExtensions' : [], + 'useRecursion': 0, + 'noindex': 0, + 'noempty': 0, + 'outputDirectory': '', + 'ignoreDirectories': [], + 'ignoreFilePatterns': [], + 'cssFile': '', + 'sourceExtensions': [], - 'qtHelpEnabled' : False, - 'qtHelpOutputDirectory' : '', - 'qtHelpNamespace' : '', - 'qtHelpVirtualFolder' : 'source', - 'qtHelpFilterName' : 'unknown', - 'qtHelpFilterAttributes' : '', - 'qtHelpTitle' : '', - 'qtHelpCreateCollection' : False, + 'qtHelpEnabled': False, + 'qtHelpOutputDirectory': '', + 'qtHelpNamespace': '', + 'qtHelpVirtualFolder': 'source', + 'qtHelpFilterName': 'unknown', + 'qtHelpFilterAttributes': '', + 'qtHelpTitle': '', + 'qtHelpCreateCollection': False, } def generateParameters(self): @@ -265,7 +266,7 @@ E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if directory: - # make it relative, if it is a subdirectory of the project path + # make it relative, if it is a subdirectory of the project path dn = Utilities.toNativeSeparators(directory) dn = self.project.getRelativePath(dn) while dn.endswith(os.sep): @@ -290,7 +291,7 @@ E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if directory: - # make it relative, if it is a subdirectory of the project path + # make it relative, if it is a subdirectory of the project path dn = Utilities.toNativeSeparators(directory) dn = self.project.getRelativePath(dn) while dn.endswith(os.sep): @@ -328,7 +329,7 @@ self.trUtf8("Style sheet (*.css);;All files (*)")) if cssFile: - # make it relative, if it is in a subdirectory of the project path + # make it relative, if it is in a subdirectory of the project path cf = Utilities.toNativeSeparators(cssFile) cf = self.project.getRelativePath(cf) self.cssEdit.setText(cf) @@ -476,7 +477,7 @@ E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if directory: - # make it relative, if it is a subdirectory of the project path + # make it relative, if it is a subdirectory of the project path dn = Utilities.toNativeSeparators(directory) dn = self.project.getRelativePath(dn) while dn.endswith(os.sep): @@ -485,7 +486,7 @@ def accept(self): """ - Protected slot called by the Ok button. + Protected slot called by the Ok button. It saves the values in the parameters dictionary. """
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences + class EricdocExecDialog(QDialog, Ui_EricdocExecDialog): """ Class implementing a dialog to show the output of the ericdoc process. @@ -25,7 +26,7 @@ This class starts a QProcess and displays a dialog that shows the output of the documentation command process. """ - def __init__(self, cmdname, parent = None): + def __init__(self, cmdname, parent=None): """ Constructor @@ -125,7 +126,7 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process, formats it and inserts it into the contents pane. @@ -133,15 +134,15 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.contents.insertPlainText(s) self.contents.ensureCursorVisible() def __readStderr(self): """ - Private slot to handle the readyReadStandardError signal. + Private slot to handle the readyReadStandardError signal. It reads the error output of the process and inserts it into the error pane. @@ -150,8 +151,8 @@ while self.process.canReadLine(): self.errorGroup.show() - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) - self.errors.ensureCursorVisible() \ No newline at end of file + self.errors.ensureCursorVisible()
--- a/Plugins/PluginAbout.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginAbout.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class AboutPlugin(QObject): """ Class implementing the About plugin. @@ -124,4 +125,4 @@ """ Private slot to handle the About Qt dialog. """ - E5MessageBox.aboutQt(self.__ui, Program) \ No newline at end of file + E5MessageBox.aboutQt(self.__ui, Program)
--- a/Plugins/PluginEricapi.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginEricapi.py Fri Mar 11 16:51:57 2011 +0100 @@ -39,6 +39,7 @@ error = "" + def exeDisplayData(): """ Public method to support the display of some executable info. @@ -48,22 +49,23 @@ """ exe = 'eric5_api' if Utilities.isWindowsPlatform(): - exe = os.path.join(getConfig("bindir"), exe +'.bat') + exe = os.path.join(getConfig("bindir"), exe + '.bat') data = { - "programEntry" : True, - "header" : QApplication.translate("EricapiPlugin", - "Eric5 API File Generator"), - "exe" : exe, - "versionCommand" : '--version', - "versionStartsWith" : 'eric5_', - "versionPosition" : -3, - "version" : "", - "versionCleanup" : None, + "programEntry": True, + "header": QApplication.translate("EricapiPlugin", + "Eric5 API File Generator"), + "exe": exe, + "versionCommand": '--version', + "versionStartsWith": 'eric5_', + "versionPosition": -3, + "version": "", + "versionCleanup": None, } return data + class EricapiPlugin(QObject): """ Class implementing the Ericapi plugin. @@ -123,7 +125,7 @@ def __projectShowMenu(self, menuName, menu): """ - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -140,9 +142,9 @@ Private slot to perform the eric5_api api generation. """ eolTranslation = { - '\r' : 'cr', - '\n' : 'lf', - '\r\n' : 'crlf', + '\r': 'cr', + '\n': 'lf', + '\r\n': 'crlf', } project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4API")
--- a/Plugins/PluginEricdoc.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginEricdoc.py Fri Mar 11 16:51:57 2011 +0100 @@ -40,6 +40,7 @@ error = "" + def exeDisplayDataList(): """ Public method to support the display of some executable info. @@ -52,17 +53,17 @@ # 1. eric5_doc exe = 'eric5_doc' if Utilities.isWindowsPlatform(): - exe = os.path.join(getConfig("bindir"), exe +'.bat') + exe = os.path.join(getConfig("bindir"), exe + '.bat') dataList.append({ - "programEntry" : True, - "header" : QApplication.translate("EricdocPlugin", - "Eric5 Documentation Generator"), - "exe" : exe, - "versionCommand" : '--version', - "versionStartsWith" : 'eric5_', - "versionPosition" : -3, - "version" : "", - "versionCleanup" : None, + "programEntry": True, + "header": QApplication.translate("EricdocPlugin", + "Eric5 Documentation Generator"), + "exe": exe, + "versionCommand": '--version', + "versionStartsWith": 'eric5_', + "versionPosition": -3, + "version": "", + "versionCleanup": None, }) # 2. Qt Help Generator @@ -70,15 +71,15 @@ if Utilities.isWindowsPlatform(): exe += '.exe' dataList.append({ - "programEntry" : True, - "header" : QApplication.translate("EricdocPlugin", - "Qt4 Help Tools"), - "exe" : exe, - "versionCommand" : '-v', - "versionStartsWith" : 'Qt', - "versionPosition" : -1, - "version" : "", - "versionCleanup" : (0, -1), + "programEntry": True, + "header": QApplication.translate("EricdocPlugin", + "Qt4 Help Tools"), + "exe": exe, + "versionCommand": '-v', + "versionStartsWith": 'Qt', + "versionPosition": -1, + "version": "", + "versionCleanup": (0, -1), }) # 3. Qt Collection Generator @@ -86,19 +87,20 @@ if Utilities.isWindowsPlatform(): exe += '.exe' dataList.append({ - "programEntry" : True, - "header" : QApplication.translate("EricdocPlugin", - "Qt4 Help Tools"), - "exe" : exe, - "versionCommand" : '-v', - "versionStartsWith" : 'Qt', - "versionPosition" : -1, - "version" : "", - "versionCleanup" : (0, -1), + "programEntry": True, + "header": QApplication.translate("EricdocPlugin", + "Qt4 Help Tools"), + "exe": exe, + "versionCommand": '-v', + "versionStartsWith": 'Qt', + "versionPosition": -1, + "version": "", + "versionCleanup": (0, -1), }) return dataList + class EricdocPlugin(QObject): """ Class implementing the Ericdoc plugin. @@ -159,7 +161,7 @@ def __projectShowMenu(self, menuName, menu): """ - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -176,9 +178,9 @@ Private slot to perform the eric5_doc api documentation generation. """ eolTranslation = { - '\r' : 'cr', - '\n' : 'lf', - '\r\n' : 'crlf', + '\r': 'cr', + '\n': 'lf', + '\r\n': 'crlf', } project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4DOC")
--- a/Plugins/PluginPep8Checker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginPep8Checker.py Fri Mar 11 16:51:57 2011 +0100 @@ -36,6 +36,7 @@ error = "" + class Pep8CheckerPlugin(QObject): """ Class implementing the PEP 8 Checker plugin. @@ -142,7 +143,7 @@ def __projectShowMenu(self, menuName, menu): """ - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -155,7 +156,7 @@ def __projectBrowserShowMenu(self, menuName, menu): """ - Private slot called, when the the project browser menu or a submenu is + Private slot called, when the the project browser menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -216,10 +217,10 @@ self.__projectBrowserPep8CheckerDialog.show() if isDir: self.__projectBrowserPep8CheckerDialog.start( - fn, save = True) + fn, save=True) else: self.__projectBrowserPep8CheckerDialog.start( - fn, save = True, repeat = True) + fn, save=True, repeat=True) def __editorOpened(self, editor): """ @@ -246,7 +247,7 @@ def __editorShowMenu(self, menuName, menu, editor): """ - Private slot called, when the the editor context menu or a submenu is + Private slot called, when the the editor context menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -269,6 +270,6 @@ self.__editorPep8CheckerDialog = Pep8Dialog() self.__editorPep8CheckerDialog.show() self.__editorPep8CheckerDialog.start( - editor.getFileName(), - save = True, - repeat = True) + editor.getFileName(), + save=True, + repeat=True)
--- a/Plugins/PluginSyntaxChecker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginSyntaxChecker.py Fri Mar 11 16:51:57 2011 +0100 @@ -35,6 +35,7 @@ error = "" + class SyntaxCheckerPlugin(QObject): """ Class implementing the Syntax Checker plugin. @@ -133,7 +134,7 @@ def __projectShowMenu(self, menuName, menu): """ - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -146,7 +147,7 @@ def __projectBrowserShowMenu(self, menuName, menu): """ - Private slot called, when the the project browser menu or a submenu is + Private slot called, when the the project browser menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -226,7 +227,7 @@ def __editorShowMenu(self, menuName, menu, editor): """ - Private slot called, when the the editor context menu or a submenu is + Private slot called, when the the editor context menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -246,5 +247,5 @@ if editor is not None: self.__editorSyntaxCheckerDialog = SyntaxCheckerDialog() self.__editorSyntaxCheckerDialog.show() - self.__editorSyntaxCheckerDialog.start(editor.getFileName(), + self.__editorSyntaxCheckerDialog.start(editor.getFileName(), editor.text())
--- a/Plugins/PluginTabnanny.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginTabnanny.py Fri Mar 11 16:51:57 2011 +0100 @@ -35,6 +35,7 @@ error = "" + class TabnannyPlugin(QObject): """ Class implementing the Tabnanny plugin. @@ -74,7 +75,7 @@ if menu: self.__projectAct = E5Action(self.trUtf8('Check Indentations'), self.trUtf8('&Indentations...'), 0, 0, - self,'project_check_indentations') + self, 'project_check_indentations') self.__projectAct.setStatusTip( self.trUtf8('Check indentations using tabnanny.')) self.__projectAct.setWhatsThis(self.trUtf8( @@ -135,7 +136,7 @@ def __projectShowMenu(self, menuName, menu): """ - Private slot called, when the the project menu or a submenu is + Private slot called, when the the project menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -148,7 +149,7 @@ def __projectBrowserShowMenu(self, menuName, menu): """ - Private slot called, when the the project browser context menu or a submenu is + Private slot called, when the the project browser context menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string) @@ -229,7 +230,7 @@ def __editorShowMenu(self, menuName, menu, editor): """ - Private slot called, when the the editor context menu or a submenu is + Private slot called, when the the editor context menu or a submenu is about to be shown. @param menuName name of the menu to be shown (string)
--- a/Plugins/PluginVcsMercurial.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginVcsMercurial.py Fri Mar 11 16:51:57 2011 +0100 @@ -38,6 +38,7 @@ error = "" + def exeDisplayData(): """ Public method to support the display of some executable info. @@ -50,19 +51,20 @@ exe += '.exe' data = { - "programEntry" : True, - "header" : QApplication.translate("VcsMercurialPlugin", - "Version Control - Mercurial"), - "exe" : exe, - "versionCommand" : 'version', - "versionStartsWith" : 'Mercurial', - "versionPosition" : -1, - "version" : "", - "versionCleanup" : (0, -1), + "programEntry": True, + "header": QApplication.translate("VcsMercurialPlugin", + "Version Control - Mercurial"), + "exe": exe, + "versionCommand": 'version', + "versionStartsWith": 'Mercurial', + "versionPosition": -1, + "version": "", + "versionCleanup": (0, -1), } return data + def getVcsSystemIndicator(): """ Public function to get the indicators for this version control system. @@ -80,6 +82,7 @@ data["_hg"] = (pluginTypename, displayString()) return data + def displayString(): """ Public function to get the display string. @@ -96,6 +99,7 @@ mercurialCfgPluginObject = None + def createConfigurationPage(configDlg): """ Module function to create the configuration page. @@ -109,6 +113,7 @@ page = MercurialPage(mercurialCfgPluginObject) return page + def getConfigData(): """ Module function returning data as required by the configuration dialog. @@ -116,13 +121,14 @@ @return dictionary with key "zzz_mercurialPage" containing the relevant data """ return { - "zzz_mercurialPage" : \ - [QApplication.translate("VcsMercurialPlugin", "Mercurial"), - os.path.join("VcsPlugins", "vcsMercurial", "icons", + "zzz_mercurialPage": \ + [QApplication.translate("VcsMercurialPlugin", "Mercurial"), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "preferences-mercurial.png"), createConfigurationPage, "vcsPage", None], } + def prepareUninstall(): """ Module function to prepare for an uninstallation. @@ -130,6 +136,7 @@ if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsMercurial"): Preferences.Prefs.settings.remove("Mercurial") + class VcsMercurialPlugin(QObject): """ Class implementing the Mercurial version control plugin. @@ -144,23 +151,23 @@ self.__ui = ui self.__mercurialDefaults = { - "StopLogOnCopy" : True, # used in log browser - "UseLogBrowser" : True, - "LogLimit" : 100, - "CommitMessages" : 20, - "PullUpdate" : False, - "ServerPort" : 8000, - "ServerStyle" : "", + "StopLogOnCopy": True, # used in log browser + "UseLogBrowser": True, + "LogLimit": 100, + "CommitMessages": 20, + "PullUpdate": False, + "ServerPort": 8000, + "ServerStyle": "", } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper self.__projectHelperObject = HgProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, + e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration - readShortcuts(pluginName = pluginTypename) + readShortcuts(pluginName=pluginTypename) def getProjectHelper(self): """ @@ -174,7 +181,7 @@ """ Public method to activate this plugin. - @return tuple of reference to instantiated viewmanager and + @return tuple of reference to instantiated viewmanager and activation status (boolean) """ from VcsPlugins.vcsMercurial.hg import Hg @@ -203,7 +210,7 @@ elif key in ["Commits"]: return Preferences.toList(Preferences.Prefs.settings.value( "Mercurial/" + key)) - else: + else: return Preferences.Prefs.settings.value("Mercurial/" + key) def setPreferences(self, key, value):
--- a/Plugins/PluginVcsPySvn.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginVcsPySvn.py Fri Mar 11 16:51:57 2011 +0100 @@ -36,6 +36,7 @@ error = "" + def exeDisplayData(): """ Public method to support the display of some executable info. @@ -48,21 +49,22 @@ text = os.path.dirname(pysvn.__file__) except AttributeError: text = "PySvn" - version = ".".join([str(v) for v in pysvn.version]) + version = ".".join([str(v) for v in pysvn.version]) except ImportError: text = "PySvn" version = "" data = { - "programEntry" : False, - "header" : QApplication.translate("VcsPySvnPlugin", - "Version Control - Subversion (pysvn)"), - "text" : text, - "version" : version, + "programEntry": False, + "header": QApplication.translate("VcsPySvnPlugin", + "Version Control - Subversion (pysvn)"), + "text": text, + "version": version, } return data + def getVcsSystemIndicator(): """ Public function to get the indicators for this version control system. @@ -80,6 +82,7 @@ pass return data + def displayString(): """ Public function to get the display string. @@ -94,6 +97,7 @@ subversionCfgPluginObject = None + def createConfigurationPage(configDlg): """ Module function to create the configuration page. @@ -107,6 +111,7 @@ page = SubversionPage(subversionCfgPluginObject) return page + def getConfigData(): """ Module function returning data as required by the configuration dialog. @@ -114,13 +119,14 @@ @return dictionary with key "zzz_subversionPage" containing the relevant data """ return { - "zzz_subversionPage" : \ - [QApplication.translate("VcsPySvnPlugin", "Subversion"), - os.path.join("VcsPlugins", "vcsPySvn", "icons", + "zzz_subversionPage": \ + [QApplication.translate("VcsPySvnPlugin", "Subversion"), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "preferences-subversion.png"), createConfigurationPage, "vcsPage", None], } + def prepareUninstall(): """ Module function to prepare for an uninstallation. @@ -128,6 +134,7 @@ if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): Preferences.Prefs.settings.remove("Subversion") + class VcsPySvnPlugin(QObject): """ Class implementing the PySvn version control plugin. @@ -142,19 +149,19 @@ self.__ui = ui self.__subversionDefaults = { - "StopLogOnCopy" : 1, - "LogLimit" : 100, - "CommitMessages" : 20, + "StopLogOnCopy": 1, + "LogLimit": 100, + "CommitMessages": 20, } from VcsPlugins.vcsPySvn.ProjectHelper import SvnProjectHelper self.__projectHelperObject = SvnProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, + e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration - readShortcuts(pluginName = pluginTypename) + readShortcuts(pluginName=pluginTypename) def getProjectHelper(self): """ @@ -168,7 +175,7 @@ """ Public method to activate this plugin. - @return tuple of reference to instantiated viewmanager and + @return tuple of reference to instantiated viewmanager and activation status (boolean) """ from VcsPlugins.vcsPySvn.subversion import Subversion @@ -198,7 +205,7 @@ elif key in ["Commits"]: return Preferences.toList(Preferences.Prefs.settings.value( "Subversion/" + key)) - else: + else: return Preferences.Prefs.settings.value("Subversion/" + key) def setPreferences(self, key, value):
--- a/Plugins/PluginVcsSubversion.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginVcsSubversion.py Fri Mar 11 16:51:57 2011 +0100 @@ -38,6 +38,7 @@ error = "" + def exeDisplayData(): """ Public method to support the display of some executable info. @@ -50,19 +51,20 @@ exe += '.exe' data = { - "programEntry" : True, - "header" : QApplication.translate("VcsSubversionPlugin", - "Version Control - Subversion (svn)"), - "exe" : exe, - "versionCommand" : '--version', - "versionStartsWith" : 'svn', - "versionPosition" : 2, - "version" : "", - "versionCleanup" : None, + "programEntry": True, + "header": QApplication.translate("VcsSubversionPlugin", + "Version Control - Subversion (svn)"), + "exe": exe, + "versionCommand": '--version', + "versionStartsWith": 'svn', + "versionPosition": 2, + "version": "", + "versionCleanup": None, } return data + def getVcsSystemIndicator(): """ Public function to get the indicators for this version control system. @@ -80,6 +82,7 @@ data["_svn"] = (pluginTypename, displayString()) return data + def displayString(): """ Public function to get the display string. @@ -96,6 +99,7 @@ subversionCfgPluginObject = None + def createConfigurationPage(configDlg): """ Module function to create the configuration page. @@ -109,6 +113,7 @@ page = SubversionPage(subversionCfgPluginObject) return page + def getConfigData(): """ Module function returning data as required by the configuration dialog. @@ -116,13 +121,14 @@ @return dictionary with key "zzz_subversionPage" containing the relevant data """ return { - "zzz_subversionPage" : \ - [QApplication.translate("VcsSubversionPlugin", "Subversion"), - os.path.join("VcsPlugins", "vcsSubversion", "icons", + "zzz_subversionPage": \ + [QApplication.translate("VcsSubversionPlugin", "Subversion"), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "preferences-subversion.png"), createConfigurationPage, "vcsPage", None], } + def prepareUninstall(): """ Module function to prepare for an uninstallation. @@ -130,6 +136,7 @@ if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): Preferences.Prefs.settings.remove("Subversion") + class VcsSubversionPlugin(QObject): """ Class implementing the Subversion version control plugin. @@ -144,19 +151,19 @@ self.__ui = ui self.__subversionDefaults = { - "StopLogOnCopy" : True, - "LogLimit" : 100, - "CommitMessages" : 20, + "StopLogOnCopy": True, + "LogLimit": 100, + "CommitMessages": 20, } from VcsPlugins.vcsSubversion.ProjectHelper import SvnProjectHelper self.__projectHelperObject = SvnProjectHelper(None, None) try: - e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, + e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration - readShortcuts(pluginName = pluginTypename) + readShortcuts(pluginName=pluginTypename) def getProjectHelper(self): """ @@ -170,7 +177,7 @@ """ Public method to activate this plugin. - @return tuple of reference to instantiated viewmanager and + @return tuple of reference to instantiated viewmanager and activation status (boolean) """ from VcsPlugins.vcsSubversion.subversion import Subversion @@ -199,7 +206,7 @@ elif key in ["Commits"]: return Preferences.toList(Preferences.Prefs.settings.value( "Subversion/" + key)) - else: + else: return Preferences.Prefs.settings.value("Subversion/" + key) def setPreferences(self, key, value):
--- a/Plugins/PluginVmListspace.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginVmListspace.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,16 +30,18 @@ error = "" + def previewPix(): """ Module function to return a preview pixmap. @return preview pixmap (QPixmap) """ - fname = os.path.join(os.path.dirname(__file__), + fname = os.path.join(os.path.dirname(__file__), "ViewManagerPlugins", "Listspace", "preview.png") return QPixmap(fname) + class VmListspacePlugin(QObject): """ Class implementing the Listspace view manager plugin. @@ -57,7 +59,7 @@ """ Public method to activate this plugin. - @return tuple of reference to instantiated viewmanager and + @return tuple of reference to instantiated viewmanager and activation status (boolean) """ from ViewManagerPlugins.Listspace.Listspace import Listspace
--- a/Plugins/PluginVmMdiArea.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginVmMdiArea.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,16 +30,18 @@ error = "" + def previewPix(): """ Module function to return a preview pixmap. @return preview pixmap (QPixmap) """ - fname = os.path.join(os.path.dirname(__file__), + fname = os.path.join(os.path.dirname(__file__), "ViewManagerPlugins", "MdiArea", "preview.png") return QPixmap(fname) + class VmMdiAreaPlugin(QObject): """ Class implementing the Workspace view manager plugin. @@ -57,7 +59,7 @@ """ Public method to activate this plugin. - @return tuple of reference to instantiated viewmanager and + @return tuple of reference to instantiated viewmanager and activation status (boolean) """ from ViewManagerPlugins.MdiArea.MdiArea import MdiArea
--- a/Plugins/PluginVmTabview.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginVmTabview.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,16 +30,18 @@ error = "" + def previewPix(): """ Module function to return a preview pixmap. @return preview pixmap (QPixmap) """ - fname = os.path.join(os.path.dirname(__file__), + fname = os.path.join(os.path.dirname(__file__), "ViewManagerPlugins", "Tabview", "preview.png") return QPixmap(fname) + class VmTabviewPlugin(QObject): """ Class implementing the Tabview view manager plugin. @@ -57,7 +59,7 @@ """ Public method to activate this plugin. - @return tuple of reference to instantiated viewmanager and + @return tuple of reference to instantiated viewmanager and activation status (boolean) """ from ViewManagerPlugins.Tabview.Tabview import Tabview
--- a/Plugins/PluginWizardE5MessageBox.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardE5MessageBox.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class E5MessageBoxWizard(QObject): """ Class implementing the E5MessageBox wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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/PluginWizardPyRegExp.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardPyRegExp.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class PyRegExpWizard(QObject): """ Class implementing the Python re wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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 Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardQColorDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class ColorDialogWizard(QObject): """ Class implementing the QColorDialog wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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 Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardQFileDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class FileDialogWizard(QObject): """ Class implementing the QFileDialog wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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 Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardQFontDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class FontDialogWizard(QObject): """ Class implementing the QFontDialog wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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 Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardQInputDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class InputDialogWizard(QObject): """ Class implementing the QInputDialog wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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 Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardQMessageBox.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class MessageBoxWizard(QObject): """ Class implementing the QMessageBox wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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 Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/PluginWizardQRegExp.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ error = "" + class QRegExpWizard(QObject): """ Class implementing the QRegExp wizard plugin. @@ -112,12 +113,12 @@ def __handle(self): """ - Private method to handle the wizards action + Private method to handle the wizards action """ 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/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,4 +5,4 @@ """ Package containing the various version control system plugins. -""" +"""
--- a/Plugins/VcsPlugins/vcsMercurial/Config.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/Config.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,8 +9,8 @@ # Available protocols fpr the repository URL ConfigHgProtocols = [ - 'file://', - 'http://', - 'https://', - 'ssh://', + 'file://', + 'http://', + 'https://', + 'ssh://', ]
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_MercurialPage import Ui_MercurialPage + class MercurialPage(ConfigurationPageBase, Ui_MercurialPage): """ Class implementing the Mercurial configuration page.
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import Preferences import Utilities + class HgAnnotateDialog(QDialog, Ui_HgAnnotateDialog): """ Class implementing a dialog to show the output of the hg annotate command. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -175,7 +176,7 @@ @param date date of the tag (string) @param name name (path) of the tag (string) """ - itm = QTreeWidgetItem(self.annotateList, + itm = QTreeWidgetItem(self.annotateList, [revision, changeset, author, date, "{0:d}".format(self.lineno), text]) self.lineno += 1 itm.setTextAlignment(0, Qt.AlignRight) @@ -209,8 +210,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_HgBackoutDialog import Ui_HgBackoutDialog + class HgBackoutDialog(QDialog, Ui_HgBackoutDialog): """ Class implementing a dialog to enter the data for a backout operation. """ - def __init__(self, tagsList, branchesList, parent = None): + def __init__(self, tagsList, branchesList, parent=None): """ Constructor @@ -49,7 +50,7 @@ """ Public method to retrieve the backout data. - @return tuple naming the revision, a flag indicating a + @return tuple naming the revision, a flag indicating a merge, the commit date, the commit user and a commit message (string, boolean, string, string, string) """ @@ -74,9 +75,9 @@ else: msg = self.trUtf8("Backed out changeset <{0}>.").format(rev) - return (rev, - self.mergeCheckBox.isChecked, - date, - self.userEdit.text(), + return (rev, + self.mergeCheckBox.isChecked, + date, + self.userEdit.text(), msg )
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_HgBundleDialog import Ui_HgBundleDialog + class HgBundleDialog(QDialog, Ui_HgBundleDialog): """ Class implementing a dialog to enter the data for a bundle operation. """ - def __init__(self, tagsList, branchesList, parent = None): + def __init__(self, tagsList, branchesList, parent=None): """ Constructor @@ -34,7 +35,7 @@ """ Public method to retrieve the bundle data. - @return tuple naming the revision, the compression type and a flag indicating + @return tuple naming the revision, the compression type and a flag indicating to bundle all changesets (string, string, boolean) """ if self.numberButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ import Utilities + class HgCommandDialog(QDialog, Ui_HgCommandDialog): """ Class implementing the Mercurial command dialog. @@ -21,7 +22,7 @@ arbitrary Mercurial command. It asks the user to enter the commandline parameters. """ - def __init__(self, argvList, ppath, parent = None): + def __init__(self, argvList, ppath, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class HgCommitDialog(QWidget, Ui_HgCommitDialog): """ Class implementing a dialog to enter the commit message. @@ -24,7 +25,7 @@ accepted = pyqtSignal() rejected = pyqtSignal() - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -60,7 +61,7 @@ no = int(Preferences.Prefs.settings\ .value('Mercurial/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Mercurial/Commits', + Preferences.Prefs.settings.setValue('Mercurial/Commits', self.recentCommitMessages) return msg
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .Ui_HgCopyDialog import Ui_HgCopyDialog + class HgCopyDialog(QDialog, Ui_HgCopyDialog): """ Class implementing a dialog to enter the data for a copy or rename operation. """ - def __init__(self, source, parent = None, move = False, force = False): + def __init__(self, source, parent=None, move=False, force=False): """ Constructor @@ -59,7 +60,7 @@ @pyqtSlot() def on_dirButton_clicked(self): """ - Private slot to handle the button press for selecting the target via a + Private slot to handle the button press for selecting the target via a selection dialog. """ if os.path.isdir(self.source):
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences + class HgDialog(QDialog, Ui_HgDialog): """ Class implementing a dialog starting a process and showing its output. @@ -26,7 +27,7 @@ shows the output of the process. The dialog is modal, which causes a synchronized execution of the process. """ - def __init__(self, text, parent = None): + def __init__(self, text, parent=None): """ Constructor @@ -91,7 +92,7 @@ self.normal = (exitStatus == QProcess.NormalExit) and (exitCode == 0) self.__finish() - def startProcess(self, args, workingDir = None, showArgs = True): + def startProcess(self, args, workingDir=None, showArgs=True): """ Public slot used to start the process. @@ -158,14 +159,14 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process, formats it and inserts it into the contents pane. """ if self.proc is not None: - s = str(self.proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + s = str(self.proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') self.resultbox.insertPlainText(s) self.resultbox.ensureCursorVisible() @@ -186,8 +187,8 @@ """ if self.proc is not None: self.errorGroup.show() - s = str(self.proc.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.proc.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import Utilities import Preferences + class HgDiffDialog(QWidget, Ui_HgDiffDialog): """ Class implementing a dialog to show the output of the hg diff command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -83,7 +84,7 @@ else: return str(version) - def start(self, fn, versions = None, bundle = None): + def start(self, fn, versions=None, bundle=None): """ Public slot to start the hg diff command. @@ -197,7 +198,7 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process, formats it and inserts it into the contents pane. @@ -205,8 +206,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if line.startswith('+'): format = self.cAddedFormat @@ -228,8 +229,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -284,13 +285,13 @@ self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) try: - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write(self.contents.toPlainText()) f.close() except IOError as why:
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,19 +30,20 @@ "darkcyan", "gray", "yellow"] COLORS = [str(QColor(x).name()) for x in COLORNAMES] + class HgLogBrowserDialog(QDialog, Ui_HgLogBrowserDialog): """ Class implementing a dialog to browse the log history. """ - IconColumn = 0 - BranchColumn = 1 + IconColumn = 0 + BranchColumn = 1 RevisionColumn = 2 - AuthorColumn = 3 - DateColumn = 4 - MessageColumn = 5 - TagsColumn = 6 + AuthorColumn = 3 + DateColumn = 4 + MessageColumn = 5 + TagsColumn = 6 - def __init__(self, vcs, mode = "log", bundle = None, parent = None): + def __init__(self, vcs, mode="log", bundle=None, parent=None): """ Constructor @@ -96,7 +97,7 @@ self.__messageRole = Qt.UserRole self.__changesRole = Qt.UserRole + 1 - self.__edgesRole = Qt.UserRole + 2 + self.__edgesRole = Qt.UserRole + 2 self.__parentsRole = Qt.UserRole + 3 self.process = QProcess() @@ -105,9 +106,9 @@ self.process.readyReadStandardError.connect(self.__readStderr) self.flags = { - 'A' : self.trUtf8('Added'), - 'D' : self.trUtf8('Deleted'), - 'M' : self.trUtf8('Modified'), + 'A': self.trUtf8('Added'), + 'D': self.trUtf8('Deleted'), + 'M': self.trUtf8('Modified'), } self.buf = [] # buffer for stdout @@ -165,9 +166,9 @@ Private method to resort the changed files tree. """ sortColumn = self.filesTree.sortColumn() - self.filesTree.sortItems(1, + self.filesTree.sortItems(1, self.filesTree.header().sortIndicatorOrder()) - self.filesTree.sortItems(sortColumn, + self.filesTree.sortItems(sortColumn, self.filesTree.header().sortIndicatorOrder()) def __getColor(self, n): @@ -199,7 +200,7 @@ @param parents list of parent revisions (list of integers) @return tuple containing the column and color index for the given node and a list of tuples indicating the edges - between the given node and its parents + between the given node and its parents (integer, integer, [(integer, integer, integer), ...]) """ if rev not in self.__revs: @@ -247,9 +248,9 @@ @param column column index of the revision (integer) @param color color of the node (integer) - @param bottomedges list of edges for the bottom of the node + @param bottomedges list of edges for the bottom of the node (list of tuples of three integers) - @param topedges list of edges for the top of the node + @param topedges list of edges for the top of the node (list of tuples of three integers) @param dotColor color to be used for the dot (QColor) @param currentRev flag indicating to draw the icon for the @@ -322,9 +323,9 @@ elif self.commandMode in ("incoming", "outgoing"): offset = radius // 2 painter.drawConvexPolygon( - QPoint(dot_x + offset, dot_y), - QPoint(dot_x, dot_y + offset), - QPoint(dot_x + offset, dot_y + 2 * offset), + QPoint(dot_x + offset, dot_y), + QPoint(dot_x, dot_y + offset), + QPoint(dot_x + offset, dot_y + 2 * offset), QPoint(dot_x + 2 * offset, dot_y + offset) ) else: @@ -367,8 +368,8 @@ finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: output = \ - str(process.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') parents = [int(p) for p in output.strip().splitlines()] else: @@ -403,8 +404,8 @@ finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: output = \ - str(process.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') self.__projectRevision = output.strip() if self.__projectRevision.endswith("+"): @@ -440,8 +441,8 @@ finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: output = \ - str(process.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') for line in output.splitlines(): if line.strip().endswith("(closed)"): @@ -489,16 +490,16 @@ if len(msgtxt) > 30: msgtxt = "{0}...".format(msgtxt[:30]) itm = QTreeWidgetItem(self.logTree, [ - "", - branches[0] + closedStr, - "{0:>7}:{1}".format(rev, node), - author, - date, - msgtxt, - ", ".join(tags), + "", + branches[0] + closedStr, + "{0:>7}:{1}".format(rev, node), + author, + date, + msgtxt, + ", ".join(tags), ]) - itm.setForeground(self.BranchColumn, + itm.setForeground(self.BranchColumn, QBrush(QColor(self.__branchColor(branches[0])))) if not self.projectMode: @@ -520,9 +521,9 @@ else: topedges = None - icon = self.__generateIcon(column, color, edges, topedges, - QColor(self.__branchColor(branches[0])), - rev == self.__projectRevision, + icon = self.__generateIcon(column, color, edges, topedges, + QColor(self.__branchColor(branches[0])), + rev == self.__projectRevision, rev in self.__closedBranchesRevs) itm.setIcon(0, icon) @@ -543,14 +544,14 @@ @return reference to the generated item (QTreeWidgetItem) """ itm = QTreeWidgetItem(self.filesTree, [ - self.flags[action], - path, - copyfrom, + self.flags[action], + path, + copyfrom, ]) return itm - def __getLogEntries(self, startRev = None): + def __getLogEntries(self, startRev=None): """ Private method to retrieve log entries from the repository. @@ -594,7 +595,7 @@ if self.commandMode == "log": args.append('--copies') args.append('--style') - args.append(os.path.join(os.path.dirname(__file__), + args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowser.style")) if self.commandMode == "incoming": if self.bundle: @@ -686,7 +687,7 @@ Private method to process the buffered output of the hg log command. """ noEntries = 0 - log = {"message" : []} + log = {"message": []} changedPaths = [] initialText = True fileCopies = {} @@ -704,7 +705,7 @@ log["author"] = value.strip() elif key == "parents": log["parents"] = \ - [int(x.split(":", 1)[0]) + [int(x.split(":", 1)[0]) for x in value.strip().split()] elif key == "date": log["date"] = " ".join(value.strip().split()[:2]) @@ -715,31 +716,31 @@ for f in value.strip().split(", "): if f in fileCopies: changedPaths.append({ - "action" : "A", - "path" : f, - "copyfrom" : fileCopies[f], + "action": "A", + "path": f, + "copyfrom": fileCopies[f], }) else: changedPaths.append({ - "action" : "A", - "path" : f, - "copyfrom" : "", + "action": "A", + "path": f, + "copyfrom": "", }) elif key == "files_mods": if value.strip(): for f in value.strip().split(", "): changedPaths.append({ - "action" : "M", - "path" : f, - "copyfrom" : "", + "action": "M", + "path": f, + "copyfrom": "", }) elif key == "file_dels": if value.strip(): for f in value.strip().split(", "): changedPaths.append({ - "action" : "D", - "path" : f, - "copyfrom" : "", + "action": "D", + "path": f, + "copyfrom": "", }) elif key == "file_copies": if value.strip(): @@ -760,7 +761,7 @@ log["message"].append(value.strip()) else: if len(log) > 1: - self.__generateLogItem(log["author"], log["date"], + self.__generateLogItem(log["author"], log["date"], log["message"], log["revision"], changedPaths, log["parents"], log["branches"], log["tags"]) dt = QDate.fromString(log["date"], Qt.ISODate) @@ -774,7 +775,7 @@ if self.__minDate > dt: self.__minDate = dt noEntries += 1 - log = {"message" : []} + log = {"message": []} changedPaths = [] fileCopies = {} @@ -818,15 +819,15 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process and inserts it into a buffer. """ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.buf.append(line) @@ -839,8 +840,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -1084,7 +1085,7 @@ """ Private slot called, when the stop on copy/move checkbox is clicked """ - self.vcs.getPlugin().setPreferences("StopLogOnCopy", + self.vcs.getPlugin().setPreferences("StopLogOnCopy", self.stopCheckBox.isChecked()) self.nextButton.setEnabled(True) self.limitSpinBox.setEnabled(True)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,14 +22,15 @@ import Utilities import Preferences + class HgLogDialog(QWidget, Ui_HgLogDialog): """ Class implementing a dialog to show the output of the hg log command process. - The dialog is nonmodal. Clicking a link in the upper text pane shows + The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the revisions. """ - def __init__(self, vcs, mode = "log", bundle = None, parent = None): + def __init__(self, vcs, mode="log", bundle=None, parent=None): """ Constructor @@ -86,7 +87,7 @@ e.accept() - def start(self, fn, noEntries = 0): + def start(self, fn, noEntries=0): """ Public slot to start the hg log command. @@ -186,8 +187,8 @@ finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: output = \ - str(process.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') parents = [p for p in output.strip().splitlines()] else: @@ -250,9 +251,9 @@ query.append(parent.split(":")[0]).append('_').append(rev) url.setEncodedQuery(query) dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( - url.toString(), - str(query, encoding="ascii"), - self.trUtf8('diff to {0}').format(parent), + url.toString(), + str(query, encoding="ascii"), + self.trUtf8('diff to {0}').format(parent), ) dstr += '<br />\n' html += dstr @@ -277,7 +278,7 @@ for f in entry["file_adds"].strip().split(", "): if f in fileCopies: html += self.trUtf8('Added {0} (copied from {1})<br />\n')\ - .format(Utilities.html_encode(f), + .format(Utilities.html_encode(f), Utilities.html_encode(fileCopies[f])) else: html += self.trUtf8('Added {0}<br />\n')\ @@ -305,15 +306,15 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process and inserts it into a buffer. """ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if s == "@@@\n": @@ -349,8 +350,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -425,4 +426,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) \ No newline at end of file + QWidget.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_HgMergeDialog import Ui_HgMergeDialog + class HgMergeDialog(QDialog, Ui_HgMergeDialog): """ Class implementing a dialog to enter the data for a merge operation. """ - def __init__(self, force, tagsList, branchesList, parent = None): + def __init__(self, force, tagsList, branchesList, parent=None): """ Constructor @@ -35,7 +36,7 @@ """ Public method to retrieve the merge data. - @return tuple naming the revision and a flag indicating a + @return tuple naming the revision and a flag indicating a forced merge (string, boolean) """ if self.numberButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import Utilities + class HgNewProjectOptionsDialog(QDialog, Ui_HgNewProjectOptionsDialog): """ Class implementing the Options Dialog for a new project from the repository. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -108,7 +109,7 @@ if scheme == "file://" and url[0] not in ["\\", "/"]: url = "/{0}".format(url) vcsdatadict = { - "url" : '{0}{1}'.format(scheme, url), - "revision" : self.vcsRevisionEdit.text(), + "url": '{0}{1}'.format(scheme, url), + "revision": self.vcsRevisionEdit.text(), } return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,12 +11,13 @@ from .Ui_HgOptionsDialog import Ui_HgOptionsDialog + class HgOptionsDialog(QDialog, Ui_HgOptionsDialog): """ Class implementing a dialog to enter options used to start a project in the repository. """ - def __init__(self, vcs, project, parent = None): + def __init__(self, vcs, project, parent=None): """ Constructor @@ -34,6 +35,6 @@ @return a dictionary containing the data entered """ vcsdatadict = { - "message" : self.vcsLogEdit.text(), + "message": self.vcsLogEdit.text(), } return vcsdatadict
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_HgRevisionSelectionDialog import Ui_HgRevisionSelectionDialog + class HgRevisionSelectionDialog(QDialog, Ui_HgRevisionSelectionDialog): """ Class implementing a dialog to select a revision. """ - def __init__(self, tagsList, branchesList, showNone = False, parent = None): + def __init__(self, tagsList, branchesList, showNone=False, parent=None): """ Constructor @@ -39,7 +40,7 @@ """ Public method to retrieve the selected revision. - @return tuple naming the revision and a flag indicating a + @return tuple naming the revision and a flag indicating a forced merge (string, boolean) """ if self.numberButton.isChecked():
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_HgRevisionsSelectionDialog import Ui_HgRevisionsSelectionDialog + class HgRevisionsSelectionDialog(QDialog, Ui_HgRevisionsSelectionDialog): """ Class implementing a dialog to enter the revisions for the hg diff command. """ - def __init__(self, tagsList, branchesList, parent = None): + def __init__(self, tagsList, branchesList, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import Preferences + class HgServeDialog(QMainWindow): """ Class implementing a dialog for the Mercurial server. """ - def __init__(self, vcs, path, parent = None): + def __init__(self, vcs, path, parent=None): """ Constructor @@ -43,17 +44,17 @@ self.__startAct = QAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "startServer.png")), - self.trUtf8("Start Server"), self) + os.path.join("VcsPlugins", "vcsMercurial", "icons", "startServer.png")), + self.trUtf8("Start Server"), self) self.__startAct.triggered[()].connect(self.__startServer) self.__stopAct = QAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "stopServer.png")), - self.trUtf8("Stop Server"), self) + os.path.join("VcsPlugins", "vcsMercurial", "icons", "stopServer.png")), + self.trUtf8("Stop Server"), self) self.__stopAct.triggered[()].connect(self.__stopServer) self.__browserAct = QAction( - UI.PixmapCache.getIcon("home.png"), - self.trUtf8("Start Browser"), self) + UI.PixmapCache.getIcon("home.png"), + self.trUtf8("Start Browser"), self) self.__browserAct.triggered[()].connect(self.__startBrowser) self.__portSpin = QSpinBox(self) @@ -179,13 +180,13 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process and inserts it into the log. """ if self.process is not None: - s = str(self.process.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') self.__appendText(s, False) @@ -196,12 +197,12 @@ It reads the error output of the process and inserts it into the log. """ if self.process is not None: - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.__appendText(s, True) - def __appendText(self, txt, error = False): + def __appendText(self, txt, error=False): """ Public method to append text to the end.
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,11 +22,12 @@ import Preferences + class HgStatusDialog(QWidget, Ui_HgStatusDialog): """ Class implementing a dialog to show the output of the hg status command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -81,13 +82,13 @@ self.statusList.customContextMenuRequested.connect(self.__showContextMenu) self.modifiedIndicators = [ - self.trUtf8('added'), - self.trUtf8('modified'), - self.trUtf8('removed'), + self.trUtf8('added'), + self.trUtf8('modified'), + self.trUtf8('removed'), ] self.unversionedIndicators = [ - self.trUtf8('not tracked'), + self.trUtf8('not tracked'), ] self.missingIndicators = [ @@ -95,20 +96,20 @@ ] self.status = { - 'A' : self.trUtf8('added'), - 'C' : self.trUtf8('normal'), - 'I' : self.trUtf8('ignored'), - 'M' : self.trUtf8('modified'), - 'R' : self.trUtf8('removed'), - '?' : self.trUtf8('not tracked'), - '!' : self.trUtf8('missing'), + 'A': self.trUtf8('added'), + 'C': self.trUtf8('normal'), + 'I': self.trUtf8('ignored'), + 'M': self.trUtf8('modified'), + 'R': self.trUtf8('removed'), + '?': self.trUtf8('not tracked'), + '!': self.trUtf8('missing'), } def __resort(self): """ Private method to resort the tree. """ - self.statusList.sortItems(self.statusList.sortColumn(), + self.statusList.sortItems(self.statusList.sortColumn(), self.statusList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -127,9 +128,9 @@ """ statusText = self.status[status] itm = QTreeWidgetItem(self.statusList, [ - "", - statusText, - path, + "", + statusText, + path, ]) itm.setTextAlignment(1, Qt.AlignHCenter) @@ -293,8 +294,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if line[0] in "ACIMR?!" and line[1] == " ": status, path = line.strip().split(" ", 1) @@ -309,8 +310,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ import Preferences + class HgStatusMonitorThread(VcsStatusMonitorThread): """ Class implementing the VCS status monitor thread class for Mercurial. """ - def __init__(self, interval, project, vcs, parent = None): + def __init__(self, interval, project, vcs, parent=None): """ Constructor @@ -48,7 +49,7 @@ <li>" " path is back at normal</li> </ul> - @return tuple of flag indicating successful operation (boolean) and + @return tuple of flag indicating successful operation (boolean) and a status message in case of non successful operation (string) """ self.shouldUpdate = False @@ -91,7 +92,7 @@ for line in output.splitlines(): flag, name = line.split(" ", 1) if flag == "U": - states[name] = "Z" # conflict + states[name] = "Z" # conflict for name in states: try: @@ -109,8 +110,8 @@ process.kill() process.waitForFinished() return False, \ - str(process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + str(process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') else: process.kill()
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,11 +19,12 @@ import Preferences + class HgTagBranchListDialog(QDialog, Ui_HgTagBranchListDialog): """ Class implementing a dialog to show a list of tags or branches. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -166,7 +167,7 @@ """ Private method to resort the tree. """ - self.tagList.sortItems(self.tagList.sortColumn(), + self.tagList.sortItems(self.tagList.sortColumn(), self.tagList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -186,9 +187,9 @@ @param name name of the tag/branch (string) """ itm = QTreeWidgetItem(self.tagList, [ - "{0:>7}".format(revision), - changeset, - status, + "{0:>7}".format(revision), + changeset, + status, name]) itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(1, Qt.AlignRight) @@ -204,8 +205,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace').strip() l = s.split() if l[-1][0] in "1234567890": @@ -240,8 +241,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,16 +12,17 @@ from .Ui_HgTagDialog import Ui_HgTagDialog + class HgTagDialog(QDialog, Ui_HgTagDialog): """ Class implementing a dialog to enter the data for a tagging operation. """ - CreateRegularTag = 1 - CreateLocalTag = 2 - DeleteTag = 3 - CreateBranch = 4 + CreateRegularTag = 1 + CreateLocalTag = 2 + DeleteTag = 3 + CreateBranch = 4 - def __init__(self, taglist, parent = None): + def __init__(self, taglist, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ import Utilities + def getConfigPath(): """ Public method to get the filename of the config file.
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,12 +18,13 @@ from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog import UI.PixmapCache + class HgProjectBrowserHelper(VcsProjectBrowserHelper): """ Class implementing the VCS project browser helper for Mercurial. """ def __init__(self, vcsObject, browserObject, projectObject, isTranslationsBrowser, - parent = None, name = None): + parent=None, name=None): """ Constructor @@ -40,9 +41,9 @@ def showContextMenu(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. @param menu reference to the menu to be shown @@ -68,9 +69,9 @@ def showContextMenuMulti(self, menu, standardItems): """ - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. @param menu reference to the menu to be shown @@ -106,9 +107,9 @@ def showContextMenuDir(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -132,9 +133,9 @@ def showContextMenuDirMulti(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -185,7 +186,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -193,20 +194,20 @@ menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('Add to repository'), + self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository only'), + self.trUtf8('Remove from repository only'), self.__HgForget) self.vcsMenuActions.append(act) menu.addSeparator() @@ -233,10 +234,10 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__HgExtendedDiff) self.vcsMenuActions.append(act) - self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), + self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), self.__HgAnnotate) self.vcsMenuActions.append(self.annotateAct) menu.addSeparator() @@ -262,7 +263,7 @@ def _addVCSMenuMulti(self, mainMenu): """ - Protected method used to add the VCS menu for multi selection to all + Protected method used to add the VCS menu for multi selection to all project browsers. @param mainMenu reference to the menu to be amended @@ -274,7 +275,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -282,7 +283,7 @@ menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -290,11 +291,11 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository only'), + self.trUtf8('Remove from repository only'), self.__HgForget) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -306,7 +307,7 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__HgExtendedDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -340,7 +341,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -377,7 +378,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -385,7 +386,7 @@ menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -393,7 +394,7 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -420,7 +421,7 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__HgExtendedDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -460,7 +461,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -468,7 +469,7 @@ menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -476,7 +477,7 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -488,7 +489,7 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__HgExtendedDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator()
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,11 +21,12 @@ import UI.PixmapCache import Preferences + class HgProjectHelper(VcsProjectHelper): """ Class implementing the VCS project helper for Mercurial. """ - def __init__(self, vcsObject, projectObject, parent = None, name = None): + def __init__(self, vcsObject, projectObject, parent=None, name=None): """ Constructor @@ -164,7 +165,7 @@ self.hgPushForcedAct.triggered[()].connect(self.__hgPushForced) self.actions.append(self.hgPushForcedAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), + self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), UI.PixmapCache.getIcon("vcsExport.png"), self.trUtf8('&Export from repository...'), 0, 0, self, 'subversion_export') @@ -373,7 +374,7 @@ self.vcsResolveAct.triggered[()].connect(self.__hgResolve) self.actions.append(self.vcsResolveAct) - self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), + self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), UI.PixmapCache.getIcon("vcsTag.png"), self.trUtf8('&Tag in repository...'), 0, 0, self, 'mercurial_tag') @@ -387,7 +388,7 @@ self.vcsTagAct.triggered[()].connect(self._vcsTag) self.actions.append(self.vcsTagAct) - self.hgTagListAct = E5Action(self.trUtf8('List tags'), + self.hgTagListAct = E5Action(self.trUtf8('List tags'), self.trUtf8('List tags...'), 0, 0, self, 'mercurial_list_tags') self.hgTagListAct.setStatusTip(self.trUtf8( @@ -400,7 +401,7 @@ self.hgTagListAct.triggered[()].connect(self.__hgTagList) self.actions.append(self.hgTagListAct) - self.hgBranchListAct = E5Action(self.trUtf8('List branches'), + self.hgBranchListAct = E5Action(self.trUtf8('List branches'), self.trUtf8('List branches...'), 0, 0, self, 'mercurial_list_branches') self.hgBranchListAct.setStatusTip(self.trUtf8( @@ -413,7 +414,7 @@ self.hgBranchListAct.triggered[()].connect(self.__hgBranchList) self.actions.append(self.hgBranchListAct) - self.hgBranchAct = E5Action(self.trUtf8('Create branch'), + self.hgBranchAct = E5Action(self.trUtf8('Create branch'), UI.PixmapCache.getIcon("vcsBranch.png"), self.trUtf8('Create &branch...'), 0, 0, self, 'mercurial_branch') @@ -428,7 +429,7 @@ self.hgBranchAct.triggered[()].connect(self.__hgBranch) self.actions.append(self.hgBranchAct) - self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), + self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), self.trUtf8('Close branch'), 0, 0, self, 'mercurial_close_branch') self.hgCloseBranchAct.setStatusTip(self.trUtf8( @@ -441,7 +442,7 @@ self.hgCloseBranchAct.triggered[()].connect(self.__hgCloseBranch) self.actions.append(self.hgCloseBranchAct) - self.hgShowBranchAct = E5Action(self.trUtf8('Show current branch'), + self.hgShowBranchAct = E5Action(self.trUtf8('Show current branch'), self.trUtf8('Show current branch'), 0, 0, self, 'mercurial_show_branch') self.hgShowBranchAct.setStatusTip(self.trUtf8( @@ -495,7 +496,7 @@ self.actions.append(self.vcsCommandAct) self.vcsPropsAct = E5Action(self.trUtf8('Command options'), - self.trUtf8('Command &options...'),0,0,self, + self.trUtf8('Command &options...'), 0, 0, self, 'mercurial_options') self.vcsPropsAct.setStatusTip(self.trUtf8('Show the Mercurial command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( @@ -790,7 +791,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), + os.path.join("VcsPlugins", "vcsMercurial", "icons", "mercurial.png")), self.vcs.vcsName(), self._vcsInfoDisplay) font = act.font() font.setBold(True) @@ -886,7 +887,7 @@ res = E5MessageBox.yesNo(self.parent(), self.trUtf8("Pull"), self.trUtf8("""The project should be reread. Do this now?"""), - yesDefault = True) + yesDefault=True) if res: self.project.reopenProject() @@ -901,25 +902,25 @@ Private slot used to push changes to a remote repository using the force option. """ - self.vcs.hgPush(self.project.ppath, force = True) + self.vcs.hgPush(self.project.ppath, force=True) def __hgHeads(self): """ Private slot used to show the heads of the repository. """ - self.vcs.hgInfo(self.project.ppath, mode = "heads") + self.vcs.hgInfo(self.project.ppath, mode="heads") def __hgParents(self): """ Private slot used to show the parents of the repository. """ - self.vcs.hgInfo(self.project.ppath, mode = "parents") + self.vcs.hgInfo(self.project.ppath, mode="parents") def __hgTip(self): """ Private slot used to show the tip of the repository. """ - self.vcs.hgInfo(self.project.ppath, mode = "tip") + self.vcs.hgInfo(self.project.ppath, mode="tip") def __hgResolve(self): """ @@ -965,7 +966,7 @@ self.project.saveProject() if Preferences.getVCS("AutoSaveFiles"): self.project.saveAllScripts() - self.vcs.vcsCommit(self.project.ppath, '', closeBranch = True) + self.vcs.vcsCommit(self.project.ppath, '', closeBranch=True) def __hgEditRepoConfig(self): """ @@ -1007,7 +1008,7 @@ """ Protected slot used to create a .hgignore file for the project. """ - self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd = True) + self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd=True) def __hgBundle(self): """
--- a/Plugins/VcsPlugins/vcsMercurial/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -6,6 +6,6 @@ """ Package implementing the vcs interface to Mercurial -It consists of the hg class, the project helper classes and some +It consists of the hg class, the project helper classes and some Mercurial specific dialogs. """
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,7 +9,9 @@ import os import shutil -import urllib.request, urllib.parse, urllib.error +import urllib.request +import urllib.parse +import urllib.error from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo from PyQt4.QtGui import QApplication, QDialog, QInputDialog @@ -48,6 +50,7 @@ import Preferences import Utilities + class Hg(VersionControl): """ Class implementing the version control systems interface to Mercurial. @@ -56,7 +59,7 @@ """ committed = pyqtSignal() - def __init__(self, plugin, parent = None, name = None): + def __init__(self, plugin, parent=None, name=None): """ Constructor @@ -66,18 +69,18 @@ """ VersionControl.__init__(self, parent, name) self.defaultOptions = { - 'global' : [''], - 'commit' : [''], - 'checkout' : [''], - 'update' : [''], - 'add' : [''], - 'remove' : [''], - 'diff' : [''], - 'log' : [''], - 'history' : [''], - 'status' : [''], - 'tag' : [''], - 'export' : [''] + 'global': [''], + 'commit': [''], + 'checkout': [''], + 'update': [''], + 'add': [''], + 'remove': [''], + 'diff': [''], + 'log': [''], + 'history': [''], + 'status': [''], + 'tag': [''], + 'export': [''] } self.__plugin = plugin @@ -91,8 +94,8 @@ self.showedBranches = False self.tagTypeList = [ - 'tags', - 'branches', + 'tags', + 'branches', ] self.commandHistory = [] @@ -178,11 +181,11 @@ return False, errMsg - def vcsInit(self, vcsDir, noDialog = False): + def vcsInit(self, vcsDir, noDialog=False): """ Public method used to initialize the mercurial repository. - The initialization is done, when a project is converted into a Mercurial + The initialization is done, when a project is converted into a Mercurial controlled project. Therefore we always return TRUE without doing anything. @param vcsDir name of the VCS directory (string) @@ -210,7 +213,7 @@ project.closeProject() project.openProject(pfn) - def vcsImport(self, vcsDataDict, projectDir, noDialog = False): + def vcsImport(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to import the project into the Subversion repository. @@ -251,7 +254,7 @@ return status, False - def vcsCheckout(self, vcsDataDict, projectDir, noDialog = False): + def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to check the project out of a Mercurial repository (clone). @@ -304,7 +307,7 @@ os.remove(os.path.join(projectDir, '.hgignore')) return status - def vcsCommit(self, name, message, noDialog = False, closeBranch = False): + def vcsCommit(self, name, message, noDialog=False, closeBranch=False): """ Public method used to make the change of a file/directory permanent in the Mercurial repository. @@ -392,7 +395,7 @@ self.__forgotNames = [] self.checkVCSStatus() - def vcsUpdate(self, name, noDialog = False, revision = None): + def vcsUpdate(self, name, noDialog=False, revision=None): """ Public method used to update a file/directory with the Mercurial repository. @@ -436,7 +439,7 @@ self.checkVCSStatus() return res - def vcsAdd(self, name, isDir = False, noDialog = False): + def vcsAdd(self, name, isDir=False, noDialog=False): """ Public method used to add a file/directory to the Mercurial repository. @@ -482,7 +485,7 @@ if res: dia.exec_() - def vcsAddBinary(self, name, isDir = False): + def vcsAddBinary(self, name, isDir=False): """ Public method used to add a file/directory in binary mode to the Mercurial repository. @@ -498,9 +501,9 @@ @param path root directory of the tree to be added (string or list of strings)) """ - self.vcsAdd(path, isDir = False) + self.vcsAdd(path, isDir=False) - def vcsRemove(self, name, project = False, noDialog = False): + def vcsRemove(self, name, project=False, noDialog=False): """ Public method used to remove a file/directory from the Mercurial repository. @@ -545,7 +548,7 @@ return res - def vcsMove(self, name, project, target = None, noDialog = False): + def vcsMove(self, name, project, target=None, noDialog=False): """ Public method used to move a file/directory. @@ -614,7 +617,7 @@ def vcsLog(self, name): """ - Public method used to view the log of a file/directory from the + Public method used to view the log of a file/directory from the Mercurial repository. @param name file/directory name to show the log of (string) @@ -625,11 +628,11 @@ def vcsDiff(self, name): """ - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Mercurial repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. @param name file/directory name to be diffed (string) @@ -641,7 +644,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -654,7 +657,7 @@ def vcsStatus(self, name): """ - Public method used to view the status of files/directories in the + Public method used to view the status of files/directories in the Mercurial repository. @param name file/directory name(s) to show the status of @@ -788,7 +791,7 @@ dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() - self.vcsUpdate(name, revision = rev) + self.vcsUpdate(name, revision=rev) def vcsRegisteredState(self, name): """ @@ -844,7 +847,7 @@ return self.canBeAdded - def vcsAllRegisteredStates(self, names, dname, shortcut = True): + def vcsAllRegisteredStates(self, names, dname, shortcut=True): """ Public method used to get the registered states of a number of files in the vcs. @@ -855,7 +858,7 @@ @param names dictionary with all filenames to be checked as keys @param dname directory to check in (string) @param shortcut flag indicating a shortcut should be taken (boolean) - @return the received dictionary completed with a combination of + @return the received dictionary completed with a combination of canBeCommited and canBeAdded or None in order to signal an error """ if dname.endswith(os.sep): @@ -981,7 +984,7 @@ if res: dia.exec_() - def vcsOptionsDialog(self, project, archive, editable = False, parent = None): + def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ Public method to get a dialog to enter repository info. @@ -992,7 +995,7 @@ """ return HgOptionsDialog(self, project, parent) - def vcsNewProjectOptionsDialog(self, parent = None): + def vcsNewProjectOptionsDialog(self, parent=None): """ Public method to get a dialog to enter repository info for getting a new project. @@ -1021,7 +1024,7 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str(process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') index = 0 for line in output.splitlines(): @@ -1029,19 +1032,19 @@ changeset, tags, author, date, branches = line.split("@@@") cdate, ctime = date.split()[:2] info.append("""<p><table>""") - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\ .format(index, changeset)) if tags: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(tags.split()))) if branches: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(branches.split()))) - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\ @@ -1049,7 +1052,7 @@ info.append("""</table></p>""") url = "" - args = [] + args = [] args.append('showconfig') args.append('paths.default') process.setWorkingDirectory(ppath) @@ -1058,7 +1061,7 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str(process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') if output: url = output.splitlines()[0].strip() @@ -1092,20 +1095,20 @@ scheme = url[0] user = url[1] host = url[2] - port, path = url[3].split("/",1) + port, path = url[3].split("/", 1) return "{0}:{1}:{2}:{3}/{4}".format( scheme, user, host, port, urllib.parse.quote(path)) elif len(url) == 3: scheme = url[0] host = url[1] - port, path = url[2].split("/",1) + port, path = url[2].split("/", 1) return "{0}:{1}:{2}/{3}".format(scheme, host, port, urllib.parse.quote(path)) else: scheme = url[0] if scheme == "file": return "{0}:{1}".format(scheme, urllib.parse.quote(url[1])) else: - host, path = url[1][2:].split("/",1) + host, path = url[1][2:].split("/", 1) return "{0}://{1}/{2}".format(scheme, host, urllib.parse.quote(path)) def hgNormalizeURL(self, url): @@ -1163,7 +1166,7 @@ project.appendFile(target) return res - def hgListTagBranch(self, path, tags = True): + def hgListTagBranch(self, path, tags=True): """ Public method used to list the available tags or branches. @@ -1180,7 +1183,7 @@ else: self.tagsList = [] allTagsBranchesList = None - self.tagbranchList.start(path, tags, + self.tagbranchList.start(path, tags, self.tagsList, allTagsBranchesList) else: if not self.showedBranches: @@ -1189,7 +1192,7 @@ else: self.branchesList = [] allTagsBranchesList = None - self.tagbranchList.start(path, tags, + self.tagbranchList.start(path, tags, self.branchesList, self.allTagsBranchesList) def hgAnnotate(self, name): @@ -1204,11 +1207,11 @@ def hgExtendedDiff(self, name): """ - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Mercurial repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. This method gives the chance to enter the revisions to be compared. @@ -1222,7 +1225,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -1237,7 +1240,7 @@ def hgLogLimited(self, name): """ - Public method used to view the (limited) log of a file/directory from the + Public method used to view the (limited) log of a file/directory from the Mercurial repository. @param name file/directory name to show the log of (string) @@ -1254,7 +1257,7 @@ def hgLogBrowser(self, path): """ - Public method used to browse the log of a file/directory from the + Public method used to browse the log of a file/directory from the Mercurial repository. @param path file/directory name to show the log of (string) @@ -1265,33 +1268,33 @@ def hgIncoming(self, name): """ - Public method used to view the log of incoming changes from the + Public method used to view the log of incoming changes from the Mercurial repository. @param name file/directory name to show the log of (string) """ if self.getPlugin().getPreferences("UseLogBrowser"): - self.logBrowser = HgLogBrowserDialog(self, mode = "incoming") + self.logBrowser = HgLogBrowserDialog(self, mode="incoming") self.logBrowser.show() self.logBrowser.start(name) else: - self.log = HgLogDialog(self, mode = "incoming") + self.log = HgLogDialog(self, mode="incoming") self.log.show() self.log.start(name) def hgOutgoing(self, name): """ - Public method used to view the log of outgoing changes from the + Public method used to view the log of outgoing changes from the Mercurial repository. @param name file/directory name to show the log of (string) """ if self.getPlugin().getPreferences("UseLogBrowser"): - self.logBrowser = HgLogBrowserDialog(self, mode = "outgoing") + self.logBrowser = HgLogBrowserDialog(self, mode="outgoing") self.logBrowser.show() self.logBrowser.start(name) else: - self.log = HgLogDialog(self, mode = "outgoing") + self.log = HgLogDialog(self, mode="outgoing") self.log.show() self.log.start(name) @@ -1325,7 +1328,7 @@ self.checkVCSStatus() return res - def hgPush(self, name, force = False): + def hgPush(self, name, force=False): """ Public method used to push changes to a remote Mercurial repository. @@ -1353,7 +1356,7 @@ res = dia.hasAddOrDelete() self.checkVCSStatus() - def hgInfo(self, ppath, mode = "heads"): + def hgInfo(self, ppath, mode="heads"): """ Public method to show information about the heads of the repository. @@ -1385,7 +1388,7 @@ if procStarted: finished = process.waitForFinished(30000) if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), + output = str(process.readAllStandardOutput(), Preferences.getSystem("IOEncoding"), 'replace') index = 0 for line in output.splitlines(): @@ -1394,32 +1397,32 @@ cdate, ctime = date.split()[:2] info.append("""<p><table>""") if mode == "heads": - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Head #{0}</b></td><td></td></tr>\n""" .format(index, changeset))) elif mode == "parents": - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" .format(index, changeset))) elif mode == "tip": - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Tip</b></td><td></td></tr>\n""")) - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\ .format(changeset)) if tags: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(tags.split()))) if branches: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(branches.split()))) if parents: - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\ .format('<br/>'.join(parents.split()))) - info.append(QApplication.translate("mercurial", + info.append(QApplication.translate("mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n""" @@ -1657,7 +1660,7 @@ if res: dia.exec_() - def hgCreateIgnoreFile(self, name, autoAdd = False): + def hgCreateIgnoreFile(self, name, autoAdd=False): """ Public method to create the ignore file. @@ -1667,12 +1670,12 @@ """ status = False ignorePatterns = [ - "glob:.eric5project", - "glob:.ropeproject", - "glob:.directory", - "glob:**.pyc", - "glob:**.orig", - "glob:**.bak", + "glob:.eric5project", + "glob:.ropeproject", + "glob:.directory", + "glob:**.pyc", + "glob:**.orig", + "glob:**.bak", ] ignoreName = os.path.join(name, ".hgignore") @@ -1681,7 +1684,7 @@ self.trUtf8("Create .hgignore file"), self.trUtf8("""<p>The file <b>{0}</b> exists already.""" """ Overwrite it?</p>""").format(ignoreName), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) else: res = True if res: @@ -1696,7 +1699,7 @@ status = False if status and autoAdd: - self.vcsAdd(ignoreName, noDialog = True) + self.vcsAdd(ignoreName, noDialog=True) project = e5App().getObject("Project") project.appendFile(ignoreName) @@ -1743,7 +1746,7 @@ self.trUtf8("<p>The Mercurial changegroup file <b>{0}</b> " "already exists. Overwrite it?</p>") .format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) @@ -1789,11 +1792,11 @@ if file: if self.getPlugin().getPreferences("UseLogBrowser"): self.logBrowser = \ - HgLogBrowserDialog(self, mode = "incoming", bundle = file) + HgLogBrowserDialog(self, mode="incoming", bundle=file) self.logBrowser.show() self.logBrowser.start(name) else: - self.log = HgLogDialog(self, mode = "incoming", bundle = file) + self.log = HgLogDialog(self, mode="incoming", bundle=file) self.log.show() self.log.start(name) @@ -1851,7 +1854,7 @@ update = E5MessageBox.yesNo(self.__ui, self.trUtf8("Apply changegroups"), self.trUtf8("""Shall the working directory be updated?"""), - yesDefault = True) + yesDefault=True) args = [] args.append('unbundle') @@ -1887,8 +1890,8 @@ rev = "" if subcommand in ("good", "bad"): - dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList, - showNone =True) + dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList, + showNone=True) if dlg.exec_() == QDialog.Accepted: rev = dlg.getRevision() else: @@ -2008,7 +2011,7 @@ ## Methods to get the helper objects are below. ############################################################################ - def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser = False): + def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): """ Public method to instanciate a helper object for the different project browsers.
--- a/Plugins/VcsPlugins/vcsPySvn/Config.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/Config.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,9 +9,9 @@ # Available protocols fpr the repository URL ConfigSvnProtocols = [ - 'file://', - 'http://', - 'https://', - 'svn://', - 'svn+ssh://', + 'file://', + 'http://', + 'https://', + 'svn://', + 'svn+ssh://', ]
--- a/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_SubversionPage import Ui_SubversionPage + class SubversionPage(ConfigurationPageBase, Ui_SubversionPage): """ Class implementing the Subversion configuration page. @@ -57,4 +58,4 @@ """ serversFile = self.__plugin.getServersPath() editor = MiniEditor(serversFile, "Properties", self) - editor.show() \ No newline at end of file + editor.show()
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,12 +22,13 @@ import UI.PixmapCache + class SvnProjectBrowserHelper(VcsProjectBrowserHelper): """ Class implementing the VCS project browser helper for subversion. """ def __init__(self, vcsObject, browserObject, projectObject, isTranslationsBrowser, - parent = None, name = None): + parent=None, name=None): """ Constructor @@ -44,9 +45,9 @@ def showContextMenu(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. @param menu reference to the menu to be shown @@ -79,9 +80,9 @@ def showContextMenuMulti(self, menu, standardItems): """ - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. @param menu reference to the menu to be shown @@ -120,9 +121,9 @@ def showContextMenuDir(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -146,9 +147,9 @@ def showContextMenuDirMulti(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -199,7 +200,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -210,21 +211,21 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('Add to repository'), + self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) if 1 in self.browser.specialMenuEntries: self.vcsMenuAddTree = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('Add tree to repository'), + self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMenuActions.append(self.vcsMenuAddTree) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) menu.addSeparator() @@ -234,10 +235,10 @@ self.vcsMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -262,14 +263,14 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) - self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), + self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), self.__SVNBlame) self.vcsMenuActions.append(self.blameAct) menu.addSeparator() @@ -319,7 +320,7 @@ def _addVCSMenuMulti(self, mainMenu): """ - Protected method used to add the VCS menu for multi selection to all + Protected method used to add the VCS menu for multi selection to all project browsers. @param mainMenu reference to the menu to be amended @@ -331,7 +332,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -342,7 +343,7 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -355,15 +356,15 @@ self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -375,11 +376,11 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -434,7 +435,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -472,7 +473,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -483,7 +484,7 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -491,7 +492,7 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -501,10 +502,10 @@ self.vcsDirMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -529,11 +530,11 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -584,7 +585,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -595,7 +596,7 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -603,15 +604,15 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -623,11 +624,11 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -838,7 +839,7 @@ names.append(itm.fileName()) except AttributeError: names.append(itm.dirName()) - self.vcs.svnUnlock(names, breakIt = True) + self.vcs.svnUnlock(names, breakIt=True) def __SVNStealLock(self): """ @@ -850,11 +851,11 @@ names.append(itm.fileName()) except AttributeError: names.append(itm.dirName()) - self.vcs.svnLock(names, stealIt = True) + self.vcs.svnLock(names, stealIt=True) def __SVNInfo(self): """ - Private slot called by the context menu to show repository information of + Private slot called by the context menu to show repository information of a file or directory. """ try:
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import UI.PixmapCache + class SvnProjectHelper(VcsProjectHelper): """ Class implementing the VCS project helper for Subversion. """ - def __init__(self, vcsObject, projectObject, parent = None, name = None): + def __init__(self, vcsObject, projectObject, parent=None, name=None): """ Constructor @@ -218,7 +219,7 @@ self.vcsStatusAct.triggered[()].connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) - self.svnRepoInfoAct = E5Action(self.trUtf8('Show repository info'), + self.svnRepoInfoAct = E5Action(self.trUtf8('Show repository info'), UI.PixmapCache.getIcon("vcsRepo.png"), self.trUtf8('Show repository info'), 0, 0, self, 'subversion_repoinfo') @@ -233,7 +234,7 @@ self.svnRepoInfoAct.triggered[()].connect(self.__svnInfo) self.actions.append(self.svnRepoInfoAct) - self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), + self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), UI.PixmapCache.getIcon("vcsTag.png"), self.trUtf8('&Tag in repository...'), 0, 0, self, 'subversion_tag') @@ -247,7 +248,7 @@ self.vcsTagAct.triggered[()].connect(self._vcsTag) self.actions.append(self.vcsTagAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), + self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), UI.PixmapCache.getIcon("vcsExport.png"), self.trUtf8('&Export from repository...'), 0, 0, self, 'subversion_export') @@ -262,7 +263,7 @@ self.actions.append(self.vcsExportAct) self.vcsPropsAct = E5Action(self.trUtf8('Command options'), - self.trUtf8('Command &options...'),0,0,self, + self.trUtf8('Command &options...'), 0, 0, self, 'subversion_options') self.vcsPropsAct.setStatusTip(self.trUtf8('Show the VCS command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( @@ -353,7 +354,7 @@ self.vcsCommandAct.triggered[()].connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) - self.svnTagListAct = E5Action(self.trUtf8('List tags'), + self.svnTagListAct = E5Action(self.trUtf8('List tags'), self.trUtf8('List tags...'), 0, 0, self, 'subversion_list_tags') self.svnTagListAct.setStatusTip(self.trUtf8( @@ -366,7 +367,7 @@ self.svnTagListAct.triggered[()].connect(self.__svnTagList) self.actions.append(self.svnTagListAct) - self.svnBranchListAct = E5Action(self.trUtf8('List branches'), + self.svnBranchListAct = E5Action(self.trUtf8('List branches'), self.trUtf8('List branches...'), 0, 0, self, 'subversion_list_branches') self.svnBranchListAct.setStatusTip(self.trUtf8( @@ -379,7 +380,7 @@ self.svnBranchListAct.triggered[()].connect(self.__svnBranchList) self.actions.append(self.svnBranchListAct) - self.svnListAct = E5Action(self.trUtf8('List repository contents'), + self.svnListAct = E5Action(self.trUtf8('List repository contents'), self.trUtf8('List repository contents...'), 0, 0, self, 'subversion_contents') self.svnListAct.setStatusTip(self.trUtf8( @@ -482,7 +483,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), + os.path.join("VcsPlugins", "vcsPySvn", "icons", "pysvn.png")), self.vcs.vcsName(), self._vcsInfoDisplay) font = act.font() font.setBold(True) @@ -612,10 +613,10 @@ """ Private slot to open the repository browser. """ - self.vcs.svnRepoBrowser(projectPath = self.project.ppath) + self.vcs.svnRepoBrowser(projectPath=self.project.ppath) def __svnConfigure(self): """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("zzz_subversionPage")
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,11 +19,12 @@ import Utilities + class SvnBlameDialog(QDialog, SvnDialogMixin, Ui_SvnBlameDialog): """ Class implementing a dialog to show the output of the svn blame command. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -77,7 +78,7 @@ annotation["author"], annotation["number"] + 1, annotation["line"]) except pysvn.ClientError as e: locker.unlock() - self.__showError(e.args[0]+'\n') + self.__showError(e.args[0] + '\n') self.__finish() os.chdir(cwd) @@ -120,7 +121,7 @@ @param lineno linenumber (string) @param text line of text from the annotated file (string) """ - itm = QTreeWidgetItem(self.blameList, + itm = QTreeWidgetItem(self.blameList, ["{0:d}".format(revision), author, "{0:d}".format(lineno), text]) itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(2, Qt.AlignRight)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ import Utilities + class SvnCommandDialog(QDialog, Ui_SvnCommandDialog): """ Class implementing the Subversion command dialog. @@ -25,7 +26,7 @@ arbitrary subversion command. It asks the user to enter the commandline parameters and the working directory. """ - def __init__(self, argvList, wdList, ppath, parent = None): + def __init__(self, argvList, wdList, ppath, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class SvnCommitDialog(QWidget, Ui_SvnCommitDialog): """ Class implementing a dialog to enter the commit message. @@ -26,7 +27,7 @@ accepted = pyqtSignal() rejected = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -67,7 +68,7 @@ no = int(Preferences.Prefs.settings\ .value('Subversion/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Subversion/Commits', + Preferences.Prefs.settings.setValue('Subversion/Commits', self.recentCommitMessages) return msg
--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,61 +12,61 @@ import pysvn svnNotifyActionMap = { - pysvn.wc_notify_action.add : \ + pysvn.wc_notify_action.add: \ QT_TRANSLATE_NOOP('Subversion', 'Add'), - pysvn.wc_notify_action.commit_added : \ + pysvn.wc_notify_action.commit_added: \ QT_TRANSLATE_NOOP('Subversion', 'Add'), - pysvn.wc_notify_action.commit_deleted : \ + pysvn.wc_notify_action.commit_deleted: \ QT_TRANSLATE_NOOP('Subversion', 'Delete'), - pysvn.wc_notify_action.commit_modified : \ + pysvn.wc_notify_action.commit_modified: \ QT_TRANSLATE_NOOP('Subversion', 'Modify'), - pysvn.wc_notify_action.commit_postfix_txdelta : None, - pysvn.wc_notify_action.commit_replaced : \ + pysvn.wc_notify_action.commit_postfix_txdelta: None, + pysvn.wc_notify_action.commit_replaced: \ QT_TRANSLATE_NOOP('Subversion', 'Replace'), - pysvn.wc_notify_action.copy : \ + pysvn.wc_notify_action.copy: \ QT_TRANSLATE_NOOP('Subversion', 'Copy'), - pysvn.wc_notify_action.delete : \ + pysvn.wc_notify_action.delete: \ QT_TRANSLATE_NOOP('Subversion', 'Delete'), - pysvn.wc_notify_action.failed_revert : \ + pysvn.wc_notify_action.failed_revert: \ QT_TRANSLATE_NOOP('Subversion', 'Failed revert'), - pysvn.wc_notify_action.resolved : \ + pysvn.wc_notify_action.resolved: \ QT_TRANSLATE_NOOP('Subversion', 'Resolve'), - pysvn.wc_notify_action.restore : \ + pysvn.wc_notify_action.restore: \ QT_TRANSLATE_NOOP('Subversion', 'Restore'), - pysvn.wc_notify_action.revert : \ + pysvn.wc_notify_action.revert: \ QT_TRANSLATE_NOOP('Subversion', 'Revert'), - pysvn.wc_notify_action.skip : \ + pysvn.wc_notify_action.skip: \ QT_TRANSLATE_NOOP('Subversion', 'Skip'), - pysvn.wc_notify_action.status_completed : None, - pysvn.wc_notify_action.status_external : \ + pysvn.wc_notify_action.status_completed: None, + pysvn.wc_notify_action.status_external: \ QT_TRANSLATE_NOOP('Subversion', 'External'), - pysvn.wc_notify_action.update_add : \ + pysvn.wc_notify_action.update_add: \ QT_TRANSLATE_NOOP('Subversion', 'Add'), - pysvn.wc_notify_action.update_completed : None, - pysvn.wc_notify_action.update_delete : \ + pysvn.wc_notify_action.update_completed: None, + pysvn.wc_notify_action.update_delete: \ QT_TRANSLATE_NOOP('Subversion', 'Delete'), - pysvn.wc_notify_action.update_external : \ + pysvn.wc_notify_action.update_external: \ QT_TRANSLATE_NOOP('Subversion', 'External'), - pysvn.wc_notify_action.update_update : \ + pysvn.wc_notify_action.update_update: \ QT_TRANSLATE_NOOP('Subversion', 'Update'), - pysvn.wc_notify_action.annotate_revision : \ + pysvn.wc_notify_action.annotate_revision: \ QT_TRANSLATE_NOOP('Subversion', 'Annotate'), } -if hasattr( pysvn.wc_notify_action, 'locked' ): - svnNotifyActionMap[ pysvn.wc_notify_action.locked ] = \ +if hasattr(pysvn.wc_notify_action, 'locked'): + svnNotifyActionMap[pysvn.wc_notify_action.locked] = \ QT_TRANSLATE_NOOP('Subversion', 'Locking') - svnNotifyActionMap[ pysvn.wc_notify_action.unlocked ] = \ + svnNotifyActionMap[pysvn.wc_notify_action.unlocked] = \ QT_TRANSLATE_NOOP('Subversion', 'Unlocking') - svnNotifyActionMap[ pysvn.wc_notify_action.failed_lock ] = \ + svnNotifyActionMap[pysvn.wc_notify_action.failed_lock] = \ QT_TRANSLATE_NOOP('Subversion', 'Failed lock') - svnNotifyActionMap[ pysvn.wc_notify_action.failed_unlock ] = \ + svnNotifyActionMap[pysvn.wc_notify_action.failed_unlock] = \ QT_TRANSLATE_NOOP('Subversion', 'Failed unlock') -if hasattr( pysvn.wc_notify_action, 'changelist_clear'): - svnNotifyActionMap[ pysvn.wc_notify_action.changelist_clear ] = \ +if hasattr(pysvn.wc_notify_action, 'changelist_clear'): + svnNotifyActionMap[pysvn.wc_notify_action.changelist_clear] = \ QT_TRANSLATE_NOOP('Subversion', 'Changelist clear') - svnNotifyActionMap[ pysvn.wc_notify_action.changelist_set ] = \ + svnNotifyActionMap[pysvn.wc_notify_action.changelist_set] = \ QT_TRANSLATE_NOOP('Subversion', 'Changelist set') - svnNotifyActionMap[ pysvn.wc_notify_action.changelist_moved ] = \ + svnNotifyActionMap[pysvn.wc_notify_action.changelist_moved] = \ QT_TRANSLATE_NOOP('Subversion', 'Changelist moved') svnStatusMap = {
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .Ui_SvnCopyDialog import Ui_SvnCopyDialog + class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): """ Class implementing a dialog to enter the data for a copy operation. """ - def __init__(self, source, parent = None, move = False, force = False): + def __init__(self, source, parent=None, move=False, force=False): """ Constructor @@ -59,7 +60,7 @@ @pyqtSlot() def on_dirButton_clicked(self): """ - Private slot to handle the button press for selecting the target via a + Private slot to handle the button press for selecting the target via a selection dialog. """ if os.path.isdir(self.source):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,11 +19,12 @@ import Preferences + class SvnDialog(QDialog, SvnDialogMixin, Ui_SvnDialog): """ Class implementing a dialog to show the output of a pysvn action. """ - def __init__(self, text, command, pysvnClient, parent = None, log = ""): + def __init__(self, text, command, pysvnClient, parent=None, log=""): """ Constructor @@ -79,12 +80,12 @@ mime = eventDict["mime_type"] == "application/octet-stream" and \ self.trUtf8(" (binary)") or "" msg = self.trUtf8("{0} {1}{2}\n")\ - .format(self.trUtf8(svnNotifyActionMap[eventDict["action"]]), - eventDict["path"], + .format(self.trUtf8(svnNotifyActionMap[eventDict["action"]]), + eventDict["path"], mime) if eventDict["action"] in \ - [pysvn.wc_notify_action.add, pysvn.wc_notify_action.commit_added, - pysvn.wc_notify_action.commit_deleted, pysvn.wc_notify_action.delete, + [pysvn.wc_notify_action.add, pysvn.wc_notify_action.commit_added, + pysvn.wc_notify_action.commit_deleted, pysvn.wc_notify_action.delete, pysvn.wc_notify_action.update_add, pysvn.wc_notify_action.update_delete]: self.__hasAddOrDelete = True if msg:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,18 +4,19 @@ # """ -Module implementing a dialog mixin class providing common callback methods for +Module implementing a dialog mixin class providing common callback methods for the pysvn client. """ from PyQt4.QtGui import QApplication, QDialog, QWidget, QCursor + class SvnDialogMixin(object): """ - Class implementing a dialog mixin providing common callback methods for + Class implementing a dialog mixin providing common callback methods for the pysvn client. """ - def __init__(self, log = ""): + def __init__(self, log=""): """ Constructor @@ -54,8 +55,8 @@ @param may_save flag indicating, that subversion is willing to save the answers returned (boolean) @return tuple of four values (retcode, username, password, save). - Retcode should be True, if username and password should be used - by subversion, username and password contain the relevant data + Retcode should be True, if username and password should be used + by subversion, username and password contain the relevant data as strings and save is a flag indicating, that username and password should be saved. """ @@ -102,16 +103,16 @@ """<tr><td>Valid until:</td><td>{4}</td></tr>""" """<tr><td>Issuer name:</td><td>{5}</td></tr>""" """</table>""")\ - .format(trust_dict["realm"], - trust_dict["hostname"], - trust_dict["finger_print"], - trust_dict["valid_from"], - trust_dict["valid_until"], + .format(trust_dict["realm"], + trust_dict["hostname"], + trust_dict["finger_print"], + trust_dict["valid_from"], + trust_dict["valid_until"], trust_dict["issuer_dname"]), - modal = True, parent = parent) - permButton = msgBox.addButton(self.trUtf8("&Permanent accept"), + modal=True, parent=parent) + permButton = msgBox.addButton(self.trUtf8("&Permanent accept"), E5MessageBox.AcceptRole) - tempButton = msgBox.addButton(self.trUtf8("&Temporary accept"), + tempButton = msgBox.addButton(self.trUtf8("&Temporary accept"), E5MessageBox.AcceptRole) msgBox.addButton(self.trUtf8("&Reject"), E5MessageBox.RejectRole) msgBox.exec_()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,11 +22,12 @@ import Utilities + class SvnDiffDialog(QWidget, SvnDialogMixin, Ui_SvnDiffDialog): """ Class implementing a dialog to show the output of the svn diff command. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -108,14 +109,14 @@ else: return " " - def start(self, fn, versions = None, urls = None, summary = False, pegRev = None): + def start(self, fn, versions=None, urls=None, summary=False, pegRev=None): """ Public slot to start the svn diff command. @param fn filename to be diffed (string) @param versions list of versions to be diffed (list of up to 2 integer or None) @keyparam urls list of repository URLs (list of 2 strings) - @keyparam summary flag indicating a summarizing diff + @keyparam summary flag indicating a summarizing diff (only valid for URL diffs) (boolean) @keyparam pegRev revision number the filename is valid (integer) """ @@ -195,9 +196,9 @@ url2 = "{0}/{1}{2}".format(urls[1], dname, name) if summary: diff_summary = self.client.diff_summarize( - url1, revision1 = rev1, - url_or_path2 = url2, revision2 = rev2, - recurse = recurse) + url1, revision1=rev1, + url_or_path2=url2, revision2=rev2, + recurse=recurse) diff_list = [] for diff_sum in diff_summary: diff_list.append("{0} {1}".format( @@ -205,18 +206,18 @@ diff_sum['path'])) diffText = os.linesep.join(diff_list) else: - diffText = self.client.diff(tmpdir, - url1, revision1 = rev1, - url_or_path2 = url2, revision2 = rev2, - recurse = recurse) + diffText = self.client.diff(tmpdir, + url1, revision1=rev1, + url_or_path2=url2, revision2=rev2, + recurse=recurse) else: if pegRev is not None: - diffText = self.client.diff_peg(tmpdir, name, - peg_revision = self.__getVersionArg(pegRev), - revision_start = rev1, revision_end = rev2, recurse = recurse) + diffText = self.client.diff_peg(tmpdir, name, + peg_revision=self.__getVersionArg(pegRev), + revision_start=rev1, revision_end=rev2, recurse=recurse) else: - diffText = self.client.diff(tmpdir, name, - revision1 = rev1, revision2 = rev2, recurse = recurse) + diffText = self.client.diff(tmpdir, name, + revision1=rev1, revision2=rev2, recurse=recurse) counter = 0 for line in diffText.splitlines(): self.__appendText("{0}{1}".format(line, os.linesep)) @@ -334,13 +335,13 @@ self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) try: - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write(self.contents.toPlainText()) f.close() except IOError as why:
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,12 +18,13 @@ from .SvnDialogMixin import SvnDialogMixin from VCS.Ui_RepositoryInfoDialog import Ui_VcsRepositoryInfoDialog + class SvnInfoDialog(QDialog, SvnDialogMixin, Ui_VcsRepositoryInfoDialog): """ - Class implementing a dialog to show repository related information + Class implementing a dialog to show repository related information for a file/directory. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -58,7 +59,7 @@ cwd = os.getcwd() os.chdir(projectPath) try: - entries = self.client.info2(fn, recurse = False) + entries = self.client.info2(fn, recurse=False) infoStr = "<table>" for path, info in entries: infoStr += self.trUtf8( @@ -171,4 +172,4 @@ @param msg error message to show (string) """ infoStr = "<p>{0}</p>".format(msg) - self.infoBrowser.setHtml(infoStr) \ No newline at end of file + self.infoBrowser.setHtml(infoStr)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,11 +24,12 @@ import UI.PixmapCache + class SvnLogBrowserDialog(QDialog, SvnDialogMixin, Ui_SvnLogBrowserDialog): """ Class implementing a dialog to browse the log history. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -64,9 +65,9 @@ self.__changesRole = Qt.UserRole + 1 self.flags = { - 'A' : self.trUtf8('Added'), - 'D' : self.trUtf8('Deleted'), - 'M' : self.trUtf8('Modified') + 'A': self.trUtf8('Added'), + 'D': self.trUtf8('Deleted'), + 'M': self.trUtf8('Modified') } self.diff = None @@ -104,7 +105,7 @@ """ Private method to resort the log tree. """ - self.logTree.sortItems(self.logTree.sortColumn(), + self.logTree.sortItems(self.logTree.sortColumn(), self.logTree.header().sortIndicatorOrder()) def __resizeColumnsFiles(self): @@ -119,9 +120,9 @@ Private method to resort the changed files tree. """ sortColumn = self.filesTree.sortColumn() - self.filesTree.sortItems(1, + self.filesTree.sortItems(1, self.filesTree.header().sortIndicatorOrder()) - self.filesTree.sortItems(sortColumn, + self.filesTree.sortItems(sortColumn, self.filesTree.header().sortIndicatorOrder()) def __generateLogItem(self, author, date, message, revision, changedPaths): @@ -133,7 +134,7 @@ @param message text of the log message (string) @param revision revision info (string or pysvn.opt_revision_kind) @param changedPaths list of pysvn dictionary like objects containing - info about the changed files/directories + info about the changed files/directories @return reference to the generated item (QTreeWidgetItem) """ if revision == "": @@ -147,8 +148,8 @@ else: dt = formatTime(date) - itm = QTreeWidgetItem(self.logTree, - [rev, author, dt," ".join(message.splitlines())] + itm = QTreeWidgetItem(self.logTree, + [rev, author, dt, " ".join(message.splitlines())] ) changes = [] @@ -162,10 +163,10 @@ else: copyRev = "{0:7d}".format(changedPath["copyfrom_revision"].number) change = { - "action" : changedPath["action"], - "path" : changedPath["path"], - "copyfrom_path" : copyPath, - "copyfrom_revision" : copyRev, + "action": changedPath["action"], + "path": changedPath["path"], + "copyfrom_path": copyPath, + "copyfrom_revision": copyRev, } changes.append(change) itm.setData(0, self.__messageRole, message) @@ -189,7 +190,7 @@ @param copyRev revision the file was copied from (None, string) @return reference to the generated item (QTreeWidgetItem) """ - itm = QTreeWidgetItem(self.filesTree, + itm = QTreeWidgetItem(self.filesTree, [self.flags[action], path, copyFrom, copyRev] ) @@ -197,7 +198,7 @@ return itm - def __getLogEntries(self, startRev = None): + def __getLogEntries(self, startRev=None): """ Private method to retrieve log entries from the repository. @@ -232,11 +233,11 @@ else: revstart = pysvn.Revision( pysvn.opt_revision_kind.number, nextRev) - allLogs = self.client.log(self.fname, - revision_start = revstart, - discover_changed_paths = True, - limit = flimit + 1, - strict_node_history = self.stopCheckBox.isChecked()) + allLogs = self.client.log(self.fname, + revision_start=revstart, + discover_changed_paths=True, + limit=flimit + 1, + strict_node_history=self.stopCheckBox.isChecked()) if len(allLogs) <= flimit or self._clientCancelCallback(): logs.extend(allLogs) break @@ -247,7 +248,7 @@ locker.unlock() for log in logs: - self.__generateLogItem(log["author"], log["date"], + self.__generateLogItem(log["author"], log["date"], log["message"], log["revision"], log['changed_paths']) dt = dateFromTime_t(log["date"]) if not self.__maxDate.isValid() and not self.__minDate.isValid(): @@ -319,7 +320,7 @@ self.diff = SvnDiffDialog(self.vcs) self.diff.show() QApplication.processEvents() - self.diff.start(self.filename, [rev1, rev2], pegRev = peg_rev) + self.diff.start(self.filename, [rev1, rev2], pegRev=peg_rev) def on_buttonBox_clicked(self, button): """ @@ -347,7 +348,7 @@ changes = current.data(0, self.__changesRole) if len(changes) > 0: for change in changes: - self.__generateFileItem(change["action"], change["path"], + self.__generateFileItem(change["action"], change["path"], change["copyfrom_path"], change["copyfrom_revision"]) self.__resizeColumnsFiles() self.__resortFiles() @@ -510,7 +511,7 @@ """ Private slot called, when the stop on copy/move checkbox is clicked """ - self.vcs.getPlugin().setPreferences("StopLogOnCopy", + self.vcs.getPlugin().setPreferences("StopLogOnCopy", int(self.stopCheckBox.isChecked())) self.nextButton.setEnabled(True) - self.limitSpinBox.setEnabled(True) \ No newline at end of file + self.limitSpinBox.setEnabled(True)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,14 +22,15 @@ import Utilities + class SvnLogDialog(QWidget, SvnDialogMixin, Ui_SvnLogDialog): """ Class implementing a dialog to show the output of the svn log command. - The dialog is nonmodal. Clicking a link in the upper text pane shows + The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the versions. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -51,9 +52,9 @@ self.contents.anchorClicked.connect(self.__sourceChanged) self.flags = { - 'A' : self.trUtf8('Added'), - 'D' : self.trUtf8('Deleted'), - 'M' : self.trUtf8('Modified') + 'A': self.trUtf8('Added'), + 'D': self.trUtf8('Deleted'), + 'M': self.trUtf8('Modified') } self.revString = self.trUtf8('revision') @@ -67,7 +68,7 @@ self.client.callback_ssl_server_trust_prompt = \ self._clientSslServerTrustPromptCallback - def start(self, fn, noEntries = 0): + def start(self, fn, noEntries=0): """ Public slot to start the svn log command. @@ -105,11 +106,11 @@ else: revstart = pysvn.Revision( pysvn.opt_revision_kind.number, nextRev) - allLogs = self.client.log(fname, - revision_start = revstart, - discover_changed_paths = verbose, - limit = flimit + 1, - strict_node_history = False) + allLogs = self.client.log(fname, + revision_start=revstart, + discover_changed_paths=verbose, + limit=flimit + 1, + strict_node_history=False) if len(allLogs) <= flimit or self._clientCancelCallback(): logs.extend(allLogs) break @@ -159,11 +160,11 @@ self.contents.insertHtml('<br />\n') for changeInfo in log['changed_paths']: dstr = '{0} {1}'\ - .format(self.flags[changeInfo["action"]], + .format(self.flags[changeInfo["action"]], changeInfo["path"]) if changeInfo["copyfrom_path"] is not None: dstr += self.trUtf8(" (copied from {0}, revision {1})")\ - .format(changeInfo["copyfrom_path"], + .format(changeInfo["copyfrom_path"], changeInfo["copyfrom_revision"].number) dstr += '<br />\n' self.contents.insertHtml(dstr) @@ -229,7 +230,7 @@ if self.diff is None: self.diff = SvnDiffDialog(self.vcs) self.diff.show() - self.diff.start(filename, [v1, v2], pegRev = self.__pegRev) + self.diff.start(filename, [v1, v2], pegRev=self.__pegRev) def __showError(self, msg): """ @@ -239,4 +240,4 @@ """ self.errorGroup.show() self.errors.insertPlainText(msg) - self.errors.ensureCursorVisible() \ No newline at end of file + self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_SvnLoginDialog import Ui_SvnLoginDialog + class SvnLoginDialog(QDialog, Ui_SvnLoginDialog): """ Class implementing the login dialog for pysvn. """ - def __init__(self, realm, username, may_save, parent = None): + def __init__(self, realm, username, may_save, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_SvnMergeDialog import Ui_SvnMergeDialog + class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): """ Class implementing a dialog to enter the data for a merge operation. """ - def __init__(self, mergelist1, mergelist2, targetlist, force = False, parent = None): + def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): """ Constructor @@ -79,7 +80,7 @@ @return tuple naming two tag names or two revisions, a target and a flag indicating a forced merge (string, string, string, boolean) """ - return (self.tag1Combo.currentText(), + return (self.tag1Combo.currentText(), self.tag2Combo.currentText(), self.targetCombo.currentText(), self.forceCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,11 +21,12 @@ import Utilities + class SvnNewProjectOptionsDialog(QDialog, Ui_SvnNewProjectOptionsDialog): """ Class implementing the Options Dialog for a new project from the repository. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -65,7 +66,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: - dlg = SvnRepoBrowserDialog(self.vcs, mode = "select", parent = self) + dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted: url = dlg.getSelectedUrl() @@ -130,8 +131,8 @@ if scheme == "file://" and url[0] not in ["\\", "/"]: url = "/{0}".format(url) vcsdatadict = { - "url" : '{0}{1}'.format(scheme, url), - "tag" : self.vcsTagEdit.text(), - "standardLayout" : self.layoutCheckBox.isChecked(), + "url": '{0}{1}'.format(scheme, url), + "tag": self.vcsTagEdit.text(), + "standardLayout": self.layoutCheckBox.isChecked(), } return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,12 +21,13 @@ import Utilities + class SvnOptionsDialog(QDialog, Ui_SvnOptionsDialog): """ Class implementing a dialog to enter options used to start a project in the repository. """ - def __init__(self, vcs, project, parent = None): + def __init__(self, vcs, project, parent=None): """ Constructor @@ -68,7 +69,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: - dlg = SvnRepoBrowserDialog(self.vcs, mode = "select", parent = self) + dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted: url = dlg.getSelectedUrl() @@ -105,8 +106,8 @@ if scheme == "file://" and url[0] not in ["\\", "/"]: url = "/{0}".format(url) vcsdatadict = { - "url" : '{0}{1}'.format(scheme, url), - "message" : self.vcsLogEdit.text(), - "standardLayout" : self.layoutCheckBox.isChecked(), + "url": '{0}{1}'.format(scheme, url), + "message": self.vcsLogEdit.text(), + "standardLayout": self.layoutCheckBox.isChecked(), } return vcsdatadict
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_SvnPropDelDialog import Ui_SvnPropDelDialog + class SvnPropDelDialog(QDialog, Ui_SvnPropDelDialog): """ Class implementing a dialog to enter the data for a new property. """ - def __init__(self, recursive, parent = None): + def __init__(self, recursive, parent=None): """ Constructor @@ -43,9 +44,9 @@ """ Public slot used to retrieve the data entered into the dialog. - @return tuple of two values giving the property name and a flag + @return tuple of two values giving the property name and a flag indicating, that this property should be applied recursively. (string, boolean) """ - return (self.propNameEdit.text(), + return (self.propNameEdit.text(), self.recurseCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .SvnDialogMixin import SvnDialogMixin from .Ui_SvnPropListDialog import Ui_SvnPropListDialog + class SvnPropListDialog(QWidget, SvnDialogMixin, Ui_SvnPropListDialog): """ Class implementing a dialog to show the output of the svn proplist command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -52,7 +53,7 @@ """ Private method to resort the tree. """ - self.propsList.sortItems(self.propsList.sortColumn(), + self.propsList.sortItems(self.propsList.sortColumn(), self.propsList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -72,7 +73,7 @@ """ QTreeWidgetItem(self.propsList, [path, propName, propValue]) - def start(self, fn, recursive = False): + def start(self, fn, recursive=False): """ Public slot to start the svn status command. @@ -94,7 +95,7 @@ os.chdir(dname) try: for name in fnames: - proplist = self.client.proplist(name, recurse = recursive) + proplist = self.client.proplist(name, recurse=recursive) counter = 0 for path, prop in proplist: for propName, propVal in list(prop.items()):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_SvnPropSetDialog import Ui_SvnPropSetDialog + class SvnPropSetDialog(QDialog, Ui_SvnPropSetDialog): """ Class implementing a dialog to enter the data for a new property. """ - def __init__(self, recursive, parent = None): + def __init__(self, recursive, parent=None): """ Constructor @@ -32,10 +33,10 @@ """ Public slot used to retrieve the data entered into the dialog. - @return tuple of three values giving the property name, the text - of the property and a flag indicating, that this property + @return tuple of three values giving the property name, the text + of the property and a flag indicating, that this property should be applied recursively. (string, string, boolean) """ - return (self.propNameEdit.text(), - self.propTextEdit.toPlainText(), + return (self.propNameEdit.text(), + self.propTextEdit.toPlainText(), self.recurseCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog + class SvnRelocateDialog(QDialog, Ui_SvnRelocateDialog): """ Class implementing a dialog to enter the data to relocate the workspace. """ - def __init__(self, currUrl, parent = None): + def __init__(self, currUrl, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,11 +21,12 @@ import UI.PixmapCache + class SvnRepoBrowserDialog(QDialog, SvnDialogMixin, Ui_SvnRepoBrowserDialog): """ Class implementing the subversion repository browser dialog. """ - def __init__(self, vcs, mode = "browse", parent = None): + def __init__(self, vcs, mode="browse", parent=None): """ Constructor @@ -71,7 +72,7 @@ """ Private method to resort the tree. """ - self.repoTree.sortItems(self.repoTree.sortColumn(), + self.repoTree.sortItems(self.repoTree.sortColumn(), self.repoTree.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -81,7 +82,7 @@ self.repoTree.header().resizeSections(QHeaderView.ResizeToContents) self.repoTree.header().setStretchLastSection(True) - def __generateItem(self, parent, repopath, revision, author, size, date, + def __generateItem(self, parent, repopath, revision, author, size, date, nodekind, url): """ Private method to generate a tree item in the repository tree. @@ -134,7 +135,7 @@ return itm - def __listRepo(self, url, parent = None): + def __listRepo(self, url, parent=None): """ Private method to perform the svn list command. @@ -152,7 +153,7 @@ try: try: - entries = self.client.list(url, recurse = False) + entries = self.client.list(url, recurse=False) firstTime = parent == self.repoTree for dirent, lock in entries: if (firstTime and dirent["path"] != url) or \ @@ -165,7 +166,7 @@ repoUrl = dirent["path"] if repoUrl != url: self.__ignoreExpand = True - itm = self.__generateItem(parent, "/", + itm = self.__generateItem(parent, "/", "", "", 0, "", pysvn.node_kind.dir, repoUrl) itm.setExpanded(True) parent = itm @@ -173,15 +174,15 @@ for element in dirent["repos_path"].split("/")[:-1]: if element: urlPart = "{0}/{1}".format(urlPart, element) - itm = self.__generateItem(parent, element, - "", "", 0, "", pysvn.node_kind.dir, + itm = self.__generateItem(parent, element, + "", "", 0, "", pysvn.node_kind.dir, urlPart) itm.setExpanded(True) parent = itm self.__ignoreExpand = False - itm = self.__generateItem(parent, dirent["repos_path"], - dirent["created_rev"], dirent["last_author"], - dirent["size"], dirent["time"], + itm = self.__generateItem(parent, dirent["repos_path"], + dirent["created_rev"], dirent["last_author"], + dirent["size"], dirent["time"], dirent["kind"], dirent["path"]) self.__resort() self.__resizeColumns() @@ -287,4 +288,4 @@ if len(items) == 1: return items[0].data(0, self.__urlRole) else: - return "" \ No newline at end of file + return ""
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,7 +17,7 @@ """ Class implementing a dialog to enter the revisions for the svn diff command. """ - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -26,12 +26,13 @@ import Preferences + class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog): """ Class implementing a dialog to show the output of the svn status command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -55,7 +56,7 @@ self.__lastColumn = self.statusList.columnCount() self.refreshButton = \ - self.buttonBox.addButton(self.trUtf8("Refresh"), + self.buttonBox.addButton(self.trUtf8("Refresh"), QDialogButtonBox.ActionRole) self.refreshButton.setToolTip( self.trUtf8("Press to refresh the status display")) @@ -117,43 +118,43 @@ self.__showContextMenu) self.modifiedIndicators = [ - self.trUtf8(svnStatusMap[pysvn.wc_status_kind.added]), - self.trUtf8(svnStatusMap[pysvn.wc_status_kind.deleted]), + self.trUtf8(svnStatusMap[pysvn.wc_status_kind.added]), + self.trUtf8(svnStatusMap[pysvn.wc_status_kind.deleted]), self.trUtf8(svnStatusMap[pysvn.wc_status_kind.modified]) ] self.missingIndicators = [ - self.trUtf8(svnStatusMap[pysvn.wc_status_kind.missing]), + self.trUtf8(svnStatusMap[pysvn.wc_status_kind.missing]), ] self.unversionedIndicators = [ - self.trUtf8(svnStatusMap[pysvn.wc_status_kind.unversioned]), + self.trUtf8(svnStatusMap[pysvn.wc_status_kind.unversioned]), ] self.lockedIndicators = [ - self.trUtf8('locked'), + self.trUtf8('locked'), ] self.stealBreakLockIndicators = [ - self.trUtf8('other lock'), - self.trUtf8('stolen lock'), - self.trUtf8('broken lock'), + self.trUtf8('other lock'), + self.trUtf8('stolen lock'), + self.trUtf8('broken lock'), ] self.unlockedIndicators = [ - self.trUtf8('not locked'), + self.trUtf8('not locked'), ] self.lockinfo = { - ' ' : self.trUtf8('not locked'), - 'L' : self.trUtf8('locked'), - 'O' : self.trUtf8('other lock'), - 'S' : self.trUtf8('stolen lock'), - 'B' : self.trUtf8('broken lock'), + ' ': self.trUtf8('not locked'), + 'L': self.trUtf8('locked'), + 'O': self.trUtf8('other lock'), + 'S': self.trUtf8('stolen lock'), + 'B': self.trUtf8('broken lock'), } self.yesno = [ - self.trUtf8('no'), - self.trUtf8('yes'), + self.trUtf8('no'), + self.trUtf8('yes'), ] self.client = self.vcs.getClient() @@ -171,7 +172,7 @@ """ Private method to resort the tree. """ - self.statusList.sortItems(self.statusList.sortColumn(), + self.statusList.sortItems(self.statusList.sortColumn(), self.statusList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -202,19 +203,19 @@ """ statusText = self.trUtf8(svnStatusMap[status]) itm = QTreeWidgetItem(self.statusList, [ - "", - changelist, - statusText, - self.trUtf8(svnStatusMap[propStatus]), - self.yesno[locked], - self.yesno[history], - self.yesno[switched], - self.lockinfo[lockinfo], - self.yesno[uptodate], - "{0:7}".format(str(revision)), - "{0:7}".format(str(change)), - author, - path, + "", + changelist, + statusText, + self.trUtf8(svnStatusMap[propStatus]), + self.yesno[locked], + self.yesno[history], + self.yesno[switched], + self.lockinfo[lockinfo], + self.yesno[uptodate], + "{0:7}".format(str(revision)), + "{0:7}".format(str(change)), + author, + path, ]) itm.setTextAlignment(1, Qt.AlignLeft) @@ -308,9 +309,9 @@ len(changelistsDict) == 0 # step 2: determine status of files - allFiles = self.client.status(name, recurse = recurse, + allFiles = self.client.status(name, recurse=recurse, get_all=verbose, ignore=True, - update = update) + update=update) counter = 0 for file in allFiles: uptodate = True @@ -343,7 +344,7 @@ hidePropertyStatusColumn = hidePropertyStatusColumn and \ file.prop_status in [ - pysvn.wc_status_kind.none, + pysvn.wc_status_kind.none, pysvn.wc_status_kind.normal ] hideLockColumns = hideLockColumns and \ @@ -355,8 +356,8 @@ not file.is_switched self.__generateItem( - changelist, - file.text_status, + changelist, + file.text_status, file.prop_status, file.is_locked, file.is_copied, @@ -377,7 +378,7 @@ if self._clientCancelCallback(): break except pysvn.ClientError as e: - self.__showError(e.args[0]+'\n') + self.__showError(e.args[0] + '\n') self.statusList.setColumnHidden(self.__propStatusColumn, hidePropertyStatusColumn) @@ -684,7 +685,7 @@ """ available/selected.""")) return - self.vcs.svnLock(names, parent = self) + self.vcs.svnLock(names, parent=self) self.on_refreshButton_clicked() def __unlock(self): @@ -700,7 +701,7 @@ """ available/selected.""")) return - self.vcs.svnUnlock(names, parent = self) + self.vcs.svnUnlock(names, parent=self) self.on_refreshButton_clicked() def __breakLock(self): @@ -717,7 +718,7 @@ """ available/selected.""")) return - self.vcs.svnUnlock(names, parent = self, breakIt = True) + self.vcs.svnUnlock(names, parent=self, breakIt=True) self.on_refreshButton_clicked() def __stealLock(self):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ import Preferences + class SvnStatusMonitorThread(VcsStatusMonitorThread): """ Class implementing the VCS status monitor thread class for Subversion. """ - def __init__(self, interval, project, vcs, parent = None): + def __init__(self, interval, project, vcs, parent=None): """ Constructor @@ -47,7 +48,7 @@ <li>" " path is back at normal</li> </ul> - @return tuple of flag indicating successful operation (boolean) and + @return tuple of flag indicating successful operation (boolean) and a status message in case of non successful operation (string) """ self.shouldUpdate = False @@ -62,10 +63,11 @@ cwd = os.getcwd() os.chdir(self.projectDir) try: - allFiles = client.status('.', recurse = True, get_all = True, - ignore = True, - update = \ - not Preferences.getVCS("MonitorLocalStatus")) + allFiles = client.status('.', + recurse=True, + get_all=True, + ignore=True, + update=not Preferences.getVCS("MonitorLocalStatus")) states = {} for file in allFiles: uptodate = True @@ -119,8 +121,8 @@ @param may_save flag indicating, that subversion is willing to save the answers returned (boolean) @return tuple of four values (retcode, username, password, save). - Retcode should be True, if username and password should be used - by subversion, username and password contain the relevant data + Retcode should be True, if username and password should be used + by subversion, username and password contain the relevant data as strings and save is a flag indicating, that username and password should be saved. Always returns (False, "", "", False). """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,17 +12,18 @@ from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog + class SvnSwitchDialog(QDialog, Ui_SvnSwitchDialog): """ Class implementing a dialog to enter the data for a switch operation. """ - def __init__(self, taglist, reposURL, standardLayout, parent = None): + def __init__(self, taglist, reposURL, standardLayout, parent=None): """ Constructor @param taglist list of previously entered tags (list of strings) @param reposURL repository path (string) or None - @param standardLayout flag indicating the layout of the + @param standardLayout flag indicating the layout of the repository (boolean) @param parent parent widget (QWidget) """ @@ -53,4 +54,3 @@ if not tag: tagType = 4 return (tag, tagType) -
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,11 +21,12 @@ from .SvnDialogMixin import SvnDialogMixin from .Ui_SvnTagBranchListDialog import Ui_SvnTagBranchListDialog + class SvnTagBranchListDialog(QDialog, SvnDialogMixin, Ui_SvnTagBranchListDialog): """ Class implementing a dialog to show a list of tags or branches. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -52,7 +53,7 @@ self.client.callback_ssl_server_trust_prompt = \ self._clientSslServerTrustPromptCallback - def start(self, path, tags = True): + def start(self, path, tags=True): """ Public slot to start the svn status command. @@ -119,13 +120,13 @@ cwd = os.getcwd() os.chdir(dname) try: - entries = self.client.list(path, recurse = False) + entries = self.client.list(path, recurse=False) for dirent, lock in entries: if dirent["path"] != path: name = dirent["path"].replace(path + '/', "") - self.__generateItem(dirent["created_rev"].number, - dirent["last_author"], - formatTime(dirent["time"]), + self.__generateItem(dirent["created_rev"].number, + dirent["last_author"], + formatTime(dirent["time"]), name) if self.vcs.otherData["standardLayout"]: self.tagsList.append(name) @@ -185,7 +186,7 @@ """ Private method to resort the tree. """ - self.tagList.sortItems(self.tagList.sortColumn(), + self.tagList.sortItems(self.tagList.sortColumn(), self.tagList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -204,7 +205,7 @@ @param date date of the tag (string) @param name name (path) of the tag (string) """ - itm = QTreeWidgetItem(self.tagList, + itm = QTreeWidgetItem(self.tagList, ["{0:6d}".format(revision), author, date, name]) itm.setTextAlignment(0, Qt.AlignRight) @@ -214,4 +215,4 @@ @return list of tags (list of strings) """ - return self.tagsList \ No newline at end of file + return self.tagsList
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,17 +12,18 @@ from .Ui_SvnTagDialog import Ui_SvnTagDialog + class SvnTagDialog(QDialog, Ui_SvnTagDialog): """ Class implementing a dialog to enter the data for a tagging operation. """ - def __init__(self, taglist, reposURL, standardLayout, parent = None): + def __init__(self, taglist, reposURL, standardLayout, parent=None): """ Constructor @param taglist list of previously entered tags (list of strings) @param reposURL repository path (string) or None - @param standardLayout flag indicating the layout of the + @param standardLayout flag indicating the layout of the repository (boolean) @param parent parent widget (QWidget) """
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog + class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog): """ Class implementing a dialog to enter the URLs for the svn diff command. """ - def __init__(self, vcs, tagsList, branchesList, path, parent = None): + def __init__(self, vcs, tagsList, branchesList, path, parent=None): """ Constructor @@ -87,7 +88,7 @@ def __changeLabelCombo(self, labelCombo, type_): """ - Private method used to change the label combo depending on the + Private method used to change the label combo depending on the selected type. @param labelCombo reference to the labelCombo object (QComboBox)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ import Utilities + def formatTime(seconds): """ Module function to return a formatted time string. @@ -24,6 +25,7 @@ .toTimeSpec(Qt.LocalTime)\ .toString("yyyy-MM-dd hh:mm:ss") + def dateFromTime_t(seconds): """ Module function to return the date. @@ -33,6 +35,7 @@ """ return QDateTime.fromTime_t(int(seconds)).toTimeSpec(Qt.LocalTime).date() + def getServersPath(): """ Public method to get the filename of the servers file. @@ -46,6 +49,7 @@ homedir = Utilities.getHomeDir() return os.path.join(homedir, ".subversion", "servers") + def getConfigPath(): """ Public method to get the filename of the config file.
--- a/Plugins/VcsPlugins/vcsPySvn/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -6,6 +6,6 @@ """ Package implementing the vcs interface to Subversion -It consists of the subversion class, the project helper classes and some +It consists of the subversion class, the project helper classes and some Subversion specific dialogs. This package is based upon the pysvn interface. """
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,7 +9,9 @@ import os import shutil -import urllib.request, urllib.parse, urllib.error +import urllib.request +import urllib.parse +import urllib.error import time from PyQt4.QtCore import * @@ -53,6 +55,7 @@ import Utilities + class Subversion(VersionControl): """ Class implementing the version control systems interface to Subversion. @@ -61,7 +64,7 @@ """ committed = pyqtSignal() - def __init__(self, plugin, parent = None, name = None): + def __init__(self, plugin, parent=None, name=None): """ Constructor @@ -71,18 +74,18 @@ """ VersionControl.__init__(self, parent, name) self.defaultOptions = { - 'global' : [''], - 'commit' : [''], - 'checkout' : [''], - 'update' : [''], - 'add' : [''], - 'remove' : [''], - 'diff' : [''], - 'log' : [''], - 'history' : [''], - 'status' : [''], - 'tag' : [''], - 'export' : [''] + 'global': [''], + 'commit': [''], + 'checkout': [''], + 'update': [''], + 'add': [''], + 'remove': [''], + 'diff': [''], + 'log': [''], + 'history': [''], + 'status': [''], + 'tag': [''], + 'export': [''] } self.interestingDataKeys = [ "standardLayout", @@ -101,7 +104,7 @@ self.showedBranches = False self.tagTypeList = [ - 'tags', + 'tags', 'branches' ] @@ -189,7 +192,7 @@ self.versionStr = ".".join([str(v) for v in pysvn.svn_version[:-1]]) return True, "" - def vcsInit(self, vcsDir, noDialog = False): + def vcsInit(self, vcsDir, noDialog=False): """ Public method used to initialize the subversion repository. @@ -253,10 +256,10 @@ project.closeProject() return shutil.rmtree(tmpProjectDir, True) - project.closeProject(noSave = True) + project.closeProject(noSave=True) project.openProject(pfn) - def vcsImport(self, vcsDataDict, projectDir, noDialog = False): + def vcsImport(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to import the project into the Subversion repository. @@ -292,7 +295,7 @@ shutil.copytree(projectDir, os.path.join(tmpDir, project)) except OSError as e: if os.path.isdir(tmpDir): - shutil.rmtree(tmpDir, True) + shutil.rmtree(tmpDir, True) return False, False locker = QMutexLocker(self.vcsExecutionMutex) @@ -306,12 +309,12 @@ dlg = \ SvnDialog(self.trUtf8('Importing project into Subversion repository'), "import{0} --message {1} .".format( - (not recurse) and " --non-recursive" or "", + (not recurse) and " --non-recursive" or "", msg), client) QApplication.processEvents() try: - rev = client.import_(".", url, msg, recurse, ignore = True) + rev = client.import_(".", url, msg, recurse, ignore=True) status = True except pysvn.ClientError as e: status = False @@ -329,7 +332,7 @@ shutil.rmtree(tmpDir, True) return status, False - def vcsCheckout(self, vcsDataDict, projectDir, noDialog = False): + def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to check the project out of the Subversion repository. @@ -377,7 +380,7 @@ dlg = \ SvnDialog(self.trUtf8('Checking project out of Subversion repository'), "checkout{0} {1} {2}".format( - (not recurse) and " --non-recursive" or "", + (not recurse) and " --non-recursive" or "", url, projectDir), client) QApplication.processEvents() @@ -444,7 +447,7 @@ QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: - client.export(url, projectDir, force = True, recurse = recurse) + client.export(url, projectDir, force=True, recurse=recurse) status = True except pysvn.ClientError as e: status = False @@ -454,7 +457,7 @@ dlg.exec_() return status - def vcsCommit(self, name, message, noDialog = False): + def vcsCommit(self, name, message, noDialog=False): """ Public method used to make the change of a file/directory permanent in the Subversion repository. @@ -524,21 +527,21 @@ "commit{0}{1}{2}{3} --message {4} {5}".format( (not recurse) and " --non-recursive" or "", keeplocks and " --keep-locks" or "", - keepChangelists and " --keep-changelists" or "", + keepChangelists and " --keep-changelists" or "", changelists and \ - " --changelist ".join([""] + changelists) or "", + " --changelist ".join([""] + changelists) or "", msg, " ".join(fnames)), client) QApplication.processEvents() try: if changelists: - rev = client.checkin(fnames, msg, - recurse = recurse, keep_locks = keeplocks, - keep_changelist = keepChangelists, - changelists = changelists) + rev = client.checkin(fnames, msg, + recurse=recurse, keep_locks=keeplocks, + keep_changelist=keepChangelists, + changelists=changelists) else: - rev = client.checkin(fnames, msg, - recurse = recurse, keep_locks = keeplocks) + rev = client.checkin(fnames, msg, + recurse=recurse, keep_locks=keeplocks) except pysvn.ClientError as e: rev = None if not noDialog: @@ -553,7 +556,7 @@ self.committed.emit() self.checkVCSStatus() - def vcsUpdate(self, name, noDialog = False): + def vcsUpdate(self, name, noDialog=False): """ Public method used to update a file/directory with the Subversion repository. @@ -597,7 +600,7 @@ self.checkVCSStatus() return res - def vcsAdd(self, name, isDir = False, noDialog = False): + def vcsAdd(self, name, isDir=False, noDialog=False): """ Public method used to add a file/directory to the Subversion repository. @@ -659,7 +662,7 @@ client) QApplication.processEvents() try: - client.add(names, recurse = recurse, force = force, ignore = not noignore) + client.add(names, recurse=recurse, force=force, ignore=not noignore) except pysvn.ClientError as e: if not noDialog: dlg.showError(e.args[0]) @@ -669,7 +672,7 @@ dlg.exec_() os.chdir(cwd) - def vcsAddBinary(self, name, isDir = False): + def vcsAddBinary(self, name, isDir=False): """ Public method used to add a file/directory in binary mode to the Subversion repository. @@ -691,7 +694,7 @@ for n in path: d = os.path.split(n)[0] while not os.path.exists(os.path.join(d, self.adminDir)): - # add directories recursively, + # add directories recursively, # if they aren't in the repository already if d in tree: break @@ -732,7 +735,7 @@ client) QApplication.processEvents() try: - client.add(names, recurse = recurse, force = force, ignore = ignore) + client.add(names, recurse=recurse, force=force, ignore=ignore) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() @@ -740,7 +743,7 @@ dlg.exec_() os.chdir(cwd) - def vcsRemove(self, name, project = False, noDialog = False): + def vcsRemove(self, name, project=False, noDialog=False): """ Public method used to remove a file/directory from the Subversion repository. @@ -767,7 +770,7 @@ QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: - client.remove(name, force = force) + client.remove(name, force=force) res = True except pysvn.ClientError as e: res = False @@ -780,7 +783,7 @@ return res - def vcsMove(self, name, project, target = None, noDialog = False): + def vcsMove(self, name, project, target=None, noDialog=False): """ Public method used to move a file/directory. @@ -824,13 +827,13 @@ self.trUtf8('Moving {0}').format(name), "move{0}{1} {2} {3}".format( force and " --force" or "", - log and (" --message {0}".format(log)) or "", + log and (" --message {0}".format(log)) or "", name, target), - client, log = log) + client, log=log) QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: - client.move(name, target, force = force) + client.move(name, target, force=force) res = True except pysvn.ClientError as e: res = False @@ -855,7 +858,7 @@ def vcsLog(self, name): """ - Public method used to view the log of a file/directory from the + Public method used to view the log of a file/directory from the Subversion repository. @param name file/directory name to show the log of (string) @@ -867,11 +870,11 @@ def vcsDiff(self, name): """ - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. @param name file/directory name to be diffed (string) @@ -883,7 +886,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -896,7 +899,7 @@ def vcsStatus(self, name): """ - Public method used to view the status of files/directories in the + Public method used to view the status of files/directories in the Subversion repository. @param name file/directory name(s) to show the status of @@ -909,7 +912,7 @@ def vcsTag(self, name): """ - Public method used to set the tag of a file/directory in the + Public method used to set the tag of a file/directory in the Subversion repository. @param name file/directory name to be tagged (string) @@ -966,7 +969,7 @@ SvnDialog( self.trUtf8('Tagging {0} in the Subversion repository').format(name), "copy --message {0} {1} {2}".format(log, reposURL, url), - client, log = log) + client, log=log) QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: @@ -980,7 +983,7 @@ SvnDialog( self.trUtf8('Tagging {0} in the Subversion repository').format(name), "remove --message {0} {1}".format(log, url), - client, log = log) + client, log=log) QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: @@ -1100,7 +1103,7 @@ dname, fname = self.splitPath(name) opts = self.options['global'] - dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], + dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], "--force" in opts) if dlg.exec_() == QDialog.Accepted: urlrev1, urlrev2, target, force = dlg.getParameters() @@ -1181,14 +1184,14 @@ "merge{0}{1} {2} {3} {4}".format( (not recurse) and " --non-recursive" or "", force and " --force" or "", - "{0}{1}".format(url1, rev1 and ("@"+rev1) or ""), - "{0}{1}".format(url2, rev2 and ("@"+rev2) or ""), + "{0}{1}".format(url1, rev1 and ("@" + rev1) or ""), + "{0}{1}".format(url2, rev2 and ("@" + rev2) or ""), fname), client) QApplication.processEvents() try: - client.merge(url1, revision1, url2, revision2, fname, - recurse = recurse, force = force) + client.merge(url1, revision1, url2, revision2, fname, + recurse=recurse, force=force) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() @@ -1212,14 +1215,14 @@ return self.canBeAdded name = os.path.normcase(name) - states = { name : 0 } + states = {name: 0} states = self.vcsAllRegisteredStates(states, dname, False) if states[name] == self.canBeCommitted: return self.canBeCommitted else: return self.canBeAdded - def vcsAllRegisteredStates(self, names, dname, shortcut = True): + def vcsAllRegisteredStates(self, names, dname, shortcut=True): """ Public method used to get the registered states of a number of files in the vcs. @@ -1230,7 +1233,7 @@ @param names dictionary with all filenames to be checked as keys @param dname directory to check in (string) @param shortcut flag indicating a shortcut should be taken (boolean) - @return the received dictionary completed with a combination of + @return the received dictionary completed with a combination of canBeCommited and canBeAdded or None in order to signal an error """ if not os.path.isdir(os.path.join(dname, self.adminDir)): @@ -1258,8 +1261,8 @@ try: locker = QMutexLocker(self.vcsExecutionMutex) - allFiles = client.status(dname, recurse = True, get_all = True, - ignore = True, update = False) + allFiles = client.status(dname, recurse=True, get_all=True, + ignore=True, update=False) locker.unlock() for file in allFiles: name = os.path.normcase(file.path) @@ -1337,7 +1340,7 @@ if res: dia.exec_() - def vcsOptionsDialog(self, project, archive, editable = False, parent = None): + def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ Public method to get a dialog to enter repository info. @@ -1348,7 +1351,7 @@ """ return SvnOptionsDialog(self, project, parent) - def vcsNewProjectOptionsDialog(self, parent = None): + def vcsNewProjectOptionsDialog(self, parent=None): """ Public method to get a dialog to enter repository info for getting a new project. @@ -1370,7 +1373,7 @@ if hasattr(pysvn, 'svn_api_version'): apiVersion = "{0} {1}".format( - ".".join([str(v) for v in pysvn.svn_api_version[:3]]), + ".".join([str(v) for v in pysvn.svn_api_version[:3]]), pysvn.svn_api_version[3]) else: apiVersion = QApplication.translate('subversion', "unknown") @@ -1388,14 +1391,14 @@ """<tr><td><b>Last author</b></td><td>{8}</td></tr>""" """</table>""" )\ - .format(".".join([str(v) for v in pysvn.version]), - ".".join([str(v) for v in pysvn.svn_version[:3]]), - apiVersion, - entry.url, - entry.revision.number, - entry.commit_revision.number, - time.strftime("%Y-%m-%d", time.localtime(entry.commit_time)), - time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)), + .format(".".join([str(v) for v in pysvn.version]), + ".".join([str(v) for v in pysvn.svn_version[:3]]), + apiVersion, + entry.url, + entry.revision.number, + entry.commit_revision.number, + time.strftime("%Y-%m-%d", time.localtime(entry.commit_time)), + time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)), entry.commit_author ) @@ -1441,13 +1444,13 @@ dlg = \ SvnDialog(self.trUtf8('Resolving conficts'), "resolved{0} {1}".format( - (not recurse) and " --non-recursive" or "", + (not recurse) and " --non-recursive" or "", " ".join(fnames)), client) QApplication.processEvents() try: for name in fnames: - client.resolved(name, recurse = recurse) + client.resolved(name, recurse=recurse) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() @@ -1481,9 +1484,9 @@ SvnDialog( self.trUtf8('Copying {0}').format(name), "copy{0} {1} {2}".format( - log and (" --message {0}".format(log)) or "", + log and (" --message {0}".format(log)) or "", name, target), - client, log = log) + client, log=log) QApplication.processEvents() locker = QMutexLocker(self.vcsExecutionMutex) try: @@ -1504,7 +1507,7 @@ project.appendFile(target) return res - def svnListProps(self, name, recursive = False): + def svnListProps(self, name, recursive=False): """ Public method used to list the properties of a file/directory. @@ -1516,7 +1519,7 @@ QApplication.processEvents() self.propList.start(name, recursive) - def svnSetProp(self, name, recursive = False): + def svnSetProp(self, name, recursive=False): """ Public method used to add a property to a file/directory. @@ -1556,8 +1559,8 @@ QApplication.processEvents() try: for name in fnames: - client.propset(propName, propValue, name, - recurse = recurse, skip_checks = skipchecks) + client.propset(propName, propValue, name, + recurse=recurse, skip_checks=skipchecks) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() @@ -1566,7 +1569,7 @@ dlg.exec_() os.chdir(cwd) - def svnDelProp(self, name, recursive = False): + def svnDelProp(self, name, recursive=False): """ Public method used to delete a property of a file/directory. @@ -1606,8 +1609,8 @@ QApplication.processEvents() try: for name in fnames: - client.propdel(propName, name, - recurse = recurse, skip_checks = skipchecks) + client.propdel(propName, name, + recurse=recurse, skip_checks=skipchecks) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() @@ -1616,7 +1619,7 @@ dlg.exec_() os.chdir(cwd) - def svnListTagBranch(self, path, tags = True): + def svnListTagBranch(self, path, tags=True): """ Public method used to list the available tags or branches. @@ -1653,11 +1656,11 @@ def svnExtendedDiff(self, name): """ - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. This method gives the chance to enter the revisions to be compared. @@ -1671,7 +1674,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -1691,7 +1694,7 @@ repository URLs. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. This method gives the chance to enter the revisions to be compared. @@ -1705,7 +1708,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -1720,11 +1723,11 @@ self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() - self.diff.start(name, urls = urls, summary = summary) + self.diff.start(name, urls=urls, summary=summary) def svnLogLimited(self, name): """ - Public method used to view the (limited) log of a file/directory from the + Public method used to view the (limited) log of a file/directory from the Subversion repository. @param name file/directory name to show the log of (string) @@ -1742,7 +1745,7 @@ def svnLogBrowser(self, path): """ - Public method used to browse the log of a file/directory from the + Public method used to browse the log of a file/directory from the Subversion repository. @param path file/directory name to show the log of (string) @@ -1786,10 +1789,10 @@ stealIt and " --force" or "", comment and (" --message {0}".format(comment)) or "", " ".join(fnames)), - client, parent = parent) + client, parent=parent) QApplication.processEvents() try: - client.lock(fnames, comment, force = stealIt) + client.lock(fnames, comment, force=stealIt) except pysvn.ClientError as e: dlg.showError(e.args[0]) except AttributeError as e: @@ -1823,10 +1826,10 @@ "unlock{0} {1}".format( breakIt and " --force" or "", " ".join(fnames)), - client, parent = parent) + client, parent=parent) QApplication.processEvents() try: - client.unlock(fnames, force = breakIt) + client.unlock(fnames, force=breakIt) except pysvn.ClientError as e: dlg.showError(e.args[0]) except AttributeError as e: @@ -1870,14 +1873,14 @@ if inside: client.switch(projectPath, newUrl) else: - client.relocate(currUrl, newUrl, projectPath, recurse = True) + client.relocate(currUrl, newUrl, projectPath, recurse=True) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() dlg.finish() dlg.exec_() - def svnRepoBrowser(self, projectPath = None): + def svnRepoBrowser(self, projectPath=None): """ Public method to open the repository browser. @@ -1956,7 +1959,7 @@ locker = QMutexLocker(self.vcsExecutionMutex) try: for name in names: - client.add_to_changelist(name, clname, depth = pysvn.depth.infinity) + client.add_to_changelist(name, clname, depth=pysvn.depth.infinity) except pysvn.ClientError as e: dlg.showError(e.args[0]) locker.unlock() @@ -1979,7 +1982,7 @@ if len(url) == 3: scheme = url[0] host = url[1] - port, path = url[2].split("/",1) + port, path = url[2].split("/", 1) return "{0}:{1}:{2}/{3}".format(scheme, host, port, urllib.parse.quote(path)) else: scheme = url[0] @@ -2010,7 +2013,7 @@ ## Methods to get the helper objects are below. ############################################################################ - def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser = False): + def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): """ Public method to instanciate a helper object for the different project browsers. @@ -2045,4 +2048,4 @@ @param interval check interval for the monitor thread in seconds (integer) @return reference to the monitor thread (QThread) """ - return SvnStatusMonitorThread(interval, project, self) \ No newline at end of file + return SvnStatusMonitorThread(interval, project, self)
--- a/Plugins/VcsPlugins/vcsSubversion/Config.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/Config.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,9 +9,9 @@ # Available protocols fpr the repository URL ConfigSvnProtocols = [ - 'file://', - 'http://', - 'https://', - 'svn://', - 'svn+ssh://', + 'file://', + 'http://', + 'https://', + 'svn://', + 'svn+ssh://', ]
--- a/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_SubversionPage import Ui_SubversionPage + class SubversionPage(ConfigurationPageBase, Ui_SubversionPage): """ Class implementing the Subversion configuration page. @@ -57,4 +58,4 @@ """ serversFile = self.__plugin.getServersPath() editor = MiniEditor(serversFile, "Properties", self) - editor.show() \ No newline at end of file + editor.show()
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,12 +20,13 @@ import UI.PixmapCache + class SvnProjectBrowserHelper(VcsProjectBrowserHelper): """ Class implementing the VCS project browser helper for subversion. """ def __init__(self, vcsObject, browserObject, projectObject, isTranslationsBrowser, - parent = None, name = None): + parent=None, name=None): """ Constructor @@ -42,9 +43,9 @@ def showContextMenu(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. @param menu reference to the menu to be shown @@ -77,9 +78,9 @@ def showContextMenuMulti(self, menu, standardItems): """ - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. @param menu reference to the menu to be shown @@ -118,9 +119,9 @@ def showContextMenuDir(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -144,9 +145,9 @@ def showContextMenuDirMulti(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -197,7 +198,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -208,21 +209,21 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('Add to repository'), + self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddMenuActions.append(act) if 1 in self.browser.specialMenuEntries: self.vcsMenuAddTree = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('Add tree to repository'), + self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMenuActions.append(self.vcsMenuAddTree) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMenuActions.append(act) menu.addSeparator() @@ -232,10 +233,10 @@ self.vcsMenuActions.append(act) if self.vcs.versionStr >= '1.5.0': menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -258,14 +259,14 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) - self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), + self.blameAct = menu.addAction(self.trUtf8('Show annotated file'), self.__SVNBlame) self.vcsMenuActions.append(self.blameAct) menu.addSeparator() @@ -316,7 +317,7 @@ def _addVCSMenuMulti(self, mainMenu): """ - Protected method used to add the VCS menu for multi selection to all + Protected method used to add the VCS menu for multi selection to all project browsers. @param mainMenu reference to the menu to be amended @@ -328,7 +329,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -339,7 +340,7 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -352,15 +353,15 @@ self.trUtf8('Add tree to repository'), self._VCSAddTree) self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsMultiMenuActions.append(act) if self.vcs.versionStr >= '1.5.0': menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -372,11 +373,11 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -432,7 +433,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -470,7 +471,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -481,7 +482,7 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -489,7 +490,7 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -499,10 +500,10 @@ self.vcsDirMenuActions.append(act) if self.vcs.versionStr >= '1.5.0': menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -525,11 +526,11 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -580,7 +581,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), self.vcs.vcsName(), self._VCSInfoDisplay) font = act.font() font.setBold(True) @@ -591,7 +592,7 @@ self.trUtf8('Update from repository'), self._VCSUpdate) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), - self.trUtf8('Commit changes to repository...'), + self.trUtf8('Commit changes to repository...'), self._VCSCommit) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -599,15 +600,15 @@ self.trUtf8('Add to repository'), self._VCSAdd) self.vcsAddDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), - self.trUtf8('Remove from repository (and disk)'), + self.trUtf8('Remove from repository (and disk)'), self._VCSRemove) self.vcsDirMultiMenuActions.append(act) if self.vcs.versionStr >= '1.5.0': menu.addSeparator() - act = menu.addAction(self.trUtf8("Add to Changelist"), + act = menu.addAction(self.trUtf8("Add to Changelist"), self.__SVNAddToChangelist) self.vcsMenuActions.append(act) - act = menu.addAction(self.trUtf8("Remove from Changelist"), + act = menu.addAction(self.trUtf8("Remove from Changelist"), self.__SVNRemoveFromChangelist) self.vcsMenuActions.append(act) menu.addSeparator() @@ -619,11 +620,11 @@ self.trUtf8('Show difference'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (extended)'), + self.trUtf8('Show difference (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), - self.trUtf8('Show difference (URLs)'), + self.trUtf8('Show difference (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -834,7 +835,7 @@ names.append(itm.fileName()) except AttributeError: names.append(itm.dirName()) - self.vcs.svnUnlock(names, breakIt = True) + self.vcs.svnUnlock(names, breakIt=True) def __SVNStealLock(self): """ @@ -846,7 +847,7 @@ names.append(itm.fileName()) except AttributeError: names.append(itm.dirName()) - self.vcs.svnLock(names, stealIt = True) + self.vcs.svnLock(names, stealIt=True) def __SVNConfigure(self): """
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import UI.PixmapCache + class SvnProjectHelper(VcsProjectHelper): """ Class implementing the VCS project helper for Subversion. """ - def __init__(self, vcsObject, projectObject, parent = None, name = None): + def __init__(self, vcsObject, projectObject, parent=None, name=None): """ Constructor @@ -218,7 +219,7 @@ self.vcsStatusAct.triggered[()].connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) - self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), + self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), UI.PixmapCache.getIcon("vcsTag.png"), self.trUtf8('&Tag in repository...'), 0, 0, self, 'subversion_tag') @@ -232,7 +233,7 @@ self.vcsTagAct.triggered[()].connect(self._vcsTag) self.actions.append(self.vcsTagAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), + self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), UI.PixmapCache.getIcon("vcsExport.png"), self.trUtf8('&Export from repository...'), 0, 0, self, 'subversion_export') @@ -247,7 +248,7 @@ self.actions.append(self.vcsExportAct) self.vcsPropsAct = E5Action(self.trUtf8('Command options'), - self.trUtf8('Command &options...'),0,0,self, + self.trUtf8('Command &options...'), 0, 0, self, 'subversion_options') self.vcsPropsAct.setStatusTip(self.trUtf8('Show the VCS command options')) self.vcsPropsAct.setWhatsThis(self.trUtf8( @@ -338,7 +339,7 @@ self.vcsCommandAct.triggered[()].connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) - self.svnTagListAct = E5Action(self.trUtf8('List tags'), + self.svnTagListAct = E5Action(self.trUtf8('List tags'), self.trUtf8('List tags...'), 0, 0, self, 'subversion_list_tags') self.svnTagListAct.setStatusTip(self.trUtf8( @@ -351,7 +352,7 @@ self.svnTagListAct.triggered[()].connect(self.__svnTagList) self.actions.append(self.svnTagListAct) - self.svnBranchListAct = E5Action(self.trUtf8('List branches'), + self.svnBranchListAct = E5Action(self.trUtf8('List branches'), self.trUtf8('List branches...'), 0, 0, self, 'subversion_list_branches') self.svnBranchListAct.setStatusTip(self.trUtf8( @@ -364,7 +365,7 @@ self.svnBranchListAct.triggered[()].connect(self.__svnBranchList) self.actions.append(self.svnBranchListAct) - self.svnListAct = E5Action(self.trUtf8('List repository contents'), + self.svnListAct = E5Action(self.trUtf8('List repository contents'), self.trUtf8('List repository contents...'), 0, 0, self, 'subversion_contents') self.svnListAct.setStatusTip(self.trUtf8( @@ -467,7 +468,7 @@ act = menu.addAction( UI.PixmapCache.getIcon( - os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), + os.path.join("VcsPlugins", "vcsSubversion", "icons", "subversion.png")), self.vcs.vcsName(), self._vcsInfoDisplay) font = act.font() font.setBold(True) @@ -591,10 +592,10 @@ """ Private slot to open the repository browser. """ - self.vcs.svnRepoBrowser(projectPath = self.project.ppath) + self.vcs.svnRepoBrowser(projectPath=self.project.ppath) def __svnConfigure(self): """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("zzz_subversionPage")
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Preferences import Utilities + class SvnBlameDialog(QDialog, Ui_SvnBlameDialog): """ Class implementing a dialog to show the output of the svn blame command. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -85,7 +86,6 @@ self.vcs.addArguments(args, self.vcs.options['global']) args.append(fname) - self.process.setWorkingDirectory(dname) self.process.start('svn', args) @@ -156,7 +156,7 @@ @param author author of the change (string) @param text line of text from the annotated file (string) """ - itm = QTreeWidgetItem(self.blameList, + itm = QTreeWidgetItem(self.blameList, [revision, author, "{0:d}".format(self.lineno), text]) self.lineno += 1 itm.setTextAlignment(0, Qt.AlignRight) @@ -190,8 +190,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -244,4 +244,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) \ No newline at end of file + QDialog.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ import Utilities + class SvnCommandDialog(QDialog, Ui_SvnCommandDialog): """ Class implementing the Subversion command dialog. @@ -25,7 +26,7 @@ arbitrary subversion command. It asks the user to enter the commandline parameters and the working directory. """ - def __init__(self, argvList, wdList, ppath, parent = None): + def __init__(self, argvList, wdList, ppath, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class SvnCommitDialog(QWidget, Ui_SvnCommitDialog): """ Class implementing a dialog to enter the commit message. @@ -24,7 +25,7 @@ accepted = pyqtSignal() rejected = pyqtSignal() - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -63,7 +64,7 @@ no = int(Preferences.Prefs.settings\ .value('Subversion/CommitMessages', 20)) del self.recentCommitMessages[no:] - Preferences.Prefs.settings.setValue('Subversion/Commits', + Preferences.Prefs.settings.setValue('Subversion/Commits', self.recentCommitMessages) return msg
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .Ui_SvnCopyDialog import Ui_SvnCopyDialog + class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): """ Class implementing a dialog to enter the data for a copy operation. """ - def __init__(self, source, parent = None, move = False, force = False): + def __init__(self, source, parent=None, move=False, force=False): """ Constructor @@ -59,7 +60,7 @@ @pyqtSlot() def on_dirButton_clicked(self): """ - Private slot to handle the button press for selecting the target via a + Private slot to handle the button press for selecting the target via a selection dialog. """ if os.path.isdir(self.source):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences + class SvnDialog(QDialog, Ui_SvnDialog): """ Class implementing a dialog starting a process and showing its output. @@ -26,7 +27,7 @@ shows the output of the process. The dialog is modal, which causes a synchronized execution of the process. """ - def __init__(self, text, parent = None): + def __init__(self, text, parent=None): """ Constructor @@ -89,7 +90,7 @@ self.normal = (exitStatus == QProcess.NormalExit) and (exitCode == 0) self.__finish() - def startProcess(self, args, workingDir = None): + def startProcess(self, args, workingDir=None): """ Public slot used to start the process. @@ -149,14 +150,14 @@ def __readStdout(self): """ - Private slot to handle the readyReadStdout signal. + Private slot to handle the readyReadStdout signal. It reads the output of the process, formats it and inserts it into the contents pane. """ if self.proc is not None: - s = str(self.proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + s = str(self.proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') self.resultbox.insertPlainText(s) self.resultbox.ensureCursorVisible() @@ -176,8 +177,8 @@ """ if self.proc is not None: self.errorGroup.show() - s = str(self.proc.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.proc.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import Utilities import Preferences + class SvnDiffDialog(QWidget, Ui_SvnDiffDialog): """ Class implementing a dialog to show the output of the svn diff command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -83,14 +84,14 @@ else: return str(version) - def start(self, fn, versions = None, urls = None, summary = False): + def start(self, fn, versions=None, urls=None, summary=False): """ Public slot to start the svn diff command. @param fn filename to be diffed (string) @param versions list of versions to be diffed (list of up to 2 strings or None) @keyparam urls list of repository URLs (list of 2 strings) - @keyparam summary flag indicating a summarizing diff + @keyparam summary flag indicating a summarizing diff (only valid for URL diffs) (boolean) """ self.errorGroup.hide() @@ -204,7 +205,7 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process, formats it and inserts it into the contents pane. @@ -212,8 +213,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if self.summaryPath: line = line.replace(self.summaryPath + '/', '') @@ -238,8 +239,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -294,13 +295,13 @@ self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) try: - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write(self.contents.toPlainText()) f.close() except IOError as why:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,11 +22,12 @@ import Preferences + class SvnLogBrowserDialog(QDialog, Ui_SvnLogBrowserDialog): """ Class implementing a dialog to browse the log history. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -82,9 +83,9 @@ # three blanks followed by A or D or M followed by path self.flags = { - 'A' : self.trUtf8('Added'), - 'D' : self.trUtf8('Deleted'), - 'M' : self.trUtf8('Modified'), + 'A': self.trUtf8('Added'), + 'D': self.trUtf8('Deleted'), + 'M': self.trUtf8('Modified'), } self.buf = [] # buffer for stdout @@ -117,7 +118,7 @@ """ Private method to resort the log tree. """ - self.logTree.sortItems(self.logTree.sortColumn(), + self.logTree.sortItems(self.logTree.sortColumn(), self.logTree.header().sortIndicatorOrder()) def __resizeColumnsFiles(self): @@ -132,9 +133,9 @@ Private method to resort the changed files tree. """ sortColumn = self.filesTree.sortColumn() - self.filesTree.sortItems(1, + self.filesTree.sortItems(1, self.filesTree.header().sortIndicatorOrder()) - self.filesTree.sortItems(sortColumn, + self.filesTree.sortItems(sortColumn, self.filesTree.header().sortIndicatorOrder()) def __generateLogItem(self, author, date, message, revision, changedPaths): @@ -146,7 +147,7 @@ @param message text of the log message (list of strings) @param revision revision info (string) @param changedPaths list of dictionary objects containing - info about the changed files/directories + info about the changed files/directories @return reference to the generated item (QTreeWidgetItem) """ msg = [] @@ -154,10 +155,10 @@ msg.append(line.strip()) itm = QTreeWidgetItem(self.logTree, [ - "{0:7}".format(revision), - author, - date, - " ".join(msg), + "{0:7}".format(revision), + author, + date, + " ".join(msg), ]) itm.setData(0, self.__messageRole, message) @@ -187,17 +188,17 @@ @return reference to the generated item (QTreeWidgetItem) """ itm = QTreeWidgetItem(self.filesTree, [ - self.flags[action], - path, - copyFrom, - copyRev, + self.flags[action], + path, + copyFrom, + copyRev, ]) itm.setTextAlignment(3, Qt.AlignRight) return itm - def __getLogEntries(self, startRev = None): + def __getLogEntries(self, startRev=None): """ Private method to retrieve log entries from the repository. @@ -299,42 +300,42 @@ ioEncoding = Preferences.getSystem("IOEncoding") noEntries = 0 - log = {"message" : []} + log = {"message": []} changedPaths = [] for s in self.buf: if self.rx_rev1.exactMatch(s): log["revision"] = self.rx_rev.cap(1) - log["author"] = self.rx_rev.cap(2) - log["date"] = self.rx_rev.cap(3) + log["author"] = self.rx_rev.cap(2) + log["date"] = self.rx_rev.cap(3) # number of lines is ignored elif self.rx_rev2.exactMatch(s): log["revision"] = self.rx_rev2.cap(1) - log["author"] = self.rx_rev2.cap(2) - log["date"] = self.rx_rev2.cap(3) + log["author"] = self.rx_rev2.cap(2) + log["date"] = self.rx_rev2.cap(3) # number of lines is ignored elif self.rx_flags1.exactMatch(s): changedPaths.append({\ - "action" : - str(self.rx_flags1.cap(1).strip(), ioEncoding, 'replace'), - "path" : - str(self.rx_flags1.cap(2).strip(), ioEncoding, 'replace'), - "copyfrom_path" : - str(self.rx_flags1.cap(3).strip(), ioEncoding, 'replace'), - "copyfrom_revision" : - str(self.rx_flags1.cap(4).strip(), ioEncoding, 'replace'), + "action": + str(self.rx_flags1.cap(1).strip(), ioEncoding, 'replace'), + "path": + str(self.rx_flags1.cap(2).strip(), ioEncoding, 'replace'), + "copyfrom_path": + str(self.rx_flags1.cap(3).strip(), ioEncoding, 'replace'), + "copyfrom_revision": + str(self.rx_flags1.cap(4).strip(), ioEncoding, 'replace'), }) elif self.rx_flags2.exactMatch(s): changedPaths.append({\ - "action" : - str(self.rx_flags2.cap(1).strip(), ioEncoding, 'replace'), - "path" : - str(self.rx_flags2.cap(2).strip(), ioEncoding, 'replace'), - "copyfrom_path" : "", - "copyfrom_revision" : "", + "action": + str(self.rx_flags2.cap(1).strip(), ioEncoding, 'replace'), + "path": + str(self.rx_flags2.cap(2).strip(), ioEncoding, 'replace'), + "copyfrom_path": "", + "copyfrom_revision": "", }) elif self.rx_sep1.exactMatch(s) or self.rx_sep2.exactMatch(s): if len(log) > 1: - self.__generateLogItem(log["author"], log["date"], + self.__generateLogItem(log["author"], log["date"], log["message"], log["revision"], changedPaths) dt = QDate.fromString(log["date"], Qt.ISODate) if not self.__maxDate.isValid() and not self.__minDate.isValid(): @@ -346,7 +347,7 @@ if self.__minDate > dt: self.__minDate = dt noEntries += 1 - log = {"message" : []} + log = {"message": []} changedPaths = [] else: if s.strip().endswith(":") or not s.strip(): @@ -378,15 +379,15 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process and inserts it into a buffer. """ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.buf.append(line) @@ -399,8 +400,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -447,7 +448,7 @@ changes = current.data(0, self.__changesRole) if len(changes) > 0: for change in changes: - self.__generateFileItem(change["action"], change["path"], + self.__generateFileItem(change["action"], change["path"], change["copyfrom_path"], change["copyfrom_revision"]) self.__resizeColumnsFiles() self.__resortFiles() @@ -588,7 +589,7 @@ """ Private slot called, when the stop on copy/move checkbox is clicked """ - self.vcs.getPlugin().setPreferences("StopLogOnCopy", + self.vcs.getPlugin().setPreferences("StopLogOnCopy", self.stopCheckBox.isChecked()) self.nextButton.setEnabled(True) self.limitSpinBox.setEnabled(True) @@ -642,4 +643,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) \ No newline at end of file + QWidget.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,14 +20,15 @@ import Utilities import Preferences + class SvnLogDialog(QWidget, Ui_SvnLogDialog): """ Class implementing a dialog to show the output of the svn log command process. - The dialog is nonmodal. Clicking a link in the upper text pane shows + The dialog is nonmodal. Clicking a link in the upper text pane shows a diff of the versions. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -66,9 +67,9 @@ self.rx_changed = QRegExp('Changed .*\\s*') self.flags = { - 'A' : self.trUtf8('Added'), - 'D' : self.trUtf8('Deleted'), - 'M' : self.trUtf8('Modified') + 'A': self.trUtf8('Added'), + 'D': self.trUtf8('Deleted'), + 'M': self.trUtf8('Modified') } self.revisions = [] # stack of remembered revisions @@ -91,7 +92,7 @@ e.accept() - def start(self, fn, noEntries = 0): + def start(self, fn, noEntries=0): """ Public slot to start the cvs log command. @@ -170,9 +171,9 @@ query.append(lv).append('_').append(ver) url.setEncodedQuery(query) dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( - url.toString(), - query, - self.trUtf8('diff to {0}').format(lv), + url.toString(), + query, + self.trUtf8('diff to {0}').format(lv), ) except IndexError: pass @@ -212,15 +213,15 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal. + Private slot to handle the readyReadStandardOutput signal. It reads the output of the process and inserts it into a buffer. """ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - line = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + line = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') self.buf.append(line) if self.rx_rev.exactMatch(line): @@ -241,8 +242,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -319,4 +320,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) \ No newline at end of file + QWidget.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_SvnMergeDialog import Ui_SvnMergeDialog + class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): """ Class implementing a dialog to enter the data for a merge operation. """ - def __init__(self, mergelist1, mergelist2, targetlist, force = False, parent = None): + def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): """ Constructor @@ -79,7 +80,7 @@ @return tuple naming two tag names or two revisions, a target and a flag indicating a forced merge (string, string, string, boolean) """ - return (self.tag1Combo.currentText(), + return (self.tag1Combo.currentText(), self.tag2Combo.currentText(), self.targetCombo.currentText(), self.forceCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,11 +21,12 @@ import Utilities + class SvnNewProjectOptionsDialog(QDialog, Ui_SvnNewProjectOptionsDialog): """ Class implementing the Options Dialog for a new project from the repository. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -65,7 +66,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: - dlg = SvnRepoBrowserDialog(self.vcs, mode = "select", parent = self) + dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted: url = dlg.getSelectedUrl() @@ -130,8 +131,8 @@ if scheme == "file://" and url[0] not in ["\\", "/"]: url = "/{0}".format(url) vcsdatadict = { - "url" : '{0}{1}'.format(scheme, url), - "tag" : self.vcsTagEdit.text(), - "standardLayout" : self.layoutCheckBox.isChecked(), + "url": '{0}{1}'.format(scheme, url), + "tag": self.vcsTagEdit.text(), + "standardLayout": self.layoutCheckBox.isChecked(), } return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,12 +21,13 @@ import Utilities + class SvnOptionsDialog(QDialog, Ui_SvnOptionsDialog): """ Class implementing a dialog to enter options used to start a project in the repository. """ - def __init__(self, vcs, project, parent = None): + def __init__(self, vcs, project, parent=None): """ Constructor @@ -68,7 +69,7 @@ if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) else: - dlg = SvnRepoBrowserDialog(self.vcs, mode = "select", parent = self) + dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start(self.protocolCombo.currentText() + self.vcsUrlEdit.text()) if dlg.exec_() == QDialog.Accepted: url = dlg.getSelectedUrl() @@ -105,8 +106,8 @@ if scheme == "file://" and url[0] not in ["\\", "/"]: url = "/{0}".format(url) vcsdatadict = { - "url" : '{0}{1}'.format(scheme, url), - "message" : self.vcsLogEdit.text(), - "standardLayout" : self.layoutCheckBox.isChecked(), + "url": '{0}{1}'.format(scheme, url), + "message": self.vcsLogEdit.text(), + "standardLayout": self.layoutCheckBox.isChecked(), } return vcsdatadict
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import Preferences + class SvnPropListDialog(QWidget, Ui_SvnPropListDialog): """ Class implementing a dialog to show the output of the svn proplist command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -53,7 +54,7 @@ """ Private method to resort the tree. """ - self.propsList.sortItems(self.propsList.sortColumn(), + self.propsList.sortItems(self.propsList.sortColumn(), self.propsList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -87,7 +88,7 @@ e.accept() - def start(self, fn, recursive = False): + def start(self, fn, recursive=False): """ Public slot to start the svn status command. @@ -177,8 +178,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if self.rx_path.exactMatch(s): if self.lastProp: @@ -204,8 +205,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) - self.errors.ensureCursorVisible() \ No newline at end of file + self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Utilities + class SvnPropSetDialog(QDialog, Ui_SvnPropSetDialog): """ Class implementing a dialog to enter the data for a new property. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog + class SvnRelocateDialog(QDialog, Ui_SvnRelocateDialog): """ Class implementing a dialog to enter the data to relocate the workspace. """ - def __init__(self, currUrl, parent = None): + def __init__(self, currUrl, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,11 +20,12 @@ import Preferences + class SvnRepoBrowserDialog(QDialog, Ui_SvnRepoBrowserDialog): """ Class implementing the subversion repository browser dialog. """ - def __init__(self, vcs, mode = "browse", parent = None): + def __init__(self, vcs, mode="browse", parent=None): """ Constructor @@ -79,7 +80,7 @@ """ Private method to resort the tree. """ - self.repoTree.sortItems(self.repoTree.sortColumn(), + self.repoTree.sortItems(self.repoTree.sortColumn(), self.repoTree.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -89,7 +90,7 @@ self.repoTree.header().resizeSections(QHeaderView.ResizeToContents) self.repoTree.header().setStretchLastSection(True) - def __generateItem(self, repopath, revision, author, size, date, + def __generateItem(self, repopath, revision, author, size, date, nodekind, url): """ Private method to generate a tree item in the repository tree. @@ -107,11 +108,11 @@ path = repopath itm = QTreeWidgetItem(self.parentItem, [ - path, - revision, - author, - size, - date, + path, + revision, + author, + size, + date, ]) if nodekind == "dir": @@ -161,8 +162,8 @@ repoRoot = line.replace('<root>', '').replace('</root>', '') break else: - error = str(process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + error = str(process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(error) self.errors.ensureCursorVisible() @@ -176,7 +177,7 @@ ).format('svn')) return repoRoot - def __listRepo(self, url, parent = None): + def __listRepo(self, url, parent=None): """ Private method to perform the svn list command. @@ -367,8 +368,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if self.__rx_dir.exactMatch(s): revision = self.__rx_dir.cap(1) @@ -399,8 +400,8 @@ error pane. """ if self.process is not None: - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -453,4 +454,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) \ No newline at end of file + QWidget.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,7 +17,7 @@ """ Class implementing a dialog to enter the revisions for the svn diff command. """ - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,12 +22,13 @@ import Preferences + class SvnStatusDialog(QWidget, Ui_SvnStatusDialog): """ Class implementing a dialog to show the output of the svn status command process. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -64,7 +65,7 @@ self.vcs.committed.connect(self.__committed) self.statusList.headerItem().setText(self.__lastColumn, "") - self.statusList.header().setSortIndicator(self.__pathColumn, + self.statusList.header().setSortIndicator(self.__pathColumn, Qt.AscendingOrder) if self.vcs.versionStr < '1.5.0': self.statusList.header().hideSection(self.__changelistColumn) @@ -113,73 +114,73 @@ self.__showContextMenu) self.modifiedIndicators = [ - self.trUtf8('added'), - self.trUtf8('deleted'), - self.trUtf8('modified'), + self.trUtf8('added'), + self.trUtf8('deleted'), + self.trUtf8('modified'), ] self.missingIndicators = [ - self.trUtf8('missing'), + self.trUtf8('missing'), ] self.unversionedIndicators = [ - self.trUtf8('unversioned'), + self.trUtf8('unversioned'), ] self.lockedIndicators = [ - self.trUtf8('locked'), + self.trUtf8('locked'), ] self.stealBreakLockIndicators = [ - self.trUtf8('other lock'), - self.trUtf8('stolen lock'), - self.trUtf8('broken lock'), + self.trUtf8('other lock'), + self.trUtf8('stolen lock'), + self.trUtf8('broken lock'), ] self.unlockedIndicators = [ - self.trUtf8('not locked'), + self.trUtf8('not locked'), ] self.status = { - ' ' : self.trUtf8('normal'), - 'A' : self.trUtf8('added'), - 'D' : self.trUtf8('deleted'), - 'M' : self.trUtf8('modified'), - 'R' : self.trUtf8('replaced'), - 'C' : self.trUtf8('conflict'), - 'X' : self.trUtf8('external'), - 'I' : self.trUtf8('ignored'), - '?' : self.trUtf8('unversioned'), - '!' : self.trUtf8('missing'), - '~' : self.trUtf8('type error'), + ' ': self.trUtf8('normal'), + 'A': self.trUtf8('added'), + 'D': self.trUtf8('deleted'), + 'M': self.trUtf8('modified'), + 'R': self.trUtf8('replaced'), + 'C': self.trUtf8('conflict'), + 'X': self.trUtf8('external'), + 'I': self.trUtf8('ignored'), + '?': self.trUtf8('unversioned'), + '!': self.trUtf8('missing'), + '~': self.trUtf8('type error'), } self.propStatus = { - ' ' : self.trUtf8('normal'), - 'M' : self.trUtf8('modified'), - 'C' : self.trUtf8('conflict'), + ' ': self.trUtf8('normal'), + 'M': self.trUtf8('modified'), + 'C': self.trUtf8('conflict'), } self.locked = { - ' ' : self.trUtf8('no'), - 'L' : self.trUtf8('yes'), + ' ': self.trUtf8('no'), + 'L': self.trUtf8('yes'), } self.history = { - ' ' : self.trUtf8('no'), - '+' : self.trUtf8('yes'), + ' ': self.trUtf8('no'), + '+': self.trUtf8('yes'), } self.switched = { - ' ' : self.trUtf8('no'), - 'S' : self.trUtf8('yes'), + ' ': self.trUtf8('no'), + 'S': self.trUtf8('yes'), } self.lockinfo = { - ' ' : self.trUtf8('not locked'), - 'K' : self.trUtf8('locked'), - 'O' : self.trUtf8('other lock'), - 'T' : self.trUtf8('stolen lock'), - 'B' : self.trUtf8('broken lock'), + ' ': self.trUtf8('not locked'), + 'K': self.trUtf8('locked'), + 'O': self.trUtf8('other lock'), + 'T': self.trUtf8('stolen lock'), + 'B': self.trUtf8('broken lock'), } self.uptodate = { - ' ' : self.trUtf8('yes'), - '*' : self.trUtf8('no'), + ' ': self.trUtf8('yes'), + '*': self.trUtf8('no'), } self.rx_status = \ @@ -199,7 +200,7 @@ """ Private method to resort the tree. """ - self.statusList.sortItems(self.statusList.sortColumn(), + self.statusList.sortItems(self.statusList.sortColumn(), self.statusList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -239,18 +240,18 @@ statusText = self.status[status] itm = QTreeWidgetItem(self.statusList, [ - self.currentChangelist, - statusText, - self.propStatus[propStatus], - self.locked[locked], - self.history[history], - self.switched[switched], - self.lockinfo[lockinfo], - self.uptodate[uptodate], - "{0:7}".format(str(revision)), - "{0:7}".format(str(change)), - author, - path, + self.currentChangelist, + statusText, + self.propStatus[propStatus], + self.locked[locked], + self.history[history], + self.switched[switched], + self.lockinfo[lockinfo], + self.uptodate[uptodate], + "{0:7}".format(str(revision)), + "{0:7}".format(str(change)), + author, + path, ]) itm.setTextAlignment(1, Qt.AlignLeft) @@ -403,19 +404,19 @@ self.__resort() self.__resizeColumns() - self.statusList.setColumnHidden(self.__changelistColumn, + self.statusList.setColumnHidden(self.__changelistColumn, not self.changelistFound) - self.statusList.setColumnHidden(self.__propStatusColumn, + self.statusList.setColumnHidden(self.__propStatusColumn, self.hidePropertyStatusColumn) - self.statusList.setColumnHidden(self.__lockedColumn, + self.statusList.setColumnHidden(self.__lockedColumn, self.hideLockColumns) - self.statusList.setColumnHidden(self.__lockinfoColumn, + self.statusList.setColumnHidden(self.__lockinfoColumn, self.hideLockColumns) - self.statusList.setColumnHidden(self.__upToDateColumn, + self.statusList.setColumnHidden(self.__upToDateColumn, self.hideUpToDateColumn) - self.statusList.setColumnHidden(self.__historyColumn, + self.statusList.setColumnHidden(self.__historyColumn, self.hideHistoryColumn) - self.statusList.setColumnHidden(self.__switchedColumn, + self.statusList.setColumnHidden(self.__switchedColumn, self.hideSwitchedColumn) self.__updateButtons() @@ -454,8 +455,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if self.rx_status.exactMatch(s): flags = self.rx_status.cap(1) @@ -487,8 +488,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -778,7 +779,7 @@ """ available/selected.""")) return - self.vcs.svnLock(names, parent = self) + self.vcs.svnLock(names, parent=self) self.on_refreshButton_clicked() def __unlock(self): @@ -794,7 +795,7 @@ """ available/selected.""")) return - self.vcs.svnUnlock(names, parent = self) + self.vcs.svnUnlock(names, parent=self) self.on_refreshButton_clicked() def __breakLock(self): @@ -811,7 +812,7 @@ """ available/selected.""")) return - self.vcs.svnUnlock(names, parent = self, breakIt = True) + self.vcs.svnUnlock(names, parent=self, breakIt=True) self.on_refreshButton_clicked() def __stealLock(self):
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ import Preferences + class SvnStatusMonitorThread(VcsStatusMonitorThread): """ Class implementing the VCS status monitor thread class for Subversion. """ - def __init__(self, interval, project, vcs, parent = None): + def __init__(self, interval, project, vcs, parent=None): """ Constructor @@ -52,7 +53,7 @@ <li>" " path is back at normal</li> </ul> - @return tuple of flag indicating successful operation (boolean) and + @return tuple of flag indicating successful operation (boolean) and a status message in case of non successful operation (string) """ self.shouldUpdate = False @@ -109,8 +110,8 @@ process.kill() process.waitForFinished() return False, \ - str(process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + str(process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') else: process.kill()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,17 +12,18 @@ from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog + class SvnSwitchDialog(QDialog, Ui_SvnSwitchDialog): """ Class implementing a dialog to enter the data for a switch operation. """ - def __init__(self, taglist, reposURL, standardLayout, parent = None): + def __init__(self, taglist, reposURL, standardLayout, parent=None): """ Constructor @param taglist list of previously entered tags (list of strings) @param reposURL repository path (string) or None - @param standardLayout flag indicating the layout of the + @param standardLayout flag indicating the layout of the repository (boolean) @param parent parent widget (QWidget) """ @@ -53,4 +54,3 @@ if not tag: tagType = 4 return (tag, tagType) -
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import Preferences + class SvnTagBranchListDialog(QDialog, Ui_SvnTagBranchListDialog): """ Class implementing a dialog to show a list of tags or branches. """ - def __init__(self, vcs, parent = None): + def __init__(self, vcs, parent=None): """ Constructor @@ -198,7 +199,7 @@ """ Private method to resort the tree. """ - self.tagList.sortItems(self.tagList.sortColumn(), + self.tagList.sortItems(self.tagList.sortColumn(), self.tagList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -230,8 +231,8 @@ self.process.setReadChannel(QProcess.StandardOutput) while self.process.canReadLine(): - s = str(self.process.readLine(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') if self.rx_list.exactMatch(s): rev = "{0:6}".format(self.rx_list.cap(1)) @@ -255,8 +256,8 @@ """ if self.process is not None: self.errorGroup.show() - s = str(self.process.readAllStandardError(), - Preferences.getSystem("IOEncoding"), + s = str(self.process.readAllStandardError(), + Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) self.errors.ensureCursorVisible() @@ -309,4 +310,4 @@ self.intercept = False evt.accept() return - QDialog.keyPressEvent(self, evt) \ No newline at end of file + QDialog.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,17 +12,18 @@ from .Ui_SvnTagDialog import Ui_SvnTagDialog + class SvnTagDialog(QDialog, Ui_SvnTagDialog): """ Class implementing a dialog to enter the data for a tagging operation. """ - def __init__(self, taglist, reposURL, standardLayout, parent = None): + def __init__(self, taglist, reposURL, standardLayout, parent=None): """ Constructor @param taglist list of previously entered tags (list of strings) @param reposURL repository path (string) or None - @param standardLayout flag indicating the layout of the + @param standardLayout flag indicating the layout of the repository (boolean) @param parent parent widget (QWidget) """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,7 +20,7 @@ """ Class implementing a dialog to enter the URLs for the svn diff command. """ - def __init__(self, vcs, tagsList, branchesList, path, parent = None): + def __init__(self, vcs, tagsList, branchesList, path, parent=None): """ Constructor @@ -86,7 +86,7 @@ def __changeLabelCombo(self, labelCombo, type_): """ - Private method used to change the label combo depending on the + Private method used to change the label combo depending on the selected type. @param labelCombo reference to the labelCombo object (QComboBox)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ import Utilities + def getServersPath(): """ Public method to get the filename of the servers file. @@ -24,6 +25,7 @@ homedir = Utilities.getHomeDir() return os.path.join(homedir, ".subversion", "servers") + def getConfigPath(): """ Public method to get the filename of the config file.
--- a/Plugins/VcsPlugins/vcsSubversion/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -6,6 +6,6 @@ """ Package implementing the vcs interface to Subversion -It consists of the subversion class, the project helper classes and some +It consists of the subversion class, the project helper classes and some Subversion specific dialogs. """
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,7 +9,9 @@ import os import shutil -import urllib.request, urllib.parse, urllib.error +import urllib.request +import urllib.parse +import urllib.error from PyQt4.QtCore import * from PyQt4.QtGui import * @@ -47,6 +49,7 @@ import Preferences import Utilities + class Subversion(VersionControl): """ Class implementing the version control systems interface to Subversion. @@ -65,18 +68,18 @@ """ VersionControl.__init__(self, parent, name) self.defaultOptions = { - 'global' : [''], - 'commit' : [''], - 'checkout' : [''], - 'update' : [''], - 'add' : [''], - 'remove' : [''], - 'diff' : [''], - 'log' : [''], - 'history' : [''], - 'status' : [''], - 'tag' : [''], - 'export' : [''] + 'global': [''], + 'commit': [''], + 'checkout': [''], + 'update': [''], + 'add': [''], + 'remove': [''], + 'diff': [''], + 'log': [''], + 'history': [''], + 'status': [''], + 'tag': [''], + 'export': [''] } self.interestingDataKeys = [ "standardLayout", @@ -95,8 +98,8 @@ self.showedBranches = False self.tagTypeList = [ - 'tags', - 'branches', + 'tags', + 'branches', ] self.commandHistory = [] @@ -182,7 +185,7 @@ return False, errMsg - def vcsInit(self, vcsDir, noDialog = False): + def vcsInit(self, vcsDir, noDialog=False): """ Public method used to initialize the subversion repository. @@ -246,10 +249,10 @@ project.closeProject() return shutil.rmtree(tmpProjectDir, True) - project.closeProject(noSave = True) + project.closeProject(noSave=True) project.openProject(pfn) - def vcsImport(self, vcsDataDict, projectDir, noDialog = False): + def vcsImport(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to import the project into the Subversion repository. @@ -270,7 +273,7 @@ elif vcsDir[1] in ['|', ':']: vcsDir = 'file:///{0}'.format(vcsDir) - project = vcsDir[vcsDir.rfind('/')+1:] + project = vcsDir[vcsDir.rfind('/') + 1:] # create the dir structure to be imported into the repository tmpDir = '{0}_tmp'.format(projectDir) @@ -285,7 +288,7 @@ shutil.copytree(projectDir, os.path.join(tmpDir, project)) except OSError: if os.path.isdir(tmpDir): - shutil.rmtree(tmpDir, True) + shutil.rmtree(tmpDir, True) return False, False args = [] @@ -308,7 +311,7 @@ shutil.rmtree(tmpDir, True) return status, False - def vcsCheckout(self, vcsDataDict, projectDir, noDialog = False): + def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to check the project out of the Subversion repository. @@ -413,7 +416,7 @@ dia.exec_() return dia.normalExit() - def vcsCommit(self, name, message, noDialog = False): + def vcsCommit(self, name, message, noDialog=False): """ Public method used to make the change of a file/directory permanent in the Subversion repository. @@ -494,7 +497,7 @@ self.committed.emit() self.checkVCSStatus() - def vcsUpdate(self, name, noDialog = False): + def vcsUpdate(self, name, noDialog=False): """ Public method used to update a file/directory with the Subversion repository. @@ -529,7 +532,7 @@ self.checkVCSStatus() return res - def vcsAdd(self, name, isDir = False, noDialog = False): + def vcsAdd(self, name, isDir=False, noDialog=False): """ Public method used to add a file/directory to the Subversion repository. @@ -588,7 +591,7 @@ if res: dia.exec_() - def vcsAddBinary(self, name, isDir = False): + def vcsAddBinary(self, name, isDir=False): """ Public method used to add a file/directory in binary mode to the Subversion repository. @@ -615,7 +618,7 @@ for n in path: d = os.path.split(n)[0] while not os.path.exists(os.path.join(d, self.adminDir)): - # add directories recursively, + # add directories recursively, # if they aren't in the repository already if d in tree: break @@ -643,7 +646,7 @@ if res: dia.exec_() - def vcsRemove(self, name, project = False, noDialog = False): + def vcsRemove(self, name, project=False, noDialog=False): """ Public method used to remove a file/directory from the Subversion repository. @@ -678,7 +681,7 @@ return res - def vcsMove(self, name, project, target = None, noDialog = False): + def vcsMove(self, name, project, target=None, noDialog=False): """ Public method used to move a file/directory. @@ -748,7 +751,7 @@ def vcsLog(self, name): """ - Public method used to view the log of a file/directory from the + Public method used to view the log of a file/directory from the Subversion repository. @param name file/directory name to show the log of (string) @@ -759,11 +762,11 @@ def vcsDiff(self, name): """ - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. @param name file/directory name to be diffed (string) @@ -775,7 +778,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -788,7 +791,7 @@ def vcsStatus(self, name): """ - Public method used to view the status of files/directories in the + Public method used to view the status of files/directories in the Subversion repository. @param name file/directory name(s) to show the status of @@ -800,7 +803,7 @@ def vcsTag(self, name): """ - Public method used to set the tag of a file/directory in the + Public method used to set the tag of a file/directory in the Subversion repository. @param name file/directory name to be tagged (string) @@ -820,7 +823,7 @@ url = None else: url = self.svnNormalizeURL(reposURL) - dlg = SvnTagDialog(self.allTagsBranchesList, url, + dlg = SvnTagDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) if dlg.exec_() == QDialog.Accepted: tag, tagOp = dlg.getParameters() @@ -914,7 +917,7 @@ url = None else: url = self.svnNormalizeURL(reposURL) - dlg = SvnSwitchDialog(self.allTagsBranchesList, url, + dlg = SvnSwitchDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) if dlg.exec_() == QDialog.Accepted: tag, tagType = dlg.getParameters() @@ -974,7 +977,7 @@ if force: del opts[opts.index('--force')] - dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], + dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], force) if dlg.exec_() == QDialog.Accepted: urlrev1, urlrev2, target, force = dlg.getParameters() @@ -1037,14 +1040,14 @@ return self.canBeAdded name = os.path.normcase(name) - states = { name : 0 } + states = {name: 0} states = self.vcsAllRegisteredStates(states, dname, False) if states[name] == self.canBeCommitted: return self.canBeCommitted else: return self.canBeAdded - def vcsAllRegisteredStates(self, names, dname, shortcut = True): + def vcsAllRegisteredStates(self, names, dname, shortcut=True): """ Public method used to get the registered states of a number of files in the vcs. @@ -1055,7 +1058,7 @@ @param names dictionary with all filenames to be checked as keys @param dname directory to check in (string) @param shortcut flag indicating a shortcut should be taken (boolean) - @return the received dictionary completed with a combination of + @return the received dictionary completed with a combination of canBeCommited and canBeAdded or None in order to signal an error """ if not os.path.isdir(os.path.join(dname, self.adminDir)): @@ -1165,7 +1168,7 @@ if res: dia.exec_() - def vcsOptionsDialog(self, project, archive, editable = False, parent = None): + def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ Public method to get a dialog to enter repository info. @@ -1176,7 +1179,7 @@ """ return SvnOptionsDialog(self, project, parent) - def vcsNewProjectOptionsDialog(self, parent = None): + def vcsNewProjectOptionsDialog(self, parent=None): """ Public method to get a dialog to enter repository info for getting a new project. @@ -1192,12 +1195,12 @@ @return string with ready formated info for display (string) """ info = {\ - 'committed-rev' : '', - 'committed-date' : '', - 'committed-time' : '', - 'url' : '', - 'last-author' : '', - 'revision' : '' + 'committed-rev': '', + 'committed-date': '', + 'committed-time': '', + 'url': '', + 'last-author': '', + 'revision': '' } ioEncoding = Preferences.getSystem("IOEncoding") @@ -1225,7 +1228,7 @@ elif line.startswith('</commit>'): commitFound = False elif line.startswith("revision="): - rev = line[line.find('"')+1:line.rfind('"')] + rev = line[line.find('"') + 1:line.rfind('"')] if entryFound: info['revision'] = rev entryFound = False @@ -1256,12 +1259,12 @@ """<tr><td><b>Last author</b></td><td>{6}</td></tr>""" """</table>""" )\ - .format(self.versionStr, - info['url'], - info['revision'], - info['committed-rev'], - info['committed-date'], - info['committed-time'], + .format(self.versionStr, + info['url'], + info['revision'], + info['committed-rev'], + info['committed-date'], + info['committed-time'], info['last-author']) ############################################################################ @@ -1363,7 +1366,7 @@ project.appendFile(target) return res - def svnListProps(self, name, recursive = False): + def svnListProps(self, name, recursive=False): """ Public method used to list the properties of a file/directory. @@ -1374,7 +1377,7 @@ self.propList.show() self.propList.start(name, recursive) - def svnSetProp(self, name, recursive = False): + def svnSetProp(self, name, recursive=False): """ Public method used to add a property to a file/directory. @@ -1411,7 +1414,7 @@ if res: dia.exec_() - def svnDelProp(self, name, recursive = False): + def svnDelProp(self, name, recursive=False): """ Public method used to delete a property of a file/directory. @@ -1451,7 +1454,7 @@ if res: dia.exec_() - def svnListTagBranch(self, path, tags = True): + def svnListTagBranch(self, path, tags=True): """ Public method used to list the available tags or branches. @@ -1468,7 +1471,7 @@ else: self.tagsList = [] allTagsBranchesList = None - self.tagbranchList.start(path, tags, + self.tagbranchList.start(path, tags, self.tagsList, allTagsBranchesList) elif not tags: if not self.showedBranches: @@ -1477,7 +1480,7 @@ else: self.branchesList = [] allTagsBranchesList = None - self.tagbranchList.start(path, tags, + self.tagbranchList.start(path, tags, self.branchesList, self.allTagsBranchesList) def svnBlame(self, name): @@ -1492,11 +1495,11 @@ def svnExtendedDiff(self, name): """ - Public method used to view the difference of a file/directory to the + Public method used to view the difference of a file/directory to the Subversion repository. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. This method gives the chance to enter the revisions to be compared. @@ -1510,7 +1513,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -1529,7 +1532,7 @@ repository URLs. If name is a directory and is the project directory, all project files - are saved first. If name is a file (or list of files), which is/are being edited + are saved first. If name is a file (or list of files), which is/are being edited and has unsaved modification, they can be saved or the operation may be aborted. This method gives the chance to enter the revisions to be compared. @@ -1543,7 +1546,7 @@ for nam in names: if os.path.isfile(nam): editor = e5App().getObject("ViewManager").getOpenEditor(nam) - if editor and not editor.checkDirty() : + if editor and not editor.checkDirty(): return else: project = e5App().getObject("Project") @@ -1558,11 +1561,11 @@ self.diff = SvnDiffDialog(self) self.diff.show() QApplication.processEvents() - self.diff.start(name, urls = urls, summary = summary) + self.diff.start(name, urls=urls, summary=summary) def svnLogLimited(self, name): """ - Public method used to view the (limited) log of a file/directory from the + Public method used to view the (limited) log of a file/directory from the Subversion repository. @param name file/directory name to show the log of (string) @@ -1579,7 +1582,7 @@ def svnLogBrowser(self, path): """ - Public method used to browse the log of a file/directory from the + Public method used to browse the log of a file/directory from the Subversion repository. @param path file/directory name to show the log of (string) @@ -1661,7 +1664,7 @@ if res: dia.exec_() - def svnRepoBrowser(self, projectPath = None): + def svnRepoBrowser(self, projectPath=None): """ Public method to open the repository browser. @@ -1761,7 +1764,7 @@ if len(url) == 3: scheme = url[0] host = url[1] - port, path = url[2].split("/",1) + port, path = url[2].split("/", 1) return "{0}:{1}:{2}/{3}".format(scheme, host, port, urllib.parse.quote(path)) else: scheme = url[0] @@ -1792,7 +1795,7 @@ ## Methods to get the helper objects are below. ############################################################################ - def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser = False): + def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): """ Public method to instanciate a helper object for the different project browsers. @@ -1827,4 +1830,4 @@ @param interval check interval for the monitor thread in seconds (integer) @return reference to the monitor thread (QThread) """ - return SvnStatusMonitorThread(interval, project, self) \ No newline at end of file + return SvnStatusMonitorThread(interval, project, self)
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,6 +19,7 @@ import UI.PixmapCache + class StackedWidget(QStackedWidget): """ Class implementing a custimized StackedWidget. @@ -115,6 +116,7 @@ """ return len(self.editors) and self.editors[0] or None + class Listspace(QSplitter, ViewManager): """ Class implementing the listspace viewmanager class. @@ -181,7 +183,7 @@ self.currentStack = stack stack.currentChanged.connect(self.__currentChanged) stack.installEventFilter(self) - self.setSizes([int(self.width() * 0.2), int(self.width() * 0.8)]) # 20% for viewlist + self.setSizes([int(self.width() * 0.2), int(self.width() * 0.8)]) # 20% for viewlist self.__inRemoveView = False self.__initMenu() @@ -303,7 +305,7 @@ else: self.changeCaption.emit("") - def _addView(self, win, fn = None, noName = ""): + def _addView(self, win, fn=None, noName=""): """ Protected method to add a view (i.e. window) @@ -339,7 +341,7 @@ def __captionChange(self, cap, editor): """ - Private method to handle caption change signals from the editor. + Private method to handle caption change signals from the editor. Updates the listwidget text to reflect the new caption information. @@ -350,7 +352,7 @@ if fn: self.setEditorName(editor, fn) - def _showView(self, win, fn = None): + def _showView(self, win, fn=None): """ Protected method to show a view (i.e. window) @@ -477,7 +479,7 @@ size = self.stackArea.width() else: size = self.stackArea.height() - self.stackArea.setSizes([int(size/len(self.stacks))] * len(self.stacks)) + self.stackArea.setSizes([int(size / len(self.stacks))] * len(self.stacks)) self.splitRemoveAct.setEnabled(True) self.nextSplitAct.setEnabled(True) self.prevSplitAct.setEnabled(True)
--- a/Plugins/ViewManagerPlugins/Listspace/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/Listspace/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,4 +5,4 @@ """ Package containing the listspace view manager plugin. -""" +"""
--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ import Utilities + class MdiArea(QMdiArea, ViewManager): """ Class implementing the mdi area viewmanager class. @@ -140,7 +141,7 @@ win.closeIt() self.__removingView = False - def _addView(self, win, fn = None, noName = ""): + def _addView(self, win, fn=None, noName=""): """ Protected method to add a view (i.e. window) @@ -177,7 +178,7 @@ win.setFocus() win.installEventFilter(self) - def _showView(self, win, fn = None): + def _showView(self, win, fn=None): """ Private method to show a view (i.e. window) @@ -231,14 +232,14 @@ self.__windowMapper.setMapping(act, subWindow) idx += 1 - addActions(windowMenu, - [None, self.nextChildAct, self.prevChildAct, - self.tileAct, self.cascadeAct, - self.restoreAllAct, self.iconizeAllAct, + addActions(windowMenu, + [None, self.nextChildAct, self.prevChildAct, + self.tileAct, self.cascadeAct, + self.restoreAllAct, self.iconizeAllAct, None]) for act in [self.restoreAllAct, self.iconizeAllAct]: act.setEnabled(len(self.editors) != 0) - for act in [self.nextChildAct, self.prevChildAct, self.tileAct, + for act in [self.nextChildAct, self.prevChildAct, self.tileAct, self.cascadeAct]: act.setEnabled(len(self.editors) > 1)
--- a/Plugins/ViewManagerPlugins/MdiArea/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/MdiArea/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,4 +5,4 @@ """ Package containing the mdi area view manager plugin. -""" +"""
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,6 +28,7 @@ from eric5config import getConfig + class TabBar(E5WheelTabBar): """ Class implementing a customized tab bar supporting drag & drop. @@ -48,7 +49,7 @@ tabCopyRequested = pyqtSignal(int, int, int) tabCopyRequested = pyqtSignal(int, int) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -84,7 +85,7 @@ mimeData.setText(self.tabText(index)) mimeData.setData("action", "tab-reordering") mimeData.setData("tabbar-id", QByteArray.number(id(self))) - mimeData.setData("source-index", + mimeData.setData("source-index", QByteArray.number(self.tabAt(self.__dragStartPos))) mimeData.setData("tabwidget-id", QByteArray.number(id(self.parentWidget()))) drag.setMimeData(mimeData) @@ -138,6 +139,7 @@ event.acceptProposedAction() E5WheelTabBar.dropEvent(self, event) + class TabWidget(E5TabWidget): """ Class implementing a custimized tab widget. @@ -230,7 +232,7 @@ self.__menu.addAction(UI.PixmapCache.getIcon("tabClose.png"), self.trUtf8('Close'), self.__contextMenuClose) self.closeOthersMenuAct = self.__menu.addAction( - UI.PixmapCache.getIcon("tabCloseOther.png"), self.trUtf8("Close Others"), + UI.PixmapCache.getIcon("tabCloseOther.png"), self.trUtf8("Close Others"), self.__contextMenuCloseOthers) self.__menu.addAction(self.trUtf8('Close All'), self.__contextMenuCloseAll) self.__menu.addSeparator() @@ -245,7 +247,7 @@ self.__menu.addAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.__contextMenuPrintFile) self.__menu.addSeparator() - self.copyPathAct = self.__menu.addAction(self.trUtf8("Copy Path to Clipboard"), + self.copyPathAct = self.__menu.addAction(self.trUtf8("Copy Path to Clipboard"), self.__contextMenuCopyPathToClipboard) def __showContextMenu(self, coord, index): @@ -278,7 +280,7 @@ """ self.__navigationMenu.clear() for index in range(self.count()): - act = self.__navigationMenu.addAction(self.tabIcon(index), + act = self.__navigationMenu.addAction(self.tabIcon(index), self.tabText(index)) act.setData(index) @@ -334,8 +336,8 @@ @param title title for the new tab (string) @return index of the inserted tab (integer) """ - newIndex = E5TabWidget.insertTab(self, index, editor, - UI.PixmapCache.getIcon("empty.png"), + newIndex = E5TabWidget.insertTab(self, index, editor, + UI.PixmapCache.getIcon("empty.png"), title) if self.closeButton: self.closeButton.setEnabled(True) @@ -355,7 +357,7 @@ def __captionChange(self, cap, editor): """ - Private method to handle Caption change signals from the editor. + Private method to handle Caption change signals from the editor. Updates the tab text and tooltip text to reflect the new caption information. @@ -395,7 +397,7 @@ self.editors.remove(object) if not self.editors: - E5TabWidget.addTab(self, self.emptyLabel, + E5TabWidget.addTab(self, self.emptyLabel, UI.PixmapCache.getIcon("empty.png"), "") self.emptyLabel.show() if self.closeButton: @@ -444,9 +446,9 @@ tw = self.vm.getTabWidgetById(sourceId) if tw is not None: editor = tw.widget(sourceIndex) - newEditor = self.vm.cloneEditor(editor, editor.getFileType(), + newEditor = self.vm.cloneEditor(editor, editor.getFileType(), editor.getFileName()) - self.vm.insertView(newEditor, self, targetIndex, + self.vm.insertView(newEditor, self, targetIndex, editor.getFileName(), editor.getNoName()) def copyTab(self, sourceIndex, targetIndex): @@ -457,9 +459,9 @@ @param targetIndex index position to place it to (integer) """ editor = self.widget(sourceIndex) - newEditor = self.vm.cloneEditor(editor, editor.getFileType(), + newEditor = self.vm.cloneEditor(editor, editor.getFileType(), editor.getFileName()) - self.vm.insertView(newEditor, self, targetIndex, + self.vm.insertView(newEditor, self, targetIndex, editor.getFileName(), editor.getNoName()) def currentWidget(self): @@ -599,6 +601,7 @@ """ self.vm.newEditor() + class Tabview(QSplitter, ViewManager): """ Class implementing a tabbed viewmanager class embedded in a splitter. @@ -735,7 +738,7 @@ else: self.changeCaption.emit("") - def _addView(self, win, fn = None, noName = ""): + def _addView(self, win, fn=None, noName=""): """ Protected method to add a view (i.e. window) @@ -770,7 +773,7 @@ else: self.changeCaption.emit("") - def insertView(self, win, tabWidget, index, fn = None, noName = ""): + def insertView(self, win, tabWidget, index, fn=None, noName=""): """ Protected method to add a view (i.e. window) @@ -809,7 +812,7 @@ self._modificationStatusChanged(win.isModified(), win) self._checkActions(win) - def _showView(self, win, fn = None): + def _showView(self, win, fn=None): """ Protected method to show a view (i.e. window) @@ -925,7 +928,7 @@ size = self.width() else: size = self.height() - self.setSizes([int(size/len(self.tabWidgets))] * len(self.tabWidgets)) + self.setSizes([int(size / len(self.tabWidgets))] * len(self.tabWidgets)) self.splitRemoveAct.setEnabled(True) self.nextSplitAct.setEnabled(True) self.prevSplitAct.setEnabled(True)
--- a/Plugins/ViewManagerPlugins/Tabview/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/Tabview/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,4 +5,4 @@ """ Package containing the tabview view manager plugin. -""" +"""
--- a/Plugins/ViewManagerPlugins/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/ViewManagerPlugins/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -5,4 +5,4 @@ """ Package containing the various view manager plugins. -""" +"""
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ from .Ui_ColorDialogWizardDialog import Ui_ColorDialogWizardDialog + class ColorDialogWizardDialog(QDialog, Ui_ColorDialogWizardDialog): """ Class implementing the color dialog wizard dialog. @@ -79,8 +80,8 @@ if self.rQt45.isChecked(): QColorDialog.getColor( QColor(self.sRed.value(), self.sGreen.value(), - self.sBlue.value(), self.sAlpha.value()), - None, self.eTitle.text(), + self.sBlue.value(), self.sAlpha.value()), + None, self.eTitle.text(), QColorDialog.ColorDialogOptions(QColorDialog.ShowAlphaChannel)) else: rgba = qRgba(self.sRed.value(), self.sGreen.value(), @@ -182,4 +183,4 @@ code += self.eRGB.text() code += '){0}'.format(estring) - return code \ No newline at end of file + return code
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ from .Ui_E5MessageBoxWizardDialog import Ui_E5MessageBoxWizardDialog + class E5MessageBoxWizardDialog(QDialog, Ui_E5MessageBoxWizardDialog): """ Class implementing the eric5 message box wizard dialog. @@ -20,7 +21,7 @@ It displays a dialog for entering the parameters for the E5MessageBox code generator. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -31,25 +32,25 @@ # keep the following three lists in sync self.buttonsList = [ - self.trUtf8("No button"), - self.trUtf8("Abort"), - self.trUtf8("Apply"), - self.trUtf8("Cancel"), - self.trUtf8("Close"), - self.trUtf8("Discard"), - self.trUtf8("Help"), - self.trUtf8("Ignore"), - self.trUtf8("No"), - self.trUtf8("No to all"), - self.trUtf8("Ok"), - self.trUtf8("Open"), - self.trUtf8("Reset"), - self.trUtf8("Restore defaults"), - self.trUtf8("Retry"), - self.trUtf8("Save"), - self.trUtf8("Save all"), - self.trUtf8("Yes"), - self.trUtf8("Yes to all"), + self.trUtf8("No button"), + self.trUtf8("Abort"), + self.trUtf8("Apply"), + self.trUtf8("Cancel"), + self.trUtf8("Close"), + self.trUtf8("Discard"), + self.trUtf8("Help"), + self.trUtf8("Ignore"), + self.trUtf8("No"), + self.trUtf8("No to all"), + self.trUtf8("Ok"), + self.trUtf8("Open"), + self.trUtf8("Reset"), + self.trUtf8("Restore defaults"), + self.trUtf8("Retry"), + self.trUtf8("Save"), + self.trUtf8("Save all"), + self.trUtf8("Yes"), + self.trUtf8("Yes to all"), ] self.buttonsCodeListBinary = [ E5MessageBox.NoButton, @@ -304,7 +305,7 @@ E5MessageBox.StandardButtons(buttons), defaultButton ) - elif self.rWarning.isChecked(): + elif self.rWarning.isChecked(): E5MessageBox.warning(self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -330,32 +331,32 @@ icon = E5MessageBox.Critical if self.rYesNo.isChecked(): - E5MessageBox.yesNo(self, + E5MessageBox.yesNo(self, self.eCaption.text(), self.eMessage.toPlainText(), - icon = icon, - yesDefault = self.yesDefaultCheck.isChecked() + icon=icon, + yesDefault=self.yesDefaultCheck.isChecked() ) elif self.rRetryAbort.isChecked(): - E5MessageBox.retryAbort(self, + E5MessageBox.retryAbort(self, self.eCaption.text(), self.eMessage.toPlainText(), - icon = icon + icon=icon ) elif self.rOkToClearData.isChecked(): - E5MessageBox.okToClearData(self, + E5MessageBox.okToClearData(self, self.eCaption.text(), self.eMessage.toPlainText(), lambda: True ) - def __getStandardButtonCode(self, istring, indString, withIntro = True): + def __getStandardButtonCode(self, istring, indString, withIntro=True): """ Private method to generate the button code for the standard buttons. @param istring indentation string (string) @param indString string used for indentation (space or tab) (string) - @keyparam withIntro flag indicating to generate a first line + @keyparam withIntro flag indicating to generate a first line with introductory text (boolean) @return the button code (string) """ @@ -420,7 +421,7 @@ btnCode = "" defaultIndex = self.defaultCombo.currentIndex() if defaultIndex: - btnCode = ',{0}{1}{2}'.format(os.linesep, istring, + btnCode = ',{0}{1}{2}'.format(os.linesep, istring, self.buttonsCodeListText[defaultIndex]) return btnCode @@ -469,13 +470,13 @@ elif self.rWarning.isChecked(): msgdlg = "res = E5MessageBox.warning({0},{1}".format(parent, os.linesep) elif self.rCritical.isChecked(): - msgdlg ="res = E5MessageBox.critical({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.critical({0},{1}".format(parent, os.linesep) elif self.rYesNo.isChecked(): - msgdlg ="res = E5MessageBox.yesNo({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.yesNo({0},{1}".format(parent, os.linesep) elif self.rRetryAbort.isChecked(): - msgdlg ="res = E5MessageBox.retryAbort({0},{1}".format(parent, os.linesep) + msgdlg = "res = E5MessageBox.retryAbort({0},{1}".format(parent, os.linesep) elif self.rOkToClearData.isChecked(): - msgdlg ="res = E5MessageBox.okToClearData({0},{1}".format( + msgdlg = "res = E5MessageBox.okToClearData({0},{1}".format( parent, os.linesep) msgdlg += '{0}self.trUtf8("{1}")'.format(istring, self.eCaption.text()) @@ -504,17 +505,17 @@ saveFunc = "lambda: True" msgdlg += ',{0}{1}{2}'.format(os.linesep, istring, saveFunc) else: - msgdlg ="E5MessageBox.E5MessageBox({0}, {1}".format(icon, os.linesep) + msgdlg = "E5MessageBox.E5MessageBox({0}, {1}".format(icon, os.linesep) msgdlg += '{0}self.trUtf8("{1}")'.format(istring, self.eCaption.text()) msgdlg += ',{0}{1}self.trUtf8("""{2}""")'.format( os.linesep, istring, self.eMessage.toPlainText()) if self.modalCheck.isChecked(): msgdlg += ',{0}{1}modal = True'.format(os.linesep, istring) - btnCode = self.__getStandardButtonCode(istring, indString, withIntro = False) + btnCode = self.__getStandardButtonCode(istring, indString, withIntro=False) if btnCode: msgdlg += ',{0}{1}buttons = {2}'.format(os.linesep, istring, btnCode) if not self.parentNone.isChecked(): msgdlg += ',{0}{1}parent = {2}'.format(os.linesep, istring, parent) - msgdlg +='){0}'.format(estring) + msgdlg += '){0}'.format(estring) return msgdlg
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Globals + class FileDialogWizardDialog(QDialog, Ui_FileDialogWizardDialog): """ Class implementing the color dialog wizard dialog. @@ -181,10 +182,10 @@ if self.eFilters.text() == "": code += '""' else: - if self.cFilters.isChecked(): - fmt = '{0}' - else: - fmt = 'self.trUtf8("{0}")' + if self.cFilters.isChecked(): + fmt = '{0}' + else: + fmt = 'self.trUtf8("{0}")' code += fmt.format(self.eFilters.text()) if self.rfOpenFile.isChecked(): code += ',{0}{1}None'.format(os.linesep, istring) @@ -214,10 +215,10 @@ if not self.eFilters.text(): code += '""' else: - if self.cFilters.isChecked(): - fmt = '{0}' - else: - fmt = 'self.trUtf8("{0}")' + if self.cFilters.isChecked(): + fmt = '{0}' + else: + fmt = 'self.trUtf8("{0}")' code += fmt.format(self.eFilters.text()) if self.rfOpenFiles.isChecked(): code += ',{0}{1}None'.format(os.linesep, istring) @@ -247,10 +248,10 @@ if not self.eFilters.text(): code += '""' else: - if self.cFilters.isChecked(): - fmt = '{0}' - else: - fmt = 'self.trUtf8("{0}")' + if self.cFilters.isChecked(): + fmt = '{0}' + else: + fmt = 'self.trUtf8("{0}")' code += fmt.format(self.eFilters.text()) if self.rfSaveFile.isChecked(): code += ',{0}{1}None'.format(os.linesep, istring)
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from .Ui_FontDialogWizardDialog import Ui_FontDialogWizardDialog + class FontDialogWizardDialog(QDialog, Ui_FontDialogWizardDialog): """ Class implementing the font dialog wizard dialog. @@ -68,7 +69,7 @@ @pyqtSlot() def on_fontButton_clicked(self): """ - Private slot to handle the button press to select a font via a font selection + Private slot to handle the button press to select a font via a font selection dialog. """ if self.font is None:
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog + class InputDialogWizardDialog(QDialog, Ui_InputDialogWizardDialog): """ Class implementing the input dialog wizard dialog. @@ -170,7 +171,7 @@ code += 'self.trUtf8("{0}"),{1}{2}'.format( self.eLabel.text(), os.linesep, istring) code += '{0}, {1}, {2}, {3:d}){4}'.format( - doubleDefault, doubleFrom, doubleTo, + doubleDefault, doubleFrom, doubleTo, self.sDoubleDecimals.value(), estring) elif self.rItem.isChecked(): code += 'getItem({0}{1}'.format(os.linesep, istring) @@ -193,4 +194,4 @@ @param indString string used for indentation (space or tab) (string) @return generated code (string) """ - return self.__getCode4(indLevel, indString) \ No newline at end of file + return self.__getCode4(indLevel, indString)
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog + class MessageBoxWizardDialog(QDialog, Ui_MessageBoxWizardDialog): """ Class implementing the message box wizard dialog. @@ -32,25 +33,25 @@ # keep the following three lists in sync self.buttonsList = [ - self.trUtf8("No button"), - self.trUtf8("Abort"), - self.trUtf8("Apply"), - self.trUtf8("Cancel"), - self.trUtf8("Close"), - self.trUtf8("Discard"), - self.trUtf8("Help"), - self.trUtf8("Ignore"), - self.trUtf8("No"), - self.trUtf8("No to all"), - self.trUtf8("Ok"), - self.trUtf8("Open"), - self.trUtf8("Reset"), - self.trUtf8("Restore defaults"), - self.trUtf8("Retry"), - self.trUtf8("Save"), - self.trUtf8("Save all"), - self.trUtf8("Yes"), - self.trUtf8("Yes to all"), + self.trUtf8("No button"), + self.trUtf8("Abort"), + self.trUtf8("Apply"), + self.trUtf8("Cancel"), + self.trUtf8("Close"), + self.trUtf8("Discard"), + self.trUtf8("Help"), + self.trUtf8("Ignore"), + self.trUtf8("No"), + self.trUtf8("No to all"), + self.trUtf8("Ok"), + self.trUtf8("Open"), + self.trUtf8("Reset"), + self.trUtf8("Restore defaults"), + self.trUtf8("Retry"), + self.trUtf8("Save"), + self.trUtf8("Save all"), + self.trUtf8("Yes"), + self.trUtf8("Yes to all"), ] self.buttonsCodeListBinary = [ QMessageBox.NoButton, @@ -160,7 +161,7 @@ QMessageBox.StandardButtons(buttons), defaultButton ) - elif self.rWarning.isChecked(): + elif self.rWarning.isChecked(): QMessageBox.warning(self, self.eCaption.text(), self.eMessage.toPlainText(), @@ -281,7 +282,7 @@ btnCode += '{0}{1}{2})'.format(os.linesep, istring2, joinstring.join(buttons)) defaultIndex = self.defaultCombo.currentIndex() if defaultIndex: - btnCode += ',{0}{1}{2}'.format(os.linesep, istring, + btnCode += ',{0}{1}{2}'.format(os.linesep, istring, self.buttonsCodeListText[defaultIndex]) return btnCode @@ -319,7 +320,7 @@ elif self.rWarning.isChecked(): msgdlg = "res = QMessageBox.warning({0},{1}".format(parent, os.linesep) else: - msgdlg ="res = QMessageBox.critical({0},{1}".format(parent, os.linesep) + msgdlg = "res = QMessageBox.critical({0},{1}".format(parent, os.linesep) msgdlg += '{0}self.trUtf8("{1}")'.format(istring, self.eCaption.text()) if not self.rAboutQt.isChecked(): @@ -327,5 +328,5 @@ os.linesep, istring, self.eMessage.toPlainText()) if not self.rAbout.isChecked() and not self.rAboutQt.isChecked(): msgdlg += self.__getButtonCode(istring, indString) - msgdlg +='){0}'.format(estring) + msgdlg += '){0}'.format(estring) return msgdlg
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,23 +18,23 @@ Class implementing a dialog for entering character classes. """ specialChars = { - 4 : "\\a", - 5 : "\\f", - 6 : "\\n", - 7 : "\\r", - 8 : "\\t", - 9 : "\\v" + 4: "\\a", + 5: "\\f", + 6: "\\n", + 7: "\\r", + 8: "\\t", + 9: "\\v" } predefinedClasses = ["\\s", "\\S", "\\w", "\\W", "\\d", "\\D"] - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor @param parent parent widget (QWidget) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.comboItems = [] @@ -81,7 +81,7 @@ self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) - hspacer0 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + hspacer0 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) @@ -114,7 +114,7 @@ self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) - hspacer1 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + hspacer1 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) self.moreRangesButton.clicked[()].connect(self.__addRangesLine)
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,18 +24,19 @@ import Utilities + class PyRegExpWizardWidget(QWidget, Ui_PyRegExpWizardDialog): """ Class implementing the Python re wizard dialog. """ - def __init__(self, parent = None, fromEric = True): + def __init__(self, parent=None, fromEric=True): """ Constructor @param parent parent widget (QWidget) @param fromEric flag indicating a call from within eric5 """ - QWidget.__init__(self,parent) + QWidget.__init__(self, parent) self.setupUi(self) # initialize icons of the tool buttons @@ -74,7 +75,7 @@ self.buttonBox.addButton(self.trUtf8("Execute"), QDialogButtonBox.ActionRole) self.executeButton.setToolTip(self.trUtf8("Execute the regular expression")) self.nextButton = \ - self.buttonBox.addButton(self.trUtf8("Next match"), + self.buttonBox.addButton(self.trUtf8("Next match"), QDialogButtonBox.ActionRole) self.nextButton.setToolTip( self.trUtf8("Show the next match of the regular expression")) @@ -96,7 +97,7 @@ self.importCheckBox.hide() self.regexpTextEdit.setFocus() - def __insertString(self, s, steps = 0): + def __insertString(self, s, steps=0): """ Private method to insert a string into line edit and move cursor. @@ -315,12 +316,12 @@ self.trUtf8("Save regular expression"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return try: - f=open(Utilities.toNativeSeparators(fname), "w", encoding = "utf-8") + f = open(Utilities.toNativeSeparators(fname), "w", encoding="utf-8") f.write(self.regexpTextEdit.toPlainText()) f.close() except IOError as err: @@ -341,7 +342,7 @@ self.trUtf8("RegExp Files (*.rx);;All Files (*)")) if fname: try: - f=open(Utilities.toNativeSeparators(fname), "r", encoding = "utf-8") + f = open(Utilities.toNativeSeparators(fname), "r", encoding="utf-8") regexp = f.read() f.close() self.regexpTextEdit.setPlainText(regexp) @@ -409,7 +410,7 @@ self.trUtf8("""A regular expression must be given.""")) @pyqtSlot() - def on_executeButton_clicked(self, startpos = 0): + def on_executeButton_clicked(self, startpos=0): """ Private slot to execute the entered regexp on the test text. @@ -459,39 +460,39 @@ self.lastMatchEnd = matchobj.end() self.nextButton.setEnabled(True) row += 1 - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Offset"))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem("{0:d}".format(matchobj.start(0)))) row += 1 - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Captures"))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem("{0:d}".format(captures))) row += 1 - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem(self.trUtf8("Text"))) - self.resultTable.setItem(row, 2, + self.resultTable.setItem(row, 2, QTableWidgetItem(self.trUtf8("Characters"))) row += 1 - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Match"))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem(matchobj.group(0))) - self.resultTable.setItem(row, 2, + self.resultTable.setItem(row, 2, QTableWidgetItem("{0:d}".format(len(matchobj.group(0))))) for i in range(1, captures + 1): if matchobj.group(i) is not None: row += 1 self.resultTable.insertRow(row) - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Capture #{0}").format(i))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem(matchobj.group(i))) - self.resultTable.setItem(row, 2, + self.resultTable.setItem(row, 2, QTableWidgetItem("{0:d}".format(len(matchobj.group(i))))) # highlight the matched text @@ -504,10 +505,10 @@ self.resultTable.setRowCount(2) row += 1 if startpos > 0: - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("No more matches"))) else: - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("No matches"))) # remove the highlight @@ -623,11 +624,12 @@ code += '){0}'.format(estring) return code + class PyRegExpWizardDialog(QDialog): """ Class for the dialog variant. """ - def __init__(self, parent = None, fromEric = True): + def __init__(self, parent=None, fromEric=True): """ Constructor @@ -660,18 +662,19 @@ """ return self.cw.getCode(indLevel, indString) + class PyRegExpWizardWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @param parent reference to the parent widget (QWidget) """ QMainWindow.__init__(self, parent) - self.cw = PyRegExpWizardWidget(self, fromEric = False) + self.cw = PyRegExpWizardWidget(self, fromEric=False) size = self.cw.size() self.setCentralWidget(self.cw) self.resize(size)
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,13 +17,13 @@ """ Class implementing a dialog for entering repeat counts. """ - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor @param parent parent widget (QWidget) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.unlimitedButton.setChecked(True)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,23 +18,23 @@ Class implementing a dialog for entering character classes. """ specialChars = { - 4 : "\\a", - 5 : "\\f", - 6 : "\\n", - 7 : "\\r", - 8 : "\\t", - 9 : "\\v" + 4: "\\a", + 5: "\\f", + 6: "\\n", + 7: "\\r", + 8: "\\t", + 9: "\\v" } predefinedClasses = ["\\s", "\\S", "\\w", "\\W", "\\d", "\\D"] - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor @param parent parent widget (QWidget) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.comboItems = [] @@ -81,7 +81,7 @@ self.singlesBox) self.moreSinglesButton.setObjectName("moreSinglesButton") hlayout0.addWidget(self.moreSinglesButton) - hspacer0 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + hspacer0 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) @@ -114,7 +114,7 @@ self.rangesBox) self.moreSinglesButton.setObjectName("moreRangesButton") hlayout1.addWidget(self.moreRangesButton) - hspacer1 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) + hspacer1 = QSpacerItem(30, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) self.moreRangesButton.clicked[()].connect(self.__addRangesLine)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,18 +23,19 @@ import Utilities + class QRegExpWizardWidget(QWidget, Ui_QRegExpWizardDialog): """ Class implementing the QRegExp wizard dialog. """ - def __init__(self, parent = None, fromEric = True): + def __init__(self, parent=None, fromEric=True): """ Constructor @param parent parent widget (QWidget) @param fromEric flag indicating a call from within eric5 """ - QWidget.__init__(self,parent) + QWidget.__init__(self, parent) self.setupUi(self) # initialize icons of the tool buttons @@ -66,7 +67,7 @@ self.buttonBox.addButton(self.trUtf8("Execute"), QDialogButtonBox.ActionRole) self.executeButton.setToolTip(self.trUtf8("Execute the regular expression")) self.nextButton = \ - self.buttonBox.addButton(self.trUtf8("Next match"), + self.buttonBox.addButton(self.trUtf8("Next match"), QDialogButtonBox.ActionRole) self.nextButton.setToolTip( self.trUtf8("Show the next match of the regular expression")) @@ -229,12 +230,12 @@ self.trUtf8("Save regular expression"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return try: - f=open(Utilities.toNativeSeparators(fname), "w", encoding = "utf-8") + f = open(Utilities.toNativeSeparators(fname), "w", encoding="utf-8") f.write(self.regexpLineEdit.text()) f.close() except IOError as err: @@ -255,7 +256,7 @@ self.trUtf8("RegExp Files (*.rx);;All Files (*)")) if fname: try: - f=open(Utilities.toNativeSeparators(fname), "r", encoding = "utf-8") + f = open(Utilities.toNativeSeparators(fname), "r", encoding="utf-8") regexp = f.read() f.close() self.regexpLineEdit.setText(regexp) @@ -313,7 +314,7 @@ self.trUtf8("""A regular expression must be given.""")) @pyqtSlot() - def on_executeButton_clicked(self, startpos = 0): + def on_executeButton_clicked(self, startpos=0): """ Private slot to execute the entered regexp on the test text. @@ -363,22 +364,22 @@ if not wildcard: row += 1 - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Captures"))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem("{0:d}".format(captures))) row += 1 - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem(self.trUtf8("Text"))) - self.resultTable.setItem(row, 2, + self.resultTable.setItem(row, 2, QTableWidgetItem(self.trUtf8("Characters"))) row += 1 - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Match"))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem(re.cap(0))) - self.resultTable.setItem(row, 2, + self.resultTable.setItem(row, 2, QTableWidgetItem("{0:d}".format(re.matchedLength()))) if not wildcard: @@ -386,11 +387,11 @@ if len(re.cap(i)) > 0: row += 1 self.resultTable.insertRow(row) - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("Capture #{0}").format(i))) - self.resultTable.setItem(row, 1, + self.resultTable.setItem(row, 1, QTableWidgetItem(re.cap(i))) - self.resultTable.setItem(row, 2, + self.resultTable.setItem(row, 2, QTableWidgetItem("{0:d}".format(len(re.cap(i))))) else: self.resultTable.setRowCount(3) @@ -405,10 +406,10 @@ self.resultTable.setRowCount(2) row += 1 if startpos > 0: - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("No more matches"))) else: - self.resultTable.setItem(row, 0, + self.resultTable.setItem(row, 0, QTableWidgetItem(self.trUtf8("No matches"))) # remove the highlight @@ -471,11 +472,12 @@ istring, reVar, estring) return code + class QRegExpWizardDialog(QDialog): """ Class for the dialog variant. """ - def __init__(self, parent = None, fromEric = True): + def __init__(self, parent=None, fromEric=True): """ Constructor @@ -508,18 +510,19 @@ """ return self.cw.getCode(indLevel, indString) + class QRegExpWizardWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @param parent reference to the parent widget (QWidget) """ QMainWindow.__init__(self, parent) - self.cw = QRegExpWizardWidget(self, fromEric = False) + self.cw = QRegExpWizardWidget(self, fromEric=False) size = self.cw.size() self.setCentralWidget(self.cw) self.resize(size)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,13 +17,13 @@ """ Class implementing a dialog for entering repeat counts. """ - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor @param parent parent widget (QWidget) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.unlimitedButton.setChecked(True)
--- a/Preferences/ConfigurationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,6 +25,7 @@ from eric5config import getConfig + class ConfigurationPageItem(QTreeWidgetItem): """ Class implementing a QTreeWidgetItem holding the configuration page data. @@ -51,6 +52,7 @@ """ return self.__pageName + class ConfigurationWidget(QWidget): """ Class implementing a dialog for the configuration of eric5. @@ -59,23 +61,23 @@ """ preferencesChanged = pyqtSignal() - DefaultMode = 0 + DefaultMode = 0 HelpBrowserMode = 1 TrayStarterMode = 2 - def __init__(self, parent = None, fromEric = True, displayMode = DefaultMode): + def __init__(self, parent=None, fromEric=True, displayMode=DefaultMode): """ Constructor @param parent The parent widget of this dialog. (QWidget) - @keyparam fromEric flag indicating a dialog generation from within the + @keyparam fromEric flag indicating a dialog generation from within the eric5 ide (boolean) - @keyparam displayMode mode of the configuration dialog + @keyparam displayMode mode of the configuration dialog (DefaultMode, HelpBrowserMode, TrayStarterMode) """ assert displayMode in ( - ConfigurationWidget.DefaultMode, - ConfigurationWidget.HelpBrowserMode, + ConfigurationWidget.DefaultMode, + ConfigurationWidget.HelpBrowserMode, ConfigurationWidget.TrayStarterMode ) @@ -97,179 +99,179 @@ if displayMode == ConfigurationWidget.DefaultMode: self.configItems = { - # key : [display string, pixmap name, dialog module name or + # key : [display string, pixmap name, dialog module name or # page creation function, parent key, # reference to configuration page (must always be last)] # The dialog module must have the module function create to create - # the configuration page. This must have the method save to save + # the configuration page. This must have the method save to save # the settings. - "applicationPage" : \ + "applicationPage": \ [self.trUtf8("Application"), "preferences-application.png", "ApplicationPage", None, None], - "cooperationPage" : \ + "cooperationPage": \ [self.trUtf8("Cooperation"), "preferences-cooperation.png", "CooperationPage", None, None], - "corbaPage" : \ + "corbaPage": \ [self.trUtf8("CORBA"), "preferences-orbit.png", "CorbaPage", None, None], - "emailPage" : \ + "emailPage": \ [self.trUtf8("Email"), "preferences-mail_generic.png", "EmailPage", None, None], - "graphicsPage" : \ + "graphicsPage": \ [self.trUtf8("Graphics"), "preferences-graphics.png", "GraphicsPage", None, None], - "iconsPage" : \ + "iconsPage": \ [self.trUtf8("Icons"), "preferences-icons.png", "IconsPage", None, None], - "networkPage" : \ - [self.trUtf8("Network"), "preferences-network.png", - "NetworkPage", None, None], - "pluginManagerPage" : \ + "networkPage": \ + [self.trUtf8("Network"), "preferences-network.png", + "NetworkPage", None, None], + "pluginManagerPage": \ [self.trUtf8("Plugin Manager"), "preferences-pluginmanager.png", "PluginManagerPage", None, None], - "printerPage" : \ + "printerPage": \ [self.trUtf8("Printer"), "preferences-printer.png", "PrinterPage", None, None], - "py3flakesPage" : \ + "py3flakesPage": \ [self.trUtf8("PyFlakes"), "warning.png", "Py3FlakesPage", None, None], - "pythonPage" : \ + "pythonPage": \ [self.trUtf8("Python"), "preferences-python.png", "PythonPage", None, None], - "qtPage" : \ + "qtPage": \ [self.trUtf8("Qt"), "preferences-qtlogo.png", "QtPage", None, None], - "shellPage" : \ + "shellPage": \ [self.trUtf8("Shell"), "preferences-shell.png", "ShellPage", None, None], - "tasksPage" : \ + "tasksPage": \ [self.trUtf8("Tasks"), "task.png", "TasksPage", None, None], - "templatesPage" : \ + "templatesPage": \ [self.trUtf8("Templates"), "preferences-template.png", "TemplatesPage", None, None], - "terminalPage" : \ + "terminalPage": \ [self.trUtf8("Terminal"), "terminal.png", "TerminalPage", None, None], - "trayStarterPage" : \ + "trayStarterPage": \ [self.trUtf8("Tray Starter"), "erict.png", "TrayStarterPage", None, None], - "vcsPage" : \ + "vcsPage": \ [self.trUtf8("Version Control Systems"), "preferences-vcs.png", "VcsPage", None, None], "0debuggerPage": \ [self.trUtf8("Debugger"), "preferences-debugger.png", None, None, None], - "debuggerGeneralPage" : \ + "debuggerGeneralPage": \ [self.trUtf8("General"), "preferences-debugger.png", "DebuggerGeneralPage", "0debuggerPage", None], - "debuggerPythonPage" : \ + "debuggerPythonPage": \ [self.trUtf8("Python"), "preferences-pyDebugger.png", "DebuggerPythonPage", "0debuggerPage", None], - "debuggerPython3Page" : \ + "debuggerPython3Page": \ [self.trUtf8("Python3"), "preferences-pyDebugger.png", "DebuggerPython3Page", "0debuggerPage", None], - "debuggerRubyPage" : \ + "debuggerRubyPage": \ [self.trUtf8("Ruby"), "preferences-rbDebugger.png", "DebuggerRubyPage", "0debuggerPage", None], - "0editorPage" : \ + "0editorPage": \ [self.trUtf8("Editor"), "preferences-editor.png", None, None, None], - "editorAPIsPage" : \ + "editorAPIsPage": \ [self.trUtf8("APIs"), "preferences-api.png", "EditorAPIsPage", "0editorPage", None], - "editorAutocompletionPage" : \ + "editorAutocompletionPage": \ [self.trUtf8("Autocompletion"), "preferences-autocompletion.png", "EditorAutocompletionPage", "0editorPage", None], - "editorAutocompletionQScintillaPage" : \ + "editorAutocompletionQScintillaPage": \ [self.trUtf8("QScintilla"), "qscintilla.png", - "EditorAutocompletionQScintillaPage", + "EditorAutocompletionQScintillaPage", "editorAutocompletionPage", None], - "editorCalltipsPage" : \ + "editorCalltipsPage": \ [self.trUtf8("Calltips"), "preferences-calltips.png", "EditorCalltipsPage", "0editorPage", None], - "editorCalltipsQScintillaPage" : \ + "editorCalltipsQScintillaPage": \ [self.trUtf8("QScintilla"), "qscintilla.png", "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], - "editorGeneralPage" : \ + "editorGeneralPage": \ [self.trUtf8("General"), "preferences-general.png", "EditorGeneralPage", "0editorPage", None], - "editorFilePage" : \ + "editorFilePage": \ [self.trUtf8("Filehandling"), "preferences-filehandling.png", "EditorFilePage", "0editorPage", None], - "editorSearchPage" : \ + "editorSearchPage": \ [self.trUtf8("Searching"), "preferences-search.png", "EditorSearchPage", "0editorPage", None], - "editorSpellCheckingPage" : \ - [self.trUtf8("Spell checking"), "preferences-spellchecking.png", + "editorSpellCheckingPage": \ + [self.trUtf8("Spell checking"), "preferences-spellchecking.png", "EditorSpellCheckingPage", "0editorPage", None], - "editorStylesPage" : \ + "editorStylesPage": \ [self.trUtf8("Style"), "preferences-styles.png", "EditorStylesPage", "0editorPage", None], - "editorTypingPage" : \ + "editorTypingPage": \ [self.trUtf8("Typing"), "preferences-typing.png", "EditorTypingPage", "0editorPage", None], - "editorExportersPage" : \ + "editorExportersPage": \ [self.trUtf8("Exporters"), "preferences-exporters.png", "EditorExportersPage", "0editorPage", None], - "1editorLexerPage" : \ + "1editorLexerPage": \ [self.trUtf8("Highlighters"), "preferences-highlighting-styles.png", None, "0editorPage", None], - "editorHighlightersPage" : \ - [self.trUtf8("Filetype Associations"), + "editorHighlightersPage": \ + [self.trUtf8("Filetype Associations"), "preferences-highlighter-association.png", "EditorHighlightersPage", "1editorLexerPage", None], - "editorHighlightingStylesPage" : \ - [self.trUtf8("Styles"), + "editorHighlightingStylesPage": \ + [self.trUtf8("Styles"), "preferences-highlighting-styles.png", "EditorHighlightingStylesPage", "1editorLexerPage", None], - "editorKeywordsPage" : \ - [self.trUtf8("Keywords"), "preferences-keywords.png", - "EditorKeywordsPage", "1editorLexerPage", None], - "editorPropertiesPage" : \ + "editorKeywordsPage": \ + [self.trUtf8("Keywords"), "preferences-keywords.png", + "EditorKeywordsPage", "1editorLexerPage", None], + "editorPropertiesPage": \ [self.trUtf8("Properties"), "preferences-properties.png", "EditorPropertiesPage", "1editorLexerPage", None], - "0helpPage" : \ + "0helpPage": \ [self.trUtf8("Help"), "preferences-help.png", None, None, None], - "helpAppearancePage" : \ + "helpAppearancePage": \ [self.trUtf8("Appearance"), "preferences-styles.png", - "HelpAppearancePage", "0helpPage", None], - "helpDocumentationPage" : \ - [self.trUtf8("Help Documentation"), + "HelpAppearancePage", "0helpPage", None], + "helpDocumentationPage": \ + [self.trUtf8("Help Documentation"), "preferences-helpdocumentation.png", "HelpDocumentationPage", "0helpPage", None], - "helpViewersPage" : \ + "helpViewersPage": \ [self.trUtf8("Help Viewers"), "preferences-helpviewers.png", "HelpViewersPage", "0helpPage", None], - "helpWebBrowserPage" : \ + "helpWebBrowserPage": \ [self.trUtf8("Eric Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], - "0projectPage" : \ + "0projectPage": \ [self.trUtf8("Project"), "preferences-project.png", None, None, None], - "projectBrowserPage" : \ + "projectBrowserPage": \ [self.trUtf8("Project Viewer"), "preferences-project.png", "ProjectBrowserPage", "0projectPage", None], - "projectPage" : \ + "projectPage": \ [self.trUtf8("Project"), "preferences-project.png", "ProjectPage", "0projectPage", None], - "multiProjectPage" : \ + "multiProjectPage": \ [self.trUtf8("Multiproject"), "preferences-multiproject.png", "MultiProjectPage", "0projectPage", None], - "0interfacePage" : \ + "0interfacePage": \ [self.trUtf8("Interface"), "preferences-interface.png", - None, None, None], - "interfacePage" : \ + None, None, None], + "interfacePage": \ [self.trUtf8("Interface"), "preferences-interface.png", "InterfacePage", "0interfacePage", None], - "viewmanagerPage" : \ + "viewmanagerPage": \ [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", "ViewmanagerPage", "0interfacePage", None], } @@ -278,45 +280,45 @@ e5App().getObject("PluginManager").getPluginConfigData()) elif displayMode == ConfigurationWidget.HelpBrowserMode: self.configItems = { - # key : [display string, pixmap name, dialog module name or + # key : [display string, pixmap name, dialog module name or # page creation function, parent key, # reference to configuration page (must always be last)] # The dialog module must have the module function create to create - # the configuration page. This must have the method save to save + # the configuration page. This must have the method save to save # the settings. - "networkPage" : \ - [self.trUtf8("Network"), "preferences-network.png", - "NetworkPage", None, None], - "pythonPage" : \ + "networkPage": \ + [self.trUtf8("Network"), "preferences-network.png", + "NetworkPage", None, None], + "pythonPage": \ [self.trUtf8("Python"), "preferences-python.png", "PythonPage", None, None], - "0helpPage" : \ + "0helpPage": \ [self.trUtf8("Help"), "preferences-help.png", None, None, None], - "helpAppearancePage" : \ + "helpAppearancePage": \ [self.trUtf8("Appearance"), "preferences-styles.png", - "HelpAppearancePage", "0helpPage", None], - "helpDocumentationPage" : \ - [self.trUtf8("Help Documentation"), + "HelpAppearancePage", "0helpPage", None], + "helpDocumentationPage": \ + [self.trUtf8("Help Documentation"), "preferences-helpdocumentation.png", "HelpDocumentationPage", "0helpPage", None], - "helpViewersPage" : \ + "helpViewersPage": \ [self.trUtf8("Help Viewers"), "preferences-helpviewers.png", "HelpViewersPage", "0helpPage", None], - "helpWebBrowserPage" : \ + "helpWebBrowserPage": \ [self.trUtf8("Eric Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], } elif displayMode == ConfigurationWidget.TrayStarterMode: self.configItems = { - # key : [display string, pixmap name, dialog module name or + # key : [display string, pixmap name, dialog module name or # page creation function, parent key, # reference to configuration page (must always be last)] # The dialog module must have the module function create to create - # the configuration page. This must have the method save to save + # the configuration page. This must have the method save to save # the settings. - "trayStarterPage" : \ + "trayStarterPage": \ [self.trUtf8("Tray Starter"), "erict.png", "TrayStarterPage", None, None], } @@ -327,7 +329,7 @@ for key in sorted(self.configItems.keys()): pageData = self.configItems[key] if pageData[3]: - pitm = self.itmDict[pageData[3]] # get the parent item + pitm = self.itmDict[pageData[3]] # get the parent item else: pitm = self.configList self.itmDict[key] = ConfigurationPageItem(pitm, pageData[0], key, pageData[1]) @@ -504,7 +506,7 @@ if page is None: page = self.emptyPage else: - items = self.configList.findItems(pageData[0], + items = self.configList.findItems(pageData[0], Qt.MatchFixedString | Qt.MatchRecursive) if items: self.configList.setCurrentItem(items[0]) @@ -517,7 +519,7 @@ ssize.setWidth( ssize.width() - self.scrollArea.verticalScrollBar().width() - 2) psize = page.minimumSizeHint() - self.configStack.resize(max(ssize.width(), psize.width()), + self.configStack.resize(max(ssize.width(), psize.width()), max(ssize.height(), psize.height())) if page != self.emptyPage: @@ -529,7 +531,7 @@ self.buttonBox.button(QDialogButtonBox.Reset).setEnabled(False) # reset scrollbars - for sb in [self.scrollArea.horizontalScrollBar(), + for sb in [self.scrollArea.horizontalScrollBar(), self.scrollArea.verticalScrollBar()]: if sb: sb.setValue(0) @@ -622,6 +624,7 @@ if savedState is not None: self.configStack.currentWidget().setState(savedState) + class ConfigurationDialog(QDialog): """ Class for the dialog variant. @@ -630,21 +633,21 @@ """ preferencesChanged = pyqtSignal() - DefaultMode = ConfigurationWidget.DefaultMode + DefaultMode = ConfigurationWidget.DefaultMode HelpBrowserMode = ConfigurationWidget.HelpBrowserMode TrayStarterMode = ConfigurationWidget.TrayStarterMode - def __init__(self, parent = None, name = None, modal = False, - fromEric = True, displayMode = ConfigurationWidget.DefaultMode): + def __init__(self, parent=None, name=None, modal=False, + fromEric=True, displayMode=ConfigurationWidget.DefaultMode): """ Constructor @param parent The parent widget of this dialog. (QWidget) @param name The name of this dialog. string @param modal Flag indicating a modal dialog. (boolean) - @keyparam fromEric flag indicating a dialog generation from within the + @keyparam fromEric flag indicating a dialog generation from within the eric5 ide (boolean) - @keyparam displayMode mode of the configuration dialog + @keyparam displayMode mode of the configuration dialog (DefaultMode, HelpBrowserMode, TrayStarterMode) """ QDialog.__init__(self, parent) @@ -655,8 +658,8 @@ self.layout.setMargin(0) self.layout.setSpacing(0) - self.cw = ConfigurationWidget(self, fromEric = fromEric, - displayMode = displayMode) + self.cw = ConfigurationWidget(self, fromEric=fromEric, + displayMode=displayMode) size = self.cw.size() self.layout.addWidget(self.cw) self.resize(size) @@ -693,11 +696,12 @@ """ self.cw.setPreferences() + class ConfigurationWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -705,7 +709,7 @@ """ QMainWindow.__init__(self, parent) - self.cw = ConfigurationWidget(self, fromEric = False) + self.cw = ConfigurationWidget(self, fromEric=False) size = self.cw.size() self.setCentralWidget(self.cw) self.resize(size) @@ -723,7 +727,7 @@ def accept(self): """ - Protected slot called by the Ok button. + Protected slot called by the Ok button. """ self.cw.setPreferences() Preferences.saveResetLayout()
--- a/Preferences/ConfigurationPages/ApplicationPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/ApplicationPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class ApplicationPage(ConfigurationPageBase, Ui_ApplicationPage): """ Class implementing the Application configuration page. @@ -93,12 +94,13 @@ period = 4 Preferences.setUI("PerformVersionCheck", period) - Preferences.setUser("UseSystemEmailClient", + Preferences.setUser("UseSystemEmailClient", self.systemEmailClientCheckBox.isChecked()) - Preferences.setUI("CheckErrorLog", + Preferences.setUI("CheckErrorLog", self.errorlogCheckBox.isChecked()) + def create(dlg): """ Module function to create the configuration page. @@ -106,4 +108,4 @@ @param dlg reference to the configuration dialog """ page = ApplicationPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/ConfigurationPageBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/ConfigurationPageBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtGui import QWidget, QIcon, QPixmap, QColor, QColorDialog, QFontDialog + class ConfigurationPageBase(QWidget): """ Class implementing the base class for all configuration pages. @@ -50,13 +51,13 @@ """ colour = QColor(prefMethod(colourstr)) size = button.size() - pm = QPixmap(size.width()/2, size.height()/2) + pm = QPixmap(size.width() / 2, size.height() / 2) pm.fill(colour) button.setIconSize(pm.size()) button.setIcon(QIcon(pm)) return colour - def selectColour(self, button, colourVar, showAlpha = False): + def selectColour(self, button, colourVar, showAlpha=False): """ Public method used by the colour selection buttons. @@ -67,7 +68,7 @@ @return selected colour (QColor) """ if showAlpha: - colour = QColorDialog.getColor(colourVar, None, "", + colour = QColorDialog.getColor(colourVar, None, "", QColorDialog.ShowAlphaChannel) else: colour = QColorDialog.getColor(colourVar) @@ -80,7 +81,7 @@ colour = colourVar return colour - def selectFont(self, fontSample, fontVar, showFontInfo = False): + def selectFont(self, fontSample, fontVar, showFontInfo=False): """ Public method used by the font selection buttons.
--- a/Preferences/ConfigurationPages/CooperationPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/CooperationPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ import Preferences + class CooperationPage(ConfigurationPageBase, Ui_CooperationPage): """ Class implementing the Cooperation configuration page. @@ -30,7 +31,7 @@ self.__bannedUserValidator = QRegExpValidator( QRegExp("[a-zA-Z0-9.-]+@" "(?:(?:2(?:[0-4][0-9]|5[0-5])|[01]?[0-9]{1,2})\.){3}" - "(?:2(?:[0-4][0-9]|5[0-5])|[01]?[0-9]{1,2})"), + "(?:2(?:[0-4][0-9]|5[0-5])|[01]?[0-9]{1,2})"), self.bannedUserEdit) self.bannedUserEdit.setValidator(self.__bannedUserValidator) @@ -53,15 +54,15 @@ """ Public slot to save the Cooperation configuration. """ - Preferences.setCooperation("AutoStartServer", + Preferences.setCooperation("AutoStartServer", self.autostartCheckBox.isChecked()) - Preferences.setCooperation("TryOtherPorts", + Preferences.setCooperation("TryOtherPorts", self.otherPortsCheckBox.isChecked()) - Preferences.setCooperation("AutoAcceptConnections", + Preferences.setCooperation("AutoAcceptConnections", self.autoAcceptCheckBox.isChecked()) - Preferences.setCooperation("ServerPort", + Preferences.setCooperation("ServerPort", self.serverPortSpin.value()) - Preferences.setCooperation("MaxPortsToTry", + Preferences.setCooperation("MaxPortsToTry", self.portToTrySpin.value()) bannedUsers = [] @@ -91,7 +92,7 @@ @pyqtSlot() def on_deleteBannedUsersButton_clicked(self): """ - Private slot to remove the selected users from the list of + Private slot to remove the selected users from the list of banned users. """ for itm in self.bannedUsersList.selectedItems(): @@ -107,6 +108,7 @@ self.bannedUsersList.addItem(self.bannedUserEdit.text()) self.bannedUserEdit.clear() + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/CorbaPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/CorbaPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class CorbaPage(ConfigurationPageBase, Ui_CorbaPage): """ Class implementing the Corba configuration page. @@ -55,6 +56,7 @@ if file: self.idlEdit.setText(Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ import Preferences import Utilities + class DebuggerGeneralPage(ConfigurationPageBase, Ui_DebuggerGeneralPage): """ Class implementing the Debugger General configuration page. @@ -65,7 +66,7 @@ if ":" in addressEntry.ip().toString() and not socket.has_ipv6: continue # IPv6 not supported by Python interfaces.append("{0} ({1})"\ - .format(networkInterface.name(), + .format(networkInterface.name(), addressEntry.ip().toString())) self.interfacesCombo.addItems(interfaces) interface = Preferences.getDebugger("NetworkInterface") @@ -137,18 +138,18 @@ """ Public slot to save the Debugger General (1) configuration. """ - Preferences.setDebugger("RemoteDbgEnabled", + Preferences.setDebugger("RemoteDbgEnabled", self.remoteCheckBox.isChecked()) - Preferences.setDebugger("RemoteHost", + Preferences.setDebugger("RemoteHost", self.hostLineEdit.text()) - Preferences.setDebugger("RemoteExecution", + Preferences.setDebugger("RemoteExecution", self.execLineEdit.text()) - Preferences.setDebugger("PassiveDbgEnabled", + Preferences.setDebugger("PassiveDbgEnabled", self.passiveDbgCheckBox.isChecked()) - Preferences.setDebugger("PassiveDbgPort", + Preferences.setDebugger("PassiveDbgPort", self.passiveDbgPortSpinBox.value()) - Preferences.setDebugger("PassiveDbgType", + Preferences.setDebugger("PassiveDbgType", self.passiveDbgBackendCombo.currentText()) if self.allInterfacesButton.isChecked(): @@ -168,19 +169,19 @@ allowedHosts.append(self.allowedHostsList.item(row).text()) Preferences.setDebugger("AllowedHosts", allowedHosts) - Preferences.setDebugger("DebugEnvironmentReplace", + Preferences.setDebugger("DebugEnvironmentReplace", self.debugEnvironReplaceCheckBox.isChecked()) - Preferences.setDebugger("DebugEnvironment", + Preferences.setDebugger("DebugEnvironment", self.debugEnvironEdit.text()) - Preferences.setDebugger("AutomaticReset", + Preferences.setDebugger("AutomaticReset", self.automaticResetCheckBox.isChecked()) - Preferences.setDebugger("Autosave", + Preferences.setDebugger("Autosave", self.debugAutoSaveScriptsCheckBox.isChecked()) - Preferences.setDebugger("ConsoleDbgEnabled", + Preferences.setDebugger("ConsoleDbgEnabled", self.consoleDbgCheckBox.isChecked()) - Preferences.setDebugger("ConsoleDbgCommand", + Preferences.setDebugger("ConsoleDbgCommand", self.consoleDbgEdit.text()) - Preferences.setDebugger("PathTranslation", + Preferences.setDebugger("PathTranslation", self.dbgPathTranslationCheckBox.isChecked()) Preferences.setDebugger("PathTranslationRemote", self.dbgTranslationRemoteEdit.text()) @@ -254,6 +255,7 @@ """ a valid IP v4 or IP v6 address. Aborting...</p>""")\ .format(allowedHost)) + def create(dlg): """ Module function to create the configuration page. @@ -261,4 +263,4 @@ @param dlg reference to the configuration dialog """ page = DebuggerGeneralPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class DebuggerPython3Page(ConfigurationPageBase, Ui_DebuggerPython3Page): """ Class implementing the Debugger Python3 configuration page. @@ -58,9 +59,9 @@ """ Public slot to save the Debugger Python configuration. """ - Preferences.setDebugger("CustomPython3Interpreter", + Preferences.setDebugger("CustomPython3Interpreter", self.customPyCheckBox.isChecked()) - Preferences.setDebugger("Python3Interpreter", + Preferences.setDebugger("Python3Interpreter", self.interpreterEdit.text()) if self.standardButton.isChecked(): dct = "standard" @@ -69,13 +70,13 @@ else: dct = "custom" Preferences.setDebugger("DebugClientType3", dct) - Preferences.setDebugger("DebugClient3", + Preferences.setDebugger("DebugClient3", self.debugClientEdit.text()) - Preferences.setDebugger("Python3Redirect", + Preferences.setDebugger("Python3Redirect", self.pyRedirectCheckBox.isChecked()) - Preferences.setDebugger("Python3NoEncoding", + Preferences.setDebugger("Python3NoEncoding", self.pyNoEncodingCheckBox.isChecked()) - Preferences.setDebugger("Python3Extensions", + Preferences.setDebugger("Python3Extensions", self.sourceExtensionsEdit.text()) @pyqtSlot() @@ -108,6 +109,7 @@ self.debugClientEdit.setText( Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class DebuggerPythonPage(ConfigurationPageBase, Ui_DebuggerPythonPage): """ Class implementing the Debugger Python configuration page. @@ -56,7 +57,7 @@ """ Public slot to save the Debugger Python configuration. """ - Preferences.setDebugger("PythonInterpreter", + Preferences.setDebugger("PythonInterpreter", self.interpreterEdit.text()) if self.standardButton.isChecked(): dct = "standard" @@ -65,13 +66,13 @@ else: dct = "custom" Preferences.setDebugger("DebugClientType", dct) - Preferences.setDebugger("DebugClient", + Preferences.setDebugger("DebugClient", self.debugClientEdit.text()) - Preferences.setDebugger("PythonRedirect", + Preferences.setDebugger("PythonRedirect", self.pyRedirectCheckBox.isChecked()) - Preferences.setDebugger("PythonNoEncoding", + Preferences.setDebugger("PythonNoEncoding", self.pyNoEncodingCheckBox.isChecked()) - Preferences.setDebugger("PythonExtensions", + Preferences.setDebugger("PythonExtensions", self.sourceExtensionsEdit.text()) @pyqtSlot() @@ -104,6 +105,7 @@ self.debugClientEdit.setText( Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class DebuggerRubyPage(ConfigurationPageBase, Ui_DebuggerRubyPage): """ Class implementing the Debugger Ruby configuration page. @@ -42,9 +43,9 @@ """ Public slot to save the Debugger Ruby configuration. """ - Preferences.setDebugger("RubyInterpreter", + Preferences.setDebugger("RubyInterpreter", self.rubyInterpreterEdit.text()) - Preferences.setDebugger("RubyRedirect", + Preferences.setDebugger("RubyRedirect", self.rbRedirectCheckBox.isChecked()) @pyqtSlot() @@ -61,6 +62,7 @@ self.rubyInterpreterEdit.setText( Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ import Preferences import Utilities + class EditorAPIsPage(ConfigurationPageBase, Ui_EditorAPIsPage): """ Class implementing the Editor APIs configuration page. @@ -207,8 +208,8 @@ else: if self.__currentAPI is not None: self.__currentAPI.prepareAPIs( - ondemand = True, - rawList = self.__editorGetApisFromApiList()) + ondemand=True, + rawList=self.__editorGetApisFromApiList()) def __apiPreparationFinished(self): """ @@ -252,6 +253,7 @@ self.apiLanguageComboBox.setCurrentIndex(state) self.on_apiLanguageComboBox_activated(self.apiLanguageComboBox.currentText()) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorAutocompletionPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorAutocompletionPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class EditorAutocompletionPage(ConfigurationPageBase, Ui_EditorAutocompletionPage): """ Class implementing the Editor Autocompletion configuration page. @@ -47,6 +48,7 @@ Preferences.setEditor("AutoCompletionThreshold", self.acThresholdSlider.value()) + def create(dlg): """ Module function to create the configuration page. @@ -54,4 +56,4 @@ @param dlg reference to the configuration dialog """ page = EditorAutocompletionPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,7 +14,8 @@ import Preferences -class EditorAutocompletionQScintillaPage(ConfigurationPageBase, + +class EditorAutocompletionQScintillaPage(ConfigurationPageBase, Ui_EditorAutocompletionQScintillaPage): """ Class implementing the QScintilla Autocompletion configuration page. @@ -56,6 +57,7 @@ elif self.acSourceAllRadioButton.isChecked(): Preferences.setEditor("AutoCompletionSource", QsciScintilla.AcsAll) + def create(dlg): """ Module function to create the configuration page. @@ -63,4 +65,4 @@ @param dlg reference to the configuration dialog """ page = EditorAutocompletionQScintillaPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorCalltipsPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorCalltipsPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class EditorCalltipsPage(ConfigurationPageBase, Ui_EditorCalltipsPage): """ Class implementing the Editor Calltips configuration page. @@ -33,7 +34,7 @@ self.ctVisibleSlider.setValue( Preferences.getEditor("CallTipsVisible")) self.callTipsBackgroundColour = \ - self.initColour("CallTipsBackground", self.calltipsBackgroundButton, + self.initColour("CallTipsBackground", self.calltipsBackgroundButton, Preferences.getEditorColour) self.ctScintillaCheckBox.setChecked( @@ -50,7 +51,7 @@ self.ctVisibleSlider.value()) Preferences.setEditorColour("CallTipsBackground", self.callTipsBackgroundColour) - Preferences.setEditor("CallTipsScintillaOnFail", + Preferences.setEditor("CallTipsScintillaOnFail", self.ctScintillaCheckBox.isChecked()) @pyqtSlot() @@ -59,9 +60,10 @@ Private slot to set the background colour for calltips. """ self.callTipsBackgroundColour = \ - self.selectColour(self.calltipsBackgroundButton, + self.selectColour(self.calltipsBackgroundButton, self.callTipsBackgroundColour) + def create(dlg): """ Module function to create the configuration page. @@ -69,4 +71,4 @@ @param dlg reference to the configuration dialog """ page = EditorCalltipsPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,7 +14,8 @@ import Preferences -class EditorCalltipsQScintillaPage(ConfigurationPageBase, + +class EditorCalltipsQScintillaPage(ConfigurationPageBase, Ui_EditorCalltipsQScintillaPage): """ Class implementing the QScintilla Calltips configuration page. @@ -41,15 +42,16 @@ Public slot to save the EditorCalltips configuration. """ if self.ctNoContextButton.isChecked(): - Preferences.setEditor("CallTipsStyle", + Preferences.setEditor("CallTipsStyle", QsciScintilla.CallTipsNoContext) elif self.ctNoAutoCompletionButton.isChecked(): - Preferences.setEditor("CallTipsStyle", + Preferences.setEditor("CallTipsStyle", QsciScintilla.CallTipsNoAutoCompletionContext) elif self.ctContextButton.isChecked(): - Preferences.setEditor("CallTipsStyle", + Preferences.setEditor("CallTipsStyle", QsciScintilla.CallTipsContext) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorExportersPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorExportersPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ import Preferences + class EditorExportersPage(ConfigurationPageBase, Ui_EditorExportersPage): """ Class implementing the Editor Typing configuration page. @@ -125,19 +126,19 @@ self.odtTabsCheckBox.isChecked()) # PDF - Preferences.setEditorExporter("PDF/Magnification", + Preferences.setEditorExporter("PDF/Magnification", self.pdfMagnificationSlider.value()) - Preferences.setEditorExporter("PDF/Font", + Preferences.setEditorExporter("PDF/Font", self.pdfFontCombo.itemData(self.pdfFontCombo.currentIndex())) - Preferences.setEditorExporter("PDF/PageSize", + Preferences.setEditorExporter("PDF/PageSize", self.pdfPageSizeCombo.itemData(self.pdfPageSizeCombo.currentIndex())) - Preferences.setEditorExporter("PDF/MarginTop", + Preferences.setEditorExporter("PDF/MarginTop", self.pdfMarginTopSpin.value()) - Preferences.setEditorExporter("PDF/MarginBottom", + Preferences.setEditorExporter("PDF/MarginBottom", self.pdfMarginBottomSpin.value()) - Preferences.setEditorExporter("PDF/MarginLeft", + Preferences.setEditorExporter("PDF/MarginLeft", self.pdfMarginLeftSpin.value()) - Preferences.setEditorExporter("PDF/MarginRight", + Preferences.setEditorExporter("PDF/MarginRight", self.pdfMarginRightSpin.value()) # RTF @@ -176,6 +177,7 @@ self.rtfFontSample.setFont(font) self.rtfFont = font + def create(dlg): """ Module function to create the configuration page. @@ -183,4 +185,4 @@ @param dlg reference to the configuration dialog """ page = EditorExportersPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorFilePage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ from Utilities import supportedCodecs import Preferences + class EditorFilePage(ConfigurationPageBase, Ui_EditorFilePage): """ Class implementing the Editor File configuration page. @@ -83,7 +84,7 @@ """ Public slot to save the Editor General configuration. """ - Preferences.setEditor("AutosaveInterval", + Preferences.setEditor("AutosaveInterval", self.autosaveSlider.value()) Preferences.setEditor("CreateBackupFile", self.createBackupFileCheckBox.isChecked()) @@ -93,7 +94,7 @@ if not enc: enc = "utf-8" Preferences.setEditor("DefaultEncoding", enc) - Preferences.setEditor("AdvancedEncodingDetection", + Preferences.setEditor("AdvancedEncodingDetection", self.advEncodingCheckBox.isChecked()) Preferences.setEditor("WarnFilesize", self.warnFilesizeSpinBox.value()) @@ -101,7 +102,7 @@ self.clearBreakpointsCheckBox.isChecked()) Preferences.setEditor("AutoReopen", self.automaticReopenCheckBox.isChecked()) - Preferences.setEditor("StripTrailingWhitespace", + Preferences.setEditor("StripTrailingWhitespace", self.stripWhitespaceCheckBox.isChecked()) Preferences.setEditor("DefaultOpenFilter", self.openFilesFilterComboBox.currentText()) @@ -121,7 +122,7 @@ Preferences.setEditor("AdditionalOpenFilters", self.openFileFilters) Preferences.setEditor("AdditionalSaveFilters", self.saveFileFilters) - def __setDefaultFiltersLists(self, keepSelection = False): + def __setDefaultFiltersLists(self, keepSelection=False): """ Private slot to set the default file filter combo boxes. @@ -133,13 +134,13 @@ selectedSaveFilter = self.saveFilesFilterComboBox.currentText() openFileFiltersList = \ - QScintilla.Lexers.getOpenFileFiltersList(False, withAdditional = False) + \ + QScintilla.Lexers.getOpenFileFiltersList(False, withAdditional=False) + \ self.openFileFilters openFileFiltersList.sort() self.openFilesFilterComboBox.clear() self.openFilesFilterComboBox.addItems(openFileFiltersList) saveFileFiltersList = \ - QScintilla.Lexers.getSaveFileFiltersList(False, withAdditional = False) + \ + QScintilla.Lexers.getSaveFileFiltersList(False, withAdditional=False) + \ self.saveFileFilters saveFileFiltersList.sort() self.saveFilesFilterComboBox.clear() @@ -202,7 +203,7 @@ if self.__checkFileFilter(filter): self.fileFiltersList.addItem(filter) self.__extractFileFilters() - self.__setDefaultFiltersLists(keepSelection = True) + self.__setDefaultFiltersLists(keepSelection=True) @pyqtSlot() def on_editFileFilterButton_clicked(self): @@ -214,13 +215,13 @@ self, self.trUtf8("Add File Filter"), self.trUtf8("Enter the file filter entry:"), - QLineEdit.Normal, + QLineEdit.Normal, filter) if ok and filter: if self.__checkFileFilter(filter): self.fileFiltersList.currentItem().setText(filter) self.__extractFileFilters() - self.__setDefaultFiltersLists(keepSelection = True) + self.__setDefaultFiltersLists(keepSelection=True) @pyqtSlot() def on_deleteFileFilterButton_clicked(self): @@ -229,7 +230,7 @@ """ self.fileFiltersList.takeItem(self.fileFiltersList.currentRow()) self.__extractFileFilters() - self.__setDefaultFiltersLists(keepSelection = True) + self.__setDefaultFiltersLists(keepSelection=True) @pyqtSlot(bool) def on_openFiltersButton_toggled(self, checked): @@ -257,6 +258,7 @@ self.editFileFilterButton.setEnabled(current is not None) self.deleteFileFilterButton.setEnabled(current is not None) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorGeneralPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class EditorGeneralPage(ConfigurationPageBase, Ui_EditorGeneralPage): """ Class implementing the Editor General configuration page. @@ -46,21 +47,21 @@ """ Public slot to save the Editor General configuration. """ - Preferences.setEditor("TabWidth", + Preferences.setEditor("TabWidth", self.tabwidthSlider.value()) - Preferences.setEditor("IndentWidth", + Preferences.setEditor("IndentWidth", self.indentwidthSlider.value()) Preferences.setEditor("IndentationGuides", self.indentguidesCheckBox.isChecked()) - Preferences.setEditor("TabForIndentation", + Preferences.setEditor("TabForIndentation", self.tabforindentationCheckBox.isChecked()) - Preferences.setEditor("TabIndents", + Preferences.setEditor("TabIndents", self.tabindentsCheckBox.isChecked()) Preferences.setEditor("ConvertTabsOnLoad", self.converttabsCheckBox.isChecked()) - Preferences.setEditor("AutoIndentation", + Preferences.setEditor("AutoIndentation", self.autoindentCheckBox.isChecked()) - Preferences.setEditor("CommentColumn0", + Preferences.setEditor("CommentColumn0", self.comment0CheckBox.isChecked()) def on_tabforindentationCheckBox_toggled(self, checked): @@ -73,6 +74,7 @@ self.converttabsCheckBox.setChecked(not checked) self.converttabsCheckBox.setEnabled(not checked) + def create(dlg): """ Module function to create the configuration page. @@ -80,4 +82,4 @@ @param dlg reference to the configuration dialog """ page = EditorGeneralPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,6 +19,7 @@ import Preferences + class EditorHighlightersPage(ConfigurationPageBase, Ui_EditorHighlightersPage): """ Class implementing the Editor Highlighter Associations configuration page. @@ -93,7 +94,7 @@ self.editorFileExtEdit.clear() self.editorLexerCombo.setCurrentIndex(0) self.pygmentsLexerCombo.setCurrentIndex(0) - self.editorLexerList.sortItems(self.editorLexerList.sortColumn(), + self.editorLexerList.sortItems(self.editorLexerList.sortColumn(), self.editorLexerList.header().sortIndicatorOrder()) @pyqtSlot() @@ -156,6 +157,7 @@ self.pygmentsLexerCombo.setEnabled(False) self.pygmentsLabel.setEnabled(False) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,15 +21,16 @@ import Preferences -class EditorHighlightingStylesPage(ConfigurationPageBase, + +class EditorHighlightingStylesPage(ConfigurationPageBase, Ui_EditorHighlightingStylesPage): """ Class implementing the Editor Highlighting Styles configuration page. """ - FAMILYONLY = 0 - SIZEONLY = 1 + FAMILYONLY = 0 + SIZEONLY = 1 FAMILYANDSIZE = 2 - FONT = 99 + FONT = 99 def __init__(self, lexers): """ @@ -135,7 +136,7 @@ @pyqtSlot() def on_foregroundButton_clicked(self): """ - Private method used to select the foreground colour of the selected style + Private method used to select the foreground colour of the selected style and lexer. """ colour = QColorDialog.getColor(self.lexer.color(self.style)) @@ -154,7 +155,7 @@ @pyqtSlot() def on_backgroundButton_clicked(self): """ - Private method used to select the background colour of the selected style + Private method used to select the background colour of the selected style and lexer. """ colour = QColorDialog.getColor(self.lexer.paper(self.style)) @@ -173,7 +174,7 @@ @pyqtSlot() def on_allBackgroundColoursButton_clicked(self): """ - Private method used to select the background colour of all styles of a + Private method used to select the background colour of all styles of a selected lexer. """ colour = QColorDialog.getColor(self.lexer.paper(self.style)) @@ -288,7 +289,7 @@ self, self.trUtf8("Fill to end of line"), self.trUtf8("Select fill to end of line for all styles"), - [on, off], + [on, off], 0, False) if ok: enabled = selection == on @@ -334,7 +335,7 @@ """ Private slot to import the styles of the current lexer. """ - self.__importStyles({self.lexer.language() : self.lexer}) + self.__importStyles({self.lexer.language(): self.lexer}) @pyqtSlot() def on_exportCurrentButton_clicked(self): @@ -458,6 +459,7 @@ self.on_lexerLanguageComboBox_activated(self.lexerLanguageComboBox.currentText()) self.styleElementList.setCurrentRow(state[1]) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class EditorKeywordsPage(ConfigurationPageBase, Ui_EditorKeywordsPage): """ Class implementing the editor highlighter keywords configuration page. @@ -30,7 +31,7 @@ # set initial values self.__keywords = { - "" : ["", "", "", "", "", "", "", "", "", ""] + "": ["", "", "", "", "", "", "", "", "", ""] } languages = sorted([''] + \ list(QScintilla.Lexers.getSupportedLanguages().keys())) @@ -111,6 +112,7 @@ self.currentSet = kwSet self.keywordsEdit.setPlainText(self.__keywords[language][kwSet]) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class EditorPropertiesPage(ConfigurationPageBase, Ui_EditorPropertiesPage): """ Class implementing the Editor Properties configuration page. @@ -247,7 +248,7 @@ self.psFoldAtElseCheckBox.isChecked()) Preferences.setEditor("PostScriptTokenize", self.psMarkTokensCheckBox.isChecked()) - Preferences.setEditor("PostScriptLevel", + Preferences.setEditor("PostScriptLevel", self.psLevelSpinBox.value()) # Povray @@ -294,9 +295,10 @@ # YAML if "YAML" in self.languages: - Preferences.setEditor("YAMLFoldComment", + Preferences.setEditor("YAMLFoldComment", self.foldYamlCommentCheckBox.isChecked()) + def create(dlg): """ Module function to create the configuration page. @@ -304,4 +306,4 @@ @param dlg reference to the configuration dialog """ page = EditorPropertiesPage(dlg.getLexers()) - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorSearchPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorSearchPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class EditorSearchPage(ConfigurationPageBase, Ui_EditorSearchPage): """ Class implementing the Editor Search configuration page. @@ -40,21 +41,21 @@ Preferences.getEditor("MarkOccurrencesTimeout")) self.editorColours["SearchMarkers"] = \ - self.initColour("SearchMarkers", self.searchMarkerButton, + self.initColour("SearchMarkers", self.searchMarkerButton, Preferences.getEditorColour) def save(self): """ Public slot to save the Editor Search configuration. """ - Preferences.setEditor("SearchMarkersEnabled", + Preferences.setEditor("SearchMarkersEnabled", self.searchMarkersEnabledCheckBox.isChecked()) - Preferences.setEditor("QuickSearchMarkersEnabled", + Preferences.setEditor("QuickSearchMarkersEnabled", self.quicksearchMarkersEnabledCheckBox.isChecked()) - Preferences.setEditor("MarkOccurrencesEnabled", + Preferences.setEditor("MarkOccurrencesEnabled", self.occurrencesMarkersEnabledCheckBox.isChecked()) - Preferences.setEditor("MarkOccurrencesTimeout", + Preferences.setEditor("MarkOccurrencesTimeout", self.markOccurrencesTimeoutSpinBox.value()) for key in list(self.editorColours.keys()): @@ -66,9 +67,10 @@ Private slot to set the colour of the search markers. """ self.editorColours["SearchMarkers"] = \ - self.selectColour(self.searchMarkerButton, + self.selectColour(self.searchMarkerButton, self.editorColours["SearchMarkers"], True) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ from QScintilla.SpellChecker import SpellChecker + class EditorSpellCheckingPage(ConfigurationPageBase, Ui_EditorSpellCheckingPage): """ Class implementing the Editor Spellchecking configuration page. @@ -41,8 +42,8 @@ else: self.spellingFrame.setEnabled(False) - self.pwlFileCompleter = E5FileCompleter(self.pwlEdit, showHidden = True) - self.pelFileCompleter = E5FileCompleter(self.pelEdit, showHidden = True) + self.pwlFileCompleter = E5FileCompleter(self.pwlEdit, showHidden=True) + self.pelFileCompleter = E5FileCompleter(self.pelEdit, showHidden=True) # set initial values self.checkingEnabledCheckBox.setChecked( @@ -58,7 +59,7 @@ Preferences.getEditor("SpellCheckingMinWordSize")) self.editorColours["SpellingMarkers"] = \ - self.initColour("SpellingMarkers", self.spellingMarkerButton, + self.initColour("SpellingMarkers", self.spellingMarkerButton, Preferences.getEditorColour) self.pwlEdit.setText(Preferences.getEditor("SpellCheckingPersonalWordList")) @@ -75,15 +76,15 @@ """ Public slot to save the Editor Search configuration. """ - Preferences.setEditor("SpellCheckingEnabled", + Preferences.setEditor("SpellCheckingEnabled", self.checkingEnabledCheckBox.isChecked()) - Preferences.setEditor("SpellCheckingDefaultLanguage", + Preferences.setEditor("SpellCheckingDefaultLanguage", self.defaultLanguageCombo.currentText()) - Preferences.setEditor("SpellCheckStringsOnly", + Preferences.setEditor("SpellCheckStringsOnly", self.stringsOnlyCheckBox.isChecked()) - Preferences.setEditor("SpellCheckingMinWordSize", + Preferences.setEditor("SpellCheckingMinWordSize", self.minimumWordSizeSlider.value()) for key in list(self.editorColours.keys()): @@ -92,7 +93,7 @@ Preferences.setEditor("SpellCheckingPersonalWordList", self.pwlEdit.text()) Preferences.setEditor("SpellCheckingPersonalExcludeList", self.pelEdit.text()) - Preferences.setEditor("AutoSpellCheckingEnabled", + Preferences.setEditor("AutoSpellCheckingEnabled", self.enabledCheckBox.isChecked()) Preferences.setEditor("AutoSpellCheckChunkSize", self.chunkSizeSpinBox.value()) @@ -102,7 +103,7 @@ Private slot to set the colour of the spelling markers. """ self.editorColours["SpellingMarkers"] = \ - self.selectColour(self.spellingMarkerButton, + self.selectColour(self.spellingMarkerButton, self.editorColours["SpellingMarkers"], True) @pyqtSlot() @@ -133,6 +134,7 @@ if file: self.pelEdit.setText(Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorStylesPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorStylesPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences + class EditorStylesPage(ConfigurationPageBase, Ui_EditorStylesPage): """ Class implementing the Editor Styles configuration page. @@ -35,9 +36,9 @@ QsciScintilla.CircledFoldStyle, QsciScintilla.BoxedFoldStyle, QsciScintilla.CircledTreeFoldStyle, - QsciScintilla.BoxedTreeFoldStyle, - QsciScintillaCompat.ArrowFoldStyle, - QsciScintillaCompat.ArrowTreeFoldStyle, + QsciScintilla.BoxedTreeFoldStyle, + QsciScintillaCompat.ArrowFoldStyle, + QsciScintillaCompat.ArrowTreeFoldStyle, ] self.edgeModes = [ @@ -83,37 +84,37 @@ Preferences.getEditor("ExtendSelectionToEol")) self.editorColours["CaretForeground"] = \ - self.initColour("CaretForeground", self.caretForegroundButton, + self.initColour("CaretForeground", self.caretForegroundButton, Preferences.getEditorColour) self.editorColours["CaretLineBackground"] = \ - self.initColour("CaretLineBackground", self.caretlineBackgroundButton, + self.initColour("CaretLineBackground", self.caretlineBackgroundButton, Preferences.getEditorColour) self.editorColours["SelectionForeground"] = \ - self.initColour("SelectionForeground", self.selectionForegroundButton, + self.initColour("SelectionForeground", self.selectionForegroundButton, Preferences.getEditorColour) self.editorColours["SelectionBackground"] = \ - self.initColour("SelectionBackground", self.selectionBackgroundButton, + self.initColour("SelectionBackground", self.selectionBackgroundButton, Preferences.getEditorColour) self.editorColours["CurrentMarker"] = \ - self.initColour("CurrentMarker", self.currentLineMarkerButton, + self.initColour("CurrentMarker", self.currentLineMarkerButton, Preferences.getEditorColour) self.editorColours["ErrorMarker"] = \ - self.initColour("ErrorMarker", self.errorMarkerButton, + self.initColour("ErrorMarker", self.errorMarkerButton, Preferences.getEditorColour) self.editorColours["MarginsForeground"] = \ - self.initColour("MarginsForeground", self.marginsForegroundButton, + self.initColour("MarginsForeground", self.marginsForegroundButton, Preferences.getEditorColour) self.editorColours["MarginsBackground"] = \ - self.initColour("MarginsBackground", self.marginsBackgroundButton, + self.initColour("MarginsBackground", self.marginsBackgroundButton, Preferences.getEditorColour) self.editorColours["FoldmarginBackground"] = \ - self.initColour("FoldmarginBackground", self.foldmarginBackgroundButton, + self.initColour("FoldmarginBackground", self.foldmarginBackgroundButton, Preferences.getEditorColour) self.editorColours["FoldMarkersForeground"] = \ - self.initColour("FoldMarkersForeground", self.foldmarkersForegroundButton, + self.initColour("FoldMarkersForeground", self.foldmarkersForegroundButton, Preferences.getEditorColour) self.editorColours["FoldMarkersBackground"] = \ - self.initColour("FoldMarkersBackground", self.foldmarkersBackgroundButton, + self.initColour("FoldMarkersBackground", self.foldmarkersBackgroundButton, Preferences.getEditorColour) self.editorColours["AnnotationsWarningForeground"] = \ @@ -134,22 +135,22 @@ self.edgeLineColumnSlider.setValue( Preferences.getEditor("EdgeColumn")) self.editorColours["Edge"] = \ - self.initColour("Edge", self.edgeBackgroundColorButton, + self.initColour("Edge", self.edgeBackgroundColorButton, Preferences.getEditorColour) self.bracehighlightingCheckBox.setChecked( Preferences.getEditor("BraceHighlighting")) self.editorColours["MatchingBrace"] = \ - self.initColour("MatchingBrace", self.matchingBracesButton, + self.initColour("MatchingBrace", self.matchingBracesButton, Preferences.getEditorColour) self.editorColours["MatchingBraceBack"] = \ self.initColour("MatchingBraceBack", self.matchingBracesBackButton, Preferences.getEditorColour) self.editorColours["NonmatchingBrace"] = \ - self.initColour("NonmatchingBrace", self.nonmatchingBracesButton, + self.initColour("NonmatchingBrace", self.nonmatchingBracesButton, Preferences.getEditorColour) self.editorColours["NonmatchingBraceBack"] = \ - self.initColour("NonmatchingBraceBack", self.nonmatchingBracesBackButton, + self.initColour("NonmatchingBraceBack", self.nonmatchingBracesBackButton, Preferences.getEditorColour) self.zoomfactorSlider.setValue( @@ -160,7 +161,7 @@ self.whitespaceSizeSpinBox.setValue( Preferences.getEditor("WhitespaceSize")) self.editorColours["WhitespaceForeground"] = \ - self.initColour("WhitespaceForeground", self.whitespaceForegroundButton, + self.initColour("WhitespaceForeground", self.whitespaceForegroundButton, Preferences.getEditorColour) self.editorColours["WhitespaceBackground"] = \ self.initColour("WhitespaceBackground", self.whitespaceBackgroundButton, @@ -188,28 +189,28 @@ Preferences.setEditor("UseMonospacedFont", self.monospacedCheckBox.isChecked()) - Preferences.setEditor("LinenoWidth", + Preferences.setEditor("LinenoWidth", self.linenowidthSlider.value()) - Preferences.setEditor("LinenoMargin", + Preferences.setEditor("LinenoMargin", self.linenoCheckBox.isChecked()) - Preferences.setEditor("FoldingMargin", + Preferences.setEditor("FoldingMargin", self.foldingCheckBox.isChecked()) - Preferences.setEditor("UnifiedMargins", + Preferences.setEditor("UnifiedMargins", self.unifiedMarginsCheckBox.isChecked()) Preferences.setEditor("CaretLineVisible", self.caretlineVisibleCheckBox.isChecked()) Preferences.setEditor("ColourizeSelText", self.colourizeSelTextCheckBox.isChecked()) - Preferences.setEditor("CustomSelectionColours", + Preferences.setEditor("CustomSelectionColours", self.customSelColourCheckBox.isChecked()) - Preferences.setEditor("ExtendSelectionToEol", + Preferences.setEditor("ExtendSelectionToEol", self.extentSelEolCheckBox.isChecked()) - Preferences.setEditor("CaretWidth", + Preferences.setEditor("CaretWidth", self.caretWidthSpinBox.value()) - Preferences.setEditor("ShowEOL", + Preferences.setEditor("ShowEOL", self.eolCheckBox.isChecked()) Preferences.setEditor("WrapLongLines", self.wrapLongLinesCheckBox.isChecked()) @@ -221,18 +222,18 @@ Preferences.setEditor("BraceHighlighting", self.bracehighlightingCheckBox.isChecked()) - Preferences.setEditor("ZoomFactor", + Preferences.setEditor("ZoomFactor", self.zoomfactorSlider.value()) - Preferences.setEditor("ShowWhitespace", + Preferences.setEditor("ShowWhitespace", self.whitespaceCheckBox.isChecked()) - Preferences.setEditor("WhitespaceSize", + Preferences.setEditor("WhitespaceSize", self.whitespaceSizeSpinBox.value()) Preferences.setEditor("MiniContextMenu", self.miniMenuCheckBox.isChecked()) - Preferences.setEditor("AnnotationsEnabled", + Preferences.setEditor("AnnotationsEnabled", self.enableAnnotationsCheckBox.isChecked()) for key in list(self.editorColours.keys()): @@ -266,7 +267,7 @@ Private slot to set the foreground colour of the caret. """ self.editorColours["CaretForeground"] = \ - self.selectColour(self.caretForegroundButton, + self.selectColour(self.caretForegroundButton, self.editorColours["CaretForeground"]) @pyqtSlot() @@ -275,7 +276,7 @@ Private slot to set the background colour of the caretline. """ self.editorColours["CaretLineBackground"] = \ - self.selectColour(self.caretlineBackgroundButton, + self.selectColour(self.caretlineBackgroundButton, self.editorColours["CaretLineBackground"], True) @pyqtSlot() @@ -284,7 +285,7 @@ Private slot to set the foreground colour of the selection. """ self.editorColours["SelectionForeground"] = \ - self.selectColour(self.selectionForegroundButton, + self.selectColour(self.selectionForegroundButton, self.editorColours["SelectionForeground"]) @pyqtSlot() @@ -293,7 +294,7 @@ Private slot to set the background colour of the selection. """ self.editorColours["SelectionBackground"] = \ - self.selectColour(self.selectionBackgroundButton, + self.selectColour(self.selectionBackgroundButton, self.editorColours["SelectionBackground"], True) @pyqtSlot() @@ -302,7 +303,7 @@ Private slot to set the colour for the highlight of the current line. """ self.editorColours["CurrentMarker"] = \ - self.selectColour(self.currentLineMarkerButton, + self.selectColour(self.currentLineMarkerButton, self.editorColours["CurrentMarker"], True) @pyqtSlot() @@ -311,7 +312,7 @@ Private slot to set the colour for the highlight of the error line. """ self.editorColours["ErrorMarker"] = \ - self.selectColour(self.errorMarkerButton, + self.selectColour(self.errorMarkerButton, self.editorColours["ErrorMarker"], True) @pyqtSlot() @@ -320,7 +321,7 @@ Private slot to set the foreground colour for the margins. """ self.editorColours["MarginsForeground"] = \ - self.selectColour(self.marginsForegroundButton, + self.selectColour(self.marginsForegroundButton, self.editorColours["MarginsForeground"]) @pyqtSlot() @@ -329,7 +330,7 @@ Private slot to set the background colour for the margins. """ self.editorColours["MarginsBackground"] = \ - self.selectColour(self.marginsBackgroundButton, + self.selectColour(self.marginsBackgroundButton, self.editorColours["MarginsBackground"]) @pyqtSlot() @@ -338,7 +339,7 @@ Private slot to set the background colour for the foldmargin. """ self.editorColours["FoldmarginBackground"] = \ - self.selectColour(self.foldmarginBackgroundButton, + self.selectColour(self.foldmarginBackgroundButton, self.editorColours["FoldmarginBackground"]) @pyqtSlot() @@ -355,7 +356,7 @@ Private slot to set the colour for highlighting matching braces. """ self.editorColours["MatchingBrace"] = \ - self.selectColour(self.matchingBracesButton, + self.selectColour(self.matchingBracesButton, self.editorColours["MatchingBrace"]) @pyqtSlot() @@ -364,7 +365,7 @@ Private slot to set the background colour for highlighting matching braces. """ self.editorColours["MatchingBraceBack"] = \ - self.selectColour(self.matchingBracesBackButton, + self.selectColour(self.matchingBracesBackButton, self.editorColours["MatchingBraceBack"]) @pyqtSlot() @@ -373,7 +374,7 @@ Private slot to set the colour for highlighting nonmatching braces. """ self.editorColours["NonmatchingBrace"] = \ - self.selectColour(self.nonmatchingBracesButton, + self.selectColour(self.nonmatchingBracesButton, self.editorColours["NonmatchingBrace"]) @pyqtSlot() @@ -382,7 +383,7 @@ Private slot to set the background colour for highlighting nonmatching braces. """ self.editorColours["NonmatchingBraceBack"] = \ - self.selectColour(self.nonmatchingBracesBackButton, + self.selectColour(self.nonmatchingBracesBackButton, self.editorColours["NonmatchingBraceBack"]) @pyqtSlot() @@ -391,7 +392,7 @@ Private slot to set the foreground colour for the foldmarkers. """ self.editorColours["FoldMarkersForeground"] = \ - self.selectColour(self.foldmarkersForegroundButton, + self.selectColour(self.foldmarkersForegroundButton, self.editorColours["FoldMarkersForeground"]) @pyqtSlot() @@ -400,7 +401,7 @@ Private slot to set the background colour for the margins. """ self.editorColours["FoldMarkersBackground"] = \ - self.selectColour(self.foldmarkersBackgroundButton, + self.selectColour(self.foldmarkersBackgroundButton, self.editorColours["FoldMarkersBackground"]) def polishPage(self): @@ -481,7 +482,7 @@ Private slot to set the foreground colour of visible whitespace. """ self.editorColours["WhitespaceForeground"] = \ - self.selectColour(self.whitespaceForegroundButton, + self.selectColour(self.whitespaceForegroundButton, self.editorColours["WhitespaceForeground"]) @pyqtSlot() @@ -490,9 +491,10 @@ Private slot to set the background colour of visible whitespace. """ self.editorColours["WhitespaceBackground"] = \ - self.selectColour(self.whitespaceBackgroundButton, + self.selectColour(self.whitespaceBackgroundButton, self.editorColours["WhitespaceBackground"]) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/EditorTypingPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorTypingPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class EditorTypingPage(ConfigurationPageBase, Ui_EditorTypingPage): """ Class implementing the Editor Typing configuration page. @@ -146,6 +147,7 @@ index = self.pageIds[' '] self.stackedWidget.setCurrentIndex(index) + def create(dlg): """ Module function to create the configuration page. @@ -153,4 +155,4 @@ @param dlg reference to the configuration dialog """ page = EditorTypingPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EmailPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/EmailPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class EmailPage(ConfigurationPageBase, Ui_EmailPage): """ Class implementing the Email configuration page. @@ -43,7 +44,7 @@ """ Preferences.setUser("MailServer", self.mailServerEdit.text()) - Preferences.setUser("MailServerPort", + Preferences.setUser("MailServerPort", self.portSpin.value()) Preferences.setUser("Email", self.emailEdit.text()) @@ -58,6 +59,7 @@ Preferences.setUser("MailServerUseTLS", self.useTlsCheckBox.isChecked()) + def create(dlg): """ Module function to create the configuration page. @@ -65,4 +67,4 @@ @param dlg reference to the configuration dialog """ page = EmailPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/GraphicsPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/GraphicsPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class GraphicsPage(ConfigurationPageBase, Ui_GraphicsPage): """ Class implementing the Printer configuration page. @@ -49,6 +50,7 @@ """ self.graphicsFontSample.setFont(self.graphicsFont) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class HelpAppearancePage(ConfigurationPageBase, Ui_HelpAppearancePage): """ Class implementing the Help Viewer Appearance page. @@ -38,17 +39,17 @@ self.standardFont = Preferences.getHelp("StandardFont") self.standardFontSample.setFont(self.standardFont) self.standardFontSample.setText("{0} {1}"\ - .format(self.standardFont.family(), + .format(self.standardFont.family(), self.standardFont.pointSize())) self.fixedFont = Preferences.getHelp("FixedFont") self.fixedFontSample.setFont(self.fixedFont) self.fixedFontSample.setText("{0} {1}"\ - .format(self.fixedFont.family(), + .format(self.fixedFont.family(), self.fixedFont.pointSize())) self.helpColours["SaveUrlColor"] = \ - self.initColour("SaveUrlColor", self.secureURLsColourButton, + self.initColour("SaveUrlColor", self.secureURLsColourButton, Preferences.getHelp) self.autoLoadImagesCheckBox.setChecked(Preferences.getHelp("AutoLoadImages")) @@ -92,7 +93,7 @@ Private slot to set the colour for secure URLs. """ self.helpColours["SaveUrlColor"] = \ - self.selectColour(self.secureURLsColourButton, + self.selectColour(self.secureURLsColourButton, self.helpColours["SaveUrlColor"]) @pyqtSlot() @@ -109,6 +110,7 @@ if file: self.styleSheetEdit.setText(Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class HelpDocumentationPage(ConfigurationPageBase, Ui_HelpDocumentationPage): """ Class implementing the Help Documentation configuration page. @@ -144,6 +145,7 @@ if entry: self.pysideDocDirEdit.setText(Utilities.toNativeSeparators(entry)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/HelpViewersPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpViewersPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,6 +19,7 @@ import Preferences import Utilities + class HelpViewersPage(ConfigurationPageBase, Ui_HelpViewersPage): """ Class implementing the Help Viewers configuration page. @@ -124,6 +125,7 @@ if file: self.chmviewerEdit.setText(Utilities.toNativeSeparators(file)) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class HelpWebBrowserPage(ConfigurationPageBase, Ui_HelpWebBrowserPage): """ Class implementing the Help web browser configuration page. @@ -99,7 +100,7 @@ if historyLimit == 1: idx = 0 elif historyLimit == 7: - idx = 1 + idx = 1 elif historyLimit == 14: idx = 2 elif historyLimit == 30: @@ -124,7 +125,7 @@ self.saveGeometryCheckBox.isChecked()) Preferences.setHelp("WebSearchSuggestions", self.webSuggestionsCheckBox.isChecked()) - Preferences.setHelp("ShowPreview", + Preferences.setHelp("ShowPreview", self.showTabPreviews.isChecked()) Preferences.setHelp("JavaEnabled", @@ -135,13 +136,13 @@ self.jsOpenWindowsCheckBox.isChecked()) Preferences.setHelp("JavaScriptCanAccessClipboard", self.jsClipboardCheckBox.isChecked()) - Preferences.setHelp("PluginsEnabled", + Preferences.setHelp("PluginsEnabled", self.pluginsCheckBox.isChecked()) - Preferences.setHelp("SavePasswords", + Preferences.setHelp("SavePasswords", self.savePasswordsCheckBox.isChecked()) if self.dnsPrefetchCheckBox.isEnabled(): - Preferences.setHelp("DnsPrefetchEnabled", + Preferences.setHelp("DnsPrefetchEnabled", self.dnsPrefetchCheckBox.isChecked()) Preferences.setHelp("DiskCacheEnabled", @@ -149,24 +150,24 @@ Preferences.setHelp("DiskCacheSize", self.cacheSizeSpinBox.value()) if self.cacheKeepButton.isChecked(): - Preferences.setHelp("CachePolicy", + Preferences.setHelp("CachePolicy", QNetworkRequest.PreferNetwork) elif self.cachePreferButton.isChecked(): - Preferences.setHelp("CachePolicy", + Preferences.setHelp("CachePolicy", QNetworkRequest.PreferCache) elif self.cacheOfflineButton.isChecked(): - Preferences.setHelp("CachePolicy", + Preferences.setHelp("CachePolicy", QNetworkRequest.AlwaysCache) Preferences.setHelp("PrintBackgrounds", self.printBackgroundsCheckBox.isChecked()) - Preferences.setHelp("StartupBehavior", + Preferences.setHelp("StartupBehavior", self.startupCombo.currentIndex()) - Preferences.setHelp("HomePage", + Preferences.setHelp("HomePage", self.homePageEdit.text()) - Preferences.setHelp("DefaultScheme", + Preferences.setHelp("DefaultScheme", self.defaultSchemeCombo.currentText()) idx = self.expireHistory.currentIndex() @@ -201,6 +202,7 @@ """ self.homePageEdit.setText(Preferences.Prefs.helpDefaults["HomePage"]) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/IconsPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/IconsPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import Preferences import Utilities + class IconsPage(ConfigurationPageBase, Ui_IconsPage): """ Class implementing the Icons configuration page. @@ -168,6 +169,7 @@ dlg = IconsPreviewDialog(self, dir) dlg.exec_() + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -31,5 +31,5 @@ dir = QDir(dirName) for icon in dir.entryList(["*.png"]): - QListWidgetItem(QIcon(os.path.join(dirName, icon)), + QListWidgetItem(QIcon(os.path.join(dirName, icon)), icon, self.iconView)
--- a/Preferences/ConfigurationPages/InterfacePage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/InterfacePage.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,6 +24,7 @@ from eric5config import getConfig + class InterfacePage(ConfigurationPageBase, Ui_InterfacePage): """ Class implementing the Interface configuration page. @@ -113,7 +114,7 @@ Preferences.getUI("SingleCloseButton")) self.uiColours["LogStdErrColour"] = \ - self.initColour("LogStdErrColour", self.stderrTextColourButton, + self.initColour("LogStdErrColour", self.stderrTextColourButton, Preferences.getUI) def save(self): @@ -130,14 +131,14 @@ self.uiBrowsersListFoldersFirstCheckBox.isChecked()) Preferences.setUI("BrowsersHideNonPublic", self.uiBrowsersHideNonPublicCheckBox.isChecked()) - Preferences.setUI("BrowsersListContentsByOccurrence", + Preferences.setUI("BrowsersListContentsByOccurrence", self.uiBrowsersSortByOccurrenceCheckBox.isChecked()) - Preferences.setUI("BrowsersListHiddenFiles", + Preferences.setUI("BrowsersListHiddenFiles", self.uiBrowsersShowHiddenCheckBox.isChecked()) Preferences.setUI("BrowsersFileFilters", self.fileFiltersEdit.text()) - Preferences.setUI("LogViewerAutoRaise", + Preferences.setUI("LogViewerAutoRaise", self.lvAutoRaiseCheckBox.isChecked()) Preferences.setUI("CaptionShowsFilename", self.uiCaptionShowsFilenameGroupBox.isChecked()) @@ -147,13 +148,13 @@ self.styleSheetEdit.text()) # save the dockarea corner settings - Preferences.setUI("TopLeftByLeft", + Preferences.setUI("TopLeftByLeft", self.tlLeftButton.isChecked()) - Preferences.setUI("BottomLeftByLeft", + Preferences.setUI("BottomLeftByLeft", self.blLeftButton.isChecked()) - Preferences.setUI("TopRightByRight", + Preferences.setUI("TopRightByRight", self.trRightButton.isChecked()) - Preferences.setUI("BottomRightByRight", + Preferences.setUI("BottomRightByRight", self.brRightButton.isChecked()) # save the language settings @@ -189,7 +190,7 @@ layout = (layout1, layout2, layout3) Preferences.setUILayout(layout) - Preferences.setUI("SingleCloseButton", + Preferences.setUI("SingleCloseButton", self.tabsCloseButtonCheckBox.isChecked()) for key in list(self.uiColours.keys()): @@ -211,7 +212,7 @@ def __populateLanguageCombo(self): """ - Private method to initialize the language combobox of the Interface + Private method to initialize the language combobox of the Interface configuration page. """ self.languageComboBox.clear() @@ -226,7 +227,7 @@ translator = QTranslator() translator.load(fn) locales[locale] = \ - translator.translate("InterfacePage", "English", + translator.translate("InterfacePage", "English", "Translate this with your language") + \ " ({0})".format(locale) localeList = sorted(list(locales.keys())) @@ -276,9 +277,10 @@ Private slot to set the foreground colour of the caret. """ self.uiColours["LogStdErrColour"] = \ - self.selectColour(self.stderrTextColourButton, + self.selectColour(self.stderrTextColourButton, self.uiColours["LogStdErrColour"]) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/MultiProjectPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/MultiProjectPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class MultiProjectPage(ConfigurationPageBase, Ui_MultiProjectPage): """ Class implementing the Multi Project configuration page. @@ -40,9 +41,10 @@ self.openMasterAutomaticallyCheckBox.isChecked()) Preferences.setMultiProject("XMLTimestamp", self.multiProjectTimestampCheckBox.isChecked()) - Preferences.setMultiProject("RecentNumber", + Preferences.setMultiProject("RecentNumber", self.multiProjectRecentSpinBox.value()) + def create(dlg): """ Module function to create the configuration page. @@ -50,4 +52,4 @@ @param dlg reference to the configuration dialog """ page = MultiProjectPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/NetworkPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/NetworkPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ import Preferences import Utilities + class NetworkPage(ConfigurationPageBase, Ui_NetworkPage): """ Class implementing the Network configuration page. @@ -73,9 +74,9 @@ """ Public slot to save the Application configuration. """ - Preferences.setUI("DownloadPath", + Preferences.setUI("DownloadPath", self.downloadDirEdit.text()) - Preferences.setUI("RequestDownloadFilename", + Preferences.setUI("RequestDownloadFilename", self.requestFilenameCheckBox.isChecked()) if self.cleanupNeverButton.isChecked(): policy = DownloadManager.RemoveNever @@ -87,9 +88,9 @@ Preferences.setUI("UseProxy", self.proxyGroup.isChecked()) - Preferences.setUI("UseSystemProxy", + Preferences.setUI("UseSystemProxy", self.systemProxyButton.isChecked()) - Preferences.setUI("UseHttpProxyForAll", + Preferences.setUI("UseHttpProxyForAll", self.httpProxyForAllCheckBox.isChecked()) Preferences.setUI("ProxyHost/Http", self.httpProxyHostEdit.text()) @@ -121,6 +122,7 @@ dn = dn[:-1] self.downloadDirEdit.setText(dn) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/PluginManagerPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/PluginManagerPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import Preferences import Utilities + class PluginManagerPage(ConfigurationPageBase, Ui_PluginManagerPage): """ Class implementing the Plugin Manager configuration page. @@ -44,9 +45,9 @@ """ Public slot to save the Viewmanager configuration. """ - Preferences.setPluginManager("ActivateExternal", + Preferences.setPluginManager("ActivateExternal", self.activateExternalPluginsCheckBox.isChecked()) - Preferences.setPluginManager("DownloadPath", + Preferences.setPluginManager("DownloadPath", self.downloadDirEdit.text()) @pyqtSlot() @@ -66,6 +67,7 @@ dn = dn[:-1] self.downloadDirEdit.setText(dn) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/PrinterPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/PrinterPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class PrinterPage(ConfigurationPageBase, Ui_PrinterPage): """ Class implementing the Printer configuration page. @@ -64,16 +65,16 @@ Preferences.setPrinter("FirstPageFirst", 1) else: Preferences.setPrinter("FirstPageFirst", 0) - Preferences.setPrinter("Magnification", + Preferences.setPrinter("Magnification", self.printMagnificationSpinBox.value()) Preferences.setPrinter("HeaderFont", self.printheaderFont) - Preferences.setPrinter("LeftMargin", + Preferences.setPrinter("LeftMargin", self.leftMarginSpinBox.value()) - Preferences.setPrinter("RightMargin", + Preferences.setPrinter("RightMargin", self.rightMarginSpinBox.value()) - Preferences.setPrinter("TopMargin", + Preferences.setPrinter("TopMargin", self.topMarginSpinBox.value()) - Preferences.setPrinter("BottomMargin", + Preferences.setPrinter("BottomMargin", self.bottomMarginSpinBox.value()) @pyqtSlot() @@ -90,6 +91,7 @@ """ self.printheaderFontSample.setFont(self.printheaderFont) + def create(dlg): """ Module function to create the configuration page. @@ -97,4 +99,4 @@ @param dlg reference to the configuration dialog """ page = PrinterPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ import Preferences + class ProjectBrowserPage(ConfigurationPageBase, Ui_ProjectBrowserPage): """ Class implementing the Project Browser configuration page. @@ -37,11 +38,11 @@ # set initial values self.projectTypeCombo.addItem('', '') - self.__projectBrowserFlags = {'' : 0} + self.__projectBrowserFlags = {'': 0} try: projectTypes = e5App().getObject("Project").getProjectTypes() for projectType in sorted(projectTypes.keys()): - self.projectTypeCombo.addItem(projectTypes[projectType], + self.projectTypeCombo.addItem(projectTypes[projectType], projectType) self.__projectBrowserFlags[projectType] = \ Preferences.getProjectBrowserFlags(projectType) @@ -49,7 +50,7 @@ self.pbGroup.setEnabled(False) self.projectBrowserColours["Highlighted"] = \ - self.initColour("Highlighted", self.pbHighlightedButton, + self.initColour("Highlighted", self.pbHighlightedButton, Preferences.getProjectBrowserColour) self.followEditorCheckBox.setChecked( @@ -64,9 +65,9 @@ for key in list(self.projectBrowserColours.keys()): Preferences.setProjectBrowserColour(key, self.projectBrowserColours[key]) - Preferences.setProject("FollowEditor", + Preferences.setProject("FollowEditor", self.followEditorCheckBox.isChecked()) - Preferences.setProject("HideGeneratedForms", + Preferences.setProject("HideGeneratedForms", self.hideGeneratedCheckBox.isChecked()) if self.pbGroup.isEnabled(): @@ -79,11 +80,11 @@ @pyqtSlot() def on_pbHighlightedButton_clicked(self): """ - Private slot to set the colour for highlighted entries of the + Private slot to set the colour for highlighted entries of the project others browser. """ self.projectBrowserColours["Highlighted"] = \ - self.selectColour(self.pbHighlightedButton, + self.selectColour(self.pbHighlightedButton, self.projectBrowserColours["Highlighted"]) def __storeProjectBrowserFlags(self, projectType): @@ -140,6 +141,7 @@ self.projectTypeCombo.itemData(index)) self.__currentProjectTypeIndex = index + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/ProjectPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/ProjectPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class ProjectPage(ConfigurationPageBase, Ui_ProjectPage): """ Class implementing the Project configuration page. @@ -78,11 +79,12 @@ self.projectAutoCompileResourcesCheckBox.isChecked()) Preferences.setProject("XMLTimestamp", self.projectTimestampCheckBox.isChecked()) - Preferences.setProject("RecentNumber", + Preferences.setProject("RecentNumber", self.projectRecentSpinBox.value()) Preferences.setProject("DeterminePyFromProject", self.pythonVariantCheckBox.isChecked()) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/Py3FlakesPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/Py3FlakesPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class Py3FlakesPage(ConfigurationPageBase, Ui_Py3FlakesPage): """ Class implementing the Python configuration page. @@ -34,11 +35,12 @@ """ Public slot to save the Python configuration. """ - Preferences.setFlakes("IncludeInSyntaxCheck", + Preferences.setFlakes("IncludeInSyntaxCheck", self.includeCheckBox.isChecked()) - Preferences.setFlakes("IgnoreStarImportWarnings", + Preferences.setFlakes("IgnoreStarImportWarnings", self.ignoreStarImportCheckBox.isChecked()) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/PythonPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/PythonPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ import Preferences from Utilities import supportedCodecs + class PythonPage(ConfigurationPageBase, Ui_PythonPage): """ Class implementing the Python configuration page. @@ -56,11 +57,12 @@ enc = "utf-8" Preferences.setSystem("IOEncoding", enc) - Preferences.setDebugger("PythonExtensions", + Preferences.setDebugger("PythonExtensions", self.py2ExtensionsEdit.text()) - Preferences.setDebugger("Python3Extensions", + Preferences.setDebugger("Python3Extensions", self.py3ExtensionsEdit.text()) + def create(dlg): """ Module function to create the configuration page. @@ -68,4 +70,4 @@ @param dlg reference to the configuration dialog """ page = PythonPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/QtPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/QtPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ import Preferences import Utilities + class QtPage(ConfigurationPageBase, Ui_QtPage): """ Class implementing the Qt configuration page. @@ -85,7 +86,7 @@ Private slot to update the Qt4 tools sample label. """ self.qt4SampleLabel.setText("Sample: {0}designer{1}"\ - .format(self.qt4PrefixEdit.text(), + .format(self.qt4PrefixEdit.text(), self.qt4PostfixEdit.text())) @pyqtSlot(str) @@ -106,6 +107,7 @@ """ self.__updateQt4Sample() + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/ShellPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/ShellPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class ShellPage(ConfigurationPageBase, Ui_ShellPage): """ Class implementing the Shell configuration page. @@ -69,7 +70,7 @@ self.shellSyntaxHighlightingCheckBox.isChecked()) Preferences.setShell("MaxHistoryEntries", self.shellHistorySpinBox.value()) - Preferences.setShell("ShowStdOutErr", + Preferences.setShell("ShowStdOutErr", self.stdOutErrCheckBox.isChecked()) Preferences.setShell("MonospacedFont", self.monospacedFont) @@ -99,6 +100,7 @@ self.monospacedFontSample.setFont(self.monospacedFont) self.marginsFontSample.setFont(self.marginsFont) + def create(dlg): """ Module function to create the configuration page. @@ -106,4 +108,4 @@ @param dlg reference to the configuration dialog """ page = ShellPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/TasksPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/TasksPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class TasksPage(ConfigurationPageBase, Ui_TasksPage): """ Class implementing the Tasks configuration page. @@ -36,13 +37,13 @@ self.tasksColours["TasksColour"] = \ self.initColour("TasksColour", self.tasksColourButton, Preferences.getTasks) self.tasksColours["TasksBugfixColour"] = \ - self.initColour("TasksBugfixColour", self.tasksBugfixColourButton, + self.initColour("TasksBugfixColour", self.tasksBugfixColourButton, Preferences.getTasks) self.tasksColours["TasksBgColour"] = \ - self.initColour("TasksBgColour", self.tasksBgColourButton, + self.initColour("TasksBgColour", self.tasksBgColourButton, Preferences.getTasks) self.tasksColours["TasksProjectBgColour"] = \ - self.initColour("TasksProjectBgColour", self.tasksProjectBgColourButton, + self.initColour("TasksProjectBgColour", self.tasksProjectBgColourButton, Preferences.getTasks) def save(self): @@ -69,7 +70,7 @@ Private slot to set the colour for bugfix tasks. """ self.tasksColours["TasksBugfixColour"] = \ - self.selectColour(self.tasksBugfixColourButton, + self.selectColour(self.tasksBugfixColourButton, self.tasksColours["TasksBugfixColour"]) @pyqtSlot() @@ -78,7 +79,7 @@ Private slot to set the background colour for global tasks. """ self.tasksColours["TasksBgColour"] = \ - self.selectColour(self.tasksBgColourButton, + self.selectColour(self.tasksBgColourButton, self.tasksColours["TasksBgColour"]) @pyqtSlot() @@ -87,9 +88,10 @@ Private slot to set the backgroundcolour for project tasks. """ self.tasksColours["TasksProjectBgColour"] = \ - self.selectColour(self.tasksProjectBgColourButton, + self.selectColour(self.tasksProjectBgColourButton, self.tasksColours["TasksProjectBgColour"]) + def create(dlg): """ Module function to create the configuration page. @@ -97,4 +99,4 @@ @param dlg reference to the configuration dialog """ page = TasksPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/TemplatesPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/TemplatesPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ import Preferences + class TemplatesPage(ConfigurationPageBase, Ui_TemplatesPage): """ Class implementing the Templates configuration page. @@ -50,6 +51,7 @@ Preferences.setTemplates("ShowTooltip", self.templatesToolTipCheckBox.isChecked()) + def create(dlg): """ Module function to create the configuration page. @@ -57,4 +59,4 @@ @param dlg reference to the configuration dialog """ page = TemplatesPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/TerminalPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/TerminalPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ import Preferences import Utilities + class TerminalPage(ConfigurationPageBase, Ui_TerminalPage): """ Class implementing the Terminal configuration page. @@ -72,9 +73,9 @@ self.monospacedCheckBox.isChecked()) Preferences.setTerminal("MarginsFont", self.marginsFont) - Preferences.setTerminal("Shell", + Preferences.setTerminal("Shell", self.shellCombo.currentText()) - Preferences.setTerminal("ShellInteractive", + Preferences.setTerminal("ShellInteractive", self.interactiveCheckBox.isChecked()) @pyqtSlot() @@ -99,6 +100,7 @@ self.monospacedFontSample.setFont(self.monospacedFont) self.marginsFontSample.setFont(self.marginsFont) + def create(dlg): """ Module function to create the configuration page. @@ -106,4 +108,4 @@ @param dlg reference to the configuration dialog """ page = TerminalPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/TrayStarterPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/TrayStarterPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ import Preferences import UI.PixmapCache + class TrayStarterPage(ConfigurationPageBase, Ui_TrayStarterPage): """ Class implementing the tray starter configuration page. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -57,6 +58,7 @@ iconName = "erict-bwi.png" Preferences.setTrayStarter("TrayStarterIcon", iconName) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/VcsPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/VcsPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class VcsPage(ConfigurationPageBase, Ui_VcsPage): """ Class implementing the VCS configuration page. @@ -41,25 +42,25 @@ Preferences.getVCS("AutoUpdate")) self.projectBrowserColours["VcsAdded"] = \ - self.initColour("VcsAdded", self.pbVcsAddedButton, + self.initColour("VcsAdded", self.pbVcsAddedButton, Preferences.getProjectBrowserColour) self.projectBrowserColours["VcsConflict"] = \ - self.initColour("VcsConflict", self.pbVcsConflictButton, + self.initColour("VcsConflict", self.pbVcsConflictButton, Preferences.getProjectBrowserColour) self.projectBrowserColours["VcsModified"] = \ - self.initColour("VcsModified", self.pbVcsModifiedButton, + self.initColour("VcsModified", self.pbVcsModifiedButton, Preferences.getProjectBrowserColour) self.projectBrowserColours["VcsReplaced"] = \ - self.initColour("VcsReplaced", self.pbVcsReplacedButton, + self.initColour("VcsReplaced", self.pbVcsReplacedButton, Preferences.getProjectBrowserColour) self.projectBrowserColours["VcsUpdate"] = \ - self.initColour("VcsUpdate", self.pbVcsUpdateButton, + self.initColour("VcsUpdate", self.pbVcsUpdateButton, Preferences.getProjectBrowserColour) self.projectBrowserColours["VcsConflict"] = \ - self.initColour("VcsConflict", self.pbVcsConflictButton, + self.initColour("VcsConflict", self.pbVcsConflictButton, Preferences.getProjectBrowserColour) self.projectBrowserColours["VcsRemoved"] = \ - self.initColour("VcsRemoved", self.pbVcsRemovedButton, + self.initColour("VcsRemoved", self.pbVcsRemovedButton, Preferences.getProjectBrowserColour) def save(self): @@ -74,9 +75,9 @@ self.vcsAutoSaveProjectCheckBox.isChecked()) Preferences.setVCS("StatusMonitorInterval", self.vcsStatusMonitorIntervalSpinBox.value()) - Preferences.setVCS("MonitorLocalStatus", + Preferences.setVCS("MonitorLocalStatus", self.vcsMonitorLocalStatusCheckBox.isChecked()) - Preferences.setVCS("AutoUpdate", + Preferences.setVCS("AutoUpdate", self.autoUpdateCheckBox.isChecked()) for key in list(self.projectBrowserColours.keys()): @@ -85,63 +86,64 @@ @pyqtSlot() def on_pbVcsAddedButton_clicked(self): """ - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "added". """ self.projectBrowserColours["VcsAdded"] = \ - self.selectColour(self.pbVcsAddedButton, + self.selectColour(self.pbVcsAddedButton, self.projectBrowserColours["VcsAdded"]) @pyqtSlot() def on_pbVcsConflictButton_clicked(self): """ - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "conflict". """ self.projectBrowserColours["VcsConflict"] = \ - self.selectColour(self.pbVcsConflictButton, + self.selectColour(self.pbVcsConflictButton, self.projectBrowserColours["VcsConflict"]) @pyqtSlot() def on_pbVcsModifiedButton_clicked(self): """ - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "modified". """ self.projectBrowserColours["VcsModified"] = \ - self.selectColour(self.pbVcsModifiedButton, + self.selectColour(self.pbVcsModifiedButton, self.projectBrowserColours["VcsModified"]) @pyqtSlot() def on_pbVcsReplacedButton_clicked(self): """ - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "replaced". """ self.projectBrowserColours["VcsReplaced"] = \ - self.selectColour(self.pbVcsReplacedButton, + self.selectColour(self.pbVcsReplacedButton, self.projectBrowserColours["VcsReplaced"]) @pyqtSlot() def on_pbVcsRemovedButton_clicked(self): """ - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "removed". """ self.projectBrowserColours["VcsRemoved"] = \ - self.selectColour(self.pbVcsRemovedButton, + self.selectColour(self.pbVcsRemovedButton, self.projectBrowserColours["VcsRemoved"]) @pyqtSlot() def on_pbVcsUpdateButton_clicked(self): """ - Private slot to set the background colour for entries with VCS + Private slot to set the background colour for entries with VCS status "needs update". """ self.projectBrowserColours["VcsUpdate"] = \ - self.selectColour(self.pbVcsUpdateButton, + self.selectColour(self.pbVcsUpdateButton, self.projectBrowserColours["VcsUpdate"]) + def create(dlg): """ Module function to create the configuration page.
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ConfigurationPages/ViewmanagerPage.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences + class ViewmanagerPage(ConfigurationPageBase, Ui_ViewmanagerPage): """ Class implementing the Viewmanager configuration page. @@ -62,7 +63,7 @@ self.filenameLengthSpinBox.value()) Preferences.setUI("TabViewManagerFilenameOnly", self.filenameOnlyCheckBox.isChecked()) - Preferences.setUI("RecentNumber", + Preferences.setUI("RecentNumber", self.recentFilesSpinBox.value()) @pyqtSlot(int) @@ -79,6 +80,7 @@ self.previewPixmap.setPixmap(pixmap) self.tabViewGroupBox.setEnabled(workspace == "tabview") + def create(dlg): """ Module function to create the configuration page. @@ -86,4 +88,4 @@ @param dlg reference to the configuration dialog """ page = ViewmanagerPage() - return page \ No newline at end of file + return page
--- a/Preferences/PreferencesLexer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/PreferencesLexer.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ import Preferences + class PreferencesLexerError(Exception): """ Class defining a special error for the PreferencesLexer class. @@ -24,7 +25,7 @@ Constructor """ self._errorMessage = \ - QApplication.translate("PreferencesLexerError", + QApplication.translate("PreferencesLexerError", "Unspecific PreferencesLexer error.") def __repr__(self): @@ -43,6 +44,7 @@ """ return self._errorMessage + class PreferencesLexerLanguageError(PreferencesLexerError): """ Class defining a special error for the PreferencesLexer class. @@ -56,8 +58,9 @@ QApplication.translate("PreferencesLexerError", 'Unsupported Lexer Language: {0}').format(language) + class PreferencesLexer(QsciLexer): - """ + """ Subclass of QsciLexer to implement preferences specific lexer methods. """ def __init__(self, language, parent=None):
--- a/Preferences/ProgramsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ProgramsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -26,7 +26,7 @@ """ Class implementing the Programs page. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -79,60 +79,60 @@ exe = Utilities.isWindowsPlatform() and \ "{0}.exe".format(Utilities.generateQtToolName("lrelease")) or \ Utilities.generateQtToolName("lrelease") - version = self.__createProgramEntry(self.trUtf8("Translation Converter (Qt4)"), + version = self.__createProgramEntry(self.trUtf8("Translation Converter (Qt4)"), exe, '-version', 'lrelease', -1) # 1b. Qt4 Designer exe = Utilities.isWindowsPlatform() and \ "{0}.exe".format(Utilities.generateQtToolName("designer")) or \ Utilities.generateQtToolName("designer") - self.__createProgramEntry(self.trUtf8("Qt4 Designer"), exe, version = version) + self.__createProgramEntry(self.trUtf8("Qt4 Designer"), exe, version=version) # 1c. Qt4 Linguist exe = Utilities.isWindowsPlatform() and \ "{0}.exe".format(Utilities.generateQtToolName("linguist")) or \ Utilities.generateQtToolName("linguist") - self.__createProgramEntry(self.trUtf8("Qt4 Linguist"), exe, version = version) + self.__createProgramEntry(self.trUtf8("Qt4 Linguist"), exe, version=version) # 1d. Qt4 Assistant exe = Utilities.isWindowsPlatform() and \ "{0}.exe".format(Utilities.generateQtToolName("assistant")) or \ Utilities.generateQtToolName("assistant") - self.__createProgramEntry(self.trUtf8("Qt4 Assistant"), exe, version = version) + self.__createProgramEntry(self.trUtf8("Qt4 Assistant"), exe, version=version) # 2. do the PyQt programs # 2a. Translation Extractor PyQt4 - self.__createProgramEntry(self.trUtf8("Translation Extractor (Python, Qt4)"), - Utilities.isWindowsPlatform() and "pylupdate4.exe" or "pylupdate4", + self.__createProgramEntry(self.trUtf8("Translation Extractor (Python, Qt4)"), + Utilities.isWindowsPlatform() and "pylupdate4.exe" or "pylupdate4", '-version', 'pylupdate', -1) # 2b. Forms Compiler PyQt4 - self.__createProgramEntry(self.trUtf8("Forms Compiler (Python, Qt4)"), - Utilities.isWindowsPlatform() and "pyuic4.bat" or "pyuic4", + self.__createProgramEntry(self.trUtf8("Forms Compiler (Python, Qt4)"), + Utilities.isWindowsPlatform() and "pyuic4.bat" or "pyuic4", '--version', 'Python User', 4) # 2c. Resource Compiler PyQt4 - self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, Qt4)"), - Utilities.isWindowsPlatform() and "pyrcc4.exe" or "pyrcc4", + self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, Qt4)"), + Utilities.isWindowsPlatform() and "pyrcc4.exe" or "pyrcc4", '-version', 'Resource Compiler', -1) # 3. do the PySide programs # 3a. Translation Extractor PySide - self.__createProgramEntry(self.trUtf8("Translation Extractor (Python, PySide)"), - Utilities.isWindowsPlatform() and "pyside-lupdate.exe" or "pyside-lupdate", - '-version', '', -1, versionRe = 'lupdate') + self.__createProgramEntry(self.trUtf8("Translation Extractor (Python, PySide)"), + Utilities.isWindowsPlatform() and "pyside-lupdate.exe" or "pyside-lupdate", + '-version', '', -1, versionRe='lupdate') # 3b. Forms Compiler PySide - self.__createProgramEntry(self.trUtf8("Forms Compiler (Python, PySide)"), - Utilities.isWindowsPlatform() and "pyside-uic.bat" or "pyside-uic", + self.__createProgramEntry(self.trUtf8("Forms Compiler (Python, PySide)"), + Utilities.isWindowsPlatform() and "pyside-uic.bat" or "pyside-uic", '--version', 'Python User', 4) # 3.c Resource Compiler PySide - self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, PySide)"), - Utilities.isWindowsPlatform() and "pyside-rcc4.exe" or "pyside-rcc4", + self.__createProgramEntry(self.trUtf8("Resource Compiler (Python, PySide)"), + Utilities.isWindowsPlatform() and "pyside-rcc4.exe" or "pyside-rcc4", '-version', 'Resource Compiler', -1) # 4. do the Ruby programs # 4a. Forms Compiler for Qt4 - self.__createProgramEntry(self.trUtf8("Forms Compiler (Ruby, Qt4)"), - Utilities.isWindowsPlatform() and "rbuic4.exe" or "rbuic4", + self.__createProgramEntry(self.trUtf8("Forms Compiler (Ruby, Qt4)"), + Utilities.isWindowsPlatform() and "rbuic4.exe" or "rbuic4", '-version', 'Qt', -1) # 4b. Resource Compiler for Qt4 - self.__createProgramEntry(self.trUtf8("Resource Compiler (Ruby, Qt4)"), - Utilities.isWindowsPlatform() and "rbrcc.exe" or "rbrcc", + self.__createProgramEntry(self.trUtf8("Resource Compiler (Ruby, Qt4)"), + Utilities.isWindowsPlatform() and "rbrcc.exe" or "rbrcc", '-version', 'Ruby Resource Compiler', -1) # 5. do the CORBA programs @@ -180,18 +180,18 @@ for info in pm.getPluginExeDisplayData(): if info["programEntry"]: self.__createProgramEntry( - info["header"], - info["exe"], - versionCommand = info["versionCommand"], - versionStartsWith = info["versionStartsWith"], - versionPosition = info["versionPosition"], - version = info["version"], - versionCleanup = info["versionCleanup"], + info["header"], + info["exe"], + versionCommand=info["versionCommand"], + versionStartsWith=info["versionStartsWith"], + versionPosition=info["versionPosition"], + version=info["version"], + versionCleanup=info["versionCleanup"], ) else: self.__createEntry( - info["header"], - info["text"], + info["header"], + info["text"], info["version"] ) @@ -201,9 +201,9 @@ self.__hasSearched = True def __createProgramEntry(self, description, exe, - versionCommand = "", versionStartsWith = "", - versionPosition = 0, version = "", - versionCleanup = None, versionRe = None): + versionCommand="", versionStartsWith="", + versionPosition=0, version="", + versionCleanup=None, versionRe=None): """ Private method to generate a program entry. @@ -216,7 +216,7 @@ @keyparam version version string to show (string) @keyparam versionCleanup tuple of two integers giving string positions start and stop for the version string (tuple of integers) - @keyparam versionRe regexp to determine the line identifying version + @keyparam versionRe regexp to determine the line identifying version info (string). Takes precedence over versionStartsWith. @return version string of detected or given version (string) """ @@ -247,8 +247,8 @@ finished = proc.waitForFinished(10000) if finished: output = \ - str(proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace') if versionRe is None: versionRe = "^{0}".format(re.escape(versionStartsWith))
--- a/Preferences/ShortcutDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ShortcutDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,16 +12,17 @@ from .Ui_ShortcutDialog import Ui_ShortcutDialog + class ShortcutDialog(QDialog, Ui_ShortcutDialog): """ Class implementing a dialog for the configuration of a keyboard shortcut. - @signal shortcutChanged(QKeySequence, QKeySequence, bool, string) emitted + @signal shortcutChanged(QKeySequence, QKeySequence, bool, string) emitted after the OK button was pressed """ shortcutChanged = pyqtSignal(QKeySequence, QKeySequence, bool, str) - def __init__(self, parent = None, name = None, modal = False): + def __init__(self, parent=None, name=None, modal=False): """ Constructor @@ -79,7 +80,7 @@ self.hide() self.shortcutChanged.emit( QKeySequence(self.keyLabel.text()), - QKeySequence(self.alternateKeyLabel.text()), + QKeySequence(self.alternateKeyLabel.text()), self.noCheck, self.objectType) def __clear(self):
--- a/Preferences/Shortcuts.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/Shortcuts.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ from E5XML.ShortcutsReader import ShortcutsReader from E5XML.ShortcutsWriter import ShortcutsWriter + def __readShortcut(act, category, prefClass): """ Private function to read a single keyboard shortcut from the settings. @@ -36,7 +37,8 @@ if accel is not None: act.setAlternateShortcut(QKeySequence(accel)) -def readShortcuts(prefClass = Prefs, helpViewer = None, pluginName = None): + +def readShortcuts(prefClass=Prefs, helpViewer=None, pluginName=None): """ Module function to read the keyboard shortcuts for the defined QActions. @@ -104,6 +106,7 @@ # silently ignore non available plugins pass + def __saveShortcut(act, category, prefClass): """ Private function to write a single keyboard shortcut to the settings. @@ -114,13 +117,14 @@ """ if act.objectName(): prefClass.settings.setValue( - "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()), + "Shortcuts/{0}/{1}/Accel".format(category, act.objectName()), act.shortcut().toString()) prefClass.settings.setValue( - "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName()), + "Shortcuts/{0}/{1}/AltAccel".format(category, act.objectName()), act.alternateShortcut().toString()) -def saveShortcuts(prefClass = Prefs): + +def saveShortcuts(prefClass=Prefs): """ Module function to write the keyboard shortcuts for the defined QActions. @@ -179,6 +183,7 @@ for act in e5App().getObject("DummyHelpViewer").getActions(): __saveShortcut(act, "HelpViewer", prefClass) + def exportShortcuts(fn): """ Module function to export the keyboard shortcuts for the defined QActions. @@ -196,10 +201,11 @@ else: E5MessageBox.critical(None, QApplication.translate("Shortcuts", "Export Keyboard Shortcuts"), - QApplication.translate("Shortcuts", + QApplication.translate("Shortcuts", "<p>The keyboard shortcuts could not be written to file <b>{0}</b>.</p>") .format(fn)) + def importShortcuts(fn): """ Module function to import the keyboard shortcuts for the defined E5Actions. @@ -223,11 +229,12 @@ else: E5MessageBox.critical(None, QApplication.translate("Shortcuts", "Import Keyboard Shortcuts"), - QApplication.translate("Shortcuts", + QApplication.translate("Shortcuts", "<p>The keyboard shortcuts could not be read from file <b>{0}</b>.</p>") .format(fn)) return + def __setAction(actions, sdict): """ Private function to write a single keyboard shortcut to the settings. @@ -244,55 +251,56 @@ except KeyError: pass + def setActions(shortcuts): """ Module function to set actions based on new format shortcuts file. - @param shortcuts dictionary containing the accelerator information + @param shortcuts dictionary containing the accelerator information read from a XML file """ if "Project" in shortcuts: - __setAction(e5App().getObject("Project").getActions(), + __setAction(e5App().getObject("Project").getActions(), shortcuts["Project"]) if "General" in shortcuts: - __setAction(e5App().getObject("UserInterface").getActions('ui'), + __setAction(e5App().getObject("UserInterface").getActions('ui'), shortcuts["General"]) if "Wizards" in shortcuts: - __setAction(e5App().getObject("UserInterface").getActions('wizards'), + __setAction(e5App().getObject("UserInterface").getActions('wizards'), shortcuts["Wizards"]) if "Debug" in shortcuts: - __setAction(e5App().getObject("DebugUI").getActions(), + __setAction(e5App().getObject("DebugUI").getActions(), shortcuts["Debug"]) if "Edit" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('edit'), + __setAction(e5App().getObject("ViewManager").getActions('edit'), shortcuts["Edit"]) if "File" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('file'), + __setAction(e5App().getObject("ViewManager").getActions('file'), shortcuts["File"]) if "Search" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('search'), + __setAction(e5App().getObject("ViewManager").getActions('search'), shortcuts["Search"]) if "View" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('view'), + __setAction(e5App().getObject("ViewManager").getActions('view'), shortcuts["View"]) if "Macro" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('macro'), + __setAction(e5App().getObject("ViewManager").getActions('macro'), shortcuts["Macro"]) if "Bookmarks" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('bookmark'), + __setAction(e5App().getObject("ViewManager").getActions('bookmark'), shortcuts["Bookmarks"]) if "Spelling" in shortcuts: - __setAction(e5App().getObject("ViewManager").getActions('spelling'), + __setAction(e5App().getObject("ViewManager").getActions('spelling'), shortcuts["Spelling"]) if "Window" in shortcuts: @@ -306,5 +314,5 @@ __setAction(actions, shortcuts[category]) if "HelpViewer" in shortcuts: - __setAction(e5App().getObject("DummyHelpViewer").getActions(), + __setAction(e5App().getObject("DummyHelpViewer").getActions(), shortcuts["HelpViewer"])
--- a/Preferences/ShortcutsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ShortcutsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -31,10 +31,10 @@ updateShortcuts = pyqtSignal() objectNameRole = Qt.UserRole - noCheckRole = Qt.UserRole + 1 + noCheckRole = Qt.UserRole + 1 objectTypeRole = Qt.UserRole + 2 - def __init__(self, parent = None, name = None, modal = False): + def __init__(self, parent=None, name=None, modal=False): """ Constructor @@ -59,7 +59,7 @@ """ Private method to resort the tree. """ - self.shortcutsList.sortItems(self.shortcutsList.sortColumn(), + self.shortcutsList.sortItems(self.shortcutsList.sortColumn(), self.shortcutsList.header().sortIndicatorOrder()) def __resizeColumns(self): @@ -80,8 +80,8 @@ itm.setExpanded(True) return itm - def __generateShortcutItem(self, category, action, - noCheck = False, objectType = ""): + def __generateShortcutItem(self, category, action, + noCheck=False, objectType=""): """ Private method to generate a keyboard shortcut item. @@ -92,8 +92,8 @@ @keyparam objectType type of the object (string). Objects of the same type are not checked for duplicate shortcuts. """ - itm = QTreeWidgetItem(category, - [action.iconText(), action.shortcut().toString(), + itm = QTreeWidgetItem(category, + [action.iconText(), action.shortcut().toString(), action.alternateShortcut().toString()]) itm.setIcon(0, action.icon()) itm.setData(0, self.objectNameRole, action.objectName()) @@ -173,8 +173,8 @@ categoryItem = self.__generateCategoryItem(category) objectType = e5App().getPluginObjectType(category) for act in ref.getActions(): - self.__generateShortcutItem(categoryItem, act, - objectType = objectType) + self.__generateShortcutItem(categoryItem, act, + objectType=objectType) self.pluginCategoryItems.append(categoryItem) self.helpViewerItem = self.__generateCategoryItem(self.trUtf8("Web Browser")) @@ -198,8 +198,8 @@ self.__editTopItem = itm.parent() - self.shortcutDialog.setKeys(QKeySequence(itm.text(1)), QKeySequence(itm.text(2)), - itm.data(0, self.noCheckRole), + self.shortcutDialog.setKeys(QKeySequence(itm.text(1)), QKeySequence(itm.text(2)), + itm.data(0, self.noCheckRole), itm.data(0, self.objectTypeRole)) self.shortcutDialog.show() @@ -225,8 +225,8 @@ if column != 0: keystr = itm.text(column).title() if not itm.data(0, self.noCheckRole) and \ - not self.__checkShortcut(QKeySequence(keystr), - itm.data(0, self.objectTypeRole), + not self.__checkShortcut(QKeySequence(keystr), + itm.data(0, self.objectTypeRole), itm.parent()): itm.setText(column, "") else: @@ -238,7 +238,7 @@ Private slot to handle the shortcutChanged signal of the shortcut dialog. @param keysequence the keysequence of the changed action (QKeySequence) - @param altKeysequence the alternative keysequence of the changed + @param altKeysequence the alternative keysequence of the changed action (QKeySequence) @param noCheck flag indicating that no uniqueness check should be performed (boolean) @@ -300,7 +300,7 @@ """ to the <b>{1}</b> action. """ """Remove this binding?</p>""") .format(keystr, itm.text(0)), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if res: itm.setText(col, "") return True @@ -318,7 +318,7 @@ """<p><b>{0}</b> hides the <b>{1}</b> action. """ """Remove this binding?</p>""") .format(keystr, itm.text(0)), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if res: itm.setText(col, "") return True @@ -334,7 +334,7 @@ """<b>{1}</b> action. """ """Remove this binding?</p>""") .format(keystr, itm.text(0)), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if res: itm.setText(col, "") return True @@ -363,27 +363,27 @@ """ Private slot to handle the OK button press. """ - self.__saveCategoryActions(self.projectItem, + self.__saveCategoryActions(self.projectItem, e5App().getObject("Project").getActions()) - self.__saveCategoryActions(self.uiItem, + self.__saveCategoryActions(self.uiItem, e5App().getObject("UserInterface").getActions('ui')) - self.__saveCategoryActions(self.wizardsItem, + self.__saveCategoryActions(self.wizardsItem, e5App().getObject("UserInterface").getActions('wizards')) - self.__saveCategoryActions(self.debugItem, + self.__saveCategoryActions(self.debugItem, e5App().getObject("DebugUI").getActions()) - self.__saveCategoryActions(self.editItem, + self.__saveCategoryActions(self.editItem, e5App().getObject("ViewManager").getActions('edit')) - self.__saveCategoryActions(self.fileItem, + self.__saveCategoryActions(self.fileItem, e5App().getObject("ViewManager").getActions('file')) - self.__saveCategoryActions(self.searchItem, + self.__saveCategoryActions(self.searchItem, e5App().getObject("ViewManager").getActions('search')) - self.__saveCategoryActions(self.viewItem, + self.__saveCategoryActions(self.viewItem, e5App().getObject("ViewManager").getActions('view')) - self.__saveCategoryActions(self.macroItem, + self.__saveCategoryActions(self.macroItem, e5App().getObject("ViewManager").getActions('macro')) - self.__saveCategoryActions(self.bookmarkItem, + self.__saveCategoryActions(self.bookmarkItem, e5App().getObject("ViewManager").getActions('bookmark')) - self.__saveCategoryActions(self.spellingItem, + self.__saveCategoryActions(self.spellingItem, e5App().getObject("ViewManager").getActions('spelling')) actions = e5App().getObject("ViewManager").getActions('window') @@ -396,7 +396,7 @@ if ref is not None and hasattr(ref, "getActions"): self.__saveCategoryActions(categoryItem, ref.getActions()) - self.__saveCategoryActions(self.helpViewerItem, + self.__saveCategoryActions(self.helpViewerItem, e5App().getObject("DummyHelpViewer").getActions()) Shortcuts.saveShortcuts() @@ -453,4 +453,4 @@ @param checked state of the shortcuts radio button (boolean) """ if checked: - self.on_searchEdit_textChanged(self.searchEdit.text()) \ No newline at end of file + self.on_searchEdit_textChanged(self.searchEdit.text())
--- a/Preferences/ToolConfigurationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ToolConfigurationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,6 +18,7 @@ from .Ui_ToolConfigurationDialog import Ui_ToolConfigurationDialog import Utilities + class ToolConfigurationDialog(QDialog, Ui_ToolConfigurationDialog): """ Class implementing a configuration dialog for the tools menu. @@ -125,11 +126,11 @@ self.toolsList.addItem(menutext) tool = { - 'menutext' : menutext, - 'icon' : icon, - 'executable' : executable, - 'arguments' : arguments, - 'redirect' : redirect, + 'menutext': menutext, + 'icon': icon, + 'executable': executable, + 'arguments': arguments, + 'redirect': redirect, } self.toollist.append(tool) @@ -171,11 +172,11 @@ return self.toollist[row] = { - 'menutext' : menutext, - 'icon' : icon, - 'executable' : executable, - 'arguments' : arguments, - 'redirect' : redirect, + 'menutext': menutext, + 'icon': icon, + 'executable': executable, + 'arguments': arguments, + 'redirect': redirect, } self.toolsList.currentItem().setText(menutext) self.changeButton.setEnabled(False) @@ -234,11 +235,11 @@ """ self.toolsList.addItem('--') tool = { - 'menutext' : '--', - 'icon' : '', - 'executable' : '', - 'arguments' : '', - 'redirect' : 'no', + 'menutext': '--', + 'icon': '', + 'executable': '', + 'arguments': '', + 'redirect': 'no', } self.toollist.append(tool) @@ -305,7 +306,7 @@ else: self.upButton.setEnabled(False) - if row+1 != len(self.toollist): + if row + 1 != len(self.toollist): self.downButton.setEnabled(True) else: self.downButton.setEnabled(False) @@ -372,9 +373,9 @@ def getToollist(self): """ - Public method to retrieve the tools list. + Public method to retrieve the tools list. - @return a list of tuples containing the menu text, the executable, + @return a list of tuples containing the menu text, the executable, the executables arguments and a redirection flag """ return self.toollist[:]
--- a/Preferences/ToolGroupConfigurationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ToolGroupConfigurationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from .Ui_ToolGroupConfigurationDialog import Ui_ToolGroupConfigurationDialog + class ToolGroupConfigurationDialog(QDialog, Ui_ToolGroupConfigurationDialog): """ Class implementing a configuration dialog for the tool groups. """ - def __init__(self, toolGroups, currentGroup, parent = None): + def __init__(self, toolGroups, currentGroup, parent=None): """ Constructor @@ -111,7 +112,7 @@ self.trUtf8("""<p>Do you really want to delete the tool group""" """ <b>"{0}"</b>?</p>""")\ .format(self.groupsList.currentItem().text()), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return @@ -188,7 +189,7 @@ def getToolGroups(self): """ - Public method to retrieve the tool groups. + Public method to retrieve the tool groups. @return a list of lists containing the group name and the tool group entries @@ -204,4 +205,4 @@ """ tmp = self.toolGroups[itm1] self.toolGroups[itm1] = self.toolGroups[itm2] - self.toolGroups[itm2] = tmp \ No newline at end of file + self.toolGroups[itm2] = tmp
--- a/Preferences/ViewProfileDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/ViewProfileDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,18 +14,19 @@ from .Ui_ViewProfileToolboxesDialog import Ui_ViewProfileToolboxesDialog from .Ui_ViewProfileSidebarsDialog import Ui_ViewProfileSidebarsDialog + class ViewProfileDialog(QDialog): """ Class implementing a dialog to configure the various view profiles. """ - def __init__(self, layout, profiles, separateShell, separateBrowser, parent = None): + def __init__(self, layout, profiles, separateShell, separateBrowser, parent=None): """ Constructor @param layout type of the window layout (string) @param profiles dictionary of tuples containing the visibility of the windows for the various profiles - @param separateShell flag indicating that the Python shell + @param separateShell flag indicating that the Python shell is a separate window (boolean) @param separateBrowser flag indicating that the file browser is a separate window (boolean) @@ -112,15 +113,15 @@ self.profiles["edit"][0][2] = self.ui.epdbCheckBox.isChecked() self.profiles["edit"][0][9] = self.ui.epcoCheckBox.isChecked() self.profiles["edit"][5] = [\ - self.ui.epvtCheckBox.isChecked(), - self.ui.ephtCheckBox.isChecked(), + self.ui.epvtCheckBox.isChecked(), + self.ui.ephtCheckBox.isChecked(), ] # get the debug profile self.profiles["debug"][0][2] = self.ui.dpdbCheckBox.isChecked() self.profiles["debug"][0][9] = self.ui.dpcoCheckBox.isChecked() self.profiles["debug"][5] = [\ - self.ui.dpvtCheckBox.isChecked(), - self.ui.dphtCheckBox.isChecked(), + self.ui.dpvtCheckBox.isChecked(), + self.ui.dphtCheckBox.isChecked(), ] else: # get the edit profile @@ -134,9 +135,9 @@ self.ui.eptevCheckBox.isChecked(), self.ui.epmpbCheckBox.isChecked(), self.ui.eptwCheckBox.isChecked(), - self.ui.epcoCheckBox.isChecked(), - self.ui.epsyCheckBox.isChecked(), - self.ui.epnuCheckBox.isChecked(), + self.ui.epcoCheckBox.isChecked(), + self.ui.epsyCheckBox.isChecked(), + self.ui.epnuCheckBox.isChecked(), ] # get the debug profile @@ -150,9 +151,9 @@ self.ui.dptevCheckBox.isChecked(), self.ui.dpmpbCheckBox.isChecked(), self.ui.dptwCheckBox.isChecked(), - self.ui.dpcoCheckBox.isChecked(), - self.ui.dpsyCheckBox.isChecked(), - self.ui.dpnuCheckBox.isChecked(), + self.ui.dpcoCheckBox.isChecked(), + self.ui.dpsyCheckBox.isChecked(), + self.ui.dpnuCheckBox.isChecked(), ] return self.profiles
--- a/Preferences/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Preferences/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,8 +9,8 @@ The preferences interface consists of a class, which defines the default values for all configuration items and stores the actual values. These values are read and written to the eric5 preferences file by module -functions. The data is stored in a file in a subdirectory of the users home -directory. The individual configuration data is accessed by accessor functions +functions. The data is stored in a file in a subdirectory of the users home +directory. The individual configuration data is accessed by accessor functions defined on the module level. The module is simply imported wherever it is needed with the statement 'import Preferences'. Do not use 'from Preferences import *' to import it. @@ -35,347 +35,348 @@ ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \ OthersBrowserFlag, AllBrowsersFlag + class Prefs(object): """ A class to hold all configuration items for the application. """ # defaults for the variables window varDefaults = { - "LocalsFilter" : "[]", - "GlobalsFilter" : "[]" + "LocalsFilter": "[]", + "GlobalsFilter": "[]" } # defaults for the debugger debuggerDefaults = { - "RemoteDbgEnabled" : False, - "RemoteHost" : "", - "RemoteExecution" : "", - "PassiveDbgEnabled" : False, - "PassiveDbgPort" : 42424, - "PassiveDbgType" : "Python", - "AutomaticReset" : False, - "Autosave" : False, + "RemoteDbgEnabled": False, + "RemoteHost": "", + "RemoteExecution": "", + "PassiveDbgEnabled": False, + "PassiveDbgPort": 42424, + "PassiveDbgType": "Python", + "AutomaticReset": False, + "Autosave": False, "ThreeStateBreakPoints": False, - "SuppressClientExit" : False, - "BreakAlways" : False, - "PythonInterpreter" : "", - "Python3Interpreter" : "", - "CustomPython3Interpreter" : False, - "RubyInterpreter" : "/usr/bin/ruby", - "DebugClientType" : "standard", # supported "standard", "threaded", "custom" - "DebugClient" : "", - "DebugClientType3" : "standard", # supported "standard", "threaded", "custom" - "DebugClient3" : "", - "PythonExtensions" : ".py2 .pyw2 .ptl", + "SuppressClientExit": False, + "BreakAlways": False, + "PythonInterpreter": "", + "Python3Interpreter": "", + "CustomPython3Interpreter": False, + "RubyInterpreter": "/usr/bin/ruby", + "DebugClientType": "standard", # supported "standard", "threaded", "custom" + "DebugClient": "", + "DebugClientType3": "standard", # supported "standard", "threaded", "custom" + "DebugClient3": "", + "PythonExtensions": ".py2 .pyw2 .ptl", # space separated list of Python extensions - "Python3Extensions" : ".py .pyw .py3 .pyw3", + "Python3Extensions": ".py .pyw .py3 .pyw3", # space separated list of Python3 extensions - "DebugEnvironmentReplace" : False, - "DebugEnvironment" : "", - "PythonRedirect" : True, - "PythonNoEncoding" : False, - "Python3Redirect" : True, - "Python3NoEncoding" : False, - "RubyRedirect" : True, - "ConsoleDbgEnabled" : False, - "ConsoleDbgCommand" : "", - "PathTranslation" : False, - "PathTranslationRemote" : "", - "PathTranslationLocal" : "", - "NetworkInterface" : "127.0.0.1", + "DebugEnvironmentReplace": False, + "DebugEnvironment": "", + "PythonRedirect": True, + "PythonNoEncoding": False, + "Python3Redirect": True, + "Python3NoEncoding": False, + "RubyRedirect": True, + "ConsoleDbgEnabled": False, + "ConsoleDbgCommand": "", + "PathTranslation": False, + "PathTranslationRemote": "", + "PathTranslationLocal": "", + "NetworkInterface": "127.0.0.1", } debuggerDefaults["AllowedHosts"] = ["127.0.0.1", "::1%0"] # defaults for the UI settings uiDefaults = { - "Language" : "System", - "Style" : "System", - "StyleSheet" : "", - "ViewManager" : "tabview", - "LayoutType" : "Sidebars", + "Language": "System", + "Style": "System", + "StyleSheet": "", + "ViewManager": "tabview", + "LayoutType": "Sidebars", # allowed values are "DockWindows", "FloatingWindows", "Toolboxes" and "Sidebars" - "LayoutShellEmbedded" : 0, # 0 = separate + "LayoutShellEmbedded": 0, # 0 = separate # 1 = embedded in debug browser - "LayoutFileBrowserEmbedded" : 1, # 0 = separate + "LayoutFileBrowserEmbedded": 1, # 0 = separate # 1 = embedded in debug browser # 2 = embedded in project browser - "BrowsersListFoldersFirst" : True, - "BrowsersHideNonPublic" : False, - "BrowsersListContentsByOccurrence" : False, - "BrowsersListHiddenFiles" : False, - "BrowsersFileFilters" : "*.py[co];*.so;*.dll", - "LogViewerAutoRaise" : True, - "SingleApplicationMode" : False, - "CaptionShowsFilename" : True, - "CaptionFilenameLength" : 100, - "RecentNumber" : 9, - "TopLeftByLeft" : True, - "BottomLeftByLeft" : False, - "TopRightByRight" : True, - "BottomRightByRight" : False, - "TabViewManagerFilenameLength" : 40, - "TabViewManagerFilenameOnly" : True, + "BrowsersListFoldersFirst": True, + "BrowsersHideNonPublic": False, + "BrowsersListContentsByOccurrence": False, + "BrowsersListHiddenFiles": False, + "BrowsersFileFilters": "*.py[co];*.so;*.dll", + "LogViewerAutoRaise": True, + "SingleApplicationMode": False, + "CaptionShowsFilename": True, + "CaptionFilenameLength": 100, + "RecentNumber": 9, + "TopLeftByLeft": True, + "BottomLeftByLeft": False, + "TopRightByRight": True, + "BottomRightByRight": False, + "TabViewManagerFilenameLength": 40, + "TabViewManagerFilenameOnly": True, # the order in ViewProfiles is Project-Viewer, File-Browser, # Debug-Viewer, Python-Shell, Log-Viewer, Task-Viewer, # Templates-Viewer, Multiproject-Viewer, Terminal, Chat, Symbols, # Numbers - "ViewProfiles" : { - "edit" : [ + "ViewProfiles": { + "edit": [ # visibility (0) - [ True, False, False, True, True, True, True, True, - True, True, True, True ], + [True, False, False, True, True, True, True, True, + True, True, True, True], # saved state main window with dock windows (1) b"", # saved states floating windows (2) [b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b""], # saved state main window with floating windows (3) - b"", + b"", # saved state main window with toolbox windows (4) - b"", + b"", # visibility of the toolboxes/sidebars (5) - [ True, True], - # saved states of the splitters and sidebars of the + [True, True], + # saved states of the splitters and sidebars of the # sidebars layout (6) - [b"", b"", b"", b""], + [b"", b"", b"", b""], ], - "debug" : [ + "debug": [ # visibility (0) - [ False, False, True, True, True, True, False, False, - True, False, False, False], + [False, False, True, True, True, True, False, False, + True, False, False, False], # saved state main window with dock windows (1) b"", # saved states floating windows (2) [b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b"", b""], # saved state main window with floating windows (3) - b"", + b"", # saved state main window with toolbox windows (4) - b"", + b"", # visibility of the toolboxes/sidebars (5) - [ False, True], - # saved states of the splitters and sidebars of the + [False, True], + # saved states of the splitters and sidebars of the # sidebars layout (6) - [b"", b"", b"", b""], + [b"", b"", b"", b""], ], }, - "ToolbarManagerState" : QtCore.QByteArray(), - "ShowSplash" : True, - "SingleCloseButton" : False, + "ToolbarManagerState": QtCore.QByteArray(), + "ShowSplash": True, + "SingleCloseButton": False, - "PerformVersionCheck" : 4, # 0 = off + "PerformVersionCheck": 4, # 0 = off # 1 = at startup # 2 = daily # 3 = weekly # 4 = monthly - "UseProxy" : False, - "UseSystemProxy" : True, - "UseHttpProxyForAll" : False, - "ProxyHost/Http" : "", - "ProxyHost/Https" : "", - "ProxyHost/Ftp" : "", - "ProxyPort/Http" : 80, - "ProxyPort/Https" : 443, - "ProxyPort/Ftp" : 21, - "ProxyUser/Http" : "", - "ProxyUser/Https" : "", - "ProxyUser/Ftp" : "", - "ProxyPassword/Http" : "", - "ProxyPassword/Https" : "", - "ProxyPassword/Ftp" : "", + "UseProxy": False, + "UseSystemProxy": True, + "UseHttpProxyForAll": False, + "ProxyHost/Http": "", + "ProxyHost/Https": "", + "ProxyHost/Ftp": "", + "ProxyPort/Http": 80, + "ProxyPort/Https": 443, + "ProxyPort/Ftp": 21, + "ProxyUser/Http": "", + "ProxyUser/Https": "", + "ProxyUser/Ftp": "", + "ProxyPassword/Http": "", + "ProxyPassword/Https": "", + "ProxyPassword/Ftp": "", - "PluginRepositoryUrl5" : \ + "PluginRepositoryUrl5": \ "http://die-offenbachs.homelinux.org/eric/plugins5/repository.xml", - "VersionsUrls5" : [ - "http://die-offenbachs.homelinux.org/eric/snapshots5/versions", - "http://eric-ide.python-projects.org/snapshots5/versions", - ], + "VersionsUrls5": [ + "http://die-offenbachs.homelinux.org/eric/snapshots5/versions", + "http://eric-ide.python-projects.org/snapshots5/versions", + ], - "OpenOnStartup" : 0, # 0 = nothing - # 1 = last file - # 2 = last project - # 3 = last multiproject - # 4 = last global session + "OpenOnStartup": 0, # 0 = nothing + # 1 = last file + # 2 = last project + # 3 = last multiproject + # 4 = last global session - "DownloadPath" : "", - "RequestDownloadFilename" : True, - "CheckErrorLog" : True, + "DownloadPath": "", + "RequestDownloadFilename": True, + "CheckErrorLog": True, - "LogStdErrColour" : QtGui.QColor(QtCore.Qt.red), + "LogStdErrColour": QtGui.QColor(QtCore.Qt.red), } viewProfilesLength = len(uiDefaults["ViewProfiles"]["edit"][2]) iconsDefaults = { - "Path" : [], + "Path": [], } # defaults for the cooperation settings cooperationDefaults = { - "ServerPort" : 42000, - "AutoStartServer" : False, - "TryOtherPorts" : True, - "MaxPortsToTry" : 100, - "AutoAcceptConnections" : False, - "BannedUsers" : [], + "ServerPort": 42000, + "AutoStartServer": False, + "TryOtherPorts": True, + "MaxPortsToTry": 100, + "AutoAcceptConnections": False, + "BannedUsers": [], } # defaults for the editor settings editorDefaults = { - "AutosaveInterval" : 0, - "TabWidth" : 4, - "IndentWidth" : 4, - "LinenoWidth" : 4, - "IndentationGuides" : True, - "UnifiedMargins" : False, - "LinenoMargin" : True, - "FoldingMargin" : True, - "FoldingStyle" : 1, - "TabForIndentation" : False, - "TabIndents" : True, - "ConvertTabsOnLoad" : False, - "AutomaticEOLConversion" : True, - "ShowWhitespace" : False, - "WhitespaceSize" : 1, - "ShowEOL" : False, - "UseMonospacedFont" : False, - "WrapLongLines" : False, - "WarnFilesize" : 512, - "ClearBreaksOnClose" : True, - "StripTrailingWhitespace" : False, - "CommentColumn0" : True, + "AutosaveInterval": 0, + "TabWidth": 4, + "IndentWidth": 4, + "LinenoWidth": 4, + "IndentationGuides": True, + "UnifiedMargins": False, + "LinenoMargin": True, + "FoldingMargin": True, + "FoldingStyle": 1, + "TabForIndentation": False, + "TabIndents": True, + "ConvertTabsOnLoad": False, + "AutomaticEOLConversion": True, + "ShowWhitespace": False, + "WhitespaceSize": 1, + "ShowEOL": False, + "UseMonospacedFont": False, + "WrapLongLines": False, + "WarnFilesize": 512, + "ClearBreaksOnClose": True, + "StripTrailingWhitespace": False, + "CommentColumn0": True, - "EdgeMode" : Qsci.QsciScintilla.EdgeNone, - "EdgeColumn" : 80, + "EdgeMode": Qsci.QsciScintilla.EdgeNone, + "EdgeColumn": 80, - "AutoIndentation" : True, - "BraceHighlighting" : True, - "CreateBackupFile" : False, - "CaretLineVisible" : False, - "CaretWidth" : 1, - "ColourizeSelText" : False, - "CustomSelectionColours" : False, - "ExtendSelectionToEol" : False, + "AutoIndentation": True, + "BraceHighlighting": True, + "CreateBackupFile": False, + "CaretLineVisible": False, + "CaretWidth": 1, + "ColourizeSelText": False, + "CustomSelectionColours": False, + "ExtendSelectionToEol": False, - "AutoPrepareAPIs" : False, + "AutoPrepareAPIs": False, - "AutoCompletionEnabled" : False, - "AutoCompletionCaseSensitivity" : True, - "AutoCompletionReplaceWord" : False, - "AutoCompletionShowSingle" : False, - "AutoCompletionSource" : Qsci.QsciScintilla.AcsDocument, - "AutoCompletionThreshold" : 2, - "AutoCompletionFillups" : False, + "AutoCompletionEnabled": False, + "AutoCompletionCaseSensitivity": True, + "AutoCompletionReplaceWord": False, + "AutoCompletionShowSingle": False, + "AutoCompletionSource": Qsci.QsciScintilla.AcsDocument, + "AutoCompletionThreshold": 2, + "AutoCompletionFillups": False, - "CallTipsEnabled" : False, - "CallTipsVisible" : 0, - "CallTipsStyle" : Qsci.QsciScintilla.CallTipsNoContext, - "CallTipsScintillaOnFail" : False, + "CallTipsEnabled": False, + "CallTipsVisible": 0, + "CallTipsStyle": Qsci.QsciScintilla.CallTipsNoContext, + "CallTipsScintillaOnFail": False, # show QScintilla calltips, if plugin fails - "AutoCheckSyntax" : True, - "AutoReopen" : False, + "AutoCheckSyntax": True, + "AutoReopen": False, - "AnnotationsEnabled" : True, + "AnnotationsEnabled": True, - "MiniContextMenu" : False, + "MiniContextMenu": False, - "SearchMarkersEnabled" : True, - "QuickSearchMarkersEnabled" : True, - "MarkOccurrencesEnabled" : True, - "MarkOccurrencesTimeout" : 500, # 500 milliseconds - "AdvancedEncodingDetection" : True, + "SearchMarkersEnabled": True, + "QuickSearchMarkersEnabled": True, + "MarkOccurrencesEnabled": True, + "MarkOccurrencesTimeout": 500, # 500 milliseconds + "AdvancedEncodingDetection": True, - "SpellCheckingEnabled" : True, - "AutoSpellCheckingEnabled" : True, - "AutoSpellCheckChunkSize" : 30, - "SpellCheckStringsOnly" : True, - "SpellCheckingMinWordSize" : 3, - "SpellCheckingDefaultLanguage" : "en", - "SpellCheckingPersonalWordList" : "", - "SpellCheckingPersonalExcludeList" : "", + "SpellCheckingEnabled": True, + "AutoSpellCheckingEnabled": True, + "AutoSpellCheckChunkSize": 30, + "SpellCheckStringsOnly": True, + "SpellCheckingMinWordSize": 3, + "SpellCheckingDefaultLanguage": "en", + "SpellCheckingPersonalWordList": "", + "SpellCheckingPersonalExcludeList": "", - "DefaultEncoding" : "utf-8", - "DefaultOpenFilter" : "", - "DefaultSaveFilter" : "", - "AdditionalOpenFilters" : [], - "AdditionalSaveFilters" : [], + "DefaultEncoding": "utf-8", + "DefaultOpenFilter": "", + "DefaultSaveFilter": "", + "AdditionalOpenFilters": [], + "AdditionalSaveFilters": [], - "ZoomFactor" : 0, + "ZoomFactor": 0, # All (most) lexers - "AllFoldCompact" : True, + "AllFoldCompact": True, # Bash specifics - "BashFoldComment" : True, + "BashFoldComment": True, # CMake specifics - "CMakeFoldAtElse" : False, + "CMakeFoldAtElse": False, # C++ specifics - "CppCaseInsensitiveKeywords" : False, - "CppFoldComment" : True, - "CppFoldPreprocessor" : False, - "CppFoldAtElse" : False, - "CppIndentOpeningBrace" : False, - "CppIndentClosingBrace" : False, - "CppDollarsAllowed" : True, + "CppCaseInsensitiveKeywords": False, + "CppFoldComment": True, + "CppFoldPreprocessor": False, + "CppFoldAtElse": False, + "CppIndentOpeningBrace": False, + "CppIndentClosingBrace": False, + "CppDollarsAllowed": True, # CSS specifics - "CssFoldComment" : True, + "CssFoldComment": True, # D specifics - "DFoldComment" : True, - "DFoldAtElse" : False, - "DIndentOpeningBrace" : False, - "DIndentClosingBrace" : False, + "DFoldComment": True, + "DFoldAtElse": False, + "DIndentOpeningBrace": False, + "DIndentClosingBrace": False, # HTML specifics - "HtmlFoldPreprocessor" : False, - "HtmlFoldScriptComments" : False, - "HtmlFoldScriptHeredocs" : False, - "HtmlCaseSensitiveTags" : False, + "HtmlFoldPreprocessor": False, + "HtmlFoldScriptComments": False, + "HtmlFoldScriptHeredocs": False, + "HtmlCaseSensitiveTags": False, # Pascal specifics - "PascalFoldComment" : True, - "PascalFoldPreprocessor" : False, - "PascalSmartHighlighting" : True, + "PascalFoldComment": True, + "PascalFoldPreprocessor": False, + "PascalSmartHighlighting": True, # Perl specifics - "PerlFoldComment" : True, - "PerlFoldPackages" : True, - "PerlFoldPODBlocks" : True, + "PerlFoldComment": True, + "PerlFoldPackages": True, + "PerlFoldPODBlocks": True, # PostScript specifics - "PostScriptTokenize" : False, - "PostScriptLevel" : 3, - "PostScriptFoldAtElse" : False, + "PostScriptTokenize": False, + "PostScriptLevel": 3, + "PostScriptFoldAtElse": False, # Povray specifics - "PovFoldComment" : True, - "PovFoldDirectives" : False, + "PovFoldComment": True, + "PovFoldDirectives": False, # Python specifics - "PythonBadIndentation" : True, - "PythonFoldComment" : True, - "PythonFoldString" : True, - "PythonAutoIndent" : True, - "PythonAllowV2Unicode" : True, - "PythonAllowV3Binary" : True, - "PythonAllowV3Bytes" : True, + "PythonBadIndentation": True, + "PythonFoldComment": True, + "PythonFoldString": True, + "PythonAutoIndent": True, + "PythonAllowV2Unicode": True, + "PythonAllowV3Binary": True, + "PythonAllowV3Bytes": True, # SQL specifics - "SqlFoldComment" : True, - "SqlBackslashEscapes" : False, + "SqlFoldComment": True, + "SqlBackslashEscapes": False, # VHDL specifics - "VHDLFoldComment" : True, - "VHDLFoldAtElse" : True, - "VHDLFoldAtBegin" : True, - "VHDLFoldAtParenthesis" : True, + "VHDLFoldComment": True, + "VHDLFoldAtElse": True, + "VHDLFoldAtBegin": True, + "VHDLFoldAtParenthesis": True, # XML specifics - "XMLStyleScripts" : True, + "XMLStyleScripts": True, # YAML specifics - "YAMLFoldComment" : False, + "YAMLFoldComment": False, } if isWindowsPlatform(): @@ -384,226 +385,226 @@ editorDefaults["EOLMode"] = Qsci.QsciScintilla.EolUnix editorColourDefaults = { - "CurrentMarker" : QtGui.QColor(QtCore.Qt.yellow), - "ErrorMarker" : QtGui.QColor(QtCore.Qt.red), - "MatchingBrace" : QtGui.QColor(QtCore.Qt.green), - "MatchingBraceBack" : QtGui.QColor(QtCore.Qt.white), - "NonmatchingBrace" : QtGui.QColor(QtCore.Qt.red), - "NonmatchingBraceBack" : QtGui.QColor(QtCore.Qt.white), - "CallTipsBackground" : QtGui.QColor(QtCore.Qt.white), - "CaretForeground" : QtGui.QColor(QtCore.Qt.black), - "CaretLineBackground" : QtGui.QColor(QtCore.Qt.white), - "Edge" : QtGui.QColor(QtCore.Qt.lightGray), - "SelectionBackground" : QtGui.QColor(QtCore.Qt.black), - "SelectionForeground" : QtGui.QColor(QtCore.Qt.white), - "SearchMarkers" : QtGui.QColor(QtCore.Qt.blue), - "MarginsBackground" : QtGui.QColor(QtCore.Qt.lightGray), - "MarginsForeground" : QtGui.QColor(QtCore.Qt.black), - "FoldmarginBackground" : QtGui.QColor("#e6e6e6"), - "FoldMarkersForeground" : QtGui.QColor(QtCore.Qt.white), - "FoldMarkersBackground" : QtGui.QColor(QtCore.Qt.black), - "SpellingMarkers" : QtGui.QColor(QtCore.Qt.red), - "AnnotationsWarningForeground" : QtGui.QColor("#606000"), - "AnnotationsWarningBackground" : QtGui.QColor("#ffffd0"), - "AnnotationsErrorForeground" : QtGui.QColor("#600000"), - "AnnotationsErrorBackground" : QtGui.QColor("#ffd0d0"), - "WhitespaceForeground" : QtGui.QColor(QtCore.Qt.darkGray), - "WhitespaceBackground" : QtGui.QColor(QtCore.Qt.white), + "CurrentMarker": QtGui.QColor(QtCore.Qt.yellow), + "ErrorMarker": QtGui.QColor(QtCore.Qt.red), + "MatchingBrace": QtGui.QColor(QtCore.Qt.green), + "MatchingBraceBack": QtGui.QColor(QtCore.Qt.white), + "NonmatchingBrace": QtGui.QColor(QtCore.Qt.red), + "NonmatchingBraceBack": QtGui.QColor(QtCore.Qt.white), + "CallTipsBackground": QtGui.QColor(QtCore.Qt.white), + "CaretForeground": QtGui.QColor(QtCore.Qt.black), + "CaretLineBackground": QtGui.QColor(QtCore.Qt.white), + "Edge": QtGui.QColor(QtCore.Qt.lightGray), + "SelectionBackground": QtGui.QColor(QtCore.Qt.black), + "SelectionForeground": QtGui.QColor(QtCore.Qt.white), + "SearchMarkers": QtGui.QColor(QtCore.Qt.blue), + "MarginsBackground": QtGui.QColor(QtCore.Qt.lightGray), + "MarginsForeground": QtGui.QColor(QtCore.Qt.black), + "FoldmarginBackground": QtGui.QColor("#e6e6e6"), + "FoldMarkersForeground": QtGui.QColor(QtCore.Qt.white), + "FoldMarkersBackground": QtGui.QColor(QtCore.Qt.black), + "SpellingMarkers": QtGui.QColor(QtCore.Qt.red), + "AnnotationsWarningForeground": QtGui.QColor("#606000"), + "AnnotationsWarningBackground": QtGui.QColor("#ffffd0"), + "AnnotationsErrorForeground": QtGui.QColor("#600000"), + "AnnotationsErrorBackground": QtGui.QColor("#ffd0d0"), + "WhitespaceForeground": QtGui.QColor(QtCore.Qt.darkGray), + "WhitespaceBackground": QtGui.QColor(QtCore.Qt.white), } editorOtherFontsDefaults = { - "MarginsFont" : "Sans Serif,10,-1,5,50,0,0,0,0,0", - "DefaultFont" : "Sans Serif,10,-1,5,50,0,0,0,0,0", - "MonospacedFont" : "Courier,10,-1,5,50,0,0,0,0,0", + "MarginsFont": "Sans Serif,10,-1,5,50,0,0,0,0,0", + "DefaultFont": "Sans Serif,10,-1,5,50,0,0,0,0,0", + "MonospacedFont": "Courier,10,-1,5,50,0,0,0,0,0", } editorTypingDefaults = { - "Python/EnabledTypingAids" : True, - "Python/InsertClosingBrace" : True, - "Python/IndentBrace" : True, - "Python/SkipBrace" : True, - "Python/InsertQuote" : True, - "Python/DedentElse" : True, - "Python/DedentExcept" : True, - "Python/Py24StyleTry" : True, - "Python/InsertImport" : True, - "Python/InsertSelf" : True, - "Python/InsertBlank" : True, - "Python/ColonDetection" : True, - "Python/DedentDef" : False, + "Python/EnabledTypingAids": True, + "Python/InsertClosingBrace": True, + "Python/IndentBrace": True, + "Python/SkipBrace": True, + "Python/InsertQuote": True, + "Python/DedentElse": True, + "Python/DedentExcept": True, + "Python/Py24StyleTry": True, + "Python/InsertImport": True, + "Python/InsertSelf": True, + "Python/InsertBlank": True, + "Python/ColonDetection": True, + "Python/DedentDef": False, - "Ruby/EnabledTypingAids" : True, - "Ruby/InsertClosingBrace" : True, - "Ruby/IndentBrace" : True, - "Ruby/SkipBrace" : True, - "Ruby/InsertQuote" : True, - "Ruby/InsertBlank" : True, - "Ruby/InsertHereDoc" : True, - "Ruby/InsertInlineDoc" : True, + "Ruby/EnabledTypingAids": True, + "Ruby/InsertClosingBrace": True, + "Ruby/IndentBrace": True, + "Ruby/SkipBrace": True, + "Ruby/InsertQuote": True, + "Ruby/InsertBlank": True, + "Ruby/InsertHereDoc": True, + "Ruby/InsertInlineDoc": True, } editorExporterDefaults = { - "HTML/WYSIWYG" : True, - "HTML/Folding" : False, - "HTML/OnlyStylesUsed" : False, - "HTML/FullPathAsTitle" : False, - "HTML/UseTabs" : False, + "HTML/WYSIWYG": True, + "HTML/Folding": False, + "HTML/OnlyStylesUsed": False, + "HTML/FullPathAsTitle": False, + "HTML/UseTabs": False, - "RTF/WYSIWYG" : True, - "RTF/UseTabs" : False, - "RTF/Font" : "Courier New,10,-1,5,50,0,0,0,0,0", + "RTF/WYSIWYG": True, + "RTF/UseTabs": False, + "RTF/Font": "Courier New,10,-1,5,50,0,0,0,0,0", - "PDF/Magnification" : 0, - "PDF/Font" : "Helvetica", # must be Courier, Helvetica or Times - "PDF/PageSize" : "A4", # must be A4 or Letter - "PDF/MarginLeft" : 36, - "PDF/MarginRight" : 36, - "PDF/MarginTop" : 36, - "PDF/MarginBottom" : 36, + "PDF/Magnification": 0, + "PDF/Font": "Helvetica", # must be Courier, Helvetica or Times + "PDF/PageSize": "A4", # must be A4 or Letter + "PDF/MarginLeft": 36, + "PDF/MarginRight": 36, + "PDF/MarginTop": 36, + "PDF/MarginBottom": 36, - "TeX/OnlyStylesUsed" : False, - "TeX/FullPathAsTitle" : False, + "TeX/OnlyStylesUsed": False, + "TeX/FullPathAsTitle": False, - "ODT/WYSIWYG" : True, - "ODT/OnlyStylesUsed" : False, - "ODT/UseTabs" : False, + "ODT/WYSIWYG": True, + "ODT/OnlyStylesUsed": False, + "ODT/UseTabs": False, } # defaults for the printer settings printerDefaults = { - "PrinterName" : "", - "ColorMode" : True, - "FirstPageFirst" : True, - "Magnification" : -3, - "Orientation" : 0, + "PrinterName": "", + "ColorMode": True, + "FirstPageFirst": True, + "Magnification": -3, + "Orientation": 0, "PageSize": 0, - "HeaderFont" : "Serif,10,-1,5,50,0,0,0,0,0", - "LeftMargin" : 1.0, - "RightMargin" : 1.0, - "TopMargin" : 1.0, - "BottomMargin" : 1.0, + "HeaderFont": "Serif,10,-1,5,50,0,0,0,0,0", + "LeftMargin": 1.0, + "RightMargin": 1.0, + "TopMargin": 1.0, + "BottomMargin": 1.0, } # defaults for the project settings projectDefaults = { - "SearchNewFiles" : False, - "SearchNewFilesRecursively" : False, - "AutoIncludeNewFiles" : False, - "AutoLoadSession" : False, - "AutoSaveSession" : False, - "SessionAllBreakpoints" : False, - "XMLTimestamp" : True, - "AutoCompileForms" : False, - "AutoCompileResources" : False, - "AutoLoadDbgProperties" : False, - "AutoSaveDbgProperties" : False, - "HideGeneratedForms" : False, - "FollowEditor" : True, - "RecentNumber" : 9, - "DeterminePyFromProject" : True, + "SearchNewFiles": False, + "SearchNewFilesRecursively": False, + "AutoIncludeNewFiles": False, + "AutoLoadSession": False, + "AutoSaveSession": False, + "SessionAllBreakpoints": False, + "XMLTimestamp": True, + "AutoCompileForms": False, + "AutoCompileResources": False, + "AutoLoadDbgProperties": False, + "AutoSaveDbgProperties": False, + "HideGeneratedForms": False, + "FollowEditor": True, + "RecentNumber": 9, + "DeterminePyFromProject": True, } # defaults for the multi project settings multiProjectDefaults = { - "OpenMasterAutomatically" : True, - "XMLTimestamp" : True, - "RecentNumber" : 9, + "OpenMasterAutomatically": True, + "XMLTimestamp": True, + "RecentNumber": 9, } # defaults for the project browser flags settings projectBrowserFlagsDefaults = { - "Qt4" : + "Qt4": SourcesBrowserFlag | \ FormsBrowserFlag | \ ResourcesBrowserFlag | \ TranslationsBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, - "Qt4C" : + OthersBrowserFlag, + "Qt4C": SourcesBrowserFlag | \ ResourcesBrowserFlag | \ TranslationsBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, - "E4Plugin" : + OthersBrowserFlag, + "E4Plugin": SourcesBrowserFlag | \ FormsBrowserFlag | \ ResourcesBrowserFlag | \ TranslationsBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, - "Console" : + OthersBrowserFlag, + "Console": SourcesBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, - "Other" : + OthersBrowserFlag, + "Other": SourcesBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, - "PySide" : + OthersBrowserFlag, + "PySide": SourcesBrowserFlag | \ FormsBrowserFlag | \ ResourcesBrowserFlag | \ TranslationsBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, - "PySideC" : + OthersBrowserFlag, + "PySideC": SourcesBrowserFlag | \ ResourcesBrowserFlag | \ TranslationsBrowserFlag | \ InterfacesBrowserFlag | \ - OthersBrowserFlag, + OthersBrowserFlag, } # defaults for the project browser colour settings projectBrowserColourDefaults = { - "Highlighted" : QtGui.QColor(QtCore.Qt.red), + "Highlighted": QtGui.QColor(QtCore.Qt.red), - "VcsAdded" : QtGui.QColor(QtCore.Qt.blue), - "VcsConflict" : QtGui.QColor(QtCore.Qt.red), - "VcsModified" : QtGui.QColor(QtCore.Qt.yellow), - "VcsReplaced" : QtGui.QColor(QtCore.Qt.cyan), - "VcsUpdate" : QtGui.QColor(QtCore.Qt.green), - "VcsRemoved" : QtGui.QColor(QtCore.Qt.magenta) + "VcsAdded": QtGui.QColor(QtCore.Qt.blue), + "VcsConflict": QtGui.QColor(QtCore.Qt.red), + "VcsModified": QtGui.QColor(QtCore.Qt.yellow), + "VcsReplaced": QtGui.QColor(QtCore.Qt.cyan), + "VcsUpdate": QtGui.QColor(QtCore.Qt.green), + "VcsRemoved": QtGui.QColor(QtCore.Qt.magenta) } # defaults for the help settings helpDefaults = { - "HelpViewerType" : 1, # this coresponds with the radio button id - "CustomViewer" : "", - "PythonDocDir" : "", - "Python2DocDir" : "", - "QtDocDir" : "", - "Qt4DocDir" : "", - "PyQt4DocDir" : "", - "PySideDocDir" : "", - "SingleHelpWindow" : True, - "SaveGeometry" : True, - "HelpViewerState" : QtCore.QByteArray(), - "WebSearchSuggestions" : True, - "WebSearchEngine" : "Google", - "WebSearchKeywords" : [], # array of two tuples (keyword, search engine name) - "DiskCacheEnabled" : True, - "DiskCacheSize" : 50, # 50 MB - "CachePolicy" : QtNetwork.QNetworkRequest.PreferNetwork, - "AcceptCookies" : 2, # CookieJar.AcceptOnlyFromSitesNavigatedTo - "KeepCookiesUntil" : 0, # CookieJar.KeepUntilExpire - "FilterTrackingCookies" : True, - "PrintBackgrounds" : False, - "StartupBehavior" : 0, # show home page + "HelpViewerType": 1, # this coresponds with the radio button id + "CustomViewer": "", + "PythonDocDir": "", + "Python2DocDir": "", + "QtDocDir": "", + "Qt4DocDir": "", + "PyQt4DocDir": "", + "PySideDocDir": "", + "SingleHelpWindow": True, + "SaveGeometry": True, + "HelpViewerState": QtCore.QByteArray(), + "WebSearchSuggestions": True, + "WebSearchEngine": "Google", + "WebSearchKeywords": [], # array of two tuples (keyword, search engine name) + "DiskCacheEnabled": True, + "DiskCacheSize": 50, # 50 MB + "CachePolicy": QtNetwork.QNetworkRequest.PreferNetwork, + "AcceptCookies": 2, # CookieJar.AcceptOnlyFromSitesNavigatedTo + "KeepCookiesUntil": 0, # CookieJar.KeepUntilExpire + "FilterTrackingCookies": True, + "PrintBackgrounds": False, + "StartupBehavior": 0, # show home page "HomePage": "pyrc:home", - "HistoryLimit" : 30, - "DefaultScheme" : "file://", - "SavePasswords" : False, - "AdBlockEnabled" : False, - "AdBlockSubscriptions" : [], - "OfflineStorageDatabaseQuota" : 50, # 50 MB - "UserAgent" : "", - "ShowPreview" : True, - "DownloadManagerRemovePolicy" : 0, # never delete downloads - "DownloadManagerSize" : QtCore.QSize(400, 300), - "DownloadManagerPosition" : QtCore.QPoint(), - "DownloadManagerDownloads" : [], + "HistoryLimit": 30, + "DefaultScheme": "file://", + "SavePasswords": False, + "AdBlockEnabled": False, + "AdBlockSubscriptions": [], + "OfflineStorageDatabaseQuota": 50, # 50 MB + "UserAgent": "", + "ShowPreview": True, + "DownloadManagerRemovePolicy": 0, # never delete downloads + "DownloadManagerSize": QtCore.QSize(400, 300), + "DownloadManagerPosition": QtCore.QPoint(), + "DownloadManagerDownloads": [], } websettings = QWebSettings.globalSettings() @@ -614,28 +615,28 @@ fontSize = websettings.fontSize(QWebSettings.DefaultFixedFontSize) helpDefaults["FixedFont"] = QtGui.QFont(fontFamily, fontSize).toString() helpDefaults.update({ - "AutoLoadImages" : - websettings.testAttribute(QWebSettings.AutoLoadImages), - "UserStyleSheet" : "", - "SaveUrlColor" : QtGui.QColor(248, 248, 210), - "JavaEnabled" : - websettings.testAttribute(QWebSettings.JavaEnabled), - "JavaScriptEnabled" : - websettings.testAttribute(QWebSettings.JavascriptEnabled), - "JavaScriptCanOpenWindows" : - websettings.testAttribute(QWebSettings.JavascriptCanOpenWindows), - "JavaScriptCanAccessClipboard" : - websettings.testAttribute(QWebSettings.JavascriptCanAccessClipboard), - "PluginsEnabled" : - websettings.testAttribute(QWebSettings.PluginsEnabled), - "OfflineStorageDatabaseEnabled" : - websettings.testAttribute(QWebSettings.OfflineStorageDatabaseEnabled), + "AutoLoadImages": + websettings.testAttribute(QWebSettings.AutoLoadImages), + "UserStyleSheet": "", + "SaveUrlColor": QtGui.QColor(248, 248, 210), + "JavaEnabled": + websettings.testAttribute(QWebSettings.JavaEnabled), + "JavaScriptEnabled": + websettings.testAttribute(QWebSettings.JavascriptEnabled), + "JavaScriptCanOpenWindows": + websettings.testAttribute(QWebSettings.JavascriptCanOpenWindows), + "JavaScriptCanAccessClipboard": + websettings.testAttribute(QWebSettings.JavascriptCanAccessClipboard), + "PluginsEnabled": + websettings.testAttribute(QWebSettings.PluginsEnabled), + "OfflineStorageDatabaseEnabled": + websettings.testAttribute(QWebSettings.OfflineStorageDatabaseEnabled), }) if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"): helpDefaults.update({ - "OfflineWebApplicationCacheEnabled" : + "OfflineWebApplicationCacheEnabled": websettings.testAttribute(QWebSettings.OfflineWebApplicationCacheEnabled), - "OfflineWebApplicationCacheQuota" : 50, # 50 MB + "OfflineWebApplicationCacheQuota": 50, # 50 MB }) if hasattr(QWebSettings, "LocalStorageEnabled"): helpDefaults["LocalStorageEnabled"] = \ @@ -649,136 +650,137 @@ # defaults for system settings sysDefaults = { - "StringEncoding" : "utf-8", - "IOEncoding" : "utf-8", + "StringEncoding": "utf-8", + "IOEncoding": "utf-8", } # defaults for the shell settings shellDefaults = { - "LinenoWidth" : 4, - "LinenoMargin" : True, - "AutoCompletionEnabled" : True, - "CallTipsEnabled" : True, - "WrapEnabled" : True, - "MaxHistoryEntries" : 100, - "SyntaxHighlightingEnabled" : True, - "ShowStdOutErr" : True, - "UseMonospacedFont" : False, - "MonospacedFont" : "Courier,10,-1,5,50,0,0,0,0,0", - "MarginsFont" : "Sans Serif,10,-1,5,50,0,0,0,0,0", + "LinenoWidth": 4, + "LinenoMargin": True, + "AutoCompletionEnabled": True, + "CallTipsEnabled": True, + "WrapEnabled": True, + "MaxHistoryEntries": 100, + "SyntaxHighlightingEnabled": True, + "ShowStdOutErr": True, + "UseMonospacedFont": False, + "MonospacedFont": "Courier,10,-1,5,50,0,0,0,0,0", + "MarginsFont": "Sans Serif,10,-1,5,50,0,0,0,0,0", } # defaults for the terminal settings terminalDefaults = { - "LinenoWidth" : 4, - "LinenoMargin" : True, - "MaxHistoryEntries" : 100, - "SyntaxHighlightingEnabled" : True, - "Shell" : "", - "ShellInteractive" : True, - "UseMonospacedFont" : False, - "MonospacedFont" : "Courier,10,-1,5,50,0,0,0,0,0", - "MarginsFont" : "Sans Serif,10,-1,5,50,0,0,0,0,0", + "LinenoWidth": 4, + "LinenoMargin": True, + "MaxHistoryEntries": 100, + "SyntaxHighlightingEnabled": True, + "Shell": "", + "ShellInteractive": True, + "UseMonospacedFont": False, + "MonospacedFont": "Courier,10,-1,5,50,0,0,0,0,0", + "MarginsFont": "Sans Serif,10,-1,5,50,0,0,0,0,0", } if isLinuxPlatform(): terminalDefaults["Shell"] = "bash" # defaults for Qt related stuff qtDefaults = { - "Qt4TranslationsDir" : "", - "QtToolsPrefix4" : "", - "QtToolsPostfix4" : "", - "Qt4Dir" : "", + "Qt4TranslationsDir": "", + "QtToolsPrefix4": "", + "QtToolsPostfix4": "", + "Qt4Dir": "", } # defaults for corba related stuff corbaDefaults = { - "omniidl" : "omniidl" + "omniidl": "omniidl" } # defaults for user related stuff userDefaults = { - "Email" : "", - "MailServer" : "", - "Signature" : "", - "MailServerAuthentication" : False, - "MailServerUser" : "", - "MailServerPassword" : "", - "MailServerUseTLS" : False, - "MailServerPort" : 25, - "UseSystemEmailClient" : False, + "Email": "", + "MailServer": "", + "Signature": "", + "MailServerAuthentication": False, + "MailServerUser": "", + "MailServerPassword": "", + "MailServerUseTLS": False, + "MailServerPort": 25, + "UseSystemEmailClient": False, } # defaults for vcs related stuff vcsDefaults = { - "AutoClose" : False, - "AutoSaveFiles" : True, - "AutoSaveProject" : True, - "AutoUpdate" : False, - "StatusMonitorInterval" : 30, - "MonitorLocalStatus" : False, + "AutoClose": False, + "AutoSaveFiles": True, + "AutoSaveProject": True, + "AutoUpdate": False, + "StatusMonitorInterval": 30, + "MonitorLocalStatus": False, } # defaults for tasks related stuff tasksDefaults = { - "TasksMarkers" : "TO" + "DO:", - "TasksMarkersBugfix" : "FIX" + "ME:", + "TasksMarkers": "TO" + "DO:", + "TasksMarkersBugfix": "FIX" + "ME:", # needed to keep it from being recognized as a task - "TasksColour" : QtGui.QColor(QtCore.Qt.black), - "TasksBugfixColour" : QtGui.QColor(QtCore.Qt.red), - "TasksBgColour" : QtGui.QColor(QtCore.Qt.white), - "TasksProjectBgColour" : QtGui.QColor(QtCore.Qt.lightGray), + "TasksColour": QtGui.QColor(QtCore.Qt.black), + "TasksBugfixColour": QtGui.QColor(QtCore.Qt.red), + "TasksBgColour": QtGui.QColor(QtCore.Qt.white), + "TasksProjectBgColour": QtGui.QColor(QtCore.Qt.lightGray), } # defaults for templates related stuff templatesDefaults = { - "AutoOpenGroups" : True, - "SingleDialog" : False, - "ShowTooltip" : False, - "SeparatorChar" : "$", + "AutoOpenGroups": True, + "SingleDialog": False, + "ShowTooltip": False, + "SeparatorChar": "$", } # defaults for plugin manager related stuff pluginManagerDefaults = { - "ActivateExternal" : True, - "DownloadPath" : "" + "ActivateExternal": True, + "DownloadPath": "" } # defaults for the printer settings graphicsDefaults = { - "Font" : "SansSerif,10,-1,5,50,0,0,0,0,0" + "Font": "SansSerif,10,-1,5,50,0,0,0,0,0" } # defaults for the icon editor iconEditorDefaults = { - "IconEditorState" : QtCore.QByteArray(), + "IconEditorState": QtCore.QByteArray(), } # defaults for py3flakes py3flakesDefaults = { - "IncludeInSyntaxCheck" : True, - "IgnoreStarImportWarnings" : True, + "IncludeInSyntaxCheck": True, + "IgnoreStarImportWarnings": True, } # defaults for tray starter trayStarterDefaults = { - "TrayStarterIcon" : "erict.png", + "TrayStarterIcon": "erict.png", # valid values are: erict.png, erict-hc.png, # erict-bw.png, erict-bwi.png } # defaults for geometry geometryDefaults = { - "HelpViewerGeometry" : QtCore.QByteArray(), - "IconEditorGeometry" : QtCore.QByteArray(), - "MainGeometry" : QtCore.QByteArray(), - "MainMaximized" : False, + "HelpViewerGeometry": QtCore.QByteArray(), + "IconEditorGeometry": QtCore.QByteArray(), + "MainGeometry": QtCore.QByteArray(), + "MainMaximized": False, } # if true, revert layouts to factory defaults resetLayout = False -def readToolGroups(prefClass = Prefs): + +def readToolGroups(prefClass=Prefs): """ Module function to read the tool groups configuration. @@ -808,27 +810,28 @@ if menutext: if menutext == '--': tool = { - 'menutext' : '--', - 'icon' : '', - 'executable' : '', - 'arguments' : '', - 'redirect' : 'no', + 'menutext': '--', + 'icon': '', + 'executable': '', + 'arguments': '', + 'redirect': 'no', } group[1].append(tool) elif executable: tool = { - 'menutext' : menutext, - 'icon' : icon, - 'executable' : executable, - 'arguments' : arguments, - 'redirect' : redirect, + 'menutext': menutext, + 'icon': icon, + 'executable': executable, + 'arguments': arguments, + 'redirect': redirect, } group[1].append(tool) toolGroups.append(group) currentGroup = int(prefClass.settings.value("Toolgroups/Current Group", -1)) return toolGroups, currentGroup -def saveToolGroups(toolGroups, currentGroup, prefClass = Prefs): + +def saveToolGroups(toolGroups, currentGroup, prefClass=Prefs): """ Module function to write the tool groups configuration. @@ -850,30 +853,31 @@ ind = 0 for tool in group[1]: prefClass.settings.setValue( - "Toolgroups/{0:02d}/{1:02d}/Menutext".format(groupIndex, ind), + "Toolgroups/{0:02d}/{1:02d}/Menutext".format(groupIndex, ind), tool['menutext']) prefClass.settings.setValue( - "Toolgroups/{0:02d}/{1:02d}/Icon".format(groupIndex, ind), + "Toolgroups/{0:02d}/{1:02d}/Icon".format(groupIndex, ind), tool['icon']) prefClass.settings.setValue( - "Toolgroups/{0:02d}/{1:02d}/Executable".format(groupIndex, ind), + "Toolgroups/{0:02d}/{1:02d}/Executable".format(groupIndex, ind), tool['executable']) prefClass.settings.setValue( - "Toolgroups/{0:02d}/{1:02d}/Arguments".format(groupIndex, ind), + "Toolgroups/{0:02d}/{1:02d}/Arguments".format(groupIndex, ind), tool['arguments']) prefClass.settings.setValue( - "Toolgroups/{0:02d}/{1:02d}/Redirect".format(groupIndex, ind), + "Toolgroups/{0:02d}/{1:02d}/Redirect".format(groupIndex, ind), tool['redirect']) ind += 1 groupIndex += 1 prefClass.settings.setValue("Toolgroups/Current Group", currentGroup) + def initPreferences(): """ - Module function to initialize the central configuration store. + Module function to initialize the central configuration store. """ Prefs.settings = QtCore.QSettings( - QtCore.QSettings.IniFormat, QtCore.QSettings.UserScope, + QtCore.QSettings.IniFormat, QtCore.QSettings.UserScope, settingsNameOrganization, settingsNameGlobal) if not isWindowsPlatform(): hp = QtCore.QDir.homePath() @@ -882,7 +886,8 @@ QtCore.QCoreApplication.setOrganizationName(settingsNameOrganization) QtCore.QCoreApplication.setApplicationName(settingsNameGlobal) -def syncPreferences(prefClass = Prefs): + +def syncPreferences(prefClass=Prefs): """ Module function to sync the preferences to disk. @@ -893,7 +898,8 @@ prefClass.settings.setValue("General/Configured", True) prefClass.settings.sync() -def exportPreferences(prefClass = Prefs): + +def exportPreferences(prefClass=Prefs): """ Module function to export the current preferences. @@ -903,9 +909,9 @@ None, QtCore.QCoreApplication.translate("Preferences", "Export Preferences"), "", - QtCore.QCoreApplication.translate("Preferences", + QtCore.QCoreApplication.translate("Preferences", "Properties File (*.ini);;All Files (*)"), - None, + None, E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) if filename: ext = QtCore.QFileInfo(filename).suffix() @@ -918,7 +924,8 @@ shutil.copy(settingsFile, filename) initPreferences() -def importPreferences(prefClass = Prefs): + +def importPreferences(prefClass=Prefs): """ Module function to import preferences from a file previously saved by the export function. @@ -929,14 +936,15 @@ None, QtCore.QCoreApplication.translate("Preferences", "Import Preferences"), "", - QtCore.QCoreApplication.translate("Preferences", + QtCore.QCoreApplication.translate("Preferences", "Properties File (*.ini);;All Files (*)")) if filename: settingsFile = prefClass.settings.fileName() shutil.copy(filename, settingsFile) initPreferences() -def isConfigured(prefClass = Prefs): + +def isConfigured(prefClass=Prefs): """ Module function to check, if the the application has been configured. @@ -945,31 +953,34 @@ """ return toBool(prefClass.settings.value("General/Configured", False)) + def initRecentSettings(): """ Module function to initialize the central configuration store for recently - opened files and projects. + opened files and projects. This function is called once upon import of the module. """ Prefs.rsettings = QtCore.QSettings( - QtCore.QSettings.IniFormat, QtCore.QSettings.UserScope, + QtCore.QSettings.IniFormat, QtCore.QSettings.UserScope, settingsNameOrganization, settingsNameRecent) -def getVarFilters(prefClass = Prefs): + +def getVarFilters(prefClass=Prefs): """ Module function to retrieve the variables filter settings. @param prefClass preferences class used as the storage area @return a tuple defing the variables filter """ - localsFilter = eval(prefClass.settings.value("Variables/LocalsFilter", + localsFilter = eval(prefClass.settings.value("Variables/LocalsFilter", prefClass.varDefaults["LocalsFilter"])) - globalsFilter = eval(prefClass.settings.value("Variables/GlobalsFilter", + globalsFilter = eval(prefClass.settings.value("Variables/GlobalsFilter", prefClass.varDefaults["GlobalsFilter"])) return (localsFilter, globalsFilter) -def setVarFilters(filters, prefClass = Prefs): + +def setVarFilters(filters, prefClass=Prefs): """ Module function to store the variables filter settings. @@ -978,7 +989,8 @@ prefClass.settings.setValue("Variables/LocalsFilter", str(filters[0])) prefClass.settings.setValue("Variables/GlobalsFilter", str(filters[1])) -def getDebugger(key, prefClass = Prefs): + +def getDebugger(key, prefClass=Prefs): """ Module function to retrieve the debugger settings. @@ -989,12 +1001,12 @@ if key in ["RemoteDbgEnabled", "PassiveDbgEnabled", "CustomPython3Interpreter", "AutomaticReset", "DebugEnvironmentReplace", - "PythonRedirect", "PythonNoEncoding", - "Python3Redirect", "Python3NoEncoding", + "PythonRedirect", "PythonNoEncoding", + "Python3Redirect", "Python3NoEncoding", "RubyRedirect", - "ConsoleDbgEnabled", "PathTranslation", - "Autosave", "ThreeStateBreakPoints", - "SuppressClientExit", "BreakAlways", + "ConsoleDbgEnabled", "PathTranslation", + "Autosave", "ThreeStateBreakPoints", + "SuppressClientExit", "BreakAlways", ]: return toBool(prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key])) @@ -1008,7 +1020,8 @@ return \ prefClass.settings.value("Debugger/" + key, prefClass.debuggerDefaults[key]) -def setDebugger(key, value, prefClass = Prefs): + +def setDebugger(key, value, prefClass=Prefs): """ Module function to store the debugger settings. @@ -1018,7 +1031,8 @@ """ prefClass.settings.setValue("Debugger/" + key, value) -def getPython(key, prefClass = Prefs): + +def getPython(key, prefClass=Prefs): """ Module function to retrieve the Python settings. @@ -1035,7 +1049,8 @@ exts.append(".{0}".format(ext)) return exts -def setPython(key, value, prefClass = Prefs): + +def setPython(key, value, prefClass=Prefs): """ Module function to store the Python settings. @@ -1046,7 +1061,8 @@ if key in ["PythonExtensions", "Python3Extensions"]: setDebugger(key, value, prefClass) -def getUILanguage(prefClass = Prefs): + +def getUILanguage(prefClass=Prefs): """ Module function to retrieve the language for the user interface. @@ -1060,7 +1076,8 @@ else: return lang -def setUILanguage(lang, prefClass = Prefs): + +def setUILanguage(lang, prefClass=Prefs): """ Module function to store the language for the user interface. @@ -1072,7 +1089,8 @@ else: prefClass.settings.setValue("UI/Language", lang) -def getUILayout(prefClass = Prefs): + +def getUILayout(prefClass=Prefs): """ Module function to retrieve the layout for the user interface. @@ -1081,16 +1099,17 @@ an embedded shell and a value for an embedded file browser """ layout = ( - prefClass.settings.value("UI/LayoutType", - prefClass.uiDefaults["LayoutType"]), - int(prefClass.settings.value("UI/LayoutShellEmbedded", - prefClass.uiDefaults["LayoutShellEmbedded"])), - int(prefClass.settings.value("UI/LayoutFileBrowserEmbedded", - prefClass.uiDefaults["LayoutFileBrowserEmbedded"])), + prefClass.settings.value("UI/LayoutType", + prefClass.uiDefaults["LayoutType"]), + int(prefClass.settings.value("UI/LayoutShellEmbedded", + prefClass.uiDefaults["LayoutShellEmbedded"])), + int(prefClass.settings.value("UI/LayoutFileBrowserEmbedded", + prefClass.uiDefaults["LayoutFileBrowserEmbedded"])), ) return layout -def setUILayout(layout, prefClass = Prefs): + +def setUILayout(layout, prefClass=Prefs): """ Module function to store the layout for the user interface. @@ -1101,7 +1120,8 @@ prefClass.settings.setValue("UI/LayoutShellEmbedded", layout[1]) prefClass.settings.setValue("UI/LayoutFileBrowserEmbedded", layout[2]) -def getViewManager(prefClass = Prefs): + +def getViewManager(prefClass=Prefs): """ Module function to retrieve the selected viewmanager type. @@ -1111,7 +1131,8 @@ return prefClass.settings.value("UI/ViewManager", prefClass.uiDefaults["ViewManager"]) -def setViewManager(vm, prefClass = Prefs): + +def setViewManager(vm, prefClass=Prefs): """ Module function to store the selected viewmanager type. @@ -1120,7 +1141,8 @@ """ prefClass.settings.setValue("UI/ViewManager", vm) -def getUI(key, prefClass = Prefs): + +def getUI(key, prefClass=Prefs): """ Module function to retrieve the various UI settings. @@ -1130,25 +1152,25 @@ """ if key in ["BrowsersListFoldersFirst", "BrowsersHideNonPublic", "BrowsersListContentsByOccurrence", "BrowsersListHiddenFiles", - "LogViewerAutoRaise", - "SingleApplicationMode", "TabViewManagerFilenameOnly", - "CaptionShowsFilename", "ShowSplash", - "SingleCloseButton", - "UseProxy", "UseSystemProxy", "UseHttpProxyForAll", - "TopLeftByLeft", "BottomLeftByLeft", - "TopRightByRight", "BottomRightByRight", - "RequestDownloadFilename", - "LayoutShellEmbedded", "LayoutFileBrowserEmbedded", + "LogViewerAutoRaise", + "SingleApplicationMode", "TabViewManagerFilenameOnly", + "CaptionShowsFilename", "ShowSplash", + "SingleCloseButton", + "UseProxy", "UseSystemProxy", "UseHttpProxyForAll", + "TopLeftByLeft", "BottomLeftByLeft", + "TopRightByRight", "BottomRightByRight", + "RequestDownloadFilename", + "LayoutShellEmbedded", "LayoutFileBrowserEmbedded", "CheckErrorLog"]: return toBool(prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key])) elif key in ["TabViewManagerFilenameLength", "CaptionFilenameLength", - "ProxyPort/Http", "ProxyPort/Https", "ProxyPort/Ftp", - "OpenOnStartup", + "ProxyPort/Http", "ProxyPort/Https", "ProxyPort/Ftp", + "OpenOnStartup", "PerformVersionCheck", "RecentNumber", ]: return int(prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key])) - elif key in ["ProxyPassword/Http", "ProxyPassword/Https", + elif key in ["ProxyPassword/Http", "ProxyPassword/Https", "ProxyPassword/Ftp", ]: from Utilities import pwDecode return pwDecode(prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key])) @@ -1211,7 +1233,8 @@ else: return prefClass.settings.value("UI/" + key, prefClass.uiDefaults[key]) -def setUI(key, value, prefClass = Prefs): + +def setUI(key, value, prefClass=Prefs): """ Module function to store the various UI settings. @@ -1223,14 +1246,15 @@ prefClass.settings.setValue("UI/" + key, value) elif key == "LogStdErrColour": prefClass.settings.setValue("UI/" + key, value.name()) - elif key in ["ProxyPassword/Http", "ProxyPassword/Https", + elif key in ["ProxyPassword/Http", "ProxyPassword/Https", "ProxyPassword/Ftp", ]: from Utilities import pwEncode prefClass.settings.setValue("UI/" + key, pwEncode(value)) else: prefClass.settings.setValue("UI/" + key, value) -def getIcons(key, prefClass = Prefs): + +def getIcons(key, prefClass=Prefs): """ Module function to retrieve the various Icons settings. @@ -1244,7 +1268,8 @@ else: return prefClass.iconsDefaults[key] -def setIcons(key, value, prefClass = Prefs): + +def setIcons(key, value, prefClass=Prefs): """ Module function to store the various Icons settings. @@ -1254,7 +1279,8 @@ """ prefClass.settings.setValue("UI/Icons/" + key, value) -def getCooperation(key, prefClass = Prefs): + +def getCooperation(key, prefClass=Prefs): """ Module function to retrieve the various Cooperation settings. @@ -1272,10 +1298,11 @@ return toList(prefClass.settings.value("Cooperation/" + key, prefClass.cooperationDefaults[key])) else: - return prefClass.settings.value("Cooperation/" + key, + return prefClass.settings.value("Cooperation/" + key, prefClass.cooperationDefaults[key]) -def setCooperation(key, value, prefClass = Prefs): + +def setCooperation(key, value, prefClass=Prefs): """ Module function to store the various Cooperation settings. @@ -1285,7 +1312,8 @@ """ prefClass.settings.setValue("Cooperation/" + key, value) -def getEditor(key, prefClass = Prefs): + +def getEditor(key, prefClass=Prefs): """ Module function to retrieve the various editor settings. @@ -1293,26 +1321,27 @@ @param prefClass preferences class used as the storage area @return the requested editor setting """ - if key in ["DefaultEncoding", "DefaultOpenFilter", "DefaultSaveFilter", - "SpellCheckingDefaultLanguage", "SpellCheckingPersonalWordList", + if key in ["DefaultEncoding", "DefaultOpenFilter", "DefaultSaveFilter", + "SpellCheckingDefaultLanguage", "SpellCheckingPersonalWordList", "SpellCheckingPersonalExcludeList"]: return prefClass.settings.value("Editor/" + key, prefClass.editorDefaults[key]) - elif key in ["AutosaveInterval", "TabWidth", "IndentWidth", "LinenoWidth", - "FoldingStyle", "WarnFilesize", "EdgeMode", "EdgeColumn", - "CaretWidth", "AutoCompletionSource", "AutoCompletionThreshold", - "CallTipsVisible", "CallTipsStyle", "MarkOccurrencesTimeout", - "AutoSpellCheckChunkSize", "SpellCheckingMinWordSize", + elif key in ["AutosaveInterval", "TabWidth", "IndentWidth", "LinenoWidth", + "FoldingStyle", "WarnFilesize", "EdgeMode", "EdgeColumn", + "CaretWidth", "AutoCompletionSource", "AutoCompletionThreshold", + "CallTipsVisible", "CallTipsStyle", "MarkOccurrencesTimeout", + "AutoSpellCheckChunkSize", "SpellCheckingMinWordSize", "PostScriptLevel", "EOLMode", "ZoomFactor", "WhitespaceSize"]: - return int(prefClass.settings.value("Editor/" + key, + return int(prefClass.settings.value("Editor/" + key, prefClass.editorDefaults[key])) elif key in ["AdditionalOpenFilters", "AdditionalSaveFilters"]: - return toList(prefClass.settings.value("Editor/" + key, + return toList(prefClass.settings.value("Editor/" + key, prefClass.editorDefaults[key])) else: - return toBool(prefClass.settings.value("Editor/" + key, + return toBool(prefClass.settings.value("Editor/" + key, prefClass.editorDefaults[key])) -def setEditor(key, value, prefClass = Prefs): + +def setEditor(key, value, prefClass=Prefs): """ Module function to store the various editor settings. @@ -1322,7 +1351,8 @@ """ prefClass.settings.setValue("Editor/" + key, value) -def getEditorColour(key, prefClass = Prefs): + +def getEditorColour(key, prefClass=Prefs): """ Module function to retrieve the various editor marker colours. @@ -1334,13 +1364,14 @@ if col is not None: if len(col) == 9: # color string with alpha - return QtGui.QColor.fromRgba(int(col[1:],16)) + return QtGui.QColor.fromRgba(int(col[1:], 16)) else: return QtGui.QColor(col) else: return prefClass.editorColourDefaults[key] -def setEditorColour(key, value, prefClass = Prefs): + +def setEditorColour(key, value, prefClass=Prefs): """ Module function to store the various editor marker colours. @@ -1354,7 +1385,8 @@ val = value.name() prefClass.settings.setValue("Editor/Colour/" + key, val) -def getEditorOtherFonts(key, prefClass = Prefs): + +def getEditorOtherFonts(key, prefClass=Prefs): """ Module function to retrieve the various editor fonts except the lexer fonts. @@ -1367,7 +1399,8 @@ prefClass.editorOtherFontsDefaults[key])) return f -def setEditorOtherFonts(key, font, prefClass = Prefs): + +def setEditorOtherFonts(key, font, prefClass=Prefs): """ Module function to store the various editor fonts except the lexer fonts. @@ -1377,7 +1410,8 @@ """ prefClass.settings.setValue("Editor/Other Fonts/" + key, font.toString()) -def getEditorAPI(key, prefClass = Prefs): + +def getEditorAPI(key, prefClass=Prefs): """ Module function to retrieve the various lists of api files. @@ -1394,7 +1428,8 @@ else: return [] -def setEditorAPI(key, apilist, prefClass = Prefs): + +def setEditorAPI(key, apilist, prefClass=Prefs): """ Module function to store the various lists of api files. @@ -1404,7 +1439,8 @@ """ prefClass.settings.setValue("Editor/APIs/" + key, apilist) -def getEditorKeywords(key, prefClass = Prefs): + +def getEditorKeywords(key, prefClass=Prefs): """ Module function to retrieve the various lists of language keywords. @@ -1418,7 +1454,8 @@ else: return [] -def setEditorKeywords(key, keywordsLists, prefClass = Prefs): + +def setEditorKeywords(key, keywordsLists, prefClass=Prefs): """ Module function to store the various lists of language keywords. @@ -1428,7 +1465,8 @@ """ prefClass.settings.setValue("Editor/Keywords/" + key, keywordsLists) -def getEditorLexerAssocs(prefClass = Prefs): + +def getEditorLexerAssocs(prefClass=Prefs): """ Module function to retrieve all lexer associations. @@ -1461,7 +1499,8 @@ editorLexerAssoc[key] = editorLexerAssocDefaults[key] return editorLexerAssoc -def setEditorLexerAssocs(assocs, prefClass = Prefs): + +def setEditorLexerAssocs(assocs, prefClass=Prefs): """ Module function to retrieve all lexer associations. @@ -1478,7 +1517,8 @@ for key in assocs: prefClass.settings.setValue("Editor/LexerAssociations/" + key, assocs[key]) -def getEditorLexerAssoc(filename, prefClass = Prefs): + +def getEditorLexerAssoc(filename, prefClass=Prefs): """ Module function to retrieve a lexer association. @@ -1492,7 +1532,8 @@ return "" -def getEditorTyping(key, prefClass = Prefs): + +def getEditorTyping(key, prefClass=Prefs): """ Module function to retrieve the various editor typing settings. @@ -1503,7 +1544,8 @@ return toBool(prefClass.settings.value("Editor/Typing/" + key, prefClass.editorTypingDefaults[key])) -def setEditorTyping(key, value, prefClass = Prefs): + +def setEditorTyping(key, value, prefClass=Prefs): """ Module function to store the various editor typing settings. @@ -1513,7 +1555,8 @@ """ prefClass.settings.setValue("Editor/Typing/" + key, value) -def getEditorExporter(key, prefClass = Prefs): + +def getEditorExporter(key, prefClass=Prefs): """ Module function to retrieve the various editor exporters settings. @@ -1526,13 +1569,13 @@ f.fromString(prefClass.settings.value("Editor/Exporters/" + key, prefClass.editorExporterDefaults[key])) return f - elif key in ["HTML/WYSIWYG", "HTML/Folding", "HTML/OnlyStylesUsed", - "HTML/FullPathAsTitle", "HTML/UseTabs", "RTF/WYSIWYG", - "RTF/UseTabs", "TeX/OnlyStylesUsed", "TeX/FullPathAsTitle", + elif key in ["HTML/WYSIWYG", "HTML/Folding", "HTML/OnlyStylesUsed", + "HTML/FullPathAsTitle", "HTML/UseTabs", "RTF/WYSIWYG", + "RTF/UseTabs", "TeX/OnlyStylesUsed", "TeX/FullPathAsTitle", "ODT/WYSIWYG", "ODT/OnlyStylesUsed", "ODT/UseTabs"]: return toBool(prefClass.settings.value("Editor/Exporters/" + key, prefClass.editorExporterDefaults[key])) - elif key in ["PDF/Magnification", "PDF/MarginLeft", "PDF/MarginRight", + elif key in ["PDF/Magnification", "PDF/MarginLeft", "PDF/MarginRight", "PDF/MarginTop", "PDF/MarginBottom"]: return int(prefClass.settings.value("Editor/Exporters/" + key, prefClass.editorExporterDefaults[key])) @@ -1540,7 +1583,8 @@ return prefClass.settings.value("Editor/Exporters/" + key, prefClass.editorExporterDefaults[key]) -def setEditorExporter(key, value, prefClass = Prefs): + +def setEditorExporter(key, value, prefClass=Prefs): """ Module function to store the various editor exporters settings. @@ -1553,7 +1597,8 @@ else: prefClass.settings.setValue("Editor/Exporters/" + key, value) -def getPrinter(key, prefClass = Prefs): + +def getPrinter(key, prefClass=Prefs): """ Module function to retrieve the various printer settings. @@ -1579,7 +1624,8 @@ return prefClass.settings.value("Printer/" + key, prefClass.printerDefaults[key]) -def setPrinter(key, value, prefClass = Prefs): + +def setPrinter(key, value, prefClass=Prefs): """ Module function to store the various printer settings. @@ -1592,7 +1638,8 @@ else: prefClass.settings.setValue("Printer/" + key, value) -def getShell(key, prefClass = Prefs): + +def getShell(key, prefClass=Prefs): """ Module function to retrieve the various shell settings. @@ -1612,7 +1659,8 @@ return toBool(prefClass.settings.value("Shell/" + key, prefClass.shellDefaults[key])) -def setShell(key, value, prefClass = Prefs): + +def setShell(key, value, prefClass=Prefs): """ Module function to store the various shell settings. @@ -1625,7 +1673,8 @@ else: prefClass.settings.setValue("Shell/" + key, value) -def getTerminal(key, prefClass = Prefs): + +def getTerminal(key, prefClass=Prefs): """ Module function to retrieve the various terminal settings. @@ -1648,7 +1697,8 @@ return toBool(prefClass.settings.value("Terminal/" + key, prefClass.terminalDefaults[key])) -def setTerminal(key, value, prefClass = Prefs): + +def setTerminal(key, value, prefClass=Prefs): """ Module function to store the various terminal settings. @@ -1661,7 +1711,8 @@ else: prefClass.settings.setValue("Terminal/" + key, value) -def getProject(key, prefClass = Prefs): + +def getProject(key, prefClass=Prefs): """ Module function to retrieve the various project handling settings. @@ -1676,7 +1727,8 @@ return toBool(prefClass.settings.value("Project/" + key, prefClass.projectDefaults[key])) -def setProject(key, value, prefClass = Prefs): + +def setProject(key, value, prefClass=Prefs): """ Module function to store the various project handling settings. @@ -1686,7 +1738,8 @@ """ prefClass.settings.setValue("Project/" + key, value) -def getProjectBrowserFlags(key, prefClass = Prefs): + +def getProjectBrowserFlags(key, prefClass=Prefs): """ Module function to retrieve the various project browser flags settings. @@ -1701,7 +1754,8 @@ return int(prefClass.settings.value("Project/BrowserFlags/" + key, default)) -def setProjectBrowserFlags(key, value, prefClass = Prefs): + +def setProjectBrowserFlags(key, value, prefClass=Prefs): """ Module function to store the various project browser flags settings. @@ -1711,7 +1765,8 @@ """ prefClass.settings.setValue("Project/BrowserFlags/" + key, value) -def setProjectBrowserFlagsDefault(key, value, prefClass = Prefs): + +def setProjectBrowserFlagsDefault(key, value, prefClass=Prefs): """ Module function to store the various project browser flags settings. @@ -1721,7 +1776,8 @@ """ prefClass.projectBrowserFlagsDefaults[key] = value -def removeProjectBrowserFlags(key, prefClass = Prefs): + +def removeProjectBrowserFlags(key, prefClass=Prefs): """ Module function to remove a project browser flags setting. @@ -1730,7 +1786,8 @@ """ prefClass.settings.remove("Project/BrowserFlags/" + key) -def getProjectBrowserColour(key, prefClass = Prefs): + +def getProjectBrowserColour(key, prefClass=Prefs): """ Module function to retrieve the various project browser colours. @@ -1744,7 +1801,8 @@ else: return prefClass.projectBrowserColourDefaults[key] -def setProjectBrowserColour(key, value, prefClass = Prefs): + +def setProjectBrowserColour(key, value, prefClass=Prefs): """ Module function to store the various project browser colours. @@ -1754,7 +1812,8 @@ """ prefClass.settings.setValue("Project/Colour/" + key, value.name()) -def getMultiProject(key, prefClass = Prefs): + +def getMultiProject(key, prefClass=Prefs): """ Module function to retrieve the various project handling settings. @@ -1769,7 +1828,8 @@ return toBool(prefClass.settings.value("MultiProject/" + key, prefClass.multiProjectDefaults[key])) -def setMultiProject(key, value, prefClass = Prefs): + +def setMultiProject(key, value, prefClass=Prefs): """ Module function to store the various project handling settings. @@ -1779,7 +1839,8 @@ """ prefClass.settings.setValue("MultiProject/" + key, value) -def getQt4DocDir(prefClass = Prefs): + +def getQt4DocDir(prefClass=Prefs): """ Module function to retrieve the Qt4DocDir setting. @@ -1793,7 +1854,8 @@ else: return s -def getHelp(key, prefClass = Prefs): + +def getHelp(key, prefClass=Prefs): """ Module function to retrieve the various help settings. @@ -1838,28 +1900,29 @@ downloads.append((url, location, done, pageUrl)) prefClass.settings.endArray() return downloads - elif key in ["HelpViewerType", "DiskCacheSize", "AcceptCookies", - "KeepCookiesUntil", "StartupBehavior", "HistoryLimit", - "OfflineStorageDatabaseQuota", "OfflineWebApplicationCacheQuota", + elif key in ["HelpViewerType", "DiskCacheSize", "AcceptCookies", + "KeepCookiesUntil", "StartupBehavior", "HistoryLimit", + "OfflineStorageDatabaseQuota", "OfflineWebApplicationCacheQuota", "CachePolicy", "DownloadManagerRemovePolicy"]: - return int(prefClass.settings.value("Help/" + key, + return int(prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key])) - elif key in ["SingleHelpWindow", "SaveGeometry", "WebSearchSuggestions", - "DiskCacheEnabled", "FilterTrackingCookies", "PrintBackgrounds", - "SavePasswords", "AdBlockEnabled", "AutoLoadImages", - "JavaEnabled", "JavaScriptEnabled", "JavaScriptCanOpenWindows", - "JavaScriptCanAccessClipboard", "PluginsEnabled", "DnsPrefetchEnabled", - "OfflineStorageDatabaseEnabled", "OfflineWebApplicationCacheEnabled", + elif key in ["SingleHelpWindow", "SaveGeometry", "WebSearchSuggestions", + "DiskCacheEnabled", "FilterTrackingCookies", "PrintBackgrounds", + "SavePasswords", "AdBlockEnabled", "AutoLoadImages", + "JavaEnabled", "JavaScriptEnabled", "JavaScriptCanOpenWindows", + "JavaScriptCanAccessClipboard", "PluginsEnabled", "DnsPrefetchEnabled", + "OfflineStorageDatabaseEnabled", "OfflineWebApplicationCacheEnabled", "LocalStorageEnabled", "ShowPreview"]: - return toBool(prefClass.settings.value("Help/" + key, + return toBool(prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key])) elif key in ["AdBlockSubscriptions"]: - return toList(prefClass.settings.value("Help/" + key, + return toList(prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key])) else: return prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key]) -def setHelp(key, value, prefClass = Prefs): + +def setHelp(key, value, prefClass=Prefs): """ Module function to store the various help settings. @@ -1898,7 +1961,8 @@ else: prefClass.settings.setValue("Help/" + key, value) -def getSystem(key, prefClass = Prefs): + +def getSystem(key, prefClass=Prefs): """ Module function to retrieve the various system settings. @@ -1908,13 +1972,14 @@ """ from Utilities import supportedCodecs if key in ["StringEncoding", "IOEncoding"]: - encoding = prefClass.settings.value("System/" + key, + encoding = prefClass.settings.value("System/" + key, prefClass.sysDefaults[key]) if encoding not in supportedCodecs: encoding = prefClass.sysDefaults[key] return encoding -def setSystem(key, value, prefClass = Prefs): + +def setSystem(key, value, prefClass=Prefs): """ Module function to store the various system settings. @@ -1924,14 +1989,15 @@ """ prefClass.settings.setValue("System/" + key, value) -def getQt4TranslationsDir(prefClass = Prefs): + +def getQt4TranslationsDir(prefClass=Prefs): """ Module function to retrieve the Qt4TranslationsDir setting. @param prefClass preferences class used as the storage area @return the requested Qt4TranslationsDir setting (string) """ - s = prefClass.settings.value("Qt/Qt4TranslationsDir", + s = prefClass.settings.value("Qt/Qt4TranslationsDir", prefClass.qtDefaults["Qt4TranslationsDir"]) if s == "": s = os.getenv("QT4TRANSLATIONSDIR", "") @@ -1942,7 +2008,8 @@ s = transPath return s -def getQt(key, prefClass = Prefs): + +def getQt(key, prefClass=Prefs): """ Module function to retrieve the various Qt settings. @@ -1952,10 +2019,11 @@ """ if key == "Qt4TranslationsDir": return getQt4TranslationsDir(prefClass) - else: + else: return prefClass.settings.value("Qt/" + key, prefClass.qtDefaults[key]) -def setQt(key, value, prefClass = Prefs): + +def setQt(key, value, prefClass=Prefs): """ Module function to store the various Qt settings. @@ -1965,7 +2033,8 @@ """ prefClass.settings.setValue("Qt/" + key, value) -def getCorba(key, prefClass = Prefs): + +def getCorba(key, prefClass=Prefs): """ Module function to retrieve the various corba settings. @@ -1975,7 +2044,8 @@ """ return prefClass.settings.value("Corba/" + key, prefClass.corbaDefaults[key]) -def setCorba(key, value, prefClass = Prefs): + +def setCorba(key, value, prefClass=Prefs): """ Module function to store the various corba settings. @@ -1985,7 +2055,8 @@ """ prefClass.settings.setValue("Corba/" + key, value) -def getUser(key, prefClass = Prefs): + +def getUser(key, prefClass=Prefs): """ Module function to retrieve the various user settings. @@ -1998,16 +2069,17 @@ return pwDecode(prefClass.settings.value("User/" + key, prefClass.userDefaults[key])) elif key in ["MailServerPort"]: - return int(prefClass.settings.value("User/" + key, + return int(prefClass.settings.value("User/" + key, prefClass.userDefaults[key])) - elif key in ["MailServerAuthentication", "MailServerUseTLS", + elif key in ["MailServerAuthentication", "MailServerUseTLS", "UseSystemEmailClient"]: - return toBool(prefClass.settings.value("User/" + key, + return toBool(prefClass.settings.value("User/" + key, prefClass.userDefaults[key])) else: return prefClass.settings.value("User/" + key, prefClass.userDefaults[key]) -def setUser(key, value, prefClass = Prefs): + +def setUser(key, value, prefClass=Prefs): """ Module function to store the various user settings. @@ -2022,7 +2094,8 @@ else: prefClass.settings.setValue("User/" + key, value) -def getVCS(key, prefClass = Prefs): + +def getVCS(key, prefClass=Prefs): """ Module function to retrieve the VCS related settings. @@ -2035,7 +2108,8 @@ else: return toBool(prefClass.settings.value("VCS/" + key, prefClass.vcsDefaults[key])) -def setVCS(key, value, prefClass = Prefs): + +def setVCS(key, value, prefClass=Prefs): """ Module function to store the VCS related settings. @@ -2045,7 +2119,8 @@ """ prefClass.settings.setValue("VCS/" + key, value) -def getTasks(key, prefClass = Prefs): + +def getTasks(key, prefClass=Prefs): """ Module function to retrieve the Tasks related settings. @@ -2053,7 +2128,7 @@ @param prefClass preferences class used as the storage area @return the requested user setting """ - if key in ["TasksColour", "TasksBugfixColour", + if key in ["TasksColour", "TasksBugfixColour", "TasksBgColour", "TasksProjectBgColour"]: col = prefClass.settings.value("Tasks/" + key) if col is not None: @@ -2064,7 +2139,8 @@ return prefClass.settings.value("Tasks/" + key, prefClass.tasksDefaults[key]) -def setTasks(key, value, prefClass = Prefs): + +def setTasks(key, value, prefClass=Prefs): """ Module function to store the Tasks related settings. @@ -2078,7 +2154,8 @@ else: prefClass.settings.setValue("Tasks/" + key, value) -def getTemplates(key, prefClass = Prefs): + +def getTemplates(key, prefClass=Prefs): """ Module function to retrieve the Templates related settings. @@ -2093,7 +2170,8 @@ return toBool(prefClass.settings.value("Templates/" + key, prefClass.templatesDefaults[key])) -def setTemplates(key, value, prefClass = Prefs): + +def setTemplates(key, value, prefClass=Prefs): """ Module function to store the Templates related settings. @@ -2103,7 +2181,8 @@ """ prefClass.settings.setValue("Templates/" + key, value) -def getPluginManager(key, prefClass = Prefs): + +def getPluginManager(key, prefClass=Prefs): """ Module function to retrieve the plugin manager related settings. @@ -2118,7 +2197,8 @@ return toBool(prefClass.settings.value("PluginManager/" + key, prefClass.pluginManagerDefaults[key])) -def setPluginManager(key, value, prefClass = Prefs): + +def setPluginManager(key, value, prefClass=Prefs): """ Module function to store the plugin manager related settings. @@ -2128,7 +2208,8 @@ """ prefClass.settings.setValue("PluginManager/" + key, value) -def getGraphics(key, prefClass = Prefs): + +def getGraphics(key, prefClass=Prefs): """ Module function to retrieve the Graphics related settings. @@ -2150,7 +2231,8 @@ return prefClass.settings.value("Graphics/" + key, prefClass.graphicsDefaults[key]) -def setGraphics(key, value, prefClass = Prefs): + +def setGraphics(key, value, prefClass=Prefs): """ Module function to store the Graphics related settings. @@ -2163,7 +2245,8 @@ else: prefClass.settings.setValue("Graphics/" + key, value) -def getIconEditor(key, prefClass = Prefs): + +def getIconEditor(key, prefClass=Prefs): """ Module function to retrieve the Icon Editor related settings. @@ -2174,7 +2257,8 @@ return prefClass.settings.value("IconEditor/" + key, prefClass.iconEditorDefaults[key]) -def setIconEditor(key, value, prefClass = Prefs): + +def setIconEditor(key, value, prefClass=Prefs): """ Module function to store the Icon Editor related settings. @@ -2184,7 +2268,8 @@ """ prefClass.settings.setValue("IconEditor/" + key, value) -def getFlakes(key, prefClass = Prefs): + +def getFlakes(key, prefClass=Prefs): """ Module function to retrieve the py3flakes related settings. @@ -2193,13 +2278,14 @@ @return the requested user setting """ if key in ["IncludeInSyntaxCheck", "IgnoreStarImportWarnings"]: - return toBool(prefClass.settings.value("Py3Flakes/" + key, + return toBool(prefClass.settings.value("Py3Flakes/" + key, prefClass.py3flakesDefaults[key])) else: return prefClass.settings.value("Py3Flakes/" + key, prefClass.py3flakesDefaults[key]) -def setFlakes(key, value, prefClass = Prefs): + +def setFlakes(key, value, prefClass=Prefs): """ Module function to store the py3flakes related settings. @@ -2209,7 +2295,8 @@ """ prefClass.settings.setValue("Py3Flakes/" + key, value) -def getTrayStarter(key, prefClass = Prefs): + +def getTrayStarter(key, prefClass=Prefs): """ Module function to retrieve the tray starter related settings. @@ -2220,7 +2307,8 @@ return prefClass.settings.value("TrayStarter/" + key, prefClass.trayStarterDefaults[key]) -def setTrayStarter(key, value, prefClass = Prefs): + +def setTrayStarter(key, value, prefClass=Prefs): """ Module function to store the tray starter related settings. @@ -2230,7 +2318,8 @@ """ prefClass.settings.setValue("TrayStarter/" + key, value) -def getGeometry(key, prefClass = Prefs): + +def getGeometry(key, prefClass=Prefs): """ Module function to retrieve the display geometry. @@ -2248,7 +2337,8 @@ else: return prefClass.geometryDefaults[key] -def setGeometry(key, value, prefClass = Prefs): + +def setGeometry(key, value, prefClass=Prefs): """ Module function to store the display geometry. @@ -2265,7 +2355,8 @@ v = value prefClass.settings.setValue("Geometry/" + key, v) -def resetLayout(prefClass = Prefs): + +def resetLayout(prefClass=Prefs): """ Module function to set a flag not storing the current layout. @@ -2273,7 +2364,8 @@ """ prefClass.resetLayout = True -def shouldResetLayout(prefClass = Prefs): + +def shouldResetLayout(prefClass=Prefs): """ Module function to indicate a reset of the layout. @@ -2282,15 +2374,17 @@ """ return prefClass.resetLayout -def saveResetLayout(prefClass = Prefs): + +def saveResetLayout(prefClass=Prefs): """ Module function to save the reset layout. """ if prefClass.resetLayout: for key in list(prefClass.geometryDefaults.keys()): - prefClass.settings.setValue("Geometry/" + key, + prefClass.settings.setValue("Geometry/" + key, prefClass.geometryDefaults[key]) + def toBool(value): """ Module function to convert a value to bool. @@ -2305,6 +2399,7 @@ else: return bool(value) + def toList(value): """ Module function to convert a value to a list. @@ -2319,6 +2414,7 @@ else: return value + def toByteArray(value): """ Module function to convert a value to a byte array. @@ -2331,6 +2427,7 @@ else: return value + def toDict(value): """ Module function to convert a value to a dictionary.
--- a/Project/AddDirectoryDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/AddDirectoryDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,12 +17,13 @@ import Utilities + class AddDirectoryDialog(QDialog, Ui_AddDirectoryDialog): """ Class implementing a dialog to add files of a directory to the project. """ - def __init__(self, pro, filter = 'source', parent = None, name = None, - startdir = None): + def __init__(self, pro, filter='source', parent=None, name=None, + startdir=None): """ Constructor @@ -32,7 +33,7 @@ @param name name of this dialog (string) @param startdir start directory for the selection dialog """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) if name: self.setObjectName(name) self.setupUi(self) @@ -43,7 +44,7 @@ self.ppath = pro.ppath self.targetDirEdit.setText(self.ppath) self.startdir = startdir - self.on_filterComboBox_highlighted('(*.py)') # enable all dialog elements + self.on_filterComboBox_highlighted('(*.py)') # enable all dialog elements if filter == 'source': # it is a source file self.filterComboBox.addItem(self.trUtf8("Source Files"), "SOURCES") elif filter == 'form': @@ -139,6 +140,6 @@ """ filetype = \ self.filterComboBox.itemData(self.filterComboBox.currentIndex()) - return (filetype, self.sourceDirEdit.text(), + return (filetype, self.sourceDirEdit.text(), self.targetDirEdit.text(), self.recursiveCheckBox.isChecked())
--- a/Project/AddFileDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/AddFileDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,12 +19,13 @@ import Utilities + class AddFileDialog(QDialog, Ui_AddFileDialog): """ Class implementing a dialog to add a file to the project. """ - def __init__(self, pro, parent = None, filter = None, name = None, - startdir = None): + def __init__(self, pro, parent=None, filter=None, name=None, + startdir=None): """ Constructor @@ -45,7 +46,7 @@ self.filter = filter self.ppath = pro.ppath self.startdir = startdir - self.filetypes = pro.pdata["FILETYPES"] # save a reference to the filetypes dict + self.filetypes = pro.pdata["FILETYPES"] # save a reference to the filetypes dict if self.filter is not None and self.filter != 'source': self.sourcecodeCheckBox.hide() @@ -79,11 +80,11 @@ dir = self.targetDirEdit.text() if self.filter is None: patterns = { - "SOURCES" : [], - "FORMS" : [], - "RESOURCES" : [], - "INTERFACES" : [], - "TRANSLATIONS" : [], + "SOURCES": [], + "FORMS": [], + "RESOURCES": [], + "INTERFACES": [], + "TRANSLATIONS": [], } for pattern, filetype in list(self.filetypes.items()): if filetype in patterns: @@ -95,10 +96,10 @@ "Interface Files ({3});;" "Translation Files ({4});;" "All Files (*)").format( - " ".join(patterns["SOURCES"]), - " ".join(patterns["FORMS"]), - " ".join(patterns["RESOURCES"]), - " ".join(patterns["INTERFACES"]), + " ".join(patterns["SOURCES"]), + " ".join(patterns["FORMS"]), + " ".join(patterns["RESOURCES"]), + " ".join(patterns["INTERFACES"]), " ".join(patterns["TRANSLATIONS"])) caption = self.trUtf8("Select Files") elif self.filter == 'form': @@ -177,9 +178,9 @@ """ Public slot to retrieve the dialogs data. - @return tuple of three values (list of string, string, boolean) giving the + @return tuple of three values (list of string, string, boolean) giving the source files, the target directory and a flag telling, whether the files shall be added as source code """ - return (self.sourceFileEdit.text().split(os.pathsep), + return (self.sourceFileEdit.text().split(os.pathsep), self.targetDirEdit.text(), self.sourcecodeCheckBox.isChecked())
--- a/Project/AddFoundFilesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/AddFoundFilesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,6 +12,7 @@ from .Ui_AddFoundFilesDialog import Ui_AddFoundFilesDialog + class AddFoundFilesDialog(QDialog, Ui_AddFoundFilesDialog): """ Class implementing a dialog to show the found files to the user. @@ -22,7 +23,7 @@ button cancels the operation. """ - def __init__(self, files, parent = None, name = None): + def __init__(self, files, parent=None, name=None): """ Constructor @@ -58,7 +59,7 @@ @pyqtSlot() def on_addAllButton_clicked(self): """ - Private slot to handle the 'Add All' button press. + Private slot to handle the 'Add All' button press. @return always 1 (int) """ @@ -82,4 +83,4 @@ list_ = [] for itm in self.fileList.selectedItems(): list_.append(itm.text()) - return list_ \ No newline at end of file + return list_
--- a/Project/AddLanguageDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/AddLanguageDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,18 +12,19 @@ from .Ui_AddLanguageDialog import Ui_AddLanguageDialog + class AddLanguageDialog(QDialog, Ui_AddLanguageDialog): """ Class implementing a dialog to add a new language to the project. """ - def __init__(self, parent = None, name = None): + def __init__(self, parent=None, name=None): """ Constructor @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) if name: self.setObjectName(name) self.setupUi(self)
--- a/Project/CreateDialogCodeDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/CreateDialogCodeDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,15 +25,16 @@ from eric5config import getConfig -pyqtSignatureRole = Qt.UserRole + 1 +pyqtSignatureRole = Qt.UserRole + 1 pythonSignatureRole = Qt.UserRole + 2 -rubySignatureRole = Qt.UserRole + 3 +rubySignatureRole = Qt.UserRole + 3 + class CreateDialogCodeDialog(QDialog, Ui_CreateDialogCodeDialog): """ Class implementing a dialog to generate code for a Qt4 dialog. """ - def __init__(self, formName, project, parent = None): + def __init__(self, formName, project, parent=None): """ Constructor @@ -73,7 +74,7 @@ self.__initError = True return - self.__module = ModuleParser.readModule(self.srcFile, caching = False) + self.__module = ModuleParser.readModule(self.srcFile, caching=False) if self.__module is not None: self.filenameEdit.setText(self.srcFile) @@ -160,7 +161,7 @@ def __mapType(self, type_): """ - Private method to map a type as reported by Qt's meta object to the + Private method to map a type as reported by Qt's meta object to the correct Python type. @param type_ type as reported by Qt (QByteArray) @@ -214,8 +215,8 @@ if self.__module is not None: method = "on_{0}_{1}".format( name, metaMethod.signature().split("(")[0]) - method2 = "{0}({1})".format(method, - ", ".join([self.__mapType(t) + method2 = "{0}({1})".format(method, + ", ".join([self.__mapType(t) for t in metaMethod.parameterTypes()])) if method2 in signatureList or method in signatureList: @@ -225,7 +226,7 @@ continue pyqtSignature = \ - ", ".join([self.__mapType(t) + ", ".join([self.__mapType(t) for t in metaMethod.parameterTypes()]) parameterNames = metaMethod.parameterNames() @@ -239,12 +240,12 @@ if methNamesSig: pythonSignature = "on_{0}_{1}(self, {2})".format( - name, - metaMethod.signature().split("(")[0], + name, + metaMethod.signature().split("(")[0], methNamesSig) else: pythonSignature = "on_{0}_{1}(self)".format( - name, + name, metaMethod.signature().split("(")[0]) itm2.setData(pyqtSignature, pyqtSignatureRole) itm2.setData(pythonSignature, pythonSignatureRole) @@ -296,7 +297,7 @@ # new file try: tmplName = os.path.join(getConfig('ericCodeTemplatesDir'), "impl.py.tmpl") - tmplFile = open(tmplName, 'r', encoding = "utf-8") + tmplFile = open(tmplName, 'r', encoding="utf-8") template = tmplFile.read() tmplFile.close() except IOError as why: @@ -310,7 +311,7 @@ objName = self.__objectName() if objName: template = template\ - .replace("$FORMFILE$", + .replace("$FORMFILE$", os.path.splitext(os.path.basename(self.formFile))[0])\ .replace("$FORMCLASS$", objName)\ .replace("$CLASSNAME$", self.classNameCombo.currentText())\ @@ -327,7 +328,7 @@ else: # extend existing file try: - srcFile = open(self.srcFile, 'r', encoding = "utf-8") + srcFile = open(self.srcFile, 'r', encoding="utf-8") sourceImpl = srcFile.readlines() srcFile.close() if not sourceImpl[-1].endswith("\n"): @@ -350,7 +351,7 @@ appendAtIndex = cls.endlineno - 1 # determine indent string - for line in sourceImpl[cls.lineno:cls.endlineno+1]: + for line in sourceImpl[cls.lineno:cls.endlineno + 1]: if line.lstrip().startswith("def __init__"): indentStr = line.replace(line.lstrip(), "") break @@ -387,8 +388,8 @@ newline = None else: newline = self.project.getEolString() - srcFile = open(self.filenameEdit.text(), 'w', encoding = "utf-8", - newline = newline) + srcFile = open(self.filenameEdit.text(), 'w', encoding="utf-8", + newline=newline) srcFile.write("".join(sourceImpl)) srcFile.close() except IOError as why: @@ -454,4 +455,4 @@ """ if button == self.okButton: self.__generateCode() - self.accept() \ No newline at end of file + self.accept()
--- a/Project/DebuggerPropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/DebuggerPropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,7 +27,7 @@ """ Class implementing a dialog for entering project specific debugger settings. """ - def __init__(self, project, parent = None, name = None): + def __init__(self, project, parent=None, name=None): """ Constructor @@ -57,13 +57,13 @@ self.debugClientEdit.setText(self.project.debugProperties["DEBUGCLIENT"]) else: if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python", "DebugClient.py") elif self.project.pdata["PROGLANGUAGE"][0] == "Python3": - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python3", "DebugClient.py") elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Ruby", "DebugClient.rb") else: debugClient = "" @@ -139,13 +139,13 @@ self.debugClientEdit.text() if not self.project.debugProperties["DEBUGCLIENT"]: if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2"]: - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python", "DebugClient.py") elif self.project.pdata["PROGLANGUAGE"][0] == "Python3": - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Python3", "DebugClient.py") elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": - debugClient = os.path.join(getConfig('ericDir'), + debugClient = os.path.join(getConfig('ericDir'), "DebugClients", "Ruby", "DebugClient.rb") else: debugClient = ""
--- a/Project/FiletypeAssociationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/FiletypeAssociationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_FiletypeAssociationDialog import Ui_FiletypeAssociationDialog + class FiletypeAssociationDialog(QDialog, Ui_FiletypeAssociationDialog): """ Class implementing a dialog to enter filetype associations for the project. """ - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -31,11 +32,11 @@ self.filetypeAssociationList.header().setSortIndicator(0, Qt.AscendingOrder) # keep these lists in sync - self.filetypes = ["SOURCES", "FORMS", "TRANSLATIONS", "RESOURCES", "INTERFACES", + self.filetypes = ["SOURCES", "FORMS", "TRANSLATIONS", "RESOURCES", "INTERFACES", "OTHERS", "__IGNORE__"] self.filetypeStrings = [self.trUtf8("Sources"), self.trUtf8("Forms"), self.trUtf8("Translations"), self.trUtf8("Resources"), - self.trUtf8("Interfaces"), self.trUtf8("Others"), + self.trUtf8("Interfaces"), self.trUtf8("Others"), self.trUtf8("Ignore")] self.filetypeCombo.addItems(self.filetypeStrings) @@ -54,7 +55,7 @@ """ Private method to resort the tree. """ - self.filetypeAssociationList.sortItems(self.filetypeAssociationList.sortColumn(), + self.filetypeAssociationList.sortItems(self.filetypeAssociationList.sortColumn(), self.filetypeAssociationList.header().sortIndicatorOrder()) def __reformat(self): @@ -152,4 +153,4 @@ itm = self.filetypeAssociationList.topLevelItem(index) pattern = itm.text(0) index = self.filetypeStrings.index(itm.text(1)) - self.project.pdata["FILETYPES"][pattern] = self.filetypes[index] \ No newline at end of file + self.project.pdata["FILETYPES"][pattern] = self.filetypes[index]
--- a/Project/LexerAssociationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/LexerAssociationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ from .Ui_LexerAssociationDialog import Ui_LexerAssociationDialog + class LexerAssociationDialog(QDialog, Ui_LexerAssociationDialog): """ Class implementing a dialog to enter lexer associations for the project. """ - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -82,7 +83,7 @@ self.editorFileExtEdit.clear() self.editorLexerCombo.setCurrentIndex(0) self.pygmentsLexerCombo.setCurrentIndex(0) - self.editorLexerList.sortItems(self.editorLexerList.sortColumn(), + self.editorLexerList.sortItems(self.editorLexerList.sortColumn(), self.editorLexerList.header().sortIndicatorOrder()) @pyqtSlot()
--- a/Project/NewDialogClassDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/NewDialogClassDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ from .Ui_NewDialogClassDialog import Ui_NewDialogClassDialog + class NewDialogClassDialog(QDialog, Ui_NewDialogClassDialog): """ Class implementing a dialog to ente the data for a new dialog class file. """ - def __init__(self, defaultClassName, defaultFile, defaultPath, parent = None): + def __init__(self, defaultClassName, defaultFile, defaultPath, parent=None): """ Constructor @@ -60,8 +61,8 @@ """ self.okButton.setEnabled( self.classnameEdit.text() != "" and \ - self.filenameEdit.text() != "" and \ - self.pathnameEdit.text() != "") + self.filenameEdit.text() != "" and \ + self.pathnameEdit.text() != "") def on_classnameEdit_textChanged(self, text): """
--- a/Project/NewPythonPackageDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/NewPythonPackageDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Ui_NewPythonPackageDialog import Ui_NewPythonPackageDialog + class NewPythonPackageDialog(QDialog, Ui_NewPythonPackageDialog): """ Class implementing a dialog to add a new Python package. """ - def __init__(self, relPath, parent = None): + def __init__(self, relPath, parent=None): """ Constructor
--- a/Project/Project.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/Project.py Fri Mar 11 16:51:57 2011 +0100 @@ -64,6 +64,7 @@ import Preferences import Utilities + class Project(QObject): """ Class implementing the project management functionality. @@ -89,7 +90,7 @@ @signal newProjectHooks() emitted after a new project was generated but before the newProject() signal is sent @signal newProject() emitted after a new project was generated - @signal sourceFile(str) emitted after a project file was read to + @signal sourceFile(str) emitted after a project file was read to open the main script @signal projectOpenedHooks() emitted after a project file was read but before the projectOpened() signal is sent @@ -148,21 +149,21 @@ keynames = [ "PROGLANGUAGE", "MIXEDLANGUAGE", "PROJECTTYPE", - "SPELLLANGUAGE", "SPELLWORDS", "SPELLEXCLUDES", + "SPELLLANGUAGE", "SPELLWORDS", "SPELLEXCLUDES", "DESCRIPTION", "VERSION", "HASH", "AUTHOR", "EMAIL", "SOURCES", "FORMS", "RESOURCES", - "TRANSLATIONS", "TRANSLATIONPATTERN", "TRANSLATIONSBINPATH", + "TRANSLATIONS", "TRANSLATIONPATTERN", "TRANSLATIONSBINPATH", "TRANSLATIONEXCEPTIONS", - "MAINSCRIPT", "EOL", + "MAINSCRIPT", "EOL", "VCS", "VCSOPTIONS", "VCSOTHERDATA", - "OTHERS", "INTERFACES", - "FILETYPES", "LEXERASSOCS", - "PROJECTTYPESPECIFICDATA", - "DOCUMENTATIONPARMS", + "OTHERS", "INTERFACES", + "FILETYPES", "LEXERASSOCS", + "PROJECTTYPESPECIFICDATA", + "DOCUMENTATIONPARMS", "PACKAGERSPARMS", "CHECKERSPARMS", - "OTHERTOOLSPARMS", + "OTHERTOOLSPARMS", ] dbgKeynames = [ @@ -180,7 +181,7 @@ eols = [os.linesep, "\n", "\r", "\r\n"] - def __init__(self, parent = None, filename = None): + def __init__(self, parent=None, filename=None): """ Constructor @@ -192,20 +193,20 @@ self.ui = parent self.sourceExtensions = { - "Python2" : Preferences.getPython("PythonExtensions"), - "Python3" : Preferences.getPython("Python3Extensions"), - "Ruby" : ['.rb'], - "Mixed" : ['.py', '.ptl', '.rb'] + "Python2": Preferences.getPython("PythonExtensions"), + "Python3": Preferences.getPython("Python3Extensions"), + "Ruby": ['.rb'], + "Mixed": ['.py', '.ptl', '.rb'] } self.dbgFilters = { - "Python2" : self.trUtf8( + "Python2": self.trUtf8( "Python2 Files (*.py2);;" "Python2 GUI Files (*.pyw2);;"), - "Python3" : self.trUtf8( + "Python3": self.trUtf8( "Python3 Files (*.py *.py3);;" "Python3 GUI Files (*.pyw *.pyw3);;"), - "Ruby" : self.trUtf8("Ruby Files (*.rb);;"), + "Ruby": self.trUtf8("Ruby Files (*.rb);;"), } self.vcsMenu = None @@ -224,9 +225,9 @@ self.__model = ProjectBrowserModel(self) - self.codemetrics = None - self.codecoverage = None - self.profiledata = None + self.codemetrics = None + self.codecoverage = None + self.profiledata = None self.applicationDiagram = None def __initProjectTypes(self): @@ -266,8 +267,8 @@ """ return type_ in self.__projectTypes - def registerProjectType(self, type_, description, fileTypeCallback = None, - binaryTranslationsCallback = None, lexerAssociationCallback = None): + def registerProjectType(self, type_, description, fileTypeCallback=None, + binaryTranslationsCallback=None, lexerAssociationCallback=None): """ Public method to register a project type. @@ -276,7 +277,7 @@ @keyparam fileTypeCallback reference to a method returning a dictionary of filetype associations. @keyparam binaryTranslationsCallback reference to a method returning the - name of the binary translation file given the name of the raw + name of the binary translation file given the name of the raw translation file @keyparam lexerAssociationCallback reference to a method returning the lexer type to be used for syntax highlighting given the name of @@ -321,7 +322,7 @@ self.translationsRoot = "" # the translations prefix self.name = "" self.opened = False - self.subdirs = [""] # record the project dir as a relative path (i.e. empty path) + self.subdirs = [""] # record the project dir as a relative path (i.e. empty path) self.otherssubdirs = [] self.vcs = None self.dbgCmdline = '' @@ -374,7 +375,7 @@ @param key key of the data entry to get (string). @return a copy of the requested data or None """ - if category in ["PROJECTTYPESPECIFICDATA", "CHECKERSPARMS", "PACKAGERSPARMS", + if category in ["PROJECTTYPESPECIFICDATA", "CHECKERSPARMS", "PACKAGERSPARMS", "DOCUMENTATIONPARMS", "OTHERTOOLSPARMS"] and \ key in self.pdata[category]: return copy.deepcopy(self.pdata[category][key]) @@ -392,7 +393,7 @@ @param data data to be stored @return flag indicating success (boolean) """ - if category not in ["PROJECTTYPESPECIFICDATA","CHECKERSPARMS", "PACKAGERSPARMS", + if category not in ["PROJECTTYPESPECIFICDATA", "CHECKERSPARMS", "PACKAGERSPARMS", "DOCUMENTATIONPARMS", "OTHERTOOLSPARMS"]: return False @@ -430,10 +431,10 @@ if self.pdata["PROJECTTYPE"][0] in ["Qt4", "E4Plugin", "PySide"]: self.pdata["FILETYPES"]["*.ui"] = "FORMS" self.pdata["FILETYPES"]["*.ui.h"] = "FORMS" - if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin", + if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES" - if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin", + if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS" self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS" @@ -449,7 +450,7 @@ """ Public method to update the filetype associations with new default values. """ - if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin", + if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: if "*.ts" not in self.pdata["FILETYPES"]: self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS" @@ -554,7 +555,7 @@ def __checkFilesExist(self, index): """ - Private method to check, if the files in a list exist. + Private method to check, if the files in a list exist. The files in the indicated list are checked for existance in the filesystem. Non existant files are removed from the list and the @@ -579,9 +580,9 @@ Private method to generate a regular expression for the project path. """ ppathRe = (self.ppath + os.sep)\ - .replace("\\","@@")\ - .replace("/","@@")\ - .replace("@@",r"[\\/]") + .replace("\\", "@@")\ + .replace("/", "@@")\ + .replace("@@", r"[\\/]") if Utilities.isWindowsPlatform(): self.ppathRe = re.compile(ppathRe, re.IGNORECASE) else: @@ -658,13 +659,13 @@ if not self.pdata["HASH"][0]: hash = str(QCryptographicHash.hash( QByteArray(self.ppath), QCryptographicHash.Sha1).toHex(), - encoding = "utf-8") + encoding="utf-8") self.pdata["HASH"] = [hash] self.setDirty(True) return res - def __writeProject(self, fn = None): + def __writeProject(self, fn=None): """ Private method to save the project infos to a project file. @@ -746,7 +747,7 @@ self.trUtf8("<p>The user specific project properties file <b>{0}</b>" " could not be written.</p>").format(fn)) - def __readSession(self, quiet = False, indicator = ""): + def __readSession(self, quiet=False, indicator=""): """ Private method to read in the project session file (.e4s) @@ -762,13 +763,13 @@ return fn, ext = os.path.splitext(os.path.basename(self.pfile)) - fn = os.path.join(self.getProjectManagementDir(), + fn = os.path.join(self.getProjectManagementDir(), '{0}{1}.e4s'.format(fn, indicator)) f = QFile(fn) if f.open(QIODevice.ReadOnly): reader = SessionReader(f, False) - reader.readXML(quiet = quiet) + reader.readXML(quiet=quiet) f.close() else: if not quiet: @@ -777,7 +778,7 @@ self.trUtf8("<p>The project session file <b>{0}</b> could not be" " read.</p>").format(fn)) - def __writeSession(self, quiet = False, indicator = ""): + def __writeSession(self, quiet=False, indicator=""): """ Private method to write the session data to an XML file (.e4s). @@ -793,7 +794,7 @@ return fn, ext = os.path.splitext(os.path.basename(self.pfile)) - fn = os.path.join(self.getProjectManagementDir(), + fn = os.path.join(self.getProjectManagementDir(), '{0}{1}.e4s'.format(fn, indicator)) f = QFile(fn) @@ -877,7 +878,7 @@ TasksWriter(f, True, os.path.splitext(os.path.basename(fn))[0]).writeXML() f.close() - def __readDebugProperties(self, quiet = False): + def __readDebugProperties(self, quiet=False): """ Private method to read in the project debugger properties file (.e4d) @@ -897,7 +898,7 @@ f = QFile(fn) if f.open(QIODevice.ReadOnly): reader = DebuggerPropertiesReader(f, self) - reader.readXML(quiet = quiet) + reader.readXML(quiet=quiet) f.close() else: if not quiet: @@ -906,7 +907,7 @@ self.trUtf8("<p>The project debugger properties file <b>{0}</b> could" " not be read.</p>").format(fn)) - def __writeDebugProperties(self, quiet = False): + def __writeDebugProperties(self, quiet=False): """ Private method to write the project debugger properties file (.e4d) @@ -1000,8 +1001,8 @@ """ return self.debugProperties[key] - def setDbgInfo(self, argv, wd, env, excReporting, excList, excIgnoreList, - autoClearShell, tracePython = None, autoContinue = None): + def setDbgInfo(self, argv, wd, env, excReporting, excList, excIgnoreList, + autoClearShell, tracePython=None, autoContinue=None): """ Public method to set the debugging information. @@ -1064,8 +1065,8 @@ try: if self.__binaryTranslationsCallbacks[self.pdata["PROJECTTYPE"][0]] \ is not None: - qmFile = self.__binaryTranslationsCallbacks\ - [self.pdata["PROJECTTYPE"][0]](langFile) + qmFile = self.__binaryTranslationsCallbacks[ + self.pdata["PROJECTTYPE"][0]](langFile) except KeyError: qmFile = langFile.replace('.ts', '.qm') if qmFile == langFile: @@ -1153,7 +1154,7 @@ " deleted.</p>").format(qmFile)) return - def appendFile(self, fn, isSourceFile = False, updateModel = True): + def appendFile(self, fn, isSourceFile=False, updateModel=True): """ Public method to append a file to the project. @@ -1244,7 +1245,7 @@ if dirty: self.setDirty(True) - def addFiles(self, filter = None, startdir = None): + def addFiles(self, filter=None, startdir=None): """ Public slot used to add files to the project. @@ -1254,7 +1255,7 @@ """ if startdir is None: startdir = self.ppath - dlg = AddFileDialog(self, self.parent(), filter, startdir = startdir) + dlg = AddFileDialog(self, self.parent(), filter, startdir=startdir) if dlg.exec_() == QDialog.Accepted: fnames, target, isSource = dlg.getData() if target != '': @@ -1271,7 +1272,7 @@ self.trUtf8("<p>The file <b>{0}</b> already" " exists.</p><p>Overwrite it?</p>") .format(targetfile), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return # don't overwrite @@ -1290,7 +1291,7 @@ self.trUtf8("Add file"), self.trUtf8("The target directory must not be empty.")) - def __addSingleDirectory(self, filetype, source, target, quiet = False): + def __addSingleDirectory(self, filetype, source, target, quiet=False): """ Private method used to add all files of a single directory to the project. @@ -1346,7 +1347,7 @@ self.trUtf8("<p>The file <b>{0}</b> already exists.</p>" "<p>Overwrite it?</p>") .format(targetfile), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: continue # don't overwrite, carry on with next file @@ -1376,7 +1377,7 @@ nt = os.path.join(target, name) self.__addRecursiveDirectory(filetype, ns, nt) - def addDirectory(self, filter = None, startdir = None): + def addDirectory(self, filter=None, startdir=None): """ Public method used to add all files of a directory to the project. @@ -1386,7 +1387,7 @@ """ if startdir is None: startdir = self.ppath - dlg = AddDirectoryDialog(self, filter, self.parent(), startdir = startdir) + dlg = AddDirectoryDialog(self, filter, self.parent(), startdir=startdir) if dlg.exec_() == QDialog.Accepted: filetype, source, target, recursive = dlg.getData() if target == '': @@ -1508,7 +1509,7 @@ self.pdata["MAINSCRIPT"] = [fn] self.setDirty(True) - def renameFile(self, oldfn, newfn = None): + def renameFile(self, oldfn, newfn=None): """ Public slot to rename a file of the project. @@ -1536,7 +1537,7 @@ self.trUtf8("""<p>The file <b>{0}</b> already exists.""" """ Overwrite it?</p>""") .format(newfn), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return False @@ -1559,7 +1560,7 @@ return True - def renameFileInPdata(self, oldname, newname, isSourceFile = False): + def renameFileInPdata(self, oldname, newname, isSourceFile=False): """ Public method to rename a file in the pdata structure. @@ -1641,7 +1642,7 @@ self.__model.addNewItem(typeString, newdn, typeStrings) self.directoryRemoved.emit(olddn) - def removeFile(self, fn, updateModel = True): + def removeFile(self, fn, updateModel=True): """ Public slot to remove a file from the project. @@ -1810,7 +1811,7 @@ hash = str(QCryptographicHash.hash( QByteArray(self.ppath), QCryptographicHash.Sha1).toHex(), - encoding = "utf-8") + encoding="utf-8") self.pdata["HASH"] = [hash] # create the project directory if it doesn't exist already @@ -1829,7 +1830,7 @@ # (only for Python and Python3) if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]: fn = os.path.join(self.ppath, "__init__.py") - f = open(fn, "w", encoding = "utf-8") + f = open(fn, "w", encoding="utf-8") f.close() self.appendFile(fn, True) # create an empty main script file, if a name was given @@ -1876,7 +1877,7 @@ res = E5MessageBox.yesNo(self.ui, self.trUtf8("New Project"), self.trUtf8("""Add existing files to the project?"""), - yesDefault = True) + yesDefault=True) if res: self.newProjectAddFiles(ms) # create an empty __init__.py file to make it a Python package @@ -1884,7 +1885,7 @@ if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]: fn = os.path.join(self.ppath, "__init__.py") if not os.path.exists(fn): - f = open(fn, "w", encoding = "utf-8") + f = open(fn, "w", encoding="utf-8") f.close() self.appendFile(fn, True) self.saveProject() @@ -1935,7 +1936,7 @@ self.trUtf8("New project"), self.trUtf8("Shall the project file be added" " to the repository?"), - yesDefault = True) + yesDefault=True) if apres: self.saveProject() self.vcs.vcsAdd(self.pfile) @@ -2042,7 +2043,7 @@ mainscriptname = os.path.splitext(mainscript)[0] or \ os.path.basename(tslist[0]).split('_')[0] self.pdata["TRANSLATIONPATTERN"] = \ - [os.path.join(os.path.dirname(tslist[0]), + [os.path.join(os.path.dirname(tslist[0]), "{0}_%language%{1}".format(os.path.basename(tslist[0]).split('_')[0], os.path.splitext(tslist[0])[1]))] else: @@ -2051,7 +2052,7 @@ self.trUtf8("Translation Pattern"), self.trUtf8("Enter the path pattern for translation files " "(use '%language%' in place of the language code):"), - QLineEdit.Normal, + QLineEdit.Normal, tslist[0]) if not pattern.isEmpty: self.pdata["TRANSLATIONPATTERN"] = [pattern] @@ -2069,7 +2070,7 @@ elif self.pdata["PROGLANGUAGE"][0] == "Ruby": self.pdata["MAINSCRIPT"] = ['{0}.rb'.format(mainscriptname)] if self.pdata["TRANSLATIONSBINPATH"]: - tpd = os.path.join(self.ppath, + tpd = os.path.join(self.ppath, self.pdata["TRANSLATIONSBINPATH"][0]) pattern = os.path.splitext( os.path.basename(self.pdata["TRANSLATIONPATTERN"][0])) @@ -2208,7 +2209,7 @@ # return empty string to signal to use the global setting return "" - def openProject(self, fn = None, restoreSession = True, reopen = False): + def openProject(self, fn=None, restoreSession=True, reopen=False): """ Public slot to open a project. @@ -2331,9 +2332,9 @@ # open a project session file being quiet about errors if reopen: - self.__readSession(quiet = True, indicator = "_tmp") + self.__readSession(quiet=True, indicator="_tmp") elif Preferences.getProject("AutoLoadSession"): - self.__readSession(quiet = True) + self.__readSession(quiet=True) # open a project debugger properties file being quiet about errors if Preferences.getProject("AutoLoadDbgProperties"): @@ -2354,9 +2355,9 @@ Public slot to reopen the current project. """ projectFile = self.pfile - res = self.closeProject(reopen = True) + res = self.closeProject(reopen=True) if res: - self.openProject(projectFile, reopen = True) + self.openProject(projectFile, reopen=True) def saveProject(self): """ @@ -2401,7 +2402,7 @@ self.trUtf8("Save File"), self.trUtf8("""<p>The file <b>{0}</b> already exists.""" """ Overwrite it?</p>""").format(fn), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return False @@ -2434,7 +2435,7 @@ @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) @@ -2453,7 +2454,7 @@ self.profiledata and self.profiledata.close() self.applicationDiagram and self.applicationDiagram.close() - def closeProject(self, reopen = False, noSave = False): + def closeProject(self, reopen=False, noSave=False): """ Public slot to close the current project. @@ -2476,9 +2477,9 @@ # save the project session file being quiet about error if reopen: - self.__writeSession(quiet = True, indicator = "_tmp") + self.__writeSession(quiet=True, indicator="_tmp") elif Preferences.getProject("AutoSaveSession") and not noSave: - self.__writeSession(quiet = True) + self.__writeSession(quiet=True) # save the project debugger properties file being quiet about error if Preferences.getProject("AutoSaveDbgProperties") and \ @@ -2551,7 +2552,7 @@ return True - def saveAllScripts(self, reportSyntaxErrors = False): + def saveAllScripts(self, reportSyntaxErrors=False): """ Public method to save all scripts belonging to the project. @@ -2580,7 +2581,7 @@ else: return success - def getMainScript(self, normalized = False): + def getMainScript(self, normalized=False): """ Public method to return the main script filename. @@ -2595,7 +2596,7 @@ else: return None - def getSources(self, normalized = False): + def getSources(self, normalized=False): """ Public method to return the source script files. @@ -2738,7 +2739,7 @@ def getAbsoluteUniversalPath(self, fn): """ - Public method to convert a project relative file path with universal + Public method to convert a project relative file path with universal separators to an absolute file path. @param fn file or directory name to convert (string) @@ -2845,7 +2846,7 @@ act = E5Action(self.trUtf8('New project'), UI.PixmapCache.getIcon("projectNew.png"), self.trUtf8('&New...'), 0, 0, - self.actGrp1,'project_new') + self.actGrp1, 'project_new') act.setStatusTip(self.trUtf8('Generate a new project')) act.setWhatsThis(self.trUtf8( """<b>New...</b>""" @@ -2858,7 +2859,7 @@ act = E5Action(self.trUtf8('Open project'), UI.PixmapCache.getIcon("projectOpen.png"), self.trUtf8('&Open...'), 0, 0, - self.actGrp1,'project_open') + self.actGrp1, 'project_open') act.setStatusTip(self.trUtf8('Open an existing project')) act.setWhatsThis(self.trUtf8( """<b>Open...</b>""" @@ -2905,7 +2906,7 @@ self.addFilesAct = E5Action(self.trUtf8('Add files to project'), UI.PixmapCache.getIcon("fileMisc.png"), self.trUtf8('Add &files...'), 0, 0, - self.actGrp2,'project_add_file') + self.actGrp2, 'project_add_file') self.addFilesAct.setStatusTip(self.trUtf8('Add files to the current project')) self.addFilesAct.setWhatsThis(self.trUtf8( """<b>Add files...</b>""" @@ -2919,7 +2920,7 @@ self.addDirectoryAct = E5Action(self.trUtf8('Add directory to project'), UI.PixmapCache.getIcon("dirOpen.png"), self.trUtf8('Add directory...'), 0, 0, - self.actGrp2,'project_add_directory') + self.actGrp2, 'project_add_directory') self.addDirectoryAct.setStatusTip( self.trUtf8('Add a directory to the current project')) self.addDirectoryAct.setWhatsThis(self.trUtf8( @@ -2933,7 +2934,7 @@ self.addLanguageAct = E5Action(self.trUtf8('Add translation to project'), UI.PixmapCache.getIcon("linguist4.png"), self.trUtf8('Add &translation...'), 0, 0, - self.actGrp2,'project_add_translation') + self.actGrp2, 'project_add_translation') self.addLanguageAct.setStatusTip( self.trUtf8('Add a translation to the current project')) self.addLanguageAct.setWhatsThis(self.trUtf8( @@ -2946,7 +2947,7 @@ act = E5Action(self.trUtf8('Search new files'), self.trUtf8('Searc&h new files...'), 0, 0, - self.actGrp2,'project_search_new_files') + self.actGrp2, 'project_search_new_files') act.setStatusTip(self.trUtf8('Search new files in the project directory.')) act.setWhatsThis(self.trUtf8( """<b>Search new files...</b>""" @@ -3117,7 +3118,7 @@ self.codeMetricsAct = E5Action(self.trUtf8('Code Metrics'), self.trUtf8('&Code Metrics...'), 0, 0, - self.chkGrp,'project_code_metrics') + self.chkGrp, 'project_code_metrics') self.codeMetricsAct.setStatusTip( self.trUtf8('Show some code metrics for the project.')) self.codeMetricsAct.setWhatsThis(self.trUtf8( @@ -3129,7 +3130,7 @@ self.codeCoverageAct = E5Action(self.trUtf8('Python Code Coverage'), self.trUtf8('Code Co&verage...'), 0, 0, - self.chkGrp,'project_code_coverage') + self.chkGrp, 'project_code_coverage') self.codeCoverageAct.setStatusTip( self.trUtf8('Show code coverage information for the project.')) self.codeCoverageAct.setWhatsThis(self.trUtf8( @@ -3142,7 +3143,7 @@ self.codeProfileAct = E5Action(self.trUtf8('Profile Data'), self.trUtf8('&Profile Data...'), 0, 0, - self.chkGrp,'project_profile_data') + self.chkGrp, 'project_profile_data') self.codeProfileAct.setStatusTip( self.trUtf8('Show profiling data for the project.')) self.codeProfileAct.setWhatsThis(self.trUtf8( @@ -3154,7 +3155,7 @@ self.applicationDiagramAct = E5Action(self.trUtf8('Application Diagram'), self.trUtf8('&Application Diagram...'), 0, 0, - self.chkGrp,'project_application_diagram') + self.chkGrp, 'project_application_diagram') self.applicationDiagramAct.setStatusTip( self.trUtf8('Show a diagram of the project.')) self.applicationDiagramAct.setWhatsThis(self.trUtf8( @@ -3169,7 +3170,7 @@ self.pluginPkgListAct = E5Action(self.trUtf8('Create Package List'), UI.PixmapCache.getIcon("pluginArchiveList.png"), self.trUtf8('Create &Package List'), 0, 0, - self.pluginGrp,'project_plugin_pkglist') + self.pluginGrp, 'project_plugin_pkglist') self.pluginPkgListAct.setStatusTip( self.trUtf8('Create an initial PKGLIST file for an eric5 plugin.')) self.pluginPkgListAct.setWhatsThis(self.trUtf8( @@ -3183,7 +3184,7 @@ self.pluginArchiveAct = E5Action(self.trUtf8('Create Plugin Archive'), UI.PixmapCache.getIcon("pluginArchive.png"), self.trUtf8('Create Plugin &Archive'), 0, 0, - self.pluginGrp,'project_plugin_archive') + self.pluginGrp, 'project_plugin_archive') self.pluginArchiveAct.setStatusTip( self.trUtf8('Create an eric5 plugin archive file.')) self.pluginArchiveAct.setWhatsThis(self.trUtf8( @@ -3198,7 +3199,7 @@ self.pluginSArchiveAct = E5Action(self.trUtf8('Create Plugin Archive (Snapshot)'), UI.PixmapCache.getIcon("pluginArchiveSnapshot.png"), self.trUtf8('Create Plugin Archive (&Snapshot)'), 0, 0, - self.pluginGrp,'project_plugin_sarchive') + self.pluginGrp, 'project_plugin_sarchive') self.pluginSArchiveAct.setStatusTip( self.trUtf8('Create an eric5 plugin archive file (snapshot release).')) self.pluginSArchiveAct.setWhatsThis(self.trUtf8( @@ -3246,16 +3247,16 @@ self.packagersMenu.setTearOffEnabled(True) self.__menus = { - "Main" : menu, - "Recent" : self.recentMenu, - "VCS" : self.vcsMenu, - "Checks" : self.checksMenu, - "Show" : self.menuShow, - "Graphics" : self.graphicsMenu, - "Session" : self.sessionMenu, - "Apidoc" : self.apidocMenu, - "Debugger" : self.debuggerMenu, - "Packagers" : self.packagersMenu, + "Main": menu, + "Recent": self.recentMenu, + "VCS": self.vcsMenu, + "Checks": self.checksMenu, + "Show": self.menuShow, + "Graphics": self.graphicsMenu, + "Session": self.sessionMenu, + "Apidoc": self.apidocMenu, + "Debugger": self.debuggerMenu, + "Packagers": self.packagersMenu, } # connect the aboutToShow signals @@ -3398,7 +3399,7 @@ else: formatStr = '{0:d}. {1}' act = self.recentMenu.addAction( - formatStr.format(idx, + formatStr.format(idx, Utilities.compactPath(rp, self.ui.maxMenuFilePathLen))) act.setData(rp) act.setEnabled(QFileInfo(rp).exists()) @@ -3429,7 +3430,7 @@ """ self.__doSearchNewFiles(False, True) - def __doSearchNewFiles(self, AI = True, onUserDemand = False): + def __doSearchNewFiles(self, AI=True, onUserDemand=False): """ Private method to search for new files in the project directory. @@ -3440,7 +3441,7 @@ @param AI flag indicating whether the automatic inclusion should be honoured (boolean) - @param onUserDemand flag indicating whether this method was + @param onUserDemand flag indicating whether this method was requested by the user via a menu action (boolean) """ autoInclude = Preferences.getProject("AutoIncludeNewFiles") @@ -3535,7 +3536,7 @@ for file in files: self.appendFile(file) - def othersAdded(self, fn, updateModel = True): + def othersAdded(self, fn, updateModel=True): """ Public slot to be called, if something was added to the OTHERS project data area. @@ -3603,7 +3604,7 @@ ## Below is the VCS interface ############################################################## - def initVCS(self, vcsSystem = None, nooverride = False): + def initVCS(self, vcsSystem=None, nooverride=False): """ Public method used to instantiate a vcs system. @@ -3636,7 +3637,7 @@ if override: # override failed, revert to original self.pudata["VCSOVERRIDE"] = [] - return self.initVCS(nooverride = True) + return self.initVCS(nooverride=True) if vcs: vcsExists, msg = vcs.vcsExists() @@ -3650,7 +3651,7 @@ "<br/>Reverting override.</p><p>{1}</p>")\ .format(vcsSystem, msg)) self.pudata["VCSOVERRIDE"] = [] - return self.initVCS(nooverride = True) + return self.initVCS(nooverride=True) QApplication.restoreOverrideCursor() E5MessageBox.critical(self.ui, @@ -3868,10 +3869,10 @@ res = E5MessageBox.yesNo(self.ui, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), - yesDefault = True) - - self.applicationDiagram = ApplicationDiagram(self, self.parent(), - noModules = not res) + yesDefault=True) + + self.applicationDiagram = ApplicationDiagram(self, self.parent(), + noModules=not res) self.applicationDiagram.show() ######################################################################### @@ -3973,7 +3974,7 @@ self.trUtf8("Create Package List"), self.trUtf8("<p>The file <b>PKGLIST</b> already" " exists.</p><p>Overwrite it?</p>"), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return # don't overwrite @@ -3992,7 +3993,7 @@ newline = None else: newline = self.getEolString() - pkglistFile = open(pkglist, "w", encoding = "utf-8", newline = newline) + pkglistFile = open(pkglist, "w", encoding="utf-8", newline=newline) pkglistFile.write("\n".join(lst)) pkglistFile.close() except IOError as why: @@ -4005,7 +4006,7 @@ if not "PKGLIST" in self.pdata["OTHERS"]: self.appendFile("PKGLIST") - def __pluginCreateArchive(self, snapshot = False): + def __pluginCreateArchive(self, snapshot=False): """ Private slot to create an eric5 plugin archive. @@ -4028,7 +4029,7 @@ return try: - pkglistFile = open(pkglist, "r", encoding = "utf-8") + pkglistFile = open(pkglist, "r", encoding="utf-8") names = pkglistFile.read() pkglistFile.close() names = sorted(names.splitlines()) @@ -4136,7 +4137,7 @@ datestr = time.strftime("%Y%m%d") lineend = sourcelines[lineno].replace(sourcelines[lineno].rstrip(), "") sversion = "{0}-snapshot-{1}".format( - sourcelines[lineno].replace("version = ", "").strip()[1:-1], + sourcelines[lineno].replace("version = ", "").strip()[1:-1], datestr) sourcelines[lineno] = '{0} + "-snapshot-{1}"{2}'.format( sourcelines[lineno].rstrip(), datestr, lineend)
--- a/Project/ProjectBaseBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectBaseBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,6 +20,7 @@ from .ProjectBrowserModel import * from .ProjectBrowserSortFilterProxyModel import ProjectBrowserSortFilterProxyModel + class ProjectBaseBrowser(Browser): """ Baseclass implementing common functionality for the various project browsers. @@ -28,7 +29,7 @@ """ closeSourceWindow = pyqtSignal(str) - def __init__(self, project, type_, parent = None): + def __init__(self, project, type_, parent=None): """ Constructor @@ -94,18 +95,18 @@ # create the popup menu for source files self.sourceMenu = QMenu(self) self.sourceMenu.addAction( - QApplication.translate('ProjectBaseBrowser', 'Open'), + QApplication.translate('ProjectBaseBrowser', 'Open'), self._openItem) # create the popup menu for general use self.menu = QMenu(self) self.menu.addAction( - QApplication.translate('ProjectBaseBrowser', 'Open'), + QApplication.translate('ProjectBaseBrowser', 'Open'), self._openItem) # create the menu for multiple selected files self.multiMenu = QMenu(self) - self.multiMenu.addAction(QApplication.translate('ProjectBaseBrowser', 'Open'), + self.multiMenu.addAction(QApplication.translate('ProjectBaseBrowser', 'Open'), self._openItem) # create the background menu @@ -164,7 +165,7 @@ @param selected flag giving the new selection status (boolean) """ if index.isValid(): - self.selectionModel().select(index, + self.selectionModel().select(index, selected and self.SelectFlags or self.DeselectFlags) def _setItemRangeSelected(self, startIndex, endIndex, selected): @@ -176,7 +177,7 @@ @param selected flag giving the new selection status (boolean) """ selection = QItemSelection(startIndex, endIndex) - self.selectionModel().select(selection, + self.selectionModel().select(selection, selected and self.SelectFlags or self.DeselectFlags) def __modelRowsInserted(self, parent, start, end): @@ -227,7 +228,7 @@ self.backMenu.setEnabled(True) if self.project.vcs is not None: - self.vcsHelper = self.project.vcs.vcsGetProjectBrowserHelper(self, + self.vcsHelper = self.project.vcs.vcsGetProjectBrowserHelper(self, self.project, self.isTranslationsBrowser) self.vcsHelper.addVCSMenus(self.mainMenu, self.multiMenu, self.backMenu, self.dirMenu, self.dirMultiMenu) @@ -246,7 +247,7 @@ self.backMenu.setEnabled(True) if self.project.vcs is not None: - self.vcsHelper = self.project.vcs.vcsGetProjectBrowserHelper(self, + self.vcsHelper = self.project.vcs.vcsGetProjectBrowserHelper(self, self.project, self.isTranslationsBrowser) self.vcsHelper.addVCSMenus(self.mainMenu, self.multiMenu, self.backMenu, self.dirMenu, self.dirMultiMenu) @@ -359,9 +360,9 @@ def _showContextMenu(self, menu): """ - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. @param menu reference to the menu to be shown (QMenu) @@ -374,9 +375,9 @@ def _showContextMenuMulti(self, menu): """ - Protected slot called before the context menu (multiple selections) is shown. + Protected slot called before the context menu (multiple selections) is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. @param menu reference to the menu to be shown (QMenu) @@ -389,9 +390,9 @@ def _showContextMenuDir(self, menu): """ - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown (QMenu) @@ -404,9 +405,9 @@ def _showContextMenuDirMulti(self, menu): """ - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown (QMenu) @@ -419,14 +420,14 @@ def _showContextMenuBack(self, menu): """ - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. @param menu reference to the menu to be shown (QMenu) """ # nothing to do for now return - def _selectEntries(self, local = True, filter = None): + def _selectEntries(self, local=True, filter=None): """ Protected method to select entries based on their VCS status. @@ -480,33 +481,33 @@ if selectedEntries == 0: E5MessageBox.information(self, QApplication.translate('ProjectBaseBrowser', "Select entries"), - QApplication.translate('ProjectBaseBrowser', + QApplication.translate('ProjectBaseBrowser', """There were no matching entries found.""")) def selectLocalEntries(self): """ Public slot to handle the select local files context menu entries """ - self._selectEntries(local = True, filter = [ProjectBrowserFileItem]) + self._selectEntries(local=True, filter=[ProjectBrowserFileItem]) def selectVCSEntries(self): """ Public slot to handle the select VCS files context menu entries """ - self._selectEntries(local = False, filter = [ProjectBrowserFileItem]) + self._selectEntries(local=False, filter=[ProjectBrowserFileItem]) def selectLocalDirEntries(self): """ Public slot to handle the select local directories context menu entries """ - self._selectEntries(local = True, + self._selectEntries(local=True, filter=[ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem]) def selectVCSDirEntries(self): """ Public slot to handle the select VCS directories context menu entries """ - self._selectEntries(local = False, + self._selectEntries(local=False, filter=[ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem]) def _prepareRepopulateItem(self, name):
--- a/Project/ProjectBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,6 +29,7 @@ ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \ OthersBrowserFlag, AllBrowsersFlag + class ProjectBrowser(E5TabWidget): """ Class implementing the project browser part of the eric5 UI. @@ -41,7 +42,7 @@ tab with the file system browser. """ - def __init__(self, project, parent = None, embeddedBrowser = True): + def __init__(self, project, parent=None, embeddedBrowser=True): """ Constructor @@ -60,21 +61,21 @@ self.vcsStatusIndicator = E5Led(self) self.setCornerWidget(self.vcsStatusIndicator, Qt.TopLeftCorner) self.vcsStatusColorNames = { - "A" : "VcsAdded", - "M" : "VcsModified", - "O" : "VcsRemoved", - "R" : "VcsReplaced", - "U" : "VcsUpdate", - "Z" : "VcsConflict", + "A": "VcsAdded", + "M": "VcsModified", + "O": "VcsRemoved", + "R": "VcsReplaced", + "U": "VcsUpdate", + "Z": "VcsConflict", } self.vcsStatusText = { - " " : self.trUtf8("up to date"), - "A" : self.trUtf8("files added"), - "M" : self.trUtf8("local modifications"), - "O" : self.trUtf8("files removed"), - "R" : self.trUtf8("files replaced"), - "U" : self.trUtf8("update required"), - "Z" : self.trUtf8("conflict"), + " ": self.trUtf8("up to date"), + "A": self.trUtf8("files added"), + "M": self.trUtf8("local modifications"), + "O": self.trUtf8("files removed"), + "R": self.trUtf8("files replaced"), + "U": self.trUtf8("update required"), + "Z": self.trUtf8("conflict"), } self.__vcsStateChanged(" ") @@ -166,32 +167,32 @@ self.setTabToolTip(index, self.psBrowser.windowTitle()) if browserFlags & FormsBrowserFlag: - index = self.addTab(self.pfBrowser, + index = self.addTab(self.pfBrowser, UI.PixmapCache.getIcon("projectForms.png"), '') self.setTabToolTip(index, self.pfBrowser.windowTitle()) if browserFlags & ResourcesBrowserFlag: - index = self.addTab(self.prBrowser, + index = self.addTab(self.prBrowser, UI.PixmapCache.getIcon("projectResources.png"), '') self.setTabToolTip(index, self.prBrowser.windowTitle()) if browserFlags & TranslationsBrowserFlag: - index = self.addTab(self.ptBrowser, + index = self.addTab(self.ptBrowser, UI.PixmapCache.getIcon("projectTranslations.png"), '') self.setTabToolTip(index, self.ptBrowser.windowTitle()) if browserFlags & InterfacesBrowserFlag: - index = self.addTab(self.piBrowser, + index = self.addTab(self.piBrowser, UI.PixmapCache.getIcon("projectInterfaces.png"), '') self.setTabToolTip(index, self.piBrowser.windowTitle()) if browserFlags & OthersBrowserFlag: - index = self.addTab(self.poBrowser, + index = self.addTab(self.poBrowser, UI.PixmapCache.getIcon("projectOthers.png"), '') self.setTabToolTip(index, self.poBrowser.windowTitle()) if self.embeddedBrowser: - index = self.addTab(self.fileBrowser, + index = self.addTab(self.fileBrowser, UI.PixmapCache.getIcon("browser.png"), '') self.setTabToolTip(index, self.fileBrowser.windowTitle()) @@ -260,7 +261,7 @@ endIndex = self.count() - 1 else: endIndex = self.count() - for index in range(endIndex) : + for index in range(endIndex): self.setTabEnabled(index, self.project.isOpen()) self.__setSourcesIcon()
--- a/Project/ProjectBrowserFlags.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectBrowserFlags.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,13 +7,13 @@ Module defining the project browser flags. """ -SourcesBrowserFlag = 1 -FormsBrowserFlag = 2 -ResourcesBrowserFlag = 4 -TranslationsBrowserFlag = 8 -InterfacesBrowserFlag = 16 -OthersBrowserFlag = 32 -AllBrowsersFlag = SourcesBrowserFlag | \ +SourcesBrowserFlag = 1 +FormsBrowserFlag = 2 +ResourcesBrowserFlag = 4 +TranslationsBrowserFlag = 8 +InterfacesBrowserFlag = 16 +OthersBrowserFlag = 32 +AllBrowsersFlag = SourcesBrowserFlag | \ FormsBrowserFlag | \ ResourcesBrowserFlag | \ TranslationsBrowserFlag | \
--- a/Project/ProjectBrowserModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectBrowserModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,17 +21,18 @@ import Utilities.ModuleParser -ProjectBrowserItemSimpleDirectory = 100 -ProjectBrowserItemDirectory = 101 -ProjectBrowserItemFile = 102 +ProjectBrowserItemSimpleDirectory = 100 +ProjectBrowserItemDirectory = 101 +ProjectBrowserItemFile = 102 -ProjectBrowserNoType = 0 -ProjectBrowserSourceType = 1 -ProjectBrowserFormType = 2 -ProjectBrowserInterfaceType = 3 +ProjectBrowserNoType = 0 +ProjectBrowserSourceType = 1 +ProjectBrowserFormType = 2 +ProjectBrowserInterfaceType = 3 ProjectBrowserTranslationType = 4 -ProjectBrowserOthersType = 5 -ProjectBrowserResourceType = 6 +ProjectBrowserOthersType = 5 +ProjectBrowserResourceType = 6 + class ProjectBrowserItemMixin(object): """ @@ -39,7 +40,7 @@ It is meant to be used as a mixin class. """ - def __init__(self, type_, bold = False): + def __init__(self, type_, bold=False): """ Constructor @@ -101,11 +102,12 @@ """ self._projectTypes.append(type_) + class ProjectBrowserSimpleDirectoryItem(BrowserItem, ProjectBrowserItemMixin): """ Class implementing the data structure for project browser simple directory items. """ - def __init__(self, parent, projectType, text, path = ""): + def __init__(self, parent, projectType, text, path=""): """ Constructor @@ -128,7 +130,7 @@ else: self.icon = UI.PixmapCache.getIcon("dirClosed.png") - def setName(self, dinfo, full = True): + def setName(self, dinfo, full=True): """ Public method to set the directory name. @@ -161,11 +163,12 @@ return BrowserItem.lessThan(self, other, column, order) + class ProjectBrowserDirectoryItem(BrowserDirectoryItem, ProjectBrowserItemMixin): """ Class implementing the data structure for project browser directory items. """ - def __init__(self, parent, dinfo, projectType, full = True, bold = False): + def __init__(self, parent, dinfo, projectType, full=True, bold=False): """ Constructor @@ -180,12 +183,13 @@ self.type_ = ProjectBrowserItemDirectory + class ProjectBrowserFileItem(BrowserFileItem, ProjectBrowserItemMixin): """ Class implementing the data structure for project browser file items. """ - def __init__(self, parent, finfo, projectType, full = True, bold = False, - sourceLanguage = ""): + def __init__(self, parent, finfo, projectType, full=True, bold=False, + sourceLanguage=""): """ Constructor @@ -201,6 +205,7 @@ self.type_ = ProjectBrowserItemFile + class ProjectBrowserModel(BrowserModel): """ Class implementing the project browser model. @@ -231,30 +236,30 @@ self.inRefresh = False self.projectBrowserTypes = { - "SOURCES" : ProjectBrowserSourceType, - "FORMS" : ProjectBrowserFormType, - "RESOURCES" : ProjectBrowserResourceType, - "INTERFACES" : ProjectBrowserInterfaceType, - "TRANSLATIONS" : ProjectBrowserTranslationType, - "OTHERS" : ProjectBrowserOthersType, + "SOURCES": ProjectBrowserSourceType, + "FORMS": ProjectBrowserFormType, + "RESOURCES": ProjectBrowserResourceType, + "INTERFACES": ProjectBrowserInterfaceType, + "TRANSLATIONS": ProjectBrowserTranslationType, + "OTHERS": ProjectBrowserOthersType, } self.colorNames = { - "A" : "VcsAdded", - "M" : "VcsModified", - "O" : "VcsRemoved", - "R" : "VcsReplaced", - "U" : "VcsUpdate", - "Z" : "VcsConflict", + "A": "VcsAdded", + "M": "VcsModified", + "O": "VcsRemoved", + "R": "VcsReplaced", + "U": "VcsUpdate", + "Z": "VcsConflict", } self.itemBackgroundColors = { - " " : QColor(), - "A" : Preferences.getProjectBrowserColour(self.colorNames["A"]), - "M" : Preferences.getProjectBrowserColour(self.colorNames["M"]), - "O" : Preferences.getProjectBrowserColour(self.colorNames["O"]), - "R" : Preferences.getProjectBrowserColour(self.colorNames["R"]), - "U" : Preferences.getProjectBrowserColour(self.colorNames["U"]), - "Z" : Preferences.getProjectBrowserColour(self.colorNames["Z"]), + " ": QColor(), + "A": Preferences.getProjectBrowserColour(self.colorNames["A"]), + "M": Preferences.getProjectBrowserColour(self.colorNames["M"]), + "O": Preferences.getProjectBrowserColour(self.colorNames["O"]), + "R": Preferences.getProjectBrowserColour(self.colorNames["R"]), + "U": Preferences.getProjectBrowserColour(self.colorNames["U"]), + "Z": Preferences.getProjectBrowserColour(self.colorNames["Z"]), } self.highLightColor = Preferences.getProjectBrowserColour("Highlighted") @@ -293,7 +298,7 @@ return BrowserModel.data(self, index, role) - def populateItem(self, parentItem, repopulate = False): + def populateItem(self, parentItem, repopulate=False): """ Public method to populate an item's subtree. @@ -309,7 +314,7 @@ else: BrowserModel.populateItem(self, parentItem, repopulate) - def populateProjectDirectoryItem(self, parentItem, repopulate = False): + def populateProjectDirectoryItem(self, parentItem, repopulate=False): """ Public method to populate a directory item's subtree. @@ -342,7 +347,7 @@ for f in entryInfoList: if f.isDir(): node = ProjectBrowserDirectoryItem(parentItem, - Utilities.toNativeSeparators(f.absoluteFilePath()), + Utilities.toNativeSeparators(f.absoluteFilePath()), parentItem.getProjectTypes()[0], False) else: node = ProjectBrowserFileItem(parentItem, @@ -415,7 +420,7 @@ else: itm = ProjectBrowserFileItem(parentItem, fname, self.projectBrowserTypes[key], False, bold, - sourceLanguage = sourceLanguage) + sourceLanguage=sourceLanguage) self._addItem(itm, parentItem) if self.project.vcs is not None: if states[os.path.normcase(fname)] == self.project.vcs.canBeCommitted: @@ -427,7 +432,7 @@ self.inRefresh = False self.reset() - def findParentItemByName(self, type_, name, dontSplit = False): + def findParentItemByName(self, type_, name, dontSplit=False): """ Public method to find an item given it's name. @@ -473,7 +478,7 @@ else: return (self.rootItem, name) - def findChildItem(self, text, column, parentItem = None): + def findChildItem(self, text, column, parentItem=None): """ Public method to find a child item given some text. @@ -491,7 +496,7 @@ return None - def addNewItem(self, typeString, name, additionalTypeStrings = []): + def addNewItem(self, typeString, name, additionalTypeStrings=[]): """ Public method to add a new item to the model. @@ -522,7 +527,7 @@ sourceLanguage = "" itm = ProjectBrowserFileItem(parentItem, fname, self.projectBrowserTypes[typeString], False, bold, - sourceLanguage = sourceLanguage) + sourceLanguage=sourceLanguage) self.__addVCSStatus(itm, fname) if additionalTypeStrings: for additionalTypeString in additionalTypeStrings: @@ -576,9 +581,9 @@ """ itm = self.findItem(name) if itm is None: - index = QModelIndex() + index = QModelIndex() else: - index = self.createIndex(itm.row(), 0, itm) + index = self.createIndex(itm.row(), 0, itm) return index def directoryChanged(self, path): @@ -621,12 +626,12 @@ cnt, cnt) if f.isDir(): node = ProjectBrowserDirectoryItem(itm, - Utilities.toNativeSeparators(f.absoluteFilePath()), - itm.getProjectTypes()[0], + Utilities.toNativeSeparators(f.absoluteFilePath()), + itm.getProjectTypes()[0], False) else: node = ProjectBrowserFileItem(itm, - Utilities.toNativeSeparators(f.absoluteFilePath()), + Utilities.toNativeSeparators(f.absoluteFilePath()), itm.getProjectTypes()[0]) self._addItem(node, itm) if self.project.vcs is not None: @@ -673,7 +678,7 @@ else: item.addVcsStatus("") - def __updateVCSStatus(self, item, name, recursive = True): + def __updateVCSStatus(self, item, name, recursive=True): """ Private method used to update the vcs status of a node. @@ -699,7 +704,7 @@ index = self.createIndex(item.row(), 0, item) self.dataChanged.emit(index, index) - def updateVCSStatus(self, name, recursive = True): + def updateVCSStatus(self, name, recursive=True): """ Public method used to update the vcs status of a node. @@ -764,9 +769,9 @@ """ Public slot to record the (non normal) VCS states. - @param statesList list of VCS state entries (list of strings) giving the - states in the first column and the path relative to the project - directory starting with the third column. The allowed status flags + @param statesList list of VCS state entries (list of strings) giving the + states in the first column and the path relative to the project + directory starting with the third column. The allowed status flags are: <ul> <li>"A" path was added but not yet comitted</li> @@ -804,7 +809,7 @@ if itm: itm.setVcsState(state) index1 = self.createIndex(itm.row(), 0, itm) - index2 = self.createIndex(itm.row(), + index2 = self.createIndex(itm.row(), self.rootItem.columnCount(), itm) self.dataChanged.emit(index1, index2) @@ -844,7 +849,7 @@ if state != itm.vcsState: itm.setVcsState(state) index1 = self.createIndex(itm.row(), 0, itm) - index2 = self.createIndex(itm.row(), + index2 = self.createIndex(itm.row(), self.rootItem.columnCount(), itm) self.dataChanged.emit(index1, index2) path, tail = os.path.split(path) @@ -862,4 +867,4 @@ color = Preferences.getProjectBrowserColour("Highlighted") if self.highLightColor.name() != color.name(): - self.highLightColor = color \ No newline at end of file + self.highLightColor = color
--- a/Project/ProjectBrowserSortFilterProxyModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectBrowserSortFilterProxyModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ import Preferences + class ProjectBrowserSortFilterProxyModel(BrowserSortFilterProxyModel): """ Class implementing the browser sort filter proxy model. """ - def __init__(self, filterType, parent = None): + def __init__(self, filterType, parent=None): """ Constructor
--- a/Project/ProjectFormsBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectFormsBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,17 +29,18 @@ from eric5config import getConfig + class ProjectFormsBrowser(ProjectBaseBrowser): """ - A class used to display the forms part of the project. + A class used to display the forms part of the project. @signal appendStderr(str) emitted after something was received from a QProcess on stderr @signal sourceFile(str) emitted to open a forms file in an editor @signal uipreview(str) emitted to preview a forms file - @signal trpreview(list of str) emitted to preview form files in the + @signal trpreview(list of str) emitted to preview form files in the translations previewer - @signal closeSourceWindow(str) emitted after a file has been removed/deleted + @signal closeSourceWindow(str) emitted after a file has been removed/deleted from the project @signal showMenu(str, QMenu) emitted when a menu is about to be shown. The name of the menu and a reference to the menu are given. @@ -54,7 +55,7 @@ showMenu = pyqtSignal(str, QMenu) menusAboutToBeCreated = pyqtSignal() - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -107,7 +108,7 @@ self.menu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: self.menu.addAction(self.trUtf8('Compile form'), self.__compileForm) - self.menu.addAction(self.trUtf8('Compile all forms'), + self.menu.addAction(self.trUtf8('Compile all forms'), self.__compileAllForms) self.menu.addAction(self.trUtf8('Generate Dialog Code...'), self.__generateDialogCode) @@ -120,16 +121,16 @@ else: if self.hooks["compileForm"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("compileForm", + self.hooksMenuEntries.get("compileForm", self.trUtf8('Compile form')), self.__compileForm) if self.hooks["compileAllForms"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("compileAllForms", - self.trUtf8('Compile all forms')), + self.hooksMenuEntries.get("compileAllForms", + self.trUtf8('Compile all forms')), self.__compileAllForms) if self.hooks["generateDialogCode"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("generateDialogCode", + self.hooksMenuEntries.get("generateDialogCode", self.trUtf8('Generate Dialog Code...')), self.__generateDialogCode) if self.hooks["compileForm"] is not None or \ @@ -150,18 +151,18 @@ else: if self.hooks["newForm"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("newForm", + self.hooksMenuEntries.get("newForm", self.trUtf8('New form...')), self.__newForm) self.menu.addAction(self.trUtf8('Add forms...'), self.__addFormFiles) - self.menu.addAction(self.trUtf8('Add forms directory...'), + self.menu.addAction(self.trUtf8('Add forms directory...'), self.__addFormsDirectory) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Expand all directories'), + self.menu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.menu.addAction(self.trUtf8('Collapse all directories'), + self.menu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) @@ -169,22 +170,22 @@ self.backMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"] or \ self.hooks["compileAllForms"] is not None: - self.backMenu.addAction(self.trUtf8('Compile all forms'), + self.backMenu.addAction(self.trUtf8('Compile all forms'), self.__compileAllForms) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('New form...'), self.__newForm) else: if self.hooks["newForm"] is not None: self.backMenu.addAction( - self.hooksMenuEntries.get("newForm", + self.hooksMenuEntries.get("newForm", self.trUtf8('New form...')), self.__newForm) self.backMenu.addAction(self.trUtf8('Add forms...'), self.project.addUiFiles) - self.backMenu.addAction(self.trUtf8('Add forms directory...'), + self.backMenu.addAction(self.trUtf8('Add forms directory...'), self.project.addUiDir) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Expand all directories'), + self.backMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.backMenu.addAction(self.trUtf8('Collapse all directories'), + self.backMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -193,48 +194,48 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - act = self.multiMenu.addAction(self.trUtf8('Compile forms'), + act = self.multiMenu.addAction(self.trUtf8('Compile forms'), self.__compileSelectedForms) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Open in Qt-Designer'), + self.multiMenu.addAction(self.trUtf8('Open in Qt-Designer'), self.__openFile) - self.multiMenu.addAction(self.trUtf8('Open in Editor'), + self.multiMenu.addAction(self.trUtf8('Open in Editor'), self.__openFileInEditor) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Preview translations'), + self.multiMenu.addAction(self.trUtf8('Preview translations'), self.__TRPreview) else: if self.hooks["compileSelectedForms"] is not None: act = self.multiMenu.addAction( - self.hooksMenuEntries.get("compileSelectedForms", - self.trUtf8('Compile forms')), + self.hooksMenuEntries.get("compileSelectedForms", + self.trUtf8('Compile forms')), self.__compileSelectedForms) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Open'), self.__openFileInEditor) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.multiMenuActions.append(act) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Expand all directories'), + self.multiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.multiMenu.addAction(self.trUtf8('Collapse all directories'), + self.multiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) self.dirMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - self.dirMenu.addAction(self.trUtf8('Compile all forms'), + self.dirMenu.addAction(self.trUtf8('Compile all forms'), self.__compileAllForms) self.dirMenu.addSeparator() else: if self.hooks["compileAllForms"] is not None: self.dirMenu.addAction( - self.hooksMenuEntries.get("compileAllForms", - self.trUtf8('Compile all forms')), + self.hooksMenuEntries.get("compileAllForms", + self.trUtf8('Compile all forms')), self.__compileAllForms) self.dirMenu.addSeparator() act = self.dirMenu.addAction(self.trUtf8('Remove from project'), self._removeDir) @@ -245,42 +246,42 @@ else: if self.hooks["newForm"] is not None: self.dirMenu.addAction( - self.hooksMenuEntries.get("newForm", + self.hooksMenuEntries.get("newForm", self.trUtf8('New form...')), self.__newForm) self.dirMenu.addAction(self.trUtf8('Add forms...'), self.__addFormFiles) - self.dirMenu.addAction(self.trUtf8('Add forms directory...'), + self.dirMenu.addAction(self.trUtf8('Add forms directory...'), self.__addFormsDirectory) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - self.dirMultiMenu.addAction(self.trUtf8('Compile all forms'), + self.dirMultiMenu.addAction(self.trUtf8('Compile all forms'), self.__compileAllForms) self.dirMultiMenu.addSeparator() else: if self.hooks["compileAllForms"] is not None: self.dirMultiMenu.addAction( - self.hooksMenuEntries.get("compileAllForms", - self.trUtf8('Compile all forms')), + self.hooksMenuEntries.get("compileAllForms", + self.trUtf8('Compile all forms')), self.__compileAllForms) self.dirMultiMenu.addSeparator() - self.dirMultiMenu.addAction(self.trUtf8('Add forms...'), + self.dirMultiMenu.addAction(self.trUtf8('Add forms...'), self.project.addUiFiles) - self.dirMultiMenu.addAction(self.trUtf8('Add forms directory...'), + self.dirMultiMenu.addAction(self.trUtf8('Add forms directory...'), self.project.addUiDir) self.dirMultiMenu.addSeparator() - self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMultiMenu.addSeparator() self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -514,7 +515,7 @@ res = E5MessageBox.yesNo(self, self.trUtf8("New Form"), self.trUtf8("The file already exists! Overwrite it?"), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: # user selected to not overwrite return @@ -561,7 +562,7 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the pyuic/rbuic process. """ if self.compileProc is None: @@ -569,13 +570,13 @@ self.compileProc.setReadChannel(QProcess.StandardOutput) while self.compileProc and self.compileProc.canReadLine(): - self.buf += str(self.compileProc.readLine(), - Preferences.getSystem("IOEncoding"), + self.buf += str(self.compileProc.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') def __readStderr(self): """ - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the pyuic/rbuic process. """ if self.compileProc is None: @@ -586,7 +587,7 @@ self.compileProc.setReadChannel(QProcess.StandardError) while self.compileProc and self.compileProc.canReadLine(): s = self.uicompiler + ': ' - error = str(self.compileProc.readLine(), + error = str(self.compileProc.readLine(), ioEncoding, 'replace') s += error self.appendStderr.emit(s) @@ -607,7 +608,7 @@ newline = None else: newline = self.project.getEolString() - f = open(ofn, "w", encoding = "utf-8", newline = newline) + f = open(ofn, "w", encoding="utf-8", newline=newline) for line in self.buf.splitlines(): f.write(line + "\n") f.close() @@ -631,7 +632,7 @@ self.trUtf8("The compilation of the form file failed.")) self.compileProc = None - def __compileUI(self, fn, noDialog = False, progress = None): + def __compileUI(self, fn, noDialog=False, progress=None): """ Privat method to compile a .ui file to a .py/.rb file. @@ -751,7 +752,7 @@ self.hooks["compileAllForms"](self.project.pdata["FORMS"]) else: numForms = len(self.project.pdata["FORMS"]) - progress = QProgressDialog(self.trUtf8("Compiling forms..."), + progress = QProgressDialog(self.trUtf8("Compiling forms..."), self.trUtf8("Abort"), 0, numForms, self) progress.setModal(True) progress.setMinimumDuration(0) @@ -786,7 +787,7 @@ self.hooks["compileSelectedForms"](files) else: numForms = len(files) - progress = QProgressDialog(self.trUtf8("Compiling forms..."), + progress = QProgressDialog(self.trUtf8("Compiling forms..."), self.trUtf8("Abort"), 0, numForms, self) progress.setModal(True) progress.setMinimumDuration(0) @@ -821,7 +822,7 @@ # ignore the request for non Qt projects return - progress = QProgressDialog(self.trUtf8("Determining changed forms..."), + progress = QProgressDialog(self.trUtf8("Determining changed forms..."), None, 0, 100) progress.setMinimumDuration(0) i = 0 @@ -895,10 +896,10 @@ specified differently. """ self.hooks = { - "compileForm" : None, - "compileAllForms" : None, - "compileChangedForms" : None, - "compileSelectedForms" : None, - "generateDialogCode" : None, - "newForm" : None, + "compileForm": None, + "compileAllForms": None, + "compileChangedForms": None, + "compileSelectedForms": None, + "generateDialogCode": None, + "newForm": None, }
--- a/Project/ProjectInterfacesBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectInterfacesBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,12 +28,13 @@ import Preferences import Utilities + class ProjectInterfacesBrowser(ProjectBaseBrowser): """ - A class used to display the interfaces (IDL) part of the project. + A class used to display the interfaces (IDL) part of the project. @signal sourceFile(str, int = 0) emitted to open a file - @signal closeSourceWindow(str) emitted after a file has been removed/deleted + @signal closeSourceWindow(str) emitted after a file has been removed/deleted from the project @signal appendStdout(str) emitted after something was received from a QProcess on stdout @@ -48,7 +49,7 @@ showMenu = pyqtSignal(str, QMenu) sourceFile = pyqtSignal((str, ), (str, int)) - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -89,31 +90,31 @@ self.sourceMenu = QMenu(self) if self.omniidl is not None: - self.sourceMenu.addAction(self.trUtf8('Compile interface'), + self.sourceMenu.addAction(self.trUtf8('Compile interface'), self.__compileInterface) - self.sourceMenu.addAction(self.trUtf8('Compile all interfaces'), + self.sourceMenu.addAction(self.trUtf8('Compile all interfaces'), self.__compileAllInterfaces) self.sourceMenu.addAction(self.trUtf8('Open'), self._openItem) self.sourceMenu.addSeparator() act = self.sourceMenu.addAction(self.trUtf8('Rename file'), self._renameFile) self.menuActions.append(act) - act = self.sourceMenu.addAction(self.trUtf8('Remove from project'), + act = self.sourceMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.menuActions.append(act) act = self.sourceMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.menuActions.append(act) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Add interfaces...'), + self.sourceMenu.addAction(self.trUtf8('Add interfaces...'), self.__addInterfaceFiles) - self.sourceMenu.addAction(self.trUtf8('Add interfaces directory...'), + self.sourceMenu.addAction(self.trUtf8('Add interfaces directory...'), self.__addInterfacesDirectory) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.sourceMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Expand all directories'), + self.sourceMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.sourceMenu.addAction(self.trUtf8('Collapse all directories'), + self.sourceMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.sourceMenu.addSeparator() self.sourceMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -122,17 +123,17 @@ self.menu = QMenu(self) if self.omniidl is not None: self.menu.addAction(self.trUtf8('Compile interface'), self.__compileInterface) - self.menu.addAction(self.trUtf8('Compile all interfaces'), + self.menu.addAction(self.trUtf8('Compile all interfaces'), self.__compileAllInterfaces) self.menu.addAction(self.trUtf8('Open'), self._openItem) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Add interfaces...'), self.__addInterfaceFiles) - self.menu.addAction(self.trUtf8('Add interfaces directory...'), + self.menu.addAction(self.trUtf8('Add interfaces directory...'), self.__addInterfacesDirectory) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Expand all directories'), + self.menu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.menu.addAction(self.trUtf8('Collapse all directories'), + self.menu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) @@ -140,17 +141,17 @@ self.backMenu = QMenu(self) if self.omniidl is not None: - self.backMenu.addAction(self.trUtf8('Compile all interfaces'), + self.backMenu.addAction(self.trUtf8('Compile all interfaces'), self.__compileAllInterfaces) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Add interfaces...'), + self.backMenu.addAction(self.trUtf8('Add interfaces...'), self.project.addIdlFiles) - self.backMenu.addAction(self.trUtf8('Add interfaces directory...'), + self.backMenu.addAction(self.trUtf8('Add interfaces directory...'), self.project.addIdlDir) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Expand all directories'), + self.backMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.backMenu.addAction(self.trUtf8('Collapse all directories'), + self.backMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -164,15 +165,15 @@ self.__compileSelectedInterfaces) self.multiMenu.addAction(self.trUtf8('Open'), self._openItem) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.multiMenuActions.append(act) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Expand all directories'), + self.multiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.multiMenu.addAction(self.trUtf8('Collapse all directories'), + self.multiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -180,22 +181,22 @@ self.dirMenu = QMenu(self) if self.omniidl is not None: - self.dirMenu.addAction(self.trUtf8('Compile all interfaces'), + self.dirMenu.addAction(self.trUtf8('Compile all interfaces'), self.__compileAllInterfaces) self.dirMenu.addSeparator() act = self.dirMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.dirMenuActions.append(act) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Add interfaces...'), self.__addInterfaceFiles) - self.dirMenu.addAction(self.trUtf8('Add interfaces directory...'), + self.dirMenu.addAction(self.trUtf8('Add interfaces directory...'), self.__addInterfacesDirectory) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -203,21 +204,21 @@ self.dirMultiMenu = QMenu(self) if self.omniidl is not None: - self.dirMultiMenu.addAction(self.trUtf8('Compile all interfaces'), + self.dirMultiMenu.addAction(self.trUtf8('Compile all interfaces'), self.__compileAllInterfaces) self.dirMultiMenu.addSeparator() - self.dirMultiMenu.addAction(self.trUtf8('Add interfaces...'), + self.dirMultiMenu.addAction(self.trUtf8('Add interfaces...'), self.project.addIdlFiles) - self.dirMultiMenu.addAction(self.trUtf8('Add interfaces directory...'), + self.dirMultiMenu.addAction(self.trUtf8('Add interfaces directory...'), self.project.addIdlDir) self.dirMultiMenu.addSeparator() - self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMultiMenu.addSeparator() self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure) - self.dirMultiMenu.addAction(self.trUtf8('Configure CORBA...'), + self.dirMultiMenu.addAction(self.trUtf8('Configure CORBA...'), self.__configureCorba) self.sourceMenu.aboutToShow.connect(self.__showContextMenu) @@ -238,7 +239,7 @@ try: categories = self.getSelectedItemsCountCategorized( - [ProjectBrowserFileItem, BrowserClassItem, + [ProjectBrowserFileItem, BrowserClassItem, BrowserMethodItem, ProjectBrowserSimpleDirectoryItem]) cnt = categories["sum"] if cnt <= 1: @@ -246,7 +247,7 @@ if index.isValid(): self._selectSingleItem(index) categories = self.getSelectedItemsCountCategorized( - [ProjectBrowserFileItem, BrowserClassItem, + [ProjectBrowserFileItem, BrowserClassItem, BrowserMethodItem, ProjectBrowserSimpleDirectoryItem]) cnt = categories["sum"] @@ -324,20 +325,20 @@ Protected slot to handle the open popup menu entry. """ itmList = self.getSelectedItems( - [BrowserFileItem, BrowserClassItem, BrowserMethodItem, + [BrowserFileItem, BrowserClassItem, BrowserMethodItem, BrowserClassAttributeItem]) for itm in itmList: if isinstance(itm, BrowserFileItem): self.sourceFile[str].emit(itm.fileName()) elif isinstance(itm, BrowserClassItem): - self.sourceFile[str, int].emit(itm.fileName(), + self.sourceFile[str, int].emit(itm.fileName(), itm.classObject().lineno) - elif isinstance(itm,BrowserMethodItem): - self.sourceFile[str, int].emit(itm.fileName(), + elif isinstance(itm, BrowserMethodItem): + self.sourceFile[str, int].emit(itm.fileName(), itm.functionObject().lineno) elif isinstance(itm, BrowserClassAttributeItem): - self.sourceFile[str, int].emit(itm.fileName(), + self.sourceFile[str, int].emit(itm.fileName(), itm.attributeObject().lineno) def __addInterfaceFiles(self): @@ -461,7 +462,7 @@ self.trUtf8("The compilation of the interface file failed.")) self.compileProc = None - def __compileIDL(self, fn, noDialog = False, progress = None): + def __compileIDL(self, fn, noDialog=False, progress=None): """ Privat method to compile a .idl file to python. @@ -519,7 +520,7 @@ """ if self.omniidl is not None: numIDLs = len(self.project.pdata["INTERFACES"]) - progress = QProgressDialog(self.trUtf8("Compiling interfaces..."), + progress = QProgressDialog(self.trUtf8("Compiling interfaces..."), self.trUtf8("Abort"), 0, numIDLs, self) progress.setModal(True) progress.setMinimumDuration(0) @@ -551,7 +552,7 @@ files = [self.project.getRelativePath(itm.fileName()) \ for itm in items] numIDLs = len(files) - progress = QProgressDialog(self.trUtf8("Compiling interfaces..."), + progress = QProgressDialog(self.trUtf8("Compiling interfaces..."), self.trUtf8("Abort"), 0, numIDLs, self) progress.setModal(True) progress.setMinimumDuration(0) @@ -577,4 +578,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("corbaPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("corbaPage")
--- a/Project/ProjectOthersBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectOthersBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,7 +4,7 @@ # """ -Module implementing a class used to display the parts of the project, that don't fit +Module implementing a class used to display the parts of the project, that don't fit the other categories. """ @@ -20,6 +20,7 @@ from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + class ProjectOthersBrowser(ProjectBaseBrowser): """ A class used to display the parts of the project, that don't fit the other categories. @@ -72,10 +73,10 @@ ProjectBaseBrowser._createPopupMenus(self) self.editPixmapAct = \ - self.menu.addAction(self.trUtf8('Open in Icon Editor'), + self.menu.addAction(self.trUtf8('Open in Icon Editor'), self._editPixmap) self.menu.addSeparator() - self.renameFileAct = self.menu.addAction(self.trUtf8('Rename file'), + self.renameFileAct = self.menu.addAction(self.trUtf8('Rename file'), self._renameFile) self.menuActions.append(self.renameFileAct) act = self.menu.addAction(self.trUtf8('Remove from project'), self.__removeItem) @@ -88,40 +89,40 @@ self.menu.addSeparator() self.menu.addAction(self.trUtf8('Refresh'), self.__refreshItem) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Expand all directories'), + self.menu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.menu.addAction(self.trUtf8('Collapse all directories'), + self.menu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) self.backMenu = QMenu(self) - self.backMenu.addAction(self.trUtf8('Add files...'), + self.backMenu.addAction(self.trUtf8('Add files...'), self.project.addOthersFiles) - self.backMenu.addAction(self.trUtf8('Add directory...'), + self.backMenu.addAction(self.trUtf8('Add directory...'), self.project.addOthersDir) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Expand all directories'), + self.backMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.backMenu.addAction(self.trUtf8('Collapse all directories'), + self.backMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) self.backMenu.setEnabled(False) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self.__removeItem) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteItem) self.multiMenuActions.append(act) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Expand all directories'), + self.multiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.multiMenu.addAction(self.trUtf8('Collapse all directories'), + self.multiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -193,9 +194,9 @@ def _showContextMenu(self, menu): """ - Protected slot called before the context menu is shown. + Protected slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. @param menu Reference to the popup menu (QPopupMenu)
--- a/Project/ProjectResourcesBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectResourcesBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,14 +25,15 @@ import Preferences import Utilities + class ProjectResourcesBrowser(ProjectBaseBrowser): """ - A class used to display the resources part of the project. + A class used to display the resources part of the project. @signal appendStderr(str) emitted after something was received from a QProcess on stderr @signal sourceFile(str) emitted to open a resources file in an editor - @signal closeSourceWindow(str) emitted after a file has been removed/deleted + @signal closeSourceWindow(str) emitted after a file has been removed/deleted from the project @signal showMenu(str, QMenu) emitted when a menu is about to be shown. The name of the menu and a reference to the menu are given. @@ -45,7 +46,7 @@ RCFilenameFormatPython = "{0}_rc.py" RCFilenameFormatRuby = "{0}_rc.rb" - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -78,21 +79,21 @@ self.menu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - self.menu.addAction(self.trUtf8('Compile resource'), + self.menu.addAction(self.trUtf8('Compile resource'), self.__compileResource) - self.menu.addAction(self.trUtf8('Compile all resources'), + self.menu.addAction(self.trUtf8('Compile all resources'), self.__compileAllResources) self.menu.addSeparator() else: if self.hooks["compileResource"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("compileResource", - self.trUtf8('Compile resource')), + self.hooksMenuEntries.get("compileResource", + self.trUtf8('Compile resource')), self.__compileResource) if self.hooks["compileAllResources"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("compileAllResources", - self.trUtf8('Compile all resources')), + self.hooksMenuEntries.get("compileAllResources", + self.trUtf8('Compile all resources')), self.__compileAllResources) if self.hooks["compileResource"] is not None or \ self.hooks["compileAllResources"] is not None: @@ -111,47 +112,47 @@ else: if self.hooks["newResource"] is not None: self.menu.addAction( - self.hooksMenuEntries.get("newResource", + self.hooksMenuEntries.get("newResource", self.trUtf8('New resource...')), self.__newResource) self.menu.addAction(self.trUtf8('Add resources...'), self.__addResourceFiles) - self.menu.addAction(self.trUtf8('Add resources directory...'), + self.menu.addAction(self.trUtf8('Add resources directory...'), self.__addResourcesDirectory) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Expand all directories'), + self.menu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.menu.addAction(self.trUtf8('Collapse all directories'), + self.menu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) self.backMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - self.backMenu.addAction(self.trUtf8('Compile all resources'), + self.backMenu.addAction(self.trUtf8('Compile all resources'), self.__compileAllResources) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('New resource...'), self.__newResource) else: if self.hooks["compileAllResources"] is not None: self.backMenu.addAction( - self.hooksMenuEntries.get("compileAllResources", - self.trUtf8('Compile all resources')), + self.hooksMenuEntries.get("compileAllResources", + self.trUtf8('Compile all resources')), self.__compileAllResources) self.backMenu.addSeparator() if self.hooks["newResource"] is not None: self.backMenu.addAction( - self.hooksMenuEntries.get("newResource", + self.hooksMenuEntries.get("newResource", self.trUtf8('New resource...')), self.__newResource) - self.backMenu.addAction(self.trUtf8('Add resources...'), + self.backMenu.addAction(self.trUtf8('Add resources...'), self.project.addResourceFiles) - self.backMenu.addAction(self.trUtf8('Add resources directory...'), + self.backMenu.addAction(self.trUtf8('Add resources directory...'), self.project.addResourceDir) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Expand all directories'), + self.backMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.backMenu.addAction(self.trUtf8('Collapse all directories'), + self.backMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -160,41 +161,41 @@ # create the menu for multiple selected files self.multiMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - act = self.multiMenu.addAction(self.trUtf8('Compile resources'), + act = self.multiMenu.addAction(self.trUtf8('Compile resources'), self.__compileSelectedResources) self.multiMenu.addSeparator() else: if self.hooks["compileSelectedResources"] is not None: act = self.multiMenu.addAction( - self.hooksMenuEntries.get("compileSelectedResources", - self.trUtf8('Compile resources')), + self.hooksMenuEntries.get("compileSelectedResources", + self.trUtf8('Compile resources')), self.__compileSelectedResources) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Open'), self.__openFile) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.multiMenuActions.append(act) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Expand all directories'), + self.multiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.multiMenu.addAction(self.trUtf8('Collapse all directories'), + self.multiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) self.dirMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - self.dirMenu.addAction(self.trUtf8('Compile all resources'), + self.dirMenu.addAction(self.trUtf8('Compile all resources'), self.__compileAllResources) self.dirMenu.addSeparator() else: if self.hooks["compileAllResources"] is not None: self.dirMenu.addAction( - self.hooksMenuEntries.get("compileAllResources", - self.trUtf8('Compile all resources')), + self.hooksMenuEntries.get("compileAllResources", + self.trUtf8('Compile all resources')), self.__compileAllResources) self.dirMenu.addSeparator() act = self.dirMenu.addAction(self.trUtf8('Remove from project'), self._removeDir) @@ -202,39 +203,39 @@ self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('New resource...'), self.__newResource) self.dirMenu.addAction(self.trUtf8('Add resources...'), self.__addResourceFiles) - self.dirMenu.addAction(self.trUtf8('Add resources directory...'), + self.dirMenu.addAction(self.trUtf8('Add resources directory...'), self.__addResourcesDirectory) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) if self.project.getProjectType() in ["Qt4", "E4Plugin", "PySide"]: - self.dirMultiMenu.addAction(self.trUtf8('Compile all resources'), + self.dirMultiMenu.addAction(self.trUtf8('Compile all resources'), self.__compileAllResources) self.dirMultiMenu.addSeparator() else: if self.hooks["compileAllResources"] is not None: self.dirMultiMenu.addAction( - self.hooksMenuEntries.get("compileAllResources", - self.trUtf8('Compile all resources')), + self.hooksMenuEntries.get("compileAllResources", + self.trUtf8('Compile all resources')), self.__compileAllResources) self.dirMultiMenu.addSeparator() - self.dirMultiMenu.addAction(self.trUtf8('Add resources...'), + self.dirMultiMenu.addAction(self.trUtf8('Add resources...'), self.project.addResourceFiles) - self.dirMultiMenu.addAction(self.trUtf8('Add resources directory...'), + self.dirMultiMenu.addAction(self.trUtf8('Add resources directory...'), self.project.addResourceDir) self.dirMultiMenu.addSeparator() - self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMultiMenu.addSeparator() self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -408,7 +409,7 @@ res = E5MessageBox.yesNo(self, self.trUtf8("New Resource"), self.trUtf8("The file already exists! Overwrite it?"), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: # user selected to not overwrite return @@ -418,7 +419,7 @@ newline = None else: newline = self.project.getEolString() - rcfile = open(fname, 'w', encoding = "utf-8", newline = newline) + rcfile = open(fname, 'w', encoding="utf-8", newline=newline) rcfile.write('<!DOCTYPE RCC>\n') rcfile.write('<RCC version="1.0">\n') rcfile.write('<qresource>\n') @@ -466,7 +467,7 @@ def __readStdout(self): """ - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the pyrcc4/rbrcc process. """ if self.compileProc is None: @@ -474,13 +475,13 @@ self.compileProc.setReadChannel(QProcess.StandardOutput) while self.compileProc and self.compileProc.canReadLine(): - self.buf += str(self.compileProc.readLine(), - Preferences.getSystem("IOEncoding"), + self.buf += str(self.compileProc.readLine(), + Preferences.getSystem("IOEncoding"), 'replace') def __readStderr(self): """ - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the pyrcc4/rbrcc process. """ if self.compileProc is None: @@ -491,7 +492,7 @@ self.compileProc.setReadChannel(QProcess.StandardError) while self.compileProc and self.compileProc.canReadLine(): s = self.rccCompiler + ': ' - error = str(self.compileProc.readLine(), + error = str(self.compileProc.readLine(), ioEncoding, 'replace') s += error self.appendStderr.emit(s) @@ -512,7 +513,7 @@ newline = None else: newline = self.project.getEolString() - f = open(ofn, "w", encoding = "utf-8", newline = newline) + f = open(ofn, "w", encoding="utf-8", newline=newline) for line in self.buf.splitlines(): f.write(line + "\n") f.close() @@ -536,7 +537,7 @@ self.trUtf8("The compilation of the resource file failed.")) self.compileProc = None - def __compileQRC(self, fn, noDialog = False, progress = None): + def __compileQRC(self, fn, noDialog=False, progress=None): """ Privat method to compile a .qrc file to a .py file. @@ -582,7 +583,7 @@ dirname, filename = os.path.split(ofn) if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]: - self.compiledFile = os.path.join(dirname, + self.compiledFile = os.path.join(dirname, self.RCFilenameFormatPython.format(filename)) elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": self.compiledFile = os.path.join( @@ -632,7 +633,7 @@ self.hooks["compileAllResources"](self.project.pdata["RESOURCES"]) else: numResources = len(self.project.pdata["RESOURCES"]) - progress = QProgressDialog(self.trUtf8("Compiling resources..."), + progress = QProgressDialog(self.trUtf8("Compiling resources..."), self.trUtf8("Abort"), 0, numResources, self) progress.setModal(True) progress.setMinimumDuration(0) @@ -666,7 +667,7 @@ self.hooks["compileSelectedResources"](files) else: numResources = len(files) - progress = QProgressDialog(self.trUtf8("Compiling resources..."), + progress = QProgressDialog(self.trUtf8("Compiling resources..."), self.trUtf8("Abort"), 0, numResources, self) progress.setModal(True) progress.setMinimumDuration(0) @@ -699,7 +700,7 @@ @return flag indicating some file is newer (boolean) """ try: - f = open(filename, "r", encoding = "utf-8") + f = open(filename, "r", encoding="utf-8") buf = f.read() f.close() except IOError: @@ -731,7 +732,7 @@ if self.hooks["compileChangedResources"] is not None: self.hooks["compileChangedResources"](self.project.pdata["RESOURCES"]) else: - progress = QProgressDialog(self.trUtf8("Determining changed resources..."), + progress = QProgressDialog(self.trUtf8("Determining changed resources..."), None, 0, 100) progress.setMinimumDuration(0) i = 0 @@ -746,11 +747,11 @@ if self.project.pdata["PROGLANGUAGE"][0] in \ ["Python", "Python2", "Python3"]: dirname, filename = os.path.split(os.path.splitext(ifn)[0]) - ofn = os.path.join(dirname, + ofn = os.path.join(dirname, self.RCFilenameFormatPython.format(filename)) elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby": dirname, filename = os.path.split(os.path.splitext(ifn)[0]) - ofn = os.path.join(dirname, + ofn = os.path.join(dirname, self.RCFilenameFormatRuby.format(filename)) else: return @@ -810,9 +811,9 @@ specified differently. """ self.hooks = { - "compileResource" : None, - "compileAllResources" : None, - "compileChangedResources" : None, - "compileSelectedResources" : None, - "newResource" : None, + "compileResource": None, + "compileAllResources": None, + "compileChangedResources": None, + "compileSelectedResources": None, + "newResource": None, }
--- a/Project/ProjectSourcesBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectSourcesBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -35,11 +35,12 @@ import Utilities + class ProjectSourcesBrowser(ProjectBaseBrowser): """ - A class used to display the Sources part of the project. + A class used to display the Sources part of the project. - @signal closeSourceWindow(str) emitted after a file has been removed/deleted + @signal closeSourceWindow(str) emitted after a file has been removed/deleted from the project @signal showMenu(str, QMenu) emitted when a menu is about to be shown. The name of the menu and a reference to the menu are given. @@ -52,7 +53,7 @@ showMenu = pyqtSignal(str, QMenu) sourceFile = pyqtSignal((str, ), (str, int), (str, int, str)) - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -75,12 +76,12 @@ project.prepareRepopulateItem.connect(self._prepareRepopulateItem) project.completeRepopulateItem.connect(self._completeRepopulateItem) - self.codemetrics = None - self.codecoverage = None - self.profiledata = None - self.classDiagram = None - self.importsDiagram = None - self.packageDiagram = None + self.codemetrics = None + self.codecoverage = None + self.profiledata = None + self.classDiagram = None + self.importsDiagram = None + self.packageDiagram = None self.applicationDiagram = None def __closeAllWindows(self): @@ -145,17 +146,17 @@ self.sourceMenu.addSeparator() act = self.sourceMenu.addAction(self.trUtf8('Rename file'), self._renameFile) self.menuActions.append(act) - act = self.sourceMenu.addAction(self.trUtf8('Remove from project'), + act = self.sourceMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.menuActions.append(act) act = self.sourceMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.menuActions.append(act) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('New package...'), + self.sourceMenu.addAction(self.trUtf8('New package...'), self.__addNewPackage) - self.sourceMenu.addAction(self.trUtf8('Add source files...'), + self.sourceMenu.addAction(self.trUtf8('Add source files...'), self.__addSourceFiles) - self.sourceMenu.addAction(self.trUtf8('Add source directory...'), + self.sourceMenu.addAction(self.trUtf8('Add source directory...'), self.__addSourceDirectory) self.sourceMenu.addSeparator() act = self.sourceMenu.addMenu(self.graphicsMenu) @@ -165,57 +166,57 @@ self.sourceMenuActions["Show"] = \ self.sourceMenu.addMenu(self.menuShow) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.sourceMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Expand all directories'), + self.sourceMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.sourceMenu.addAction(self.trUtf8('Collapse all directories'), + self.sourceMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.sourceMenu.addSeparator() self.sourceMenu.addAction(self.trUtf8('Configure...'), self._configure) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('New package...'), + self.menu.addAction(self.trUtf8('New package...'), self.__addNewPackage) - self.menu.addAction(self.trUtf8('Add source files...'), + self.menu.addAction(self.trUtf8('Add source files...'), self.__addSourceFiles) - self.menu.addAction(self.trUtf8('Add source directory...'), + self.menu.addAction(self.trUtf8('Add source directory...'), self.__addSourceDirectory) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Expand all directories'), + self.menu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.menu.addAction(self.trUtf8('Collapse all directories'), + self.menu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) self.backMenu = QMenu(self) - self.backMenu.addAction(self.trUtf8('New package...'), + self.backMenu.addAction(self.trUtf8('New package...'), self.__addNewPackage) - self.backMenu.addAction(self.trUtf8('Add source files...'), + self.backMenu.addAction(self.trUtf8('Add source files...'), self.project.addSourceFiles) - self.backMenu.addAction(self.trUtf8('Add source directory...'), + self.backMenu.addAction(self.trUtf8('Add source directory...'), self.project.addSourceDir) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Expand all directories'), + self.backMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.backMenu.addAction(self.trUtf8('Collapse all directories'), + self.backMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) self.backMenu.setEnabled(False) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.multiMenuActions.append(act) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Expand all directories'), + self.multiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.multiMenu.addAction(self.trUtf8('Collapse all directories'), + self.multiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -226,27 +227,27 @@ self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('New package...'), self.__addNewPackage) self.dirMenu.addAction(self.trUtf8('Add source files...'), self.__addSourceFiles) - self.dirMenu.addAction(self.trUtf8('Add source directory...'), + self.dirMenu.addAction(self.trUtf8('Add source directory...'), self.__addSourceDirectory) self.dirMenu.addSeparator() - act = self.dirMenu.addMenu(self.graphicsMenu) + act = self.dirMenu.addMenu(self.graphicsMenu) self.dirMenu.addSeparator() self.dirMenu.addMenu(self.checksMenu) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) - self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMultiMenu.addSeparator() self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -265,70 +266,70 @@ self.graphicsMenu = QMenu(self.trUtf8('Diagrams')) self.classDiagramAction = self.graphicsMenu.addAction( self.trUtf8("Class Diagram..."), self.__showClassDiagram) - self.graphicsMenu.addAction(self.trUtf8("Package Diagram..."), + self.graphicsMenu.addAction(self.trUtf8("Package Diagram..."), self.__showPackageDiagram) - self.graphicsMenu.addAction(self.trUtf8("Application Diagram..."), + self.graphicsMenu.addAction(self.trUtf8("Application Diagram..."), self.__showApplicationDiagram) self.sourceMenu.addSeparator() act = self.sourceMenu.addAction(self.trUtf8('Rename file'), self._renameFile) self.menuActions.append(act) - act = self.sourceMenu.addAction(self.trUtf8('Remove from project'), + act = self.sourceMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.menuActions.append(act) act = self.sourceMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.menuActions.append(act) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Add source files...'), + self.sourceMenu.addAction(self.trUtf8('Add source files...'), self.__addSourceFiles) - self.sourceMenu.addAction(self.trUtf8('Add source directory...'), + self.sourceMenu.addAction(self.trUtf8('Add source directory...'), self.__addSourceDirectory) self.sourceMenu.addSeparator() act = self.sourceMenu.addMenu(self.graphicsMenu) self.sourceMenu.addSeparator() - self.sourceMenu.addAction(self.trUtf8('Expand all directories'), + self.sourceMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.sourceMenu.addAction(self.trUtf8('Collapse all directories'), + self.sourceMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.sourceMenu.addSeparator() self.sourceMenu.addAction(self.trUtf8('Configure...'), self._configure) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Add source files...'), self.__addSourceFiles) - self.menu.addAction(self.trUtf8('Add source directory...'), + self.menu.addAction(self.trUtf8('Add source directory...'), self.__addSourceDirectory) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Expand all directories'), + self.menu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.menu.addAction(self.trUtf8('Collapse all directories'), + self.menu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) self.backMenu = QMenu(self) - self.backMenu.addAction(self.trUtf8('Add source files...'), + self.backMenu.addAction(self.trUtf8('Add source files...'), self.project.addSourceFiles) - self.backMenu.addAction(self.trUtf8('Add source directory...'), + self.backMenu.addAction(self.trUtf8('Add source directory...'), self.project.addSourceDir) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Expand all directories'), + self.backMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.backMenu.addAction(self.trUtf8('Collapse all directories'), + self.backMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.backMenu.setEnabled(False) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self._removeFile) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteFile) self.multiMenuActions.append(act) self.multiMenu.addSeparator() - self.multiMenu.addAction(self.trUtf8('Expand all directories'), + self.multiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.multiMenu.addAction(self.trUtf8('Collapse all directories'), + self.multiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -338,22 +339,22 @@ self.dirMenuActions.append(act) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Add source files...'), self.__addSourceFiles) - self.dirMenu.addAction(self.trUtf8('Add source directory...'), + self.dirMenu.addAction(self.trUtf8('Add source directory...'), self.__addSourceDirectory) self.dirMenu.addSeparator() - act = self.dirMenu.addMenu(self.graphicsMenu) + act = self.dirMenu.addMenu(self.graphicsMenu) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) self.dirMultiMenu = QMenu(self) - self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'), self._expandAllDirs) - self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), + self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'), self._collapseAllDirs) self.dirMultiMenu.addSeparator() self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -376,7 +377,7 @@ try: categories = self.getSelectedItemsCountCategorized( - [ProjectBrowserFileItem, BrowserClassItem, + [ProjectBrowserFileItem, BrowserClassItem, BrowserMethodItem, ProjectBrowserSimpleDirectoryItem]) cnt = categories["sum"] if cnt <= 1: @@ -384,7 +385,7 @@ if index.isValid(): self._selectSingleItem(index) categories = self.getSelectedItemsCountCategorized( - [ProjectBrowserFileItem, BrowserClassItem, + [ProjectBrowserFileItem, BrowserClassItem, BrowserMethodItem, ProjectBrowserSimpleDirectoryItem]) cnt = categories["sum"] @@ -523,7 +524,7 @@ Protected slot to handle the open popup menu entry. """ itmList = self.getSelectedItems( - [BrowserFileItem, BrowserClassItem, BrowserMethodItem, + [BrowserFileItem, BrowserClassItem, BrowserMethodItem, BrowserClassAttributeItem]) for itm in itmList: @@ -540,7 +541,7 @@ self.sourceFile[str].emit(itm.fileName()) elif isinstance(itm, BrowserClassItem): self.sourceFile[str, int].emit(itm.fileName(), itm.classObject().lineno) - elif isinstance(itm,BrowserMethodItem): + elif isinstance(itm, BrowserMethodItem): self.sourceFile[str, int].emit( itm.fileName(), itm.functionObject().lineno) elif isinstance(itm, BrowserClassAttributeItem): @@ -587,7 +588,7 @@ packageFile = os.path.join(packagePath, "__init__.py") if not os.path.exists(packageFile): try: - f = open(packageFile, "w", encoding = "utf-8") + f = open(packageFile, "w", encoding="utf-8") f.close() except IOError as err: E5MessageBox.critical(self, @@ -810,8 +811,8 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Class Diagram"), self.trUtf8("""Include class attributes?"""), - yesDefault = True) - self.classDiagram = UMLClassDiagram(fn, self, noAttrs = not res) + yesDefault=True) + self.classDiagram = UMLClassDiagram(fn, self, noAttrs=not res) self.classDiagram.show() def __showImportsDiagram(self): @@ -827,8 +828,8 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?""")) - self.importsDiagram = ImportsDiagram(package, self, - showExternalImports = res) + self.importsDiagram = ImportsDiagram(package, self, + showExternalImports=res) self.importsDiagram.show() def __showPackageDiagram(self): @@ -844,8 +845,8 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), - yesDefault = True) - self.packageDiagram = PackageDiagram(package, self, noAttrs = not res) + yesDefault=True) + self.packageDiagram = PackageDiagram(package, self, noAttrs=not res) self.packageDiagram.show() def __showApplicationDiagram(self): @@ -855,7 +856,7 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), - yesDefault = True) - self.applicationDiagram = ApplicationDiagram(self.project, self, - noModules = not res) + yesDefault=True) + self.applicationDiagram = ApplicationDiagram(self.project, self, + noModules=not res) self.applicationDiagram.show()
--- a/Project/ProjectTranslationsBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/ProjectTranslationsBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -26,9 +26,10 @@ import Preferences import Utilities + class ProjectTranslationsBrowser(ProjectBaseBrowser): """ - A class used to display the translations part of the project. + A class used to display the translations part of the project. @signal linguistFile(str) emitted to open a translation file with Qt-Linguist @@ -37,9 +38,9 @@ @signal appendStderr(str) emitted after something was received from a QProcess on stderr @signal sourceFile(str) emitted to open a translation file in an editor - @signal closeSourceWindow(str) emitted after a file has been removed/deleted + @signal closeSourceWindow(str) emitted after a file has been removed/deleted from the project - @signal trpreview(list of str, bool = False) emitted to preview translations in the + @signal trpreview(list of str, bool = False) emitted to preview translations in the translations previewer @signal showMenu(str, QMenu) emitted when a menu is about to be shown. The name of the menu and a reference to the menu are given. @@ -106,108 +107,108 @@ self.menu = QMenu(self) if self.project.getProjectType() in \ ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: - act = self.menu.addAction(self.trUtf8('Generate translation'), + act = self.menu.addAction(self.trUtf8('Generate translation'), self.__generateSelected) self.tsMenuActions.append(act) self.tsprocMenuActions.append(act) act = self.menu.addAction( - self.trUtf8('Generate translation (with obsolete)'), + self.trUtf8('Generate translation (with obsolete)'), self.__generateObsoleteSelected) self.tsMenuActions.append(act) self.tsprocMenuActions.append(act) - act = self.menu.addAction(self.trUtf8('Generate all translations'), + act = self.menu.addAction(self.trUtf8('Generate all translations'), self.__generateAll) self.tsprocMenuActions.append(act) act = self.menu.addAction( - self.trUtf8('Generate all translations (with obsolete)'), + self.trUtf8('Generate all translations (with obsolete)'), self.__generateObsoleteAll) self.tsprocMenuActions.append(act) self.menu.addSeparator() - act = self.menu.addAction(self.trUtf8('Open in Qt-Linguist'), + act = self.menu.addAction(self.trUtf8('Open in Qt-Linguist'), self._openItem) self.tsMenuActions.append(act) - act = self.menu.addAction(self.trUtf8('Open in Editor'), + act = self.menu.addAction(self.trUtf8('Open in Editor'), self.__openFileInEditor) self.tsMenuActions.append(act) self.menu.addSeparator() - act = self.menu.addAction(self.trUtf8('Release translation'), + act = self.menu.addAction(self.trUtf8('Release translation'), self.__releaseSelected) self.tsMenuActions.append(act) self.qmprocMenuActions.append(act) - act = self.menu.addAction(self.trUtf8('Release all translations'), + act = self.menu.addAction(self.trUtf8('Release all translations'), self.__releaseAll) self.qmprocMenuActions.append(act) self.menu.addSeparator() - act = self.menu.addAction(self.trUtf8('Preview translation'), + act = self.menu.addAction(self.trUtf8('Preview translation'), self.__TRPreview) self.qmMenuActions.append(act) - act = self.menu.addAction(self.trUtf8('Preview all translations'), + act = self.menu.addAction(self.trUtf8('Preview all translations'), self.__TRPreviewAll) self.menu.addSeparator() else: if self.hooks["extractMessages"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("extractMessages", - self.trUtf8('Extract messages')), + self.hooksMenuEntries.get("extractMessages", + self.trUtf8('Extract messages')), self.__extractMessages) self.menuActions.append(act) self.menu.addSeparator() if self.hooks["generateSelected"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("generateSelected", - self.trUtf8('Generate translation')), + self.hooksMenuEntries.get("generateSelected", + self.trUtf8('Generate translation')), self.__generateSelected) self.tsMenuActions.append(act) self.tsprocMenuActions.append(act) if self.hooks["generateSelectedWithObsolete"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("generateSelectedWithObsolete", - self.trUtf8('Generate translation (with obsolete)')), + self.hooksMenuEntries.get("generateSelectedWithObsolete", + self.trUtf8('Generate translation (with obsolete)')), self.__generateObsoleteSelected) self.tsMenuActions.append(act) self.tsprocMenuActions.append(act) if self.hooks["generateAll"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("generateAll", - self.trUtf8('Generate all translations')), + self.hooksMenuEntries.get("generateAll", + self.trUtf8('Generate all translations')), self.__generateAll) self.tsprocMenuActions.append(act) if self.hooks["generateAllWithObsolete"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("generateAllWithObsolete", - self.trUtf8('Generate all translations (with obsolete)')), + self.hooksMenuEntries.get("generateAllWithObsolete", + self.trUtf8('Generate all translations (with obsolete)')), self.__generateObsoleteAll) self.tsprocMenuActions.append(act) self.menu.addSeparator() - act = self.menu.addAction(self.trUtf8('Open in Editor'), + act = self.menu.addAction(self.trUtf8('Open in Editor'), self.__openFileInEditor) self.tsMenuActions.append(act) self.menu.addSeparator() if self.hooks["releaseSelected"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("releaseSelected", - self.trUtf8('Release translation')), + self.hooksMenuEntries.get("releaseSelected", + self.trUtf8('Release translation')), self.__releaseSelected) self.tsMenuActions.append(act) self.qmprocMenuActions.append(act) if self.hooks["releaseAll"] is not None: act = self.menu.addAction( - self.hooksMenuEntries.get("releaseAll", - self.trUtf8('Release all translations')), + self.hooksMenuEntries.get("releaseAll", + self.trUtf8('Release all translations')), self.__releaseAll) self.qmprocMenuActions.append(act) self.menu.addSeparator() - act = self.menu.addAction(self.trUtf8('Remove from project'), + act = self.menu.addAction(self.trUtf8('Remove from project'), self.__removeLanguageFile) self.menuActions.append(act) act = self.menu.addAction(self.trUtf8('Delete'), self.__deleteLanguageFile) self.menuActions.append(act) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Add translation...'), self.project.addLanguage) - self.menu.addAction(self.trUtf8('Add translation files...'), + self.menu.addAction(self.trUtf8('Add translation files...'), self.__addTranslationFiles) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.menu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.menu.addSeparator() self.menu.addAction(self.trUtf8('Configure...'), self._configure) @@ -215,48 +216,48 @@ self.backMenu = QMenu(self) if self.project.getProjectType() in \ ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: - act = self.backMenu.addAction(self.trUtf8('Generate all translations'), + act = self.backMenu.addAction(self.trUtf8('Generate all translations'), self.__generateAll) self.tsprocBackMenuActions.append(act) act = self.backMenu.addAction( - self.trUtf8('Generate all translations (with obsolete)'), + self.trUtf8('Generate all translations (with obsolete)'), self.__generateObsoleteAll) self.tsprocBackMenuActions.append(act) - act = self.backMenu.addAction(self.trUtf8('Release all translations'), + act = self.backMenu.addAction(self.trUtf8('Release all translations'), self.__releaseAll) self.qmprocBackMenuActions.append(act) self.backMenu.addSeparator() - act = self.backMenu.addAction(self.trUtf8('Preview all translations'), + act = self.backMenu.addAction(self.trUtf8('Preview all translations'), self.__TRPreview) else: if self.hooks["extractMessages"] is not None: act = self.backMenu.addAction( - self.hooksMenuEntries.get("extractMessages", - self.trUtf8('Extract messages')), + self.hooksMenuEntries.get("extractMessages", + self.trUtf8('Extract messages')), self.__extractMessages) self.backMenu.addSeparator() if self.hooks["generateAll"] is not None: act = self.backMenu.addAction( - self.hooksMenuEntries.get("generateAll", - self.trUtf8('Generate all translations')), + self.hooksMenuEntries.get("generateAll", + self.trUtf8('Generate all translations')), self.__generateAll) self.tsprocBackMenuActions.append(act) if self.hooks["generateAllWithObsolete"] is not None: act = self.backMenu.addAction( - self.hooksMenuEntries.get("generateAllWithObsolete", - self.trUtf8('Generate all translations (with obsolete)')), + self.hooksMenuEntries.get("generateAllWithObsolete", + self.trUtf8('Generate all translations (with obsolete)')), self.__generateObsoleteAll) self.tsprocBackMenuActions.append(act) if self.hooks["releaseAll"] is not None: act = self.backMenu.addAction( - self.hooksMenuEntries.get("releaseAll", - self.trUtf8('Release all translations')), + self.hooksMenuEntries.get("releaseAll", + self.trUtf8('Release all translations')), self.__releaseAll) self.qmprocBackMenuActions.append(act) self.backMenu.addSeparator() - self.backMenu.addAction(self.trUtf8('Add translation...'), + self.backMenu.addAction(self.trUtf8('Add translation...'), self.project.addLanguage) - self.backMenu.addAction(self.trUtf8('Add translation files...'), + self.backMenu.addAction(self.trUtf8('Add translation files...'), self.__addTranslationFiles) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -266,7 +267,7 @@ self.multiMenu = QMenu(self) if self.project.getProjectType() in \ ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: - act = self.multiMenu.addAction(self.trUtf8('Generate translations'), + act = self.multiMenu.addAction(self.trUtf8('Generate translations'), self.__generateSelected) self.tsMultiMenuActions.append(act) self.tsprocMultiMenuActions.append(act) @@ -279,54 +280,54 @@ act = self.multiMenu.addAction( self.trUtf8('Open in Qt-Linguist'), self._openItem) self.tsMultiMenuActions.append(act) - act = self.multiMenu.addAction(self.trUtf8('Open in Editor'), + act = self.multiMenu.addAction(self.trUtf8('Open in Editor'), self.__openFileInEditor) self.tsMultiMenuActions.append(act) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Release translations'), + act = self.multiMenu.addAction(self.trUtf8('Release translations'), self.__releaseSelected) self.tsMultiMenuActions.append(act) self.qmprocMultiMenuActions.append(act) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Preview translations'), + act = self.multiMenu.addAction(self.trUtf8('Preview translations'), self.__TRPreview) self.qmMultiMenuActions.append(act) else: if self.hooks["extractMessages"] is not None: act = self.multiMenu.addAction( - self.hooksMenuEntries.get("extractMessages", - self.trUtf8('Extract messages')), + self.hooksMenuEntries.get("extractMessages", + self.trUtf8('Extract messages')), self.__extractMessages) self.multiMenuActions.append(act) self.multiMenu.addSeparator() if self.hooks["generateSelected"] is not None: act = self.multiMenu.addAction( - self.hooksMenuEntries.get("generateSelected", - self.trUtf8('Generate translations')), + self.hooksMenuEntries.get("generateSelected", + self.trUtf8('Generate translations')), self.__generateSelected) self.tsMultiMenuActions.append(act) self.tsprocMultiMenuActions.append(act) if self.hooks["generateSelectedWithObsolete"] is not None: act = self.multiMenu.addAction( - self.hooksMenuEntries.get("generateSelectedWithObsolete", + self.hooksMenuEntries.get("generateSelectedWithObsolete", self.trUtf8('Generate translations (with obsolete)')), self.__generateObsoleteSelected) self.tsMultiMenuActions.append(act) self.tsprocMultiMenuActions.append(act) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Open in Editor'), + act = self.multiMenu.addAction(self.trUtf8('Open in Editor'), self.__openFileInEditor) self.tsMultiMenuActions.append(act) self.multiMenu.addSeparator() if self.hooks["releaseSelected"] is not None: act = self.multiMenu.addAction( - self.hooksMenuEntries.get("releaseSelected", - self.trUtf8('Release translations')), + self.hooksMenuEntries.get("releaseSelected", + self.trUtf8('Release translations')), self.__releaseSelected) self.tsMultiMenuActions.append(act) self.qmprocMultiMenuActions.append(act) self.multiMenu.addSeparator() - act = self.multiMenu.addAction(self.trUtf8('Remove from project'), + act = self.multiMenu.addAction(self.trUtf8('Remove from project'), self.__removeLanguageFile) self.multiMenuActions.append(act) act = self.multiMenu.addAction(self.trUtf8('Delete'), self.__deleteLanguageFile) @@ -337,52 +338,52 @@ self.dirMenu = QMenu(self) if self.project.getProjectType() in \ ["Qt4", "Qt4C", "E4Plugin", "PySide", "PySideC"]: - act = self.dirMenu.addAction(self.trUtf8('Generate all translations'), + act = self.dirMenu.addAction(self.trUtf8('Generate all translations'), self.__generateAll) self.tsprocDirMenuActions.append(act) act = self.dirMenu.addAction( - self.trUtf8('Generate all translations (with obsolete)'), + self.trUtf8('Generate all translations (with obsolete)'), self.__generateObsoleteAll) self.tsprocDirMenuActions.append(act) - act = self.dirMenu.addAction(self.trUtf8('Release all translations'), + act = self.dirMenu.addAction(self.trUtf8('Release all translations'), self.__releaseAll) self.qmprocDirMenuActions.append(act) self.dirMenu.addSeparator() - act = self.dirMenu.addAction(self.trUtf8('Preview all translations'), + act = self.dirMenu.addAction(self.trUtf8('Preview all translations'), self.__TRPreview) else: if self.hooks["extractMessages"] is not None: act = self.dirMenu.addAction( - self.hooksMenuEntries.get("extractMessages", - self.trUtf8('Extract messages')), + self.hooksMenuEntries.get("extractMessages", + self.trUtf8('Extract messages')), self.__extractMessages) self.dirMenuActions.append(act) self.dirMenu.addSeparator() if self.hooks["generateAll"] is not None: act = self.dirMenu.addAction( - self.hooksMenuEntries.get("generateAll", - self.trUtf8('Generate all translations')), + self.hooksMenuEntries.get("generateAll", + self.trUtf8('Generate all translations')), self.__generateAll) self.tsprocDirMenuActions.append(act) if self.hooks["generateAllWithObsolete"] is not None: act = self.dirMenu.addAction( - self.hooksMenuEntries.get("generateAllWithObsolete", - self.trUtf8('Generate all translations (with obsolete)')), + self.hooksMenuEntries.get("generateAllWithObsolete", + self.trUtf8('Generate all translations (with obsolete)')), self.__generateObsoleteAll) self.tsprocDirMenuActions.append(act) if self.hooks["releaseAll"] is not None: act = self.dirMenu.addAction( - self.hooksMenuEntries.get("releaseAll", - self.trUtf8('Release all translations')), + self.hooksMenuEntries.get("releaseAll", + self.trUtf8('Release all translations')), self.__releaseAll) self.qmprocDirMenuActions.append(act) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Add translation...'), + self.dirMenu.addAction(self.trUtf8('Add translation...'), self.project.addLanguage) - self.dirMenu.addAction(self.trUtf8('Add translation files...'), + self.dirMenu.addAction(self.trUtf8('Add translation files...'), self.__addTranslationFiles) self.dirMenu.addSeparator() - self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), + self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard) self.dirMenu.addSeparator() self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure) @@ -611,7 +612,7 @@ self.closeSourceWindow.emit(fn) self.project.deleteLanguageFile(fn) - def __TRPreview(self, previewAll = False): + def __TRPreview(self, previewAll=False): """ Private slot to handle the Preview translations action. @@ -655,8 +656,8 @@ Private method to write a temporary project file suitable for pylupdate and lrelease. - @param langs list of languages to include in the process. An empty list (default) - means that all translations should be included. + @param langs list of languages to include in the process. An empty list (default) + means that all translations should be included. (list of ProjectBrowserFileItem) @param filter list of source file extension that should be considered (list of strings) @@ -711,7 +712,7 @@ return False try: - pf = open(pfile, "w", encoding = "utf-8") + pf = open(pfile, "w", encoding="utf-8") for key, list in sections: if len(list) > 0: pf.write('{0} = '.format(key)) @@ -741,7 +742,7 @@ def __readStdoutLupdate(self): """ - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the pylupdate process. """ if self.pylupdateProc is not None: @@ -751,7 +752,7 @@ def __readStdoutLrelease(self): """ - Private slot to handle the readyReadStandardOutput signal of the + Private slot to handle the readyReadStandardOutput signal of the lrelease process. """ if self.lreleaseProc is not None: @@ -777,7 +778,7 @@ def __readStderrLupdate(self): """ - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the pylupdate process. """ if self.pylupdateProc is not None: @@ -787,7 +788,7 @@ def __readStderrLrelease(self): """ - Private slot to handle the readyReadStandardError signal of the + Private slot to handle the readyReadStandardError signal of the lrelease process. """ if self.lreleaseProc is not None: @@ -847,13 +848,13 @@ pass self.tmpProject = None - def __generateTSFile(self, noobsolete = False, generateAll = True): + def __generateTSFile(self, noobsolete=False, generateAll=True): """ Private method used to run pylupdate/pylupdate4 to generate the .ts files. - @param noobsolete flag indicating whether obsolete entries should be + @param noobsolete flag indicating whether obsolete entries should be kept (boolean) - @param generateAll flag indicating whether all translations should be + @param generateAll flag indicating whether all translations should be generated (boolean) """ if generateAll: @@ -934,7 +935,7 @@ All obsolete strings are removed from the .ts file. """ - self.__generateTSFile(noobsolete = True, generateAll = True) + self.__generateTSFile(noobsolete=True, generateAll=True) def __generateObsoleteAll(self): """ @@ -942,7 +943,7 @@ Obsolete strings are kept. """ - self.__generateTSFile(noobsolete = False, generateAll = True) + self.__generateTSFile(noobsolete=False, generateAll=True) def __generateSelected(self): """ @@ -950,7 +951,7 @@ All obsolete strings are removed from the .ts file. """ - self.__generateTSFile(noobsolete = True, generateAll = False) + self.__generateTSFile(noobsolete=True, generateAll=False) def __generateObsoleteSelected(self): """ @@ -958,7 +959,7 @@ Obsolete strings are kept. """ - self.__generateTSFile(noobsolete = False, generateAll = False) + self.__generateTSFile(noobsolete=False, generateAll=False) ############################################################################ ## Methods for the release commands @@ -975,7 +976,7 @@ self.trUtf8("The release of the translation files (*.qm)" " was successful.")) if self.project.pdata["TRANSLATIONSBINPATH"]: - target = os.path.join(self.project.ppath, + target = os.path.join(self.project.ppath, self.project.pdata["TRANSLATIONSBINPATH"][0]) for langFile in self.project.pdata["TRANSLATIONS"][:]: if langFile.endswith('.ts'): @@ -995,7 +996,7 @@ self.tmpProject = None self.project.checkLanguageFiles() - def __releaseTSFile(self, generateAll = False): + def __releaseTSFile(self, generateAll=False): """ Private method to run lrelease to release the translation files (.qm). @@ -1061,13 +1062,13 @@ """ Private method to release the translation files (.qm). """ - self.__releaseTSFile(generateAll = False) + self.__releaseTSFile(generateAll=False) def __releaseAll(self): """ Private method to release the translation files (.qm). """ - self.__releaseTSFile(generateAll = True) + self.__releaseTSFile(generateAll=True) ############################################################################ ## Support for hooks below @@ -1091,11 +1092,11 @@ <b>Note</b>: Filenames are relative to the project directory. """ self.hooks = { - "extractMessages" : None, - "generateAll" : None, - "generateAllWithObsolete" : None, - "generateSelected" : None, - "generateSelectedWithObsolete" : None, - "releaseAll" : None, - "releaseSelected" : None, + "extractMessages": None, + "generateAll": None, + "generateAllWithObsolete": None, + "generateSelected": None, + "generateSelectedWithObsolete": None, + "releaseAll": None, + "releaseSelected": None, }
--- a/Project/PropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/PropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,11 +24,12 @@ import Utilities + class PropertiesDialog(QDialog, Ui_PropertiesDialog): """ Class implementing the project properties dialog. """ - def __init__(self, project, new = True, parent = None, name = None): + def __init__(self, project, new=True, parent=None, name=None): """ Constructor @@ -150,7 +151,7 @@ SpellingPropertiesDialog(self.project, self.newProject, self) res = self.spellPropertiesDlg.exec_() if res == QDialog.Rejected: - self.spellPropertiesDlg.initDialog() # reset the dialogs contents + self.spellPropertiesDlg.initDialog() # reset the dialogs contents @pyqtSlot() def on_transPropertiesButton_clicked(self): @@ -164,7 +165,7 @@ self.transPropertiesDlg.initFilters() res = self.transPropertiesDlg.exec_() if res == QDialog.Rejected: - self.transPropertiesDlg.initDialog() # reset the dialogs contents + self.transPropertiesDlg.initDialog() # reset the dialogs contents @pyqtSlot() def on_mainscriptButton_clicked(self):
--- a/Project/SpellingPropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/SpellingPropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ import Utilities import Preferences + class SpellingPropertiesDialog(QDialog, Ui_SpellingPropertiesDialog): """ Class implementing the Spelling Properties dialog.
--- a/Project/TranslationPropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/TranslationPropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,6 +19,7 @@ import Utilities + class TranslationPropertiesDialog(QDialog, Ui_TranslationPropertiesDialog): """ Class implementing the Translations Properties dialog. @@ -50,8 +51,8 @@ Public method to initialize the filters. """ patterns = { - "SOURCES" : [], - "FORMS" : [], + "SOURCES": [], + "FORMS": [], } for pattern, filetype in list(self.project.pdata["FILETYPES"].items()): if filetype in patterns:
--- a/Project/UserPropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/UserPropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from .Ui_UserPropertiesDialog import Ui_UserPropertiesDialog + class UserPropertiesDialog(QDialog, Ui_UserPropertiesDialog): """ Class implementing the user specific project properties dialog. """ - def __init__(self, project, parent = None, name = None): + def __init__(self, project, parent=None, name=None): """ Constructor @@ -91,4 +92,4 @@ if vcsSystem != self.project.pdata["VCS"][0]: self.project.pudata["VCSOVERRIDE"] = [vcsSystem] else: - self.project.pudata["VCSOVERRIDE"] = [] \ No newline at end of file + self.project.pudata["VCSOVERRIDE"] = []
--- a/Project/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Project/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,8 +8,8 @@ The project management module consists of the main part, which is used for reading and writing of eric4 and eric5 project files (*.e4p) -and for performing all operations on the project. It is accompanied by -various UI related modules implementing different dialogs and a tabbed +and for performing all operations on the project. It is accompanied by +various UI related modules implementing different dialogs and a tabbed tree browser for the display of files belonging to the current project as well as the project model related modules. """
--- a/PyUnit/UnittestDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PyUnit/UnittestDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -30,6 +30,7 @@ import Utilities + class UnittestDialog(QWidget, Ui_UnittestDialog): """ Class implementing the UI to the pyunit package. @@ -38,7 +39,7 @@ """ unittestFile = pyqtSignal(str, int, int) - def __init__(self,prog = None,dbs = None,ui = None,parent = None,name = None): + def __init__(self, prog=None, dbs=None, ui=None, parent=None, name=None): """ Constructor @@ -49,7 +50,7 @@ @param parent parent widget of this dialog (QWidget) @param name name of this dialog (string) """ - QWidget.__init__(self,parent) + QWidget.__init__(self, parent) if name: self.setObjectName(name) self.setupUi(self) @@ -150,10 +151,10 @@ """ if self.dbs: py2Extensions = \ - ' '.join(["*{0}".format(ext) + ' '.join(["*{0}".format(ext) for ext in self.dbs.getExtensions('Python2')]) py3Extensions = \ - ' '.join(["*{0}".format(ext) + ' '.join(["*{0}".format(ext) for ext in self.dbs.getExtensions('Python3')]) filter = self.trUtf8( "Python3 Files ({1});;Python2 Files ({0});;All Files (*)")\ @@ -211,8 +212,8 @@ prog = self.testsuiteComboBox.currentText() if not prog: - E5MessageBox.critical(self, - self.trUtf8("Unittest"), + E5MessageBox.critical(self, + self.trUtf8("Unittest"), self.trUtf8("You must enter a test suite file.")) return @@ -258,7 +259,7 @@ test = unittest.defaultTestLoader.loadTestsFromModule(module) except: exc_type, exc_value, exc_tb = sys.exc_info() - E5MessageBox.critical(self, + 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))) @@ -276,7 +277,7 @@ else: mainScript = os.path.abspath(prog) cover = coverage( - data_file = "{0}.coverage".format(os.path.splitext(mainScript)[0])) + data_file="{0}.coverage".format(os.path.splitext(mainScript)[0])) cover.use_cache(True) if self.coverageEraseCheckBox.isChecked(): cover.erase() @@ -307,7 +308,7 @@ @param exc_value value of exception occured during preparation (string) """ if nrTests == 0: - E5MessageBox.critical(self, + 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)) @@ -506,6 +507,7 @@ fn, ln = fmatch.group(1, 2) self.unittestFile.emit(fn, int(ln), 1) + class QtTestResult(unittest.TestResult): """ A TestResult derivative to work with a graphical GUI. @@ -561,11 +563,12 @@ unittest.TestResult.stopTest(self, test) self.parent.testFinished() + class UnittestWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, prog = None, parent = None): + def __init__(self, prog=None, parent=None): """ Constructor @@ -573,7 +576,7 @@ @param parent reference to the parent widget (QWidget) """ QMainWindow.__init__(self, parent) - self.cw = UnittestDialog(prog = prog, parent = self) + self.cw = UnittestDialog(prog=prog, parent=self) self.cw.installEventFilter(self) size = self.cw.size() self.setCentralWidget(self.cw)
--- a/PyUnit/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/PyUnit/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -6,7 +6,7 @@ """ Package implementing an interface to the pyunit unittest package. -The package consist of a single dialog, which may be called as a +The package consist of a single dialog, which may be called as a standalone version using the eric5_unittest script or from within the eric5 IDE. If it is called from within eric5, it has the additional function to open a source file that failed a test.
--- a/QScintilla/APIsManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/APIsManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ import Preferences import Utilities + class APIs(QObject): """ Class implementing an API storage entity. @@ -28,7 +29,7 @@ apiPreparationCancelled = pyqtSignal() apiPreparationStarted = pyqtSignal() - def __init__(self, language, forPreparation = False, parent = None): + def __init__(self, language, forPreparation=False, parent=None): """ Constructor @@ -67,7 +68,7 @@ else: # load the raw files and prepare the API file if not self.__forPreparation and Preferences.getEditor("AutoPrepareAPIs"): - self.prepareAPIs(ondemand = True) + self.prepareAPIs(ondemand=True) def reloadAPIs(self): """ @@ -109,7 +110,7 @@ self.__inPreparation = True self.apiPreparationStarted.emit() - def prepareAPIs(self, ondemand = False, rawList = None): + def prepareAPIs(self, ondemand=False, rawList=None): """ Public method to prepare the APIs if necessary. @@ -171,7 +172,7 @@ # it's the installer apidir = os.path.join(qsciPath, "api", self.__lexer.lexer()) fnames = [] - filist = QDir(apidir).entryInfoList(["*.api"], QDir.Files, + filist = QDir(apidir).entryInfoList(["*.api"], QDir.Files, QDir.IgnoreCase) for fi in filist: fnames.append(fi.absoluteFilePath()) @@ -192,12 +193,13 @@ else: return "" + class APIsManager(QObject): """ Class implementing the APIsManager class, which is the central store for API information used by autocompletion and calltips. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -215,11 +217,11 @@ for api in list(self.__apis.values()): api and api.reloadAPIs() - def getAPIs(self, language, forPreparation = False): + def getAPIs(self, language, forPreparation=False): """ Public method to get an apis object for autocompletion/calltips. - This method creates and loads an APIs object dynamically upon request. + This method creates and loads an APIs object dynamically upon request. This saves memory for languages, that might not be needed at the moment. @param language the language of the requested api object (string) @@ -228,7 +230,7 @@ @return the apis object (APIs) """ if forPreparation: - return APIs(language, forPreparation = forPreparation) + return APIs(language, forPreparation=forPreparation) else: try: return self.__apis[language]
--- a/QScintilla/Editor.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Editor.py Fri Mar 11 16:51:57 2011 +0100 @@ -49,6 +49,7 @@ EditorAutoCompletionListID = 1 TemplateCompletionListID = 2 + class Editor(QsciScintillaCompat): """ Class implementing the editor component of the eric5 IDE. @@ -67,22 +68,22 @@ updated. Typically due to a readOnly attribute change. @signal breakpointToggled(QsciScintillaCompat) emitted when a breakpoint is toggled @signal bookmarkToggled(QsciScintillaCompat) emitted when a bookmark is toggled - @signal syntaxerrorToggled(QsciScintillaCompat) emitted when a syntax error + @signal syntaxerrorToggled(QsciScintillaCompat) emitted when a syntax error was discovered @signal autoCompletionAPIsAvailable(bool) emitted after the autocompletion function has been configured - @signal coverageMarkersShown(bool) emitted after the coverage markers have been + @signal coverageMarkersShown(bool) emitted after the coverage markers have been shown or cleared - @signal taskMarkersUpdated(QsciScintillaCompat) emitted when the task markers + @signal taskMarkersUpdated(QsciScintillaCompat) emitted when the task markers were updated - @signal showMenu(str, QMenu, QsciScintillaCompat) emitted when a menu is about + @signal showMenu(str, QMenu, QsciScintillaCompat) emitted when a menu is about to be shown. The name of the menu, a reference to the menu and a reference to the editor are given. @signal languageChanged(str) emitted when the editors language was set. The language is passed as a parameter. @signal eolChanged(str) emitted when the editors eol type was set. The eol string is passed as a parameter. - @signal encodingChanged(str) emitted when the editors encoding was set. The + @signal encodingChanged(str) emitted when the editors encoding was set. The encoding name is passed as a parameter. """ modificationStatusChanged = pyqtSignal(bool, QsciScintillaCompat) @@ -105,32 +106,32 @@ encodingChanged = pyqtSignal(str) # Autocompletion icon definitions - ClassID = 1 - ClassProtectedID = 2 - ClassPrivateID = 3 - MethodID = 4 - MethodProtectedID = 5 - MethodPrivateID = 6 - AttributeID = 7 + ClassID = 1 + ClassProtectedID = 2 + ClassPrivateID = 3 + MethodID = 4 + MethodProtectedID = 5 + MethodPrivateID = 6 + AttributeID = 7 AttributeProtectedID = 8 - AttributePrivateID = 9 - EnumID = 10 + AttributePrivateID = 9 + EnumID = 10 - FromDocumentID = 99 + FromDocumentID = 99 - TemplateImageID = 100 + TemplateImageID = 100 # Cooperation related definitions Separator = "@@@" - StartEditToken = "START_EDIT" - EndEditToken = "END_EDIT" - CancelEditToken = "CANCEL_EDIT" - RequestSyncToken = "REQUEST_SYNC" - SyncToken = "SYNC" + StartEditToken = "START_EDIT" + EndEditToken = "END_EDIT" + CancelEditToken = "CANCEL_EDIT" + RequestSyncToken = "REQUEST_SYNC" + SyncToken = "SYNC" - def __init__(self, dbs, fn = None, vm = None, - filetype = "", editor = None, tv = None): + def __init__(self, dbs, fn=None, vm=None, + filetype="", editor=None, tv=None): """ Constructor @@ -157,12 +158,12 @@ self.project = e5App().getObject("Project") # clear some variables - self.lastHighlight = None # remember the last highlighted line + self.lastHighlight = None # remember the last highlighted line self.lastErrorMarker = None # remember the last error line - self.lastCurrMarker = None # remember the last current line - - self.breaks = {} # key: marker handle, - # value: (lineno, condition, temporary, + self.lastCurrMarker = None # remember the last current line + + self.breaks = {} # key: marker handle, + # value: (lineno, condition, temporary, # enabled, ignorecount) self.bookmarks = [] # bookmarks are just a list of handles to the # bookmark markers @@ -170,7 +171,7 @@ # value: error message, error index self.warnings = {} # key: marker handle # value: list of warning messages - self.notcoveredMarkers = [] # just a list of marker handles + self.notcoveredMarkers = [] # just a list of marker handles self.condHistory = [] self.lexer_ = None @@ -262,9 +263,9 @@ self.errorline = self.markerDefine(QsciScintilla.Background) self.__setLineMarkerColours() - self.breakpointMask = (1 << self.breakpoint) | \ - (1 << self.cbreakpoint) | \ - (1 << self.tbreakpoint) | \ + self.breakpointMask = (1 << self.breakpoint) | \ + (1 << self.cbreakpoint) | \ + (1 << self.tbreakpoint) | \ (1 << self.tcbreakpoint) | \ (1 << self.dbreakpoint) @@ -289,9 +290,9 @@ self.trUtf8("""<p>The size of the file <b>{0}</b>""" """ is <b>{1} KB</b>.""" """ Do you really want to load it?</p>""")\ - .format(self.fileName, + .format(self.fileName, QFileInfo(self.fileName).size() // 1024), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: raise IOError() self.readFile(self.fileName, True) @@ -372,8 +373,8 @@ self.__checkEncoding() else: # it's a clone - self.__languageChanged(editor.apiLanguage, propagate = False) - self.__encodingChanged(editor.encoding, propagate = False) + self.__languageChanged(editor.apiLanguage, propagate=False) + self.__encodingChanged(editor.encoding, propagate=False) self.__coverageMarkersShown = False # flag remembering the current status of the # code coverage markers @@ -406,31 +407,31 @@ """ Private method to register images for autocompletion lists. """ - self.registerImage(self.ClassID, + self.registerImage(self.ClassID, UI.PixmapCache.getPixmap("class.png")) - self.registerImage(self.ClassProtectedID, + self.registerImage(self.ClassProtectedID, UI.PixmapCache.getPixmap("class_protected.png")) - self.registerImage(self.ClassPrivateID, + self.registerImage(self.ClassPrivateID, UI.PixmapCache.getPixmap("class_private.png")) - self.registerImage(self.MethodID, + self.registerImage(self.MethodID, UI.PixmapCache.getPixmap("method.png")) - self.registerImage(self.MethodProtectedID, + self.registerImage(self.MethodProtectedID, UI.PixmapCache.getPixmap("method_protected.png")) - self.registerImage(self.MethodPrivateID, + self.registerImage(self.MethodPrivateID, UI.PixmapCache.getPixmap("method_private.png")) - self.registerImage(self.AttributeID, + self.registerImage(self.AttributeID, UI.PixmapCache.getPixmap("attribute.png")) - self.registerImage(self.AttributeProtectedID, + self.registerImage(self.AttributeProtectedID, UI.PixmapCache.getPixmap("attribute_protected.png")) - self.registerImage(self.AttributePrivateID, + self.registerImage(self.AttributePrivateID, UI.PixmapCache.getPixmap("attribute_private.png")) - self.registerImage(self.EnumID, + self.registerImage(self.EnumID, UI.PixmapCache.getPixmap("enum.png")) - self.registerImage(self.FromDocumentID, + self.registerImage(self.FromDocumentID, UI.PixmapCache.getPixmap("editor.png")) - self.registerImage(self.TemplateImageID, + self.registerImage(self.TemplateImageID, UI.PixmapCache.getPixmap("templateViewer.png")) def addClone(self, editor): @@ -542,7 +543,7 @@ self.menuActs = {} self.menu = QMenu() self.__menus = { - "Main" : self.menu, + "Main": self.menu, } self.languagesMenu = self.__initContextMenuLanguages() @@ -597,29 +598,29 @@ self.menu.addAction(UI.PixmapCache.getIcon("editUncomment.png"), self.trUtf8('Uncomment'), self.uncommentLineOrSelection) self.menuActs["StreamComment"] = \ - self.menu.addAction(self.trUtf8('Stream Comment'), + self.menu.addAction(self.trUtf8('Stream Comment'), self.streamCommentLineOrSelection) self.menuActs["BoxComment"] = \ - self.menu.addAction(self.trUtf8('Box Comment'), + self.menu.addAction(self.trUtf8('Box Comment'), self.boxCommentLineOrSelection) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Select to brace'), + self.menu.addAction(self.trUtf8('Select to brace'), self.selectToMatchingBrace) self.menu.addAction(self.trUtf8('Select all'), self.__selectAll) self.menu.addAction(self.trUtf8('Deselect all'), self.__deselectAll) self.menu.addSeparator() self.menuActs["SpellCheck"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), + self.menu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), self.trUtf8('Check spelling...'), self.checkSpelling) self.menuActs["SpellCheckSelection"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), - self.trUtf8('Check spelling of selection...'), + self.menu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), + self.trUtf8('Check spelling of selection...'), self.__checkSpellingSelection) self.menuActs["SpellCheckRemove"] = \ - self.menu.addAction(self.trUtf8("Remove from dictionary"), + self.menu.addAction(self.trUtf8("Remove from dictionary"), self.__removeFromSpellingDictionary) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Shorten empty lines'), + self.menu.addAction(self.trUtf8('Shorten empty lines'), self.shortenEmptyLines) self.menu.addSeparator() self.menuActs["Languages"] = self.menu.addMenu(self.languagesMenu) @@ -637,7 +638,7 @@ self.menuActs["AutosaveEnable"].setCheckable(True) self.menuActs["AutosaveEnable"].setChecked(self.autosaveEnabled) self.menuActs["TypingAidsEnabled"] = \ - self.menu.addAction(self.trUtf8("Typing aids enabled"), + self.menu.addAction(self.trUtf8("Typing aids enabled"), self.__toggleTypingAids) self.menuActs["TypingAidsEnabled"].setCheckable(True) self.menuActs["TypingAidsEnabled"].setEnabled(self.completer is not None) @@ -662,7 +663,7 @@ self.menuActs["Diagrams"] = self.menu.addMenu(self.graphicsMenu) self.menu.addSeparator() self.menu.addAction(self.trUtf8('New view'), self.__newView) - act = self.menu.addAction(self.trUtf8('New view (with new split)'), + act = self.menu.addAction(self.trUtf8('New view (with new split)'), self.__newViewNewSplit) if not self.vm.canSplit(): act.setEnabled(False) @@ -697,16 +698,16 @@ menu = QMenu(self.trUtf8('Autocomplete')) self.menuActs["acDynamic"] = \ - menu.addAction(self.trUtf8('dynamic'), + menu.addAction(self.trUtf8('dynamic'), self.autoComplete) menu.addSeparator() - menu.addAction(self.trUtf8('from Document'), + menu.addAction(self.trUtf8('from Document'), self.autoCompleteFromDocument) self.menuActs["acAPI"] = \ menu.addAction(self.trUtf8('from APIs'), self.autoCompleteFromAPIs) self.menuActs["acAPIDocument"] = \ - menu.addAction(self.trUtf8('from Document and APIs'), + menu.addAction(self.trUtf8('from Document and APIs'), self.autoCompleteFromAll) menu.addSeparator() self.menuActs["calltip"] = \ @@ -734,10 +735,10 @@ self.coverageMenuAct = \ menu.addAction(self.trUtf8('Code coverage...'), self.__showCodeCoverage) self.coverageShowAnnotationMenuAct = \ - menu.addAction(self.trUtf8('Show code coverage annotations'), + menu.addAction(self.trUtf8('Show code coverage annotations'), self.__codeCoverageShowAnnotations) self.coverageHideAnnotationMenuAct = \ - menu.addAction(self.trUtf8('Hide code coverage annotations'), + menu.addAction(self.trUtf8('Hide code coverage annotations'), self.__codeCoverageHideAnnotations) self.profileMenuAct = \ menu.addAction(self.trUtf8('Profile data...'), self.__showProfileData) @@ -752,14 +753,14 @@ """ menu = QMenu(self.trUtf8('Diagrams')) - menu.addAction(self.trUtf8('Class Diagram...'), + menu.addAction(self.trUtf8('Class Diagram...'), self.__showClassDiagram) - menu.addAction(self.trUtf8('Package Diagram...'), + menu.addAction(self.trUtf8('Package Diagram...'), self.__showPackageDiagram) - menu.addAction(self.trUtf8('Imports Diagram...'), + menu.addAction(self.trUtf8('Imports Diagram...'), self.__showImportsDiagram) self.applicationDiagramMenuAct = \ - menu.addAction(self.trUtf8('Application Diagram...'), + menu.addAction(self.trUtf8('Application Diagram...'), self.__showApplicationDiagram) menu.aboutToShow.connect(self.__showContextMenuGraphics) @@ -911,25 +912,25 @@ self.bpMarginMenu = QMenu() self.marginMenuActs["Breakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Toggle breakpoint'), + self.bpMarginMenu.addAction(self.trUtf8('Toggle breakpoint'), self.menuToggleBreakpoint) self.marginMenuActs["TempBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Toggle temporary breakpoint'), + self.bpMarginMenu.addAction(self.trUtf8('Toggle temporary breakpoint'), self.__menuToggleTemporaryBreakpoint) self.marginMenuActs["EditBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Edit breakpoint...'), + self.bpMarginMenu.addAction(self.trUtf8('Edit breakpoint...'), self.menuEditBreakpoint) self.marginMenuActs["EnableBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Enable breakpoint'), + self.bpMarginMenu.addAction(self.trUtf8('Enable breakpoint'), self.__menuToggleBreakpointEnabled) self.marginMenuActs["NextBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Next breakpoint'), + self.bpMarginMenu.addAction(self.trUtf8('Next breakpoint'), self.menuNextBreakpoint) self.marginMenuActs["PreviousBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Previous breakpoint'), + self.bpMarginMenu.addAction(self.trUtf8('Previous breakpoint'), self.menuPreviousBreakpoint) self.marginMenuActs["ClearBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Clear all breakpoints'), + self.bpMarginMenu.addAction(self.trUtf8('Clear all breakpoints'), self.__menuClearBreakpoints) self.bpMarginMenu.aboutToShow.connect(self.__showContextMenuMargin) @@ -948,10 +949,10 @@ self.clearSyntaxError) self.indicMarginMenu.addSeparator() self.marginMenuActs["NextWarningMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8("Next warning"), + self.indicMarginMenu.addAction(self.trUtf8("Next warning"), self.nextFlakesWarning) self.marginMenuActs["PreviousWarningMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8("Previous warning"), + self.indicMarginMenu.addAction(self.trUtf8("Previous warning"), self.previousFlakesWarning) self.marginMenuActs["ShowWarning"] = \ self.indicMarginMenu.addAction(self.trUtf8('Show warning message'), @@ -1005,10 +1006,10 @@ self.clearSyntaxError) self.marginMenu.addSeparator() self.marginMenuActs["NextWarningMarker"] = \ - self.marginMenu.addAction(self.trUtf8("Next warning"), + self.marginMenu.addAction(self.trUtf8("Next warning"), self.nextFlakesWarning) self.marginMenuActs["PreviousWarningMarker"] = \ - self.marginMenu.addAction(self.trUtf8("Previous warning"), + self.marginMenu.addAction(self.trUtf8("Previous warning"), self.previousFlakesWarning) self.marginMenuActs["ShowWarning"] = \ self.marginMenu.addAction(self.trUtf8('Show warning message'), @@ -1018,25 +1019,25 @@ self.clearFlakesWarnings) self.marginMenu.addSeparator() self.marginMenuActs["Breakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Toggle breakpoint'), + self.marginMenu.addAction(self.trUtf8('Toggle breakpoint'), self.menuToggleBreakpoint) self.marginMenuActs["TempBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Toggle temporary breakpoint'), + self.marginMenu.addAction(self.trUtf8('Toggle temporary breakpoint'), self.__menuToggleTemporaryBreakpoint) self.marginMenuActs["EditBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Edit breakpoint...'), + self.marginMenu.addAction(self.trUtf8('Edit breakpoint...'), self.menuEditBreakpoint) self.marginMenuActs["EnableBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Enable breakpoint'), + self.marginMenu.addAction(self.trUtf8('Enable breakpoint'), self.__menuToggleBreakpointEnabled) self.marginMenuActs["NextBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Next breakpoint'), + self.marginMenu.addAction(self.trUtf8('Next breakpoint'), self.menuNextBreakpoint) self.marginMenuActs["PreviousBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Previous breakpoint'), + self.marginMenu.addAction(self.trUtf8('Previous breakpoint'), self.menuPreviousBreakpoint) self.marginMenuActs["ClearBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Clear all breakpoints'), + self.marginMenu.addAction(self.trUtf8('Clear all breakpoints'), self.__menuClearBreakpoints) self.marginMenu.addSeparator() self.marginMenuActs["NextCoverageMarker"] = \ @@ -1103,7 +1104,7 @@ if self.apiLanguage.startswith("Pygments|"): self.pygmentsSelAct.setText( self.trUtf8("Alternatives ({0})").format( - self.getLanguage(normalized = False))) + self.getLanguage(normalized=False))) else: self.pygmentsSelAct.setText(self.trUtf8("Alternatives")) self.showMenu.emit("Languages", self.languagesMenu, self) @@ -1117,7 +1118,7 @@ from pygments.lexers import get_all_lexers lexerList = sorted([l[0] for l in get_all_lexers()]) try: - lexerSel = lexerList.index(self.getLanguage(normalized = False)) + lexerSel = lexerList.index(self.getLanguage(normalized=False)) except ValueError: lexerSel = 0 lexerName, ok = QInputDialog.getItem( @@ -1125,7 +1126,7 @@ self.trUtf8("Pygments Lexer"), self.trUtf8("Select the Pygments lexer to apply."), lexerList, - lexerSel, + lexerSel, False) if ok and lexerName: return lexerName @@ -1145,7 +1146,7 @@ elif act == self.pygmentsSelAct: language = self.__selectPygmentsLexer() if language: - self.setLanguage("dummy.pygments", pyname = language) + self.setLanguage("dummy.pygments", pyname=language) else: language = act.data() if language: @@ -1153,7 +1154,7 @@ self.filetype = language self.__autoSyntaxCheck() - def __languageChanged(self, language, propagate = True): + def __languageChanged(self, language, propagate=True): """ Private slot handling a change of a connected editor's language. @@ -1161,18 +1162,18 @@ @keyparam propagate flag indicating to propagate the change (boolean) """ if language == '': - self.__resetLanguage(propagate = propagate) + self.__resetLanguage(propagate=propagate) elif language == "Guessed": self.setLanguage("dummy.pygments") elif language.startswith("Pygments|"): pyname = language.split("|", 1)[1] - self.setLanguage("dummy.pygments", pyname = pyname) + self.setLanguage("dummy.pygments", pyname=pyname) else: - self.setLanguage(self.supportedLanguages[language][1], propagate = propagate) + self.setLanguage(self.supportedLanguages[language][1], propagate=propagate) self.filetype = language self.__autoSyntaxCheck() - def __resetLanguage(self, propagate = True): + def __resetLanguage(self, propagate=True): """ Private method used to reset the language selection. @@ -1197,8 +1198,8 @@ self.languageChanged.emit(self.apiLanguage) self.inLanguageChanged = False - def setLanguage(self, filename, initTextDisplay = True, propagate = True, - pyname = ""): + def setLanguage(self, filename, initTextDisplay=True, propagate=True, + pyname=""): """ Public method to set a lexer language. @@ -1209,7 +1210,7 @@ @keyparam pyname name of the pygments lexer to use (string) """ self.__lexerReset = False - self.__bindLexer(filename, pyname = pyname) + self.__bindLexer(filename, pyname=pyname) self.__bindCompleter(filename) self.recolor() self.__checkLanguage() @@ -1272,11 +1273,11 @@ except (AttributeError, KeyError): pass - def __encodingChanged(self, encoding, propagate = True): + def __encodingChanged(self, encoding, propagate=True): """ Private slot to handle a change of the encoding. - @keyparam propagate flag indicating to propagate the change (boolean) + @keyparam propagate flag indicating to propagate the change (boolean) """ self.encoding = encoding self.__checkEncoding() @@ -1333,7 +1334,7 @@ self.eolChanged.emit(eol) self.inEolChanged = False - def __bindLexer(self, filename, pyname = ""): + def __bindLexer(self, filename, pyname=""): """ Private slot to set the correct lexer depending on language. @@ -1369,7 +1370,7 @@ pyname = language.split("|", 1)[1] language = "" - self.lexer_ = Lexers.getLexer(language, self, pyname = pyname) + self.lexer_ = Lexers.getLexer(language, self, pyname=pyname) if self.lexer_ is None: self.setLexer() self.apiLanguage = "" @@ -1425,11 +1426,11 @@ """ return self.lexer_ - def getLanguage(self, normalized = True): + def getLanguage(self, normalized=True): """ Public method to retrieve the language of the editor. - @keyparam normalized flag indicating to normalize some Pygments + @keyparam normalized flag indicating to normalize some Pygments lexer names (boolean) @return language of the editor (string) """ @@ -1478,7 +1479,7 @@ def __modificationChanged(self, m): """ - Private slot to handle the modificationChanged signal. + Private slot to handle the modificationChanged signal. It emits the signal modificationStatusChanged with parameters m and self. @@ -1495,9 +1496,9 @@ def __cursorPositionChanged(self, line, index): """ - Private slot to handle the cursorPositionChanged signal. - - It emits the signal cursorChanged with parameters fileName, + Private slot to handle the cursorPositionChanged signal. + + It emits the signal cursorChanged with parameters fileName, line and pos. @param line line number of the cursor @@ -1513,7 +1514,7 @@ # do spell checking doSpelling = True if self.lastLine == line: - start, end = self.getWordBoundaries(line, index, useWordChars = False) + start, end = self.getWordBoundaries(line, index, useWordChars=False) if start <= self.lastIndex and self.lastIndex <= end: doSpelling = False if doSpelling: @@ -1569,7 +1570,7 @@ Public method to return the type of the file, if it was set by an eflag: marker. @return type of the displayed file, if set by an eflag: marker or an empty - string (string) + string (string) """ if self.filetypeByFlag: return self.filetype @@ -1645,9 +1646,9 @@ """ if self.lastHighlight is not None: lineno = self.markerLine(self.lastHighlight) - self.ensureVisible(lineno+1) - - def highlight(self, line = None, error = False, syntaxError = False): + self.ensureVisible(lineno + 1) + + def highlight(self, line=None, error=False, syntaxError=False): """ Public method to highlight (or de-highlight) a particular line. @@ -1667,14 +1668,14 @@ if error: if self.lastErrorMarker is not None: self.markerDeleteHandle(self.lastErrorMarker) - self.lastErrorMarker = self.markerAdd(line-1, self.errorline) + self.lastErrorMarker = self.markerAdd(line - 1, self.errorline) self.lastHighlight = self.lastErrorMarker else: if self.lastCurrMarker is not None: self.markerDeleteHandle(self.lastCurrMarker) - self.lastCurrMarker = self.markerAdd(line-1, self.currentline) + self.lastCurrMarker = self.markerAdd(line - 1, self.currentline) self.lastHighlight = self.lastCurrMarker - self.setCursorPosition(line-1, 0) + self.setCursorPosition(line - 1, 0) def getHighlightPosition(self): """ @@ -1707,7 +1708,7 @@ self.breaks = {} for bp in bps: index = self.breakpointModel.getBreakPointIndex(self.fileName, bp[0]) - self.breakpointModel.setBreakPointByIndex(index, + self.breakpointModel.setBreakPointByIndex(index, self.fileName, bp[1], bp[2]) def __restoreBreakpoints(self): @@ -1774,7 +1775,7 @@ @param line linenumber of the breakpoint (integer) """ for handle, (ln, _, _, _, _) in list(self.breaks.items()): - if self.markerLine(handle) == line-1: + if self.markerLine(handle) == line - 1: break else: # not found, simply ignore it @@ -1798,11 +1799,11 @@ else: marker = properties[1] and self.tbreakpoint or self.breakpoint - handle = self.markerAdd(line-1, marker) + handle = self.markerAdd(line - 1, marker) self.breaks[handle] = (line,) + properties self.breakpointToggled.emit(self) - def __toggleBreakpoint(self, line, temporary = False): + def __toggleBreakpoint(self, line, temporary=False): """ Private method to toggle a breakpoint. @@ -1900,7 +1901,7 @@ self.__toggleBreakpointEnabled(self.line) self.line = -1 - def menuEditBreakpoint(self, line = None): + def menuEditBreakpoint(self, line=None): """ Public slot to handle the 'Edit breakpoint' context menu action. @@ -1921,12 +1922,12 @@ if not index.isValid(): return - dlg = EditBreakpointDialog((self.fileName, ln), + dlg = EditBreakpointDialog((self.fileName, ln), (cond, temp, enabled, ignorecount), - self.condHistory, self, modal = True) + self.condHistory, self, modal=True) if dlg.exec_() == QDialog.Accepted: cond, temp, enabled, ignorecount = dlg.getData() - self.breakpointModel.setBreakPointByIndex(index, + self.breakpointModel.setBreakPointByIndex(index, self.fileName, ln, (cond, temp, enabled, ignorecount)) self.line = -1 @@ -1936,7 +1937,7 @@ Public slot to handle the 'Next breakpoint' context menu action. """ line, index = self.getCursorPosition() - if line == self.lines()-1: + if line == self.lines() - 1: line = 0 else: line += 1 @@ -1954,13 +1955,13 @@ """ line, index = self.getCursorPosition() if line == 0: - line = self.lines()-1 + line = self.lines() - 1 else: line -= 1 bpline = self.markerFindPrevious(line, self.breakpointMask) if bpline < 0: # wrap around - bpline = self.markerFindPrevious(self.lines()-1, self.breakpointMask) + bpline = self.markerFindPrevious(self.lines() - 1, self.breakpointMask) if bpline >= 0: self.setCursorPosition(bpline, 0) self.ensureLineVisible(bpline) @@ -2044,7 +2045,7 @@ Public slot to handle the 'Next bookmark' context menu action. """ line, index = self.getCursorPosition() - if line == self.lines()-1: + if line == self.lines() - 1: line = 0 else: line += 1 @@ -2062,7 +2063,7 @@ """ line, index = self.getCursorPosition() if line == 0: - line = self.lines()-1 + line = self.lines() - 1 else: line -= 1 bmline = self.markerFindPrevious(line, 1 << self.bookmark) @@ -2090,7 +2091,7 @@ """ Public slot to print the text. """ - printer = Printer(mode = QPrinter.HighResolution) + printer = Printer(mode=QPrinter.HighResolution) sb = e5App().getObject("UserInterface").statusBar() printDialog = QPrintDialog(printer, self) if self.hasSelectedText(): @@ -2109,7 +2110,7 @@ if toIndex == 0: toLine -= 1 # Qscintilla seems to print one line more than told - res = printer.printRange(self, fromLine, toLine-1) + res = printer.printRange(self, fromLine, toLine - 1) else: res = printer.printRange(self) if res: @@ -2127,7 +2128,7 @@ """ from PyQt4.QtGui import QPrintPreviewDialog - printer = Printer(mode = QPrinter.HighResolution) + printer = Printer(mode=QPrinter.HighResolution) fn = self.getFileName() if fn is not None: printer.setDocName(os.path.basename(fn)) @@ -2162,7 +2163,7 @@ Public slot to handle the 'Next task' context menu action. """ line, index = self.getCursorPosition() - if line == self.lines()-1: + if line == self.lines() - 1: line = 0 else: line += 1 @@ -2180,7 +2181,7 @@ """ line, index = self.getCursorPosition() if line == 0: - line = self.lines()-1 + line = self.lines() - 1 else: line -= 1 taskline = self.markerFindPrevious(line, 1 << self.taskmarker) @@ -2228,7 +2229,7 @@ if index > -1: task = line[index:] self.markerAdd(lineIndex, self.taskmarker) - self.taskViewer.addFileTask(task, self.fileName, lineIndex+1, True) + self.taskViewer.addFileTask(task, self.fileName, lineIndex + 1, True) self.__hasTaskMarkers = True break self.taskMarkersUpdated.emit(self) @@ -2269,7 +2270,7 @@ 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), @@ -2300,7 +2301,7 @@ break # Couldn't find the unmodified state - def readFile(self, fn, createIt = False): + def readFile(self, fn, createIt=False): """ Public slot to read the text from a file. @@ -2378,7 +2379,7 @@ self.__removeTrailingWhitespace() txt = self.text() - # work around glitch in scintilla: always make sure, + # work around glitch in scintilla: always make sure, # that the last line is terminated properly eol = self.getLineSeparator() if eol: @@ -2424,7 +2425,7 @@ .format(fn, str(why))) return False - def saveFile(self, saveas = False, path = None): + def saveFile(self, saveas=False, path=None): """ Public slot to save the text to a file. @@ -2452,7 +2453,7 @@ self, self.trUtf8("Save File"), path, - Lexers.getSaveFileFiltersList(True, True), + Lexers.getSaveFileFiltersList(True, True), defaultFilter, E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) @@ -2470,7 +2471,7 @@ self.trUtf8("Save File"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fn), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return False fn = Utilities.toNativeSeparators(fn) @@ -2519,7 +2520,7 @@ self.lastModified = QFileInfo(fn).lastModified() return False - def saveFileAs(self, path = None, toProject = False): + def saveFileAs(self, path=None, toProject=False): """ Public slot to save a file with a new name. @@ -2570,7 +2571,7 @@ @param line line number to make visible """ - self.ensureLineVisible(line-1) + self.ensureLineVisible(line - 1) def ensureVisibleTop(self, line): """ @@ -2632,13 +2633,13 @@ self.setMonospaced(False) self.__setMarginsDisplay() - def getWordBoundaries(self, line, index, useWordChars = True): + def getWordBoundaries(self, line, index, useWordChars=True): """ Public method to get the word boundaries at a position. @param line number of line to look at (int) @param index position to look at (int) - @keyparam useWordChars flag indicating to use the wordCharacters + @keyparam useWordChars flag indicating to use the wordCharacters method (boolean) @return tuple with start and end indices of the word at the position (integer, integer) @@ -2666,14 +2667,14 @@ return (start, end) - def getWord(self, line, index, direction = 0, useWordChars = True): + def getWord(self, line, index, direction=0, useWordChars=True): """ Public method to get the word at a position. @param line number of line to look at (int) @param index position to look at (int) @param direction direction to look in (0 = whole word, 1 = left, 2 = right) - @keyparam useWordChars flag indicating to use the wordCharacters + @keyparam useWordChars flag indicating to use the wordCharacters method (boolean) @return the word at that position (string) """ @@ -2756,9 +2757,9 @@ return ch, pos - def getSearchText(self, selectionOnly = False): - """ - Public method to determine the selection or the current word for the next + def getSearchText(self, selectionOnly=False): + """ + Public method to determine the selection or the current word for the next search operation. @param selectionOnly flag indicating that only selected text should be @@ -2855,7 +2856,7 @@ if Preferences.getEditor("CommentColumn0"): self.setSelection(line, 0, line, len(commentStr)) else: - self.setSelection(line, self.indentation(line), + self.setSelection(line, self.indentation(line), line, self.indentation(line) + len(commentStr)) self.removeSelectedText() self.endUndoAction() @@ -2893,7 +2894,7 @@ def uncommentSelection(self): """ - Public slot to uncomment the current selection. + Public slot to uncomment the current selection. """ if self.lexer_ is None or not self.lexer_.canBlockComment(): return @@ -2912,7 +2913,7 @@ self.beginUndoAction() # iterate over the lines - for line in range(lineFrom, endLine+1): + for line in range(lineFrom, endLine + 1): # check if line starts with our comment string (i.e. was commented # by our comment...() slots if not self.text(line).strip().startswith(commentStr): @@ -2921,7 +2922,7 @@ if Preferences.getEditor("CommentColumn0"): self.setSelection(line, 0, line, len(commentStr)) else: - self.setSelection(line, self.indentation(line), + self.setSelection(line, self.indentation(line), line, self.indentation(line) + len(commentStr)) self.removeSelectedText() @@ -3083,9 +3084,9 @@ ## Indentation handling methods below ############################################################################ - def __indentLine(self, indent = True): - """ - Private method to indent or unindent the current line. + def __indentLine(self, indent=True): + """ + Private method to indent or unindent the current line. @param indent flag indicating an indent operation (boolean) <br />If the flag is true, an indent operation is performed. @@ -3103,9 +3104,9 @@ else: self.setCursorPosition(line, index - self.indentationWidth()) - def __indentSelection(self, indent = True): - """ - Private method to indent or unindent the current selection. + def __indentSelection(self, indent=True): + """ + Private method to indent or unindent the current selection. @param indent flag indicating an indent operation (boolean) <br />If the flag is true, an indent operation is performed. @@ -3179,7 +3180,7 @@ else: self.__indentLine(True) - def gotoLine(self, line, pos = 1): + def gotoLine(self, line, pos=1): """ Public slot to jump to the beginning of a line. @@ -3282,17 +3283,17 @@ # set marker margin(s) settings if self.__unifiedMargins: - margin1Mask = (1 << self.breakpoint) | \ - (1 << self.cbreakpoint) | \ - (1 << self.tbreakpoint) | \ + margin1Mask = (1 << self.breakpoint) | \ + (1 << self.cbreakpoint) | \ + (1 << self.tbreakpoint) | \ (1 << self.tcbreakpoint) | \ - (1 << self.dbreakpoint) | \ - (1 << self.currentline) | \ - (1 << self.errorline) | \ - (1 << self.bookmark) | \ - (1 << self.syntaxerror) | \ - (1 << self.notcovered) | \ - (1 << self.taskmarker) | \ + (1 << self.dbreakpoint) | \ + (1 << self.currentline) | \ + (1 << self.errorline) | \ + (1 << self.bookmark) | \ + (1 << self.syntaxerror) | \ + (1 << self.notcovered) | \ + (1 << self.taskmarker) | \ (1 << self.warning) self.setMarginWidth(1, 16) self.setMarginSensitivity(1, True) @@ -3313,20 +3314,20 @@ self.setMarginSensitivity(self.__bmMargin, True) self.setMarginMarkerMask(self.__bmMargin, marginBmMask) - marginBpMask = (1 << self.breakpoint) | \ - (1 << self.cbreakpoint) | \ - (1 << self.tbreakpoint) | \ + marginBpMask = (1 << self.breakpoint) | \ + (1 << self.cbreakpoint) | \ + (1 << self.tbreakpoint) | \ (1 << self.tcbreakpoint) | \ - (1 << self.dbreakpoint) | \ - (1 << self.currentline) | \ + (1 << self.dbreakpoint) | \ + (1 << self.currentline) | \ (1 << self.errorline) self.setMarginWidth(self.__bpMargin, 16) self.setMarginSensitivity(self.__bpMargin, True) self.setMarginMarkerMask(self.__bpMargin, marginBpMask) - marginIndicMask = (1 << self.syntaxerror) | \ - (1 << self.notcovered) | \ - (1 << self.taskmarker) | \ + marginIndicMask = (1 << self.syntaxerror) | \ + (1 << self.notcovered) | \ + (1 << self.taskmarker) | \ (1 << self.warning) self.setMarginWidth(self.__indicMargin, 16) self.setMarginSensitivity(self.__indicMargin, True) @@ -3351,7 +3352,7 @@ pass self.setFolding(folding, self.__foldMargin) self.setFoldMarginColors( - Preferences.getEditorColour("FoldmarginBackground"), + Preferences.getEditorColour("FoldmarginBackground"), Preferences.getEditorColour("FoldmarginBackground")) self.setFoldMarkersColors( Preferences.getEditorColour("FoldMarkersForeground"), @@ -3444,7 +3445,7 @@ self.zoomTo(Preferences.getEditor("ZoomFactor")) self.searchIndicator = QsciScintilla.INDIC_CONTAINER - self.indicatorDefine(self.searchIndicator, QsciScintilla.INDIC_BOX, + self.indicatorDefine(self.searchIndicator, QsciScintilla.INDIC_BOX, Preferences.getEditorColour("SearchMarkers")) if not Preferences.getEditor("SearchMarkersEnabled") and \ not Preferences.getEditor("QuickSearchMarkersEnabled") and \ @@ -3452,7 +3453,7 @@ self.clearAllIndicators(self.searchIndicator) self.spellingIndicator = QsciScintilla.INDIC_CONTAINER + 1 - self.indicatorDefine(self.spellingIndicator, QsciScintilla.INDIC_SQUIGGLE, + self.indicatorDefine(self.spellingIndicator, QsciScintilla.INDIC_SQUIGGLE, Preferences.getEditorColour("SpellingMarkers")) self.__setSpelling() @@ -3601,7 +3602,7 @@ char = chr(charNumber) if self.__isStartChar(char): self.cancelList() - self.autoComplete(auto = True, context = True) + self.autoComplete(auto=True, context=True) return elif char == '(': self.cancelList() @@ -3613,13 +3614,13 @@ if not self.isCallTipActive(): char = chr(charNumber) if self.__isStartChar(char): - self.autoComplete(auto = True, context = True) + self.autoComplete(auto=True, context=True) return line, col = self.getCursorPosition() txt = self.getWordLeft(line, col) if len(txt) >= Preferences.getEditor("AutoCompletionThreshold"): - self.autoComplete(auto = True, context = False) + self.autoComplete(auto=True, context=False) return def __isStartChar(self, ch): @@ -3644,7 +3645,7 @@ Public method to set an autocompletion hook. @param func Function to be set to handle autocompletion. func - should be a function taking a reference to the editor and + should be a function taking a reference to the editor and a boolean indicating to complete a context. """ if self.autoCompletionThreshold() > 0: @@ -3670,7 +3671,7 @@ """ return self.__acHookFunction - def autoComplete(self, auto = False, context = True): + def autoComplete(self, auto=False, context=True): """ Public method to start autocompletion. @@ -3760,7 +3761,7 @@ # until here and unindent below ct = self._encodeString("\n".join(callTips)) - self.SendScintilla(QsciScintilla.SCI_CALLTIPSHOW, + self.SendScintilla(QsciScintilla.SCI_CALLTIPSHOW, self.__adjustedCallTipPosition(ctshift, pos), ct) if b'\n' in ct: return @@ -3805,7 +3806,7 @@ """ ct = pos if ctshift: - ctmin = self.SendScintilla(QsciScintilla.SCI_POSITIONFROMLINE, + ctmin = self.SendScintilla(QsciScintilla.SCI_POSITIONFROMLINE, self.SendScintilla(QsciScintilla.SCI_LINEFROMPOSITION, ct)) if ct - ctshift < ctmin: ct = ctmin @@ -4227,7 +4228,7 @@ .replace("\r\n", "\n")\ .replace("\r", "\n") warnings = Checker(txt, self.fileName) - warnings.messages.sort(key = lambda a: a.lineno) + warnings.messages.sort(key=lambda a: a.lineno) for warning in warnings.messages: if ignoreStarImportWarnings and \ isinstance(warning, ImportStarUsed): @@ -4247,7 +4248,7 @@ elif self.isPy2File(): syntaxError, _fn, errorline, errorindex, _code, _error, \ warnings = Utilities.py2compile( - self.fileName, + self.fileName, checkFlakes=Preferences.getFlakes("IncludeInSyntaxCheck")) if syntaxError: self.toggleSyntaxError( @@ -4339,7 +4340,7 @@ """ fn = self.__getCodeCoverageFile() if fn: - cover = coverage(data_file = fn) + cover = coverage(data_file=fn) cover.use_cache(True) cover.load() missing = cover.analysis2(self.fileName)[3] @@ -4379,7 +4380,7 @@ Public slot to handle the 'Next uncovered' context menu action. """ line, index = self.getCursorPosition() - if line == self.lines()-1: + if line == self.lines() - 1: line = 0 else: line += 1 @@ -4397,7 +4398,7 @@ """ line, index = self.getCursorPosition() if line == 0: - line = self.lines()-1 + line = self.lines() - 1 else: line -= 1 ucline = self.markerFindPrevious(line, 1 << self.notcovered) @@ -4481,7 +4482,7 @@ ## Syntax error handling methods below ############################################################################ - def toggleSyntaxError(self, line, index, error, msg = "", show = False): + def toggleSyntaxError(self, line, index, error, msg="", show=False): """ Public method to toggle a syntax error indicator. @@ -4559,7 +4560,7 @@ line = self.markerLine(handle) + 1 self.toggleSyntaxError(line, 0, False) - def __showSyntaxError(self, line = -1): + def __showSyntaxError(self, line=-1): """ Private slot to handle the 'Show syntax error message' context menu action. @@ -4584,7 +4585,7 @@ ## Flakes warning handling methods below ############################################################################ - def toggleFlakesWarning(self, line, warning, msg = ""): + def toggleFlakesWarning(self, line, warning, msg=""): """ Public method to toggle a flakes warning indicator. @@ -4686,7 +4687,7 @@ self.warnings = {} self.syntaxerrorToggled.emit(self) - def __showFlakesWarning(self, line = -1): + def __showFlakesWarning(self, line=-1): """ Private slot to handle the 'Show warning' context menu action. @@ -4716,18 +4717,18 @@ """ if hasattr(QsciScintilla, "annotate"): self.annotationWarningStyle = QsciScintilla.STYLE_LASTPREDEFINED + 1 - self.SendScintilla(QsciScintilla.SCI_STYLESETFORE, + self.SendScintilla(QsciScintilla.SCI_STYLESETFORE, self.annotationWarningStyle, Preferences.getEditorColour("AnnotationsWarningForeground")) - self.SendScintilla(QsciScintilla.SCI_STYLESETBACK, + self.SendScintilla(QsciScintilla.SCI_STYLESETBACK, self.annotationWarningStyle, Preferences.getEditorColour("AnnotationsWarningBackground")) self.annotationErrorStyle = self.annotationWarningStyle + 1 - self.SendScintilla(QsciScintilla.SCI_STYLESETFORE, + self.SendScintilla(QsciScintilla.SCI_STYLESETFORE, self.annotationErrorStyle, Preferences.getEditorColour("AnnotationsErrorForeground")) - self.SendScintilla(QsciScintilla.SCI_STYLESETBACK, + self.SendScintilla(QsciScintilla.SCI_STYLESETBACK, self.annotationErrorStyle, Preferences.getEditorColour("AnnotationsErrorBackground")) @@ -4763,12 +4764,12 @@ annotationWarningTxt = "\n".join(warningAnnotations) if eLen: annotationWarningTxt += "\n" - annotations.append(QsciStyledText(annotationWarningTxt, + annotations.append(QsciStyledText(annotationWarningTxt, self.annotationWarningStyle)) if eLen: annotationErrorTxt = "\n".join(errorAnnotations) - annotations.append(QsciStyledText(annotationErrorTxt, + annotations.append(QsciStyledText(annotationErrorTxt, self.annotationErrorStyle)) if annotations: @@ -4839,7 +4840,7 @@ return # user aborted try: - f = open(fname, "r", encoding = "utf-8") + f = open(fname, "r", encoding="utf-8") lines = f.readlines() f.close() except IOError: @@ -4890,13 +4891,13 @@ self.trUtf8("Save macro"), self.trUtf8("<p>The macro file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) try: - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write("{0}{1}".format(name, "\n")) f.write(self.macros[name].save()) f.close() @@ -4912,11 +4913,11 @@ 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, - yesDefault = True) + icon=E5MessageBox.Warning, + yesDefault=True) if res: self.macroRecordingStop() else: @@ -4968,7 +4969,7 @@ self.undoAvailable.emit(self.isUndoAvailable()) self.redoAvailable.emit(self.isRedoAvailable()) - def close(self, alsoDelete = False): + def close(self, alsoDelete=False): """ Public method called when the window gets closed. @@ -5061,8 +5062,8 @@ yesDefault = False res = E5MessageBox.yesNo(self, self.trUtf8("File changed"), msg, - icon = E5MessageBox.Warning, - yesDefault = yesDefault) + icon=E5MessageBox.Warning, + yesDefault=yesDefault) if res: self.refresh() else: @@ -5119,9 +5120,9 @@ self.vm.eventFilter(self, event) QsciScintillaCompat.mousePressEvent(self, event) - def __updateReadOnly(self, bForce = True): - """ - Private method to update the readOnly information for this editor. + def __updateReadOnly(self, bForce=True): + """ + Private method to update the readOnly information for this editor. If bForce is True, then updates everything regardless if the attributes have actually changed, such as during @@ -5275,13 +5276,13 @@ """ menu = QMenu(self.trUtf8('Resources')) - menu.addAction(self.trUtf8('Add file...'), + menu.addAction(self.trUtf8('Add file...'), self.__addFileResource) - menu.addAction(self.trUtf8('Add files...'), + menu.addAction(self.trUtf8('Add files...'), self.__addFileResources) - menu.addAction(self.trUtf8('Add aliased file...'), + menu.addAction(self.trUtf8('Add aliased file...'), self.__addFileAliasResource) - menu.addAction(self.trUtf8('Add localized resource...'), + menu.addAction(self.trUtf8('Add localized resource...'), self.__addLocalizedResource) menu.addSeparator() menu.addAction(self.trUtf8('Add resource frame'), @@ -5393,7 +5394,7 @@ if not self.checkDirty(): return - self.classDiagram = UMLClassDiagram(self.fileName, self, noAttrs = False) + self.classDiagram = UMLClassDiagram(self.fileName, self, noAttrs=False) self.classDiagram.show() def __showPackageDiagram(self): @@ -5409,8 +5410,8 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), - yesDefault = True) - self.packageDiagram = PackageDiagram(package, self, noAttrs = not res) + yesDefault=True) + self.packageDiagram = PackageDiagram(package, self, noAttrs=not res) self.packageDiagram.show() def __showImportsDiagram(self): @@ -5426,8 +5427,8 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?""")) - self.importsDiagram = ImportsDiagram(package, self, - showExternalImports = res) + self.importsDiagram = ImportsDiagram(package, self, + showExternalImports=res) self.importsDiagram.show() def __showApplicationDiagram(self): @@ -5438,9 +5439,9 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), - yesDefault = True) - self.applicationDiagram = ApplicationDiagram(self.project, - self, noModules = not res) + yesDefault=True) + self.applicationDiagram = ApplicationDiagram(self.project, + self, noModules=not res) self.applicationDiagram.show() ####################################################################### @@ -5480,7 +5481,7 @@ self.__applyTemplate(templateNames[0]) return elif len(templateNames) > 1: - self.showUserList(TemplateCompletionListID, + self.showUserList(TemplateCompletionListID, ["{0}?{1:d}".format(t, self.TemplateImageID) \ for t in templateNames]) return @@ -5517,8 +5518,8 @@ """ if self.spell: pwl, pel = self.project.getProjectDictionaries() - self.__setSpellingLanguage(self.project.getProjectSpellLanguage(), - pwl = pwl, pel = pel) + self.__setSpellingLanguage(self.project.getProjectSpellLanguage(), + pwl=pwl, pel=pel) self.setEolModeByEolString(self.project.getEolString()) self.convertEols(self.eolMode()) @@ -5529,15 +5530,15 @@ """ if self.spell: pwl, pel = self.project.getProjectDictionaries() - self.__setSpellingLanguage(self.project.getProjectSpellLanguage(), - pwl = pwl, pel = pel) + self.__setSpellingLanguage(self.project.getProjectSpellLanguage(), + pwl=pwl, pel=pel) self.project.projectPropertiesChanged.connect(self.__projectPropertiesChanged) ####################################################################### ## Spellchecking related methods ####################################################################### - def __setSpellingLanguage(self, language, pwl = "", pel = ""): + def __setSpellingLanguage(self, language, pwl="", pel=""): """ Private slot to set the spell checking language. @@ -5546,7 +5547,7 @@ @keyparam pel name of the personal/project exclude list (string) """ if self.spell and self.spell.getLanguage() != language: - self.spell.setLanguage(language, pwl = pwl, pel = pel) + self.spell.setLanguage(language, pwl=pwl, pel=pel) self.spell.checkDocumentIncrementally() def __setSpelling(self): @@ -5556,8 +5557,8 @@ if Preferences.getEditor("SpellCheckingEnabled"): self.__spellCheckStringsOnly = Preferences.getEditor("SpellCheckStringsOnly") if self.spell is None: - self.spell = SpellChecker(self, self.spellingIndicator, - checkRegion = self.isSpellCheckRegion) + self.spell = SpellChecker(self, self.spellingIndicator, + checkRegion=self.isSpellCheckRegion) self.setSpellingForProject() self.project.projectPropertiesChanged.connect(self.__projectPropertiesChanged) self.spell.setMinimumWordSize( @@ -5577,8 +5578,8 @@ self.project.isOpen() and \ self.project.isProjectSource(self.fileName): pwl, pel = self.project.getProjectDictionaries() - self.__setSpellingLanguage(self.project.getProjectSpellLanguage(), - pwl = pwl, pel = pel) + self.__setSpellingLanguage(self.project.getProjectSpellLanguage(), + pwl=pwl, pel=pel) def setAutoSpellChecking(self): """ @@ -5596,7 +5597,7 @@ def isSpellCheckRegion(self, pos): """ - Public method to check, if the given position is within a region, that should + Public method to check, if the given position is within a region, that should be spell checked. @param pos position to be checked (integer) @@ -5667,11 +5668,11 @@ self.spellingSuggActs.append(self.spellingMenu.addAction(suggestion)) if suggestions: self.spellingMenu.addSeparator() - self.spellingMenu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), + self.spellingMenu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), self.trUtf8("Check spelling..."), self.__checkSpellingWord) - self.spellingMenu.addAction(self.trUtf8("Add to dictionary"), + self.spellingMenu.addAction(self.trUtf8("Add to dictionary"), self.__addToSpellingDictionary) - self.spellingMenu.addAction(self.trUtf8("Ignore All"), + self.spellingMenu.addAction(self.trUtf8("Ignore All"), self.__ignoreSpellingAlways) self.showMenu.emit("Spelling", self.spellingMenu, self) @@ -5754,7 +5755,7 @@ self.__inRemoteSharedEdit = False self.setReadOnly(False) self.__updateReadOnly() - self.cancelSharedEdit(send = False) + self.cancelSharedEdit(send=False) self.__isSyncing = False self.__receivedWhileSyncing = [] @@ -5776,9 +5777,9 @@ self.__savedText = self.text() hash = str( QCryptographicHash.hash( - Utilities.encode(self.__savedText, self.encoding)[0], + Utilities.encode(self.__savedText, self.encoding)[0], QCryptographicHash.Sha1).toHex(), - encoding = "utf-8") + encoding="utf-8") self.__send(Editor.StartEditToken, hash) def sendSharedEdit(self): @@ -5791,7 +5792,7 @@ self.__inSharedEdit = False self.__savedText = "" - def cancelSharedEdit(self, send = True): + def cancelSharedEdit(self, send=True): """ Public slot to cancel a shared edit session for the editor. @@ -5802,7 +5803,7 @@ if send: self.__send(Editor.CancelEditToken) - def __send(self, token, args = None): + def __send(self, token, args=None): """ Private method to send an editor command to remote editors. @@ -5811,18 +5812,18 @@ """ if self.vm.isConnected(): msg = "" - if token in (Editor.StartEditToken, - Editor.EndEditToken, - Editor.RequestSyncToken, + if token in (Editor.StartEditToken, + Editor.EndEditToken, + Editor.RequestSyncToken, Editor.SyncToken): msg = "{0}{1}{2}".format( - token, - Editor.Separator, + token, + Editor.Separator, args ) elif token == Editor.CancelEditToken: msg = "{0}{1}c".format( - token, + token, Editor.Separator ) @@ -5871,9 +5872,9 @@ self.__updateReadOnly() hash = str( QCryptographicHash.hash( - Utilities.encode(self.text(), self.encoding)[0], + Utilities.encode(self.text(), self.encoding)[0], QCryptographicHash.Sha1).toHex(), - encoding = "utf-8") + encoding="utf-8") if hash != argsString: # text is different to the remote site, request to sync it self.__isSyncing = True @@ -5953,9 +5954,9 @@ if self.__inSharedEdit: hash = str( QCryptographicHash.hash( - Utilities.encode(self.__savedText, self.encoding)[0], + Utilities.encode(self.__savedText, self.encoding)[0], QCryptographicHash.Sha1).toHex(), - encoding = "utf-8") + encoding="utf-8") if hash == argsString: self.__send(Editor.SyncToken, self.__savedText) @@ -5980,7 +5981,7 @@ self.setCursorPosition(*cur) while self.__receivedWhileSyncing: - command = self.__receivedWhileSyncing.pop(0) + command = self.__receivedWhileSyncing.pop(0) self.__dispatchCommand(command) self.__isSyncing = False
--- a/QScintilla/Exporters/ExporterBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/ExporterBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,11 +14,12 @@ import Utilities + class ExporterBase(QObject): """ Class implementing the exporter base class. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -57,7 +58,7 @@ self.trUtf8("Export source"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fn), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return ""
--- a/QScintilla/Exporters/ExporterHTML.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/ExporterHTML.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ import Preferences import Utilities + class HTMLGenerator(object): """ Class implementing an HTML generator for exporting source code. @@ -35,8 +36,8 @@ """ self.editor = editor - def generate(self, tabSize = 4, useTabs = False, wysiwyg = True, folding = False, - onlyStylesUsed = False, titleFullPath = False): + def generate(self, tabSize=4, useTabs=False, wysiwyg=True, folding=False, + onlyStylesUsed=False, titleFullPath=False): """ Public method to generate HTML for the source editor. @@ -212,7 +213,7 @@ if inStyleSpan: html += '''</span>''' inStyleSpan = False - if ch not in [b'\r', b'\n']: # no need of a span for the EOL + if ch not in [b'\r', b'\n']: # no need of a span for the EOL if styleIsUsed[style]: html += '''<span class="S{0:d}">'''.format(style) inStyleSpan = True @@ -221,8 +222,8 @@ if ch == b' ': if wysiwyg: prevCh = b'' - if column == 0: - # at start of line, must put a + if column == 0: + # at start of line, must put a # because regular space will be collapsed prevCh = b' ' while pos < lengthDoc and self.editor.byteAt(pos) == b' ': @@ -233,7 +234,7 @@ prevCh = self.editor.byteAt(pos) pos += 1 column += 1 - pos -= 1 + pos -= 1 # the last incrementation will be done by the outer loop else: html += ' ' @@ -258,7 +259,7 @@ html += '''</span>''' inFoldSpan = False if ch == b'\r' and self.editor.byteAt(pos + 1) == b'\n': - pos += 1 # CR+LF line ending, skip the "extra" EOL char + pos += 1 # CR+LF line ending, skip the "extra" EOL char column = 0 if wysiwyg: html += '''<br />''' @@ -272,7 +273,7 @@ while levelStack[-1] > newLevel: html += '''</span>''' levelStack.pop() - html += '\n' # here to get clean code + html += '\n' # here to get clean code if newLevel > level: html += '''<span id="ln{0:d}">'''.format(line) levelStack.append(newLevel) @@ -312,14 +313,14 @@ utf8Len = 3 elif (utf8Ch[0] & 0xC0) == 0xC0: utf8Len = 2 - column -= 1 # will be incremented again later + column -= 1 # will be incremented again later elif len(utf8Ch) == utf8Len: ch = utf8Ch.decode('utf8') html += Utilities.html_encode(ch) utf8Ch = b"" utf8Len = 0 else: - column -= 1 # will be incremented again later + column -= 1 # will be incremented again later else: html += ch.decode() column += 1 @@ -343,11 +344,12 @@ return html + class ExporterHTML(ExporterBase): """ Class implementing an exporter for HTML. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -379,16 +381,16 @@ generator = HTMLGenerator(self.editor) html = generator.generate( - tabSize = tabSize, - useTabs = tabs, - wysiwyg = wysiwyg, - folding = folding, - onlyStylesUsed = onlyStylesUsed, - titleFullPath = titleFullPath + tabSize=tabSize, + useTabs=tabs, + wysiwyg=wysiwyg, + folding=folding, + onlyStylesUsed=onlyStylesUsed, + titleFullPath=titleFullPath ) try: - f = open(filename, "w", encoding = "utf-8") + f = open(filename, "w", encoding="utf-8") f.write(html) f.close() except IOError as err: @@ -400,4 +402,4 @@ """<p>Reason: {1}</p>""")\ .format(filename, str(err))) finally: - QApplication.restoreOverrideCursor() \ No newline at end of file + QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterODT.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/ExporterODT.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Preferences + class ExporterODT(ExporterBase): """ Class implementing an exporter for ODT. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -51,12 +52,12 @@ # generate HTML of the source generator = HTMLGenerator(self.editor) html = generator.generate( - tabSize = tabSize, - useTabs = tabs, - wysiwyg = wysiwyg, - folding = False, - onlyStylesUsed = onlyStylesUsed, - titleFullPath = False + tabSize=tabSize, + useTabs=tabs, + wysiwyg=wysiwyg, + folding=False, + onlyStylesUsed=onlyStylesUsed, + titleFullPath=False ) # convert HTML to ODT @@ -70,4 +71,4 @@ self.trUtf8("Export source"), self.trUtf8( """<p>The source could not be exported to <b>{0}</b>.</p>""")\ - .format(filename)) \ No newline at end of file + .format(filename))
--- a/QScintilla/Exporters/ExporterPDF.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/ExporterPDF.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ PDF_FONT_DEFAULT = 1 # Helvetica PDF_FONTSIZE_DEFAULT = 10 PDF_SPACING_DEFAULT = 1.2 -PDF_MARGIN_DEFAULT = 72 # 1.0" +PDF_MARGIN_DEFAULT = 72 # 1.0" PDF_ENCODING = "WinAnsiEncoding" PDFfontNames = [ @@ -32,16 +32,17 @@ "Helvetica", "Helvetica-Bold", "Helvetica-Oblique", "Helvetica-BoldOblique", "Times-Roman", "Times-Bold", "Times-Italic", "Times-BoldItalic" ] -PDFfontAscenders = [629, 718, 699] +PDFfontAscenders = [629, 718, 699] PDFfontDescenders = [157, 207, 217] -PDFfontWidths = [600, 0, 0] +PDFfontWidths = [600, 0, 0] PDFpageSizes = { # name : (height, width) - "Letter" : (792, 612), - "A4" : (842, 595), + "Letter": (792, 612), + "A4": (842, 595), } + class PDFStyle(object): """ Simple class to store the values of a PDF style. @@ -53,6 +54,7 @@ self.fore = "" self.font = 0 + class PDFObjectTracker(object): """ Class to conveniently handle the tracking of PDF objects @@ -114,9 +116,10 @@ ind += 1 return xrefStart + class PDFRender(object): """ - Class to manage line and page rendering. + Class to manage line and page rendering. Apart from startPDF, endPDF everything goes in via add() and nextLine() so that line formatting and pagination can be done properly. @@ -133,10 +136,10 @@ self.segStyle = "" self.segment = "" self.pageMargins = { - "left" : 72, - "right" : 72, - "top" : 72, - "bottom" : 72, + "left": 72, + "right": 72, + "top": 72, + "bottom": 72, } self.fontSize = 0 self.fontSet = 0 @@ -172,7 +175,7 @@ if styleNext != self.styleCurrent or style_ == -1: if self.style[self.styleCurrent].font != self.style[styleNext].font or \ style_ == -1: - buf += "/F{0:d} {1:d} Tf ".format(self.style[styleNext].font + 1, + buf += "/F{0:d} {1:d} Tf ".format(self.style[styleNext].font + 1, self.fontSize) if self.style[self.styleCurrent].fore != self.style[styleNext].fore or \ style_ == -1: @@ -236,7 +239,7 @@ "/MediaBox[ 0 0 {1:d} {2:d}]\n" \ "/Contents {3:d} 0 R\n" \ "/Resources {4:d} 0 R\n>>\n".format( - pagesRef, self.pageWidth, self.pageHeight, + pagesRef, self.pageWidth, self.pageHeight, self.pageContentStart + i, resourceRef) self.oT.add(buffer) @@ -291,7 +294,7 @@ self.segment += '\\' if ch != ' ': self.justWhiteSpace = False - self.segment += ch # add to segment data + self.segment += ch # add to segment data def flushSegment(self): """ @@ -369,11 +372,12 @@ buffer = "T*\n" self.pageData += buffer + class ExporterPDF(ExporterBase): """ Class implementing an exporter for PDF. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -432,7 +436,7 @@ elif fontName == "Times": self.pr.fontSet = 2 - # page size: height, width, + # page size: height, width, pageSize = Preferences.getEditorExporter("PDF/PageSize") try: pageDimensions = PDFpageSizes[pageSize] @@ -516,7 +520,7 @@ try: # save file in win ansi using cp1250 - f = open(filename, "w", encoding = "cp1250", errors = "backslashreplace") + f = open(filename, "w", encoding="cp1250", errors="backslashreplace") # initialise PDF rendering ot = PDFObjectTracker(f) @@ -527,7 +531,7 @@ lengthDoc = self.editor.length() if lengthDoc == 0: - self.pr.nextLine() # enable zero length docs + self.pr.nextLine() # enable zero length docs else: pos = 0 column = 0 @@ -561,14 +565,14 @@ utf8Len = 3 elif (utf8Ch[0] & 0xC0) == 0xC0: utf8Len = 2 - column -= 1 # will be incremented again later + column -= 1 # will be incremented again later elif len(utf8Ch) == utf8Len: ch = utf8Ch.decode('utf8') self.pr.add(ch, style) utf8Ch = b"" utf8Len = 0 else: - column -= 1 # will be incremented again later + column -= 1 # will be incremented again later else: self.pr.add(ch.decode(), style) column += 1 @@ -587,4 +591,4 @@ """<p>Reason: {1}</p>""")\ .format(filename, str(err))) finally: - QApplication.restoreOverrideCursor() \ No newline at end of file + QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterRTF.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/ExporterRTF.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ import Preferences + class ExporterRTF(ExporterBase): """ Class implementing an exporter for RTF. @@ -37,7 +38,7 @@ RTF_INFOOPEN = "{\\info " RTF_INFOCLOSE = "}" RTF_COMMENT = "{\\comment Generated by eric5's RTF export filter.}" - RTF_CREATED = "{\creatim\yr%Y\mo%m\dy%d\hr%H\min%M\sec%S}" # to be used by strftime + RTF_CREATED = "{\creatim\yr%Y\mo%m\dy%d\hr%H\min%M\sec%S}" # to be used by strftime RTF_BODYOPEN = "" RTF_BODYCLOSE = "}" @@ -55,7 +56,7 @@ RTF_COLOR = "#000000" - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -147,7 +148,7 @@ bgColour = self.editor.paper() try: - f = open(filename, "w", encoding = "utf-8") + f = open(filename, "w", encoding="utf-8") styles = {} fonts = {} @@ -313,7 +314,7 @@ utf8Len = 3 elif (utf8Ch[0] & 0xC0) == 0xC0: utf8Len = 2 - column -= 1 # will be incremented again later + column -= 1 # will be incremented again later elif len(utf8Ch) == utf8Len: ch = utf8Ch.decode('utf8') if ord(ch) <= 0xff: @@ -324,7 +325,7 @@ utf8Ch = b"" utf8Len = 0 else: - column -= 1 # will be incremented again later + column -= 1 # will be incremented again later else: f.write(ch.decode()) @@ -343,4 +344,4 @@ """<p>Reason: {1}</p>""")\ .format(filename, str(err))) finally: - QApplication.restoreOverrideCursor() \ No newline at end of file + QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/ExporterTEX.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/ExporterTEX.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,13 +22,14 @@ import Preferences + class ExporterTEX(ExporterBase): """ Class implementing an exporter for TeX. """ CHARZ = ord('z') - ord('a') + 1 - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -148,7 +149,7 @@ styleIsUsed[QsciScintilla.STYLE_DEFAULT] = True try: - f = open(filename, "w", encoding = "utf-8") + f = open(filename, "w", encoding="utf-8") f.write("\\documentclass[a4paper]{article}\n") f.write("\\usepackage[a4paper,margin=1.5cm]{geometry}\n") @@ -181,7 +182,7 @@ font = Preferences.getEditorOtherFonts("DefaultFont") self.__defineTexStyle(font, colour, paper, f, 0) - self.__defineTexStyle(font, colour, paper, f, + self.__defineTexStyle(font, colour, paper, f, QsciScintilla.STYLE_DEFAULT) f.write("\\begin{document}\n\n") @@ -262,4 +263,4 @@ """<p>Reason: {1}</p>""")\ .format(filename, str(err))) finally: - QApplication.restoreOverrideCursor() \ No newline at end of file + QApplication.restoreOverrideCursor()
--- a/QScintilla/Exporters/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Exporters/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtGui import QApplication + def getSupportedFormats(): """ Module function to get a dictionary of supported exporters. @@ -18,15 +19,16 @@ for the exporters (string) """ supportedFormats = { - "HTML" : QApplication.translate('Exporters', "HTML"), - "RTF" : QApplication.translate('Exporters', "RTF"), - "PDF" : QApplication.translate('Exporters', "PDF"), - "TeX" : QApplication.translate('Exporters', "TeX"), - "ODT" : QApplication.translate('Exporters', "ODT"), + "HTML": QApplication.translate('Exporters', "HTML"), + "RTF": QApplication.translate('Exporters', "RTF"), + "PDF": QApplication.translate('Exporters', "PDF"), + "TeX": QApplication.translate('Exporters', "TeX"), + "ODT": QApplication.translate('Exporters', "ODT"), } return supportedFormats + def getExporter(format, editor): """ Module function to instantiate an exporter object for a given format.
--- a/QScintilla/GotoDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/GotoDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_GotoDialog import Ui_GotoDialog + class GotoDialog(QDialog, Ui_GotoDialog): """ Class implementing the Goto dialog. """ - def __init__(self, maximum, parent, name = None, modal = False): + def __init__(self, maximum, parent, name=None, modal=False): """ Constructor
--- a/QScintilla/Lexers/Lexer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/Lexer.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,8 +9,9 @@ import Preferences + class Lexer(object): - """ + """ Class to implement the lexer mixin class. """ def __init__(self): @@ -19,13 +20,13 @@ """ self.commentString = '' self.streamCommentString = { - 'start' : '', - 'end' : '' + 'start': '', + 'end': '' } self.boxCommentString = { - 'start' : '', - 'middle' : '', - 'end' : '' + 'start': '', + 'middle': '', + 'end': '' } # last indented line wrapper @@ -159,8 +160,8 @@ editor.beginUndoAction() # iterate over the lines - for line in range(lineFrom, endLine+1): - editor.setIndentation(line, + for line in range(lineFrom, endLine + 1): + editor.setIndentation(line, editor.indentation(line) + indentDifference) editor.endUndoAction()
--- a/QScintilla/Lexers/LexerBash.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerBash.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerBash(QsciLexerBash, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -48,15 +49,15 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerBash.DoubleQuotedString, - QsciLexerBash.SingleQuotedString, + return style in [QsciLexerBash.DoubleQuotedString, + QsciLexerBash.SingleQuotedString, QsciLexerBash.SingleQuotedHereDocument] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerBash.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerBatch.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerBatch.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,8 +11,9 @@ from .Lexer import Lexer + class LexerBatch(QsciLexerBatch, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -46,7 +47,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerBatch.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerCMake.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerCMake.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerCMake(QsciLexerCMake, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -53,7 +54,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerCMake.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerCPP.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerCPP.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerCPP(QsciLexerCPP, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent=None, caseInsensitiveKeywords = False): + def __init__(self, parent=None, caseInsensitiveKeywords=False): """ Constructor @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -69,9 +70,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerCPP.Comment, - QsciLexerCPP.CommentDoc, - QsciLexerCPP.CommentLine, + return style in [QsciLexerCPP.Comment, + QsciLexerCPP.CommentDoc, + QsciLexerCPP.CommentLine, QsciLexerCPP.CommentLineDoc] def isStringStyle(self, style): @@ -80,16 +81,16 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerCPP.DoubleQuotedString, - QsciLexerCPP.SingleQuotedString, - QsciLexerCPP.UnclosedString, + return style in [QsciLexerCPP.DoubleQuotedString, + QsciLexerCPP.SingleQuotedString, + QsciLexerCPP.UnclosedString, QsciLexerCPP.VerbatimString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerCPP.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerCSS.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerCSS.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerCSS(QsciLexerCSS, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,8 +28,8 @@ self.commentString = "#" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } def initProperties(self): @@ -52,14 +53,14 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerCSS.DoubleQuotedString, + return style in [QsciLexerCSS.DoubleQuotedString, QsciLexerCSS.SingleQuotedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerCSS.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerCSharp.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerCSharp.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerCSharp(QsciLexerCSharp, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -57,9 +58,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerCSharp.Comment, - QsciLexerCSharp.CommentDoc, - QsciLexerCSharp.CommentLine, + return style in [QsciLexerCSharp.Comment, + QsciLexerCSharp.CommentDoc, + QsciLexerCSharp.CommentLine, QsciLexerCSharp.CommentLineDoc] def isStringStyle(self, style): @@ -68,16 +69,16 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerCSharp.DoubleQuotedString, - QsciLexerCSharp.SingleQuotedString, - QsciLexerCSharp.UnclosedString, + return style in [QsciLexerCSharp.DoubleQuotedString, + QsciLexerCSharp.SingleQuotedString, + QsciLexerCSharp.UnclosedString, QsciLexerCSharp.VerbatimString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerCSharp.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerContainer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerContainer.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Lexer import Lexer + class LexerContainer(QsciLexer, Lexer): - """ + """ Subclass as a base for the implementation of custom lexers. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/QScintilla/Lexers/LexerD.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerD.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerD(QsciLexerD, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/+ ', - 'end' : ' +/' + 'start': '/+ ', + 'end': ' +/' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -64,10 +65,10 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerD.Comment, - QsciLexerD.CommentDoc, - QsciLexerD.CommentLine, - QsciLexerD.CommentLineDoc, + return style in [QsciLexerD.Comment, + QsciLexerD.CommentDoc, + QsciLexerD.CommentLine, + QsciLexerD.CommentLineDoc, QsciLexerD.CommentNested] def isStringStyle(self, style): @@ -76,14 +77,14 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerD.String, + return style in [QsciLexerD.String, QsciLexerD.UnclosedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerD.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerDiff.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerDiff.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,8 +11,9 @@ from .Lexer import Lexer + class LexerDiff(QsciLexerDiff, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -44,7 +45,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerDiff.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerFortran.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerFortran.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerFortran(QsciLexerFortran, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -55,15 +56,15 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerFortran.DoubleQuotedString, - QsciLexerFortran.SingleQuotedString, + return style in [QsciLexerFortran.DoubleQuotedString, + QsciLexerFortran.SingleQuotedString, QsciLexerFortran.UnclosedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerFortran.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerFortran77.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerFortran77.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerFortran77(QsciLexerFortran77, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -55,15 +56,15 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerFortran77.DoubleQuotedString, - QsciLexerFortran77.SingleQuotedString, + return style in [QsciLexerFortran77.DoubleQuotedString, + QsciLexerFortran77.SingleQuotedString, QsciLexerFortran77.UnclosedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerFortran77.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerHTML.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerHTML.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerHTML(QsciLexerHTML, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -26,8 +27,8 @@ Lexer.__init__(self) self.streamCommentString = { - 'start' : '<!-- ', - 'end' : ' -->' + 'start': '<!-- ', + 'end': ' -->' } def initProperties(self): @@ -50,20 +51,20 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerHTML.HTMLComment, - QsciLexerHTML.ASPXCComment, - QsciLexerHTML.SGMLComment, - QsciLexerHTML.SGMLParameterComment, - QsciLexerHTML.JavaScriptComment, - QsciLexerHTML.JavaScriptCommentDoc, - QsciLexerHTML.JavaScriptCommentLine, - QsciLexerHTML.ASPJavaScriptComment, - QsciLexerHTML.ASPJavaScriptCommentDoc, - QsciLexerHTML.ASPJavaScriptCommentLine, - QsciLexerHTML.VBScriptComment, - QsciLexerHTML.ASPVBScriptComment, - QsciLexerHTML.PythonComment, - QsciLexerHTML.ASPPythonComment, + return style in [QsciLexerHTML.HTMLComment, + QsciLexerHTML.ASPXCComment, + QsciLexerHTML.SGMLComment, + QsciLexerHTML.SGMLParameterComment, + QsciLexerHTML.JavaScriptComment, + QsciLexerHTML.JavaScriptCommentDoc, + QsciLexerHTML.JavaScriptCommentLine, + QsciLexerHTML.ASPJavaScriptComment, + QsciLexerHTML.ASPJavaScriptCommentDoc, + QsciLexerHTML.ASPJavaScriptCommentLine, + QsciLexerHTML.VBScriptComment, + QsciLexerHTML.ASPVBScriptComment, + QsciLexerHTML.PythonComment, + QsciLexerHTML.ASPPythonComment, QsciLexerHTML.PHPComment] def isStringStyle(self, style): @@ -72,36 +73,36 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerHTML.HTMLDoubleQuotedString, - QsciLexerHTML.HTMLSingleQuotedString, - QsciLexerHTML.SGMLDoubleQuotedString, - QsciLexerHTML.SGMLSingleQuotedString, - QsciLexerHTML.JavaScriptDoubleQuotedString, - QsciLexerHTML.JavaScriptSingleQuotedString, - QsciLexerHTML.JavaScriptUnclosedString, - QsciLexerHTML.ASPJavaScriptDoubleQuotedString, - QsciLexerHTML.ASPJavaScriptSingleQuotedString, - QsciLexerHTML.ASPJavaScriptUnclosedString, - QsciLexerHTML.VBScriptString, - QsciLexerHTML.VBScriptUnclosedString, - QsciLexerHTML.ASPVBScriptString, - QsciLexerHTML.ASPVBScriptUnclosedString, - QsciLexerHTML.PythonDoubleQuotedString, - QsciLexerHTML.PythonSingleQuotedString, - QsciLexerHTML.PythonTripleDoubleQuotedString, - QsciLexerHTML.PythonTripleSingleQuotedString, - QsciLexerHTML.ASPPythonDoubleQuotedString, - QsciLexerHTML.ASPPythonSingleQuotedString, - QsciLexerHTML.ASPPythonTripleDoubleQuotedString, - QsciLexerHTML.ASPPythonTripleSingleQuotedString, - QsciLexerHTML.PHPDoubleQuotedString, + return style in [QsciLexerHTML.HTMLDoubleQuotedString, + QsciLexerHTML.HTMLSingleQuotedString, + QsciLexerHTML.SGMLDoubleQuotedString, + QsciLexerHTML.SGMLSingleQuotedString, + QsciLexerHTML.JavaScriptDoubleQuotedString, + QsciLexerHTML.JavaScriptSingleQuotedString, + QsciLexerHTML.JavaScriptUnclosedString, + QsciLexerHTML.ASPJavaScriptDoubleQuotedString, + QsciLexerHTML.ASPJavaScriptSingleQuotedString, + QsciLexerHTML.ASPJavaScriptUnclosedString, + QsciLexerHTML.VBScriptString, + QsciLexerHTML.VBScriptUnclosedString, + QsciLexerHTML.ASPVBScriptString, + QsciLexerHTML.ASPVBScriptUnclosedString, + QsciLexerHTML.PythonDoubleQuotedString, + QsciLexerHTML.PythonSingleQuotedString, + QsciLexerHTML.PythonTripleDoubleQuotedString, + QsciLexerHTML.PythonTripleSingleQuotedString, + QsciLexerHTML.ASPPythonDoubleQuotedString, + QsciLexerHTML.ASPPythonSingleQuotedString, + QsciLexerHTML.ASPPythonTripleDoubleQuotedString, + QsciLexerHTML.ASPPythonTripleSingleQuotedString, + QsciLexerHTML.PHPDoubleQuotedString, QsciLexerHTML.PHPSingleQuotedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ - return QsciLexerHTML.keywords(self, kwSet) \ No newline at end of file + return QsciLexerHTML.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerIDL.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerIDL.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerIDL(QsciLexerIDL, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -57,9 +58,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerIDL.Comment, - QsciLexerIDL.CommentDoc, - QsciLexerIDL.CommentLine, + return style in [QsciLexerIDL.Comment, + QsciLexerIDL.CommentDoc, + QsciLexerIDL.CommentLine, QsciLexerIDL.CommentLineDoc] def isStringStyle(self, style): @@ -68,16 +69,16 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerIDL.DoubleQuotedString, - QsciLexerIDL.SingleQuotedString, - QsciLexerIDL.UnclosedString, + return style in [QsciLexerIDL.DoubleQuotedString, + QsciLexerIDL.SingleQuotedString, + QsciLexerIDL.UnclosedString, QsciLexerIDL.VerbatimString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerIDL.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerJava.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerJava.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerJava(QsciLexerJava, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -57,9 +58,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerJava.Comment, - QsciLexerJava.CommentDoc, - QsciLexerJava.CommentLine, + return style in [QsciLexerJava.Comment, + QsciLexerJava.CommentDoc, + QsciLexerJava.CommentLine, QsciLexerJava.CommentLineDoc] def isStringStyle(self, style): @@ -68,16 +69,16 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerJava.DoubleQuotedString, - QsciLexerJava.SingleQuotedString, - QsciLexerJava.UnclosedString, + return style in [QsciLexerJava.DoubleQuotedString, + QsciLexerJava.SingleQuotedString, + QsciLexerJava.UnclosedString, QsciLexerJava.VerbatimString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerJava.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerJavaScript.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerJavaScript.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerJavaScript(QsciLexerJavaScript, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -57,9 +58,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerJavaScript.Comment, - QsciLexerJavaScript.CommentDoc, - QsciLexerJavaScript.CommentLine, + return style in [QsciLexerJavaScript.Comment, + QsciLexerJavaScript.CommentDoc, + QsciLexerJavaScript.CommentLine, QsciLexerJavaScript.CommentLineDoc] def isStringStyle(self, style): @@ -68,16 +69,16 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerJavaScript.DoubleQuotedString, - QsciLexerJavaScript.SingleQuotedString, - QsciLexerJavaScript.UnclosedString, + return style in [QsciLexerJavaScript.DoubleQuotedString, + QsciLexerJavaScript.SingleQuotedString, + QsciLexerJavaScript.UnclosedString, QsciLexerJavaScript.VerbatimString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerJavaScript.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerLua.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerLua.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerLua(QsciLexerLua, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,8 +28,8 @@ self.commentString = "--" self.streamCommentString = { - 'start' : '--[[ ', - 'end' : ' ]]--' + 'start': '--[[ ', + 'end': ' ]]--' } def initProperties(self): @@ -51,7 +52,7 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerLua.Comment, + return style in [QsciLexerLua.Comment, QsciLexerLua.LineComment] def isStringStyle(self, style): @@ -60,15 +61,15 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerLua.String, - QsciLexerLua.LiteralString, + return style in [QsciLexerLua.String, + QsciLexerLua.LiteralString, QsciLexerLua.UnclosedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerLua.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerMakefile.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerMakefile.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,8 +11,9 @@ from .Lexer import Lexer + class LexerMakefile(QsciLexerMakefile, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -47,7 +48,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerMakefile.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerPOV.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerPOV.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerPOV(QsciLexerPOV, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -27,13 +28,13 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '/* ', - 'end' : ' */' + 'start': '/* ', + 'end': ' */' } self.boxCommentString = { - 'start' : '/* ', - 'middle' : ' * ', - 'end' : ' */' + 'start': '/* ', + 'middle': ' * ', + 'end': ' */' } def initProperties(self): @@ -50,7 +51,7 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerPOV.Comment, + return style in [QsciLexerPOV.Comment, QsciLexerPOV.CommentLine] def isStringStyle(self, style): @@ -59,14 +60,14 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerPOV.String, + return style in [QsciLexerPOV.String, QsciLexerPOV.UnclosedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerPOV.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerPascal.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerPascal.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerPascal(QsciLexerPascal, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -27,8 +28,8 @@ self.commentString = "//" self.streamCommentString = { - 'start' : '{ ', - 'end' : ' }' + 'start': '{ ', + 'end': ' }' } def initProperties(self): @@ -58,12 +59,12 @@ @return flag indicating a comment style (boolean) """ try: - return style in [QsciLexerPascal.Comment, - QsciLexerPascal.CommentDoc, + return style in [QsciLexerPascal.Comment, + QsciLexerPascal.CommentDoc, QsciLexerPascal.CommentLine] except AttributeError: - return style in [QsciLexerPascal.Comment, - QsciLexerPascal.CommentParenthesis, + return style in [QsciLexerPascal.Comment, + QsciLexerPascal.CommentParenthesis, QsciLexerPascal.CommentLine] def isStringStyle(self, style): @@ -78,7 +79,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerPascal.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerPerl.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerPerl.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerPerl(QsciLexerPerl, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -61,21 +62,21 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerPerl.DoubleQuotedHereDocument, - QsciLexerPerl.DoubleQuotedString, - QsciLexerPerl.QuotedStringQ, - QsciLexerPerl.QuotedStringQQ, - QsciLexerPerl.QuotedStringQR, - QsciLexerPerl.QuotedStringQW, - QsciLexerPerl.QuotedStringQX, - QsciLexerPerl.SingleQuotedHereDocument, + return style in [QsciLexerPerl.DoubleQuotedHereDocument, + QsciLexerPerl.DoubleQuotedString, + QsciLexerPerl.QuotedStringQ, + QsciLexerPerl.QuotedStringQQ, + QsciLexerPerl.QuotedStringQR, + QsciLexerPerl.QuotedStringQW, + QsciLexerPerl.QuotedStringQX, + QsciLexerPerl.SingleQuotedHereDocument, QsciLexerPerl.SingleQuotedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerPerl.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerPostScript.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerPostScript.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerPostScript(QsciLexerPostScript, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -56,7 +57,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerPostScript.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerProperties.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerProperties.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerProperties(QsciLexerProperties, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -53,7 +54,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerProperties.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerPygments.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerPygments.py Fri Mar 11 16:51:57 2011 +0100 @@ -48,7 +48,7 @@ PYGMENTS_HEADING, \ PYGMENTS_SUBHEADING, \ PYGMENTS_DELETED, \ -PYGMENTS_INSERTED = list(range(32)) +PYGMENTS_INSERTED = list(range(32)) # 32 to 39 are reserved for QScintilla internal styles PYGMENTS_GENERIC_ERROR, \ PYGMENTS_EMPHASIZE, \ @@ -61,7 +61,7 @@ PYGMENTS_PROPERTY, \ PYGMENTS_CHAR, \ PYGMENTS_HEREDOC, \ -PYGMENTS_PUNCTUATION = list(range(40, 52)) +PYGMENTS_PUNCTUATION = list(range(40, 52)) #-----------------------------------------------------------------------------# @@ -129,16 +129,17 @@ Token.Generic.Output: PYGMENTS_OUTPUT, Token.Generic.Traceback: PYGMENTS_TRACEBACK, - Token.Error: PYGMENTS_ERROR, + Token.Error: PYGMENTS_ERROR, } #-----------------------------------------------------------------------------# + class LexerPygments(LexerContainer): - """ + """ Class implementing a custom lexer using pygments. """ - def __init__(self, parent = None, name = ""): + def __init__(self, parent=None, name=""): """ Constructor @@ -150,106 +151,106 @@ self.__pygmentsName = name self.descriptions = { - PYGMENTS_DEFAULT : self.trUtf8("Default"), - PYGMENTS_COMMENT : self.trUtf8("Comment"), - PYGMENTS_PREPROCESSOR : self.trUtf8("Preprocessor"), - PYGMENTS_KEYWORD : self.trUtf8("Keyword"), - PYGMENTS_PSEUDOKEYWORD : self.trUtf8("Pseudo Keyword"), - PYGMENTS_TYPEKEYWORD : self.trUtf8("Type Keyword"), - PYGMENTS_OPERATOR : self.trUtf8("Operator"), - PYGMENTS_WORD : self.trUtf8("Word"), - PYGMENTS_BUILTIN : self.trUtf8("Builtin"), - PYGMENTS_FUNCTION : self.trUtf8("Function or method name"), - PYGMENTS_CLASS : self.trUtf8("Class name"), - PYGMENTS_NAMESPACE : self.trUtf8("Namespace"), - PYGMENTS_EXCEPTION : self.trUtf8("Exception"), - PYGMENTS_VARIABLE : self.trUtf8("Identifier"), - PYGMENTS_CONSTANT : self.trUtf8("Constant"), - PYGMENTS_LABEL : self.trUtf8("Label"), - PYGMENTS_ENTITY : self.trUtf8("Entity"), - PYGMENTS_ATTRIBUTE : self.trUtf8("Attribute"), - PYGMENTS_TAG : self.trUtf8("Tag"), - PYGMENTS_DECORATOR : self.trUtf8("Decorator"), - PYGMENTS_STRING : self.trUtf8("String"), - PYGMENTS_DOCSTRING : self.trUtf8("Documentation string"), - PYGMENTS_SCALAR : self.trUtf8("Scalar"), - PYGMENTS_ESCAPE : self.trUtf8("Escape"), - PYGMENTS_REGEX : self.trUtf8("Regular expression"), - PYGMENTS_SYMBOL : self.trUtf8("Symbol"), - PYGMENTS_OTHER : self.trUtf8("Other string"), - PYGMENTS_NUMBER : self.trUtf8("Number"), - PYGMENTS_HEADING : self.trUtf8("Heading"), - PYGMENTS_SUBHEADING : self.trUtf8("Subheading"), - PYGMENTS_DELETED : self.trUtf8("Deleted"), - PYGMENTS_INSERTED : self.trUtf8("Inserted"), - PYGMENTS_GENERIC_ERROR : self.trUtf8("Generic error"), - PYGMENTS_EMPHASIZE : self.trUtf8("Emphasized text"), - PYGMENTS_STRONG : self.trUtf8("Strong text"), - PYGMENTS_PROMPT : self.trUtf8("Prompt"), - PYGMENTS_OUTPUT : self.trUtf8("Output"), - PYGMENTS_TRACEBACK : self.trUtf8("Traceback"), - PYGMENTS_ERROR : self.trUtf8("Error"), - PYGMENTS_MULTILINECOMMENT : self.trUtf8("Comment block"), - PYGMENTS_PROPERTY : self.trUtf8("Property"), - PYGMENTS_CHAR : self.trUtf8("Character"), - PYGMENTS_HEREDOC : self.trUtf8("Here document"), - PYGMENTS_PUNCTUATION : self.trUtf8("Punctuation"), + PYGMENTS_DEFAULT: self.trUtf8("Default"), + PYGMENTS_COMMENT: self.trUtf8("Comment"), + PYGMENTS_PREPROCESSOR: self.trUtf8("Preprocessor"), + PYGMENTS_KEYWORD: self.trUtf8("Keyword"), + PYGMENTS_PSEUDOKEYWORD: self.trUtf8("Pseudo Keyword"), + PYGMENTS_TYPEKEYWORD: self.trUtf8("Type Keyword"), + PYGMENTS_OPERATOR: self.trUtf8("Operator"), + PYGMENTS_WORD: self.trUtf8("Word"), + PYGMENTS_BUILTIN: self.trUtf8("Builtin"), + PYGMENTS_FUNCTION: self.trUtf8("Function or method name"), + PYGMENTS_CLASS: self.trUtf8("Class name"), + PYGMENTS_NAMESPACE: self.trUtf8("Namespace"), + PYGMENTS_EXCEPTION: self.trUtf8("Exception"), + PYGMENTS_VARIABLE: self.trUtf8("Identifier"), + PYGMENTS_CONSTANT: self.trUtf8("Constant"), + PYGMENTS_LABEL: self.trUtf8("Label"), + PYGMENTS_ENTITY: self.trUtf8("Entity"), + PYGMENTS_ATTRIBUTE: self.trUtf8("Attribute"), + PYGMENTS_TAG: self.trUtf8("Tag"), + PYGMENTS_DECORATOR: self.trUtf8("Decorator"), + PYGMENTS_STRING: self.trUtf8("String"), + PYGMENTS_DOCSTRING: self.trUtf8("Documentation string"), + PYGMENTS_SCALAR: self.trUtf8("Scalar"), + PYGMENTS_ESCAPE: self.trUtf8("Escape"), + PYGMENTS_REGEX: self.trUtf8("Regular expression"), + PYGMENTS_SYMBOL: self.trUtf8("Symbol"), + PYGMENTS_OTHER: self.trUtf8("Other string"), + PYGMENTS_NUMBER: self.trUtf8("Number"), + PYGMENTS_HEADING: self.trUtf8("Heading"), + PYGMENTS_SUBHEADING: self.trUtf8("Subheading"), + PYGMENTS_DELETED: self.trUtf8("Deleted"), + PYGMENTS_INSERTED: self.trUtf8("Inserted"), + PYGMENTS_GENERIC_ERROR: self.trUtf8("Generic error"), + PYGMENTS_EMPHASIZE: self.trUtf8("Emphasized text"), + PYGMENTS_STRONG: self.trUtf8("Strong text"), + PYGMENTS_PROMPT: self.trUtf8("Prompt"), + PYGMENTS_OUTPUT: self.trUtf8("Output"), + PYGMENTS_TRACEBACK: self.trUtf8("Traceback"), + PYGMENTS_ERROR: self.trUtf8("Error"), + PYGMENTS_MULTILINECOMMENT: self.trUtf8("Comment block"), + PYGMENTS_PROPERTY: self.trUtf8("Property"), + PYGMENTS_CHAR: self.trUtf8("Character"), + PYGMENTS_HEREDOC: self.trUtf8("Here document"), + PYGMENTS_PUNCTUATION: self.trUtf8("Punctuation"), } self.defaultColors = { - PYGMENTS_DEFAULT : QColor("#000000"), - PYGMENTS_COMMENT : QColor("#408080"), - PYGMENTS_PREPROCESSOR : QColor("#BC7A00"), - PYGMENTS_KEYWORD : QColor("#008000"), - PYGMENTS_PSEUDOKEYWORD : QColor("#008000"), - PYGMENTS_TYPEKEYWORD : QColor("#B00040"), - PYGMENTS_OPERATOR : QColor("#666666"), - PYGMENTS_WORD : QColor("#AA22FF"), - PYGMENTS_BUILTIN : QColor("#008000"), - PYGMENTS_FUNCTION : QColor("#0000FF"), - PYGMENTS_CLASS : QColor("#0000FF"), - PYGMENTS_NAMESPACE : QColor("#0000FF"), - PYGMENTS_EXCEPTION : QColor("#D2413A"), - PYGMENTS_VARIABLE : QColor("#19177C"), - PYGMENTS_CONSTANT : QColor("#880000"), - PYGMENTS_LABEL : QColor("#A0A000"), - PYGMENTS_ENTITY : QColor("#999999"), - PYGMENTS_ATTRIBUTE : QColor("#7D9029"), - PYGMENTS_TAG : QColor("#008000"), - PYGMENTS_DECORATOR : QColor("#AA22FF"), - PYGMENTS_STRING : QColor("#BA2121"), - PYGMENTS_DOCSTRING : QColor("#BA2121"), - PYGMENTS_SCALAR : QColor("#BB6688"), - PYGMENTS_ESCAPE : QColor("#BB6622"), - PYGMENTS_REGEX : QColor("#BB6688"), - PYGMENTS_SYMBOL : QColor("#19177C"), - PYGMENTS_OTHER : QColor("#008000"), - PYGMENTS_NUMBER : QColor("#666666"), - PYGMENTS_HEADING : QColor("#000080"), - PYGMENTS_SUBHEADING : QColor("#800080"), - PYGMENTS_DELETED : QColor("#A00000"), - PYGMENTS_INSERTED : QColor("#00A000"), - PYGMENTS_GENERIC_ERROR : QColor("#FF0000"), - PYGMENTS_PROMPT : QColor("#000080"), - PYGMENTS_OUTPUT : QColor("#808080"), - PYGMENTS_TRACEBACK : QColor("#0040D0"), - PYGMENTS_MULTILINECOMMENT : QColor("#007F00"), - PYGMENTS_PROPERTY : QColor("#00A0E0"), - PYGMENTS_CHAR : QColor("#7F007F"), - PYGMENTS_HEREDOC : QColor("#7F007F"), - PYGMENTS_PUNCTUATION : QColor("#000000"), + PYGMENTS_DEFAULT: QColor("#000000"), + PYGMENTS_COMMENT: QColor("#408080"), + PYGMENTS_PREPROCESSOR: QColor("#BC7A00"), + PYGMENTS_KEYWORD: QColor("#008000"), + PYGMENTS_PSEUDOKEYWORD: QColor("#008000"), + PYGMENTS_TYPEKEYWORD: QColor("#B00040"), + PYGMENTS_OPERATOR: QColor("#666666"), + PYGMENTS_WORD: QColor("#AA22FF"), + PYGMENTS_BUILTIN: QColor("#008000"), + PYGMENTS_FUNCTION: QColor("#0000FF"), + PYGMENTS_CLASS: QColor("#0000FF"), + PYGMENTS_NAMESPACE: QColor("#0000FF"), + PYGMENTS_EXCEPTION: QColor("#D2413A"), + PYGMENTS_VARIABLE: QColor("#19177C"), + PYGMENTS_CONSTANT: QColor("#880000"), + PYGMENTS_LABEL: QColor("#A0A000"), + PYGMENTS_ENTITY: QColor("#999999"), + PYGMENTS_ATTRIBUTE: QColor("#7D9029"), + PYGMENTS_TAG: QColor("#008000"), + PYGMENTS_DECORATOR: QColor("#AA22FF"), + PYGMENTS_STRING: QColor("#BA2121"), + PYGMENTS_DOCSTRING: QColor("#BA2121"), + PYGMENTS_SCALAR: QColor("#BB6688"), + PYGMENTS_ESCAPE: QColor("#BB6622"), + PYGMENTS_REGEX: QColor("#BB6688"), + PYGMENTS_SYMBOL: QColor("#19177C"), + PYGMENTS_OTHER: QColor("#008000"), + PYGMENTS_NUMBER: QColor("#666666"), + PYGMENTS_HEADING: QColor("#000080"), + PYGMENTS_SUBHEADING: QColor("#800080"), + PYGMENTS_DELETED: QColor("#A00000"), + PYGMENTS_INSERTED: QColor("#00A000"), + PYGMENTS_GENERIC_ERROR: QColor("#FF0000"), + PYGMENTS_PROMPT: QColor("#000080"), + PYGMENTS_OUTPUT: QColor("#808080"), + PYGMENTS_TRACEBACK: QColor("#0040D0"), + PYGMENTS_MULTILINECOMMENT: QColor("#007F00"), + PYGMENTS_PROPERTY: QColor("#00A0E0"), + PYGMENTS_CHAR: QColor("#7F007F"), + PYGMENTS_HEREDOC: QColor("#7F007F"), + PYGMENTS_PUNCTUATION: QColor("#000000"), } self.defaultPapers = { - PYGMENTS_ERROR : QColor("#FF0000"), - PYGMENTS_MULTILINECOMMENT : QColor("#A8FFA8"), - PYGMENTS_HEREDOC : QColor("#DDD0DD"), + PYGMENTS_ERROR: QColor("#FF0000"), + PYGMENTS_MULTILINECOMMENT: QColor("#A8FFA8"), + PYGMENTS_HEREDOC: QColor("#DDD0DD"), } self.defaultEolFills = { - PYGMENTS_ERROR : True, - PYGMENTS_MULTILINECOMMENT : True, - PYGMENTS_HEREDOC : True, + PYGMENTS_ERROR: True, + PYGMENTS_MULTILINECOMMENT: True, + PYGMENTS_HEREDOC: True, } def language(self): @@ -320,9 +321,9 @@ return QFont("Bitstream Vera Serif", 10) if style in [PYGMENTS_KEYWORD, PYGMENTS_OPERATOR, PYGMENTS_WORD, PYGMENTS_BUILTIN, - PYGMENTS_ATTRIBUTE, PYGMENTS_FUNCTION, PYGMENTS_CLASS, - PYGMENTS_NAMESPACE, PYGMENTS_EXCEPTION, PYGMENTS_ENTITY, - PYGMENTS_TAG, PYGMENTS_SCALAR, PYGMENTS_ESCAPE, PYGMENTS_HEADING, + PYGMENTS_ATTRIBUTE, PYGMENTS_FUNCTION, PYGMENTS_CLASS, + PYGMENTS_NAMESPACE, PYGMENTS_EXCEPTION, PYGMENTS_ENTITY, + PYGMENTS_TAG, PYGMENTS_SCALAR, PYGMENTS_ESCAPE, PYGMENTS_HEADING, PYGMENTS_SUBHEADING, PYGMENTS_STRONG, PYGMENTS_PROMPT]: f = LexerContainer.defaultFont(self, style) f.setBold(True) @@ -454,15 +455,15 @@ @return flag indicating a string style (boolean) """ - return style in [PYGMENTS_STRING, PYGMENTS_DOCSTRING, PYGMENTS_OTHER, - PYGMENTS_HEADING, PYGMENTS_SUBHEADING, PYGMENTS_EMPHASIZE, + return style in [PYGMENTS_STRING, PYGMENTS_DOCSTRING, PYGMENTS_OTHER, + PYGMENTS_HEADING, PYGMENTS_SUBHEADING, PYGMENTS_EMPHASIZE, PYGMENTS_STRONG] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return None
--- a/QScintilla/Lexers/LexerPython.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerPython.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,11 +14,12 @@ from .Lexer import Lexer import Preferences + class LexerPython(QsciLexerPython, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, variant = "", parent = None): + def __init__(self, variant="", parent=None): """ Constructor @@ -86,7 +87,7 @@ last += indent_width else: # special cases, like pass (unindent) or return (also unindent) - m = re.search('(pass\s*(#.*)?$)|(^[^#]return)', + m = re.search('(pass\s*(#.*)?$)|(^[^#]return)', editor.text(pline)) if m: last -= indent_width @@ -113,7 +114,7 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerPython.Comment, + return style in [QsciLexerPython.Comment, QsciLexerPython.CommentBlock] def isStringStyle(self, style): @@ -122,10 +123,10 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerPython.DoubleQuotedString, - QsciLexerPython.SingleQuotedString, - QsciLexerPython.TripleDoubleQuotedString, - QsciLexerPython.TripleSingleQuotedString, + return style in [QsciLexerPython.DoubleQuotedString, + QsciLexerPython.SingleQuotedString, + QsciLexerPython.TripleDoubleQuotedString, + QsciLexerPython.TripleSingleQuotedString, QsciLexerPython.UnclosedString] def defaultKeywords(self, kwSet):
--- a/QScintilla/Lexers/LexerRuby.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerRuby.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,8 +11,9 @@ from .Lexer import Lexer + class LexerRuby(QsciLexerRuby, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -48,20 +49,20 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerRuby.DoubleQuotedString, - QsciLexerRuby.HereDocument, - QsciLexerRuby.PercentStringQ, - QsciLexerRuby.PercentStringq, - QsciLexerRuby.PercentStringr, - QsciLexerRuby.PercentStringw, - QsciLexerRuby.PercentStringx, + return style in [QsciLexerRuby.DoubleQuotedString, + QsciLexerRuby.HereDocument, + QsciLexerRuby.PercentStringQ, + QsciLexerRuby.PercentStringq, + QsciLexerRuby.PercentStringr, + QsciLexerRuby.PercentStringw, + QsciLexerRuby.PercentStringx, QsciLexerRuby.SingleQuotedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerRuby.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerSQL.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerSQL.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerSQL(QsciLexerSQL, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -41,9 +42,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerSQL.Comment, - QsciLexerSQL.CommentDoc, - QsciLexerSQL.CommentLine, + return style in [QsciLexerSQL.Comment, + QsciLexerSQL.CommentDoc, + QsciLexerSQL.CommentLine, QsciLexerSQL.CommentLineHash] def isStringStyle(self, style): @@ -52,14 +53,14 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerSQL.DoubleQuotedString, + return style in [QsciLexerSQL.DoubleQuotedString, QsciLexerSQL.SingleQuotedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerSQL.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerTCL.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerTCL.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,8 +13,9 @@ import Preferences + class LexerTCL(QsciLexerTCL, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -40,9 +41,9 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerTCL.Comment, - QsciLexerTCL.CommentBlock, - QsciLexerTCL.CommentBox, + return style in [QsciLexerTCL.Comment, + QsciLexerTCL.CommentBlock, + QsciLexerTCL.CommentBox, QsciLexerTCL.CommentLine] def isStringStyle(self, style): @@ -57,7 +58,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerTCL.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerTeX.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerTeX.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,8 +11,9 @@ from .Lexer import Lexer + class LexerTeX(QsciLexerTeX, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -46,7 +47,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerTeX.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerVHDL.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerVHDL.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerVHDL(QsciLexerVHDL, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -44,7 +45,7 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerVHDL.Comment, + return style in [QsciLexerVHDL.Comment, QsciLexerVHDL.CommentLine] def isStringStyle(self, style): @@ -53,14 +54,14 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerVHDL.String, + return style in [QsciLexerVHDL.String, QsciLexerVHDL.UnclosedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ - return QsciLexerVHDL.keywords(self, kwSet) \ No newline at end of file + return QsciLexerVHDL.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerXML.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerXML.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,8 +12,9 @@ from .Lexer import Lexer import Preferences + class LexerXML(QsciLexerXML, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ def __init__(self, parent=None): @@ -26,8 +27,8 @@ Lexer.__init__(self) self.streamCommentString = { - 'start' : '<!-- ', - 'end' : ' -->' + 'start': '<!-- ', + 'end': ' -->' } def initProperties(self): @@ -51,20 +52,20 @@ @return flag indicating a comment style (boolean) """ - return style in [QsciLexerXML.HTMLComment, - QsciLexerXML.ASPXCComment, - QsciLexerXML.SGMLComment, - QsciLexerXML.SGMLParameterComment, - QsciLexerXML.JavaScriptComment, - QsciLexerXML.JavaScriptCommentDoc, - QsciLexerXML.JavaScriptCommentLine, - QsciLexerXML.ASPJavaScriptComment, - QsciLexerXML.ASPJavaScriptCommentDoc, - QsciLexerXML.ASPJavaScriptCommentLine, - QsciLexerXML.VBScriptComment, - QsciLexerXML.ASPVBScriptComment, - QsciLexerXML.PythonComment, - QsciLexerXML.ASPPythonComment, + return style in [QsciLexerXML.HTMLComment, + QsciLexerXML.ASPXCComment, + QsciLexerXML.SGMLComment, + QsciLexerXML.SGMLParameterComment, + QsciLexerXML.JavaScriptComment, + QsciLexerXML.JavaScriptCommentDoc, + QsciLexerXML.JavaScriptCommentLine, + QsciLexerXML.ASPJavaScriptComment, + QsciLexerXML.ASPJavaScriptCommentDoc, + QsciLexerXML.ASPJavaScriptCommentLine, + QsciLexerXML.VBScriptComment, + QsciLexerXML.ASPVBScriptComment, + QsciLexerXML.PythonComment, + QsciLexerXML.ASPPythonComment, QsciLexerXML.PHPComment] def isStringStyle(self, style): @@ -73,36 +74,36 @@ @return flag indicating a string style (boolean) """ - return style in [QsciLexerXML.HTMLDoubleQuotedString, - QsciLexerXML.HTMLSingleQuotedString, - QsciLexerXML.SGMLDoubleQuotedString, - QsciLexerXML.SGMLSingleQuotedString, - QsciLexerXML.JavaScriptDoubleQuotedString, - QsciLexerXML.JavaScriptSingleQuotedString, - QsciLexerXML.JavaScriptUnclosedString, - QsciLexerXML.ASPJavaScriptDoubleQuotedString, - QsciLexerXML.ASPJavaScriptSingleQuotedString, - QsciLexerXML.ASPJavaScriptUnclosedString, - QsciLexerXML.VBScriptString, - QsciLexerXML.VBScriptUnclosedString, - QsciLexerXML.ASPVBScriptString, - QsciLexerXML.ASPVBScriptUnclosedString, - QsciLexerXML.PythonDoubleQuotedString, - QsciLexerXML.PythonSingleQuotedString, - QsciLexerXML.PythonTripleDoubleQuotedString, - QsciLexerXML.PythonTripleSingleQuotedString, - QsciLexerXML.ASPPythonDoubleQuotedString, - QsciLexerXML.ASPPythonSingleQuotedString, - QsciLexerXML.ASPPythonTripleDoubleQuotedString, - QsciLexerXML.ASPPythonTripleSingleQuotedString, - QsciLexerXML.PHPDoubleQuotedString, + return style in [QsciLexerXML.HTMLDoubleQuotedString, + QsciLexerXML.HTMLSingleQuotedString, + QsciLexerXML.SGMLDoubleQuotedString, + QsciLexerXML.SGMLSingleQuotedString, + QsciLexerXML.JavaScriptDoubleQuotedString, + QsciLexerXML.JavaScriptSingleQuotedString, + QsciLexerXML.JavaScriptUnclosedString, + QsciLexerXML.ASPJavaScriptDoubleQuotedString, + QsciLexerXML.ASPJavaScriptSingleQuotedString, + QsciLexerXML.ASPJavaScriptUnclosedString, + QsciLexerXML.VBScriptString, + QsciLexerXML.VBScriptUnclosedString, + QsciLexerXML.ASPVBScriptString, + QsciLexerXML.ASPVBScriptUnclosedString, + QsciLexerXML.PythonDoubleQuotedString, + QsciLexerXML.PythonSingleQuotedString, + QsciLexerXML.PythonTripleDoubleQuotedString, + QsciLexerXML.PythonTripleSingleQuotedString, + QsciLexerXML.ASPPythonDoubleQuotedString, + QsciLexerXML.ASPPythonSingleQuotedString, + QsciLexerXML.ASPPythonTripleDoubleQuotedString, + QsciLexerXML.ASPPythonTripleSingleQuotedString, + QsciLexerXML.PHPDoubleQuotedString, QsciLexerXML.PHPSingleQuotedString] def defaultKeywords(self, kwSet): """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ - return QsciLexerXML.keywords(self, kwSet) \ No newline at end of file + return QsciLexerXML.keywords(self, kwSet)
--- a/QScintilla/Lexers/LexerYAML.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/LexerYAML.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ from .Lexer import Lexer import Preferences + class LexerYAML(QsciLexerYAML, Lexer): - """ + """ Subclass to implement some additional lexer dependant methods. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -53,7 +54,7 @@ """ Public method to get the default keywords. - @param kwSet number of the keyword set (integer) + @param kwSet number of the keyword set (integer) @return string giving the keywords (string) or None """ return QsciLexerYAML.keywords(self, kwSet)
--- a/QScintilla/Lexers/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Lexers/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,9 +23,10 @@ # to be associated with the lexer) LexerRegistry = {} -def registerLexer(name, displayString, filenameSample, getLexerFunc, - openFilters = [], saveFilters = [], - defaultAssocs = []): + +def registerLexer(name, displayString, filenameSample, getLexerFunc, + openFilters=[], saveFilters=[], + defaultAssocs=[]): """ Module function to register a custom QScintilla lexer. @@ -36,7 +37,7 @@ This function must take a reference to the parent as it's only argument. @keyparam openFilters list of open file filters (list of strings) @keyparam saveFilters list of save file filters (list of strings) - @keyparam defaultAssocs default lexer associations (list of strings of filename + @keyparam defaultAssocs default lexer associations (list of strings of filename wildcard patterns to be associated with the lexer) @exception KeyError raised when the given name is already in use """ @@ -44,9 +45,10 @@ if name in LexerRegistry: raise KeyError('Lexer "{0}" already registered.'.format(name)) else: - LexerRegistry[name] = [displayString, filenameSample, getLexerFunc, + LexerRegistry[name] = [displayString, filenameSample, getLexerFunc, openFilters, saveFilters, defaultAssocs[:]] + def unregisterLexer(name): """ Module function to unregister a custom QScintilla lexer. @@ -56,6 +58,7 @@ if name in LexerRegistry: del LexerRegistry[name] + def getSupportedLanguages(): """ Module function to get a dictionary of supported lexer languages. @@ -67,36 +70,36 @@ (string, string) """ supportedLanguages = { - "Bash" : [QApplication.translate('Lexers', "Bash"), 'dummy.sh'], - "Batch" : [QApplication.translate('Lexers', "Batch"), 'dummy.bat'], - "C++" : [QApplication.translate('Lexers', "C/C++"), 'dummy.cpp'], - "C#" : [QApplication.translate('Lexers', "C#"), 'dummy.cs'], - "CMake" : [QApplication.translate('Lexers', "CMake"), 'dummy.cmake'], - "CSS" : [QApplication.translate('Lexers', "CSS"), 'dummy.css'], - "D" : [QApplication.translate('Lexers', "D"), 'dummy.d'], - "Diff" : [QApplication.translate('Lexers', "Diff"), 'dummy.diff'], - "Fortran" : [QApplication.translate('Lexers', "Fortran"), 'dummy.f95'], - "Fortran77" : [QApplication.translate('Lexers', "Fortran77"), 'dummy.f'], - "HTML" : [QApplication.translate('Lexers', "HTML/PHP/XML"), 'dummy.html'], - "IDL" : [QApplication.translate('Lexers', "IDL"), 'dummy.idl'], - "Java" : [QApplication.translate('Lexers', "Java"), 'dummy.java'], - "JavaScript" : [QApplication.translate('Lexers', "JavaScript"), 'dummy.js'], - "Lua" : [QApplication.translate('Lexers', "Lua"), 'dummy.lua'], - "Makefile" : [QApplication.translate('Lexers', "Makefile"), 'dummy.mak'], - "Pascal" : [QApplication.translate('Lexers', "Pascal"), 'dummy.pas'], - "Perl" : [QApplication.translate('Lexers', "Perl"), 'dummy.pl'], - "PostScript" : [QApplication.translate('Lexers', "PostScript"), 'dummy.ps'], - "Povray" : [QApplication.translate('Lexers', "Povray"), 'dummy.pov'], - "Properties" : [QApplication.translate('Lexers', "Properties"), 'dummy.ini'], - "Python2" : [QApplication.translate('Lexers', "Python2"), 'dummy.py'], - "Python3" : [QApplication.translate('Lexers', "Python3"), 'dummy.py'], - "Ruby" : [QApplication.translate('Lexers', "Ruby"), 'dummy.rb'], - "SQL" : [QApplication.translate('Lexers', "SQL"), 'dummy.sql'], - "TCL" : [QApplication.translate('Lexers', "TCL"), 'dummy.tcl'], - "TeX" : [QApplication.translate('Lexers', "TeX"), 'dummy.tex'], - "VHDL" : [QApplication.translate('Lexers', "VHDL"), 'dummy.vhd'], - "XML" : [QApplication.translate('Lexers', "XML"), 'dummy.xml'], - "YAML" : [QApplication.translate('Lexers', "YAML"), 'dummy.yml'], + "Bash": [QApplication.translate('Lexers', "Bash"), 'dummy.sh'], + "Batch": [QApplication.translate('Lexers', "Batch"), 'dummy.bat'], + "C++": [QApplication.translate('Lexers', "C/C++"), 'dummy.cpp'], + "C#": [QApplication.translate('Lexers', "C#"), 'dummy.cs'], + "CMake": [QApplication.translate('Lexers', "CMake"), 'dummy.cmake'], + "CSS": [QApplication.translate('Lexers', "CSS"), 'dummy.css'], + "D": [QApplication.translate('Lexers', "D"), 'dummy.d'], + "Diff": [QApplication.translate('Lexers', "Diff"), 'dummy.diff'], + "Fortran": [QApplication.translate('Lexers', "Fortran"), 'dummy.f95'], + "Fortran77": [QApplication.translate('Lexers', "Fortran77"), 'dummy.f'], + "HTML": [QApplication.translate('Lexers', "HTML/PHP/XML"), 'dummy.html'], + "IDL": [QApplication.translate('Lexers', "IDL"), 'dummy.idl'], + "Java": [QApplication.translate('Lexers', "Java"), 'dummy.java'], + "JavaScript": [QApplication.translate('Lexers', "JavaScript"), 'dummy.js'], + "Lua": [QApplication.translate('Lexers', "Lua"), 'dummy.lua'], + "Makefile": [QApplication.translate('Lexers', "Makefile"), 'dummy.mak'], + "Pascal": [QApplication.translate('Lexers', "Pascal"), 'dummy.pas'], + "Perl": [QApplication.translate('Lexers', "Perl"), 'dummy.pl'], + "PostScript": [QApplication.translate('Lexers', "PostScript"), 'dummy.ps'], + "Povray": [QApplication.translate('Lexers', "Povray"), 'dummy.pov'], + "Properties": [QApplication.translate('Lexers', "Properties"), 'dummy.ini'], + "Python2": [QApplication.translate('Lexers', "Python2"), 'dummy.py'], + "Python3": [QApplication.translate('Lexers', "Python3"), 'dummy.py'], + "Ruby": [QApplication.translate('Lexers', "Ruby"), 'dummy.rb'], + "SQL": [QApplication.translate('Lexers', "SQL"), 'dummy.sql'], + "TCL": [QApplication.translate('Lexers', "TCL"), 'dummy.tcl'], + "TeX": [QApplication.translate('Lexers', "TeX"), 'dummy.tex'], + "VHDL": [QApplication.translate('Lexers', "VHDL"), 'dummy.vhd'], + "XML": [QApplication.translate('Lexers', "XML"), 'dummy.xml'], + "YAML": [QApplication.translate('Lexers', "YAML"), 'dummy.yml'], } for name in LexerRegistry: @@ -107,7 +110,8 @@ return supportedLanguages -def getLexer(language, parent = None, pyname = ""): + +def getLexer(language, parent=None, pyname=""): """ Module function to instantiate a lexer object for a given language. @@ -123,7 +127,7 @@ return LexerPython(language, parent) elif language == "C++": from .LexerCPP import LexerCPP - return LexerCPP(parent, + return LexerCPP(parent, Preferences.getEditor("CppCaseInsensitiveKeywords")) elif language == "C#": from .LexerCSharp import LexerCSharp @@ -215,9 +219,10 @@ except ImportError: return __getPygmentsLexer(parent) else: - return __getPygmentsLexer(parent, name = pyname) + return __getPygmentsLexer(parent, name=pyname) -def __getPygmentsLexer(parent, name = ""): + +def __getPygmentsLexer(parent, name=""): """ Private module function to instantiate a pygments lexer. @@ -226,99 +231,100 @@ @return reference to the lexer (LexerPygments) or None """ from .LexerPygments import LexerPygments - lexer = LexerPygments(parent, name = name) + lexer = LexerPygments(parent, name=name) if lexer.canStyle(): return lexer else: return None -def getOpenFileFiltersList(includeAll = False, asString = False, withAdditional = True): + +def getOpenFileFiltersList(includeAll=False, asString=False, withAdditional=True): """ Module function to get the file filter list for an open file operation. - @param includeAll flag indicating the inclusion of the + @param includeAll flag indicating the inclusion of the All Files filter (boolean) - @param asString flag indicating the list should be returned + @param asString flag indicating the list should be returned as a string (boolean) @keyparam withAdditional flag indicating to include additional filters defined by the user (boolean) @return file filter list (list of strings or string) """ openFileFiltersList = [ - QApplication.translate('Lexers', - 'Python Files (*.py *.py2 *.py3)'), - QApplication.translate('Lexers', - 'Python GUI Files (*.pyw *.pyw2 *.pyw3)'), - QApplication.translate('Lexers', - 'Pyrex Files (*.pyx)'), - QApplication.translate('Lexers', - 'Quixote Template Files (*.ptl)'), - QApplication.translate('Lexers', - 'Ruby Files (*.rb)'), - QApplication.translate('Lexers', - 'IDL Files (*.idl)'), - QApplication.translate('Lexers', - 'C Files (*.h *.c)'), - QApplication.translate('Lexers', - 'C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', + 'Python Files (*.py *.py2 *.py3)'), + QApplication.translate('Lexers', + 'Python GUI Files (*.pyw *.pyw2 *.pyw3)'), + QApplication.translate('Lexers', + 'Pyrex Files (*.pyx)'), + QApplication.translate('Lexers', + 'Quixote Template Files (*.ptl)'), + QApplication.translate('Lexers', + 'Ruby Files (*.rb)'), + QApplication.translate('Lexers', + 'IDL Files (*.idl)'), + QApplication.translate('Lexers', + 'C Files (*.h *.c)'), + QApplication.translate('Lexers', + 'C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)'), + QApplication.translate('Lexers', 'C# Files (*.cs)'), - QApplication.translate('Lexers', - 'HTML Files (*.html *.htm *.asp *.shtml)'), - QApplication.translate('Lexers', - 'CSS Files (*.css)'), - QApplication.translate('Lexers', - 'QSS Files (*.qss)'), - QApplication.translate('Lexers', - 'PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)'), - QApplication.translate('Lexers', - 'XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)'), - QApplication.translate('Lexers', - 'Qt Resource Files (*.qrc)'), - QApplication.translate('Lexers', - 'D Files (*.d *.di)'), - QApplication.translate('Lexers', - 'Java Files (*.java)'), - QApplication.translate('Lexers', - 'JavaScript Files (*.js)'), - QApplication.translate('Lexers', - 'SQL Files (*.sql)'), - QApplication.translate('Lexers', - 'Docbook Files (*.docbook)'), - QApplication.translate('Lexers', - 'Perl Files (*.pl *.pm *.ph)'), - QApplication.translate('Lexers', - 'Lua Files (*.lua)'), - QApplication.translate('Lexers', - 'Tex Files (*.tex *.sty *.aux *.toc *.idx)'), - QApplication.translate('Lexers', - 'Shell Files (*.sh)'), - QApplication.translate('Lexers', - 'Batch Files (*.bat *.cmd)'), - QApplication.translate('Lexers', - 'Diff Files (*.diff *.patch)'), - QApplication.translate('Lexers', - 'Makefiles (*.mak)'), - QApplication.translate('Lexers', - 'Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)'), - QApplication.translate('Lexers', - 'Povray Files (*.pov)'), - QApplication.translate('Lexers', - 'CMake Files (CMakeLists.txt *.cmake *.ctest)'), - QApplication.translate('Lexers', - 'VHDL Files (*.vhd *.vhdl)'), - QApplication.translate('Lexers', - 'TCL/Tk Files (*.tcl *.tk)'), - QApplication.translate('Lexers', - 'Fortran Files (*.f90 *.f95 *.f2k)'), - QApplication.translate('Lexers', - 'Fortran77 Files (*.f *.for)'), - QApplication.translate('Lexers', - 'Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)'), - QApplication.translate('Lexers', - 'PostScript Files (*.ps)'), - QApplication.translate('Lexers', - 'YAML Files (*.yaml *.yml)'), + QApplication.translate('Lexers', + 'HTML Files (*.html *.htm *.asp *.shtml)'), + QApplication.translate('Lexers', + 'CSS Files (*.css)'), + QApplication.translate('Lexers', + 'QSS Files (*.qss)'), + QApplication.translate('Lexers', + 'PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)'), + QApplication.translate('Lexers', + 'XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)'), + QApplication.translate('Lexers', + 'Qt Resource Files (*.qrc)'), + QApplication.translate('Lexers', + 'D Files (*.d *.di)'), + QApplication.translate('Lexers', + 'Java Files (*.java)'), + QApplication.translate('Lexers', + 'JavaScript Files (*.js)'), + QApplication.translate('Lexers', + 'SQL Files (*.sql)'), + QApplication.translate('Lexers', + 'Docbook Files (*.docbook)'), + QApplication.translate('Lexers', + 'Perl Files (*.pl *.pm *.ph)'), + QApplication.translate('Lexers', + 'Lua Files (*.lua)'), + QApplication.translate('Lexers', + 'Tex Files (*.tex *.sty *.aux *.toc *.idx)'), + QApplication.translate('Lexers', + 'Shell Files (*.sh)'), + QApplication.translate('Lexers', + 'Batch Files (*.bat *.cmd)'), + QApplication.translate('Lexers', + 'Diff Files (*.diff *.patch)'), + QApplication.translate('Lexers', + 'Makefiles (*.mak)'), + QApplication.translate('Lexers', + 'Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)'), + QApplication.translate('Lexers', + 'Povray Files (*.pov)'), + QApplication.translate('Lexers', + 'CMake Files (CMakeLists.txt *.cmake *.ctest)'), + QApplication.translate('Lexers', + 'VHDL Files (*.vhd *.vhdl)'), + QApplication.translate('Lexers', + 'TCL/Tk Files (*.tcl *.tk)'), + QApplication.translate('Lexers', + 'Fortran Files (*.f90 *.f95 *.f2k)'), + QApplication.translate('Lexers', + 'Fortran77 Files (*.f *.for)'), + QApplication.translate('Lexers', + 'Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)'), + QApplication.translate('Lexers', + 'PostScript Files (*.ps)'), + QApplication.translate('Lexers', + 'YAML Files (*.yaml *.yml)'), ] for name in LexerRegistry: @@ -336,117 +342,118 @@ else: return openFileFiltersList -def getSaveFileFiltersList(includeAll = False, asString = False, withAdditional = True): + +def getSaveFileFiltersList(includeAll=False, asString=False, withAdditional=True): """ Module function to get the file filter list for a save file operation. - @param includeAll flag indicating the inclusion of the + @param includeAll flag indicating the inclusion of the All Files filter (boolean) - @param asString flag indicating the list should be returned + @param asString flag indicating the list should be returned as a string (boolean) @keyparam withAdditional flag indicating to include additional filters defined by the user (boolean) @return file filter list (list of strings or string) """ saveFileFiltersList = [ - QApplication.translate('Lexers', - "Python2 Files (*.py2)"), - QApplication.translate('Lexers', - "Python3 Files (*.py)"), - QApplication.translate('Lexers', - "Python2 GUI Files (*.pyw2)"), - QApplication.translate('Lexers', - "Python3 GUI Files (*.pyw)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', + "Python2 Files (*.py2)"), + QApplication.translate('Lexers', + "Python3 Files (*.py)"), + QApplication.translate('Lexers', + "Python2 GUI Files (*.pyw2)"), + QApplication.translate('Lexers', + "Python3 GUI Files (*.pyw)"), + QApplication.translate('Lexers', "Pyrex Files (*.pyx)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Quixote Template Files (*.ptl)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Ruby Files (*.rb)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "IDL Files (*.idl)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "C Files (*.c)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "C++ Files (*.cpp)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "C++/C Header Files (*.h)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "C# Files (*.cs)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "HTML Files (*.html)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "PHP Files (*.php)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "ASP Files (*.asp)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "CSS Files (*.css)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "QSS Files (*.qss)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "XML Files (*.xml)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "XSL Files (*.xsl)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "DTD Files (*.dtd)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Qt Resource Files (*.qrc)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "D Files (*.d)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "D Interface Files (*.di)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Java Files (*.java)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "JavaScript Files (*.js)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "SQL Files (*.sql)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Docbook Files (*.docbook)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Perl Files (*.pl)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Perl Module Files (*.pm)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Lua Files (*.lua)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Shell Files (*.sh)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Batch Files (*.bat)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "TeX Files (*.tex)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "TeX Template Files (*.sty)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Diff Files (*.diff)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Make Files (*.mak)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Properties Files (*.ini)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', "Configuration Files (*.cfg)"), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'Povray Files (*.pov)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'CMake Files (CMakeLists.txt)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'CMake Macro Files (*.cmake)'), - QApplication.translate('Lexers', - 'VHDL Files (*.vhd)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', + 'VHDL Files (*.vhd)'), + QApplication.translate('Lexers', 'TCL Files (*.tcl)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'Tk Files (*.tk)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'Fortran Files (*.f95)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'Fortran77 Files (*.f)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'Pascal Files (*.pas)'), - QApplication.translate('Lexers', + QApplication.translate('Lexers', 'PostScript Files (*.ps)'), - QApplication.translate('Lexers', - 'YAML Files (*.yml)'), + QApplication.translate('Lexers', + 'YAML Files (*.yml)'), ] for name in LexerRegistry: @@ -465,127 +472,128 @@ else: return saveFileFiltersList + def getDefaultLexerAssociations(): assocs = { - '*.sh' : "Bash", - '*.bash' : "Bash", - "*.bat" : "Batch", - "*.cmd" : "Batch", - '*.cpp' : "C++", - '*.cxx' : "C++", - '*.cc' : "C++", - '*.c' : "C++", - '*.hpp' : "C++", - '*.hh' : "C++", - '*.h' : "C++", - '*.cs' : "C#", - 'CMakeLists.txt' : "CMake", - '*.cmake' : "CMake", - '*.cmake.in' : "CMake", - '*.ctest' : "CMake", - '*.ctest.in' : "CMake", - '*.css' : "CSS", - '*.qss' : "CSS", - "*.d" : "D", - "*.di" : "D", - "*.diff" : "Diff", - "*.patch" : "Diff", - '*.html' : "HTML", - '*.htm' : "HTML", - '*.asp' : "HTML", - '*.shtml' : "HTML", - '*.php' : "HTML", - '*.php3' : "HTML", - '*.php4' : "HTML", - '*.php5' : "HTML", - '*.phtml' : "HTML", - '*.xml' : "HTML", - '*.xsl' : "HTML", - '*.svg' : "HTML", - '*.xsd' : "HTML", - '*.xslt' : "HTML", - '*.dtd' : "HTML", - '*.rdf' : "HTML", - '*.xul' : "HTML", - '*.docbook' : "HTML", - '*.ui' : "HTML", - '*.ts' : "HTML", - '*.qrc' : "HTML", - '*.kid' : "HTML", - '*.idl' : "IDL", - '*.java' : "Java", - '*.js' : "JavaScript", - '*.lua' : "Lua", - "*makefile" : "Makefile", - "Makefile*" : "Makefile", - "*.mak" : "Makefile", - '*.pl' : "Perl", - '*.pm' : "Perl", - '*.ph' : "Perl", - '*.pov' : "Povray", - "*.properties" : "Properties", - "*.ini" : "Properties", - "*.inf" : "Properties", - "*.reg" : "Properties", - "*.cfg" : "Properties", - "*.cnf" : "Properties", - "*.rc" : "Properties", - '*.py' : "Python", - '*.pyw' : "Python", - '*.py2' : "Python", - '*.pyw2' : "Python", - '*.py3' : "Python", - '*.pyw3' : "Python", - '*.pyx' : "Python", - '*.ptl' : "Python", - '*.rb' : "Ruby", - '*.rbw' : "Ruby", - '*.sql' : "SQL", - "*.tex" : "TeX", - "*.sty" : "TeX", - "*.aux" : "TeX", - "*.toc" : "TeX", - "*.idx" : "TeX", - '*.vhd' : "VHDL", - '*.vhdl' : "VHDL", - "*.tcl" : "TCL", - "*.tk" : "TCL", - "*.f" : "Fortran77", - "*.for" : "Fortran77", - "*.f90" : "Fortran", - "*.f95" : "Fortran", - "*.f2k" : "Fortran", - "*.dpr" : "Pascal", - "*.dpk" : "Pascal", - "*.pas" : "Pascal", - "*.dfm" : "Pascal", - "*.inc" : "Pascal", - "*.pp" : "Pascal", - "*.ps" : "PostScript", - "*.xml" : "XML", - "*.xsl" : "XML", - "*.svg" : "XML", - "*.xsd" : "XML", - "*.xslt" : "XML", - "*.dtd" : "XML", - "*.rdf" : "XML", - "*.xul" : "XML", - "*.yaml" : "YAML", - "*.yml" : "YAML", - '*.e4d' : "XML", - '*.e4k' : "XML", - '*.e4m' : "XML", - '*.e4p' : "XML", - '*.e4q' : "XML", - '*.e4s' : "XML", - '*.e4t' : "XML", - '*.e5d' : "XML", - '*.e5k' : "XML", - '*.e5m' : "XML", - '*.e5p' : "XML", - '*.e5q' : "XML", - '*.e5s' : "XML", - '*.e5t' : "XML", + '*.sh': "Bash", + '*.bash': "Bash", + "*.bat": "Batch", + "*.cmd": "Batch", + '*.cpp': "C++", + '*.cxx': "C++", + '*.cc': "C++", + '*.c': "C++", + '*.hpp': "C++", + '*.hh': "C++", + '*.h': "C++", + '*.cs': "C#", + 'CMakeLists.txt': "CMake", + '*.cmake': "CMake", + '*.cmake.in': "CMake", + '*.ctest': "CMake", + '*.ctest.in': "CMake", + '*.css': "CSS", + '*.qss': "CSS", + "*.d": "D", + "*.di": "D", + "*.diff": "Diff", + "*.patch": "Diff", + '*.html': "HTML", + '*.htm': "HTML", + '*.asp': "HTML", + '*.shtml': "HTML", + '*.php': "HTML", + '*.php3': "HTML", + '*.php4': "HTML", + '*.php5': "HTML", + '*.phtml': "HTML", + '*.xml': "HTML", + '*.xsl': "HTML", + '*.svg': "HTML", + '*.xsd': "HTML", + '*.xslt': "HTML", + '*.dtd': "HTML", + '*.rdf': "HTML", + '*.xul': "HTML", + '*.docbook': "HTML", + '*.ui': "HTML", + '*.ts': "HTML", + '*.qrc': "HTML", + '*.kid': "HTML", + '*.idl': "IDL", + '*.java': "Java", + '*.js': "JavaScript", + '*.lua': "Lua", + "*makefile": "Makefile", + "Makefile*": "Makefile", + "*.mak": "Makefile", + '*.pl': "Perl", + '*.pm': "Perl", + '*.ph': "Perl", + '*.pov': "Povray", + "*.properties": "Properties", + "*.ini": "Properties", + "*.inf": "Properties", + "*.reg": "Properties", + "*.cfg": "Properties", + "*.cnf": "Properties", + "*.rc": "Properties", + '*.py': "Python", + '*.pyw': "Python", + '*.py2': "Python", + '*.pyw2': "Python", + '*.py3': "Python", + '*.pyw3': "Python", + '*.pyx': "Python", + '*.ptl': "Python", + '*.rb': "Ruby", + '*.rbw': "Ruby", + '*.sql': "SQL", + "*.tex": "TeX", + "*.sty": "TeX", + "*.aux": "TeX", + "*.toc": "TeX", + "*.idx": "TeX", + '*.vhd': "VHDL", + '*.vhdl': "VHDL", + "*.tcl": "TCL", + "*.tk": "TCL", + "*.f": "Fortran77", + "*.for": "Fortran77", + "*.f90": "Fortran", + "*.f95": "Fortran", + "*.f2k": "Fortran", + "*.dpr": "Pascal", + "*.dpk": "Pascal", + "*.pas": "Pascal", + "*.dfm": "Pascal", + "*.inc": "Pascal", + "*.pp": "Pascal", + "*.ps": "PostScript", + "*.xml": "XML", + "*.xsl": "XML", + "*.svg": "XML", + "*.xsd": "XML", + "*.xslt": "XML", + "*.dtd": "XML", + "*.rdf": "XML", + "*.xul": "XML", + "*.yaml": "YAML", + "*.yml": "YAML", + '*.e4d': "XML", + '*.e4k': "XML", + '*.e4m': "XML", + '*.e4p': "XML", + '*.e4q': "XML", + '*.e4s': "XML", + '*.e4t': "XML", + '*.e5d': "XML", + '*.e5k': "XML", + '*.e5m': "XML", + '*.e5p': "XML", + '*.e5q': "XML", + '*.e5s': "XML", + '*.e5t': "XML", } for name in LexerRegistry:
--- a/QScintilla/MiniEditor.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/MiniEditor.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,11 +29,12 @@ import Utilities import Preferences + class MiniScintilla(QsciScintillaCompat): """ Class implementing a QsciScintillaCompat subclass for handling focus events. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -84,6 +85,7 @@ QsciScintillaCompat.focusOutEvent(self, event) + class MiniEditor(QMainWindow): """ Class implementing a minimalistic editor for simple editing tasks. @@ -92,7 +94,7 @@ """ editorSaved = pyqtSignal() - def __init__(self, filename = "", filetype = "", parent = None, name = None): + def __init__(self, filename="", filetype="", parent=None, name=None): """ Constructor @@ -114,8 +116,8 @@ self.encoding = Preferences.getEditor("DefaultEncoding") self.srHistory = { - "search" : [], - "replace" : [] + "search": [], + "replace": [] } self.searchDlg = SearchReplaceWidget(False, self, self) self.replaceDlg = SearchReplaceWidget(True, self, self) @@ -254,7 +256,7 @@ """ self.setWindowModified(self.__textEdit.isModified()) - def __checkActions(self, setSb = True): + def __checkActions(self, setSb=True): """ Private slot to check some actions for their enable/disable status and set the statusbar info. @@ -270,7 +272,7 @@ line, pos = self.__textEdit.getCursorPosition() self.__setSbFile(line + 1, pos) - def __setSbFile(self, line = None, pos = None): + def __setSbFile(self, line=None, pos=None): """ Private method to set the file info in the status bar. @@ -358,7 +360,7 @@ self.openAct = E5Action(self.trUtf8('Open'), UI.PixmapCache.getIcon("open.png"), self.trUtf8('&Open...'), - QKeySequence(self.trUtf8("Ctrl+O", "File|Open")), + QKeySequence(self.trUtf8("Ctrl+O", "File|Open")), 0, self, 'vm_file_open') self.openAct.setStatusTip(self.trUtf8('Open a file')) self.openAct.setWhatsThis(self.trUtf8( @@ -371,7 +373,7 @@ self.saveAct = E5Action(self.trUtf8('Save'), UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8('&Save'), - QKeySequence(self.trUtf8("Ctrl+S", "File|Save")), + QKeySequence(self.trUtf8("Ctrl+S", "File|Save")), 0, self, 'vm_file_save') self.saveAct.setStatusTip(self.trUtf8('Save the current file')) self.saveAct.setWhatsThis(self.trUtf8( @@ -384,7 +386,7 @@ self.saveAsAct = E5Action(self.trUtf8('Save as'), UI.PixmapCache.getIcon("fileSaveAs.png"), self.trUtf8('Save &as...'), - QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")), + QKeySequence(self.trUtf8("Shift+Ctrl+S", "File|Save As")), 0, self, 'vm_file_save_as') self.saveAsAct.setStatusTip(self.trUtf8('Save the current file to a new one')) self.saveAsAct.setWhatsThis(self.trUtf8( @@ -398,7 +400,7 @@ self.closeAct = E5Action(self.trUtf8('Close'), UI.PixmapCache.getIcon("close.png"), self.trUtf8('&Close'), - QKeySequence(self.trUtf8("Ctrl+W", "File|Close")), + QKeySequence(self.trUtf8("Ctrl+W", "File|Close")), 0, self, 'vm_file_close') self.closeAct.setStatusTip(self.trUtf8('Close the editor window')) self.closeAct.setWhatsThis(self.trUtf8( @@ -411,10 +413,10 @@ self.printAct = E5Action(self.trUtf8('Print'), UI.PixmapCache.getIcon("print.png"), self.trUtf8('&Print'), - QKeySequence(self.trUtf8("Ctrl+P", "File|Print")), + QKeySequence(self.trUtf8("Ctrl+P", "File|Print")), 0, self, 'vm_file_print') self.printAct.setStatusTip(self.trUtf8('Print the current file')) - self.printAct.setWhatsThis(self.trUtf8( + self.printAct.setWhatsThis(self.trUtf8( """<b>Print File</b>""" """<p>Print the contents of the current file.</p>""" )) @@ -442,8 +444,8 @@ self.undoAct = E5Action(self.trUtf8('Undo'), UI.PixmapCache.getIcon("editUndo.png"), self.trUtf8('&Undo'), - QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")), - QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")), + QKeySequence(self.trUtf8("Ctrl+Z", "Edit|Undo")), + QKeySequence(self.trUtf8("Alt+Backspace", "Edit|Undo")), self, 'vm_edit_undo') self.undoAct.setStatusTip(self.trUtf8('Undo the last change')) self.undoAct.setWhatsThis(self.trUtf8( @@ -456,7 +458,7 @@ self.redoAct = E5Action(self.trUtf8('Redo'), UI.PixmapCache.getIcon("editRedo.png"), self.trUtf8('&Redo'), - QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")), + QKeySequence(self.trUtf8("Ctrl+Shift+Z", "Edit|Redo")), 0, self, 'vm_edit_redo') self.redoAct.setStatusTip(self.trUtf8('Redo the last change')) self.redoAct.setWhatsThis(self.trUtf8( @@ -483,8 +485,8 @@ self.copyAct = E5Action(self.trUtf8('Copy'), UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8('&Copy'), - QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")), - QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")), + QKeySequence(self.trUtf8("Ctrl+C", "Edit|Copy")), + QKeySequence(self.trUtf8("Ctrl+Ins", "Edit|Copy")), self, 'vm_edit_copy') self.copyAct.setStatusTip(self.trUtf8('Copy the selection')) self.copyAct.setWhatsThis(self.trUtf8( @@ -497,8 +499,8 @@ self.pasteAct = E5Action(self.trUtf8('Paste'), UI.PixmapCache.getIcon("editPaste.png"), self.trUtf8('&Paste'), - QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")), - QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")), + QKeySequence(self.trUtf8("Ctrl+V", "Edit|Paste")), + QKeySequence(self.trUtf8("Shift+Ins", "Edit|Paste")), self, 'vm_edit_paste') self.pasteAct.setStatusTip(self.trUtf8('Paste the last cut/copied text')) self.pasteAct.setWhatsThis(self.trUtf8( @@ -512,7 +514,7 @@ self.deleteAct = E5Action(self.trUtf8('Clear'), UI.PixmapCache.getIcon("editDelete.png"), self.trUtf8('Cl&ear'), - QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")), + QKeySequence(self.trUtf8("Alt+Shift+C", "Edit|Clear")), 0, self, 'vm_edit_clear') self.deleteAct.setStatusTip(self.trUtf8('Clear all text')) @@ -537,93 +539,93 @@ self.editorActGrp = createActionGroup(self) - act = E5Action(QApplication.translate('ViewManager', 'Move left one character'), - QApplication.translate('ViewManager', 'Move left one character'), + act = E5Action(QApplication.translate('ViewManager', 'Move left one character'), + QApplication.translate('ViewManager', 'Move left one character'), QKeySequence(QApplication.translate('ViewManager', 'Left')), 0, self.editorActGrp, 'vm_edit_move_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move right one character'), - QApplication.translate('ViewManager', 'Move right one character'), + act = E5Action(QApplication.translate('ViewManager', 'Move right one character'), + QApplication.translate('ViewManager', 'Move right one character'), QKeySequence(QApplication.translate('ViewManager', 'Right')), 0, self.editorActGrp, 'vm_edit_move_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move up one line'), - QApplication.translate('ViewManager', 'Move up one line'), + act = E5Action(QApplication.translate('ViewManager', 'Move up one line'), + QApplication.translate('ViewManager', 'Move up one line'), QKeySequence(QApplication.translate('ViewManager', 'Up')), 0, self.editorActGrp, 'vm_edit_move_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move down one line'), - QApplication.translate('ViewManager', 'Move down one line'), + act = E5Action(QApplication.translate('ViewManager', 'Move down one line'), + QApplication.translate('ViewManager', 'Move down one line'), QKeySequence(QApplication.translate('ViewManager', 'Down')), 0, self.editorActGrp, 'vm_edit_move_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move left one word part'), - QApplication.translate('ViewManager', 'Move left one word part'), + act = E5Action(QApplication.translate('ViewManager', 'Move left one word part'), + QApplication.translate('ViewManager', 'Move left one word part'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move right one word part'), - QApplication.translate('ViewManager', 'Move right one word part'), + act = E5Action(QApplication.translate('ViewManager', 'Move right one word part'), + QApplication.translate('ViewManager', 'Move right one word part'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Right')), 0, self.editorActGrp, 'vm_edit_move_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move left one word'), - QApplication.translate('ViewManager', 'Move left one word'), + act = E5Action(QApplication.translate('ViewManager', 'Move left one word'), + QApplication.translate('ViewManager', 'Move left one word'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move right one word'), - QApplication.translate('ViewManager', 'Move right one word'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Right')), + act = E5Action(QApplication.translate('ViewManager', 'Move right one word'), + QApplication.translate('ViewManager', 'Move right one word'), + QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Right')), 0, self.editorActGrp, 'vm_edit_move_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Move to first visible character in line'), - QApplication.translate('ViewManager', - 'Move to first visible character in line'), + act = E5Action(QApplication.translate('ViewManager', + 'Move to first visible character in line'), + QApplication.translate('ViewManager', + 'Move to first visible character in line'), QKeySequence(QApplication.translate('ViewManager', 'Home')), 0, self.editorActGrp, 'vm_edit_move_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOME) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Move to start of displayed line'), - QApplication.translate('ViewManager', - 'Move to start of displayed line'), + act = E5Action(QApplication.translate('ViewManager', + 'Move to start of displayed line'), + QApplication.translate('ViewManager', + 'Move to start of displayed line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Home')), 0, self.editorActGrp, 'vm_edit_move_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move to end of line'), - QApplication.translate('ViewManager', 'Move to end of line'), + act = E5Action(QApplication.translate('ViewManager', 'Move to end of line'), + QApplication.translate('ViewManager', 'Move to end of line'), QKeySequence(QApplication.translate('ViewManager', 'End')), 0, self.editorActGrp, 'vm_edit_move_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEEND) @@ -631,213 +633,213 @@ self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Scroll view down one line'), - QApplication.translate('ViewManager', 'Scroll view down one line'), + QApplication.translate('ViewManager', 'Scroll view down one line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_scroll_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Scroll view up one line'), - QApplication.translate('ViewManager', 'Scroll view up one line'), + act = E5Action(QApplication.translate('ViewManager', 'Scroll view up one line'), + QApplication.translate('ViewManager', 'Scroll view up one line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_scroll_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move up one paragraph'), - QApplication.translate('ViewManager', 'Move up one paragraph'), + act = E5Action(QApplication.translate('ViewManager', 'Move up one paragraph'), + QApplication.translate('ViewManager', 'Move up one paragraph'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0, self.editorActGrp, 'vm_edit_move_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move down one paragraph'), - QApplication.translate('ViewManager', 'Move down one paragraph'), + act = E5Action(QApplication.translate('ViewManager', 'Move down one paragraph'), + QApplication.translate('ViewManager', 'Move down one paragraph'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0, self.editorActGrp, 'vm_edit_move_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move up one page'), - QApplication.translate('ViewManager', 'Move up one page'), + act = E5Action(QApplication.translate('ViewManager', 'Move up one page'), + QApplication.translate('ViewManager', 'Move up one page'), QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0, self.editorActGrp, 'vm_edit_move_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move down one page'), - QApplication.translate('ViewManager', 'Move down one page'), + act = E5Action(QApplication.translate('ViewManager', 'Move down one page'), + QApplication.translate('ViewManager', 'Move down one page'), QKeySequence(QApplication.translate('ViewManager', 'PgDown')), 0, self.editorActGrp, 'vm_edit_move_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move to start of text'), - QApplication.translate('ViewManager', 'Move to start of text'), + act = E5Action(QApplication.translate('ViewManager', 'Move to start of text'), + QApplication.translate('ViewManager', 'Move to start of text'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Home')), 0, self.editorActGrp, 'vm_edit_move_start_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move to end of text'), - QApplication.translate('ViewManager', 'Move to end of text'), + act = E5Action(QApplication.translate('ViewManager', 'Move to end of text'), + QApplication.translate('ViewManager', 'Move to end of text'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+End')), 0, self.editorActGrp, 'vm_edit_move_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Indent one level'), - QApplication.translate('ViewManager', 'Indent one level'), + act = E5Action(QApplication.translate('ViewManager', 'Indent one level'), + QApplication.translate('ViewManager', 'Indent one level'), QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0, self.editorActGrp, 'vm_edit_indent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_TAB) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Unindent one level'), - QApplication.translate('ViewManager', 'Unindent one level'), + act = E5Action(QApplication.translate('ViewManager', 'Unindent one level'), + QApplication.translate('ViewManager', 'Unindent one level'), QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')), 0, self.editorActGrp, 'vm_edit_unindent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection left one character'), - QApplication.translate('ViewManager', - 'Extend selection left one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection left one character'), + QApplication.translate('ViewManager', + 'Extend selection left one character'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection right one character'), - QApplication.translate('ViewManager', - 'Extend selection right one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection right one character'), + QApplication.translate('ViewManager', + 'Extend selection right one character'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection up one line'), - QApplication.translate('ViewManager', - 'Extend selection up one line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection up one line'), + QApplication.translate('ViewManager', + 'Extend selection up one line'), QKeySequence(QApplication.translate('ViewManager', 'Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection down one line'), - QApplication.translate('ViewManager', - 'Extend selection down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Down')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection down one line'), + QApplication.translate('ViewManager', + 'Extend selection down one line'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection left one word part'), - QApplication.translate('ViewManager', - 'Extend selection left one word part'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection left one word part'), + QApplication.translate('ViewManager', + 'Extend selection left one word part'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection right one word part'), - QApplication.translate('ViewManager', - 'Extend selection right one word part'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection right one word part'), + QApplication.translate('ViewManager', + 'Extend selection right one word part'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection left one word'), - QApplication.translate('ViewManager', - 'Extend selection left one word'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection left one word'), + QApplication.translate('ViewManager', + 'Extend selection left one word'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection right one word'), - QApplication.translate('ViewManager', - 'Extend selection right one word'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection right one word'), + QApplication.translate('ViewManager', + 'Extend selection right one word'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', + act = E5Action(QApplication.translate('ViewManager', 'Extend selection to first visible character in line'), - QApplication.translate('ViewManager', - 'Extend selection to first visible character in line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Home')), + QApplication.translate('ViewManager', + 'Extend selection to first visible character in line'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Home')), 0, self.editorActGrp, 'vm_edit_extend_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to start of line'), - QApplication.translate('ViewManager', - 'Extend selection to start of line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Home')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to start of line'), + QApplication.translate('ViewManager', + 'Extend selection to start of line'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Home')), 0, self.editorActGrp, 'vm_edit_extend_selection_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to end of line'), - QApplication.translate('ViewManager', - 'Extend selection to end of line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to end of line'), + QApplication.translate('ViewManager', + 'Extend selection to end of line'), QKeySequence(QApplication.translate('ViewManager', 'Shift+End')), 0, self.editorActGrp, 'vm_edit_extend_selection_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection up one paragraph'), - QApplication.translate('ViewManager', - 'Extend selection up one paragraph'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection up one paragraph'), + QApplication.translate('ViewManager', + 'Extend selection up one paragraph'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_para') @@ -845,33 +847,33 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection down one paragraph'), - QApplication.translate('ViewManager', - 'Extend selection down one paragraph'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Down')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection down one paragraph'), + QApplication.translate('ViewManager', + 'Extend selection down one paragraph'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWNEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection up one page'), - QApplication.translate('ViewManager', - 'Extend selection up one page'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection up one page'), + QApplication.translate('ViewManager', + 'Extend selection up one page'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection down one page'), - QApplication.translate('ViewManager', - 'Extend selection down one page'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection down one page'), + QApplication.translate('ViewManager', + 'Extend selection down one page'), QKeySequence(QApplication.translate('ViewManager', 'Shift+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_page') @@ -879,11 +881,11 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to start of text'), - QApplication.translate('ViewManager', - 'Extend selection to start of text'), - QKeySequence(QApplication.translate('ViewManager', + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to start of text'), + QApplication.translate('ViewManager', + 'Extend selection to start of text'), + QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+Home')), 0, self.editorActGrp, 'vm_edit_extend_selection_start_text') @@ -891,133 +893,133 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to end of text'), - QApplication.translate('ViewManager', - 'Extend selection to end of text'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+End')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to end of text'), + QApplication.translate('ViewManager', + 'Extend selection to end of text'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+End')), 0, self.editorActGrp, 'vm_edit_extend_selection_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Delete previous character'), - QApplication.translate('ViewManager', 'Delete previous character'), - QKeySequence(QApplication.translate('ViewManager', 'Backspace')), - QKeySequence(QApplication.translate('ViewManager', - 'Shift+Backspace')), + act = E5Action(QApplication.translate('ViewManager', + 'Delete previous character'), + QApplication.translate('ViewManager', 'Delete previous character'), + QKeySequence(QApplication.translate('ViewManager', 'Backspace')), + QKeySequence(QApplication.translate('ViewManager', + 'Shift+Backspace')), self.editorActGrp, 'vm_edit_delete_previous_char') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Delete previous character if not at line start'), - QApplication.translate('ViewManager', - 'Delete previous character if not at line start'), + act = E5Action(QApplication.translate('ViewManager', + 'Delete previous character if not at line start'), + QApplication.translate('ViewManager', + 'Delete previous character if not at line start'), 0, 0, self.editorActGrp, 'vm_edit_delet_previous_char_not_line_start') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACKNOTLINE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete current character'), - QApplication.translate('ViewManager', 'Delete current character'), + act = E5Action(QApplication.translate('ViewManager', 'Delete current character'), + QApplication.translate('ViewManager', 'Delete current character'), QKeySequence(QApplication.translate('ViewManager', 'Del')), 0, self.editorActGrp, 'vm_edit_delete_current_char') self.esm.setMapping(act, QsciScintilla.SCI_CLEAR) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete word to left'), - QApplication.translate('ViewManager', 'Delete word to left'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Backspace')), + act = E5Action(QApplication.translate('ViewManager', 'Delete word to left'), + QApplication.translate('ViewManager', 'Delete word to left'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_word_left') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete word to right'), - QApplication.translate('ViewManager', 'Delete word to right'), + act = E5Action(QApplication.translate('ViewManager', 'Delete word to right'), + QApplication.translate('ViewManager', 'Delete word to right'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0, self.editorActGrp, 'vm_edit_delete_word_right') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete line to left'), - QApplication.translate('ViewManager', 'Delete line to left'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Backspace')), + act = E5Action(QApplication.translate('ViewManager', 'Delete line to left'), + QApplication.translate('ViewManager', 'Delete line to left'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_line_left') self.esm.setMapping(act, QsciScintilla.SCI_DELLINELEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete line to right'), - QApplication.translate('ViewManager', 'Delete line to right'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Del')), + act = E5Action(QApplication.translate('ViewManager', 'Delete line to right'), + QApplication.translate('ViewManager', 'Delete line to right'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Del')), 0, self.editorActGrp, 'vm_edit_delete_line_right') self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Insert new line'), - QApplication.translate('ViewManager', 'Insert new line'), - QKeySequence(QApplication.translate('ViewManager', 'Return')), - QKeySequence(QApplication.translate('ViewManager', 'Enter')), + act = E5Action(QApplication.translate('ViewManager', 'Insert new line'), + QApplication.translate('ViewManager', 'Insert new line'), + QKeySequence(QApplication.translate('ViewManager', 'Return')), + QKeySequence(QApplication.translate('ViewManager', 'Enter')), self.editorActGrp, 'vm_edit_insert_line') self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Insert new line below current line'), - QApplication.translate('ViewManager', - 'Insert new line below current line'), + act = E5Action(QApplication.translate('ViewManager', + 'Insert new line below current line'), + QApplication.translate('ViewManager', + 'Insert new line below current line'), QKeySequence(QApplication.translate('ViewManager', 'Shift+Return')), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), self.editorActGrp, 'vm_edit_insert_line_below') act.triggered[()].connect(self.__textEdit.newLineBelow) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete current line'), - QApplication.translate('ViewManager', 'Delete current line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+U')), + act = E5Action(QApplication.translate('ViewManager', 'Delete current line'), + QApplication.translate('ViewManager', 'Delete current line'), + QKeySequence(QApplication.translate('ViewManager', 'Ctrl+U')), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+L')), self.editorActGrp, 'vm_edit_delete_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDELETE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Duplicate current line'), - QApplication.translate('ViewManager', 'Duplicate current line'), + act = E5Action(QApplication.translate('ViewManager', 'Duplicate current line'), + QApplication.translate('ViewManager', 'Duplicate current line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Swap current and previous lines'), - QApplication.translate('ViewManager', - 'Swap current and previous lines'), + act = E5Action(QApplication.translate('ViewManager', + 'Swap current and previous lines'), + QApplication.translate('ViewManager', + 'Swap current and previous lines'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0, self.editorActGrp, 'vm_edit_swap_current_previous_line') self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Cut current line'), - QApplication.translate('ViewManager', 'Cut current line'), + act = E5Action(QApplication.translate('ViewManager', 'Cut current line'), + QApplication.translate('ViewManager', 'Cut current line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+L')), 0, self.editorActGrp, 'vm_edit_cut_current_line') @@ -1025,8 +1027,8 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Copy current line'), - QApplication.translate('ViewManager', 'Copy current line'), + act = E5Action(QApplication.translate('ViewManager', 'Copy current line'), + QApplication.translate('ViewManager', 'Copy current line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+T')), 0, self.editorActGrp, 'vm_edit_copy_current_line') @@ -1034,18 +1036,18 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Toggle insert/overtype'), - QApplication.translate('ViewManager', 'Toggle insert/overtype'), + act = E5Action(QApplication.translate('ViewManager', 'Toggle insert/overtype'), + QApplication.translate('ViewManager', 'Toggle insert/overtype'), QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0, self.editorActGrp, 'vm_edit_toggle_insert_overtype') self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Convert selection to lower case'), - QApplication.translate('ViewManager', - 'Convert selection to lower case'), + act = E5Action(QApplication.translate('ViewManager', + 'Convert selection to lower case'), + QApplication.translate('ViewManager', + 'Convert selection to lower case'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+U')), 0, self.editorActGrp, 'vm_edit_convert_selection_lower') @@ -1053,10 +1055,10 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Convert selection to upper case'), - QApplication.translate('ViewManager', - 'Convert selection to upper case'), + act = E5Action(QApplication.translate('ViewManager', + 'Convert selection to upper case'), + QApplication.translate('ViewManager', + 'Convert selection to upper case'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+U')), 0, self.editorActGrp, 'vm_edit_convert_selection_upper') @@ -1064,58 +1066,58 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Move to end of displayed line'), - QApplication.translate('ViewManager', - 'Move to end of displayed line'), + act = E5Action(QApplication.translate('ViewManager', + 'Move to end of displayed line'), + QApplication.translate('ViewManager', + 'Move to end of displayed line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+End')), 0, self.editorActGrp, 'vm_edit_move_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to end of displayed line'), - QApplication.translate('ViewManager', - 'Extend selection to end of displayed line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to end of displayed line'), + QApplication.translate('ViewManager', + 'Extend selection to end of displayed line'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Formfeed'), - QApplication.translate('ViewManager', 'Formfeed'), + act = E5Action(QApplication.translate('ViewManager', 'Formfeed'), + QApplication.translate('ViewManager', 'Formfeed'), 0, 0, self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Escape'), - QApplication.translate('ViewManager', 'Escape'), + act = E5Action(QApplication.translate('ViewManager', 'Escape'), + QApplication.translate('ViewManager', 'Escape'), QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0, self.editorActGrp, 'vm_edit_escape') self.esm.setMapping(act, QsciScintilla.SCI_CANCEL) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection down one line'), - QApplication.translate('ViewManager', - 'Extend rectangular selection down one line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Down')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection down one line'), + QApplication.translate('ViewManager', + 'Extend rectangular selection down one line'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection up one line'), - QApplication.translate('ViewManager', - 'Extend rectangular selection up one line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection up one line'), + QApplication.translate('ViewManager', + 'Extend rectangular selection up one line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') @@ -1123,49 +1125,49 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection left one character'), - QApplication.translate('ViewManager', - 'Extend rectangular selection left one character'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection left one character'), + QApplication.translate('ViewManager', + 'Extend rectangular selection left one character'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection right one character'), - QApplication.translate('ViewManager', - 'Extend rectangular selection right one character'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection right one character'), + QApplication.translate('ViewManager', + 'Extend rectangular selection right one character'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Right')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', + act = E5Action(QApplication.translate('ViewManager', 'Extend rectangular selection to first' - ' visible character in line'), - QApplication.translate('ViewManager', + ' visible character in line'), + QApplication.translate('ViewManager', 'Extend rectangular selection to first' - ' visible character in line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Home')), + ' visible character in line'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Home')), 0, - self.editorActGrp, + self.editorActGrp, 'vm_edit_extend_rect_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection to end of line'), - QApplication.translate('ViewManager', - 'Extend rectangular selection to end of line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection to end of line'), + QApplication.translate('ViewManager', + 'Extend rectangular selection to end of line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Ctrl+End')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_end_line') @@ -1173,34 +1175,34 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection up one page'), - QApplication.translate('ViewManager', - 'Extend rectangular selection up one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+PgUp')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection up one page'), + QApplication.translate('ViewManager', + 'Extend rectangular selection up one page'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection down one page'), - QApplication.translate('ViewManager', - 'Extend rectangular selection down one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+PgDown')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection down one page'), + QApplication.translate('ViewManager', + 'Extend rectangular selection down one page'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Duplicate current selection'), - QApplication.translate('ViewManager', - 'Duplicate current selection'), + act = E5Action(QApplication.translate('ViewManager', + 'Duplicate current selection'), + QApplication.translate('ViewManager', + 'Duplicate current selection'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') @@ -1217,13 +1219,13 @@ self.searchAct = E5Action(QApplication.translate('ViewManager', 'Search'), UI.PixmapCache.getIcon("find.png"), QApplication.translate('ViewManager', '&Search...'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+F", "Search|Search")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+F", "Search|Search")), 0, self, 'vm_search') - self.searchAct.setStatusTip(QApplication.translate('ViewManager', + self.searchAct.setStatusTip(QApplication.translate('ViewManager', 'Search for a text')) - self.searchAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search</b>""" """<p>Search for some text in the current editor. A""" """ dialog is shown to enter the searchtext and options""" @@ -1232,17 +1234,17 @@ self.searchAct.triggered[()].connect(self.__search) self.searchActions.append(self.searchAct) - self.searchNextAct = E5Action(QApplication.translate('ViewManager', + self.searchNextAct = E5Action(QApplication.translate('ViewManager', 'Search next'), UI.PixmapCache.getIcon("findNext.png"), QApplication.translate('ViewManager', 'Search &next'), - QKeySequence(QApplication.translate('ViewManager', - "F3", "Search|Search next")), + QKeySequence(QApplication.translate('ViewManager', + "F3", "Search|Search next")), 0, self, 'vm_search_next') - self.searchNextAct.setStatusTip(QApplication.translate('ViewManager', + self.searchNextAct.setStatusTip(QApplication.translate('ViewManager', 'Search next occurrence of text')) - self.searchNextAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchNextAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search next</b>""" """<p>Search the next occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" @@ -1250,17 +1252,17 @@ self.searchNextAct.triggered[()].connect(self.searchDlg.findNext) self.searchActions.append(self.searchNextAct) - self.searchPrevAct = E5Action(QApplication.translate('ViewManager', + self.searchPrevAct = E5Action(QApplication.translate('ViewManager', 'Search previous'), UI.PixmapCache.getIcon("findPrev.png"), QApplication.translate('ViewManager', 'Search &previous'), - QKeySequence(QApplication.translate('ViewManager', - "Shift+F3", "Search|Search previous")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+F3", "Search|Search previous")), 0, self, 'vm_search_previous') - self.searchPrevAct.setStatusTip(QApplication.translate('ViewManager', + self.searchPrevAct.setStatusTip(QApplication.translate('ViewManager', 'Search previous occurrence of text')) - self.searchPrevAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchPrevAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search previous</b>""" """<p>Search the previous occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" @@ -1268,17 +1270,17 @@ self.searchPrevAct.triggered[()].connect(self.searchDlg.findPrev) self.searchActions.append(self.searchPrevAct) - self.searchClearMarkersAct = E5Action(QApplication.translate('ViewManager', + self.searchClearMarkersAct = E5Action(QApplication.translate('ViewManager', 'Clear search markers'), UI.PixmapCache.getIcon("findClear.png"), QApplication.translate('ViewManager', 'Clear search markers'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+3", "Search|Clear search markers")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+3", "Search|Clear search markers")), 0, self, 'vm_clear_search_markers') - self.searchClearMarkersAct.setStatusTip(QApplication.translate('ViewManager', + self.searchClearMarkersAct.setStatusTip(QApplication.translate('ViewManager', 'Clear all displayed search markers')) - self.searchClearMarkersAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchClearMarkersAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Clear search markers</b>""" """<p>Clear all displayed search markers.</p>""" )) @@ -1287,13 +1289,13 @@ self.replaceAct = E5Action(QApplication.translate('ViewManager', 'Replace'), QApplication.translate('ViewManager', '&Replace...'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+R", "Search|Replace")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+R", "Search|Replace")), 0, self, 'vm_search_replace') - self.replaceAct.setStatusTip(QApplication.translate('ViewManager', + self.replaceAct.setStatusTip(QApplication.translate('ViewManager', 'Replace some text')) - self.replaceAct.setWhatsThis(QApplication.translate('ViewManager', + self.replaceAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Replace</b>""" """<p>Search for some text in the current editor and replace it. A""" """ dialog is shown to enter the searchtext, the replacement text""" @@ -1327,10 +1329,10 @@ self.aboutQtAct.triggered[()].connect(self.__aboutQt) self.helpActions.append(self.aboutQtAct) - self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), + self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), UI.PixmapCache.getIcon("whatsThis.png"), - self.trUtf8('&What\'s This?'), - QKeySequence(self.trUtf8("Shift+F1","Help|What's This?'")), + self.trUtf8('&What\'s This?'), + QKeySequence(self.trUtf8("Shift+F1", "Help|What's This?'")), 0, self, 'help_help_whats_this') self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help')) self.whatsThisAct.setWhatsThis(self.trUtf8( @@ -1476,14 +1478,14 @@ @return flag indicating, if it is ok to continue (boolean) """ if self.__textEdit.isModified(): - ret = E5MessageBox.okToClearData(self, + ret = E5MessageBox.okToClearData(self, self.trUtf8("eric5 Mini Editor"), self.trUtf8("The document has unsaved changes."), self.__save) return ret return True - def __loadFile(self, fileName, filetype = None): + def __loadFile(self, fileName, filetype=None): """ Private method to load the given file. @@ -1589,7 +1591,7 @@ def __modificationChanged(self, m): """ - Private slot to handle the modificationChanged signal. + Private slot to handle the modificationChanged signal. @param m modification status """ @@ -1598,7 +1600,7 @@ def __cursorPositionChanged(self, line, pos): """ - Private slot to handle the cursorPositionChanged signal. + Private slot to handle the cursorPositionChanged signal. @param line line number of the cursor @param pos position in line of the cursor @@ -1650,7 +1652,7 @@ linenoMargin = Preferences.getEditor("LinenoMargin") self.__textEdit.setMarginLineNumbers(0, linenoMargin) if linenoMargin: - self.__textEdit.setMarginWidth(0, + self.__textEdit.setMarginWidth(0, ' ' + '8' * Preferences.getEditor("LinenoWidth")) else: self.__textEdit.setMarginWidth(0, 16) @@ -1668,7 +1670,7 @@ pass self.__textEdit.setFolding(folding) self.__textEdit.setFoldMarginColors( - Preferences.getEditorColour("FoldmarginBackground"), + Preferences.getEditorColour("FoldmarginBackground"), Preferences.getEditorColour("FoldmarginBackground")) self.__textEdit.setFoldMarkersColors( Preferences.getEditorColour("FoldMarkersForeground"), @@ -1759,7 +1761,7 @@ QsciScintilla.WrapFlagNone, QsciScintilla.WrapFlagNone) self.searchIndicator = QsciScintilla.INDIC_CONTAINER - self.__textEdit.indicatorDefine(self.searchIndicator, QsciScintilla.INDIC_BOX, + self.__textEdit.indicatorDefine(self.searchIndicator, QsciScintilla.INDIC_BOX, Preferences.getEditorColour("SearchMarkers")) self.__textEdit.setCursorFlashTime(QApplication.cursorFlashTime()) @@ -1793,7 +1795,7 @@ """ Private slot to print the text. """ - printer = Printer(mode = QPrinter.HighResolution) + printer = Printer(mode=QPrinter.HighResolution) sb = self.statusBar() printDialog = QPrintDialog(printer, self) if self.__textEdit.hasSelectedText(): @@ -1811,7 +1813,7 @@ if toIndex == 0: toLine -= 1 # Qscintilla seems to print one line more than told - res = printer.printRange(self.__textEdit, fromLine, toLine-1) + res = printer.printRange(self.__textEdit, fromLine, toLine - 1) else: res = printer.printRange(self.__textEdit) if res: @@ -1829,7 +1831,7 @@ """ from PyQt4.QtGui import QPrintPreviewDialog - printer = Printer(mode = QPrinter.HighResolution) + printer = Printer(mode=QPrinter.HighResolution) if self.__curFile: printer.setDocName(QFileInfo(self.__curFile).fileName()) else: @@ -1946,7 +1948,7 @@ self.trUtf8("Pygments Lexer"), self.trUtf8("Select the Pygments lexer to apply."), lexerList, - lexerSel, + lexerSel, False) if ok and lexerName: return lexerName @@ -1966,7 +1968,7 @@ elif act == self.pygmentsSelAct: language = self.__selectPygmentsLexer() if language: - self.setLanguage("dummy.pygments", pyname = language) + self.setLanguage("dummy.pygments", pyname=language) else: language = act.data() if language: @@ -1985,7 +1987,7 @@ self.__textEdit.setLexer() self.__setMonospaced(self.useMonospaced) - def setLanguage(self, filename, initTextDisplay = True, pyname = ""): + def setLanguage(self, filename, initTextDisplay=True, pyname=""): """ Public method to set a lexer language. @@ -1994,7 +1996,7 @@ is required as well (boolean) @keyparam pyname name of the pygments lexer to use (string) """ - self.__bindLexer(filename, pyname = pyname) + self.__bindLexer(filename, pyname=pyname) self.__textEdit.recolor() self.__checkLanguage() @@ -2029,7 +2031,7 @@ else: self.supportedLanguages[self.apiLanguage][2].setChecked(True) - def __bindLexer(self, filename, pyname = ""): + def __bindLexer(self, filename, pyname=""): """ Private slot to set the correct lexer depending on language. @@ -2046,7 +2048,7 @@ pyname = language.split("|", 1)[1] language = "" - self.lexer_ = Lexers.getLexer(language, self.__textEdit, pyname = pyname) + self.lexer_ = Lexers.getLexer(language, self.__textEdit, pyname=pyname) if self.lexer_ is None: self.__textEdit.setLexer() self.apiLanguage = "" @@ -2142,7 +2144,7 @@ def textForFind(self): """ - Public method to determine the selection or the current word for the next + Public method to determine the selection or the current word for the next find operation. @return selection or current word (string) @@ -2259,8 +2261,8 @@ return self.clearSearchIndicators() - ok = self.__textEdit.findFirstTarget(word, - False, self.__textEdit.caseSensitive(), True, + ok = self.__textEdit.findFirstTarget(word, + False, self.__textEdit.caseSensitive(), True, 0, 0) while ok: tgtPos, tgtLen = self.__textEdit.getFoundTarget() @@ -2272,7 +2274,7 @@ ## Methods exhibiting some QScintilla API methods ########################################################## - def setText(self, txt, filetype = None): + def setText(self, txt, filetype=None): """ Public method to set the text programatically.
--- a/QScintilla/Printer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Printer.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ import Preferences + class Printer(QsciPrinter): - """ + """ Class implementing the QextScintillaPrinter with a header. """ - def __init__(self, mode = QPrinter.ScreenResolution): + def __init__(self, mode=QPrinter.ScreenResolution): """ Constructor @@ -50,7 +51,7 @@ """ fn = self.docName() - header = QApplication.translate('Printer', + header = QApplication.translate('Printer', '{0} - Printed on {1}, {2} - Page {3}')\ .format(fn, self.date, self.time, pagenr)
--- a/QScintilla/QsciScintillaCompat.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/QsciScintillaCompat.py Fri Mar 11 16:51:57 2011 +0100 @@ -31,6 +31,7 @@ ############################################################################### + class QsciScintillaCompat(QsciScintilla): """ Class implementing a compatability interface to QsciScintilla. @@ -39,12 +40,12 @@ QsciScintilla incrementally. This class ensures compatibility to older versions of QsciScintilla. """ - ArrowFoldStyle = QsciScintilla.BoxedTreeFoldStyle + 1 - ArrowTreeFoldStyle = ArrowFoldStyle + 1 + ArrowFoldStyle = QsciScintilla.BoxedTreeFoldStyle + 1 + ArrowTreeFoldStyle = ArrowFoldStyle + 1 UserSeparator = '\x04' - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -62,7 +63,7 @@ self.__targetSearchEnd = -1 self.__targetSearchActive = False - def setLexer(self, lex = None): + def setLexer(self, lex=None): """ Public method to set the lexer. @@ -196,7 +197,7 @@ def charAt(self, pos): """ - Public method to get the character at a position in the text observing + Public method to get the character at a position in the text observing multibyte characters. @param pos position in the text (integer) @@ -298,7 +299,7 @@ # methods below are missing from QScintilla ########################################################################### - def zoomIn(self, zoom = 1): + def zoomIn(self, zoom=1): """ Public method used to increase the zoom factor. @@ -307,7 +308,7 @@ self.zoom += zoom QsciScintilla.zoomIn(self, zoom) - def zoomOut(self, zoom = 1): + def zoomOut(self, zoom=1): """ Public method used to decrease the zoom factor. @@ -527,7 +528,7 @@ Public method to get the flash (blink) time of the cursor in milliseconds. - The flash time is the time required to display, invert and restore the + The flash time is the time required to display, invert and restore the caret display. Usually the text cursor is displayed for half the cursor flash time, then hidden for the same amount of time. @@ -540,7 +541,7 @@ Public method to get the flash (blink) time of the cursor in milliseconds. - The flash time is the time required to display, invert and restore the + The flash time is the time required to display, invert and restore the caret display. Usually the text cursor is displayed for half the cursor flash time, then hidden for the same amount of time. @@ -561,7 +562,7 @@ @return scintilla position (integer) or -1 to indicate, that the point is not near any character """ - return self.SendScintilla(QsciScintilla.SCI_POSITIONFROMPOINTCLOSE, + return self.SendScintilla(QsciScintilla.SCI_POSITIONFROMPOINTCLOSE, point.x(), point.y()) def positionBefore(self, pos): @@ -612,7 +613,7 @@ self.__targetSearchFlags) targetSearchExpr = self._encodeString(self.__targetSearchExpr) pos = self.SendScintilla(QsciScintilla.SCI_SEARCHINTARGET, - len(targetSearchExpr), + len(targetSearchExpr), targetSearchExpr) if pos == -1: @@ -638,9 +639,9 @@ else: return (0, 0) - def findFirstTarget(self, expr_, re_, cs_, wo_, - begline = -1, begindex = -1, endline = -1, endindex = -1, - ws_ = False): + def findFirstTarget(self, expr_, re_, cs_, wo_, + begline=-1, begindex=-1, endline=-1, endindex=-1, + ws_=False): """ Public method to search in a specified range of text without setting the selection. @@ -657,7 +658,7 @@ document) (integer) @keyparam endindex index number to stop at (-1 to indicate end of document) (integer) - @keyparam ws_ flag indicating a word start search (boolean) + @keyparam ws_ flag indicating a word start search (boolean) @return flag indicating a successful search (boolean) """ self.__targetSearchFlags = 0 @@ -732,7 +733,7 @@ """ Public method to define the appearance of an indicator. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @param style style to be used for the indicator (QsciScintilla.INDIC_PLAIN, QsciScintilla.INDIC_SQUIGGLE, @@ -762,7 +763,7 @@ """ Public method to set the current indicator. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @exception ValueError the indicator or style are not valid """ @@ -776,7 +777,7 @@ """ Public method to set an indicator for the given range. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @param spos position of the indicator start (integer) @param length length of the indicator (integer) @@ -789,7 +790,7 @@ """ Public method to set an indicator for the given range. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @param sline line number of the indicator start (integer) @param sindex index of the indicator start (integer) @@ -805,7 +806,7 @@ """ Public method to clear an indicator for the given range. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @param spos position of the indicator start (integer) @param length length of the indicator (integer) @@ -817,7 +818,7 @@ """ Public method to clear an indicator for the given range. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @param sline line number of the indicator start (integer) @param sindex index of the indicator start (integer) @@ -832,7 +833,7 @@ """ Public method to clear all occurrences of an indicator. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) """ self.clearIndicatorRange(indicator, 0, self.length()) @@ -841,7 +842,7 @@ """ Public method to test for the existence of an indicator. - @param indicator number of the indicator (integer, + @param indicator number of the indicator (integer, QsciScintilla.INDIC_CONTAINER .. QsciScintilla.INDIC_MAX) @param pos position to test (integer) @return flag indicating the existence of the indicator (boolean) @@ -854,7 +855,7 @@ # methods to perform folding related stuff ########################################################################### - def __setFoldMarker(self, marknr, mark = QsciScintilla.SC_MARK_EMPTY): + def __setFoldMarker(self, marknr, mark=QsciScintilla.SC_MARK_EMPTY): """ Private method to define a fold marker. @@ -864,12 +865,12 @@ self.SendScintilla(QsciScintilla.SCI_MARKERDEFINE, marknr, mark) if mark != QsciScintilla.SC_MARK_EMPTY: - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, marknr, QColor(Qt.white)) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, marknr, QColor(Qt.black)) - def setFolding(self, style, margin = 2): + def setFolding(self, style, margin=2): """ Public method to set the folding style and margin. @@ -883,9 +884,9 @@ self, QsciScintilla.PlainFoldStyle, margin) if style == self.ArrowFoldStyle: - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDER, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDER, QsciScintilla.SC_MARK_ARROW) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPEN, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPEN, QsciScintilla.SC_MARK_ARROWDOWN) self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERSUB) self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERTAIL) @@ -893,19 +894,19 @@ self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPENMID) self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERMIDTAIL) elif style == self.ArrowTreeFoldStyle: - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDER, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDER, QsciScintilla.SC_MARK_ARROW) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPEN, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPEN, QsciScintilla.SC_MARK_ARROWDOWN) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERSUB, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERSUB, QsciScintilla.SC_MARK_VLINE) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERTAIL, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERTAIL, QsciScintilla.SC_MARK_LCORNER) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEREND, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEREND, QsciScintilla.SC_MARK_ARROW) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPENMID, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDEROPENMID, QsciScintilla.SC_MARK_ARROWDOWN) - self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERMIDTAIL, + self.__setFoldMarker(QsciScintilla.SC_MARKNUM_FOLDERMIDTAIL, QsciScintilla.SC_MARK_TCORNER) def setFoldMarkersColors(self, foreColor, backColor): @@ -916,39 +917,39 @@ @param foreColor foreground color (QColor) @param backColor background color (QColor) """ - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDER, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDER, backColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDEROPEN, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDEROPEN, backColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDEROPENMID, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDEROPENMID, backColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDERSUB, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDERSUB, backColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDERTAIL, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDERTAIL, backColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDERMIDTAIL, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDERMIDTAIL, backColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, + self.SendScintilla(QsciScintilla.SCI_MARKERSETFORE, QsciScintilla.SC_MARKNUM_FOLDEREND, foreColor) - self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, + self.SendScintilla(QsciScintilla.SCI_MARKERSETBACK, QsciScintilla.SC_MARKNUM_FOLDEREND, backColor) @@ -1018,9 +1019,9 @@ if id <= 0: return - self.SendScintilla(QsciScintilla.SCI_AUTOCSETSEPARATOR, + self.SendScintilla(QsciScintilla.SCI_AUTOCSETSEPARATOR, ord(self.UserSeparator)) - self.SendScintilla(QsciScintilla.SCI_USERLISTSHOW, id, + self.SendScintilla(QsciScintilla.SCI_USERLISTSHOW, id, self._encodeString(self.UserSeparator.join(lst))) ########################################################################### @@ -1120,12 +1121,12 @@ ## ######################################################################### ## # methods below have been added to QScintilla starting with version 2.x ## ######################################################################### -## +## ## if "newMethod" not in QsciScintilla.__dict__: ## def newMethod(self, param): ## """ ## Public method to do something. -## +## ## @param param parameter for method ## """ ## pass
--- a/QScintilla/SearchReplaceWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/SearchReplaceWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ import UI.PixmapCache + class SearchReplaceWidget(QWidget): """ Class implementing the search and replace widget. @@ -30,7 +31,7 @@ """ searchListChanged = pyqtSignal() - def __init__(self, replace, vm, parent = None): + def __init__(self, replace, vm, parent=None): """ Constructor @@ -49,9 +50,9 @@ self.ui = Ui_ReplaceWidget() whatsThis = self.trUtf8(r""" <b>Find and Replace</b> -<p>This dialog is used to find some text and replace it with another text. -By checking the various checkboxes, the search can be made more specific. The search -string might be a regular expression. In a regular expression, special characters +<p>This dialog is used to find some text and replace it with another text. +By checking the various checkboxes, the search can be made more specific. The search +string might be a regular expression. In a regular expression, special characters interpreted are:</p> """ ) @@ -59,8 +60,8 @@ self.ui = Ui_SearchWidget() whatsThis = self.trUtf8(r""" <b>Find</b> -<p>This dialog is used to find some text. By checking the various checkboxes, the search -can be made more specific. The search string might be a regular expression. In a regular +<p>This dialog is used to find some text. By checking the various checkboxes, the search +can be made more specific. The search string might be a regular expression. In a regular expression, special characters interpreted are:</p> """ ) @@ -383,7 +384,7 @@ return ok - def __showFind(self, text = ''): + def __showFind(self, text=''): """ Private method to display this widget in find mode. @@ -598,7 +599,7 @@ self.viewmanager.searchPrevAct.alternateShortcut()) self.findPrevAct.setShortcutContext(Qt.WidgetShortcut) - def show(self, text = ''): + def show(self, text=''): """ Overridden slot from QWidget. @@ -629,4 +630,4 @@ if aw: aw.setFocus(Qt.ActiveWindowFocusReason) event.accept() - self.close() \ No newline at end of file + self.close()
--- a/QScintilla/Shell.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Shell.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,14 +27,15 @@ from .ShellHistoryDialog import ShellHistoryDialog + class Shell(QsciScintillaCompat): """ Class implementing a graphical Python shell. - A user can enter commands that are executed in the remote - Python interpreter. + A user can enter commands that are executed in the remote + Python interpreter. """ - def __init__(self, dbs, vm, parent = None): + def __init__(self, dbs, vm, parent=None): """ Constructor @@ -138,7 +139,7 @@ # Create a little language context menu self.lmenu = QMenu(self.trUtf8('Start')) - self.clientLanguages = self.dbs.getSupportedLanguages(shellOnly = True) + self.clientLanguages = self.dbs.getSupportedLanguages(shellOnly=True) self.clientLanguages.sort() for language in self.clientLanguages: act = self.lmenu.addAction(language) @@ -181,46 +182,46 @@ self.incrementalSearchActive = False self.supportedEditorCommands = { - QsciScintilla.SCI_LINEDELETE : self.__clearCurrentLine, - QsciScintilla.SCI_TAB : self.__QScintillaTab, - QsciScintilla.SCI_NEWLINE : self.__QScintillaNewline, + QsciScintilla.SCI_LINEDELETE: self.__clearCurrentLine, + QsciScintilla.SCI_TAB: self.__QScintillaTab, + QsciScintilla.SCI_NEWLINE: self.__QScintillaNewline, - QsciScintilla.SCI_DELETEBACK : self.__QScintillaDeleteBack, - QsciScintilla.SCI_CLEAR : self.__QScintillaDelete, - QsciScintilla.SCI_DELWORDLEFT : self.__QScintillaDeleteWordLeft, - QsciScintilla.SCI_DELWORDRIGHT : self.__QScintillaDeleteWordRight, - QsciScintilla.SCI_DELLINELEFT : self.__QScintillaDeleteLineLeft, - QsciScintilla.SCI_DELLINERIGHT : self.__QScintillaDeleteLineRight, + QsciScintilla.SCI_DELETEBACK: self.__QScintillaDeleteBack, + QsciScintilla.SCI_CLEAR: self.__QScintillaDelete, + QsciScintilla.SCI_DELWORDLEFT: self.__QScintillaDeleteWordLeft, + QsciScintilla.SCI_DELWORDRIGHT: self.__QScintillaDeleteWordRight, + QsciScintilla.SCI_DELLINELEFT: self.__QScintillaDeleteLineLeft, + QsciScintilla.SCI_DELLINERIGHT: self.__QScintillaDeleteLineRight, - QsciScintilla.SCI_CHARLEFT : self.__QScintillaCharLeft, - QsciScintilla.SCI_CHARRIGHT : self.__QScintillaCharRight, - QsciScintilla.SCI_WORDLEFT : self.__QScintillaWordLeft, - QsciScintilla.SCI_WORDRIGHT : self.__QScintillaWordRight, - QsciScintilla.SCI_VCHOME : self.__QScintillaVCHome, - QsciScintilla.SCI_LINEEND : self.__QScintillaLineEnd, - QsciScintilla.SCI_LINEUP : self.__QScintillaLineUp, - QsciScintilla.SCI_LINEDOWN : self.__QScintillaLineDown, + QsciScintilla.SCI_CHARLEFT: self.__QScintillaCharLeft, + QsciScintilla.SCI_CHARRIGHT: self.__QScintillaCharRight, + QsciScintilla.SCI_WORDLEFT: self.__QScintillaWordLeft, + QsciScintilla.SCI_WORDRIGHT: self.__QScintillaWordRight, + QsciScintilla.SCI_VCHOME: self.__QScintillaVCHome, + QsciScintilla.SCI_LINEEND: self.__QScintillaLineEnd, + QsciScintilla.SCI_LINEUP: self.__QScintillaLineUp, + QsciScintilla.SCI_LINEDOWN: self.__QScintillaLineDown, - QsciScintilla.SCI_PAGEUP : self.__QScintillaAutoCompletionCommand, - QsciScintilla.SCI_PAGEDOWN : self.__QScintillaAutoCompletionCommand, - QsciScintilla.SCI_CANCEL : self.__QScintillaAutoCompletionCommand, + QsciScintilla.SCI_PAGEUP: self.__QScintillaAutoCompletionCommand, + QsciScintilla.SCI_PAGEDOWN: self.__QScintillaAutoCompletionCommand, + QsciScintilla.SCI_CANCEL: self.__QScintillaAutoCompletionCommand, - QsciScintilla.SCI_CHARLEFTEXTEND : self.__QScintillaCharLeftExtend, - QsciScintilla.SCI_CHARRIGHTEXTEND : self.extendSelectionRight, - QsciScintilla.SCI_WORDLEFTEXTEND : self.__QScintillaWordLeftExtend, - QsciScintilla.SCI_WORDRIGHTEXTEND : self.extendSelectionWordRight, - QsciScintilla.SCI_VCHOMEEXTEND : self.__QScintillaVCHomeExtend, - QsciScintilla.SCI_LINEENDEXTEND : self.extendSelectionToEOL, + QsciScintilla.SCI_CHARLEFTEXTEND: self.__QScintillaCharLeftExtend, + QsciScintilla.SCI_CHARRIGHTEXTEND: self.extendSelectionRight, + QsciScintilla.SCI_WORDLEFTEXTEND: self.__QScintillaWordLeftExtend, + QsciScintilla.SCI_WORDRIGHTEXTEND: self.extendSelectionWordRight, + QsciScintilla.SCI_VCHOMEEXTEND: self.__QScintillaVCHomeExtend, + QsciScintilla.SCI_LINEENDEXTEND: self.extendSelectionToEOL, } def closeShell(self): """ - Public method to shutdown the shell. + Public method to shutdown the shell. """ for key in list(self.historyLists.keys()): self.saveHistory(key) - def __bindLexer(self, language = 'Python3'): + def __bindLexer(self, language='Python3'): """ Private slot to set the lexer. @@ -355,7 +356,7 @@ self.useMonospaced = on - def __setAutoCompletion(self, language = 'Python'): + def __setAutoCompletion(self, language='Python'): """ Private method to configure the autocompletion function. @@ -367,7 +368,7 @@ self.racEnabled = Preferences.getShell("AutoCompletionEnabled") - def __setCallTips(self, language = 'Python'): + def __setCallTips(self, language='Python'): """ Private method to configure the calltips function. @@ -518,7 +519,7 @@ debug client side. """ if self.passive: - self.__writeBanner('','','') + self.__writeBanner('', '', '') else: self.dbs.remoteBanner() @@ -620,7 +621,7 @@ self.echoInput = echo self.__write(s) line, col = self.__getEndPos() - self.setCursorPosition(line,col) + self.setCursorPosition(line, col) self.prompt = self.text(line)\ .replace(sys.ps1, "").replace(sys.ps2, "") # move cursor to end of line @@ -660,7 +661,7 @@ self.__insertTextAtEnd(line) if fullline: self.__executeCommand(cmd) - if self.interruptCommandExecution: + if self.interruptCommandExecution: self.__executeCommand("") break @@ -777,7 +778,7 @@ elif self.__isCursorOnLastLine(): line, index = self.getCursorPosition() buf = self.text(line).replace(sys.ps1, "").replace(sys.ps2, "") - if self.inContinue and not buf[:index-len(sys.ps2)].strip(): + if self.inContinue and not buf[:index - len(sys.ps2)].strip(): self.SendScintilla(cmd) elif self.racEnabled: self.dbs.remoteCompletion(buf) @@ -872,12 +873,12 @@ self.incrementalSearchString = "" self.incrementalSearchActive = False line, col = self.__getEndPos() - self.setCursorPosition(line,col) + self.setCursorPosition(line, col) buf = self.text(line).replace(sys.ps1, "").replace(sys.ps2, "") self.insert('\n') self.__executeCommand(buf) - def __QScintillaLeftCommand(self, method, allLinesAllowed = False): + def __QScintillaLeftCommand(self, method, allLinesAllowed=False): """ Private method to handle a QScintilla command working to the left. @@ -983,7 +984,7 @@ buf = self.text(line).replace(sys.ps1, "").replace(sys.ps2, "") if buf and self.incrementalSearchActive: if self.incrementalSearchString: - idx = self.__rsearchHistory(self.incrementalSearchString, + idx = self.__rsearchHistory(self.incrementalSearchString, self.histidx) if idx >= 0: self.histidx = idx @@ -1087,7 +1088,7 @@ if not self.passive: cmdList = cmd.split(None, 1) if len(cmdList) < 2: - self.dbs.startClient(False) # same as reset + self.dbs.startClient(False) # same as reset else: language = cmdList[1] if not language in self.clientLanguages: @@ -1156,13 +1157,13 @@ @param cmd history entry to be inserted (string) """ - self.setCursorPosition(self.prline,self.prcol) - self.setSelection(self.prline,self.prcol,\ - self.prline,self.lineLength(self.prline)) + self.setCursorPosition(self.prline, self.prcol) + self.setSelection(self.prline, self.prcol,\ + self.prline, self.lineLength(self.prline)) self.removeSelectedText() self.__insertText(cmd) - def __searchHistory(self, txt, startIdx = -1): + def __searchHistory(self, txt, startIdx=-1): """ Private method used to search the history. @@ -1179,7 +1180,7 @@ idx += 1 return idx - def __rsearchHistory(self, txt, startIdx = -1): + def __rsearchHistory(self, txt, startIdx=-1): """ Private method used to reverse search the history. @@ -1209,9 +1210,9 @@ if next and self.inContinue: return False - return QsciScintillaCompat.focusNextPrevChild(self,next) + return QsciScintillaCompat.focusNextPrevChild(self, next) - def contextMenuEvent(self,ev): + def contextMenuEvent(self, ev): """ Reimplemented to show our own context menu. @@ -1434,7 +1435,7 @@ self.insertAt(txt, line, col) if re.search(self.linesepRegExp, txt) is not None: line += 1 - self.setCursorPosition(line, col + l) + self.setCursorPosition(line, col + l) def __configure(self): """
--- a/QScintilla/ShellHistoryDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/ShellHistoryDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from .Ui_ShellHistoryDialog import Ui_ShellHistoryDialog + class ShellHistoryDialog(QDialog, Ui_ShellHistoryDialog): """ Class implementing the shell history dialog. @@ -30,7 +31,7 @@ self.setupUi(self) self.historyList.addItems(history) - self.historyList.setCurrentRow(self.historyList.count() - 1, + self.historyList.setCurrentRow(self.historyList.count() - 1, QItemSelectionModel.Clear) self.historyList.scrollToItem(self.historyList.currentItem()) @@ -111,7 +112,7 @@ history = self.shell.getHistory(None) self.historyList.clear() self.historyList.addItems(history) - self.historyList.setCurrentRow(self.historyList.count() - 1, + self.historyList.setCurrentRow(self.historyList.count() - 1, QItemSelectionModel.Clear) self.historyList.scrollToItem(self.historyList.currentItem())
--- a/QScintilla/SpellChecker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/SpellChecker.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ import Preferences import Utilities + class SpellChecker(QObject): """ Class implementing a pyenchant based spell checker. @@ -29,7 +30,7 @@ _spelling_lang = None _spelling_dict = None - def __init__(self, editor, indicator, defaultLanguage = None, checkRegion = None): + def __init__(self, editor, indicator, defaultLanguage=None, checkRegion=None): """ Constructor @@ -83,7 +84,7 @@ return False @classmethod - def _getDict(cls, lang, pwl = "", pel = ""): + def _getDict(cls, lang, pwl="", pel=""): """ Protected classmethod to get a new dictionary. @@ -128,7 +129,7 @@ cls._spelling_lang = language cls._spelling_dict = cls._getDict(language) - def setLanguage(self, language, pwl = "", pel = ""): + def setLanguage(self, language, pwl="", pel=""): """ Public method to set the current language. @@ -138,8 +139,8 @@ @keyparam pel name of the personal/project exclude list (string) """ self._spelling_lang = language - self._spelling_dict = self._getDict(language, pwl = pwl, - pel = pel) + self._spelling_dict = self._getDict(language, pwl=pwl, + pel=pel) def getLanguage(self): """ @@ -163,7 +164,7 @@ @param pos position to start word extraction (integer) @param endPosition position to stop word extraction (integer) - @return tuple of three values (the extracted word (string), + @return tuple of three values (the extracted word (string), start position (integer), end position (integer)) """ if pos < 0 or pos >= endPosition: @@ -175,7 +176,7 @@ pos = self.editor.positionAfter(pos) ch = self.editor.charAt(pos) if pos == endPosition: - return "", -1, -1 + return "", -1, -1 startPos = pos # 2. extract the word @@ -249,7 +250,7 @@ while True: try: next(self) - self.editor.setIndicatorRange(self.indicator, self.wordStart, + self.editor.setIndicatorRange(self.indicator, self.wordStart, self.wordEnd - self.wordStart) except StopIteration: break @@ -269,7 +270,7 @@ else: QTimer.singleShot(0, self.__incrementalCheck) - def checkWord(self, pos, atEnd = False): + def checkWord(self, pos, atEnd=False): """ Public method to check the word at position pos. @@ -296,13 +297,13 @@ for pos in [pos0, pos1]: if self.editor.charAt(pos).isalnum(): line, index = self.editor.lineIndexFromPosition(pos) - word = self.editor.getWord(line, index, useWordChars = False) + word = self.editor.getWord(line, index, useWordChars=False) if len(word) >= self.minimumWordSize: ok = spell.check(word) else: ok = True start, end = \ - self.editor.getWordBoundaries(line, index, useWordChars = False) + self.editor.getWordBoundaries(line, index, useWordChars=False) if ok: self.editor.clearIndicator(self.indicator, line, start, line, end) else: @@ -355,7 +356,7 @@ selStartLine, selStartIndex, selEndLine, selEndIndex = \ self.editor.getSelection() self.__checkDocumentPart( - self.editor.positionFromLineIndex(selStartLine, selStartIndex), + self.editor.positionFromLineIndex(selStartLine, selStartIndex), self.editor.positionFromLineIndex(selEndLine, selEndIndex) ) @@ -387,7 +388,7 @@ return [] - def add(self, word = None): + def add(self, word=None): """ Public method to add a word to the personal word list. @@ -409,7 +410,7 @@ if spell: spell.remove(word) - def ignoreAlways(self, word = None): + def ignoreAlways(self, word=None): """ Public method to tell the checker, to always ignore the given word or the current word. @@ -423,7 +424,7 @@ def replace(self, replacement): """ - Public method to tell the checker to replace the current word with + Public method to tell the checker to replace the current word with the replacement string. @param replacement replacement string (string)
--- a/QScintilla/SpellCheckingDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/SpellCheckingDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,11 +14,12 @@ import Utilities + class SpellCheckingDialog(QDialog, Ui_SpellCheckingDialog): """ Class implementing the spell checking dialog. """ - def __init__(self, spellChecker, startPos, endPos, parent = None): + def __init__(self, spellChecker, startPos, endPos, parent=None): """ Constructor """ @@ -60,8 +61,8 @@ lcontext, rcontext = self.__spell.getContext(self.wordStart, self.wordEnd) self.changeEdit.setText(self.word) self.contextLabel.setText('{0}<font color="#FF0000">{1}</font>{2}'.format( - Utilities.html_encode(lcontext), - self.word, + Utilities.html_encode(lcontext), + self.word, Utilities.html_encode(rcontext))) suggestions = self.__spell.getSuggestions(self.word) self.suggestionsList.clear()
--- a/QScintilla/Terminal.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/Terminal.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,13 +27,14 @@ from .ShellHistoryDialog import ShellHistoryDialog + class Terminal(QsciScintillaCompat): """ Class implementing a simple terminal based on QScintilla. - A user can enter commands that are executed by a shell process. + A user can enter commands that are executed by a shell process. """ - def __init__(self, vm, parent = None): + def __init__(self, vm, parent=None): """ Constructor @@ -128,31 +129,31 @@ self.incrementalSearchActive = False self.supportedEditorCommands = { - QsciScintilla.SCI_LINEDELETE : self.__clearCurrentLine, - QsciScintilla.SCI_NEWLINE : self.__QScintillaNewline, + QsciScintilla.SCI_LINEDELETE: self.__clearCurrentLine, + QsciScintilla.SCI_NEWLINE: self.__QScintillaNewline, - QsciScintilla.SCI_DELETEBACK : self.__QScintillaDeleteBack, - QsciScintilla.SCI_CLEAR : self.__QScintillaDelete, - QsciScintilla.SCI_DELWORDLEFT : self.__QScintillaDeleteWordLeft, - QsciScintilla.SCI_DELWORDRIGHT : self.__QScintillaDeleteWordRight, - QsciScintilla.SCI_DELLINELEFT : self.__QScintillaDeleteLineLeft, - QsciScintilla.SCI_DELLINERIGHT : self.__QScintillaDeleteLineRight, + QsciScintilla.SCI_DELETEBACK: self.__QScintillaDeleteBack, + QsciScintilla.SCI_CLEAR: self.__QScintillaDelete, + QsciScintilla.SCI_DELWORDLEFT: self.__QScintillaDeleteWordLeft, + QsciScintilla.SCI_DELWORDRIGHT: self.__QScintillaDeleteWordRight, + QsciScintilla.SCI_DELLINELEFT: self.__QScintillaDeleteLineLeft, + QsciScintilla.SCI_DELLINERIGHT: self.__QScintillaDeleteLineRight, - QsciScintilla.SCI_CHARLEFT : self.__QScintillaCharLeft, - QsciScintilla.SCI_CHARRIGHT : self.__QScintillaCharRight, - QsciScintilla.SCI_WORDLEFT : self.__QScintillaWordLeft, - QsciScintilla.SCI_WORDRIGHT : self.__QScintillaWordRight, - QsciScintilla.SCI_VCHOME : self.__QScintillaVCHome, - QsciScintilla.SCI_LINEEND : self.__QScintillaLineEnd, - QsciScintilla.SCI_LINEUP : self.__QScintillaLineUp, - QsciScintilla.SCI_LINEDOWN : self.__QScintillaLineDown, + QsciScintilla.SCI_CHARLEFT: self.__QScintillaCharLeft, + QsciScintilla.SCI_CHARRIGHT: self.__QScintillaCharRight, + QsciScintilla.SCI_WORDLEFT: self.__QScintillaWordLeft, + QsciScintilla.SCI_WORDRIGHT: self.__QScintillaWordRight, + QsciScintilla.SCI_VCHOME: self.__QScintillaVCHome, + QsciScintilla.SCI_LINEEND: self.__QScintillaLineEnd, + QsciScintilla.SCI_LINEUP: self.__QScintillaLineUp, + QsciScintilla.SCI_LINEDOWN: self.__QScintillaLineDown, - QsciScintilla.SCI_CHARLEFTEXTEND : self.__QScintillaCharLeftExtend, - QsciScintilla.SCI_CHARRIGHTEXTEND : self.extendSelectionRight, - QsciScintilla.SCI_WORDLEFTEXTEND : self.__QScintillaWordLeftExtend, - QsciScintilla.SCI_WORDRIGHTEXTEND : self.extendSelectionWordRight, - QsciScintilla.SCI_VCHOMEEXTEND : self.__QScintillaVCHomeExtend, - QsciScintilla.SCI_LINEENDEXTEND : self.extendSelectionToEOL, + QsciScintilla.SCI_CHARLEFTEXTEND: self.__QScintillaCharLeftExtend, + QsciScintilla.SCI_CHARRIGHTEXTEND: self.extendSelectionRight, + QsciScintilla.SCI_WORDLEFTEXTEND: self.__QScintillaWordLeftExtend, + QsciScintilla.SCI_WORDRIGHTEXTEND: self.extendSelectionWordRight, + QsciScintilla.SCI_VCHOMEEXTEND: self.__QScintillaVCHomeExtend, + QsciScintilla.SCI_LINEENDEXTEND: self.extendSelectionToEOL, } self.__ioEncoding = Preferences.getSystem("IOEncoding") @@ -177,7 +178,7 @@ """ Private method to process the output of the shell. """ - output = str(self.__process.readAllStandardOutput(), + output = str(self.__process.readAllStandardOutput(), self.__ioEncoding, 'replace') self.__write(self.ansi_re.sub("", output)) self.__lastPos = self.__getEndPos() @@ -225,7 +226,7 @@ def closeTerminal(self): """ - Public method to shutdown the terminal. + Public method to shutdown the terminal. """ self.__stopShell() self.saveHistory() @@ -588,7 +589,7 @@ self.insert('\n') self.__executeCommand(buf) - def __QScintillaLeftCommand(self, method, allLinesAllowed = False): + def __QScintillaLeftCommand(self, method, allLinesAllowed=False): """ Private method to handle a QScintilla command working to the left. @@ -670,7 +671,7 @@ buf = self.text(line)[self.__lastPos[1]:] if buf and self.incrementalSearchActive: if self.incrementalSearchString: - idx = self.__rsearchHistory(self.incrementalSearchString, + idx = self.__rsearchHistory(self.incrementalSearchString, self.histidx) if idx >= 0: self.histidx = idx @@ -782,7 +783,7 @@ self.removeSelectedText() self.__insertText(cmd) - def __searchHistory(self, txt, startIdx = -1): + def __searchHistory(self, txt, startIdx=-1): """ Private method used to search the history. @@ -799,7 +800,7 @@ idx += 1 return idx - def __rsearchHistory(self, txt, startIdx = -1): + def __rsearchHistory(self, txt, startIdx=-1): """ Private method used to reverse search the history. @@ -816,7 +817,7 @@ idx -= 1 return idx - def contextMenuEvent(self,ev): + def contextMenuEvent(self, ev): """ Reimplemented to show our own context menu. @@ -934,7 +935,7 @@ self.insertAt(txt, line, col) if re.search(self.linesepRegExp, txt) is not None: line += 1 - self.setCursorPosition(line, col + l) + self.setCursorPosition(line, col + l) def __configure(self): """
--- a/QScintilla/TypingCompleters/CompleterBase.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/TypingCompleters/CompleterBase.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,11 +13,12 @@ from PyQt4.QtCore import QObject + class CompleterBase(QObject): """ Class implementing the base class for all completers. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor
--- a/QScintilla/TypingCompleters/CompleterPython.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/TypingCompleters/CompleterPython.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import Preferences + class CompleterPython(CompleterBase): """ Class implementing typing completer for Python. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -77,9 +78,9 @@ Preferences.getEditorTyping("Python/InsertSelf") self.__insertBlank = \ Preferences.getEditorTyping("Python/InsertBlank") - self.__colonDetection= \ + self.__colonDetection = \ Preferences.getEditorTyping("Python/ColonDetection") - self.__dedentDef= \ + self.__dedentDef = \ Preferences.getEditorTyping("Python/DedentDef") def charAdded(self, charNumber): @@ -265,7 +266,7 @@ def __dedentExceptToTry(self, hasColon): """ - Private method to dedent the line of the except statement to the last + Private method to dedent the line of the except statement to the last try statement with less (or equal) indentation. @param hasColon flag indicating the except type (boolean) @@ -288,7 +289,7 @@ def __dedentFinallyToTry(self): """ - Private method to dedent the line of the except statement to the last + Private method to dedent the line of the except statement to the last try statement with less (or equal) indentation. """ line, col = self.editor.getCursorPosition() @@ -366,7 +367,7 @@ def __isClassmethodDef(self): """ - Private method to check, if the user is defing a classmethod + Private method to check, if the user is defing a classmethod (@classmethod) method. @return flag indicating the definition of a classmethod method (boolean) @@ -400,7 +401,7 @@ """ Private method to check, if the cursor is within a double quoted string. - @return flag indicating, if the cursor is inside a double + @return flag indicating, if the cursor is inside a double quoted string (boolean) """ return self.editor.currentStyle() == QsciLexerPython.DoubleQuotedString @@ -409,7 +410,7 @@ """ Private method to check, if the cursor is within a triple double quoted string. - @return flag indicating, if the cursor is inside a triple double + @return flag indicating, if the cursor is inside a triple double quoted string (boolean) """ return self.editor.currentStyle() == QsciLexerPython.TripleDoubleQuotedString @@ -418,7 +419,7 @@ """ Private method to check, if the cursor is within a single quoted string. - @return flag indicating, if the cursor is inside a single + @return flag indicating, if the cursor is inside a single quoted string (boolean) """ return self.editor.currentStyle() == QsciLexerPython.SingleQuotedString @@ -427,7 +428,7 @@ """ Private method to check, if the cursor is within a triple single quoted string. - @return flag indicating, if the cursor is inside a triple single + @return flag indicating, if the cursor is inside a triple single quoted string (boolean) """ return self.editor.currentStyle() == QsciLexerPython.TripleSingleQuotedString
--- a/QScintilla/TypingCompleters/CompleterRuby.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/TypingCompleters/CompleterRuby.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import Preferences + class CompleterRuby(CompleterBase): """ Class implementing typing completer for Ruby. """ - def __init__(self, editor, parent = None): + def __init__(self, editor, parent=None): """ Constructor @@ -175,7 +176,7 @@ """ Private method to check, if the cursor is within a double quoted string. - @return flag indicating, if the cursor is inside a double + @return flag indicating, if the cursor is inside a double quoted string (boolean) """ return self.editor.currentStyle() == QsciLexerRuby.DoubleQuotedString @@ -184,7 +185,7 @@ """ Private method to check, if the cursor is within a single quoted string. - @return flag indicating, if the cursor is inside a single + @return flag indicating, if the cursor is inside a single quoted string (boolean) """ return self.editor.currentStyle() == QsciLexerRuby.SingleQuotedString
--- a/QScintilla/TypingCompleters/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/TypingCompleters/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,7 +7,8 @@ Package implementing lexers for the various supported programming languages. """ -def getCompleter(language, editor, parent = None): + +def getCompleter(language, editor, parent=None): """ Module function to instantiate a lexer object for a given language.
--- a/QScintilla/ZoomDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/ZoomDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_ZoomDialog import Ui_ZoomDialog + class ZoomDialog(QDialog, Ui_ZoomDialog): """ Class implementing a dialog to select the zoom scale. """ - def __init__(self, zoom, parent, name = None, modal = False): + def __init__(self, zoom, parent, name=None, modal=False): """ Constructor
--- a/QScintilla/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/QScintilla/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,4 +14,4 @@ The shell component is derived from the editor component and is the visible component of the interactive language shell. It interacts with the debug client through the debug server. -""" \ No newline at end of file +"""
--- a/SqlBrowser/SqlBrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/SqlBrowser/SqlBrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,11 +19,12 @@ import UI.PixmapCache import UI.Config + class SqlBrowser(QMainWindow): """ Class implementing the SQL Browser main window. """ - def __init__(self, connections = [], parent = None): + def __init__(self, connections=[], parent=None): """ Constructor @@ -55,8 +56,8 @@ self.__warnings.append(self.trUtf8("Invalid URL: {0}").format(connection)) continue - err = self.__browser.addConnection(url.scheme(), url.path(), - url.userName(), url.password(), + err = self.__browser.addConnection(url.scheme(), url.path(), + url.userName(), url.password(), url.host(), url.port(-1)) if err.type() != QSqlError.NoError: self.__warnings.append( @@ -83,9 +84,9 @@ # list of all actions self.__actions = [] - self.addConnectionAct = E5Action(self.trUtf8('Add Connection'), + self.addConnectionAct = E5Action(self.trUtf8('Add Connection'), UI.PixmapCache.getIcon("databaseConnection.png"), - self.trUtf8('Add &Connection...'), + self.trUtf8('Add &Connection...'), 0, 0, self, 'sql_file_add_connection') self.addConnectionAct.setStatusTip(self.trUtf8( 'Open a dialog to add a new database connection')) @@ -96,10 +97,10 @@ self.addConnectionAct.triggered[()].connect(self.__browser.addConnectionByDialog) self.__actions.append(self.addConnectionAct) - self.exitAct = E5Action(self.trUtf8('Quit'), + self.exitAct = E5Action(self.trUtf8('Quit'), UI.PixmapCache.getIcon("exit.png"), - self.trUtf8('&Quit'), - QKeySequence(self.trUtf8("Ctrl+Q","File|Quit")), + self.trUtf8('&Quit'), + QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit")), 0, self, 'sql_file_quit') self.exitAct.setStatusTip(self.trUtf8('Quit the SQL browser')) self.exitAct.setWhatsThis(self.trUtf8( @@ -108,8 +109,8 @@ )) self.exitAct.triggered[()].connect(qApp.closeAllWindows) - self.aboutAct = E5Action(self.trUtf8('About'), - self.trUtf8('&About'), + self.aboutAct = E5Action(self.trUtf8('About'), + self.trUtf8('&About'), 0, 0, self, 'sql_help_about') self.aboutAct.setStatusTip(self.trUtf8('Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( @@ -119,8 +120,8 @@ self.aboutAct.triggered[()].connect(self.__about) self.__actions.append(self.aboutAct) - self.aboutQtAct = E5Action(self.trUtf8('About Qt'), - self.trUtf8('About &Qt'), + self.aboutQtAct = E5Action(self.trUtf8('About Qt'), + self.trUtf8('About &Qt'), 0, 0, self, 'sql_help_about_qt') self.aboutQtAct.setStatusTip( self.trUtf8('Display information about the Qt toolkit'))
--- a/SqlBrowser/SqlBrowserWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/SqlBrowser/SqlBrowserWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,6 +16,7 @@ from .SqlConnectionDialog import SqlConnectionDialog from .Ui_SqlBrowserWidget import Ui_SqlBrowserWidget + class SqlBrowserWidget(QWidget, Ui_SqlBrowserWidget): """ Class implementing the SQL Browser widget. @@ -26,7 +27,7 @@ cCount = 0 - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -124,7 +125,7 @@ err = QSqlError() self.__class__.cCount += 1 - db = QSqlDatabase.addDatabase(driver.upper(), + db = QSqlDatabase.addDatabase(driver.upper(), "Browser{0:d}".format(self.__class__.cCount)) db.setDatabaseName(dbName) db.setHostName(host) @@ -198,11 +199,11 @@ fld = rec.field(i) model.setData(model.index(i, 0), fld.name()) if fld.typeID() == -1: - model.setData(model.index(i, 1), + model.setData(model.index(i, 1), QVariant.typeToName(fld.type())) else: model.setData(model.index(i, 1), "{0} ({1})".format( - QVariant.typeToName(fld.type()), + QVariant.typeToName(fld.type()), fld.typeID())) if fld.length() < 0: model.setData(model.index(i, 2), "?") @@ -295,4 +296,4 @@ self.table.resizeColumnsToContents() - self.updateActions() \ No newline at end of file + self.updateActions()
--- a/SqlBrowser/SqlConnectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/SqlBrowser/SqlConnectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -18,11 +18,12 @@ import Utilities + class SqlConnectionDialog(QDialog, Ui_SqlConnectionDialog): """ Class implementing a dialog to enter the connection parameters. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor """ @@ -106,10 +107,10 @@ and the port (integer) """ return ( - self.driverCombo.currentText(), - self.databaseEdit.text(), - self.usernameEdit.text(), - self.passwordEdit.text(), - self.hostnameEdit.text(), - self.portSpinBox.value(), + self.driverCombo.currentText(), + self.databaseEdit.text(), + self.usernameEdit.text(), + self.passwordEdit.text(), + self.hostnameEdit.text(), + self.portSpinBox.value(), )
--- a/SqlBrowser/SqlConnectionWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/SqlBrowser/SqlConnectionWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ from PyQt4.QtGui import * from PyQt4.QtSql import QSqlDatabase + class SqlConnectionWidget(QWidget): """ Class implementing a widget showing the SQL connections. @@ -23,7 +24,7 @@ schemaRequested = pyqtSignal(str) cleared = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Tasks/TaskFilterConfigDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tasks/TaskFilterConfigDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,7 +17,7 @@ """ Class implementing the task filter configuration dialog. """ - def __init__(self, taskFilter, parent = None): + def __init__(self, taskFilter, parent=None): """ Constructor
--- a/Tasks/TaskPropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tasks/TaskPropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,7 +21,7 @@ """ Class implementing the task properties dialog. """ - def __init__(self, task = None, parent = None, projectOpen = False): + def __init__(self, task=None, parent=None, projectOpen=False): """ Constructor @@ -39,7 +39,7 @@ if task is not None: self.descriptionEdit.setText(task.description) self.longtextEdit.setText(task.longtext) - self.creationLabel.setText(time.strftime("%Y-%m-%d, %H:%M:%S", + self.creationLabel.setText(time.strftime("%Y-%m-%d, %H:%M:%S", time.localtime(task.created))) self.priorityCombo.setCurrentIndex(task.priority) self.projectCheckBox.setChecked(task._isProjectTask) @@ -66,5 +66,5 @@ project flag and long text (string, string, boolean, boolean, string) """ return (self.descriptionEdit.text(), self.priorityCombo.currentIndex(), - self.completedCheckBox.isChecked(), self.projectCheckBox.isChecked(), - self.longtextEdit.toPlainText()) \ No newline at end of file + self.completedCheckBox.isChecked(), self.projectCheckBox.isChecked(), + self.longtextEdit.toPlainText())
--- a/Tasks/TaskViewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tasks/TaskViewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,13 +28,14 @@ import Preferences import Utilities + class Task(QTreeWidgetItem): """ Class implementing the task data structure. """ - def __init__(self, description, priority = 1, filename = "", lineno = 0, - completed = False, _time = 0, isProjectTask = False, - isBugfixTask = False, project = None, longtext = ""): + def __init__(self, description, priority=1, filename="", lineno=0, + completed=False, _time=0, isProjectTask=False, + isBugfixTask=False, project=None, longtext=""): """ Constructor @@ -54,7 +55,7 @@ self.description = description self.longtext = longtext if priority in [0, 1, 2]: - self.priority = priority + self.priority = priority else: self.priority = 1 self.filename = filename @@ -68,7 +69,7 @@ if isProjectTask: self.filename = self.project.getRelativePath(self.filename) - QTreeWidgetItem.__init__(self, ["", "", self.description, self.filename, + QTreeWidgetItem.__init__(self, ["", "", self.description, self.filename, (self.lineno and "{0:6d}".format(self.lineno) or "")]) if self.completed: @@ -126,7 +127,7 @@ @param priority priority of the task (0=high, 1=normal, 2=low) """ if priority in [0, 1, 2]: - self.priority = priority + self.priority = priority else: self.priority = 1 @@ -195,6 +196,7 @@ """ return self._isProjectTask + class TaskFilter(object): """ Class implementing a filter for tasks. @@ -224,7 +226,7 @@ """ Public method to set the description filter. - @param filter a regular expression for the description filter + @param filter a regular expression for the description filter to set (string) or None """ if not filter: @@ -236,7 +238,7 @@ """ Public method to set the filename filter. - @param filter a wildcard expression for the filename filter + @param filter a wildcard expression for the filename filter to set (string) or None """ if not filter: @@ -326,6 +328,7 @@ return True + class TaskViewer(QTreeWidget): """ Class implementing the task viewer. @@ -347,7 +350,7 @@ self.setItemsExpandable(False) self.setSortingEnabled(True) - self.__headerItem = QTreeWidgetItem(["", "", self.trUtf8("Summary"), + self.__headerItem = QTreeWidgetItem(["", "", self.trUtf8("Summary"), self.trUtf8("Filename"), self.trUtf8("Line"), ""]) self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png")) self.__headerItem.setIcon(1, UI.PixmapCache.getIcon("taskPriority.png")) @@ -384,11 +387,11 @@ self.__menu.addSeparator() self.__menu.addAction(self.trUtf8("P&roperties..."), self.__editTaskProperties) self.__menu.addSeparator() - self.__menuFilteredAct = self.__menu.addAction(self.trUtf8("&Filtered display")) + self.__menuFilteredAct = self.__menu.addAction(self.trUtf8("&Filtered display")) self.__menuFilteredAct.setCheckable(True) self.__menuFilteredAct.setChecked(False) self.__menuFilteredAct.triggered[bool].connect(self.__activateFilter) - self.__menu.addAction(self.trUtf8("Filter c&onfiguration..."), + self.__menu.addAction(self.trUtf8("Filter c&onfiguration..."), self.__configureFilter) self.__menu.addSeparator() self.__menu.addAction(self.trUtf8("Resi&ze columns"), self.__resizeColumns) @@ -402,18 +405,18 @@ self.__backMenu.addAction(self.trUtf8("&Regenerate project tasks"), self.__regenerateProjectTasks) self.__backMenu.addSeparator() - self.backPasteItem = self.__backMenu.addAction(self.trUtf8("&Paste"), + self.backPasteItem = self.__backMenu.addAction(self.trUtf8("&Paste"), self.__pasteTask) self.__backMenu.addSeparator() self.__backMenu.addAction(self.trUtf8("Delete Completed &Tasks"), self.__deleteCompleted) self.__backMenu.addSeparator() self.__backMenuFilteredAct = \ - self.__backMenu.addAction(self.trUtf8("&Filtered display")) + self.__backMenu.addAction(self.trUtf8("&Filtered display")) self.__backMenuFilteredAct.setCheckable(True) self.__backMenuFilteredAct.setChecked(False) self.__backMenuFilteredAct.triggered[bool].connect(self.__activateFilter) - self.__backMenu.addAction(self.trUtf8("Filter c&onfiguration..."), + self.__backMenu.addAction(self.trUtf8("Filter c&onfiguration..."), self.__configureFilter) self.__backMenu.addSeparator() self.__backMenu.addAction(self.trUtf8("Resi&ze columns"), self.__resizeColumns) @@ -458,7 +461,7 @@ def __taskItemActivated(self, itm, col): """ - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. @param itm reference to the activated item (QTreeWidgetItem) @param col column the item was activated in (integer) @@ -503,7 +506,7 @@ self.__menu.popup(coord) - def setProjectOpen(self, o = False): + def setProjectOpen(self, o=False): """ Public slot to set the project status. @@ -511,9 +514,9 @@ """ self.projectOpen = o - def addTask(self, description, priority = 1, filename = "", lineno = 0, - completed = False, _time = 0, isProjectTask = False, - isBugfixTask = False, longtext = ""): + def addTask(self, description, priority=1, filename="", lineno=0, + completed=False, _time=0, isProjectTask=False, + isBugfixTask=False, longtext=""): """ Public slot to add a task. @@ -523,13 +526,13 @@ @param lineno line number containing the task (integer) @param completed flag indicating completion status (boolean) @param _time creation time of the task (float, if 0 use current time) - @param isProjectTask flag indicating a task related to the current + @param isProjectTask flag indicating a task related to the current project (boolean) @param isBugfixTask flag indicating a bugfix task (boolean) @param longtext explanatory text of the task (string) """ - task = Task(description, priority, filename, lineno, completed, - _time, isProjectTask, isBugfixTask, + task = Task(description, priority, filename, lineno, completed, + _time, isProjectTask, isBugfixTask, self.project, longtext) self.tasks.append(task) if self.taskFilter.showTask(task): @@ -537,8 +540,8 @@ self.__resort() self.__resizeColumns() - def addFileTask(self, description, filename, lineno, isBugfixTask = False, - longtext = ""): + def addFileTask(self, description, filename, lineno, isBugfixTask=False, + longtext=""): """ Public slot to add a file related task. @@ -548,10 +551,10 @@ @param isBugfixTask flag indicating a bugfix task (boolean) @param longtext explanatory text of the task (string) """ - self.addTask(description, filename = filename, lineno = lineno, - isProjectTask = \ - self.project and self.project.isProjectSource(filename), - isBugfixTask = isBugfixTask, longtext = longtext) + self.addTask(description, filename=filename, lineno=lineno, + isProjectTask=( + self.project and self.project.isProjectSource(filename)), + isBugfixTask=isBugfixTask, longtext=longtext) def getProjectTasks(self): """ @@ -630,8 +633,8 @@ dlg = TaskPropertiesDialog(None, self, self.projectOpen) if dlg.exec_() == QDialog.Accepted: data = dlg.getData() - self.addTask(data[0], data[1], completed = data[2], isProjectTask = data[3], - longtext = data[4]) + self.addTask(data[0], data[1], completed=data[2], isProjectTask=data[3], + longtext=data[4]) def __markCompleted(self): """ @@ -670,10 +673,10 @@ """ if self.copyTask: self.addTask(self.copyTask.description, - priority = self.copyTask.priority, - completed = self.copyTask.completed, - longtext = self.copyTask.longtext, - isProjectTask = self.copyTask._isProjectTask) + priority=self.copyTask.priority, + completed=self.copyTask.completed, + longtext=self.copyTask.longtext, + isProjectTask=self.copyTask._isProjectTask) def __deleteTask(self): """ @@ -716,7 +719,7 @@ self.trUtf8("Activate task filter"), self.trUtf8("""The task filter doesn't have any active filters.""" """ Do you want to configure the filter settings?"""), - yesDefault = True) + yesDefault=True) if not res: on = False else: @@ -749,7 +752,7 @@ self.clearProjectTasks() # now process them - progress = QProgressDialog(self.trUtf8("Extracting project tasks..."), + progress = QProgressDialog(self.trUtf8("Extracting project tasks..."), self.trUtf8("Abort"), 0, len(files)) progress.setMinimumDuration(0) count = 0 @@ -805,4 +808,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("tasksPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("tasksPage")
--- a/Templates/TemplateMultipleVariablesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Templates/TemplateMultipleVariablesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,11 +10,12 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * + class TemplateMultipleVariablesDialog(QDialog): """ Class implementing a dialog for entering multiple template variables. """ - def __init__(self, variables, parent = None): + def __init__(self, variables, parent=None): """ Constructor @@ -115,4 +116,4 @@ values[var] = textEdit.text() except AttributeError: values[var] = textEdit.toPlainText() - return values \ No newline at end of file + return values
--- a/Templates/TemplatePropertiesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Templates/TemplatePropertiesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ from E5Gui import E5MessageBox + class TemplatePropertiesDialog(QDialog, Ui_TemplatePropertiesDialog): """ Class implementing the templates properties dialog. """ - def __init__(self, parent, groupMode = False, itm = None): + def __init__(self, parent, groupMode=False, itm=None): """ Constructor @@ -40,7 +41,7 @@ """ must only consist of letters (a-z and A-Z),""" """ digits (0-9) and underscores (_).</p>""" )) - self.__nameValidator = QRegExpValidator(QRegExp("[a-zA-Z0-9_]+"), + self.__nameValidator = QRegExpValidator(QRegExp("[a-zA-Z0-9_]+"), self.nameEdit) self.nameEdit.setValidator(self.__nameValidator) @@ -182,7 +183,7 @@ Public method to get the data entered into the dialog. @return a tuple of two strings (name, language), if the dialog is in group mode, - and a tuple of four strings (name, description, group name, template) + and a tuple of four strings (name, description, group name, template) otherwise. """ if self.groupMode: @@ -191,7 +192,7 @@ ) else: return (self.nameEdit.text(), - self.descriptionEdit.text(), + self.descriptionEdit.text(), self.groupCombo.currentText(), self.templateEdit.toPlainText() - ) \ No newline at end of file + )
--- a/Templates/TemplateSingleVariableDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Templates/TemplateSingleVariableDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,7 +16,7 @@ """ Class implementing a dialog for entering a single template variable. """ - def __init__(self, variable, parent = None): + def __init__(self, variable, parent=None): """ Constructor
--- a/Templates/TemplateViewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Templates/TemplateViewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,11 +29,12 @@ import UI.PixmapCache import Utilities + class TemplateGroup(QTreeWidgetItem): """ Class implementing a template group. """ - def __init__(self, parent, name, language = "All"): + def __init__(self, parent, name, language="All"): """ Constructor @@ -85,7 +86,7 @@ """ return self.language - def addEntry(self, name, description, template, quiet = False): + def addEntry(self, name, description, template, quiet=False): """ Public method to add a template entry to this group. @@ -154,7 +155,7 @@ def getEntryNames(self, beginning): """ - Public method to get the names of all entries, who's name starts with the + Public method to get the names of all entries, who's name starts with the given string. @param beginning string denoting the beginning of the template name @@ -176,6 +177,7 @@ """ return list(self.entries.values()) + class TemplateEntry(QTreeWidgetItem): """ Class immplementing a template entry. @@ -277,7 +279,7 @@ @param varDict dictionary containing the texts of each variable with the variable name as key. - @param indent indentation of the line receiving he expanded + @param indent indentation of the line receiving he expanded template text (string) @return a tuple of the expanded template text (string), the number of lines (integer) and the length of the last line (integer) @@ -317,7 +319,7 @@ format = var[1:-1].split(':', 1)[1] if format == 'rl': prefix = line[:ind] - postfix = line [ind + len(var):] + postfix = line[ind + len(var):] for v in val.splitlines(): t = "{0}{1}{2}{3}{4}".format(t, os.linesep, prefix, v, postfix) elif format == 'ml': @@ -363,6 +365,7 @@ if var.find(':') >= 0 and not var in self.formatedVariables: self.formatedVariables.append(var) + class TemplateViewer(QTreeWidget): """ Class implementing the template viewer. @@ -425,9 +428,9 @@ """ self.sortItems(self.sortColumn(), self.header().sortIndicatorOrder()) - def __templateItemActivated(self, itm = None, col = 0): + def __templateItemActivated(self, itm=None, col=0): """ - Private slot to handle the activation of an item. + Private slot to handle the activation of an item. @param itm reference to the activated item (QTreeWidgetItem) @param col column the item was activated in (integer) @@ -680,7 +683,7 @@ if "i_n_s_e_r_t_i_o_n" in txt: lines = 1 for aline in txt.splitlines(): - count = aline.find("i_n_s_e_r_t_i_o_n") + count = aline.find("i_n_s_e_r_t_i_o_n") if count >= 0: txt = txt.replace("i_n_s_e_r_t_i_o_n", "") if lines == 1: @@ -697,7 +700,7 @@ setselect = True linea = 1 for aline in txt.splitlines(): - posa = aline.find("s_e_l_e_c_t_s_t_a_r_t") + posa = aline.find("s_e_l_e_c_t_s_t_a_r_t") if posa >= 0: txt = txt.replace("s_e_l_e_c_t_s_t_a_r_t", "") break @@ -705,12 +708,12 @@ linea += 1 lineb = 1 for aline in txt.splitlines(): - posb = aline.find("s_e_l_e_c_t_e_n_d") + posb = aline.find("s_e_l_e_c_t_e_n_d") if posb >= 0: txt = txt.replace("s_e_l_e_c_t_e_n_d", "") break else: - lineb += 1 + lineb += 1 editor.insert(txt) @@ -734,7 +737,7 @@ self.applyTemplate(template) break - def addEntry(self, groupName, name, description, template, quiet = False): + def addEntry(self, groupName, name, description, template, quiet=False): """ Public method to add a template entry. @@ -744,10 +747,10 @@ @param template template text of the entry (string) @param quiet flag indicating quiet operation (boolean) """ - self.groups[groupName].addEntry(name, description, template, quiet = quiet) + self.groups[groupName].addEntry(name, description, template, quiet=quiet) self.__resort() - def addGroup(self, name, language = "All"): + def addGroup(self, name, language="All"): """ Public method to add a group. @@ -758,7 +761,7 @@ self.groups[name] = TemplateGroup(self, name, language) self.__resort() - def changeGroup(self, oldname, newname, language = "All"): + def changeGroup(self, oldname, newname, language="All"): """ Public method to rename a group. @@ -848,7 +851,7 @@ tmpl.setTemplateText(template) self.__resort() - def writeTemplates(self, filename = None): + def writeTemplates(self, filename=None): """ Public method to write the templates data to an XML file (.e4c). @@ -868,7 +871,7 @@ TemplatesWriter(f, self).writeXML() f.close() - def readTemplates(self, filename = None): + def readTemplates(self, filename=None): """ Public method to read in the templates file (.e4c) @@ -881,7 +884,7 @@ f = QFile(filename) if f.open(QIODevice.ReadOnly): - reader = TemplatesReader(f, viewer = self) + reader = TemplatesReader(f, viewer=self) reader.readXML() f.close() else:
--- a/Tools/TRPreviewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tools/TRPreviewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,11 +23,12 @@ noTranslationName = QApplication.translate("TRPreviewer", "<No translation>") + class TRPreviewer(QMainWindow): """ Class implementing the UI Previewer main window. """ - def __init__(self, filenames = [], parent = None, name = None): + def __init__(self, filenames=[], parent=None, name=None): """ Constructor @@ -120,7 +121,7 @@ fi = QFileInfo(fn) if fi.suffix().lower() == 'ui': self.preview.loadWidget(fn) - elif fi.suffix().lower()== 'qm': + elif fi.suffix().lower() == 'qm': self.translations.add(fn, first) first = False @@ -141,7 +142,7 @@ """ Private method to define the user interface actions. """ - self.openUIAct = QAction(UI.PixmapCache.getIcon("openUI.png"), + self.openUIAct = QAction(UI.PixmapCache.getIcon("openUI.png"), self.trUtf8('&Open UI Files...'), self) self.openUIAct.setStatusTip(self.trUtf8('Open UI files for display')) self.openUIAct.setWhatsThis(self.trUtf8( @@ -150,7 +151,7 @@ )) self.openUIAct.triggered[()].connect(self.__openWidget) - self.openQMAct = QAction(UI.PixmapCache.getIcon("openQM.png"), + self.openQMAct = QAction(UI.PixmapCache.getIcon("openQM.png"), self.trUtf8('Open &Translation Files...'), self) self.openQMAct.setStatusTip(self.trUtf8('Open Translation files for display')) self.openQMAct.setWhatsThis(self.trUtf8( @@ -159,7 +160,7 @@ )) self.openQMAct.triggered[()].connect(self.__openTranslation) - self.reloadAct = QAction(UI.PixmapCache.getIcon("reload.png"), + self.reloadAct = QAction(UI.PixmapCache.getIcon("reload.png"), self.trUtf8('&Reload Translations'), self) self.reloadAct.setStatusTip(self.trUtf8('Reload the loaded translations')) self.reloadAct.setWhatsThis(self.trUtf8( @@ -168,9 +169,9 @@ )) self.reloadAct.triggered[()].connect(self.translations.reload) - self.exitAct = QAction(UI.PixmapCache.getIcon("exit.png"), + self.exitAct = QAction(UI.PixmapCache.getIcon("exit.png"), self.trUtf8('&Quit'), self) - self.exitAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+Q","File|Quit"))) + self.exitAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.trUtf8('Quit the application')) self.exitAct.setWhatsThis(self.trUtf8( """<b>Quit</b>""" @@ -227,7 +228,7 @@ self.closeAct = QAction(UI.PixmapCache.getIcon("close.png"), self.trUtf8('&Close'), self) - self.closeAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+W","File|Close"))) + self.closeAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+W", "File|Close"))) self.closeAct.setStatusTip(self.trUtf8('Close the current window')) self.closeAct.setWhatsThis(self.trUtf8( """<b>Close Window</b>""" @@ -391,6 +392,7 @@ """ self.translations.reload() + class Translation(object): """ Class to store the properties of a translation @@ -403,6 +405,7 @@ self.name = None self.translator = None + class TranslationsDict(QObject): """ Class to store all loaded translations. @@ -424,9 +427,9 @@ self.selector = selector self.currentTranslator = None self.selector.addItem(noTranslationName) - self.translations = [] # list of Translation objects + self.translations = [] # list of Translation objects - def add(self, fileName, setTranslation = True): + def add(self, fileName, setTranslation=True): """ Public method to add a translation to the list. @@ -624,11 +627,12 @@ """ return len(self.translations) > 0 + class WidgetView(QWidget): """ Class to show a dynamically loaded widget (or dialog). """ - def __init__(self, uiFileName, parent = None, name = None): + def __init__(self, uiFileName, parent=None, name=None): """ Constructor @@ -703,6 +707,7 @@ """ self.__timer.start(0) + class WidgetArea(QMdiArea): """ Specialized MDI area to show the loaded widgets. @@ -712,7 +717,7 @@ lastWidgetClosed = pyqtSignal() rebuildWidgets = pyqtSignal() - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/Tools/TRSingleApplication.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tools/TRSingleApplication.py Fri Mar 11 16:51:57 2011 +0100 @@ -20,12 +20,13 @@ SAFile = "eric5_trpreviewer" # define the protocol tokens -SALoadForm = '>LoadForm<' +SALoadForm = '>LoadForm<' SALoadTranslation = '>LoadTranslation<' + class TRSingleApplicationServer(SingleApplicationServer): """ - Class implementing the single application server embedded within the + Class implementing the single application server embedded within the Translations Previewer. @signal loadForm(str) emitted to load a form file @@ -79,6 +80,7 @@ self.loadTranslation.emit(fname, first) first = False + class TRSingleApplicationClient(SingleApplicationClient): """ Class implementing the single application client of the Translations Previewer.
--- a/Tools/TrayStarter.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tools/TrayStarter.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ from eric5config import getConfig + class TrayStarter(QSystemTrayIcon): """ Class implementing a starter for the system tray. @@ -31,14 +32,14 @@ """ Constructor """ - QSystemTrayIcon.__init__(self, + QSystemTrayIcon.__init__(self, UI.PixmapCache.getIcon(Preferences.getTrayStarter("TrayStarterIcon"))) self.maxMenuFilePathLen = 75 - self.rsettings = QSettings(QSettings.IniFormat, - QSettings.UserScope, - Globals.settingsNameOrganization, + self.rsettings = QSettings(QSettings.IniFormat, + QSettings.UserScope, + Globals.settingsNameOrganization, Globals.settingsNameRecent) self.recentProjects = [] @@ -93,11 +94,11 @@ self.trUtf8("Compare Files side by side"), self.__startCompare) self.__menu.addSeparator() - self.__menu.addAction(UI.PixmapCache.getIcon("sqlBrowser.png"), + self.__menu.addAction(UI.PixmapCache.getIcon("sqlBrowser.png"), self.trUtf8("SQL Browser"), self.__startSqlBrowser) self.__menu.addSeparator() - self.__menu.addAction(UI.PixmapCache.getIcon("iconEditor.png"), + self.__menu.addAction(UI.PixmapCache.getIcon("iconEditor.png"), self.trUtf8("Icon Editor"), self.__startIconEditor) self.__menu.addSeparator() @@ -113,7 +114,7 @@ self.trUtf8('Preferences'), self.__startPreferences) self.__menu.addAction(UI.PixmapCache.getIcon("erict.png"), self.trUtf8("eric5 IDE"), self.__startEric) - self.__menu.addAction(UI.PixmapCache.getIcon("editor.png"), + self.__menu.addAction(UI.PixmapCache.getIcon("editor.png"), self.trUtf8("eric5 Mini Editor"), self.__startMiniEditor) self.__menu.addSeparator() @@ -343,7 +344,7 @@ else: formatStr = '{0:d}. {1}' act = self.recentProjectsMenu.addAction( - formatStr.format(idx, + formatStr.format(idx, Utilities.compactPath(rp, self.maxMenuFilePathLen))) act.setData(rp) idx += 1 @@ -365,7 +366,7 @@ else: formatStr = '{0:d}. {1}' act = self.recentMultiProjectsMenu.addAction( - formatStr.format(idx, + formatStr.format(idx, Utilities.compactPath(rmp, self.maxMenuFilePathLen))) act.setData(rmp) idx += 1 @@ -387,14 +388,14 @@ else: formatStr = '{0:d}. {1}' act = self.recentFilesMenu.addAction( - formatStr.format(idx, + formatStr.format(idx, Utilities.compactPath(rf, self.maxMenuFilePathLen))) act.setData(rf) idx += 1 def __openRecent(self, act): """ - Private method to open a project or file from the list of rencently opened + Private method to open a project or file from the list of rencently opened projects or files. @param act reference to the action that triggered (QAction) @@ -408,9 +409,9 @@ Private slot to set the preferences. """ from Preferences.ConfigurationDialog import ConfigurationDialog - dlg = ConfigurationDialog(None, 'Configuration', True, - fromEric = True, - displayMode = ConfigurationDialog.TrayStarterMode) + dlg = ConfigurationDialog(None, 'Configuration', True, + fromEric=True, + displayMode=ConfigurationDialog.TrayStarterMode) dlg.preferencesChanged.connect(self.preferencesChanged) dlg.show() dlg.showConfigurationPageByName("trayStarterPage")
--- a/Tools/UIPreviewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Tools/UIPreviewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import UI.PixmapCache import UI.Config + class UIPreviewer(QMainWindow): """ Class implementing the UI Previewer main window. """ - def __init__(self, filename = None, parent = None, name = None): + def __init__(self, filename=None, parent=None, name=None): """ Constructor @@ -112,7 +113,7 @@ """ Private method to define the user interface actions. """ - self.openAct = QAction(UI.PixmapCache.getIcon("openUI.png"), + self.openAct = QAction(UI.PixmapCache.getIcon("openUI.png"), self.trUtf8('&Open File'), self) self.openAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+O", "File|Open"))) self.openAct.setStatusTip(self.trUtf8('Open a UI file for display')) @@ -122,7 +123,7 @@ )) self.openAct.triggered[()].connect(self.__openFile) - self.printAct = QAction(UI.PixmapCache.getIcon("print.png"), + self.printAct = QAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8('&Print'), self) self.printAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+P", "File|Print"))) self.printAct.setStatusTip(self.trUtf8('Print a screen capture')) @@ -132,7 +133,7 @@ )) self.printAct.triggered[()].connect(self.__printImage) - self.printPreviewAct = QAction(UI.PixmapCache.getIcon("printPreview.png"), + self.printPreviewAct = QAction(UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8('Print Preview'), self) self.printPreviewAct.setStatusTip(self.trUtf8( 'Print preview a screen capture')) @@ -142,7 +143,7 @@ )) self.printPreviewAct.triggered[()].connect(self.__printPreviewImage) - self.imageAct = QAction(UI.PixmapCache.getIcon("screenCapture.png"), + self.imageAct = QAction(UI.PixmapCache.getIcon("screenCapture.png"), self.trUtf8('&Screen Capture'), self) self.imageAct.setShortcut( QKeySequence(self.trUtf8("Ctrl+S", "File|Screen Capture"))) @@ -153,7 +154,7 @@ )) self.imageAct.triggered[()].connect(self.__saveImage) - self.exitAct = QAction(UI.PixmapCache.getIcon("exit.png"), + self.exitAct = QAction(UI.PixmapCache.getIcon("exit.png"), self.trUtf8('&Quit'), self) self.exitAct.setShortcut(QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit"))) self.exitAct.setStatusTip(self.trUtf8('Quit the application')) @@ -291,7 +292,7 @@ Private slot to load a new file. """ fn = E5FileDialog.getOpenFileName( - self, + self, self.trUtf8("Select UI file"), self.currentFile, self.trUtf8("Qt User-Interface Files (*.ui)")) @@ -356,7 +357,7 @@ self.lastQStyle = qstyle self.lastStyle = sstyle - Preferences.Prefs.settings.setValue('UIPreviewer/style', + Preferences.Prefs.settings.setValue('UIPreviewer/style', self.styleCombo.currentIndex()) QApplication.restoreOverrideCursor() @@ -548,7 +549,7 @@ height = printer.height() - marginY * 2 img = QPixmap.grabWidget(self.mainWidget).toImage() self.__updateChildren(self.lastStyle) - p.drawImage(marginX, marginY, - img.scaled(width, height, + p.drawImage(marginX, marginY, + img.scaled(width, height, Qt.KeepAspectRatio, Qt.SmoothTransformation)) p.end()
--- a/UI/AuthenticationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/AuthenticationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_AuthenticationDialog import Ui_AuthenticationDialog + class AuthenticationDialog(QDialog, Ui_AuthenticationDialog): """ Class implementing the authentication dialog for the help browser. """ - def __init__(self, info, username, showSave = False, saveIt = False, parent = None): + def __init__(self, info, username, showSave=False, saveIt=False, parent=None): """ Constructor
--- a/UI/Browser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/Browser.py Fri Mar 11 16:51:57 2011 +0100 @@ -25,15 +25,16 @@ import Preferences import Utilities + class Browser(QTreeView): """ - Class used to display a file system tree. + Class used to display a file system tree. Via the context menu that is displayed by a right click the user can select various actions on the selected file. - @signal sourceFile(str, int = 0, str = "") emitted to open a Python file at a line + @signal sourceFile(str, int = 0, str = "") emitted to open a Python file at a line @signal designerFile(str) emitted to open a Qt-Designer file @signal linguistFile(str) emitted to open a Qt-Linguist (*.ts) file @signal trpreview(list of str) emitted to preview a Qt-Linguist (*.qm) file @@ -55,7 +56,7 @@ svgFile = pyqtSignal(str) unittestOpen = pyqtSignal(str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -81,7 +82,7 @@ self.expanded.connect(self._resizeColumns) self.collapsed.connect(self._resizeColumns) - self.setWhatsThis(QApplication.translate('Browser', + self.setWhatsThis(QApplication.translate('Browser', """<b>The Browser Window</b>""" """<p>This allows you to easily navigate the hierachy of directories and""" """ files on your system, identify the Python programs and open them up in""" @@ -164,7 +165,7 @@ """ Protected slot to resort the tree. """ - self.model().sort(self.header().sortIndicatorSection(), + self.model().sort(self.header().sortIndicatorSection(), self.header().sortIndicatorOrder()) def __createPopupMenus(self): @@ -173,41 +174,41 @@ """ # create the popup menu for source files self.sourceMenu = QMenu(self) - self.sourceMenu.addAction(QApplication.translate('Browser', 'Open'), + self.sourceMenu.addAction(QApplication.translate('Browser', 'Open'), self._openItem) self.unittestAct = self.sourceMenu.addAction( QApplication.translate('Browser', 'Run unittest...'), self.handleUnittest) self.sourceMenu.addAction( - QApplication.translate('Browser', 'Copy Path to Clipboard'), + QApplication.translate('Browser', 'Copy Path to Clipboard'), self._copyToClipboard) # create the popup menu for general use self.menu = QMenu(self) self.menu.addAction(QApplication.translate('Browser', 'Open'), self._openItem) self.editPixmapAct = \ - self.menu.addAction(QApplication.translate('Browser', 'Open in Icon Editor'), + self.menu.addAction(QApplication.translate('Browser', 'Open in Icon Editor'), self._editPixmap) self.menu.addAction( - QApplication.translate('Browser', 'Copy Path to Clipboard'), + QApplication.translate('Browser', 'Copy Path to Clipboard'), self._copyToClipboard) if self.__embeddedBrowser in [1, 2]: self.menu.addSeparator() - self.menu.addAction(QApplication.translate('Browser', 'Configure...'), + self.menu.addAction(QApplication.translate('Browser', 'Configure...'), self.__configure) # create the menu for multiple selected files self.multiMenu = QMenu(self) - self.multiMenu.addAction(QApplication.translate('Browser', 'Open'), + self.multiMenu.addAction(QApplication.translate('Browser', 'Open'), self._openItem) if self.__embeddedBrowser in [1, 2]: self.multiMenu.addSeparator() - self.multiMenu.addAction(QApplication.translate('Browser', 'Configure...'), + self.multiMenu.addAction(QApplication.translate('Browser', 'Configure...'), self.__configure) # create the directory menu self.dirMenu = QMenu(self) - self.dirMenu.addAction(QApplication.translate('Browser', - 'New toplevel directory...'), + self.dirMenu.addAction(QApplication.translate('Browser', + 'New toplevel directory...'), self.__newToplevelDir) self.addAsTopLevelAct = self.dirMenu.addAction( QApplication.translate('Browser', 'Add as toplevel directory'), @@ -216,37 +217,37 @@ QApplication.translate('Browser', 'Remove from toplevel'), self.__removeToplevel) self.dirMenu.addSeparator() - self.dirMenu.addAction(QApplication.translate('Browser', + self.dirMenu.addAction(QApplication.translate('Browser', 'Refresh directory'), self.__refreshDirectory) self.dirMenu.addSeparator() - self.dirMenu.addAction(QApplication.translate('Browser', + self.dirMenu.addAction(QApplication.translate('Browser', 'Find in this directory'), self.__findInDirectory) - self.dirMenu.addAction(QApplication.translate('Browser', + self.dirMenu.addAction(QApplication.translate('Browser', 'Find&&Replace in this directory'), self.__replaceInDirectory) self.dirMenu.addAction( - QApplication.translate('Browser', 'Copy Path to Clipboard'), + QApplication.translate('Browser', 'Copy Path to Clipboard'), self._copyToClipboard) if self.__embeddedBrowser in [1, 2]: self.dirMenu.addSeparator() - self.dirMenu.addAction(QApplication.translate('Browser', 'Configure...'), + self.dirMenu.addAction(QApplication.translate('Browser', 'Configure...'), self.__configure) # create the background menu self.backMenu = QMenu(self) - self.backMenu.addAction(QApplication.translate('Browser', - 'New toplevel directory...'), + self.backMenu.addAction(QApplication.translate('Browser', + 'New toplevel directory...'), self.__newToplevelDir) if self.__embeddedBrowser in [1, 2]: self.backMenu.addSeparator() - self.backMenu.addAction(QApplication.translate('Browser', 'Configure...'), + self.backMenu.addAction(QApplication.translate('Browser', 'Configure...'), self.__configure) def mouseDoubleClickEvent(self, mouseEvent): """ - Protected method of QAbstractItemView. + Protected method of QAbstractItemView. Reimplemented to disable expanding/collapsing of items when double-clicking. Instead the double-clicked entry is opened. @@ -264,7 +265,7 @@ @param coord the position of the mouse pointer (QPoint) """ categories = self.getSelectedItemsCountCategorized( - [BrowserDirectoryItem, BrowserFileItem, + [BrowserDirectoryItem, BrowserFileItem, BrowserClassItem, BrowserMethodItem]) cnt = categories["sum"] bfcnt = categories[str(BrowserFileItem)] @@ -319,7 +320,7 @@ Protected slot to handle the open popup menu entry. """ itmList = self.getSelectedItems( - [BrowserFileItem, BrowserClassItem, + [BrowserFileItem, BrowserClassItem, BrowserMethodItem, BrowserClassAttributeItem]) for itm in itmList: @@ -358,13 +359,13 @@ else: QDesktopServices.openUrl(QUrl(itm.fileName())) elif isinstance(itm, BrowserClassItem): - self.sourceFile[str, int].emit(itm.fileName(), + self.sourceFile[str, int].emit(itm.fileName(), itm.classObject().lineno) elif isinstance(itm, BrowserMethodItem): - self.sourceFile[str, int].emit(itm.fileName(), + self.sourceFile[str, int].emit(itm.fileName(), itm.functionObject().lineno) elif isinstance(itm, BrowserClassAttributeItem): - self.sourceFile[str, int].emit(itm.fileName(), + self.sourceFile[str, int].emit(itm.fileName(), itm.attributeObject().lineno) def _editPixmap(self): @@ -472,7 +473,7 @@ replaceFilesDialog.raise_() replaceFilesDialog.activateWindow() - def handleProgramChange(self,fn): + def handleProgramChange(self, fn): """ Public slot to handle the programChange signal. """
--- a/UI/BrowserModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/BrowserModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,21 +21,22 @@ import Preferences import Utilities -BrowserItemRoot = 0 -BrowserItemDirectory = 1 -BrowserItemSysPath = 2 -BrowserItemFile = 3 -BrowserItemClass = 4 -BrowserItemMethod = 5 +BrowserItemRoot = 0 +BrowserItemDirectory = 1 +BrowserItemSysPath = 2 +BrowserItemFile = 3 +BrowserItemClass = 4 +BrowserItemMethod = 5 BrowserItemAttributes = 6 -BrowserItemAttribute = 7 -BrowserItemCoding = 8 +BrowserItemAttribute = 7 +BrowserItemCoding = 8 + class BrowserModel(QAbstractItemModel): """ Class implementing the browser model. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -111,7 +112,7 @@ return Qt.ItemIsEnabled | Qt.ItemIsSelectable - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get the header data. @@ -128,7 +129,7 @@ return None - def index(self, row, column, parent = QModelIndex()): + def index(self, row, column, parent=QModelIndex()): """ Public method to create an index. @@ -137,8 +138,8 @@ @param parent index of parent item (QModelIndex) @return index object (QModelIndex) """ - # The model/view framework considers negative values out-of-bounds, - # however in python they work when indexing into lists. So make sure + # The model/view framework considers negative values out-of-bounds, + # however in python they work when indexing into lists. So make sure # we return an invalid index for out-of-bounds row/col if row < 0 or column < 0 or \ row >= self.rowCount(parent) or column >= self.columnCount(parent): @@ -178,7 +179,7 @@ return self.createIndex(parentItem.row(), 0, parentItem) - def rowCount(self, parent = QModelIndex()): + def rowCount(self, parent=QModelIndex()): """ Public method to get the number of rows. @@ -198,7 +199,7 @@ return parentItem.childCount() - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check for the presence of child items. @@ -313,7 +314,7 @@ cnt, cnt) if f.isDir(): node = BrowserDirectoryItem(itm, - Utilities.toNativeSeparators(f.absoluteFilePath()), + Utilities.toNativeSeparators(f.absoluteFilePath()), False) else: node = BrowserFileItem(itm, @@ -413,7 +414,7 @@ """ Public slot to save the toplevel directories. """ - Preferences.Prefs.settings.setValue('BrowserModel/ToplevelDirs', + Preferences.Prefs.settings.setValue('BrowserModel/ToplevelDirs', self.toplevelDirs) def _addItem(self, itm, parentItem): @@ -425,7 +426,7 @@ """ parentItem.appendChild(itm) - def addItem(self, itm, parent = QModelIndex()): + def addItem(self, itm, parent=QModelIndex()): """ Puplic slot to add an item. @@ -442,7 +443,7 @@ self._addItem(itm, parentItem) self.endInsertRows() - def populateItem(self, parentItem, repopulate = False): + def populateItem(self, parentItem, repopulate=False): """ Public method to populate an item's subtree. @@ -462,7 +463,7 @@ elif parentItem.type() == BrowserItemAttributes: self.populateClassAttributesItem(parentItem, repopulate) - def populateDirectoryItem(self, parentItem, repopulate = False): + def populateDirectoryItem(self, parentItem, repopulate=False): """ Public method to populate a directory item's subtree. @@ -485,7 +486,7 @@ for f in entryInfoList: if f.isDir(): node = BrowserDirectoryItem(parentItem, - Utilities.toNativeSeparators(f.absoluteFilePath()), + Utilities.toNativeSeparators(f.absoluteFilePath()), False) else: fileFilters = Preferences.getUI("BrowsersFileFilters").split(";") @@ -500,7 +501,7 @@ if repopulate: self.endInsertRows() - def populateSysPathItem(self, parentItem, repopulate = False): + def populateSysPathItem(self, parentItem, repopulate=False): """ Public method to populate a sys.path item's subtree. @@ -520,7 +521,7 @@ if repopulate: self.endInsertRows() - def populateFileItem(self, parentItem, repopulate = False): + def populateFileItem(self, parentItem, repopulate=False): """ Public method to populate a file item's subtree. @@ -531,7 +532,7 @@ fileName = parentItem.fileName() try: dict = Utilities.ClassBrowsers.readmodule( - moduleName, [parentItem.dirName()], + moduleName, [parentItem.dirName()], parentItem.isPython2File() or parentItem.isPython3File()) except ImportError: return @@ -553,19 +554,19 @@ except AttributeError: pass if "@@Coding@@" in keys: - node = BrowserCodingItem(parentItem, + node = BrowserCodingItem(parentItem, QApplication.translate("BrowserModel", "Coding: {0}")\ .format(dict["@@Coding@@"].coding)) self._addItem(node, parentItem) if "@@Globals@@" in keys: - node = BrowserClassAttributesItem(parentItem, - dict["@@Globals@@"].globals, + node = BrowserClassAttributesItem(parentItem, + dict["@@Globals@@"].globals, QApplication.translate("BrowserModel", "Globals")) self._addItem(node, parentItem) if repopulate: self.endInsertRows() - def populateClassItem(self, parentItem, repopulate = False): + def populateClassItem(self, parentItem, repopulate=False): """ Public method to populate a class item's subtree. @@ -600,25 +601,25 @@ if len(cl.attributes): node = BrowserClassAttributesItem( - parentItem, cl.attributes, + parentItem, cl.attributes, QApplication.translate("BrowserModel", "Attributes")) if repopulate: - self.addItem(node, + self.addItem(node, self.createIndex(parentItem.row(), 0, parentItem)) else: self._addItem(node, parentItem) if len(cl.globals): node = BrowserClassAttributesItem( - parentItem, cl.globals, + parentItem, cl.globals, QApplication.translate("BrowserModel", "Attributes (global)")) if repopulate: - self.addItem(node, + self.addItem(node, self.createIndex(parentItem.row(), 0, parentItem)) else: self._addItem(node, parentItem) - def populateMethodItem(self, parentItem, repopulate = False): + def populateMethodItem(self, parentItem, repopulate=False): """ Public method to populate a method item's subtree. @@ -651,7 +652,7 @@ if repopulate: self.endInsertRows() - def populateClassAttributesItem(self, parentItem, repopulate = False): + def populateClassAttributesItem(self, parentItem, repopulate=False): """ Public method to populate a class attributes item's subtree. @@ -673,6 +674,7 @@ if repopulate: self.endInsertRows() + class BrowserItem(object): """ Class implementing the data structure for browser items. @@ -840,11 +842,12 @@ """ return self.symlink + class BrowserDirectoryItem(BrowserItem): """ Class implementing the data structure for browser directory items. """ - def __init__(self, parent, dinfo, full = True): + def __init__(self, parent, dinfo, full=True): """ Constructor @@ -870,7 +873,7 @@ self._populated = False self._lazyPopulation = True - def setName(self, dinfo, full = True): + def setName(self, dinfo, full=True): """ Public method to set the directory name. @@ -916,6 +919,7 @@ return BrowserItem.lessThan(self, other, column, order) + class BrowserSysPathItem(BrowserItem): """ Class implementing the data structure for browser sys.path items. @@ -933,11 +937,12 @@ self._populated = False self._lazyPopulation = True + class BrowserFileItem(BrowserItem): """ Class implementing the data structure for browser file items. """ - def __init__(self, parent, finfo, full = True, sourceLanguage = ""): + def __init__(self, parent, finfo, full=True, sourceLanguage=""): """ Constructor @@ -1008,7 +1013,7 @@ else: self.icon = UI.PixmapCache.getIcon(pixName) - def setName(self, finfo, full = True): + def setName(self, finfo, full=True): """ Public method to set the directory name. @@ -1185,6 +1190,7 @@ return BrowserItem.lessThan(self, other, column, order) + class BrowserClassItem(BrowserItem): """ Class implementing the data structure for browser class items. @@ -1217,9 +1223,9 @@ self._classObject = cl self._filename = filename - self.isfunction = isinstance(self._classObject, + self.isfunction = isinstance(self._classObject, Utilities.ClassBrowsers.ClbrBaseClasses.Function) - self.ismodule = isinstance(self._classObject, + self.ismodule = isinstance(self._classObject, Utilities.ClassBrowsers.ClbrBaseClasses.Module) if self.isfunction: if cl.isPrivate(): @@ -1302,6 +1308,7 @@ """ return self._classObject.isPublic() + class BrowserMethodItem(BrowserItem): """ Class implementing the data structure for browser method items. @@ -1327,7 +1334,7 @@ self.icon = UI.PixmapCache.getIcon("method_protected.png") else: self.icon = UI.PixmapCache.getIcon("method.png") - self.itemData[0] = "{0}({1})".format( + self.itemData[0] = "{0}({1})".format( name, ", ".join(self._functionObject.parameters)) # if no defaults are wanted # ....format(name, ", ".join( @@ -1394,6 +1401,7 @@ """ return self._functionObject.isPublic() + class BrowserClassAttributesItem(BrowserItem): """ Class implementing the data structure for browser class attributes items. @@ -1439,6 +1447,7 @@ return BrowserItem.lessThan(self, other, column, order) + class BrowserClassAttributeItem(BrowserItem): """ Class implementing the data structure for browser class attribute items. @@ -1511,6 +1520,7 @@ return BrowserItem.lessThan(self, other, column, order) + class BrowserCodingItem(BrowserItem): """ Class implementing the data structure for browser coding items.
--- a/UI/BrowserSortFilterProxyModel.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/BrowserSortFilterProxyModel.py Fri Mar 11 16:51:57 2011 +0100 @@ -12,11 +12,12 @@ import Preferences + class BrowserSortFilterProxyModel(QSortFilterProxyModel): """ Class implementing the browser sort filter proxy model. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -69,7 +70,7 @@ sindex = self.mapToSource(index) return self.sourceModel().item(sindex) - def hasChildren(self, parent = QModelIndex()): + def hasChildren(self, parent=QModelIndex()): """ Public method to check for the presence of child items.
--- a/UI/CompareDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/CompareDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,7 +22,8 @@ import Utilities -def sbsdiff(a, b, linenumberwidth = 4): + +def sbsdiff(a, b, linenumberwidth=4): """ Compare two sequences of lines; generate the delta for display side by side. @@ -71,19 +72,20 @@ yield ('r', linenumberformat.format(ln1), l1, linenumberformat.format(ln2), l2) + class CompareDialog(QWidget, Ui_CompareDialog): """ Class implementing a dialog to compare two files and show the result side by side. """ - def __init__(self, files = [], parent = None): + def __init__(self, files=[], parent=None): """ Constructor - @param files list of files to compare and their label + @param files list of files to compare and their label (list of two tuples of two strings) @param parent parent widget (QWidget) """ - QWidget.__init__(self,parent) + QWidget.__init__(self, parent) self.setupUi(self) self.file1Completer = E5FileCompleter(self.file1Edit) @@ -157,7 +159,7 @@ self.file1Label.hide() self.file2Label.hide() - def show(self, filename = None): + def show(self, filename=None): """ Public slot to show the dialog. @@ -167,7 +169,7 @@ self.file1Edit.setText(filename) QWidget.show(self) - def __appendText(self, pane, linenumber, line, format, interLine = False): + def __appendText(self, pane, linenumber, line, format, interLine=False): """ Private method to append text to the end of the contents pane. @@ -216,7 +218,7 @@ """ filename1 = Utilities.toNativeSeparators(self.file1Edit.text()) try: - f1 = open(filename1, "r", encoding = "utf-8") + f1 = open(filename1, "r", encoding="utf-8") lines1 = f1.readlines() f1.close() except IOError: @@ -228,7 +230,7 @@ filename2 = Utilities.toNativeSeparators(self.file2Edit.text()) try: - f2 = open(filename2, "r", encoding = "utf-8") + f2 = open(filename2, "r", encoding="utf-8") lines2 = f2.readlines() f2.close() except IOError: @@ -419,15 +421,16 @@ self.hsb1.valueChanged.disconnect(self.hsb2.setValue) self.hsb2.valueChanged.disconnect(self.hsb1.setValue) + class CompareWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, files = [], parent = None): + def __init__(self, files=[], parent=None): """ Constructor - @param files list of files to compare and their label + @param files list of files to compare and their label (list of two tuples of two strings) @param parent reference to the parent widget (QWidget) """
--- a/UI/DeleteFilesConfirmationDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/DeleteFilesConfirmationDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,7 +27,7 @@ @param cancelLabel label for the Cancel button (string) @param files list of filenames to be shown (list of strings) """ - QDialog.__init__(self,parent) + QDialog.__init__(self, parent) self.setupUi(self) self.setModal(True)
--- a/UI/DiffDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/DiffDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,8 @@ # This function is copied from python 2.3 and slightly modified. # The header lines contain a tab after the filename. + + def unified_diff(a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n'): """ @@ -76,14 +78,14 @@ @return a generator yielding lines of differences """ started = False - for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n): + for group in SequenceMatcher(None, a, b).get_grouped_opcodes(n): if not started: yield '--- {0}\t{1}{2}'.format(fromfile, fromfiledate, lineterm) yield '+++ {0}\t{1}{2}'.format(tofile, tofiledate, lineterm) started = True i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4] yield "@@ -{0:d},{1:d} +{2:d},{3:d} @@{4}".format( - i1+1, i2-i1, j1+1, j2-j1, lineterm) + i1 + 1, i2 - i1, j1 + 1, j2 - j1, lineterm) for tag, i1, i2, j1, j2 in group: if tag == 'equal': for line in a[i1:i2]: @@ -98,6 +100,8 @@ # This function is copied from python 2.3 and slightly modified. # The header lines contain a tab after the filename. + + def context_diff(a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n'): """ @@ -155,8 +159,8 @@ """ started = False - prefixmap = {'insert':'+ ', 'delete':'- ', 'replace':'! ', 'equal':' '} - for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n): + prefixmap = {'insert': '+ ', 'delete': '- ', 'replace': '! ', 'equal': ' '} + for group in SequenceMatcher(None, a, b).get_grouped_opcodes(n): if not started: yield '*** {0}\t{1}{2}'.format(fromfile, fromfiledate, lineterm) yield '--- {0}\t{1}{2}'.format(tofile, tofiledate, lineterm) @@ -164,7 +168,7 @@ yield '***************{0}'.format(lineterm) if group[-1][2] - group[0][1] >= 2: - yield '*** {0:d},{1:d} ****{2}'.format(group[0][1]+1, group[-1][2], lineterm) + yield '*** {0:d},{1:d} ****{2}'.format(group[0][1] + 1, group[-1][2], lineterm) else: yield '*** {0:d} ****{1}'.format(group[-1][2], lineterm) visiblechanges = [e for e in group if e[0] in ('replace', 'delete')] @@ -175,7 +179,7 @@ yield prefixmap[tag] + line if group[-1][4] - group[0][3] >= 2: - yield '--- {0:d},{1:d} ----{2}'.format(group[0][3]+1, group[-1][4], lineterm) + yield '--- {0:d},{1:d} ----{2}'.format(group[0][3] + 1, group[-1][4], lineterm) else: yield '--- {0:d} ----{1}'.format(group[-1][4], lineterm) visiblechanges = [e for e in group if e[0] in ('replace', 'insert')] @@ -185,15 +189,16 @@ for line in b[j1:j2]: yield prefixmap[tag] + line + class DiffDialog(QWidget, Ui_DiffDialog): """ Class implementing a dialog to compare two files. """ - def __init__(self,parent = None): + def __init__(self, parent=None): """ Constructor """ - QWidget.__init__(self,parent) + QWidget.__init__(self, parent) self.setupUi(self) self.file1Completer = E5FileCompleter(self.file1Edit) @@ -234,7 +239,7 @@ self.file1Edit.textChanged.connect(self.__fileChanged) self.file2Edit.textChanged.connect(self.__fileChanged) - def show(self, filename = None): + def show(self, filename=None): """ Public slot to show the dialog. @@ -274,7 +279,7 @@ self.trUtf8("Save Diff"), fname, self.trUtf8("Patch Files (*.diff)"), - None, + None, E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) if not fname: @@ -290,13 +295,13 @@ self.trUtf8("Save Diff"), self.trUtf8("<p>The patch file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if not res: return fname = Utilities.toNativeSeparators(fname) try: - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") txt = self.contents.toPlainText() try: f.write(txt) @@ -320,7 +325,7 @@ except IOError: filemtime1 = "" try: - f1 = open(self.filename1, "r", encoding = "utf-8") + f1 = open(self.filename1, "r", encoding="utf-8") lines1 = f1.readlines() f1.close() except IOError: @@ -336,7 +341,7 @@ except IOError: filemtime2 = "" try: - f2 = open(self.filename2, "r", encoding = "utf-8") + f2 = open(self.filename2, "r", encoding="utf-8") lines2 = f2.readlines() f2.close() except IOError: @@ -480,11 +485,12 @@ """ self.__selectFile(self.file2Edit) + class DiffWindow(QMainWindow): """ Main window class for the standalone dialog. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/UI/EmailDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/EmailDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -28,6 +28,8 @@ ## package for Image and Audio mime messages. ## ############################################################ from base64 import b64encode as _bencode + + def _encode_base64(msg): """ Function to encode the message's payload in Base64. @@ -50,11 +52,12 @@ from email.mime.multipart import MIMEMultipart from email.header import Header + class EmailDialog(QDialog, Ui_EmailDialog): """ Class implementing a dialog to send bug reports. """ - def __init__(self, mode = "bug", parent = None): + def __init__(self, mode="bug", parent=None): """ Constructor @@ -163,7 +166,7 @@ return MIMEText(txt) except UnicodeEncodeError: coding = Preferences.getSystem("StringEncoding") - return MIMEText(txt.encode(coding), _charset = coding) + return MIMEText(txt.encode(coding), _charset=coding) def __encodedHeader(self, txt): """ @@ -186,14 +189,14 @@ @return string containing the mail message """ msgtext = "{0}\r\n----\r\n{1}----\r\n{2}----\r\n{3}".format( - self.message.toPlainText(), - Utilities.generateVersionInfo("\r\n"), - Utilities.generatePluginsVersionInfo("\r\n"), + self.message.toPlainText(), + Utilities.generateVersionInfo("\r\n"), + Utilities.generatePluginsVersionInfo("\r\n"), Utilities.generateDistroInfo("\r\n")) msg = self.__encodedText(msgtext) - msg['From'] = Preferences.getUser("Email") - msg['To'] = self.__toAddress + msg['From'] = Preferences.getUser("Email") + msg['To'] = self.__toAddress subject = '[eric5] {0}'.format(self.subject.text()) msg['Subject'] = self.__encodedHeader(subject) @@ -210,15 +213,15 @@ "capable of displaying the attachments.") msgtext = "{0}\r\n----\r\n{1}----\r\n{2}----\r\n{3}".format( - self.message.toPlainText(), - Utilities.generateVersionInfo("\r\n"), - Utilities.generatePluginsVersionInfo("\r\n"), + self.message.toPlainText(), + Utilities.generateVersionInfo("\r\n"), + Utilities.generatePluginsVersionInfo("\r\n"), Utilities.generateDistroInfo("\r\n")) # first part of multipart mail explains format msg = MIMEMultipart() - msg['From'] = Preferences.getUser("Email") - msg['To'] = self.__toAddress + msg['From'] = Preferences.getUser("Email") + msg['To'] = self.__toAddress subject = '[eric5] {0}'.format(self.subject.text()) msg['Subject'] = self.__encodedHeader(subject) msg.preamble = mpPreamble @@ -236,20 +239,20 @@ name = os.path.basename(fname) if maintype == 'text': - txt = open(fname, 'r', encoding = "utf-8").read() + txt = open(fname, 'r', encoding="utf-8").read() try: txt.encode("us-ascii") - att = MIMEText(txt, _subtype = subtype) + att = MIMEText(txt, _subtype=subtype) except UnicodeEncodeError: att = MIMEText( - txt.encode("utf-8"), _subtype = subtype, _charset = "utf-8") + txt.encode("utf-8"), _subtype=subtype, _charset="utf-8") elif maintype == 'image': - att = MIMEImage(open(fname, 'rb').read(), _subtype = subtype) + att = MIMEImage(open(fname, 'rb').read(), _subtype=subtype) elif maintype == 'audio': - att = MIMEAudio(open(fname, 'rb').read(), _subtype = subtype) + att = MIMEAudio(open(fname, 'rb').read(), _subtype=subtype) else: att = MIMEApplication(open(fname, 'rb').read()) - att.add_header('Content-Disposition', 'attachment', filename = name) + att.add_header('Content-Disposition', 'attachment', filename=name) msg.attach(att) return msg.as_string() @@ -262,7 +265,7 @@ @return flag indicating success (boolean) """ try: - server = smtplib.SMTP(Preferences.getUser("MailServer"), + server = smtplib.SMTP(Preferences.getUser("MailServer"), Preferences.getUser("MailServerPort")) if Preferences.getUser("MailServerUseTLS"): server.starttls() @@ -271,7 +274,7 @@ password = Preferences.getUser("MailServerPassword") if not password: password, ok = QInputDialog.getText( - self, + self, self.trUtf8("Mail Server Password"), self.trUtf8("Enter your mail server password"), QLineEdit.Password) @@ -326,7 +329,7 @@ Public method to add an attachment. @param fname name of the file to be attached (string) - @param deleteFile flag indicating to delete the file after it has + @param deleteFile flag indicating to delete the file after it has been sent (boolean) """ type = mimetypes.guess_type(fname)[0]
--- a/UI/FindFileDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/FindFileDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,6 +21,7 @@ import Utilities import Preferences + class FindFileDialog(QDialog, Ui_FindFileDialog): """ Class implementing a dialog to search for text in files. @@ -36,13 +37,13 @@ sourceFile = pyqtSignal(str, int, str, int, int) designerFile = pyqtSignal(str) - lineRole = Qt.UserRole + 1 - startRole = Qt.UserRole + 2 - endRole = Qt.UserRole + 3 + lineRole = Qt.UserRole + 1 + startRole = Qt.UserRole + 2 + endRole = Qt.UserRole + 3 replaceRole = Qt.UserRole + 4 - md5Role = Qt.UserRole + 5 + md5Role = Qt.UserRole + 5 - def __init__(self, project, replaceMode = False, parent=None): + def __init__(self, project, replaceMode=False, parent=None): """ Constructor @@ -56,12 +57,12 @@ self.__replaceMode = replaceMode self.stopButton = \ - self.buttonBox.addButton(self.trUtf8("Stop"), + self.buttonBox.addButton(self.trUtf8("Stop"), QDialogButtonBox.ActionRole) self.stopButton.setEnabled(False) self.findButton = \ - self.buttonBox.addButton(self.trUtf8("Find"), + self.buttonBox.addButton(self.trUtf8("Find"), QDialogButtonBox.ActionRole) self.findButton.setEnabled(False) self.findButton.setDefault(True) @@ -142,12 +143,12 @@ if self.__replaceMode: self.__lastFileItem.setFlags(self.__lastFileItem.flags() | \ Qt.ItemFlags(Qt.ItemIsUserCheckable | Qt.ItemIsTristate)) - # Qt bug: - # item is not user checkable if setFirstColumnSpanned + # Qt bug: + # item is not user checkable if setFirstColumnSpanned # is True (< 4.5.0) self.__lastFileItem.setData(0, self.md5Role, md5) - itm = QTreeWidgetItem(self.__lastFileItem, + itm = QTreeWidgetItem(self.__lastFileItem, [' {0:5d} '.format(line), text]) itm.setTextAlignment(0, Qt.AlignRight) itm.setData(0, self.lineRole, line) @@ -159,7 +160,7 @@ itm.setCheckState(0, Qt.Checked) self.replaceButton.setEnabled(True) - def show(self, txt = ""): + def show(self, txt=""): """ Overwritten method to enable/disable the project button. @@ -334,7 +335,7 @@ filterString = "|".join(filters) filterRe = re.compile(filterString) files = self.__getFileList( - os.path.abspath(self.dirCombo.currentText()), + os.path.abspath(self.dirCombo.currentText()), filterRe) elif self.openFilesButton.isChecked(): files = e5App().getObject("ViewManager").getOpenFilenames() @@ -345,7 +346,7 @@ self.findProgress.setMaximum(len(files)) # retrieve the values - reg = self.regexpCheckBox.isChecked() + reg = self.regexpCheckBox.isChecked() wo = self.wordCheckBox.isChecked() cs = self.caseCheckBox.isChecked() ct = self.findtextCombo.currentText() @@ -369,8 +370,6 @@ self.findButton.setEnabled(True) self.findButton.setDefault(True) return - - # reset the findtextCombo if ct in self.searchHistory: self.searchHistory.remove(ct) @@ -378,7 +377,7 @@ self.findtextCombo.clear() self.findtextCombo.addItems(self.searchHistory) Preferences.Prefs.settings.setValue( - "FindFileDialog/SearchHistory", + "FindFileDialog/SearchHistory", self.searchHistory[:30]) if self.__replaceMode: @@ -389,7 +388,7 @@ self.replacetextCombo.clear() self.replacetextCombo.addItems(self.replaceHistory) Preferences.Prefs.settings.setValue( - "FindFileDialog/ReplaceHistory", + "FindFileDialog/ReplaceHistory", self.replaceHistory[:30]) if self.dirButton.isChecked(): @@ -400,7 +399,7 @@ self.dirCombo.clear() self.dirCombo.addItems(self.dirHistory) Preferences.Prefs.settings.setValue( - "FindFileDialog/DirectoryHistory", + "FindFileDialog/DirectoryHistory", self.dirHistory[:30]) # set the button states @@ -456,7 +455,7 @@ rline = "{0} ...".format(line[:1024]) line = "- {0}\n+ {1}".format( line, self.__stripEol(rline)) - self.__createItem(file, count, line, start, end, + self.__createItem(file, count, line, start, end, rline, hash) if self.feelLikeCheckBox.isChecked(): @@ -478,7 +477,7 @@ self.findProgressLabel.setPath("") self.findList.setUpdatesEnabled(True) - self.findList.sortItems(self.findList.sortColumn(), + self.findList.sortItems(self.findList.sortColumn(), self.findList.header().sortIndicatorOrder()) self.findList.resizeColumnToContents(1) if self.__replaceMode: @@ -495,7 +494,7 @@ def on_findList_itemDoubleClicked(self, itm, column): """ - Private slot to handle the double click on a file item. + Private slot to handle the double click on a file item. It emits the signal sourceFile or designerFile depending on the file extension. @@ -658,7 +657,7 @@ menu = QMenu(self) menu.addAction(self.trUtf8("Open"), self.__openFile) - menu.addAction(self.trUtf8("Copy Path to Clipboard"), + menu.addAction(self.trUtf8("Copy Path to Clipboard"), self.__copyToClipboard) menu.exec_(QCursor.pos())
--- a/UI/FindFileNameDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/FindFileNameDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -35,7 +35,7 @@ sourceFile = pyqtSignal(str) designerFile = pyqtSignal(str) - def __init__(self, project, parent = None): + def __init__(self, project, parent=None): """ Constructor @@ -74,7 +74,7 @@ def __openFile(self): """ - Private slot to open a file. + Private slot to open a file. It emits the signal sourceFile or designerFile depending on the file extension. @@ -178,7 +178,7 @@ @pyqtSlot() def on_searchDirButton_clicked(self): """ - Private slot to handle the clicked signal of the search directory selection + Private slot to handle the clicked signal of the search directory selection button. """ searchDir = E5FileDialog.getExistingDirectory( @@ -217,7 +217,7 @@ def on_fileList_itemActivated(self, itm, column): """ - Private slot to handle the double click on a file item. + Private slot to handle the double click on a file item. It emits the signal sourceFile or designerFile depending on the file extension.
--- a/UI/LogView.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/LogView.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,11 +15,12 @@ import UI.PixmapCache import Preferences + class LogViewer(QTextEdit): """ Class providing a specialized text edit for displaying logging information. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -57,7 +58,7 @@ coord = self.mapToGlobal(coord) self.__menu.popup(coord) - def __appendText(self, txt, error = False): + def __appendText(self, txt, error=False): """ Public method to append text to the end. @@ -80,7 +81,7 @@ @param txt text to be appended (string) """ - self.__appendText(txt, error = False) + self.__appendText(txt, error=False) QApplication.processEvents() def appendToStderr(self, txt): @@ -89,7 +90,7 @@ @param txt text to be appended (string) """ - self.__appendText(txt, error = True) + self.__appendText(txt, error=True) QApplication.processEvents() def preferencesChanged(self):
--- a/UI/NumbersWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/NumbersWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -16,11 +16,12 @@ import UI.PixmapCache + class BinaryModel(QAbstractTableModel): """ Class implementing a model for entering binary numbers. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -49,7 +50,7 @@ """ return self.__bits - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -74,7 +75,7 @@ """ return Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsSelectable - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get header data from the model. @@ -125,7 +126,7 @@ """ return self.__value - def setData(self, index, value, role = Qt.EditRole): + def setData(self, index, value, role=Qt.EditRole): """ Public method to set the data of a node cell. @@ -145,6 +146,7 @@ return False + class NumbersWidget(QWidget, Ui_NumbersWidget): """ Class implementing a widget to show numbers in different formats. @@ -154,7 +156,7 @@ """ insertNumber = pyqtSignal(str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor
--- a/UI/PixmapCache.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/PixmapCache.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ from PyQt4.QtGui import QPixmap, QIcon, QPainter + class PixmapCache(object): """ Class implementing a pixmap cache for icons. @@ -57,7 +58,8 @@ pixCache = PixmapCache() -def getPixmap(key, cache = pixCache): + +def getPixmap(key, cache=pixCache): """ Module function to retrieve a pixmap. @@ -66,7 +68,8 @@ """ return cache.getPixmap(key) -def getIcon(key, cache = pixCache): + +def getIcon(key, cache=pixCache): """ Module function to retrieve an icon. @@ -75,7 +78,8 @@ """ return QIcon(cache.getPixmap(key)) -def getSymlinkIcon(key, cache = pixCache): + +def getSymlinkIcon(key, cache=pixCache): """ Module function to retrieve a symbolic link icon. @@ -89,7 +93,8 @@ painter.end() return QIcon(pix1) -def addSearchPath(path, cache = pixCache): + +def addSearchPath(path, cache=pixCache): """ Module function to add a path to the search path.
--- a/UI/SplashScreen.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/SplashScreen.py Fri Mar 11 16:51:57 2011 +0100 @@ -15,6 +15,7 @@ from eric5config import getConfig + class SplashScreen(QSplashScreen): """ Class implementing a splashscreen for eric5. @@ -47,6 +48,7 @@ QSplashScreen.clearMessage(self) QApplication.processEvents() + class NoneSplashScreen(object): """ Class implementing a "None" splashscreen for eric5. @@ -80,4 +82,4 @@ @param widget widget to wait for (QWidget) """ - pass \ No newline at end of file + pass
--- a/UI/SymbolsWidget.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/SymbolsWidget.py Fri Mar 11 16:51:57 2011 +0100 @@ -19,11 +19,12 @@ import UI.PixmapCache import Preferences + class SymbolsModel(QAbstractTableModel): """ Class implementing the model for the symbols widget. """ - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -32,11 +33,11 @@ QAbstractTableModel.__init__(self, parent) self.__headerData = [ - self.trUtf8("Code"), - self.trUtf8("Char"), - self.trUtf8("Hex"), - self.trUtf8("HTML"), - self.trUtf8("Name"), + self.trUtf8("Code"), + self.trUtf8("Char"), + self.trUtf8("Hex"), + self.trUtf8("HTML"), + self.trUtf8("Name"), ] self.__tables = ( @@ -181,7 +182,7 @@ self.__currentTableIndex = index self.reset() - def headerData(self, section, orientation, role = Qt.DisplayRole): + def headerData(self, section, orientation, role=Qt.DisplayRole): """ Public method to get header data from the model. @@ -195,7 +196,7 @@ return QAbstractTableModel.headerData(self, section, orientation, role) - def data(self, index, role = Qt.DisplayRole): + def data(self, index, role=Qt.DisplayRole): """ Public method to get data from the model. @@ -314,6 +315,7 @@ """ return unicodedata.category(char) in ["Pc", "Pd", "Ps", "Pe", "Pi", "Pf", "Po"] + class SymbolsWidget(QWidget, Ui_SymbolsWidget): """ Class implementing a widget to select a symbol in various formats. @@ -322,7 +324,7 @@ """ insertSymbol = pyqtSignal(str) - def __init__(self, parent = None): + def __init__(self, parent=None): """ Constructor @@ -353,10 +355,10 @@ self.tableCombo.setCurrentIndex(tableIndex) index = self.__model.index( - int(Preferences.Prefs.settings.value("Symbols/Top", 0)), + int(Preferences.Prefs.settings.value("Symbols/Top", 0)), 0) self.symbolsTable.scrollTo(index, QAbstractItemView.PositionAtTop) - self.symbolsTable.selectionModel().setCurrentIndex(index, + self.symbolsTable.selectionModel().setCurrentIndex(index, QItemSelectionModel.SelectCurrent | QItemSelectionModel.Rows) @pyqtSlot(QModelIndex)
--- a/UI/UserInterface.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/UserInterface.py Fri Mar 11 16:51:57 2011 +0100 @@ -165,6 +165,7 @@ self.buffer += str(s) self.__nWrite(self.__bufferedWrite()) + class UserInterface(QMainWindow): """ Class implementing the main user interface. @@ -248,7 +249,7 @@ splash.showMessage(self.trUtf8("Initializing Plugin Manager...")) # Initialize the Plugin Manager (Plugins are initialized later - self.pluginManager = PluginManager(self, develPlugin = plugin) + self.pluginManager = PluginManager(self, develPlugin=plugin) splash.showMessage(self.trUtf8("Generating Main User Interface...")) @@ -258,7 +259,7 @@ # Generate the debugger part of the ui logging.debug("Creating Debugger UI...") - self.debuggerUI = DebugUI(self, self.viewmanager, debugServer, + self.debuggerUI = DebugUI(self, self.viewmanager, debugServer, self.debugViewer, self.project) self.debugViewer.setDebugger(self.debuggerUI) self.shell.setDebuggerUI(self.debuggerUI) @@ -449,7 +450,7 @@ self.findFilesDialog.sourceFile.connect( self.viewmanager.openSourceFile) self.findFilesDialog.designerFile.connect(self.__designer) - self.replaceFilesDialog = FindFileDialog(self.project, replaceMode = True) + self.replaceFilesDialog = FindFileDialog(self.project, replaceMode=True) self.replaceFilesDialog.sourceFile.connect( self.viewmanager.openSourceFile) self.replaceFilesDialog.designerFile.connect(self.__designer) @@ -600,7 +601,7 @@ styleSheetFile = Preferences.getUI("StyleSheet") if styleSheetFile: try: - f = open(styleSheetFile, "r", encoding = "utf-8") + f = open(styleSheetFile, "r", encoding="utf-8") styleSheet = f.read() f.close() except IOError as msg: @@ -678,7 +679,7 @@ # Create the debug viewer maybe without the embedded shell self.debugViewer = DebugViewer(debugServer, False, self.viewmanager, None, - embeddedShell=self.embeddedShell, + embeddedShell=self.embeddedShell, embeddedBrowser=(self.embeddedFileBrowser == 1)) self.debugViewer.setWindowTitle(self.trUtf8("Debug-Viewer")) @@ -710,9 +711,9 @@ self.numbersViewer = NumbersWidget() self.numbersViewer.setWindowTitle(self.trUtf8("Numbers")) - self.windows = [self.projectBrowser, None, self.debugViewer, - None, self.logViewer, self.taskViewer, self.templateViewer, - self.multiProjectBrowser, self.terminal, self.cooperation, + self.windows = [self.projectBrowser, None, self.debugViewer, + None, self.logViewer, self.taskViewer, self.templateViewer, + self.multiProjectBrowser, self.terminal, self.cooperation, self.symbolsViewer, self.numbersViewer] if self.embeddedShell: @@ -727,7 +728,7 @@ self.browser = Browser(None) self.browser.setWindowTitle(self.trUtf8("File-Browser")) self.windows[1] = self.browser - elif self.embeddedFileBrowser == 1: # embedded in debug browser + elif self.embeddedFileBrowser == 1: # embedded in debug browser self.browser = self.debugViewer.browser else: # embedded in project browser self.browser = self.projectBrowser.fileBrowser @@ -750,21 +751,21 @@ self.__createDockWindow("MultiProjectBrowserDock") self.multiProjectBrowser = MultiProjectBrowser(self.multiProject) self.__setupDockWindow(self.multiProjectBrowserDock, Qt.LeftDockWidgetArea, - self.multiProjectBrowser, + self.multiProjectBrowser, self.trUtf8("Multiproject-Viewer")) # Create the debug viewer maybe without the embedded shell self.debugViewerDock = self.__createDockWindow("DebugViewerDock") - self.debugViewer = DebugViewer(debugServer, True, self.viewmanager, + self.debugViewer = DebugViewer(debugServer, True, self.viewmanager, self.debugViewerDock, - embeddedShell=self.embeddedShell, + embeddedShell=self.embeddedShell, embeddedBrowser=(self.embeddedFileBrowser == 1)) self.__setupDockWindow(self.debugViewerDock, Qt.RightDockWidgetArea, self.debugViewer, self.trUtf8("Debug-Viewer")) # Create the chat part of the user interface self.cooperationDock = self.__createDockWindow("CooperationDock") - self.cooperation = ChatWidget(parent = self.cooperationDock) + self.cooperation = ChatWidget(parent=self.cooperationDock) self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, self.cooperation, self.trUtf8("Cooperation")) @@ -782,7 +783,7 @@ # Create the template viewer part of the user interface self.templateViewerDock = self.__createDockWindow("TemplateViewerDock") - self.templateViewer = TemplateViewer(self.templateViewerDock, + self.templateViewer = TemplateViewer(self.templateViewerDock, self.viewmanager) self.__setupDockWindow(self.templateViewerDock, Qt.RightDockWidgetArea, self.templateViewer, self.trUtf8("Template-Viewer")) @@ -793,8 +794,8 @@ self.__setupDockWindow(self.terminalDock, Qt.BottomDockWidgetArea, self.terminal, self.trUtf8("Terminal")) - self.windows = [self.projectBrowserDock, None, self.debugViewerDock, - None, self.logViewerDock, self.taskViewerDock, self.templateViewerDock, + self.windows = [self.projectBrowserDock, None, self.debugViewerDock, + None, self.logViewerDock, self.taskViewerDock, self.templateViewerDock, self.multiProjectBrowserDock, self.terminalDock, self.cooperationDock] if self.embeddedShell: @@ -814,7 +815,7 @@ self.__setupDockWindow(self.browserDock, Qt.RightDockWidgetArea, self.browser, self.trUtf8("File-Browser")) self.windows[1] = self.browserDock - elif self.embeddedFileBrowser == 1: # embedded in debug browser + elif self.embeddedFileBrowser == 1: # embedded in debug browser self.browser = self.debugViewer.browser else: # embedded in project browser self.browser = self.projectBrowser.fileBrowser @@ -842,69 +843,69 @@ # Create the vertical toolbox self.vToolboxDock = self.__createDockWindow("vToolboxDock") self.vToolbox = E5VerticalToolBox(self.vToolboxDock) - self.__setupDockWindow(self.vToolboxDock, Qt.LeftDockWidgetArea, + self.__setupDockWindow(self.vToolboxDock, Qt.LeftDockWidgetArea, self.vToolbox, self.trUtf8("Vertical Toolbox")) # Create the horizontal toolbox self.hToolboxDock = self.__createDockWindow("hToolboxDock") self.hToolbox = E5HorizontalToolBox(self.hToolboxDock) - self.__setupDockWindow(self.hToolboxDock, Qt.BottomDockWidgetArea, + self.__setupDockWindow(self.hToolboxDock, Qt.BottomDockWidgetArea, self.hToolbox, self.trUtf8("Horizontal Toolbox")) # Create the project browser self.projectBrowser = ProjectBrowser(self.project, None, embeddedBrowser=(self.embeddedFileBrowser == 2)) - self.vToolbox.addItem(self.projectBrowser, - UI.PixmapCache.getIcon("projectViewer.png"), + self.vToolbox.addItem(self.projectBrowser, + UI.PixmapCache.getIcon("projectViewer.png"), self.trUtf8("Project-Viewer")) # Create the multi project browser self.multiProjectBrowser = MultiProjectBrowser(self.multiProject) - self.vToolbox.addItem(self.multiProjectBrowser, - UI.PixmapCache.getIcon("multiProjectViewer.png"), + self.vToolbox.addItem(self.multiProjectBrowser, + UI.PixmapCache.getIcon("multiProjectViewer.png"), self.trUtf8("Multiproject-Viewer")) # Create the template viewer part of the user interface - self.templateViewer = TemplateViewer(None, + self.templateViewer = TemplateViewer(None, self.viewmanager) - self.vToolbox.addItem(self.templateViewer, - UI.PixmapCache.getIcon("templateViewer.png"), + self.vToolbox.addItem(self.templateViewer, + UI.PixmapCache.getIcon("templateViewer.png"), self.trUtf8("Template-Viewer")) # Create the debug viewer maybe without the embedded shell self.debugViewerDock = self.__createDockWindow("DebugViewerDock") - self.debugViewer = DebugViewer(debugServer, True, self.viewmanager, + self.debugViewer = DebugViewer(debugServer, True, self.viewmanager, self.debugViewerDock, - embeddedShell=self.embeddedShell, + embeddedShell=self.embeddedShell, embeddedBrowser=(self.embeddedFileBrowser == 1)) self.__setupDockWindow(self.debugViewerDock, Qt.RightDockWidgetArea, self.debugViewer, self.trUtf8("Debug-Viewer")) # Create the chat part of the user interface self.cooperationDock = self.__createDockWindow("CooperationDock") - self.cooperation = ChatWidget(parent = self.cooperationDock) + self.cooperation = ChatWidget(parent=self.cooperationDock) self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, self.cooperation, self.trUtf8("Cooperation")) # Create the terminal part of the user interface self.terminal = Terminal(self.viewmanager) - self.hToolbox.addItem(self.terminal, - UI.PixmapCache.getIcon("terminal.png"), + self.hToolbox.addItem(self.terminal, + UI.PixmapCache.getIcon("terminal.png"), self.trUtf8("Terminal")) # Create the task viewer part of the user interface self.taskViewer = TaskViewer(None, self.project) - self.hToolbox.addItem(self.taskViewer, - UI.PixmapCache.getIcon("task.png"), + self.hToolbox.addItem(self.taskViewer, + UI.PixmapCache.getIcon("task.png"), self.trUtf8("Task-Viewer")) # Create the log viewer part of the user interface self.logViewer = LogViewer() - self.hToolbox.addItem(self.logViewer, - UI.PixmapCache.getIcon("logViewer.png"), + self.hToolbox.addItem(self.logViewer, + UI.PixmapCache.getIcon("logViewer.png"), self.trUtf8("Log-Viewer")) - self.windows = [None, None, self.debugViewerDock, None, None, + self.windows = [None, None, self.debugViewerDock, None, None, None, None, None, None, self.cooperationDock] if self.embeddedShell: @@ -912,31 +913,31 @@ else: # Create the shell self.shell = Shell(debugServer, self.viewmanager) - self.hToolbox.insertItem(0, self.shell, - UI.PixmapCache.getIcon("shell.png"), + self.hToolbox.insertItem(0, self.shell, + UI.PixmapCache.getIcon("shell.png"), self.trUtf8("Shell")) if self.embeddedFileBrowser == 0: # separate window # Create the file browser self.browser = Browser() - self.vToolbox.addItem(self.browser, - UI.PixmapCache.getIcon("browser.png"), + self.vToolbox.addItem(self.browser, + UI.PixmapCache.getIcon("browser.png"), self.trUtf8("File-Browser")) - elif self.embeddedFileBrowser == 1: # embedded in debug browser + elif self.embeddedFileBrowser == 1: # embedded in debug browser self.browser = self.debugViewer.browser else: # embedded in project browser self.browser = self.projectBrowser.fileBrowser # Create the symbols viewer self.symbolsViewer = SymbolsWidget() - self.vToolbox.addItem(self.symbolsViewer, - UI.PixmapCache.getIcon("symbols.png"), + self.vToolbox.addItem(self.symbolsViewer, + UI.PixmapCache.getIcon("symbols.png"), self.trUtf8("Symbols")) # Create the numbers viewer self.numbersViewer = NumbersWidget() - self.hToolbox.addItem(self.numbersViewer, - UI.PixmapCache.getIcon("numbers.png"), + self.hToolbox.addItem(self.numbersViewer, + UI.PixmapCache.getIcon("numbers.png"), self.trUtf8("Numbers")) self.hToolbox.setCurrentIndex(0) @@ -957,63 +958,63 @@ logging.debug("Creating Project Browser...") self.projectBrowser = ProjectBrowser(self.project, None, embeddedBrowser=(self.embeddedFileBrowser == 2)) - self.leftSidebar.addTab(self.projectBrowser, - UI.PixmapCache.getIcon("projectViewer.png"), + self.leftSidebar.addTab(self.projectBrowser, + UI.PixmapCache.getIcon("projectViewer.png"), self.trUtf8("Project-Viewer")) # Create the multi project browser logging.debug("Creating Multiproject Browser...") self.multiProjectBrowser = MultiProjectBrowser(self.multiProject) - self.leftSidebar.addTab(self.multiProjectBrowser, - UI.PixmapCache.getIcon("multiProjectViewer.png"), + self.leftSidebar.addTab(self.multiProjectBrowser, + UI.PixmapCache.getIcon("multiProjectViewer.png"), self.trUtf8("Multiproject-Viewer")) # Create the template viewer part of the user interface logging.debug("Creating Template Viewer...") - self.templateViewer = TemplateViewer(None, + self.templateViewer = TemplateViewer(None, self.viewmanager) - self.leftSidebar.addTab(self.templateViewer, - UI.PixmapCache.getIcon("templateViewer.png"), + self.leftSidebar.addTab(self.templateViewer, + UI.PixmapCache.getIcon("templateViewer.png"), self.trUtf8("Template-Viewer")) # Create the debug viewer maybe without the embedded shell logging.debug("Creating Debug Viewer...") self.debugViewerDock = self.__createDockWindow("DebugViewerDock") - self.debugViewer = DebugViewer(debugServer, True, self.viewmanager, + self.debugViewer = DebugViewer(debugServer, True, self.viewmanager, self.debugViewerDock, - embeddedShell=self.embeddedShell, + embeddedShell=self.embeddedShell, embeddedBrowser=(self.embeddedFileBrowser == 1)) self.__setupDockWindow(self.debugViewerDock, Qt.RightDockWidgetArea, self.debugViewer, self.trUtf8("Debug-Viewer")) # Create the chat part of the user interface self.cooperationDock = self.__createDockWindow("CooperationDock") - self.cooperation = ChatWidget(parent = self.cooperationDock) + self.cooperation = ChatWidget(parent=self.cooperationDock) self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, self.cooperation, self.trUtf8("Cooperation")) # Create the terminal part of the user interface logging.debug("Creating Terminal...") self.terminal = Terminal(self.viewmanager) - self.bottomSidebar.addTab(self.terminal, - UI.PixmapCache.getIcon("terminal.png"), + self.bottomSidebar.addTab(self.terminal, + UI.PixmapCache.getIcon("terminal.png"), self.trUtf8("Terminal")) # Create the task viewer part of the user interface logging.debug("Creating Task Viewer...") self.taskViewer = TaskViewer(None, self.project) - self.bottomSidebar.addTab(self.taskViewer, - UI.PixmapCache.getIcon("task.png"), + self.bottomSidebar.addTab(self.taskViewer, + UI.PixmapCache.getIcon("task.png"), self.trUtf8("Task-Viewer")) # Create the log viewer part of the user interface logging.debug("Creating Log Viewer...") self.logViewer = LogViewer() - self.bottomSidebar.addTab(self.logViewer, - UI.PixmapCache.getIcon("logViewer.png"), + self.bottomSidebar.addTab(self.logViewer, + UI.PixmapCache.getIcon("logViewer.png"), self.trUtf8("Log-Viewer")) - self.windows = [None, None, self.debugViewerDock, None, None, + self.windows = [None, None, self.debugViewerDock, None, None, None, None, None, None, self.cooperationDock] if self.embeddedShell: @@ -1022,32 +1023,32 @@ # Create the shell logging.debug("Creating Shell...") self.shell = Shell(debugServer, self.viewmanager) - self.bottomSidebar.insertTab(0, self.shell, - UI.PixmapCache.getIcon("shell.png"), + self.bottomSidebar.insertTab(0, self.shell, + UI.PixmapCache.getIcon("shell.png"), self.trUtf8("Shell")) if self.embeddedFileBrowser == 0: # separate window # Create the file browser logging.debug("Creating File Browser...") self.browser = Browser() - self.leftSidebar.addTab(self.browser, - UI.PixmapCache.getIcon("browser.png"), + self.leftSidebar.addTab(self.browser, + UI.PixmapCache.getIcon("browser.png"), self.trUtf8("File-Browser")) - elif self.embeddedFileBrowser == 1: # embedded in debug browser + elif self.embeddedFileBrowser == 1: # embedded in debug browser self.browser = self.debugViewer.browser else: # embedded in project browser self.browser = self.projectBrowser.fileBrowser # Create the symbols viewer self.symbolsViewer = SymbolsWidget() - self.leftSidebar.addTab(self.symbolsViewer, - UI.PixmapCache.getIcon("symbols.png"), + self.leftSidebar.addTab(self.symbolsViewer, + UI.PixmapCache.getIcon("symbols.png"), self.trUtf8("Symbols")) # Create the numbers viewer self.numbersViewer = NumbersWidget() - self.bottomSidebar.addTab(self.numbersViewer, - UI.PixmapCache.getIcon("numbers.png"), + self.bottomSidebar.addTab(self.numbersViewer, + UI.PixmapCache.getIcon("numbers.png"), self.trUtf8("Numbers")) self.bottomSidebar.setCurrentIndex(0) @@ -1108,7 +1109,7 @@ if self.bottomSidebar.isAutoHiding(): self.bottomSidebar.setFocus() - def __openOnStartup(self, startupType = None): + def __openOnStartup(self, startupType=None): """ Private method to open the last file, project or multiproject. @@ -1116,11 +1117,11 @@ "Nothing", "File", "Project", "MultiProject" or "Session") """ startupTypeMapping = { - "Nothing" : 0, - "File" : 1, - "Project" : 2, - "MultiProject" : 3, - "Session" : 4, + "Nothing": 0, + "File": 1, + "Project": 2, + "MultiProject": 3, + "Session": 4, } if startupType is None: @@ -1159,10 +1160,10 @@ @param args list of files to open<br /> The args are processed one at a time. All arguments after a - '--' option are considered debug arguments to the program + '--' option are considered debug arguments to the program for the debugger. All files named before the '--' option - are opened in a text editor, unless the argument ends in - .e4p, then it is opened as a project file. If it ends in + are opened in a text editor, unless the argument ends in + .e4p, then it is opened as a project file. If it ends in .e4m, it is opened as a multiproject. """ # no args, return @@ -1252,7 +1253,7 @@ dock.setWindowTitle(caption) dock.show() - def __setWindowCaption(self, editor = None, project = None): + def __setWindowCaption(self, editor=None, project=None): """ Private method to set the caption of the Main Window. @@ -1298,7 +1299,7 @@ self.exitAct = E5Action(self.trUtf8('Quit'), UI.PixmapCache.getIcon("exit.png"), self.trUtf8('&Quit'), - QKeySequence(self.trUtf8("Ctrl+Q","File|Quit")), + QKeySequence(self.trUtf8("Ctrl+Q", "File|Quit")), 0, self, 'quit') self.exitAct.setStatusTip(self.trUtf8('Quit the IDE')) self.exitAct.setWhatsThis(self.trUtf8( @@ -1364,7 +1365,7 @@ self.addAction(self.pbActivateAct) self.mpbAct = E5Action(self.trUtf8('Multiproject-Viewer'), - self.trUtf8('&Multiproject-Viewer'), 0, 0, self, + self.trUtf8('&Multiproject-Viewer'), 0, 0, self, 'multi_project_viewer', True) self.mpbAct.setStatusTip(self.trUtf8('Toggle the Multiproject-Viewer window')) self.mpbAct.setWhatsThis(self.trUtf8( @@ -1501,7 +1502,7 @@ self.trUtf8('Activate Task-Viewer'), QKeySequence(self.trUtf8("Alt+Shift+T")), 0, self, - 'task_viewer_activate',1) + 'task_viewer_activate', 1) self.taskViewerActivateAct.triggered[()].connect(self.__activateTaskViewer) self.actions.append(self.taskViewerActivateAct) self.addAction(self.taskViewerActivateAct) @@ -1522,7 +1523,7 @@ self.trUtf8('Activate Template-Viewer'), QKeySequence(self.trUtf8("Alt+Shift+A")), 0, self, - 'template_viewer_activate',1) + 'template_viewer_activate', 1) self.templateViewerActivateAct.triggered[()].connect(self.__activateTemplateViewer) self.actions.append(self.templateViewerActivateAct) self.addAction(self.templateViewerActivateAct) @@ -1539,7 +1540,7 @@ self.actions.append(self.vtAct) self.htAct = E5Action(self.trUtf8('Horizontal Toolbox'), - self.trUtf8('&Horizontal Toolbox'), 0, 0, self, + self.trUtf8('&Horizontal Toolbox'), 0, 0, self, 'horizontal_toolbox', True) self.htAct.setStatusTip(self.trUtf8('Toggle the Horizontal Toolbox window')) self.htAct.setWhatsThis(self.trUtf8( @@ -1562,7 +1563,7 @@ self.actions.append(self.lsbAct) self.bsbAct = E5Action(self.trUtf8('Bottom Sidebar'), - self.trUtf8('&Bottom Sidebar'), 0, 0, self, + self.trUtf8('&Bottom Sidebar'), 0, 0, self, 'bottom_sidebar', True) self.bsbAct.setStatusTip(self.trUtf8('Toggle the bottom sidebar window')) self.bsbAct.setWhatsThis(self.trUtf8( @@ -1641,7 +1642,7 @@ self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), UI.PixmapCache.getIcon("whatsThis.png"), - self.trUtf8('&What\'s This?'), + self.trUtf8('&What\'s This?'), QKeySequence(self.trUtf8("Shift+F1")), 0, self, 'whatsThis') self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help')) @@ -1658,7 +1659,7 @@ self.helpviewerAct = E5Action(self.trUtf8('Helpviewer'), UI.PixmapCache.getIcon("help.png"), - self.trUtf8('&Helpviewer...'), + self.trUtf8('&Helpviewer...'), QKeySequence(self.trUtf8("F1")), 0, self, 'helpviewer') self.helpviewerAct.setStatusTip(self.trUtf8('Open the helpviewer window')) @@ -1700,7 +1701,7 @@ self.actions.append(self.checkUpdateAct) self.showVersionsAct = E5Action(self.trUtf8('Show downloadable versions'), - self.trUtf8('Show &downloadable versions...'), + self.trUtf8('Show &downloadable versions...'), 0, 0, self, 'show_downloadable_versions') self.showVersionsAct.setStatusTip( self.trUtf8('Show the versions available for download')) @@ -1734,7 +1735,7 @@ self.utActGrp = createActionGroup(self) - self.utDialogAct = E5Action(self.trUtf8('Unittest'), + self.utDialogAct = E5Action(self.trUtf8('Unittest'), UI.PixmapCache.getIcon("unittest.png"), self.trUtf8('&Unittest...'), 0, 0, self.utActGrp, 'unittest') @@ -1791,7 +1792,7 @@ "{0}.exe".format(Utilities.generateQtToolName("designer")) or \ Utilities.generateQtToolName("designer") if Utilities.isinpath(designerExe): - self.designer4Act = E5Action(self.trUtf8('Qt-Designer 4'), + self.designer4Act = E5Action(self.trUtf8('Qt-Designer 4'), UI.PixmapCache.getIcon("designer4.png"), self.trUtf8('&Designer 4...'), 0, 0, self, 'qt_designer4') self.designer4Act.setStatusTip(self.trUtf8('Start Qt-Designer 4')) @@ -1808,7 +1809,7 @@ "{0}.exe".format(Utilities.generateQtToolName("linguist")) or \ Utilities.generateQtToolName("linguist") if Utilities.isinpath(linguistExe): - self.linguist4Act = E5Action(self.trUtf8('Qt-Linguist 4'), + self.linguist4Act = E5Action(self.trUtf8('Qt-Linguist 4'), UI.PixmapCache.getIcon("linguist4.png"), self.trUtf8('&Linguist 4...'), 0, 0, self, 'qt_linguist4') self.linguist4Act.setStatusTip(self.trUtf8('Start Qt-Linguist 4')) @@ -1821,7 +1822,7 @@ else: self.linguist4Act = None - self.uipreviewerAct = E5Action(self.trUtf8('UI Previewer'), + self.uipreviewerAct = E5Action(self.trUtf8('UI Previewer'), UI.PixmapCache.getIcon("uiPreviewer.png"), self.trUtf8('&UI Previewer...'), 0, 0, self, 'ui_previewer') self.uipreviewerAct.setStatusTip(self.trUtf8('Start the UI Previewer')) @@ -1832,7 +1833,7 @@ self.uipreviewerAct.triggered[()].connect(self.__UIPreviewer) self.actions.append(self.uipreviewerAct) - self.trpreviewerAct = E5Action(self.trUtf8('Translations Previewer'), + self.trpreviewerAct = E5Action(self.trUtf8('Translations Previewer'), UI.PixmapCache.getIcon("trPreviewer.png"), self.trUtf8('&Translations Previewer...'), 0, 0, self, 'tr_previewer') self.trpreviewerAct.setStatusTip(self.trUtf8('Start the Translations Previewer')) @@ -1856,7 +1857,7 @@ self.compareAct = E5Action(self.trUtf8('Compare Files side by side'), UI.PixmapCache.getIcon("compareFiles.png"), - self.trUtf8('Compare Files &side by side...'), + self.trUtf8('Compare Files &side by side...'), 0, 0, self, 'compare_files') self.compareAct.setStatusTip(self.trUtf8('Compare two files')) self.compareAct.setWhatsThis(self.trUtf8( @@ -1869,7 +1870,7 @@ self.sqlBrowserAct = E5Action(self.trUtf8('SQL Browser'), UI.PixmapCache.getIcon("sqlBrowser.png"), - self.trUtf8('SQL &Browser...'), + self.trUtf8('SQL &Browser...'), 0, 0, self, 'sql_browser') self.sqlBrowserAct.setStatusTip(self.trUtf8('Browse a SQL database')) self.sqlBrowserAct.setWhatsThis(self.trUtf8( @@ -1881,7 +1882,7 @@ self.miniEditorAct = E5Action(self.trUtf8('Mini Editor'), UI.PixmapCache.getIcon("editor.png"), - self.trUtf8('Mini &Editor...'), + self.trUtf8('Mini &Editor...'), 0, 0, self, 'mini_editor') self.miniEditorAct.setStatusTip(self.trUtf8('Mini Editor')) self.miniEditorAct.setWhatsThis(self.trUtf8( @@ -1893,7 +1894,7 @@ self.webBrowserAct = E5Action(self.trUtf8('Web Browser'), UI.PixmapCache.getIcon("ericWeb.png"), - self.trUtf8('&Web Browser...'), + self.trUtf8('&Web Browser...'), 0, 0, self, 'web_browser') self.webBrowserAct.setStatusTip(self.trUtf8('Start the eric5 Web Browser')) self.webBrowserAct.setWhatsThis(self.trUtf8( @@ -1905,7 +1906,7 @@ self.iconEditorAct = E5Action(self.trUtf8('Icon Editor'), UI.PixmapCache.getIcon("iconEditor.png"), - self.trUtf8('&Icon Editor...'), + self.trUtf8('&Icon Editor...'), 0, 0, self, 'icon_editor') self.iconEditorAct.setStatusTip(self.trUtf8('Start the eric5 Icon Editor')) self.iconEditorAct.setWhatsThis(self.trUtf8( @@ -2038,29 +2039,29 @@ self.trUtf8('Activate current editor'), QKeySequence(self.trUtf8("Alt+Shift+E")), 0, self, - 'viewmanager_activate',1) + 'viewmanager_activate', 1) self.viewmanagerActivateAct.triggered[()].connect(self.__activateViewmanager) self.actions.append(self.viewmanagerActivateAct) self.addAction(self.viewmanagerActivateAct) - self.nextTabAct = E5Action(self.trUtf8('Show next'), - self.trUtf8('Show next'), + self.nextTabAct = E5Action(self.trUtf8('Show next'), + self.trUtf8('Show next'), QKeySequence(self.trUtf8('Ctrl+Alt+Tab')), 0, self, 'view_next_tab') self.nextTabAct.triggered[()].connect(self.__showNext) self.actions.append(self.nextTabAct) self.addAction(self.nextTabAct) - self.prevTabAct = E5Action(self.trUtf8('Show previous'), - self.trUtf8('Show previous'), + self.prevTabAct = E5Action(self.trUtf8('Show previous'), + self.trUtf8('Show previous'), QKeySequence(self.trUtf8('Shift+Ctrl+Alt+Tab')), 0, self, 'view_previous_tab') self.prevTabAct.triggered[()].connect(self.__showPrevious) self.actions.append(self.prevTabAct) self.addAction(self.prevTabAct) - self.switchTabAct = E5Action(self.trUtf8('Switch between tabs'), - self.trUtf8('Switch between tabs'), + self.switchTabAct = E5Action(self.trUtf8('Switch between tabs'), + self.trUtf8('Switch between tabs'), QKeySequence(self.trUtf8('Ctrl+1')), 0, self, 'switch_tabs') self.switchTabAct.triggered[()].connect(self.__switchTab) @@ -2315,7 +2316,7 @@ self.__menus["toolbars"].aboutToShow.connect(self.__showToolbarsMenu) self.__menus["toolbars"].triggered.connect(self.__TBMenuTriggered) - self.__showWindowMenu() # to initialize these actions + self.__showWindowMenu() # to initialize these actions self.__menus["bookmarks"] = self.viewmanager.initBookmarkMenu() mb.addMenu(self.__menus["bookmarks"]) @@ -2591,8 +2592,8 @@ """ the current editor.</p>""" )) - self.viewmanager.setSbInfo(self.sbFile, self.sbLine, self.sbPos, - self.sbWritable, self.sbEncoding, self.sbLanguage, + self.viewmanager.setSbInfo(self.sbFile, self.sbLine, self.sbPos, + self.sbWritable, self.sbEncoding, self.sbLanguage, self.sbEol) self.sbVcsMonitorLed = StatusMonitorLed(self.project, self.__statusBar) @@ -2607,9 +2608,9 @@ category = self.trUtf8("External Tools/{0}").format(toolGroup[0]) for tool in toolGroup[1]: if tool['menutext'] != '--': - act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'], + act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'], self) - act.setObjectName("{0}@@{1}".format(toolGroup[0], + act.setObjectName("{0}@@{1}".format(toolGroup[0], tool['menutext'])) act.triggered[()].connect(self.__toolActionTriggered) self.toolGroupActions[act.objectName()] = act @@ -2648,7 +2649,7 @@ if tool['menutext'] != '--': key = "{0}@@{1}".format(toolGroup[0], tool['menutext']) if key not in groupActionKeys: - act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'], + act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'], self) act.setObjectName(key) act.triggered[()].connect(self.__toolActionTriggered) @@ -2766,7 +2767,7 @@ """ self.__showEmailDialog("feature") - def __showEmailDialog(self, mode, attachFile = None, deleteAttachFile = False): + def __showEmailDialog(self, mode, attachFile=None, deleteAttachFile=False): """ Private slot to show the email dialog in a given mode. @@ -2782,23 +2783,23 @@ Preferences.getUser("MailServer") == "": E5MessageBox.critical(self, self.trUtf8("Report Bug"), - self.trUtf8("""Email address or mail server address is empty.""" + self.trUtf8("""Email address or mail server address is empty.""" """ Please configure your Email settings in the""" """ Preferences Dialog.""")) self.showPreferences("emailPage") return - self.dlg = EmailDialog(mode = mode) + self.dlg = EmailDialog(mode=mode) if attachFile is not None: self.dlg.attachFile(attachFile, deleteAttachFile) self.dlg.show() - def __showSystemEmailClient(self, mode, attachFile = None, deleteAttachFile = False): + def __showSystemEmailClient(self, mode, attachFile=None, deleteAttachFile=False): """ Private slot to show the system email dialog. @param mode mode of the email dialog (string, "bug" or "feature") - @param attachFile name of a file to put into the body of the + @param attachFile name of a file to put into the body of the email (string) @param deleteAttachFile flag indicating to delete the file after it has been read (boolean) @@ -2809,15 +2810,15 @@ address = BugAddress subject = "[eric5] " if attachFile is not None: - f = open(attachFile, "r", encoding = "utf-8") + f = open(attachFile, "r", encoding="utf-8") body = f.read() f.close() if deleteAttachFile: os.remove(attachFile) else: body = "\r\n----\r\n{0}----\r\n{1}----\r\n{2}".format( - Utilities.generateVersionInfo("\r\n"), - Utilities.generatePluginsVersionInfo("\r\n"), + Utilities.generateVersionInfo("\r\n"), + Utilities.generatePluginsVersionInfo("\r\n"), Utilities.generateDistroInfo("\r\n")) url = QUrl("mailto:{0}".format(address)) @@ -2833,26 +2834,26 @@ if Preferences.getUI("CheckErrorLog"): logFile = os.path.join(Utilities.getConfigDir(), "eric5_error.log") if os.path.exists(logFile): - dlg = E5MessageBox.E5MessageBox(E5MessageBox.Question, - self.trUtf8("Error log found"), + dlg = E5MessageBox.E5MessageBox(E5MessageBox.Question, + self.trUtf8("Error log found"), self.trUtf8("An error log file was found. " - "What should be done with it?"), - modal = True, parent = self) + "What should be done with it?"), + modal=True, parent=self) try: - f = open(logFile, "r", encoding = "utf-8") + f = open(logFile, "r", encoding="utf-8") txt = f.read() f.close() dlg.setDetailedText(txt) except IOError: pass emailButton = \ - dlg.addButton(self.trUtf8("Send Bug Email"), + dlg.addButton(self.trUtf8("Send Bug Email"), E5MessageBox.AcceptRole) deleteButton = \ - dlg.addButton(self.trUtf8("Ignore and Delete"), + dlg.addButton(self.trUtf8("Ignore and Delete"), E5MessageBox.AcceptRole) keepButton = \ - dlg.addButton(self.trUtf8("Ignore but Keep"), + dlg.addButton(self.trUtf8("Ignore but Keep"), E5MessageBox.AcceptRole) dlg.setDefaultButton(emailButton) dlg.setEscapeButton(keepButton) @@ -2860,8 +2861,8 @@ btn = dlg.clickedButton() if btn == emailButton: # start email dialog - self.__showEmailDialog("bug", - attachFile = logFile, deleteAttachFile = True) + self.__showEmailDialog("bug", + attachFile=logFile, deleteAttachFile=True) elif btn == deleteButton: # delete the error log os.remove(logFile) @@ -2889,7 +2890,7 @@ """ Private slot to show a mini editor window. """ - editor = MiniEditor(parent = self) + editor = MiniEditor(parent=self) editor.show() def addE5Actions(self, actions, type): @@ -2905,7 +2906,7 @@ elif type == 'wizards': self.wizardsActions.extend(actions) - def removeE5Actions(self, actions, type = 'ui'): + def removeE5Actions(self, actions, type='ui'): """ Public method to remove actions from the list of actions. @@ -2942,7 +2943,7 @@ Public method to get a reference to an action of a menu. @param menuName name of the menu to search in (string) - @param actionName object name of the action to search for + @param actionName object name of the action to search for (string) """ try: @@ -3053,7 +3054,7 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Restart application"), self.trUtf8("""The application needs to be restarted. Do it now?"""), - yesDefault = True) + yesDefault=True) if res and self.__shutdown(): e5App().closeAllWindows() @@ -3075,7 +3076,7 @@ self.__toolGroupsConfiguration) act.setData(-1) act = self.__menus["tools"].addAction( - self.trUtf8("Configure current Tool Group ..."), + self.trUtf8("Configure current Tool Group ..."), self.__toolsConfiguration) act.setData(-2) self.__menus["tools"].addSeparator() @@ -3355,7 +3356,7 @@ self.profiles[self.currentProfile][5][1] = self.bottomSidebar.isVisible() Preferences.setUI("ViewProfiles", self.profiles) - def __activateViewProfile(self, name, save = True): + def __activateViewProfile(self, name, save=True): """ Private slot to activate a view profile. @@ -3425,7 +3426,7 @@ if self.__menus["window"].isTearOffMenuVisible(): self.__showWindowMenu() - def __setEditProfile(self, save = True): + def __setEditProfile(self, save=True): """ Private slot to activate the edit view profile. @@ -3447,7 +3448,7 @@ if not self.embeddedShell: self.bottomSidebar.setCurrentWidget(self.shell) - def setDebugProfile(self, save = True): + def setDebugProfile(self, save=True): """ Public slot to activate the debug view profile. @@ -3756,7 +3757,7 @@ self.leftSidebar.setCurrentWidget(self.browser) else: self.browser.show() - elif self.embeddedFileBrowser == 1: # embedded in debug browser + elif self.embeddedFileBrowser == 1: # embedded in debug browser if self.layout in ["DockWindows", "Toolboxes", "Sidebars"]: self.debugViewerDock.show() self.debugViewerDock.raise_() @@ -3962,7 +3963,7 @@ self.unittestDialog.show() self.unittestDialog.raise_() - def __unittestScript(self, prog = None): + def __unittestScript(self, prog=None): """ Private slot for displaying the unittest dialog and run the current script. @@ -4013,7 +4014,7 @@ self.unittestDialog.raise_() self.unittestDialog.on_startButton_clicked() - def __designer(self, fn = None, version = 0): + def __designer(self, fn=None, version=0): """ Private slot to start the Qt-Designer executable. @@ -4023,7 +4024,7 @@ if fn is not None and version == 0: # determine version from file, if not specified try: - f = open(fn, "r", encoding = "utf-8") + f = open(fn, "r", encoding="utf-8") found = False while not found: uiLine = f.readline() @@ -4087,9 +4088,9 @@ """ Private slot to start the Qt-Designer 4 executable. """ - self.__designer(version = 4) - - def __linguist(self, fn = None, version = 0): + self.__designer(version=4) + + def __linguist(self, fn=None, version=0): """ Private slot to start the Qt-Linguist executable. @@ -4140,15 +4141,15 @@ 'Ensure that it is available as <b>{0}</b>.</p>' ).format(linguist)) - def __linguist4(self, fn = None): + def __linguist4(self, fn=None): """ Private slot to start the Qt-Linguist 4 executable. @param fn filename of the translation file to be opened """ - self.__linguist(fn, version = 4) + self.__linguist(fn, version=4) - def __assistant(self, home = None, version = 0): + def __assistant(self, home=None, version=0): """ Private slot to start the Qt-Assistant executable. @@ -4188,9 +4189,9 @@ """ Private slot to start the Qt-Assistant 4 executable. """ - self.__assistant(version = 4) + self.__assistant(version=4) - def __startWebBrowser(self, home = ""): + def __startWebBrowser(self, home=""): """ Private slot to start the eric5 web browser. @@ -4198,7 +4199,7 @@ """ self.launchHelpViewer(home) - def __customViewer(self, home = None): + def __customViewer(self, home=None): """ Private slot to start a custom viewer. @@ -4244,7 +4245,7 @@ 'Ensure that it is available as <b>hh</b>.</p>' )) - def __UIPreviewer(self,fn=None): + def __UIPreviewer(self, fn=None): """ Private slot to start the UI Previewer executable. @@ -4284,7 +4285,7 @@ 'Ensure that it is available as <b>{0}</b>.</p>' ).format(viewer)) - def __TRPreviewer(self, fileNames = None, ignore = False): + def __TRPreviewer(self, fileNames=None, ignore=False): """ Private slot to start the Translation Previewer executable. @@ -4348,13 +4349,13 @@ 'Ensure that it is available as <b>{0}</b>.</p>' ).format(browser)) - def __editPixmap(self, fn = ""): + def __editPixmap(self, fn=""): """ Private slot to show a pixmap in a dialog. @param fn filename of the file to show (string) """ - dlg = IconEditorWindow(fn, self, fromEric = True) + dlg = IconEditorWindow(fn, self, fromEric=True) dlg.show() def __showPixmap(self, fn): @@ -4471,7 +4472,7 @@ toolProc.setReadChannel(QProcess.StandardOutput) if toolProcData[0] is None or \ - toolProcData[1] not in ["insert", "replaceSelection"]: + toolProcData[1] not in ["insert", "replaceSelection"]: # not connected to an editor or wrong mode while toolProc.canReadLine(): s = "{0} - ".format(program) @@ -4534,10 +4535,10 @@ pythonDocDir = Preferences.getHelp("PythonDocDir") if not pythonDocDir: if Utilities.isWindowsPlatform(): - pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", + pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", os.path.join(os.path.dirname(sys.executable), "doc")) else: - pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", + pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", '/usr/share/doc/packages/python/html') if not pythonDocDir.startswith("http://") and \ not pythonDocDir.startswith("https://"): @@ -4576,7 +4577,7 @@ if hvType == 1: self.launchHelpViewer(home) elif hvType == 2: - self.__assistant(home, version = 4) + self.__assistant(home, version=4) elif hvType == 3: self.__webBrowser(home) else: @@ -4596,7 +4597,7 @@ default = "" pythonDocDir = Utilities.getEnvironmentEntry("PYTHON2DOCDIR", default) else: - pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", + pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", '/usr/share/doc/packages/python/html/python-docs-html') if not pythonDocDir.startswith("http://") and \ not pythonDocDir.startswith("https://"): @@ -4630,7 +4631,7 @@ if hvType == 1: self.launchHelpViewer(home) elif hvType == 2: - self.__assistant(home, version = 4) + self.__assistant(home, version=4) elif hvType == 3: self.__webBrowser(home) else: @@ -4676,7 +4677,7 @@ if hvType == 1: self.launchHelpViewer(home) elif hvType == 2: - self.__assistant(home, version = 4) + self.__assistant(home, version=4) elif hvType == 3: self.__webBrowser(home) else: @@ -4735,7 +4736,7 @@ if hvType == 1: self.launchHelpViewer(home) elif hvType == 2: - self.__assistant(home, version = 4) + self.__assistant(home, version=4) elif hvType == 3: self.__webBrowser(home) else: @@ -4767,7 +4768,7 @@ if hvType == 1: self.launchHelpViewer(home) elif hvType == 2: - self.__assistant(home, version = 4) + self.__assistant(home, version=4) elif hvType == 3: self.__webBrowser(home) else: @@ -4815,13 +4816,13 @@ if hvType == 1: self.launchHelpViewer(home) elif hvType == 2: - self.__assistant(home, version = 4) + self.__assistant(home, version=4) elif hvType == 3: self.__webBrowser(home) else: self.__customViewer(home) - def launchHelpViewer(self, home, searchWord = None): + def launchHelpViewer(self, home, searchWord=None): """ Public slot to start the help viewer. @@ -4833,8 +4834,8 @@ if not homeUrl.scheme(): home = QUrl.fromLocalFile(home).toString() if not Preferences.getHelp("SingleHelpWindow") or self.helpWindow is None: - help = HelpWindow(home, '.', None, 'help viewer', True, - searchWord = searchWord) + help = HelpWindow(home, '.', None, 'help viewer', True, + searchWord=searchWord) if QApplication.desktop().width() > 400 and \ QApplication.desktop().height() > 500: @@ -4869,7 +4870,7 @@ if searchWord == "": searchWord = None - self.launchHelpViewer("", searchWord = searchWord) + self.launchHelpViewer("", searchWord=searchWord) def __webBrowser(self): """ @@ -4877,7 +4878,7 @@ """ self.launchHelpViewer("") - def showPreferences(self, pageName = None): + def showPreferences(self, pageName=None): """ Public slot to set the preferences. @@ -4930,14 +4931,14 @@ self.maxEditorPathLen = Preferences.getUI("CaptionFilenameLength") self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename") if not self.captionShowsFilename: - self.__setWindowCaption(editor = "") + self.__setWindowCaption(editor="") else: aw = self.viewmanager.activeWindow() fn = aw and aw.getFileName() or None if fn: - self.__setWindowCaption(editor = fn) + self.__setWindowCaption(editor=fn) else: - self.__setWindowCaption(editor = "") + self.__setWindowCaption(editor="") self.__httpAlternatives = Preferences.getUI("VersionsUrls5") self.performVersionCheck(False) @@ -5030,13 +5031,13 @@ """ Private slot to handle the NewProject signal. """ - self.__setWindowCaption(project = self.project.name) + self.__setWindowCaption(project=self.project.name) def __projectOpened(self): """ Private slot to handle the projectOpened signal. """ - self.__setWindowCaption(project = self.project.name) + self.__setWindowCaption(project=self.project.name) cap = e5App().getObject("DebugServer")\ .getClientCapabilities(self.project.pdata["PROGLANGUAGE"][0]) self.utProjectAct.setEnabled(cap & HasUnittest) @@ -5046,7 +5047,7 @@ """ Private slot to handle the projectClosed signal. """ - self.__setWindowCaption(project = "") + self.__setWindowCaption(project="") self.utProjectAct.setEnabled(False) if not self.utEditorOpen: self.utRestartAct.setEnabled(False) @@ -5075,7 +5076,7 @@ self.utEditorOpen = False if not self.utProjectOpen: self.utRestartAct.setEnabled(False) - self.__setWindowCaption(editor = "") + self.__setWindowCaption(editor="") def __editorOpened(self, fn): """ @@ -5154,7 +5155,7 @@ return f = QFile(fn) if f.open(QIODevice.ReadOnly): - reader = TasksReader(f, viewer = self.taskViewer) + reader = TasksReader(f, viewer=self.taskViewer) reader.readXML() f.close() else: @@ -5234,11 +5235,11 @@ self.__pluginInfoDialog = PluginInfoDialog(self.pluginManager, self) self.__pluginInfoDialog.show() - def __installPlugins(self, pluginFileNames = []): + def __installPlugins(self, pluginFileNames=[]): """ Private slot to show a dialog to install a new plugin. - @param pluginFileNames list of plugin files suggested for + @param pluginFileNames list of plugin files suggested for installation list of strings """ dlg = PluginInstallDialog(self.pluginManager, pluginFileNames, self) @@ -5386,9 +5387,9 @@ "DebugViewer": self.debugViewer, "LogViewer": self.logViewer, "Shell": self.shell, - "FileBrowser" : self.browser, - "TaskViewer" : self.taskViewer, - "TemplateViewer" : self.templateViewer, + "FileBrowser": self.browser, + "TaskViewer": self.taskViewer, + "TemplateViewer": self.templateViewer, "MultiProjectBrowser": self.multiProjectBrowser, } if self.embeddedShell: @@ -5417,9 +5418,9 @@ """ Public method to show the eric5 versions available for download. """ - self.performVersionCheck(manual = True, showVersions = True) - - def performVersionCheck(self, manual = True, alternative = 0, showVersions = False): + self.performVersionCheck(manual=True, showVersions=True) + + def performVersionCheck(self, manual=True, alternative=0, showVersions=False): """ Public method to check the internet for an eric5 update. @@ -5458,7 +5459,7 @@ if manual: if self.__versionCheckProgress is None: self.__versionCheckProgress = \ - QProgressDialog("", self.trUtf8("&Cancel"), + QProgressDialog("", self.trUtf8("&Cancel"), 0, len(self.__httpAlternatives), self) self.__versionCheckProgress.setMinimumDuration(0) self.__versionCheckProgress.canceled.connect( @@ -5497,7 +5498,7 @@ self.trUtf8("""Could not download the versions file.""")) return else: - self.performVersionCheck(self.manualUpdatesCheck, self.httpAlternative, + self.performVersionCheck(self.manualUpdatesCheck, self.httpAlternative, self.showAvailableVersions) return @@ -5546,7 +5547,7 @@ self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" """ at <b>{1}</b>. Would you like to get it?""")\ .format(versions[2], versions[3]), - yesDefault = True) + yesDefault=True) url = res and versions[3] or '' elif versions[0] > Version: res = E5MessageBox.yesNo(self, @@ -5554,7 +5555,7 @@ self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" """ at <b>{1}</b>. Would you like to get it?""")\ .format(versions[0], versions[1]), - yesDefault = True) + yesDefault=True) url = res and versions[1] or '' else: if self.manualUpdatesCheck: @@ -5569,7 +5570,7 @@ self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" """ at <b>{1}</b>. Would you like to get it?""")\ .format(versions[0], versions[1]), - yesDefault = True) + yesDefault=True) url = res and versions[1] or '' else: if self.manualUpdatesCheck: @@ -5607,7 +5608,7 @@ break versionText += """<tr><td>{0}</td><td><a href="{1}">{2}</a></td></tr>"""\ - .format(versions[line], versions[line + 1], + .format(versions[line], versions[line + 1], 'sourceforge' in versions[line + 1] and \ "SourceForge" or versions[line + 1]) line += 2 @@ -5632,7 +5633,7 @@ """<p>{0}</p>""" """<p>Do you want to ignore these errors?</p>""")\ .format(errorString), - icon = E5MessageBox.Warning) + icon=E5MessageBox.Warning) if ret: reply.ignoreSslErrors() else: @@ -5645,7 +5646,7 @@ def checkConfigurationStatus(self): """ - Public method to check, if eric5 has been configured. If it is not, + Public method to check, if eric5 has been configured. If it is not, the configuration dialog is shown. """ if not Preferences.isConfigured(): @@ -5657,7 +5658,7 @@ """The configuration dialog will be started.""")) self.showPreferences() - def versionIsNewer(self, required, snapshot = None): + def versionIsNewer(self, required, snapshot=None): """ Public method to check, if the eric5 version is good compared to the required version.
--- a/UI/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UI/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,5 +7,5 @@ Package implementing the main user interface and general purpose dialogs. This package contains the main user interface and some general purpose -dialogs as well as dialogs not fitting the other more specific categories. +dialogs as well as dialogs not fitting the other more specific categories. """
--- a/Utilities/AutoSaver.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/AutoSaver.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,12 +9,13 @@ from PyQt4.QtCore import QObject, QBasicTimer, QTime + class AutoSaver(QObject): """ Class implementing the auto saver. """ AUTOSAVE_IN = 1000 * 3 - MAXWAIT = 1000 * 15 + MAXWAIT = 1000 * 15 def __init__(self, parent, save): """
--- a/Utilities/ClassBrowsers/ClbrBaseClasses.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/ClassBrowsers/ClbrBaseClasses.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,6 +7,7 @@ Module implementing base classes used by the various class browsers. """ + class _ClbrBase(object): """ Class implementing the base of all class browser objects. @@ -25,6 +26,7 @@ self.file = file self.lineno = lineno + class ClbrBase(_ClbrBase): """ Class implementing the base of all complex class browser objects. @@ -116,6 +118,7 @@ """ self.classes[name] = _class + class ClbrVisibilityMixinBase(object): """ Class implementing the base class of all visibility mixins. @@ -162,6 +165,7 @@ """ self.visibility = 2 + class Attribute(_ClbrBase): """ Class to represent an attribute. @@ -177,6 +181,7 @@ """ _ClbrBase.__init__(self, module, name, file, lineno) + class Class(ClbrBase): """ Class to represent a class. @@ -196,6 +201,7 @@ super = [] self.super = super + class Module(ClbrBase): """ Class to represent a module. @@ -211,11 +217,12 @@ """ ClbrBase.__init__(self, module, name, file, lineno) + class Function(ClbrBase): """ Class to represent a function or method. """ - def __init__(self, module, name, file, lineno, signature = '', separator = ','): + def __init__(self, module, name, file, lineno, signature='', separator=','): """ Constructor @@ -229,6 +236,7 @@ ClbrBase.__init__(self, module, name, file, lineno) self.parameters = [e.strip() for e in signature.split(separator)] + class Coding(ClbrBase): """ Class to represent a source coding.
--- a/Utilities/ClassBrowsers/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/ClassBrowsers/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,12 +29,13 @@ SUPPORTED_TYPES = [PY_SOURCE, PTL_SOURCE, RB_SOURCE, IDL_SOURCE] __extensions = { - "IDL" : [".idl"], - "Python" : [".py", ".pyw", ".ptl"], # currently not used - "Ruby" : [".rb"], + "IDL": [".idl"], + "Python": [".py", ".pyw", ".ptl"], # currently not used + "Ruby": [".rb"], } -def readmodule(module, path=[], isPyFile = False): + +def readmodule(module, path=[], isPyFile=False): ''' Read a source file and return a dictionary of classes, functions, modules, etc. . @@ -59,7 +60,7 @@ ext in Preferences.getPython("Python3Extensions") or \ isPyFile: from . import pyclbr - dict = pyclbr.readmodule_ex(module, path, isPyFile = isPyFile) + dict = pyclbr.readmodule_ex(module, path, isPyFile=isPyFile) pyclbr._modules.clear() else: # try Python if it is without extension @@ -69,7 +70,8 @@ return dict -def find_module(name, path, isPyFile = False): + +def find_module(name, path, isPyFile=False): """ Module function to extend the Python module finding mechanism.
--- a/Utilities/ClassBrowsers/idlclbr.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/ClassBrowsers/idlclbr.py Fri Mar 11 16:51:57 2011 +0100 @@ -37,7 +37,7 @@ (?: oneway [ \t]+ )? (?: [a-zA-Z0-9_:]+ | void ) [ \t]* (?P<MethodName> [a-zA-Z_] [a-zA-Z0-9_]* ) - [ \t]* + [ \t]* \( (?P<MethodSignature> [^)]*? ) \); @@ -83,12 +83,13 @@ """, re.VERBOSE | re.DOTALL | re.MULTILINE).search # function to replace comments -_commentsub = re.compile(r"""//[^\n]*\n|//[^\n]*$""").sub +_commentsub = re.compile(r"""//[^\n]*\n|//[^\n]*$""").sub # function to normalize whitespace -_normalize = re.compile(r"""[ \t]{2,}""").sub +_normalize = re.compile(r"""[ \t]{2,}""").sub _modules = {} # cache of modules we've seen + class VisibilityMixin(ClbrBaseClasses.ClbrVisibilityMixinBase): """ Mixin class implementing the notion of visibility. @@ -99,6 +100,7 @@ """ self.setPublic() + class Module(ClbrBaseClasses.Module, VisibilityMixin): """ Class to represent a CORBA IDL module. @@ -115,6 +117,7 @@ ClbrBaseClasses.Module.__init__(self, module, name, file, lineno) VisibilityMixin.__init__(self) + class Interface(ClbrBaseClasses.Class, VisibilityMixin): """ Class to represent a CORBA IDL interface. @@ -132,11 +135,12 @@ ClbrBaseClasses.Class.__init__(self, module, name, super, file, lineno) VisibilityMixin.__init__(self) + class Function(ClbrBaseClasses.Function, VisibilityMixin): """ Class to represent a CORBA IDL function. """ - def __init__(self, module, name, file, lineno, signature = '', separator = ','): + def __init__(self, module, name, file, lineno, signature='', separator=','): """ Constructor @@ -147,10 +151,11 @@ @param signature parameterlist of the method @param separator string separating the parameters """ - ClbrBaseClasses.Function.__init__(self, module, name, file, lineno, + ClbrBaseClasses.Function.__init__(self, module, name, file, lineno, signature, separator) VisibilityMixin.__init__(self) + class Attribute(ClbrBaseClasses.Attribute, VisibilityMixin): """ Class to represent a CORBA IDL attribute. @@ -167,6 +172,7 @@ ClbrBaseClasses.Attribute.__init__(self, module, name, file, lineno) VisibilityMixin.__init__(self) + def readmodule_ex(module, path=[]): ''' Read a CORBA IDL file and return a dictionary of classes, functions and modules. @@ -196,7 +202,7 @@ return dict _modules[module] = dict - classstack = [] # stack of (class, indent) pairs + classstack = [] # stack of (class, indent) pairs indent = 0 try: src = Utilities.readEncodedFile(file)[0] @@ -246,7 +252,7 @@ else: dict_counts[meth_name] = 0 dict[meth_name] = f - classstack.append((f, thisindent)) # Marker for nested fns + classstack.append((f, thisindent)) # Marker for nested fns elif m.start("String") >= 0: pass
--- a/Utilities/ClassBrowsers/pyclbr.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/ClassBrowsers/pyclbr.py Fri Mar 11 16:51:57 2011 +0100 @@ -103,6 +103,7 @@ _modules = {} # cache of modules we've seen + class VisibilityMixin(ClbrBaseClasses.ClbrVisibilityMixinBase): """ Mixin class implementing the notion of visibility. @@ -118,6 +119,7 @@ else: self.setPublic() + class Class(ClbrBaseClasses.Class, VisibilityMixin): """ Class to represent a Python class. @@ -135,11 +137,12 @@ ClbrBaseClasses.Class.__init__(self, module, name, super, file, lineno) VisibilityMixin.__init__(self) + class Function(ClbrBaseClasses.Function, VisibilityMixin): """ Class to represent a Python function. """ - def __init__(self, module, name, file, lineno, signature = '', separator = ','): + def __init__(self, module, name, file, lineno, signature='', separator=','): """ Constructor @@ -150,10 +153,11 @@ @param signature parameterlist of the method @param separator string separating the parameters """ - ClbrBaseClasses.Function.__init__(self, module, name, file, lineno, + ClbrBaseClasses.Function.__init__(self, module, name, file, lineno, signature, separator) VisibilityMixin.__init__(self) + class Attribute(ClbrBaseClasses.Attribute, VisibilityMixin): """ Class to represent a class attribute. @@ -170,6 +174,7 @@ ClbrBaseClasses.Attribute.__init__(self, module, name, file, lineno) VisibilityMixin.__init__(self) + class Publics(object): """ Class to represent the list of public identifiers. @@ -187,10 +192,11 @@ self.name = '__all__' self.file = file self.lineno = lineno - self.identifiers = [e.replace('"','').replace("'","").strip() \ + self.identifiers = [e.replace('"', '').replace("'", "").strip() \ for e in idents.split(',')] -def readmodule_ex(module, path=[], inpackage = False, isPyFile = False): + +def readmodule_ex(module, path=[], inpackage=False, isPyFile=False): ''' Read a module file and return a dictionary of classes. @@ -244,8 +250,8 @@ return dict _modules[module] = dict - classstack = [] # stack of (class, indent) pairs - conditionalsstack = [] # stack of indents of conditional defines + classstack = [] # stack of (class, indent) pairs + conditionalsstack = [] # stack of indents of conditional defines deltastack = [] deltaindent = 0 deltaindentcalculated = 0 @@ -278,7 +284,7 @@ if thisindent > conditionalsstack[-1]: if not deltaindentcalculated: deltastack.append(thisindent - conditionalsstack[-1]) - deltaindent = reduce(lambda x,y: x+y, deltastack) + deltaindent = reduce(lambda x, y: x + y, deltastack) deltaindentcalculated = 1 thisindent -= deltaindent else: @@ -310,7 +316,7 @@ else: dict_counts[meth_name] = 0 dict[meth_name] = f - classstack.append((f, thisindent)) # Marker for nested fns + classstack.append((f, thisindent)) # Marker for nested fns elif m.start("String") >= 0: pass @@ -445,6 +451,7 @@ return dict + def _indent(ws): """ Module function to return the indentation depth.
--- a/Utilities/ClassBrowsers/rbclbr.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/ClassBrowsers/rbclbr.py Fri Mar 11 16:51:57 2011 +0100 @@ -53,8 +53,8 @@ | (?P<MethodName3> [^( \t]{1,3} ) ) - [ \t]* - (?: + [ \t]* + (?: \( (?P<MethodSignature> (?: [^)] | \)[ \t]*,? )*? ) \) )? [ \t]* @@ -70,7 +70,7 @@ [ \t]* (?P<ClassSupers> < [ \t]* [A-Z] [a-zA-Z0-9_:]* )? | - [ \t]* << [ \t]* + [ \t]* << [ \t]* (?P<ClassName2> [a-zA-Z_] [a-zA-Z0-9_:]* ) ) [ \t]* @@ -119,7 +119,7 @@ | (?P<Attr> ^ (?P<AttrIndent> [ \t]* ) - attr + attr (?P<AttrType> (?: _accessor | _reader | _writer ) )? \(? [ \t]* @@ -156,6 +156,7 @@ _modules = {} # cache of modules we've seen + class VisibilityMixin(ClbrBaseClasses.ClbrVisibilityMixinBase): """ Mixin class implementing the notion of visibility. @@ -166,6 +167,7 @@ """ self.setPublic() + class Class(ClbrBaseClasses.Class, VisibilityMixin): """ Class to represent a Ruby class. @@ -183,6 +185,7 @@ ClbrBaseClasses.Class.__init__(self, module, name, super, file, lineno) VisibilityMixin.__init__(self) + class Module(ClbrBaseClasses.Module, VisibilityMixin): """ Class to represent a Ruby module. @@ -199,11 +202,12 @@ ClbrBaseClasses.Module.__init__(self, module, name, file, lineno) VisibilityMixin.__init__(self) + class Function(ClbrBaseClasses.Function, VisibilityMixin): """ Class to represent a Ruby function. """ - def __init__(self, module, name, file, lineno, signature = '', separator = ','): + def __init__(self, module, name, file, lineno, signature='', separator=','): """ Constructor @@ -214,10 +218,11 @@ @param signature parameterlist of the method @param separator string separating the parameters """ - ClbrBaseClasses.Function.__init__(self, module, name, file, lineno, + ClbrBaseClasses.Function.__init__(self, module, name, file, lineno, signature, separator) VisibilityMixin.__init__(self) + class Attribute(ClbrBaseClasses.Attribute, VisibilityMixin): """ Class to represent a class or module attribute. @@ -235,6 +240,7 @@ VisibilityMixin.__init__(self) self.setPrivate() + def readmodule_ex(module, path=[]): ''' Read a Ruby file and return a dictionary of classes, functions and modules. @@ -264,7 +270,7 @@ return dict _modules[module] = dict - classstack = [] # stack of (class, indent) pairs + classstack = [] # stack of (class, indent) pairs acstack = [] # stack of (access control, indent) pairs indent = 0 try: @@ -335,7 +341,7 @@ else: dict_counts[meth_name] = 0 dict[meth_name] = f - classstack.append((f, thisindent)) # Marker for nested fns + classstack.append((f, thisindent)) # Marker for nested fns elif m.start("String") >= 0: pass @@ -481,9 +487,9 @@ if not nv: break name = nv[0].strip()[1:] # get rid of leading ':' - attr = parent._getattribute("@"+name) or \ - parent._getattribute("@@"+name) or \ - Attribute(module, "@"+name, file, lineno) + attr = parent._getattribute("@" + name) or \ + parent._getattribute("@@" + name) or \ + Attribute(module, "@" + name, file, lineno) if len(nv) == 1 or nv[1].strip() == "false": attr.setProtected() elif nv[1].strip() == "true": @@ -493,9 +499,9 @@ access = m.group("AttrType") for name in m.group("AttrList").split(","): name = name.strip()[1:] # get rid of leading ':' - attr = parent._getattribute("@"+name) or \ - parent._getattribute("@@"+name) or \ - Attribute(module, "@"+name, file, lineno) + attr = parent._getattribute("@" + name) or \ + parent._getattribute("@@" + name) or \ + Attribute(module, "@" + name, file, lineno) if access == "_accessor": attr.setPublic() elif access == "_reader" or access == "_writer":
--- a/Utilities/ModuleParser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/ModuleParser.py Fri Mar 11 16:51:57 2011 +0100 @@ -193,8 +193,8 @@ | (?P<MethodName3> [^( \t]{1,3} ) ) - [ \t]* - (?: + [ \t]* + (?: \( (?P<MethodSignature> (?: [^)] | \)[ \t]*,? )*? ) \) )? [ \t]* @@ -210,7 +210,7 @@ [ \t]* (?P<ClassSupers> < [ \t]* [A-Z] [a-zA-Z0-9_]* )? | - [ \t]* << [ \t]* + [ \t]* << [ \t]* (?P<ClassName2> [a-zA-Z_] [a-zA-Z0-9_]* ) ) [ \t]* @@ -259,7 +259,7 @@ | (?P<Attr> ^ (?P<AttrIndent> [ \t]* ) - attr + attr (?P<AttrType> (?: _accessor | _reader | _writer ) )? \(? [ \t]* @@ -298,6 +298,7 @@ _modules = {} # cache of modules we've seen + class VisibilityBase(object): """ Class implementing the visibility aspect of all objects. @@ -344,6 +345,7 @@ """ self.visibility = 2 + class Module(object): ''' Class to represent a Python module. @@ -463,14 +465,14 @@ def __py_scan(self, src): """ - Private method to scan the source text of a Python module and retrieve the + Private method to scan the source text of a Python module and retrieve the relevant information. @param src the source text to be scanned (string) """ lineno, last_lineno_pos = 1, 0 - classstack = [] # stack of (class, indent) pairs - conditionalsstack = [] # stack of indents of conditional defines + classstack = [] # stack of (class, indent) pairs + conditionalsstack = [] # stack of indents of conditional defines deltastack = [] deltaindent = 0 deltaindentcalculated = 0 @@ -504,7 +506,7 @@ if thisindent > conditionalsstack[-1]: if not deltaindentcalculated: deltastack.append(thisindent - conditionalsstack[-1]) - deltaindent = reduce(lambda x,y: x+y, deltastack) + deltaindent = reduce(lambda x, y: x + y, deltastack) deltaindentcalculated = 1 thisindent -= deltaindent else: @@ -535,25 +537,25 @@ if isinstance(cur_class, Class): # it's a class method - f = Function(None, meth_name, None, lineno, + f = Function(None, meth_name, None, lineno, meth_sig, meth_pyqtSig) self.__py_setVisibility(f) cur_class.addMethod(meth_name, f) break else: # it's a nested function of a module function - f = Function(self.name, meth_name, self.file, lineno, + f = Function(self.name, meth_name, self.file, lineno, meth_sig, meth_pyqtSig) self.__py_setVisibility(f) self.addFunction(meth_name, f) else: # it's a module function - f = Function(self.name, meth_name, self.file, lineno, + f = Function(self.name, meth_name, self.file, lineno, meth_sig, meth_pyqtSig) self.__py_setVisibility(f) self.addFunction(meth_name, f) cur_obj = f - classstack.append((None, thisindent)) # Marker for nested fns + classstack.append((None, thisindent)) # Marker for nested fns elif m.start("Docstring") >= 0: contents = m.group("DocstringContents3") @@ -570,9 +572,9 @@ elif m.start("String") >= 0: if modulelevel and \ - (src[start-len('\r\n'):start] == '\r\n' or \ - src[start-len('\n'):start] == '\n' or \ - src[start-len('\r'):start] == '\r'): + (src[start - len('\r\n'):start] == '\r\n' or \ + src[start - len('\n'):start] == '\n' or \ + src[start - len('\r'):start] == '\r'): contents = m.group("StringContents3") if contents is not None: contents = _hashsub(r"\1", contents) @@ -657,8 +659,8 @@ last_lineno_pos = start if thisindent == 0: # global variable - attr = Attribute(self.name, variable_name, self.file, lineno, - isSignal = isSignal) + attr = Attribute(self.name, variable_name, self.file, lineno, + isSignal=isSignal) self.__py_setVisibility(attr) self.addGlobal(variable_name, attr) else: @@ -669,8 +671,8 @@ else: if classstack[index][0] is not None and \ isinstance(classstack[index][0], Class): - attr = Attribute(self.name, variable_name, self.file, - lineno, isSignal = isSignal) + attr = Attribute(self.name, variable_name, self.file, + lineno, isSignal=isSignal) self.__py_setVisibility(attr) classstack[index][0].addGlobal(variable_name, attr) break @@ -710,13 +712,13 @@ def __rb_scan(self, src): """ - Private method to scan the source text of a Python module and retrieve the + Private method to scan the source text of a Python module and retrieve the relevant information. @param src the source text to be scanned (string) """ lineno, last_lineno_pos = 1, 0 - classstack = [] # stack of (class, indent) pairs + classstack = [] # stack of (class, indent) pairs acstack = [] # stack of (access control, indent) pairs indent = 0 i = 0 @@ -783,7 +785,7 @@ f = Function(self.name, meth_name, self.file, lineno, meth_sig) self.addFunction(meth_name, f) cur_obj = f - classstack.append((None, thisindent)) # Marker for nested fns + classstack.append((None, thisindent)) # Marker for nested fns elif m.start("Docstring") >= 0: contents = m.group("DocstringContents") @@ -940,9 +942,9 @@ if not nv: break name = nv[0].strip()[1:] # get rid of leading ':' - attr = parent.getAttribute("@"+name) or \ - parent.getAttribute("@@"+name) or \ - Attribute(self.name, "@"+name, self.file, lineno) + attr = parent.getAttribute("@" + name) or \ + parent.getAttribute("@@" + name) or \ + Attribute(self.name, "@" + name, self.file, lineno) if len(nv) == 1 or nv[1].strip() == "false": attr.setProtected() elif nv[1].strip() == "true": @@ -952,9 +954,9 @@ access = m.group("AttrType") for name in m.group("AttrList").split(","): name = name.strip()[1:] # get rid of leading ':' - attr = parent.getAttribute("@"+name) or \ - parent.getAttribute("@@"+name) or \ - Attribute(self.name, "@"+name, self.file, lineno) + attr = parent.getAttribute("@" + name) or \ + parent.getAttribute("@@" + name) or \ + Attribute(self.name, "@" + name, self.file, lineno) if access == "_accessor": attr.setPublic() elif access == "_reader" or access == "_writer": @@ -994,7 +996,7 @@ @return A dictionary with inheritance hierarchies. """ - hierarchy = {} + hierarchy = {} for cls in list(list(self.classes.keys())): self.assembleHierarchy(cls, self.classes, [cls], hierarchy) for mod in list(list(self.modules.keys())): @@ -1013,7 +1015,7 @@ @param name name of class to assemble hierarchy (string) @param classes A dictionary of classes to look in. - @param path + @param path @param result The resultant hierarchy """ rv = {} @@ -1084,6 +1086,7 @@ type = "" return type + class Class(VisibilityBase): ''' Class to represent a Python class. @@ -1182,6 +1185,7 @@ """ self.endlineno = endLineNo + class RbModule(Class): ''' Class to represent a Ruby module. @@ -1207,11 +1211,12 @@ """ self.classes[name] = _class + class Function(VisibilityBase): ''' Class to represent a Python function or method. ''' - def __init__(self, module, name, file, lineno, signature = '', pyqtSignature = None): + def __init__(self, module, name, file, lineno, signature='', pyqtSignature=None): """ Constructor @@ -1240,11 +1245,12 @@ """ self.description = description + class Attribute(VisibilityBase): ''' Class to represent a Python function or method. ''' - def __init__(self, module, name, file, lineno, isSignal = False): + def __init__(self, module, name, file, lineno, isSignal=False): """ Constructor @@ -1261,8 +1267,9 @@ self.isSignal = isSignal self.setPublic() -def readModule(module, path = [], inpackage = False, basename = "", - extensions = None, caching = True): + +def readModule(module, path=[], inpackage=False, basename="", + extensions=None, caching=True): ''' Function to read a module file and parse it. @@ -1278,7 +1285,7 @@ the filename of the module file to be read. (string) @param extensions list of extensions, which should be considered valid source file extensions (list of strings) - @param caching flag indicating that the parsed module should be + @param caching flag indicating that the parsed module should be cached (boolean) @return reference to a Module object containing the parsed module information (Module) @@ -1357,6 +1364,7 @@ _modules[modname] = mod return mod + def _indent(ws): """ Protected function to determine the indent width of a whitespace string. @@ -1366,6 +1374,7 @@ """ return len(ws.expandtabs(TABWIDTH)) + def find_module(name, path, extensions): """ Module function to extend the Python module finding mechanism. @@ -1404,13 +1413,15 @@ return imp.find_module(name, path) + def resetParsedModules(): """ Module function to reset the list of modules already parsed. """ _modules.clear() -def resetParsedModule(module, basename = ""): + +def resetParsedModule(module, basename=""): """ Module function to clear one module from the list of parsed modules.
--- a/Utilities/SingleApplication.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/SingleApplication.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtNetwork import QLocalServer, QLocalSocket + class SingleApplicationServer(QLocalServer): """ Class implementing the single application server base class. @@ -95,6 +96,7 @@ """ raise RuntimeError("'handleCommand' must be overridden") + class SingleApplicationClient(object): """ Class implementing the single application client base class. @@ -128,7 +130,7 @@ if err == QLocalSocket.ServerNotFoundError: return 0 else: - return -err + return -err def disconnect(self): """
--- a/Utilities/Startup.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/Startup.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,7 +24,7 @@ from eric5config import getConfig -def makeAppInfo(argv, name, arg, description, options = []): +def makeAppInfo(argv, name, arg, description, options=[]): """ Module function to generate a dictionary describing the application. @@ -44,10 +44,11 @@ "name": name, "description": description, "version": Version, - "options" : options + "options": options } -def usage(appinfo, optlen = 12): + +def usage(appinfo, optlen=12): """ Module function to show the usage information. @@ -70,6 +71,7 @@ print(" {0} {1}".format(opt[0].ljust(optlen), opt[1])) sys.exit(0) + def version(appinfo): """ Module function to show the version information. @@ -87,6 +89,7 @@ PARTICULAR PURPOSE.""".format(**appinfo)) sys.exit(0) + def handleArgs(argv, appinfo): """ Module function to handle the always present commandline options. @@ -110,6 +113,7 @@ args[a](appinfo) return ddindex + def loadTranslatorForLocale(dirs, tn): """ Module function to find and load a specific translation. @@ -128,6 +132,7 @@ print("Using default.") return (None, False) + def initializeResourceSearchPath(): """ Module function to initialize the default mime source factory. @@ -140,6 +145,7 @@ if not defaultIconPath in iconPaths: UI.PixmapCache.addSearchPath(defaultIconPath) + def setLibraryPaths(): """ Module function to set the Qt library paths correctly for windows systems. @@ -157,7 +163,8 @@ # the translator must not be deleted, therefore we save them here loaded_translators = {} -def loadTranslators(qtTransDir, app, translationFiles = ()): + +def loadTranslators(qtTransDir, app, translationFiles=()): """ Module function to load all required translations. @@ -194,8 +201,9 @@ loc = None return loc -def simpleAppStartup(argv, appinfo, mwFactory, quitOnLastWindowClosed = True, - app = None): + +def simpleAppStartup(argv, appinfo, mwFactory, quitOnLastWindowClosed=True, + app=None): """ Module function to start up an application that doesn't need a specialized start up.
--- a/Utilities/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,7 +4,7 @@ # """ -Package implementing various functions/classes needed everywhere within eric5. +Package implementing various functions/classes needed everywhere within eric5. """ import os @@ -16,7 +16,8 @@ import base64 import getpass -def __showwarning(message, category, filename, lineno, file = None, line = ""): + +def __showwarning(message, category, filename, lineno, file=None, line=""): """ Module function to raise a SyntaxError for a SyntaxWarning. @@ -57,31 +58,32 @@ configDir = None codingBytes_regexps = [ - (2, re.compile(br'''coding[:=]\s*([-\w_.]+)''')), - (1, re.compile(br'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), + (2, re.compile(br'''coding[:=]\s*([-\w_.]+)''')), + (1, re.compile(br'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), ] coding_regexps = [ - (2, re.compile(r'''coding[:=]\s*([-\w_.]+)''')), - (1, re.compile(r'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), + (2, re.compile(r'''coding[:=]\s*([-\w_.]+)''')), + (1, re.compile(r'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), ] -supportedCodecs = ['utf-8', - 'iso8859-1', 'iso8859-15', 'iso8859-2', 'iso8859-3', - 'iso8859-4', 'iso8859-5', 'iso8859-6', 'iso8859-7', - 'iso8859-8', 'iso8859-9', 'iso8859-10', 'iso8859-11', - 'iso8859-13', 'iso8859-14', 'iso8859-16', 'latin-1', - 'koi8-r', 'koi8-u', - 'utf-16', 'utf-32', - 'cp037', 'cp424', 'cp437', 'cp500', 'cp737', 'cp775', - 'cp850', 'cp852', 'cp855', 'cp856', 'cp857', 'cp860', - 'cp861', 'cp862', 'cp863', 'cp864', 'cp865', 'cp866', - 'cp869', 'cp874', 'cp875', 'cp932', 'cp949', 'cp950', - 'cp1006', 'cp1026', 'cp1140', 'cp1250', 'cp1251', - 'cp1252', 'cp1253', 'cp1254', 'cp1255', 'cp1256', - 'cp1257', 'cp1258', - 'gb2312', 'gb18030', +supportedCodecs = ['utf-8', + 'iso8859-1', 'iso8859-15', 'iso8859-2', 'iso8859-3', + 'iso8859-4', 'iso8859-5', 'iso8859-6', 'iso8859-7', + 'iso8859-8', 'iso8859-9', 'iso8859-10', 'iso8859-11', + 'iso8859-13', 'iso8859-14', 'iso8859-16', 'latin-1', + 'koi8-r', 'koi8-u', + 'utf-16', 'utf-32', + 'cp037', 'cp424', 'cp437', 'cp500', 'cp737', 'cp775', + 'cp850', 'cp852', 'cp855', 'cp856', 'cp857', 'cp860', + 'cp861', 'cp862', 'cp863', 'cp864', 'cp865', 'cp866', + 'cp869', 'cp874', 'cp875', 'cp932', 'cp949', 'cp950', + 'cp1006', 'cp1026', 'cp1140', 'cp1250', 'cp1251', + 'cp1252', 'cp1253', 'cp1254', 'cp1255', 'cp1256', + 'cp1257', 'cp1258', + 'gb2312', 'gb18030', 'ascii'] + class CodingError(Exception): """ Class implementing an exception, which is raised, if a given coding is incorrect. @@ -90,7 +92,7 @@ """ Constructor """ - self.errorMessage = QCoreApplication.translate("CodingError", + self.errorMessage = QCoreApplication.translate("CodingError", "The coding '{0}' is wrong for the given text.").format(coding) def __repr__(self): @@ -109,6 +111,7 @@ """ return str(self.errorMessage) + def get_codingBytes(text): """ Function to get the coding of a bytes text. @@ -126,6 +129,7 @@ return str(m.group(1), "ascii").lower() return None + def get_coding(text): """ Function to get the coding of a text. @@ -143,6 +147,7 @@ return m.group(1).lower() return None + def readEncodedFile(filename): """ Function to read a file and decode it's contents into proper text. @@ -155,6 +160,7 @@ f.close() return decode(text) + def readEncodedFileWithHash(filename): """ Function to read a file, calculate a hash value and decode it's contents @@ -166,10 +172,11 @@ f = open(filename, "rb") text = f.read() f.close() - hash = str(QCryptographicHash.hash(QByteArray(text), QCryptographicHash.Md5).toHex(), - encoding = "ASCII") + hash = str(QCryptographicHash.hash(QByteArray(text), QCryptographicHash.Md5).toHex(), + encoding="ASCII") return decode(text) + (hash, ) + def decode(text): """ Function to decode some byte text into a string. @@ -232,6 +239,7 @@ # Assume UTF-8 loosing information return str(text, "utf-8", "ignore"), 'utf-8-ignore' + def writeEncodedFile(filename, text, orig_coding): """ Function to write a file with properly encoded text. @@ -249,6 +257,7 @@ return encoding + def encode(text, orig_coding): """ Function to encode text into a byte text. @@ -303,6 +312,7 @@ return etext, encoding + def decodeString(text): """ Function to decode a string containing Unicode encoded characters. @@ -351,6 +361,7 @@ '"': """, } + def escape_entities(m, map=_escape_map): """ Function to encode html entities. @@ -365,6 +376,7 @@ text = "&#{0:d};".format(ord(char)) return text + def html_encode(text, pattern=_escape): """ Function to correctly encode a text for html. @@ -380,6 +392,7 @@ _uescape = re.compile('[\u0080-\uffff]') + def escape_uentities(m): """ Function to encode html entities. @@ -391,6 +404,7 @@ text = "&#{0:d};".format(ord(char)) return text + def html_uencode(text, pattern=_uescape): """ Function to correctly encode a unicode text for html. @@ -404,6 +418,7 @@ text = pattern.sub(escape_uentities, text) return text + def convertLineEnds(text, eol): """ Function to convert the end of line characters. @@ -414,16 +429,17 @@ """ if eol == '\r\n': regexp = re.compile(r"""(\r(?!\n)|(?<!\r)\n)""") - return regexp.sub(lambda m, eol = '\r\n': eol, text) + return regexp.sub(lambda m, eol='\r\n': eol, text) elif eol == '\n': regexp = re.compile(r"""(\r\n|\r)""") - return regexp.sub(lambda m, eol = '\n': eol, text) + return regexp.sub(lambda m, eol='\n': eol, text) elif eol == '\r': regexp = re.compile(r"""(\r\n|\n)""") - return regexp.sub(lambda m, eol = '\r': eol, text) + return regexp.sub(lambda m, eol='\r': eol, text) else: return text + def linesep(): """ Function to return the lineseparator used by the editor. @@ -438,6 +454,7 @@ else: return "\r\n" + def extractFlags(text): """ Function to extract eric specific flags out of the given text. @@ -445,7 +462,7 @@ Flags are contained in comments and are introduced by 'eflag:'. The rest of the line is interpreted as 'key = value'. value is analyzed for being an integer or float value. If that fails, it - is assumed to be a string. If a key does not contain a '=' + is assumed to be a string. If a key does not contain a '=' character, it is assumed to be a boolean flag. Flags are expected at the very end of a file. The search is ended, if a line without the 'eflag:' marker is found. @@ -492,6 +509,7 @@ return flags + def toNativeSeparators(path): """ Function returning a path, that is using native separator characters. @@ -501,6 +519,7 @@ """ return QDir.toNativeSeparators(path) + def fromNativeSeparators(path): """ Function returning a path, that is using "/" separator characters. @@ -510,6 +529,7 @@ """ return QDir.fromNativeSeparators(path) + def normcasepath(path): """ Function returning a path, that is normalized with respect to its case and references. @@ -519,6 +539,7 @@ """ return os.path.normcase(os.path.normpath(path)) + def normabspath(path): """ Function returning a normalized, absolute path. @@ -528,9 +549,10 @@ """ return os.path.abspath(path) + def normcaseabspath(path): """ - Function returning an absolute path, that is normalized with respect to its case + Function returning an absolute path, that is normalized with respect to its case and references. @param path file path (string) @@ -538,6 +560,7 @@ """ return os.path.normcase(os.path.abspath(path)) + def normjoinpath(a, *p): """ Function returning a normalized path of the joined parts passed into it. @@ -548,6 +571,7 @@ """ return os.path.normpath(os.path.join(a, *p)) + def normabsjoinpath(a, *p): """ Function returning a normalized, absolute path of the joined parts passed into it. @@ -558,7 +582,8 @@ """ return os.path.abspath(os.path.join(a, *p)) -def relpath(path, start = os.path.curdir): + +def relpath(path, start=os.path.curdir): """ Return a relative version of a path. @@ -579,6 +604,7 @@ return os.path.curdir return os.path.join(*rel_list) + def isinpath(file): """ Function to check for an executable file. @@ -603,6 +629,7 @@ return False + def getExecutablePath(file): """ Function to build the full path of an executable file from the environment. @@ -632,6 +659,7 @@ return "" + def isExecutable(exe): """ Function to check, if a file is executable. @@ -641,6 +669,7 @@ """ return os.access(exe, os.X_OK) + def samepath(f1, f2): """ Function to compare two paths. @@ -663,6 +692,7 @@ except AttributeError: EXTSEP = "." + def splitPath(name): """ Function to split a pathname into a directory part and a file part. @@ -677,6 +707,7 @@ dn, fn = os.path.split(name) return (dn, fn) + def joinext(prefix, ext): """ Function to join a file extension to a path. @@ -689,10 +720,11 @@ @return the complete filename (string) """ if ext[0] != ".": - ext = ".{0}".format(ext) # require leading separator, to match os.path.splitext + ext = ".{0}".format(ext) # require leading separator, to match os.path.splitext return prefix + EXTSEP + ext[1:] -def compactPath(path, width, measure = len): + +def compactPath(path, width, measure=len): """ Function to return a compacted path fitting inside the given width. @@ -727,6 +759,7 @@ tail = tail[1:] return "" + def direntries(path, filesonly=False, pattern=None, followsymlinks=True, checkStop=None): """ Function returning a list of all files and directories. @@ -738,7 +771,7 @@ should be followed @param checkStop function to be called to check for a stop @return list of all files and directories in the tree rooted - at path. The names are expanded to start with path. + at path. The names are expanded to start with path. """ if filesonly: files = [] @@ -750,11 +783,11 @@ if checkStop and checkStop(): break - if entry in ['CVS', 'cvs', - '.svn', '_svn', - '.hg', '_hg', + if entry in ['CVS', 'cvs', + '.svn', '_svn', + '.hg', '_hg', '.ropeproject', '_ropeproject', - '.eric5project', '_eric5project', + '.eric5project', '_eric5project', '.issues', '_issues']: continue @@ -777,6 +810,7 @@ pass return files + def getDirs(path, excludeDirs): """ Function returning a list of all directories below path. @@ -796,7 +830,7 @@ not os.path.islink(os.path.join(path, name)): exclude = 0 for e in excludeDirs: - if name.split(os.sep,1)[0] == e: + if name.split(os.sep, 1)[0] == e: exclude = 1 break if not exclude: @@ -808,6 +842,7 @@ return dirs + def getTestFileName(fn): """ Function to build the filename of a unittest file. @@ -821,6 +856,7 @@ dn, fn = os.path.split(fn) return os.path.join(dn, "test{0}".format(fn)) + def parseOptionString(s): """ Function used to convert an option string into a list of options. @@ -832,6 +868,7 @@ s = re.sub(r"%[A-Z%]", _percentReplacementFunc, s) return parseString(s, rx) + def parseEnvironmentString(s): """ Function used to convert an environment string into a list of environment settings. @@ -842,6 +879,7 @@ rx = QRegExp(r"""\s(\w+\+?=[^\s]+|\w+="[^"]+"|\w+='[^']+')""") return parseString(s, rx) + def parseString(s, rx): """ Function used to convert a string into a list. @@ -866,6 +904,7 @@ return olist + def _percentReplacementFunc(matchobj): """ Protected function called for replacing % codes. @@ -875,6 +914,7 @@ """ return getPercentReplacement(matchobj.group(0)) + def getPercentReplacement(code): """ Function to get the replacement for code. @@ -951,13 +991,14 @@ # unknown code, just return it return code + def getPercentReplacementHelp(): """ Function to get the help text for the supported %-codes. @returns help text (string) """ - return QCoreApplication.translate("Utilities", + return QCoreApplication.translate("Utilities", """<p>You may use %-codes as placeholders in the string.""" """ Supported codes are:""" """<table>""" @@ -973,6 +1014,7 @@ """</table>""" """</p>""") + def getUserName(): """ Function to get the user name. @@ -984,6 +1026,7 @@ if not user and isWindowsPlatform(): return win32_GetUserName() + def getHomeDir(): """ Function to get a users home directory @@ -992,6 +1035,7 @@ """ return QDir.homePath() + def getPythonModulesDirectory(): """ Function to determine the path to Python's modules directory. @@ -1001,6 +1045,7 @@ import distutils.sysconfig return distutils.sysconfig.get_python_lib(True) + def getPythonLibPath(): """ Function to determine the path to Python's library. @@ -1026,6 +1071,7 @@ return libDir + def getPythonVersion(): """ Function to get the Python version (major, minor) as an integer value. @@ -1034,7 +1080,8 @@ """ return sys.hexversion >> 16 -def compile(file, codestring = ""): + +def compile(file, codestring=""): """ Function to compile one Python source file to Python bytecode. @@ -1052,8 +1099,8 @@ except (UnicodeDecodeError, IOError): return (False, None, None, None, None) - codestring = codestring.replace("\r\n","\n") - codestring = codestring.replace("\r","\n") + codestring = codestring.replace("\r\n", "\n") + codestring = codestring.replace("\r", "\n") if codestring and codestring[-1] != '\n': codestring = codestring + '\n' @@ -1069,9 +1116,10 @@ else: builtins.compile(codestring, file, 'exec') except SyntaxError as detail: - import traceback, re + import traceback + import re lines = traceback.format_exception_only(SyntaxError, detail) - match = re.match('\s*File "(.+)", line (\d+)', + match = re.match('\s*File "(.+)", line (\d+)', lines[0].replace('<string>', '{0}'.format(file))) if match is not None: fn, line = match.group(1, 2) @@ -1119,7 +1167,8 @@ return (False, None, None, None, None, None) -def py2compile(file, checkFlakes = False): + +def py2compile(file, checkFlakes=False): """ Function to compile one Python 2 source file to Python 2 bytecode. @@ -1135,12 +1184,12 @@ """ interpreter = Preferences.getDebugger("PythonInterpreter") if interpreter == "" or not isExecutable(interpreter): - return (True, file, "1", "", - QCoreApplication.translate("Utilities", - "Python2 interpreter not configured."), + return (True, file, "1", "", + QCoreApplication.translate("Utilities", + "Python2 interpreter not configured."), []) - syntaxChecker = os.path.join(getConfig('ericDir'), + syntaxChecker = os.path.join(getConfig('ericDir'), "UtilitiesPython2", "Py2SyntaxChecker.py") args = [syntaxChecker] if checkFlakes: @@ -1155,8 +1204,8 @@ finished = proc.waitForFinished(30000) if finished: output = \ - str(proc.readAllStandardOutput(), - Preferences.getSystem("IOEncoding"), + str(proc.readAllStandardOutput(), + Preferences.getSystem("IOEncoding"), 'replace').splitlines() syntaxerror = output[0] == "ERROR" @@ -1172,20 +1221,21 @@ warnings = [] while index < len(output): if output[index] == "FLAKES_ERROR": - return (True, output[index + 1], output[index + 2], "", + return (True, output[index + 1], output[index + 2], "", output[index + 3], []) else: - warnings.append((output[index + 1], output[index + 2], + warnings.append((output[index + 1], output[index + 2], output[index + 3])) index += 4 return (False, None, None, None, None, None, warnings) - return (True, file, "1", "0", "", + return (True, file, "1", "0", "", QCoreApplication.translate("Utilities", - "Python2 interpreter did not finish within 30s."), + "Python2 interpreter did not finish within 30s."), []) + def getConfigDir(): """ Module function to get the name of the directory storing the config data. @@ -1206,6 +1256,7 @@ hp += "/" + cdn return toNativeSeparators(hp) + def setConfigDir(d): """ Module function to set the name of the directory storing the config data. @@ -1219,14 +1270,15 @@ # functions for environment handling ################################################################################ -def getEnvironmentEntry(key, default = None): + +def getEnvironmentEntry(key, default=None): """ Module function to get an environment entry. @param key key of the requested environment entry (string) @param default value to be returned, if the environment doesn't contain the requested entry (string) - @return the requested entry or the default value, if the entry wasn't + @return the requested entry or the default value, if the entry wasn't found (string or None) """ filter = QRegExp("^{0}[ \t]*=".format(key)) @@ -1241,6 +1293,7 @@ ename, val = entries[0].split("=", 1) return val.strip() + def hasEnvironmentEntry(key): """ Module function to check, if the environment contains an entry. @@ -1259,6 +1312,7 @@ # Qt utility functions below ################################################################################ + def generateQtToolName(toolname): """ Module function to generate the executable name for a Qt tool like designer. @@ -1266,11 +1320,12 @@ @param toolname base name of the tool (string) @return the Qt tool name without extension (string) """ - return "{0}{1}{2}".format(Preferences.getQt("QtToolsPrefix4"), - toolname, + return "{0}{1}{2}".format(Preferences.getQt("QtToolsPrefix4"), + toolname, Preferences.getQt("QtToolsPostfix4") ) + def prepareQtMacBundle(toolname, version, args): """ Module function for starting Qt tools that are Mac OS X bundles. @@ -1299,7 +1354,8 @@ # Other utility functions below ################################################################################ -def generateVersionInfo(linesep = '\n'): + +def generateVersionInfo(linesep='\n'): """ Module function to generate a string with various version infos. @@ -1312,7 +1368,7 @@ except ImportError: sip_version_str = "sip version not available" - info = "Version Numbers:{0} Python {1}{2}".format( + info = "Version Numbers:{0} Python {1}{2}".format( linesep, sys.version.split()[0], linesep) info += " Qt {0}{1} PyQt4 {2}{3}".format( qVersion(), linesep, PYQT_VERSION_STR, linesep) @@ -1330,7 +1386,8 @@ return info -def generatePluginsVersionInfo(linesep = '\n'): + +def generatePluginsVersionInfo(linesep='\n'): """ Module function to generate a string with plugins version infos. @@ -1355,7 +1412,8 @@ return infoStr -def generateDistroInfo(linesep = '\n'): + +def generateDistroInfo(linesep='\n'): """ Module function to generate a string with distribution infos. @@ -1382,6 +1440,7 @@ return infoStr + def checkBlacklistedVersions(): """ Module functions to check for blacklisted versions of the prerequisites. @@ -1438,6 +1497,7 @@ # password handling functions below ################################################################################ + def pwEncode(pw): """ Module function to encode a password. @@ -1450,6 +1510,7 @@ rpw = "".join(random.sample(pop, 32)) + pw + "".join(random.sample(pop, 32)) return marker + base64.b64encode(rpw.encode()).decode() + def pwDecode(epw): """ Module function to decode a password. @@ -1472,6 +1533,7 @@ # win32 compatibility functions below ################################################################################ + def win32_Kill(pid): """ Function to provide an os.kill equivalent for Win32. @@ -1482,6 +1544,7 @@ handle = win32api.OpenProcess(1, 0, pid) return (0 != win32api.TerminateProcess(handle, 0)) + def win32_GetUserName(): """ Function to get the user name under Win32.
--- a/Utilities/py3flakes/checker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/py3flakes/checker.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,6 +13,7 @@ from . import messages + class Binding(object): """ Represents the binding of a value to a name. @@ -36,11 +37,13 @@ self.source.lineno, id(self)) + class UnBinding(Binding): ''' Created by the 'del' operator. ''' + class Importation(Binding): """ A binding created by an import statement. @@ -50,11 +53,13 @@ name = name.split('.')[0] super(Importation, self).__init__(name, source) + class Argument(Binding): """ Represents binding a name as an argument. """ + class Assignment(Binding): """ Represents binding a name with an explicit assignment. @@ -64,12 +69,14 @@ Assignments, rather it treats them as simple Bindings. """ + class FunctionDefinition(Binding): """ Represents a function definition. """ pass + class ExportBinding(Binding): """ A binding created by an __all__ assignment. If the names in the list @@ -97,6 +104,7 @@ names.append(node.n) return names + class Scope(dict): """ Class defining the scope base class. @@ -110,12 +118,14 @@ def __init__(self): super(Scope, self).__init__() + class ClassScope(Scope): """ Class representing a name scope for a class. """ pass + class FunctionScope(Scope): """ Class representing a name scope for a function. @@ -124,6 +134,7 @@ super(FunctionScope, self).__init__() self.globals = {} + class ModuleScope(Scope): """ Class representing a name scope for a module. @@ -133,6 +144,7 @@ # Globally defined names which are not attributes of the builtins module. _MAGIC_GLOBALS = ['__file__', '__builtins__'] + class Checker(object): """ Class to check the cleanliness and sanity of Python code. @@ -140,7 +152,7 @@ nodeDepth = 0 traceTree = False - def __init__(self, module, filename = '(none)'): + def __init__(self, module, filename='(none)'): """ Constructor @@ -301,7 +313,7 @@ # additional node types COMPREHENSION = KEYWORD = handleChildren - def addBinding(self, lineno, value, reportRedef = True): + def addBinding(self, lineno, value, reportRedef=True): ''' Called when a binding is altered. @@ -367,6 +379,7 @@ Process bindings for loop variables. """ vars = [] + def collectLoopVars(n): if isinstance(n, ast.Name): vars.append(n.id) @@ -619,7 +632,7 @@ def IMPORTFROM(self, node): if node.module == '__future__': if not self.futuresAllowed: - self.report(messages.LateFutureImport, node.lineno, + self.report(messages.LateFutureImport, node.lineno, [n.name for n in node.names]) else: self.futuresAllowed = False
--- a/Utilities/py3flakes/messages.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/py3flakes/messages.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtCore import QCoreApplication + class Message(object): """ Class defining the base for all specific message classes. @@ -39,16 +40,17 @@ """ Public method to get the individual message data elements. - @return tuple containing file name, line number and message + @return tuple containing file name, line number and message (string, integer, string) """ return (self.filename, self.lineno, self.message.format(*self.message_args)) + class UnusedImport(Message): """ Class defining the "Unused Import" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', '{0!r} imported but unused.') def __init__(self, filename, lineno, name): @@ -62,11 +64,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class RedefinedWhileUnused(Message): """ Class defining the "Redefined While Unused" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', 'Redefinition of unused {0!r} from line {1!r}.') def __init__(self, filename, lineno, name, orig_lineno): @@ -81,11 +84,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class ImportShadowedByLoopVar(Message): """ Class defining the "Import Shadowed By Loop Var" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', 'Import {0!r} from line {1!r} shadowed by loop variable.') def __init__(self, filename, lineno, name, orig_lineno): @@ -100,11 +104,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class ImportStarUsed(Message): """ Class defining the "Import Star Used" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', "'from {0} import *' used; unable to detect undefined names.") def __init__(self, filename, lineno, modname): @@ -118,6 +123,7 @@ Message.__init__(self, filename, lineno) self.message_args = (modname,) + class UndefinedName(Message): """ Class defining the "Undefined Name" message. @@ -135,6 +141,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class UndefinedExport(Message): """ Class defining the "Undefined Export" message. @@ -152,11 +159,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class UndefinedLocal(Message): """ Class defining the "Undefined Local Variable" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', "Local variable {0!r} (defined in enclosing scope on line {1!r})" " referenced before assignment.") @@ -172,11 +180,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class DuplicateArgument(Message): """ Class defining the "Duplicate Argument" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', 'Duplicate argument {0!r} in function definition.') def __init__(self, filename, lineno, name): @@ -190,11 +199,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class RedefinedFunction(Message): """ Class defining the "Redefined Function" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', 'Redefinition of function {0!r} from line {1!r}.') def __init__(self, filename, lineno, name, orig_lineno): @@ -209,11 +219,12 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class LateFutureImport(Message): """ Class defining the "Late Future Import" message. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', 'Future import(s) {0!r} after other statements.') def __init__(self, filename, lineno, names): @@ -227,6 +238,7 @@ Message.__init__(self, filename, lineno) self.message_args = (names,) + class UnusedVariable(Message): """ Class defining the "Unused Variable" message. @@ -234,7 +246,7 @@ Indicates that a variable has been explicitly assigned to but not actually used. """ - message = QCoreApplication.translate('py3Flakes', + message = QCoreApplication.translate('py3Flakes', 'Local variable {0!r} is assigned to but never used.') def __init__(self, filename, lineno, name):
--- a/Utilities/uic.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Utilities/uic.py Fri Mar 11 16:51:57 2011 +0100 @@ -10,7 +10,8 @@ import os -def compileUiFiles(dir, recurse = False): + +def compileUiFiles(dir, recurse=False): """ Module function to compile the .ui files of a directory tree to Python sources. @@ -23,7 +24,7 @@ from PyQt4.uic import compileUi def compileUiDir(dir, recurse = False, map = None, # __IGNORE_WARNING__ - **compileUi_args): + ** compileUi_args): """ Creates Python modules from Qt Designer .ui files in a directory or directory tree.
--- a/UtilitiesPython2/Py2SyntaxChecker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UtilitiesPython2/Py2SyntaxChecker.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,6 +17,7 @@ from py2flakes.checker import Checker from py2flakes.messages import ImportStarUsed + def compile(file, codestring): """ Function to compile one Python source file to Python bytecode. @@ -45,7 +46,7 @@ __builtin__.compile(codestring, file, 'exec') except SyntaxError, detail: lines = traceback.format_exception_only(SyntaxError, detail) - match = re.match('\s*File "(.+)", line (\d+)', + match = re.match('\s*File "(.+)", line (\d+)', lines[0].replace('<string>', '%s' % file)) if match is not None: fn, line = match.group(1, 2) @@ -93,13 +94,14 @@ return (0, None, None, None, None, None) + def flakesCheck(fileName, codestring, ignoreStarImportWarnings): """ Function to perform a pyflakes check. @param fileName name of the file (string) @param codestring source code to be checked (string) - @param ignoreStarImportWarnings flag indicating to + @param ignoreStarImportWarnings flag indicating to ignore 'star import' warnings (boolean) @return list of strings containing the warnings (marker, file name, line number, message) @@ -108,7 +110,7 @@ lines = codestring.splitlines() try: warnings = Checker(codestring, fileName) - warnings.messages.sort(key = lambda a: a.lineno) + warnings.messages.sort(key=lambda a: a.lineno) for warning in warnings.messages: if ignoreStarImportWarnings and \ isinstance(warning, ImportStarUsed):
--- a/UtilitiesPython2/Tabnanny.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UtilitiesPython2/Tabnanny.py Fri Mar 11 16:51:57 2011 +0100 @@ -48,6 +48,7 @@ __all__ = ["check", "NannyNag", "process_tokens"] + class NannyNag(Exception): """ Raised by tokeneater() if detecting an ambiguous indent. @@ -87,6 +88,7 @@ """ return self.line + def check(filename, codestring): """ Private function to check one Python source file for whitespace related problems. @@ -122,6 +124,7 @@ return (False, None, None, None) + class Whitespace(object): """ Class implementing the whitespace checker. @@ -154,7 +157,7 @@ @param ws The string to be checked. """ - self.raw = ws + self.raw = ws S, T = Whitespace.S, Whitespace.T count = [] b = n = nt = 0 @@ -171,8 +174,8 @@ b = 0 else: break - self.n = n - self.nt = nt + self.n = n + self.nt = nt self.norm = tuple(count), b self.is_simple = len(count) <= 1 @@ -186,7 +189,7 @@ preceding a tab) """ count, trailing = self.norm - return max(len(count)-1, trailing) + return max(len(count) - 1, trailing) def indent_level(self, tabsize): """ @@ -212,7 +215,7 @@ count, trailing = self.norm il = 0 for i in range(tabsize, len(count)): - il = il + i/tabsize * count[i] + il = il + i / tabsize * count[i] return trailing + tabsize * (il + self.nt) # return true iff self.indent_level(t) == other.indent_level(t) @@ -244,11 +247,11 @@ n = max(self.longest_run_of_spaces(), other.longest_run_of_spaces()) + 1 a = [] - for ts in range(1, n+1): + for ts in range(1, n + 1): if self.indent_level(ts) != other.indent_level(ts): - a.append( (ts, + a.append((ts, self.indent_level(ts), - other.indent_level(ts)) ) + other.indent_level(ts))) return a # Return True iff self.indent_level(t) < other.indent_level(t) @@ -266,7 +269,7 @@ # Note that M is of the form (T*)(S*) iff len(M.norm[0]) <= 1. def less(self, other): """ - Method to compare the indentation level against another Whitespace objects to + Method to compare the indentation level against another Whitespace objects to be smaller. @param other Whitespace object to compare against. @@ -279,7 +282,7 @@ n = max(self.longest_run_of_spaces(), other.longest_run_of_spaces()) + 1 # the self.n >= other.n test already did it for ts=1 - for ts in range(2, n+1): + for ts in range(2, n + 1): if self.indent_level(ts) >= other.indent_level(ts): return False return True @@ -302,13 +305,14 @@ n = max(self.longest_run_of_spaces(), other.longest_run_of_spaces()) + 1 a = [] - for ts in range(1, n+1): + for ts in range(1, n + 1): if self.indent_level(ts) >= other.indent_level(ts): - a.append( (ts, + a.append((ts, self.indent_level(ts), - other.indent_level(ts)) ) + other.indent_level(ts))) return a + def format_witnesses(w): """ Function to format the witnesses as a readable string. @@ -322,6 +326,7 @@ prefix = prefix + "s" return prefix + " " + ', '.join(firsts) + def process_tokens(tokens): """ Function processing all tokens generated by a tokenizer run.
--- a/UtilitiesPython2/Tools.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UtilitiesPython2/Tools.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,10 +11,11 @@ from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32 coding_regexps = [ - (2, re.compile(r'''coding[:=]\s*([-\w_.]+)''')), - (1, re.compile(r'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), + (2, re.compile(r'''coding[:=]\s*([-\w_.]+)''')), + (1, re.compile(r'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), ] + def get_coding(text): """ Function to get the coding of a text. @@ -32,6 +33,7 @@ return m.group(1).lower() return None + def decode(text): """ Function to decode a text. @@ -64,6 +66,7 @@ # Assume Latin-1 (behaviour before 3.7.1) return unicode(text, "latin-1"), 'latin-1-guessed' + def readEncodedFile(filename): """ Function to read a file and decode it's contents into proper text. @@ -76,6 +79,7 @@ f.close() return decode(text) + def normalizeCode(codestring): """ Function to normalize the given code. @@ -85,7 +89,7 @@ """ if type(codestring) == type(u""): codestring = codestring.encode('utf-8') - codestring = codestring.replace("\r\n","\n").replace("\r","\n") + codestring = codestring.replace("\r\n", "\n").replace("\r", "\n") if codestring and codestring[-1] != '\n': codestring = codestring + '\n'
--- a/UtilitiesPython2/pep8.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UtilitiesPython2/pep8.py Fri Mar 11 16:51:57 2011 +0100 @@ -877,7 +877,7 @@ if result is not None: offset, code = result[:2] args = result[2:] - self.report_error_args(self.line_number, offset, code, check, + self.report_error_args(self.line_number, offset, code, check, *args) def build_tokens_line(self):
--- a/UtilitiesPython2/py2flakes/checker.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UtilitiesPython2/py2flakes/checker.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ from py2flakes import messages + class Binding(object): """ Represents the binding of a value to a name. @@ -37,11 +38,13 @@ self.source.lineno, id(self)) + class UnBinding(Binding): ''' Created by the 'del' operator. ''' + class Importation(Binding): """ A binding created by an import statement. @@ -51,11 +54,13 @@ name = name.split('.')[0] super(Importation, self).__init__(name, source) + class Argument(Binding): """ Represents binding a name as an argument. """ + class Assignment(Binding): """ Represents binding a name with an explicit assignment. @@ -65,12 +70,14 @@ Assignments, rather it treats them as simple Bindings. """ + class FunctionDefinition(Binding): """ Represents a function definition. """ pass + class ExportBinding(Binding): """ A binding created by an __all__ assignment. If the names in the list @@ -96,6 +103,7 @@ names.append(node.value) return names + class Scope(dict): """ Class defining the scope base class. @@ -108,12 +116,14 @@ def __init__(self): super(Scope, self).__init__() + class ClassScope(Scope): """ Class representing a name scope for a class. """ pass + class FunctionScope(Scope): """ Class representing a name scope for a function. @@ -122,6 +132,7 @@ super(FunctionScope, self).__init__() self.globals = {} + class ModuleScope(Scope): """ Class representing a name scope for a module. @@ -131,6 +142,7 @@ # Globally defined names which are not attributes of the __builtin__ module. _MAGIC_GLOBALS = ['__file__', '__builtins__'] + class Checker(object): """ Class to check the cleanliness and sanity of Python code. @@ -323,7 +335,6 @@ self.handleChildren(node.body) - def GLOBAL(self, node): """ Keep track of globals declarations. @@ -343,6 +354,7 @@ Process bindings for loop variables. """ vars = [] + def collectLoopVars(n): if hasattr(n, 'name'): vars.append(n.name) @@ -402,7 +414,6 @@ else: self.report(messages.UndefinedName, node.lineno, node.name) - def FUNCTION(self, node): if getattr(node, "decorators", None) is not None: self.handleChildren(node.decorators) @@ -430,6 +441,7 @@ for name in args: self.addBinding(node.lineno, Argument(name, node), reportRedef=False) self.handleNode(node.code, node) + def checkUnusedAssignments(): """ Check to see if any assignments have not been used. @@ -444,7 +456,6 @@ self.deferFunction(runFunction) - def CLASS(self, node): """ Check names used in a class definition, including its decorators, base @@ -460,7 +471,6 @@ self.handleChildren(node.code) self.popScope() - def ASSNAME(self, node): if node.flags == 'OP_DELETE': if isinstance(self.scope, FunctionScope) and node.name in self.scope.globals:
--- a/UtilitiesPython2/py2flakes/messages.py Fri Mar 11 08:55:14 2011 +0100 +++ b/UtilitiesPython2/py2flakes/messages.py Fri Mar 11 16:51:57 2011 +0100 @@ -7,6 +7,7 @@ # This module is based on pyflakes for Python2 but was heavily hacked to # work within eric5 + class Message(object): """ Class defining the base for all specific message classes. @@ -37,11 +38,12 @@ """ Public method to get the individual message data elements. - @return tuple containing file name, line number and message + @return tuple containing file name, line number and message (string, integer, string) """ return (self.filename, self.lineno, self.message % self.message_args) + class UnusedImport(Message): """ Class defining the "Unused Import" message. @@ -59,6 +61,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class RedefinedWhileUnused(Message): """ Class defining the "Redefined While Unused" message. @@ -77,6 +80,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class ImportShadowedByLoopVar(Message): """ Class defining the "Import Shadowed By Loop Var" message. @@ -95,6 +99,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class ImportStarUsed(Message): """ Class defining the "Import Star Used" message. @@ -112,6 +117,7 @@ Message.__init__(self, filename, lineno) self.message_args = (modname,) + class UndefinedName(Message): """ Class defining the "Undefined Name" message. @@ -129,6 +135,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class UndefinedExport(Message): """ Class defining the "Undefined Export" message. @@ -146,6 +153,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class UndefinedLocal(Message): """ Class defining the "Undefined Local Variable" message. @@ -165,6 +173,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class DuplicateArgument(Message): """ Class defining the "Duplicate Argument" message. @@ -182,6 +191,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name,) + class RedefinedFunction(Message): """ Class defining the "Redefined Function" message. @@ -200,6 +210,7 @@ Message.__init__(self, filename, lineno) self.message_args = (name, orig_lineno) + class LateFutureImport(Message): """ Class defining the "Late Future Import" message. @@ -217,6 +228,7 @@ Message.__init__(self, filename, lineno) self.message_args = (names,) + class UnusedVariable(Message): """ Class defining the "Unused Variable" message.
--- a/VCS/CommandOptionsDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/CommandOptionsDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Utilities + class vcsCommandOptionsDialog(QDialog, Ui_vcsCommandOptionsDialog): """ Class implementing the VCS command options dialog.
--- a/VCS/ProjectBrowserHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/ProjectBrowserHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,12 +23,13 @@ import Preferences + class VcsProjectBrowserHelper(QObject): """ Class implementing the base class of the VCS project browser helper. """ def __init__(self, vcsObject, browserObject, projectObject, isTranslationsBrowser, - parent = None, name = None): + parent=None, name=None): """ Constructor @@ -68,9 +69,9 @@ def showContextMenu(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the file status. @param menu reference to the menu to be shown @@ -81,9 +82,9 @@ def showContextMenuMulti(self, menu, standardItems): """ - Slot called before the context menu (multiple selections) is shown. + Slot called before the context menu (multiple selections) is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the files status. @param menu reference to the menu to be shown @@ -94,9 +95,9 @@ def showContextMenuDir(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -107,9 +108,9 @@ def showContextMenuDirMulti(self, menu, standardItems): """ - Slot called before the context menu is shown. + Slot called before the context menu is shown. - It enables/disables the VCS menu entries depending on the overall + It enables/disables the VCS menu entries depending on the overall VCS status and the directory status. @param menu reference to the menu to be shown @@ -280,9 +281,9 @@ status = self.vcs.vcsRemove(names) if status: if isRemoveDirs: - self.browser._removeDir() # remove directories from Project + self.browser._removeDir() # remove directories from Project else: - self.browser._removeFile() # remove file(s) from project + self.browser._removeFile() # remove file(s) from project def _VCSLog(self): """ @@ -368,4 +369,4 @@ @param name filename or directoryname of the item to be updated (string) """ - self.project.getModel().updateVCSStatus(name) \ No newline at end of file + self.project.getModel().updateVCSStatus(name)
--- a/VCS/ProjectHelper.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/ProjectHelper.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,11 +23,12 @@ import Preferences + class VcsProjectHelper(QObject): """ Class implementing the base class of the VCS project helper. """ - def __init__(self, vcsObject, projectObject, parent = None, name = None): + def __init__(self, vcsObject, projectObject, parent=None, name=None): """ Constructor @@ -73,7 +74,7 @@ self.vcsNewAct.triggered[()].connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) - self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), + self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), self.trUtf8('&Export from repository...'), 0, 0, self, 'vcs_export') self.vcsExportAct.setStatusTip(self.trUtf8( 'Export a project from the repository' @@ -117,7 +118,7 @@ """ self.vcsAddAct.setEnabled(self.project.isOpen()) - def _vcsCheckout(self, export = False): + def _vcsCheckout(self, export=False): """ Protected slot used to create a local project from the repository. @@ -213,7 +214,7 @@ self.trUtf8("The project retrieved from the repository" " does not contain an eric project file" " (*.e4p). Create it?"), - yesDefault = True) + yesDefault=True) if res: self.project.ppath = projectdir self.project.opened = True @@ -225,7 +226,7 @@ self.project.initFileTypes() self.project.setDirty(True) try: - ms = os.path.join(self.project.ppath, + ms = os.path.join(self.project.ppath, self.project.pdata["MAINSCRIPT"][0]) if os.path.exists(ms): self.project.appendFile(ms) @@ -239,7 +240,7 @@ self.trUtf8("New project from repository"), self.trUtf8("Shall the project file be added to" " the repository?"), - yesDefault = True) + yesDefault=True) if res: self.project.vcs.vcsAdd(self.project.pfile) else: @@ -263,9 +264,9 @@ """ Protected slot used to import the local project into the repository. - <b>NOTE</b>: + <b>NOTE</b>: This does not necessarily make the local project a vcs controlled - project. You may have to checkout the project from the repository in + project. You may have to checkout the project from the repository in order to accomplish that. """ def revertChanges(): @@ -328,7 +329,7 @@ # reopen the project self.project.openProject(self.project.pfile) else: - # revert the changes to the local project + # revert the changes to the local project # because the project dir is not a VCS directory revertChanges() else: @@ -344,7 +345,7 @@ res = E5MessageBox.yesNo(self.parent(), self.trUtf8("Update"), self.trUtf8("""The project should be reread. Do this now?"""), - yesDefault = True) + yesDefault=True) if res: self.project.reopenProject()
--- a/VCS/StatusMonitorLed.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/StatusMonitorLed.py Fri Mar 11 16:51:57 2011 +0100 @@ -14,6 +14,7 @@ import Preferences + class StatusMonitorLed(E5Led): """ Class implementing a LED to indicate the status of the VCS status monitor thread. @@ -25,17 +26,17 @@ @param project reference to the project object (Project.Project) @param parent reference to the parent object (QWidget) """ - E5Led.__init__(self, parent, shape = E5LedRectangular, rectRatio = 1.0) + E5Led.__init__(self, parent, shape=E5LedRectangular, rectRatio=1.0) self.project = project self.vcsMonitorLedColors = { - "off" : QColor(Qt.lightGray), - "ok" : QColor(Qt.green), - "nok" : QColor(Qt.red), - "op" : QColor(Qt.yellow), - "send" : QColor(Qt.blue), - "wait" : QColor(Qt.cyan), - "timeout" : QColor(Qt.darkRed) + "off": QColor(Qt.lightGray), + "ok": QColor(Qt.green), + "nok": QColor(Qt.red), + "op": QColor(Qt.yellow), + "send": QColor(Qt.blue), + "wait": QColor(Qt.cyan), + "timeout": QColor(Qt.darkRed) } self.__on = False @@ -58,7 +59,7 @@ self.__intervalAct = \ self.__menu.addAction(self.trUtf8("Set interval..."), self.__setInterval) self.__menu.addSeparator() - self.__onAct = \ + self.__onAct = \ self.__menu.addAction(self.trUtf8("Switch on"), self.__switchOn) self.__offAct = \ self.__menu.addAction(self.trUtf8("Switch off"), self.__switchOff) @@ -120,7 +121,7 @@ None, self.trUtf8("VCS Status Monitor"), self.trUtf8("Enter monitor interval [s]"), - self.project.getStatusMonitorInterval(), + self.project.getStatusMonitorInterval(), 0, 3600, 1) if ok: self.project.setStatusMonitorInterval(interval) @@ -135,4 +136,4 @@ """ Private slot to switch the status monitor thread to Off. """ - self.project.stopStatusMonitor() \ No newline at end of file + self.project.stopStatusMonitor()
--- a/VCS/StatusMonitorThread.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/StatusMonitorThread.py Fri Mar 11 16:51:57 2011 +0100 @@ -9,6 +9,7 @@ from PyQt4.QtCore import QThread, QMutex, QWaitCondition, pyqtSignal + class VcsStatusMonitorThread(QThread): """ Class implementing the VCS status monitor thread base class. @@ -20,7 +21,7 @@ vcsStatusMonitorData = pyqtSignal(list) vcsStatusMonitorStatus = pyqtSignal(str, str) - def __init__(self, interval, project, vcs, parent = None): + def __init__(self, interval, project, vcs, parent=None): """ Constructor @@ -180,7 +181,7 @@ <li>" " path is back at normal</li> </ul> - @return tuple of flag indicating successful operation (boolean) and + @return tuple of flag indicating successful operation (boolean) and a status message in case of non successful operation (string) """ raise RuntimeError('Not implemented')
--- a/VCS/VersionControl.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/VersionControl.py Fri Mar 11 16:51:57 2011 +0100 @@ -4,7 +4,7 @@ # """ -Module implementing an abstract base class to be subclassed by all specific +Module implementing an abstract base class to be subclassed by all specific VCS interfaces. """ @@ -18,9 +18,10 @@ import Preferences + class VersionControl(QObject): """ - Class implementing an abstract base class to be subclassed by all specific + Class implementing an abstract base class to be subclassed by all specific VCS interfaces. It defines the vcs interface to be implemented by subclasses @@ -36,7 +37,7 @@ canBeCommitted = 1 # Indicates that a file/directory is in the vcs. canBeAdded = 2 # Indicates that a file/directory is not in vcs. - def __init__(self, parent = None, name = None): + def __init__(self, parent=None, name=None): """ Constructor @@ -47,18 +48,18 @@ if name: self.setObjectName(name) self.defaultOptions = { - 'global' : [''], - 'commit' : [''], - 'checkout' : [''], - 'update' : [''], - 'add' : [''], - 'remove' : [''], - 'diff' : [''], - 'log' : [''], - 'history' : [''], - 'status' : [''], - 'tag' : [''], - 'export' : [''] + 'global': [''], + 'commit': [''], + 'checkout': [''], + 'update': [''], + 'add': [''], + 'remove': [''], + 'diff': [''], + 'log': [''], + 'history': [''], + 'status': [''], + 'tag': [''], + 'export': [''] } self.interestingDataKeys = [] self.options = {} @@ -86,7 +87,7 @@ """ raise RuntimeError('Not implemented') - def vcsInit(self, vcsDir, noDialog = False): + def vcsInit(self, vcsDir, noDialog=False): """ Public method used to initialize the vcs. @@ -108,7 +109,7 @@ """ raise RuntimeError('Not implemented') - def vcsImport(self, vcsDataDict, projectDir, noDialog = False): + def vcsImport(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to import the project into the vcs. @@ -121,7 +122,7 @@ """ raise RuntimeError('Not implemented') - def vcsCheckout(self, vcsDataDict, projectDir, noDialog = False): + def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False): """ Public method used to check the project out of the vcs. @@ -146,7 +147,7 @@ """ raise RuntimeError('Not implemented') - def vcsCommit(self, name, message, noDialog = False): + def vcsCommit(self, name, message, noDialog=False): """ Public method used to make the change of a file/directory permanent in the vcs. @@ -159,7 +160,7 @@ """ raise RuntimeError('Not implemented') - def vcsUpdate(self, name, noDialog = False): + def vcsUpdate(self, name, noDialog=False): """ Public method used to update a file/directory in the vcs. @@ -173,7 +174,7 @@ """ raise RuntimeError('Not implemented') - def vcsAdd(self, name, isDir = False, noDialog = False): + def vcsAdd(self, name, isDir=False, noDialog=False): """ Public method used to add a file/directory in the vcs. @@ -186,7 +187,7 @@ """ raise RuntimeError('Not implemented') - def vcsAddBinary(self, name, isDir = False): + def vcsAddBinary(self, name, isDir=False): """ Public method used to add a file/directory in binary mode in the vcs. @@ -209,7 +210,7 @@ """ raise RuntimeError('Not implemented') - def vcsRemove(self, name, project = False, noDialog = False): + def vcsRemove(self, name, project=False, noDialog=False): """ Public method used to add a file/directory in the vcs. @@ -222,7 +223,7 @@ """ raise RuntimeError('Not implemented') - def vcsMove(self, name, project, target = None, noDialog = False): + def vcsMove(self, name, project, target=None, noDialog=False): """ Public method used to move a file/directory. @@ -340,7 +341,7 @@ @param names dictionary with all filenames to be checked as keys @param dname directory to check in (string) - @return the received dictionary completed with a combination of + @return the received dictionary completed with a combination of canBeCommited and canBeAdded or None in order to signal an error @exception RuntimeError not implemented """ @@ -373,7 +374,7 @@ """ raise RuntimeError('Not implemented') - def vcsOptionsDialog(self, project, archive, editable = False, parent = None): + def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ Public method to get a dialog to enter repository info. @@ -384,7 +385,7 @@ """ raise RuntimeError('Not implemented') - def vcsNewProjectOptionsDialog(self, parent = None): + def vcsNewProjectOptionsDialog(self, parent=None): """ Public method to get a dialog to enter repository info for getting a new project. @@ -401,7 +402,7 @@ """ raise RuntimeError('Not implemented') - def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser = False): + def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False): """ Public method to instanciate a helper object for the different project browsers. @@ -509,7 +510,7 @@ ## below are some utility methods ##################################################################### - def startSynchronizedProcess(self, proc, program, arguments, workingDir = None): + def startSynchronizedProcess(self, proc, program, arguments, workingDir=None): """ Public method to start a synchroneous process @@ -560,7 +561,7 @@ def splitPathList(self, names): """ - Public method splitting the list of names into a common directory part and + Public method splitting the list of names into a common directory part and a file list. @param names list of paths (list of strings) @@ -656,7 +657,7 @@ self.statusMonitorThread.terminate() self.statusMonitorThread.wait(10000) self.statusMonitorThread = None - self.__statusMonitorStatus("off", + self.__statusMonitorStatus("off", self.trUtf8("Repository status checking is switched off")) def setStatusMonitorInterval(self, interval, project):
--- a/VCS/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/VCS/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ The general part of the VCS interface defines classes to implement common dialogs. These are a dialog to enter command options, a dialog to display -some repository information and an abstract base class. The individual +some repository information and an abstract base class. The individual interfaces (i.e. CVS) have to be subclasses of this base class. """ @@ -19,6 +19,7 @@ ## vcs object depending on the project settings. ###################################################################### + def factory(vcs): """ Modul factory function to generate the right vcs object. @@ -31,7 +32,7 @@ # that should not happen vc = None - vc = pluginManager.getPluginObject("version_control", vcs, maybeActive = True) + vc = pluginManager.getPluginObject("version_control", vcs, maybeActive=True) if vc is None: # try alternative vcs interfaces assuming, that there is a common # indicator for the alternatives @@ -47,7 +48,7 @@ for vcsSystem, vcsSystemDisplay in vcsData: if vcsSystem != vcs: vc = pluginManager.getPluginObject( - "version_control", vcsSystem, maybeActive = True) + "version_control", vcsSystem, maybeActive=True) if vc is not None: break break
--- a/ViewManager/BookmarkedFilesDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/ViewManager/BookmarkedFilesDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -17,11 +17,12 @@ import Utilities + class BookmarkedFilesDialog(QDialog, Ui_BookmarkedFilesDialog): """ Class implementing a configuration dialog for the bookmarked files menu. """ - def __init__(self, bookmarks, parent = None): + def __init__(self, bookmarks, parent=None): """ Constructor @@ -171,7 +172,7 @@ def getBookmarkedFiles(self): """ - Public method to retrieve the tools list. + Public method to retrieve the tools list. @return a list of filenames (list of strings) """
--- a/ViewManager/ViewManager.py Fri Mar 11 08:55:14 2011 +0100 +++ b/ViewManager/ViewManager.py Fri Mar 11 16:51:57 2011 +0100 @@ -40,6 +40,7 @@ from E5Gui.E5Action import E5Action, createActionGroup + class QuickSearchLineEdit(QLineEdit): """ Class implementing a line edit that reacts to newline and cancel commands. @@ -90,6 +91,7 @@ self.gotFocus.emit() QLineEdit.focusInEvent(self, evt) # pass it on + class ViewManager(QObject): """ Base class inherited by all specific viewmanager classes. @@ -136,8 +138,8 @@ self.currentEditor = None self.untitledCount = 0 self.srHistory = { - "search" : [], - "replace" : [] + "search": [], + "replace": [] } self.editorsCheckFocusIn = True @@ -157,7 +159,7 @@ self.autosaveTimer.timeout.connect(self.__autosave) # initialize the APIs manager - self.apisManager = APIsManager(parent = self) + self.apisManager = APIsManager(parent=self) self.__cooperationClient = None @@ -216,11 +218,11 @@ @param sbFile reference to the file part of the statusbar (E5SqueezeLabelPath) @param sbLine reference to the line number part of the statusbar (QLabel) @param sbPos reference to the character position part of the statusbar (QLabel) - @param sbWritable reference to the writability indicator part of + @param sbWritable reference to the writability indicator part of the statusbar (QLabel) - @param sbEncoding reference to the encoding indicator part of the + @param sbEncoding reference to the encoding indicator part of the statusbar (QLabel) - @param sbLanguage reference to the language indicator part of the + @param sbLanguage reference to the language indicator part of the statusbar (QLabel) @param sbEol reference to the eol indicator part of the statusbar (QLabel) """ @@ -446,14 +448,14 @@ self.spellingActions = [] self.__actions = { - "bookmark" : self.bookmarkActions, - "edit" : self.editActions, - "file" : self.fileActions, - "macro" : self.macroActions, - "search" : self.searchActions, - "spelling" : self.spellingActions, - "view" : self.viewActions, - "window" : self.windowActions, + "bookmark": self.bookmarkActions, + "edit": self.editActions, + "file": self.fileActions, + "macro": self.macroActions, + "search": self.searchActions, + "spelling": self.spellingActions, + "view": self.viewActions, + "window": self.windowActions, } self._initWindowActions() @@ -480,7 +482,7 @@ 0, self, 'vm_file_new') self.newAct.setStatusTip( QApplication.translate('ViewManager', 'Open an empty editor window')) - self.newAct.setWhatsThis(QApplication.translate('ViewManager', + self.newAct.setWhatsThis(QApplication.translate('ViewManager', """<b>New</b>""" """<p>An empty editor window will be created.</p>""" )) @@ -491,10 +493,10 @@ UI.PixmapCache.getIcon("open.png"), QApplication.translate('ViewManager', '&Open...'), QKeySequence( - QApplication.translate('ViewManager', "Ctrl+O", "File|Open")), + QApplication.translate('ViewManager', "Ctrl+O", "File|Open")), 0, self, 'vm_file_open') self.openAct.setStatusTip(QApplication.translate('ViewManager', 'Open a file')) - self.openAct.setWhatsThis(QApplication.translate('ViewManager', + self.openAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Open a file</b>""" """<p>You will be asked for the name of a file to be opened""" """ in an editor window.</p>""" @@ -508,11 +510,11 @@ UI.PixmapCache.getIcon("close.png"), QApplication.translate('ViewManager', '&Close'), QKeySequence( - QApplication.translate('ViewManager', "Ctrl+W", "File|Close")), + QApplication.translate('ViewManager', "Ctrl+W", "File|Close")), 0, self.closeActGrp, 'vm_file_close') self.closeAct.setStatusTip( QApplication.translate('ViewManager', 'Close the current window')) - self.closeAct.setWhatsThis(QApplication.translate('ViewManager', + self.closeAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Close Window</b>""" """<p>Close the current window.</p>""" )) @@ -524,7 +526,7 @@ 0, 0, self.closeActGrp, 'vm_file_close_all') self.closeAllAct.setStatusTip( QApplication.translate('ViewManager', 'Close all editor windows')) - self.closeAllAct.setWhatsThis(QApplication.translate('ViewManager', + self.closeAllAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Close All Windows</b>""" """<p>Close all editor windows.</p>""" )) @@ -539,11 +541,11 @@ UI.PixmapCache.getIcon("fileSave.png"), QApplication.translate('ViewManager', '&Save'), QKeySequence( - QApplication.translate('ViewManager', "Ctrl+S", "File|Save")), + QApplication.translate('ViewManager', "Ctrl+S", "File|Save")), 0, self.saveActGrp, 'vm_file_save') self.saveAct.setStatusTip( QApplication.translate('ViewManager', 'Save the current file')) - self.saveAct.setWhatsThis(QApplication.translate('ViewManager', + self.saveAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Save File</b>""" """<p>Save the contents of current editor window.</p>""" )) @@ -553,12 +555,12 @@ self.saveAsAct = E5Action(QApplication.translate('ViewManager', 'Save as'), UI.PixmapCache.getIcon("fileSaveAs.png"), QApplication.translate('ViewManager', 'Save &as...'), - QKeySequence(QApplication.translate('ViewManager', - "Shift+Ctrl+S", "File|Save As")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+Ctrl+S", "File|Save As")), 0, self.saveActGrp, 'vm_file_save_as') - self.saveAsAct.setStatusTip(QApplication.translate('ViewManager', + self.saveAsAct.setStatusTip(QApplication.translate('ViewManager', 'Save the current file to a new one')) - self.saveAsAct.setWhatsThis(QApplication.translate('ViewManager', + self.saveAsAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Save File as</b>""" """<p>Save the contents of current editor window to a new file.""" """ The file can be entered in a file selection dialog.</p>""" @@ -570,9 +572,9 @@ UI.PixmapCache.getIcon("fileSaveAll.png"), QApplication.translate('ViewManager', 'Save a&ll...'), 0, 0, self.saveActGrp, 'vm_file_save_all') - self.saveAllAct.setStatusTip(QApplication.translate('ViewManager', + self.saveAllAct.setStatusTip(QApplication.translate('ViewManager', 'Save all files')) - self.saveAllAct.setWhatsThis(QApplication.translate('ViewManager', + self.saveAllAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Save All Files</b>""" """<p>Save the contents of all editor windows.</p>""" )) @@ -584,12 +586,12 @@ self.printAct = E5Action(QApplication.translate('ViewManager', 'Print'), UI.PixmapCache.getIcon("print.png"), QApplication.translate('ViewManager', '&Print'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+P", "File|Print")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+P", "File|Print")), 0, self, 'vm_file_print') - self.printAct.setStatusTip(QApplication.translate('ViewManager', + self.printAct.setStatusTip(QApplication.translate('ViewManager', 'Print the current file')) - self.printAct.setWhatsThis(QApplication.translate('ViewManager', + self.printAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Print File</b>""" """<p>Print the contents of current editor window.</p>""" )) @@ -602,9 +604,9 @@ UI.PixmapCache.getIcon("printPreview.png"), QApplication.translate('ViewManager', 'Print Preview'), 0, 0, self, 'vm_file_print_preview') - self.printPreviewAct.setStatusTip(QApplication.translate('ViewManager', + self.printPreviewAct.setStatusTip(QApplication.translate('ViewManager', 'Print preview of the current file')) - self.printPreviewAct.setWhatsThis(QApplication.translate('ViewManager', + self.printPreviewAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Print Preview</b>""" """<p>Print preview of the current editor window.</p>""" )) @@ -612,15 +614,15 @@ self.printPreviewAct.setEnabled(False) self.fileActions.append(self.printPreviewAct) - self.findFileNameAct = E5Action(QApplication.translate('ViewManager', + self.findFileNameAct = E5Action(QApplication.translate('ViewManager', 'Search File'), QApplication.translate('ViewManager', 'Search &File...'), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Ctrl+F", "File|Search File")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Ctrl+F", "File|Search File")), 0, self, 'vm_file_search_file') - self.findFileNameAct.setStatusTip(QApplication.translate('ViewManager', + self.findFileNameAct.setStatusTip(QApplication.translate('ViewManager', 'Search for a file')) - self.findFileNameAct.setWhatsThis(QApplication.translate('ViewManager', + self.findFileNameAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search File</b>""" """<p>Search for a file.</p>""" )) @@ -634,9 +636,9 @@ @return the generated menu """ menu = QMenu(QApplication.translate('ViewManager', '&File'), self.ui) - self.recentMenu = QMenu(QApplication.translate('ViewManager', + self.recentMenu = QMenu(QApplication.translate('ViewManager', 'Open &Recent Files'), menu) - self.bookmarkedMenu = QMenu(QApplication.translate('ViewManager', + self.bookmarkedMenu = QMenu(QApplication.translate('ViewManager', 'Open &Bookmarked Files'), menu) self.exportersMenu = self.__initContextMenuExporters() menu.setTearOffEnabled(True) @@ -724,14 +726,14 @@ self.undoAct = E5Action(QApplication.translate('ViewManager', 'Undo'), UI.PixmapCache.getIcon("editUndo.png"), QApplication.translate('ViewManager', '&Undo'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Z", "Edit|Undo")), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Backspace", "Edit|Undo")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Z", "Edit|Undo")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Backspace", "Edit|Undo")), self.editActGrp, 'vm_edit_undo') - self.undoAct.setStatusTip(QApplication.translate('ViewManager', + self.undoAct.setStatusTip(QApplication.translate('ViewManager', 'Undo the last change')) - self.undoAct.setWhatsThis(QApplication.translate('ViewManager', + self.undoAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Undo</b>""" """<p>Undo the last change done in the current editor.</p>""" )) @@ -741,28 +743,28 @@ self.redoAct = E5Action(QApplication.translate('ViewManager', 'Redo'), UI.PixmapCache.getIcon("editRedo.png"), QApplication.translate('ViewManager', '&Redo'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Shift+Z", "Edit|Redo")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Shift+Z", "Edit|Redo")), 0, self.editActGrp, 'vm_edit_redo') - self.redoAct.setStatusTip(QApplication.translate('ViewManager', + self.redoAct.setStatusTip(QApplication.translate('ViewManager', 'Redo the last change')) - self.redoAct.setWhatsThis(QApplication.translate('ViewManager', + self.redoAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Redo</b>""" """<p>Redo the last change done in the current editor.</p>""" )) self.redoAct.triggered[()].connect(self.__editRedo) self.editActions.append(self.redoAct) - self.revertAct = E5Action(QApplication.translate('ViewManager', + self.revertAct = E5Action(QApplication.translate('ViewManager', 'Revert to last saved state'), QApplication.translate('ViewManager', 'Re&vert to last saved state'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Y", "Edit|Revert")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Y", "Edit|Revert")), 0, self.editActGrp, 'vm_edit_revert') - self.revertAct.setStatusTip(QApplication.translate('ViewManager', + self.revertAct.setStatusTip(QApplication.translate('ViewManager', 'Revert to last saved state')) - self.revertAct.setWhatsThis(QApplication.translate('ViewManager', + self.revertAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Revert to last saved state</b>""" """<p>Undo all changes up to the last saved state""" """ of the current editor.</p>""" @@ -776,12 +778,12 @@ UI.PixmapCache.getIcon("editCut.png"), QApplication.translate('ViewManager', 'Cu&t'), QKeySequence(QApplication.translate('ViewManager', "Ctrl+X", "Edit|Cut")), - QKeySequence(QApplication.translate('ViewManager', + QKeySequence(QApplication.translate('ViewManager', "Shift+Del", "Edit|Cut")), self.copyActGrp, 'vm_edit_cut') - self.cutAct.setStatusTip(QApplication.translate('ViewManager', + self.cutAct.setStatusTip(QApplication.translate('ViewManager', 'Cut the selection')) - self.cutAct.setWhatsThis(QApplication.translate('ViewManager', + self.cutAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Cut</b>""" """<p>Cut the selected text of the current editor to the clipboard.</p>""" )) @@ -791,14 +793,14 @@ self.copyAct = E5Action(QApplication.translate('ViewManager', 'Copy'), UI.PixmapCache.getIcon("editCopy.png"), QApplication.translate('ViewManager', '&Copy'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+C", "Edit|Copy")), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Ins", "Edit|Copy")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+C", "Edit|Copy")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Ins", "Edit|Copy")), self.copyActGrp, 'vm_edit_copy') - self.copyAct.setStatusTip(QApplication.translate('ViewManager', + self.copyAct.setStatusTip(QApplication.translate('ViewManager', 'Copy the selection')) - self.copyAct.setWhatsThis(QApplication.translate('ViewManager', + self.copyAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Copy</b>""" """<p>Copy the selected text of the current editor to the clipboard.</p>""" )) @@ -808,14 +810,14 @@ self.pasteAct = E5Action(QApplication.translate('ViewManager', 'Paste'), UI.PixmapCache.getIcon("editPaste.png"), QApplication.translate('ViewManager', '&Paste'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+V", "Edit|Paste")), - QKeySequence(QApplication.translate('ViewManager', - "Shift+Ins", "Edit|Paste")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+V", "Edit|Paste")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+Ins", "Edit|Paste")), self.copyActGrp, 'vm_edit_paste') - self.pasteAct.setStatusTip(QApplication.translate('ViewManager', + self.pasteAct.setStatusTip(QApplication.translate('ViewManager', 'Paste the last cut/copied text')) - self.pasteAct.setWhatsThis(QApplication.translate('ViewManager', + self.pasteAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Paste</b>""" """<p>Paste the last cut/copied text from the clipboard to""" """ the current editor.</p>""" @@ -826,13 +828,13 @@ self.deleteAct = E5Action(QApplication.translate('ViewManager', 'Clear'), UI.PixmapCache.getIcon("editDelete.png"), QApplication.translate('ViewManager', 'Cl&ear'), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Shift+C", "Edit|Clear")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Shift+C", "Edit|Clear")), 0, self.copyActGrp, 'vm_edit_clear') - self.deleteAct.setStatusTip(QApplication.translate('ViewManager', + self.deleteAct.setStatusTip(QApplication.translate('ViewManager', 'Clear all text')) - self.deleteAct.setWhatsThis(QApplication.translate('ViewManager', + self.deleteAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Clear</b>""" """<p>Delete all text of the current editor.</p>""" )) @@ -841,13 +843,13 @@ self.joinAct = E5Action(QApplication.translate('ViewManager', 'Join Lines'), QApplication.translate('ViewManager', 'Join Lines'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+J", "Edit|Join Lines")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+J", "Edit|Join Lines")), 0, self.copyActGrp, 'vm_edit_join_lines') - self.joinAct.setStatusTip(QApplication.translate('ViewManager', + self.joinAct.setStatusTip(QApplication.translate('ViewManager', 'Join Lines')) - self.joinAct.setWhatsThis(QApplication.translate('ViewManager', + self.joinAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Join Lines</b>""" """<p>Join the current and the next lines.</p>""" )) @@ -857,12 +859,12 @@ self.indentAct = E5Action(QApplication.translate('ViewManager', 'Indent'), UI.PixmapCache.getIcon("editIndent.png"), QApplication.translate('ViewManager', '&Indent'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+I", "Edit|Indent")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+I", "Edit|Indent")), 0, self.editActGrp, 'vm_edit_indent') self.indentAct.setStatusTip(QApplication.translate('ViewManager', 'Indent line')) - self.indentAct.setWhatsThis(QApplication.translate('ViewManager', + self.indentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Indent</b>""" """<p>Indents the current line or the lines of the""" """ selection by one level.</p>""" @@ -873,13 +875,13 @@ self.unindentAct = E5Action(QApplication.translate('ViewManager', 'Unindent'), UI.PixmapCache.getIcon("editUnindent.png"), QApplication.translate('ViewManager', 'U&nindent'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Shift+I", "Edit|Unindent")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Shift+I", "Edit|Unindent")), 0, self.editActGrp, 'vm_edit_unindent') - self.unindentAct.setStatusTip(QApplication.translate('ViewManager', + self.unindentAct.setStatusTip(QApplication.translate('ViewManager', 'Unindent line')) - self.unindentAct.setWhatsThis(QApplication.translate('ViewManager', + self.unindentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Unindent</b>""" """<p>Unindents the current line or the lines of the""" """ selection by one level.</p>""" @@ -887,17 +889,17 @@ self.unindentAct.triggered[()].connect(self.__editUnindent) self.editActions.append(self.unindentAct) - self.smartIndentAct = E5Action(QApplication.translate('ViewManager', + self.smartIndentAct = E5Action(QApplication.translate('ViewManager', 'Smart indent'), UI.PixmapCache.getIcon("editSmartIndent.png"), QApplication.translate('ViewManager', 'Smart indent'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Alt+I", "Edit|Smart indent")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Alt+I", "Edit|Smart indent")), 0, self.editActGrp, 'vm_edit_smart_indent') - self.smartIndentAct.setStatusTip(QApplication.translate('ViewManager', + self.smartIndentAct.setStatusTip(QApplication.translate('ViewManager', 'Smart indent Line or Selection')) - self.smartIndentAct.setWhatsThis(QApplication.translate('ViewManager', + self.smartIndentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Smart indent</b>""" """<p>Indents the current line or the lines of the""" """ current selection smartly.</p>""" @@ -908,13 +910,13 @@ self.commentAct = E5Action(QApplication.translate('ViewManager', 'Comment'), UI.PixmapCache.getIcon("editComment.png"), QApplication.translate('ViewManager', 'C&omment'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+M", "Edit|Comment")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+M", "Edit|Comment")), 0, self.editActGrp, 'vm_edit_comment') - self.commentAct.setStatusTip(QApplication.translate('ViewManager', + self.commentAct.setStatusTip(QApplication.translate('ViewManager', 'Comment Line or Selection')) - self.commentAct.setWhatsThis(QApplication.translate('ViewManager', + self.commentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Comment</b>""" """<p>Comments the current line or the lines of the""" """ current selection.</p>""" @@ -925,13 +927,13 @@ self.uncommentAct = E5Action(QApplication.translate('ViewManager', 'Uncomment'), UI.PixmapCache.getIcon("editUncomment.png"), QApplication.translate('ViewManager', 'Unco&mment'), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Ctrl+M", "Edit|Uncomment")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Ctrl+M", "Edit|Uncomment")), 0, self.editActGrp, 'vm_edit_uncomment') - self.uncommentAct.setStatusTip(QApplication.translate('ViewManager', + self.uncommentAct.setStatusTip(QApplication.translate('ViewManager', 'Uncomment Line or Selection')) - self.uncommentAct.setWhatsThis(QApplication.translate('ViewManager', + self.uncommentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Uncomment</b>""" """<p>Uncomments the current line or the lines of the""" """ current selection.</p>""" @@ -939,26 +941,26 @@ self.uncommentAct.triggered[()].connect(self.__editUncomment) self.editActions.append(self.uncommentAct) - self.streamCommentAct = E5Action(QApplication.translate('ViewManager', + self.streamCommentAct = E5Action(QApplication.translate('ViewManager', 'Stream Comment'), QApplication.translate('ViewManager', 'Stream Comment'), 0, 0, self.editActGrp, 'vm_edit_stream_comment') - self.streamCommentAct.setStatusTip(QApplication.translate('ViewManager', + self.streamCommentAct.setStatusTip(QApplication.translate('ViewManager', 'Stream Comment Line or Selection')) - self.streamCommentAct.setWhatsThis(QApplication.translate('ViewManager', + self.streamCommentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Stream Comment</b>""" """<p>Stream comments the current line or the current selection.</p>""" )) self.streamCommentAct.triggered[()].connect(self.__editStreamComment) self.editActions.append(self.streamCommentAct) - self.boxCommentAct = E5Action(QApplication.translate('ViewManager', + self.boxCommentAct = E5Action(QApplication.translate('ViewManager', 'Box Comment'), QApplication.translate('ViewManager', 'Box Comment'), 0, 0, self.editActGrp, 'vm_edit_box_comment') - self.boxCommentAct.setStatusTip(QApplication.translate('ViewManager', + self.boxCommentAct.setStatusTip(QApplication.translate('ViewManager', 'Box Comment Line or Selection')) - self.boxCommentAct.setWhatsThis(QApplication.translate('ViewManager', + self.boxCommentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Box Comment</b>""" """<p>Box comments the current line or the lines of the""" """ current selection.</p>""" @@ -966,16 +968,16 @@ self.boxCommentAct.triggered[()].connect(self.__editBoxComment) self.editActions.append(self.boxCommentAct) - self.selectBraceAct = E5Action(QApplication.translate('ViewManager', + self.selectBraceAct = E5Action(QApplication.translate('ViewManager', 'Select to brace'), QApplication.translate('ViewManager', 'Select to &brace'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+E", "Edit|Select to brace")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+E", "Edit|Select to brace")), 0, self.editActGrp, 'vm_edit_select_to_brace') - self.selectBraceAct.setStatusTip(QApplication.translate('ViewManager', + self.selectBraceAct.setStatusTip(QApplication.translate('ViewManager', 'Select text to the matching brace')) - self.selectBraceAct.setWhatsThis(QApplication.translate('ViewManager', + self.selectBraceAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Select to brace</b>""" """<p>Select text of the current editor to the matching brace.</p>""" )) @@ -984,86 +986,86 @@ self.selectAllAct = E5Action(QApplication.translate('ViewManager', 'Select all'), QApplication.translate('ViewManager', '&Select all'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+A", "Edit|Select all")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+A", "Edit|Select all")), 0, self.editActGrp, 'vm_edit_select_all') - self.selectAllAct.setStatusTip(QApplication.translate('ViewManager', + self.selectAllAct.setStatusTip(QApplication.translate('ViewManager', 'Select all text')) - self.selectAllAct.setWhatsThis(QApplication.translate('ViewManager', + self.selectAllAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Select All</b>""" """<p>Select all text of the current editor.</p>""" )) self.selectAllAct.triggered[()].connect(self.__editSelectAll) self.editActions.append(self.selectAllAct) - self.deselectAllAct = E5Action(QApplication.translate('ViewManager', + self.deselectAllAct = E5Action(QApplication.translate('ViewManager', 'Deselect all'), QApplication.translate('ViewManager', '&Deselect all'), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Ctrl+A", "Edit|Deselect all")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Ctrl+A", "Edit|Deselect all")), 0, self.editActGrp, 'vm_edit_deselect_all') - self.deselectAllAct.setStatusTip(QApplication.translate('ViewManager', + self.deselectAllAct.setStatusTip(QApplication.translate('ViewManager', 'Deselect all text')) - self.deselectAllAct.setWhatsThis(QApplication.translate('ViewManager', + self.deselectAllAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Deselect All</b>""" """<p>Deselect all text of the current editor.</p>""" )) self.deselectAllAct.triggered[()].connect(self.__editDeselectAll) self.editActions.append(self.deselectAllAct) - self.convertEOLAct = E5Action(QApplication.translate('ViewManager', + self.convertEOLAct = E5Action(QApplication.translate('ViewManager', 'Convert Line End Characters'), QApplication.translate('ViewManager', 'Convert &Line End Characters'), 0, 0, self.editActGrp, 'vm_edit_convert_eol') - self.convertEOLAct.setStatusTip(QApplication.translate('ViewManager', + self.convertEOLAct.setStatusTip(QApplication.translate('ViewManager', 'Convert Line End Characters')) - self.convertEOLAct.setWhatsThis(QApplication.translate('ViewManager', + self.convertEOLAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Convert Line End Characters</b>""" """<p>Convert the line end characters to the currently set type.</p>""" )) self.convertEOLAct.triggered[()].connect(self.__convertEOL) self.editActions.append(self.convertEOLAct) - self.shortenEmptyAct = E5Action(QApplication.translate('ViewManager', + self.shortenEmptyAct = E5Action(QApplication.translate('ViewManager', 'Shorten empty lines'), QApplication.translate('ViewManager', 'Shorten empty lines'), 0, 0, self.editActGrp, 'vm_edit_shorten_empty_lines') - self.shortenEmptyAct.setStatusTip(QApplication.translate('ViewManager', + self.shortenEmptyAct.setStatusTip(QApplication.translate('ViewManager', 'Shorten empty lines')) - self.shortenEmptyAct.setWhatsThis(QApplication.translate('ViewManager', + self.shortenEmptyAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Shorten empty lines</b>""" """<p>Shorten lines consisting solely of whitespace characters.</p>""" )) self.shortenEmptyAct.triggered[()].connect(self.__shortenEmptyLines) self.editActions.append(self.shortenEmptyAct) - self.autoCompleteAct = E5Action(QApplication.translate('ViewManager', + self.autoCompleteAct = E5Action(QApplication.translate('ViewManager', 'Autocomplete'), QApplication.translate('ViewManager', '&Autocomplete'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Space", "Edit|Autocomplete")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Space", "Edit|Autocomplete")), 0, self.editActGrp, 'vm_edit_autocomplete') - self.autoCompleteAct.setStatusTip(QApplication.translate('ViewManager', + self.autoCompleteAct.setStatusTip(QApplication.translate('ViewManager', 'Autocomplete current word')) - self.autoCompleteAct.setWhatsThis(QApplication.translate('ViewManager', + self.autoCompleteAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Autocomplete</b>""" """<p>Performs an autocompletion of the word containing the cursor.</p>""" )) self.autoCompleteAct.triggered[()].connect(self.__editAutoComplete) self.editActions.append(self.autoCompleteAct) - self.autoCompleteFromDocAct = E5Action(QApplication.translate('ViewManager', + self.autoCompleteFromDocAct = E5Action(QApplication.translate('ViewManager', 'Autocomplete from Document'), QApplication.translate('ViewManager', 'Autocomplete from Document'), - QKeySequence(QApplication.translate('ViewManager', "Ctrl+Shift+Space", - "Edit|Autocomplete from Document")), + QKeySequence(QApplication.translate('ViewManager', "Ctrl+Shift+Space", + "Edit|Autocomplete from Document")), 0, self.editActGrp, 'vm_edit_autocomplete_from_document') - self.autoCompleteFromDocAct.setStatusTip(QApplication.translate('ViewManager', + self.autoCompleteFromDocAct.setStatusTip(QApplication.translate('ViewManager', 'Autocomplete current word from Document')) - self.autoCompleteFromDocAct.setWhatsThis(QApplication.translate('ViewManager', + self.autoCompleteFromDocAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Autocomplete from Document</b>""" """<p>Performs an autocompletion from document of the word""" """ containing the cursor.</p>""" @@ -1071,15 +1073,15 @@ self.autoCompleteFromDocAct.triggered[()].connect(self.__editAutoCompleteFromDoc) self.editActions.append(self.autoCompleteFromDocAct) - self.autoCompleteFromAPIsAct = E5Action(QApplication.translate('ViewManager', + self.autoCompleteFromAPIsAct = E5Action(QApplication.translate('ViewManager', 'Autocomplete from APIs'), QApplication.translate('ViewManager', 'Autocomplete from APIs'), - QKeySequence(QApplication.translate('ViewManager', "Ctrl+Alt+Space", - "Edit|Autocomplete from APIs")), + QKeySequence(QApplication.translate('ViewManager', "Ctrl+Alt+Space", + "Edit|Autocomplete from APIs")), 0, self.editActGrp, 'vm_edit_autocomplete_from_api') - self.autoCompleteFromAPIsAct.setStatusTip(QApplication.translate('ViewManager', + self.autoCompleteFromAPIsAct.setStatusTip(QApplication.translate('ViewManager', 'Autocomplete current word from APIs')) - self.autoCompleteFromAPIsAct.setWhatsThis(QApplication.translate('ViewManager', + self.autoCompleteFromAPIsAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Autocomplete from APIs</b>""" """<p>Performs an autocompletion from APIs of the word containing""" """ the cursor.</p>""" @@ -1088,16 +1090,16 @@ self.editActions.append(self.autoCompleteFromAPIsAct) self.autoCompleteFromAllAct = E5Action( - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Autocomplete from Document and APIs'), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Autocomplete from Document and APIs'), - QKeySequence(QApplication.translate('ViewManager', "Alt+Shift+Space", - "Edit|Autocomplete from Document and APIs")), + QKeySequence(QApplication.translate('ViewManager', "Alt+Shift+Space", + "Edit|Autocomplete from Document and APIs")), 0, self.editActGrp, 'vm_edit_autocomplete_from_all') - self.autoCompleteFromAllAct.setStatusTip(QApplication.translate('ViewManager', + self.autoCompleteFromAllAct.setStatusTip(QApplication.translate('ViewManager', 'Autocomplete current word from Document and APIs')) - self.autoCompleteFromAllAct.setWhatsThis(QApplication.translate('ViewManager', + self.autoCompleteFromAllAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Autocomplete from Document and APIs</b>""" """<p>Performs an autocompletion from document and APIs""" """ of the word containing the cursor.</p>""" @@ -1105,16 +1107,16 @@ self.autoCompleteFromAllAct.triggered[()].connect(self.__editAutoCompleteFromAll) self.editActions.append(self.autoCompleteFromAllAct) - self.calltipsAct = E5Action(QApplication.translate('ViewManager', + self.calltipsAct = E5Action(QApplication.translate('ViewManager', 'Calltip'), QApplication.translate('ViewManager', '&Calltip'), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Space", "Edit|Calltip")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Space", "Edit|Calltip")), 0, self.editActGrp, 'vm_edit_calltip') - self.calltipsAct.setStatusTip(QApplication.translate('ViewManager', + self.calltipsAct.setStatusTip(QApplication.translate('ViewManager', 'Show Calltips')) - self.calltipsAct.setWhatsThis(QApplication.translate('ViewManager', + self.calltipsAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Calltip</b>""" """<p>Show calltips based on the characters immediately to the""" """ left of the cursor.</p>""" @@ -1134,93 +1136,93 @@ self.editorActGrp = createActionGroup(self.editActGrp) - act = E5Action(QApplication.translate('ViewManager', 'Move left one character'), - QApplication.translate('ViewManager', 'Move left one character'), + act = E5Action(QApplication.translate('ViewManager', 'Move left one character'), + QApplication.translate('ViewManager', 'Move left one character'), QKeySequence(QApplication.translate('ViewManager', 'Left')), 0, self.editorActGrp, 'vm_edit_move_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move right one character'), - QApplication.translate('ViewManager', 'Move right one character'), + act = E5Action(QApplication.translate('ViewManager', 'Move right one character'), + QApplication.translate('ViewManager', 'Move right one character'), QKeySequence(QApplication.translate('ViewManager', 'Right')), 0, self.editorActGrp, 'vm_edit_move_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move up one line'), - QApplication.translate('ViewManager', 'Move up one line'), + act = E5Action(QApplication.translate('ViewManager', 'Move up one line'), + QApplication.translate('ViewManager', 'Move up one line'), QKeySequence(QApplication.translate('ViewManager', 'Up')), 0, self.editorActGrp, 'vm_edit_move_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move down one line'), - QApplication.translate('ViewManager', 'Move down one line'), + act = E5Action(QApplication.translate('ViewManager', 'Move down one line'), + QApplication.translate('ViewManager', 'Move down one line'), QKeySequence(QApplication.translate('ViewManager', 'Down')), 0, self.editorActGrp, 'vm_edit_move_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move left one word part'), - QApplication.translate('ViewManager', 'Move left one word part'), + act = E5Action(QApplication.translate('ViewManager', 'Move left one word part'), + QApplication.translate('ViewManager', 'Move left one word part'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move right one word part'), - QApplication.translate('ViewManager', 'Move right one word part'), + act = E5Action(QApplication.translate('ViewManager', 'Move right one word part'), + QApplication.translate('ViewManager', 'Move right one word part'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Right')), 0, self.editorActGrp, 'vm_edit_move_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move left one word'), - QApplication.translate('ViewManager', 'Move left one word'), + act = E5Action(QApplication.translate('ViewManager', 'Move left one word'), + QApplication.translate('ViewManager', 'Move left one word'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move right one word'), - QApplication.translate('ViewManager', 'Move right one word'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Right')), + act = E5Action(QApplication.translate('ViewManager', 'Move right one word'), + QApplication.translate('ViewManager', 'Move right one word'), + QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Right')), 0, self.editorActGrp, 'vm_edit_move_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Move to first visible character in line'), - QApplication.translate('ViewManager', - 'Move to first visible character in line'), + act = E5Action(QApplication.translate('ViewManager', + 'Move to first visible character in line'), + QApplication.translate('ViewManager', + 'Move to first visible character in line'), QKeySequence(QApplication.translate('ViewManager', 'Home')), 0, self.editorActGrp, 'vm_edit_move_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOME) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Move to start of displayed line'), - QApplication.translate('ViewManager', - 'Move to start of displayed line'), + act = E5Action(QApplication.translate('ViewManager', + 'Move to start of displayed line'), + QApplication.translate('ViewManager', + 'Move to start of displayed line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Home')), 0, self.editorActGrp, 'vm_edit_move_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move to end of line'), - QApplication.translate('ViewManager', 'Move to end of line'), + act = E5Action(QApplication.translate('ViewManager', 'Move to end of line'), + QApplication.translate('ViewManager', 'Move to end of line'), QKeySequence(QApplication.translate('ViewManager', 'End')), 0, self.editorActGrp, 'vm_edit_move_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEEND) @@ -1228,213 +1230,213 @@ self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Scroll view down one line'), - QApplication.translate('ViewManager', 'Scroll view down one line'), + QApplication.translate('ViewManager', 'Scroll view down one line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_scroll_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Scroll view up one line'), - QApplication.translate('ViewManager', 'Scroll view up one line'), + act = E5Action(QApplication.translate('ViewManager', 'Scroll view up one line'), + QApplication.translate('ViewManager', 'Scroll view up one line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_scroll_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move up one paragraph'), - QApplication.translate('ViewManager', 'Move up one paragraph'), + act = E5Action(QApplication.translate('ViewManager', 'Move up one paragraph'), + QApplication.translate('ViewManager', 'Move up one paragraph'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0, self.editorActGrp, 'vm_edit_move_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move down one paragraph'), - QApplication.translate('ViewManager', 'Move down one paragraph'), + act = E5Action(QApplication.translate('ViewManager', 'Move down one paragraph'), + QApplication.translate('ViewManager', 'Move down one paragraph'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0, self.editorActGrp, 'vm_edit_move_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move up one page'), - QApplication.translate('ViewManager', 'Move up one page'), + act = E5Action(QApplication.translate('ViewManager', 'Move up one page'), + QApplication.translate('ViewManager', 'Move up one page'), QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0, self.editorActGrp, 'vm_edit_move_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move down one page'), - QApplication.translate('ViewManager', 'Move down one page'), + act = E5Action(QApplication.translate('ViewManager', 'Move down one page'), + QApplication.translate('ViewManager', 'Move down one page'), QKeySequence(QApplication.translate('ViewManager', 'PgDown')), 0, self.editorActGrp, 'vm_edit_move_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move to start of text'), - QApplication.translate('ViewManager', 'Move to start of text'), + act = E5Action(QApplication.translate('ViewManager', 'Move to start of text'), + QApplication.translate('ViewManager', 'Move to start of text'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Home')), 0, self.editorActGrp, 'vm_edit_move_start_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Move to end of text'), - QApplication.translate('ViewManager', 'Move to end of text'), + act = E5Action(QApplication.translate('ViewManager', 'Move to end of text'), + QApplication.translate('ViewManager', 'Move to end of text'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+End')), 0, self.editorActGrp, 'vm_edit_move_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Indent one level'), - QApplication.translate('ViewManager', 'Indent one level'), + act = E5Action(QApplication.translate('ViewManager', 'Indent one level'), + QApplication.translate('ViewManager', 'Indent one level'), QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0, self.editorActGrp, 'vm_edit_indent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_TAB) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Unindent one level'), - QApplication.translate('ViewManager', 'Unindent one level'), + act = E5Action(QApplication.translate('ViewManager', 'Unindent one level'), + QApplication.translate('ViewManager', 'Unindent one level'), QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')), 0, self.editorActGrp, 'vm_edit_unindent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection left one character'), - QApplication.translate('ViewManager', - 'Extend selection left one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection left one character'), + QApplication.translate('ViewManager', + 'Extend selection left one character'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection right one character'), - QApplication.translate('ViewManager', - 'Extend selection right one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection right one character'), + QApplication.translate('ViewManager', + 'Extend selection right one character'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection up one line'), - QApplication.translate('ViewManager', - 'Extend selection up one line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection up one line'), + QApplication.translate('ViewManager', + 'Extend selection up one line'), QKeySequence(QApplication.translate('ViewManager', 'Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection down one line'), - QApplication.translate('ViewManager', - 'Extend selection down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Down')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection down one line'), + QApplication.translate('ViewManager', + 'Extend selection down one line'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection left one word part'), - QApplication.translate('ViewManager', - 'Extend selection left one word part'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection left one word part'), + QApplication.translate('ViewManager', + 'Extend selection left one word part'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection right one word part'), - QApplication.translate('ViewManager', - 'Extend selection right one word part'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection right one word part'), + QApplication.translate('ViewManager', + 'Extend selection right one word part'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection left one word'), - QApplication.translate('ViewManager', - 'Extend selection left one word'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection left one word'), + QApplication.translate('ViewManager', + 'Extend selection left one word'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection right one word'), - QApplication.translate('ViewManager', - 'Extend selection right one word'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection right one word'), + QApplication.translate('ViewManager', + 'Extend selection right one word'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', + act = E5Action(QApplication.translate('ViewManager', 'Extend selection to first visible character in line'), - QApplication.translate('ViewManager', - 'Extend selection to first visible character in line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Home')), + QApplication.translate('ViewManager', + 'Extend selection to first visible character in line'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Home')), 0, self.editorActGrp, 'vm_edit_extend_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to start of line'), - QApplication.translate('ViewManager', - 'Extend selection to start of line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Home')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to start of line'), + QApplication.translate('ViewManager', + 'Extend selection to start of line'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Home')), 0, self.editorActGrp, 'vm_edit_extend_selection_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to end of line'), - QApplication.translate('ViewManager', - 'Extend selection to end of line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to end of line'), + QApplication.translate('ViewManager', + 'Extend selection to end of line'), QKeySequence(QApplication.translate('ViewManager', 'Shift+End')), 0, self.editorActGrp, 'vm_edit_extend_selection_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection up one paragraph'), - QApplication.translate('ViewManager', - 'Extend selection up one paragraph'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection up one paragraph'), + QApplication.translate('ViewManager', + 'Extend selection up one paragraph'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_para') @@ -1442,33 +1444,33 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection down one paragraph'), - QApplication.translate('ViewManager', - 'Extend selection down one paragraph'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Down')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection down one paragraph'), + QApplication.translate('ViewManager', + 'Extend selection down one paragraph'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWNEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection up one page'), - QApplication.translate('ViewManager', - 'Extend selection up one page'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection up one page'), + QApplication.translate('ViewManager', + 'Extend selection up one page'), + QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection down one page'), - QApplication.translate('ViewManager', - 'Extend selection down one page'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection down one page'), + QApplication.translate('ViewManager', + 'Extend selection down one page'), QKeySequence(QApplication.translate('ViewManager', 'Shift+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_page') @@ -1476,11 +1478,11 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to start of text'), - QApplication.translate('ViewManager', - 'Extend selection to start of text'), - QKeySequence(QApplication.translate('ViewManager', + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to start of text'), + QApplication.translate('ViewManager', + 'Extend selection to start of text'), + QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+Home')), 0, self.editorActGrp, 'vm_edit_extend_selection_start_text') @@ -1488,133 +1490,133 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to end of text'), - QApplication.translate('ViewManager', - 'Extend selection to end of text'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+End')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to end of text'), + QApplication.translate('ViewManager', + 'Extend selection to end of text'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+End')), 0, self.editorActGrp, 'vm_edit_extend_selection_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Delete previous character'), - QApplication.translate('ViewManager', 'Delete previous character'), - QKeySequence(QApplication.translate('ViewManager', 'Backspace')), - QKeySequence(QApplication.translate('ViewManager', - 'Shift+Backspace')), + act = E5Action(QApplication.translate('ViewManager', + 'Delete previous character'), + QApplication.translate('ViewManager', 'Delete previous character'), + QKeySequence(QApplication.translate('ViewManager', 'Backspace')), + QKeySequence(QApplication.translate('ViewManager', + 'Shift+Backspace')), self.editorActGrp, 'vm_edit_delete_previous_char') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Delete previous character if not at line start'), - QApplication.translate('ViewManager', - 'Delete previous character if not at line start'), + act = E5Action(QApplication.translate('ViewManager', + 'Delete previous character if not at line start'), + QApplication.translate('ViewManager', + 'Delete previous character if not at line start'), 0, 0, self.editorActGrp, 'vm_edit_delet_previous_char_not_line_start') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACKNOTLINE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete current character'), - QApplication.translate('ViewManager', 'Delete current character'), + act = E5Action(QApplication.translate('ViewManager', 'Delete current character'), + QApplication.translate('ViewManager', 'Delete current character'), QKeySequence(QApplication.translate('ViewManager', 'Del')), 0, self.editorActGrp, 'vm_edit_delete_current_char') self.esm.setMapping(act, QsciScintilla.SCI_CLEAR) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete word to left'), - QApplication.translate('ViewManager', 'Delete word to left'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Backspace')), + act = E5Action(QApplication.translate('ViewManager', 'Delete word to left'), + QApplication.translate('ViewManager', 'Delete word to left'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_word_left') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDLEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete word to right'), - QApplication.translate('ViewManager', 'Delete word to right'), + act = E5Action(QApplication.translate('ViewManager', 'Delete word to right'), + QApplication.translate('ViewManager', 'Delete word to right'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0, self.editorActGrp, 'vm_edit_delete_word_right') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete line to left'), - QApplication.translate('ViewManager', 'Delete line to left'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Backspace')), + act = E5Action(QApplication.translate('ViewManager', 'Delete line to left'), + QApplication.translate('ViewManager', 'Delete line to left'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_line_left') self.esm.setMapping(act, QsciScintilla.SCI_DELLINELEFT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete line to right'), - QApplication.translate('ViewManager', 'Delete line to right'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Del')), + act = E5Action(QApplication.translate('ViewManager', 'Delete line to right'), + QApplication.translate('ViewManager', 'Delete line to right'), + QKeySequence(QApplication.translate('ViewManager', + 'Ctrl+Shift+Del')), 0, self.editorActGrp, 'vm_edit_delete_line_right') self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Insert new line'), - QApplication.translate('ViewManager', 'Insert new line'), - QKeySequence(QApplication.translate('ViewManager', 'Return')), - QKeySequence(QApplication.translate('ViewManager', 'Enter')), + act = E5Action(QApplication.translate('ViewManager', 'Insert new line'), + QApplication.translate('ViewManager', 'Insert new line'), + QKeySequence(QApplication.translate('ViewManager', 'Return')), + QKeySequence(QApplication.translate('ViewManager', 'Enter')), self.editorActGrp, 'vm_edit_insert_line') self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Insert new line below current line'), - QApplication.translate('ViewManager', - 'Insert new line below current line'), + act = E5Action(QApplication.translate('ViewManager', + 'Insert new line below current line'), + QApplication.translate('ViewManager', + 'Insert new line below current line'), QKeySequence(QApplication.translate('ViewManager', 'Shift+Return')), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), + QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), self.editorActGrp, 'vm_edit_insert_line_below') act.triggered[()].connect(self.__newLineBelow) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Delete current line'), - QApplication.translate('ViewManager', 'Delete current line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+U')), + act = E5Action(QApplication.translate('ViewManager', 'Delete current line'), + QApplication.translate('ViewManager', 'Delete current line'), + QKeySequence(QApplication.translate('ViewManager', 'Ctrl+U')), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+L')), self.editorActGrp, 'vm_edit_delete_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDELETE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Duplicate current line'), - QApplication.translate('ViewManager', 'Duplicate current line'), + act = E5Action(QApplication.translate('ViewManager', 'Duplicate current line'), + QApplication.translate('ViewManager', 'Duplicate current line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Swap current and previous lines'), - QApplication.translate('ViewManager', - 'Swap current and previous lines'), + act = E5Action(QApplication.translate('ViewManager', + 'Swap current and previous lines'), + QApplication.translate('ViewManager', + 'Swap current and previous lines'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0, self.editorActGrp, 'vm_edit_swap_current_previous_line') self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Cut current line'), - QApplication.translate('ViewManager', 'Cut current line'), + act = E5Action(QApplication.translate('ViewManager', 'Cut current line'), + QApplication.translate('ViewManager', 'Cut current line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+L')), 0, self.editorActGrp, 'vm_edit_cut_current_line') @@ -1622,8 +1624,8 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Copy current line'), - QApplication.translate('ViewManager', 'Copy current line'), + act = E5Action(QApplication.translate('ViewManager', 'Copy current line'), + QApplication.translate('ViewManager', 'Copy current line'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+T')), 0, self.editorActGrp, 'vm_edit_copy_current_line') @@ -1631,18 +1633,18 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Toggle insert/overtype'), - QApplication.translate('ViewManager', 'Toggle insert/overtype'), + act = E5Action(QApplication.translate('ViewManager', 'Toggle insert/overtype'), + QApplication.translate('ViewManager', 'Toggle insert/overtype'), QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0, self.editorActGrp, 'vm_edit_toggle_insert_overtype') self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Convert selection to lower case'), - QApplication.translate('ViewManager', - 'Convert selection to lower case'), + act = E5Action(QApplication.translate('ViewManager', + 'Convert selection to lower case'), + QApplication.translate('ViewManager', + 'Convert selection to lower case'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+U')), 0, self.editorActGrp, 'vm_edit_convert_selection_lower') @@ -1650,10 +1652,10 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Convert selection to upper case'), - QApplication.translate('ViewManager', - 'Convert selection to upper case'), + act = E5Action(QApplication.translate('ViewManager', + 'Convert selection to upper case'), + QApplication.translate('ViewManager', + 'Convert selection to upper case'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+U')), 0, self.editorActGrp, 'vm_edit_convert_selection_upper') @@ -1661,58 +1663,58 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Move to end of displayed line'), - QApplication.translate('ViewManager', - 'Move to end of displayed line'), + act = E5Action(QApplication.translate('ViewManager', + 'Move to end of displayed line'), + QApplication.translate('ViewManager', + 'Move to end of displayed line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+End')), 0, self.editorActGrp, 'vm_edit_move_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend selection to end of displayed line'), - QApplication.translate('ViewManager', - 'Extend selection to end of displayed line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend selection to end of displayed line'), + QApplication.translate('ViewManager', + 'Extend selection to end of displayed line'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Formfeed'), - QApplication.translate('ViewManager', 'Formfeed'), + act = E5Action(QApplication.translate('ViewManager', 'Formfeed'), + QApplication.translate('ViewManager', 'Formfeed'), 0, 0, self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', 'Escape'), - QApplication.translate('ViewManager', 'Escape'), + act = E5Action(QApplication.translate('ViewManager', 'Escape'), + QApplication.translate('ViewManager', 'Escape'), QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0, self.editorActGrp, 'vm_edit_escape') self.esm.setMapping(act, QsciScintilla.SCI_CANCEL) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection down one line'), - QApplication.translate('ViewManager', - 'Extend rectangular selection down one line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Down')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection down one line'), + QApplication.translate('ViewManager', + 'Extend rectangular selection down one line'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection up one line'), - QApplication.translate('ViewManager', - 'Extend rectangular selection up one line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection up one line'), + QApplication.translate('ViewManager', + 'Extend rectangular selection up one line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') @@ -1720,49 +1722,49 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection left one character'), - QApplication.translate('ViewManager', - 'Extend rectangular selection left one character'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Left')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection left one character'), + QApplication.translate('ViewManager', + 'Extend rectangular selection left one character'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection right one character'), - QApplication.translate('ViewManager', - 'Extend rectangular selection right one character'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Right')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection right one character'), + QApplication.translate('ViewManager', + 'Extend rectangular selection right one character'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Right')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', + act = E5Action(QApplication.translate('ViewManager', 'Extend rectangular selection to first' - ' visible character in line'), - QApplication.translate('ViewManager', + ' visible character in line'), + QApplication.translate('ViewManager', 'Extend rectangular selection to first' - ' visible character in line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Home')), + ' visible character in line'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+Home')), 0, - self.editorActGrp, + self.editorActGrp, 'vm_edit_extend_rect_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection to end of line'), - QApplication.translate('ViewManager', - 'Extend rectangular selection to end of line'), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection to end of line'), + QApplication.translate('ViewManager', + 'Extend rectangular selection to end of line'), QKeySequence(QApplication.translate('ViewManager', 'Alt+Ctrl+End')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_end_line') @@ -1770,34 +1772,34 @@ act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection up one page'), - QApplication.translate('ViewManager', - 'Extend rectangular selection up one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+PgUp')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection up one page'), + QApplication.translate('ViewManager', + 'Extend rectangular selection up one page'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Extend rectangular selection down one page'), - QApplication.translate('ViewManager', - 'Extend rectangular selection down one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+PgDown')), + act = E5Action(QApplication.translate('ViewManager', + 'Extend rectangular selection down one page'), + QApplication.translate('ViewManager', + 'Extend rectangular selection down one page'), + QKeySequence(QApplication.translate('ViewManager', + 'Alt+Ctrl+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND) act.triggered[()].connect(self.esm.map) self.editActions.append(act) - act = E5Action(QApplication.translate('ViewManager', - 'Duplicate current selection'), - QApplication.translate('ViewManager', - 'Duplicate current selection'), + act = E5Action(QApplication.translate('ViewManager', + 'Duplicate current selection'), + QApplication.translate('ViewManager', + 'Duplicate current selection'), QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') @@ -1918,13 +1920,13 @@ self.searchAct = E5Action(QApplication.translate('ViewManager', 'Search'), UI.PixmapCache.getIcon("find.png"), QApplication.translate('ViewManager', '&Search...'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+F", "Search|Search")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+F", "Search|Search")), 0, self.searchActGrp, 'vm_search') - self.searchAct.setStatusTip(QApplication.translate('ViewManager', + self.searchAct.setStatusTip(QApplication.translate('ViewManager', 'Search for a text')) - self.searchAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search</b>""" """<p>Search for some text in the current editor. A""" """ dialog is shown to enter the searchtext and options""" @@ -1933,17 +1935,17 @@ self.searchAct.triggered[()].connect(self.__search) self.searchActions.append(self.searchAct) - self.searchNextAct = E5Action(QApplication.translate('ViewManager', + self.searchNextAct = E5Action(QApplication.translate('ViewManager', 'Search next'), UI.PixmapCache.getIcon("findNext.png"), QApplication.translate('ViewManager', 'Search &next'), - QKeySequence(QApplication.translate('ViewManager', - "F3", "Search|Search next")), + QKeySequence(QApplication.translate('ViewManager', + "F3", "Search|Search next")), 0, self.searchActGrp, 'vm_search_next') - self.searchNextAct.setStatusTip(QApplication.translate('ViewManager', + self.searchNextAct.setStatusTip(QApplication.translate('ViewManager', 'Search next occurrence of text')) - self.searchNextAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchNextAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search next</b>""" """<p>Search the next occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" @@ -1951,17 +1953,17 @@ self.searchNextAct.triggered[()].connect(self.searchDlg.findNext) self.searchActions.append(self.searchNextAct) - self.searchPrevAct = E5Action(QApplication.translate('ViewManager', + self.searchPrevAct = E5Action(QApplication.translate('ViewManager', 'Search previous'), UI.PixmapCache.getIcon("findPrev.png"), QApplication.translate('ViewManager', 'Search &previous'), - QKeySequence(QApplication.translate('ViewManager', - "Shift+F3", "Search|Search previous")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+F3", "Search|Search previous")), 0, self.searchActGrp, 'vm_search_previous') - self.searchPrevAct.setStatusTip(QApplication.translate('ViewManager', + self.searchPrevAct.setStatusTip(QApplication.translate('ViewManager', 'Search previous occurrence of text')) - self.searchPrevAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchPrevAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search previous</b>""" """<p>Search the previous occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" @@ -1969,17 +1971,17 @@ self.searchPrevAct.triggered[()].connect(self.searchDlg.findPrev) self.searchActions.append(self.searchPrevAct) - self.searchClearMarkersAct = E5Action(QApplication.translate('ViewManager', + self.searchClearMarkersAct = E5Action(QApplication.translate('ViewManager', 'Clear search markers'), UI.PixmapCache.getIcon("findClear.png"), QApplication.translate('ViewManager', 'Clear search markers'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+3", "Search|Clear search markers")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+3", "Search|Clear search markers")), 0, self.searchActGrp, 'vm_clear_search_markers') - self.searchClearMarkersAct.setStatusTip(QApplication.translate('ViewManager', + self.searchClearMarkersAct.setStatusTip(QApplication.translate('ViewManager', 'Clear all displayed search markers')) - self.searchClearMarkersAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchClearMarkersAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Clear search markers</b>""" """<p>Clear all displayed search markers.</p>""" )) @@ -1988,13 +1990,13 @@ self.replaceAct = E5Action(QApplication.translate('ViewManager', 'Replace'), QApplication.translate('ViewManager', '&Replace...'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+R", "Search|Replace")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+R", "Search|Replace")), 0, self.searchActGrp, 'vm_search_replace') - self.replaceAct.setStatusTip(QApplication.translate('ViewManager', + self.replaceAct.setStatusTip(QApplication.translate('ViewManager', 'Replace some text')) - self.replaceAct.setWhatsThis(QApplication.translate('ViewManager', + self.replaceAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Replace</b>""" """<p>Search for some text in the current editor and replace it. A""" """ dialog is shown to enter the searchtext, the replacement text""" @@ -2003,17 +2005,17 @@ self.replaceAct.triggered[()].connect(self.__replace) self.searchActions.append(self.replaceAct) - self.quickSearchAct = E5Action(QApplication.translate('ViewManager', + self.quickSearchAct = E5Action(QApplication.translate('ViewManager', 'Quicksearch'), UI.PixmapCache.getIcon("quickFindNext.png"), QApplication.translate('ViewManager', '&Quicksearch'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Shift+K", "Search|Quicksearch")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Shift+K", "Search|Quicksearch")), 0, self.searchActGrp, 'vm_quicksearch') - self.quickSearchAct.setStatusTip(QApplication.translate('ViewManager', + self.quickSearchAct.setStatusTip(QApplication.translate('ViewManager', 'Perform a quicksearch')) - self.quickSearchAct.setWhatsThis(QApplication.translate('ViewManager', + self.quickSearchAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Quicksearch</b>""" """<p>This activates the quicksearch function of the IDE by""" """ giving focus to the quicksearch entry field. If this field""" @@ -2023,33 +2025,33 @@ self.quickSearchAct.triggered[()].connect(self.__quickSearch) self.searchActions.append(self.quickSearchAct) - self.quickSearchBackAct = E5Action(QApplication.translate('ViewManager', + self.quickSearchBackAct = E5Action(QApplication.translate('ViewManager', 'Quicksearch backwards'), UI.PixmapCache.getIcon("quickFindPrev.png"), QApplication.translate('ViewManager', 'Quicksearch &backwards'), - QKeySequence(QApplication.translate('ViewManager', + QKeySequence(QApplication.translate('ViewManager', "Ctrl+Shift+J", "Search|Quicksearch backwards")), 0, self.searchActGrp, 'vm_quicksearch_backwards') - self.quickSearchBackAct.setStatusTip(QApplication.translate('ViewManager', + self.quickSearchBackAct.setStatusTip(QApplication.translate('ViewManager', 'Perform a quicksearch backwards')) - self.quickSearchBackAct.setWhatsThis(QApplication.translate('ViewManager', + self.quickSearchBackAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Quicksearch backwards</b>""" """<p>This searches the previous occurrence of the quicksearch text.</p>""" )) self.quickSearchBackAct.triggered[()].connect(self.__quickSearchPrev) self.searchActions.append(self.quickSearchBackAct) - self.quickSearchExtendAct = E5Action(QApplication.translate('ViewManager', + self.quickSearchExtendAct = E5Action(QApplication.translate('ViewManager', 'Quicksearch extend'), UI.PixmapCache.getIcon("quickFindExtend.png"), QApplication.translate('ViewManager', 'Quicksearch e&xtend'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Shift+H", "Search|Quicksearch extend")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Shift+H", "Search|Quicksearch extend")), 0, self.searchActGrp, 'vm_quicksearch_extend') self.quickSearchExtendAct.setStatusTip(QApplication.translate('ViewManager', \ 'Extend the quicksearch to the end of the current word')) - self.quickSearchExtendAct.setWhatsThis(QApplication.translate('ViewManager', + self.quickSearchExtendAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Quicksearch extend</b>""" """<p>This extends the quicksearch text to the end of the word""" """ currently found.</p>""" @@ -2060,12 +2062,12 @@ self.gotoAct = E5Action(QApplication.translate('ViewManager', 'Goto Line'), UI.PixmapCache.getIcon("goto.png"), QApplication.translate('ViewManager', '&Goto Line...'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+G", "Search|Goto Line")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+G", "Search|Goto Line")), 0, self.searchActGrp, 'vm_search_goto_line') self.gotoAct.setStatusTip(QApplication.translate('ViewManager', 'Goto Line')) - self.gotoAct.setWhatsThis(QApplication.translate('ViewManager', + self.gotoAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Goto Line</b>""" """<p>Go to a specific line of text in the current editor.""" """ A dialog is shown to enter the linenumber.</p>""" @@ -2076,13 +2078,13 @@ self.gotoBraceAct = E5Action(QApplication.translate('ViewManager', 'Goto Brace'), UI.PixmapCache.getIcon("gotoBrace.png"), QApplication.translate('ViewManager', 'Goto &Brace'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+L", "Search|Goto Brace")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+L", "Search|Goto Brace")), 0, self.searchActGrp, 'vm_search_goto_brace') - self.gotoBraceAct.setStatusTip(QApplication.translate('ViewManager', + self.gotoBraceAct.setStatusTip(QApplication.translate('ViewManager', 'Goto Brace')) - self.gotoBraceAct.setWhatsThis(QApplication.translate('ViewManager', + self.gotoBraceAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Goto Brace</b>""" """<p>Go to the matching brace in the current editor.</p>""" )) @@ -2091,17 +2093,17 @@ self.searchActGrp.setEnabled(False) - self.searchFilesAct = E5Action(QApplication.translate('ViewManager', + self.searchFilesAct = E5Action(QApplication.translate('ViewManager', 'Search in Files'), UI.PixmapCache.getIcon("projectFind.png"), QApplication.translate('ViewManager', 'Search in &Files...'), - QKeySequence(QApplication.translate('ViewManager', - "Shift+Ctrl+F", "Search|Search Files")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+Ctrl+F", "Search|Search Files")), 0, self, 'vm_search_in_files') - self.searchFilesAct.setStatusTip(QApplication.translate('ViewManager', + self.searchFilesAct.setStatusTip(QApplication.translate('ViewManager', 'Search for a text in files')) - self.searchFilesAct.setWhatsThis(QApplication.translate('ViewManager', + self.searchFilesAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Search in Files</b>""" """<p>Search for some text in the files of a directory tree""" """ or the project. A dialog is shown to enter the searchtext""" @@ -2110,16 +2112,16 @@ self.searchFilesAct.triggered[()].connect(self.__searchFiles) self.searchActions.append(self.searchFilesAct) - self.replaceFilesAct = E5Action(QApplication.translate('ViewManager', + self.replaceFilesAct = E5Action(QApplication.translate('ViewManager', 'Replace in Files'), QApplication.translate('ViewManager', 'Replace in F&iles...'), - QKeySequence(QApplication.translate('ViewManager', - "Shift+Ctrl+R", "Search|Replace in Files")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+Ctrl+R", "Search|Replace in Files")), 0, self, 'vm_replace_in_files') - self.replaceFilesAct.setStatusTip(QApplication.translate('ViewManager', + self.replaceFilesAct.setStatusTip(QApplication.translate('ViewManager', 'Search for a text in files and replace it')) - self.replaceFilesAct.setWhatsThis(QApplication.translate('ViewManager', + self.replaceFilesAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Replace in Files</b>""" """<p>Search for some text in the files of a directory tree""" """ or the project and replace it. A dialog is shown to enter""" @@ -2162,7 +2164,7 @@ self.quickFindtextCombo.setSizeAdjustPolicy( QComboBox.AdjustToMinimumContentsLengthWithIcon) self.quickFindtextCombo.addItem("") - self.quickFindtextCombo.setWhatsThis(QApplication.translate('ViewManager', + self.quickFindtextCombo.setWhatsThis(QApplication.translate('ViewManager', """<p>Enter the searchtext directly into this field.""" """ The search will be performed case insensitive.""" """ The quicksearch function is activated upon activation""" @@ -2227,13 +2229,13 @@ self.zoomInAct = E5Action(QApplication.translate('ViewManager', 'Zoom in'), UI.PixmapCache.getIcon("zoomIn.png"), QApplication.translate('ViewManager', 'Zoom &in'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl++", "View|Zoom in")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl++", "View|Zoom in")), 0, self.viewActGrp, 'vm_view_zoom_in') - self.zoomInAct.setStatusTip(QApplication.translate('ViewManager', + self.zoomInAct.setStatusTip(QApplication.translate('ViewManager', 'Zoom in on the text')) - self.zoomInAct.setWhatsThis(QApplication.translate('ViewManager', + self.zoomInAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Zoom in</b>""" """<p>Zoom in on the text. This makes the text bigger.</p>""" )) @@ -2243,13 +2245,13 @@ self.zoomOutAct = E5Action(QApplication.translate('ViewManager', 'Zoom out'), UI.PixmapCache.getIcon("zoomOut.png"), QApplication.translate('ViewManager', 'Zoom &out'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+-", "View|Zoom out")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+-", "View|Zoom out")), 0, self.viewActGrp, 'vm_view_zoom_out') - self.zoomOutAct.setStatusTip(QApplication.translate('ViewManager', + self.zoomOutAct.setStatusTip(QApplication.translate('ViewManager', 'Zoom out on the text')) - self.zoomOutAct.setWhatsThis(QApplication.translate('ViewManager', + self.zoomOutAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Zoom out</b>""" """<p>Zoom out on the text. This makes the text smaller.</p>""" )) @@ -2259,13 +2261,13 @@ self.zoomToAct = E5Action(QApplication.translate('ViewManager', 'Zoom'), UI.PixmapCache.getIcon("zoomTo.png"), QApplication.translate('ViewManager', '&Zoom'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+#", "View|Zoom")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+#", "View|Zoom")), 0, self.viewActGrp, 'vm_view_zoom') - self.zoomToAct.setStatusTip(QApplication.translate('ViewManager', + self.zoomToAct.setStatusTip(QApplication.translate('ViewManager', 'Zoom the text')) - self.zoomToAct.setWhatsThis(QApplication.translate('ViewManager', + self.zoomToAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Zoom</b>""" """<p>Zoom the text. This opens a dialog where the""" """ desired size can be entered.</p>""" @@ -2273,13 +2275,13 @@ self.zoomToAct.triggered[()].connect(self.__zoom) self.viewActions.append(self.zoomToAct) - self.toggleAllAct = E5Action(QApplication.translate('ViewManager', + self.toggleAllAct = E5Action(QApplication.translate('ViewManager', 'Toggle all folds'), QApplication.translate('ViewManager', 'Toggle &all folds'), 0, 0, self.viewFoldActGrp, 'vm_view_toggle_all_folds') - self.toggleAllAct.setStatusTip(QApplication.translate('ViewManager', + self.toggleAllAct.setStatusTip(QApplication.translate('ViewManager', 'Toggle all folds')) - self.toggleAllAct.setWhatsThis(QApplication.translate('ViewManager', + self.toggleAllAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Toggle all folds</b>""" """<p>Toggle all folds of the current editor.</p>""" )) @@ -2287,14 +2289,14 @@ self.viewActions.append(self.toggleAllAct) self.toggleAllChildrenAct = \ - E5Action(QApplication.translate('ViewManager', + E5Action(QApplication.translate('ViewManager', 'Toggle all folds (including children)'), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Toggle all &folds (including children)'), 0, 0, self.viewFoldActGrp, 'vm_view_toggle_all_folds_children') - self.toggleAllChildrenAct.setStatusTip(QApplication.translate('ViewManager', + self.toggleAllChildrenAct.setStatusTip(QApplication.translate('ViewManager', 'Toggle all folds (including children)')) - self.toggleAllChildrenAct.setWhatsThis(QApplication.translate('ViewManager', + self.toggleAllChildrenAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Toggle all folds (including children)</b>""" """<p>Toggle all folds of the current editor including""" """ all children.</p>""" @@ -2302,28 +2304,28 @@ self.toggleAllChildrenAct.triggered[()].connect(self.__toggleAllChildren) self.viewActions.append(self.toggleAllChildrenAct) - self.toggleCurrentAct = E5Action(QApplication.translate('ViewManager', + self.toggleCurrentAct = E5Action(QApplication.translate('ViewManager', 'Toggle current fold'), QApplication.translate('ViewManager', 'Toggle ¤t fold'), 0, 0, self.viewFoldActGrp, 'vm_view_toggle_current_fold') - self.toggleCurrentAct.setStatusTip(QApplication.translate('ViewManager', + self.toggleCurrentAct.setStatusTip(QApplication.translate('ViewManager', 'Toggle current fold')) - self.toggleCurrentAct.setWhatsThis(QApplication.translate('ViewManager', + self.toggleCurrentAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Toggle current fold</b>""" """<p>Toggle the folds of the current line of the current editor.</p>""" )) self.toggleCurrentAct.triggered[()].connect(self.__toggleCurrent) self.viewActions.append(self.toggleCurrentAct) - self.unhighlightAct = E5Action(QApplication.translate('ViewManager', + self.unhighlightAct = E5Action(QApplication.translate('ViewManager', 'Remove all highlights'), UI.PixmapCache.getIcon("unhighlight.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Remove all highlights'), 0, 0, self, 'vm_view_unhighlight') - self.unhighlightAct.setStatusTip(QApplication.translate('ViewManager', + self.unhighlightAct.setStatusTip(QApplication.translate('ViewManager', 'Remove all highlights')) - self.unhighlightAct.setWhatsThis(QApplication.translate('ViewManager', + self.unhighlightAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Remove all highlights</b>""" """<p>Remove the highlights of all editors.</p>""" )) @@ -2334,23 +2336,23 @@ UI.PixmapCache.getIcon("splitVertical.png"), QApplication.translate('ViewManager', '&Split view'), 0, 0, self, 'vm_view_split_view') - self.splitViewAct.setStatusTip(QApplication.translate('ViewManager', + self.splitViewAct.setStatusTip(QApplication.translate('ViewManager', 'Add a split to the view')) - self.splitViewAct.setWhatsThis(QApplication.translate('ViewManager', + self.splitViewAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Split view</b>""" """<p>Add a split to the view.</p>""" )) self.splitViewAct.triggered[()].connect(self.__splitView) self.viewActions.append(self.splitViewAct) - self.splitOrientationAct = E5Action(QApplication.translate('ViewManager', + self.splitOrientationAct = E5Action(QApplication.translate('ViewManager', 'Arrange horizontally'), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Arrange &horizontally'), 0, 0, self, 'vm_view_arrange_horizontally', True) - self.splitOrientationAct.setStatusTip(QApplication.translate('ViewManager', + self.splitOrientationAct.setStatusTip(QApplication.translate('ViewManager', 'Arrange the splitted views horizontally')) - self.splitOrientationAct.setWhatsThis(QApplication.translate('ViewManager', + self.splitOrientationAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Arrange horizontally</b>""" """<p>Arrange the splitted views horizontally.</p>""" )) @@ -2358,14 +2360,14 @@ self.splitOrientationAct.toggled[bool].connect(self.__splitOrientation) self.viewActions.append(self.splitOrientationAct) - self.splitRemoveAct = E5Action(QApplication.translate('ViewManager', + self.splitRemoveAct = E5Action(QApplication.translate('ViewManager', 'Remove split'), UI.PixmapCache.getIcon("remsplitVertical.png"), QApplication.translate('ViewManager', '&Remove split'), 0, 0, self, 'vm_view_remove_split') - self.splitRemoveAct.setStatusTip(QApplication.translate('ViewManager', + self.splitRemoveAct.setStatusTip(QApplication.translate('ViewManager', 'Remove the current split')) - self.splitRemoveAct.setWhatsThis(QApplication.translate('ViewManager', + self.splitRemoveAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Remove split</b>""" """<p>Remove the current split.</p>""" )) @@ -2374,28 +2376,28 @@ self.nextSplitAct = E5Action(QApplication.translate('ViewManager', 'Next split'), QApplication.translate('ViewManager', '&Next split'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Alt+N", "View|Next split")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Alt+N", "View|Next split")), 0, self, 'vm_next_split') - self.nextSplitAct.setStatusTip(QApplication.translate('ViewManager', + self.nextSplitAct.setStatusTip(QApplication.translate('ViewManager', 'Move to the next split')) - self.nextSplitAct.setWhatsThis(QApplication.translate('ViewManager', + self.nextSplitAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Next split</b>""" """<p>Move to the next split.</p>""" )) self.nextSplitAct.triggered[()].connect(self.nextSplit) self.viewActions.append(self.nextSplitAct) - self.prevSplitAct = E5Action(QApplication.translate('ViewManager', + self.prevSplitAct = E5Action(QApplication.translate('ViewManager', 'Previous split'), QApplication.translate('ViewManager', '&Previous split'), - QKeySequence(QApplication.translate('ViewManager', - "Ctrl+Alt+P", "View|Previous split")), + QKeySequence(QApplication.translate('ViewManager', + "Ctrl+Alt+P", "View|Previous split")), 0, self, 'vm_previous_split') - self.prevSplitAct.setStatusTip(QApplication.translate('ViewManager', + self.prevSplitAct.setStatusTip(QApplication.translate('ViewManager', 'Move to the previous split')) - self.prevSplitAct.setWhatsThis(QApplication.translate('ViewManager', + self.prevSplitAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Previous split</b>""" """<p>Move to the previous split.</p>""" )) @@ -2428,7 +2430,7 @@ menu.addSeparator() menu.addAction(self.splitViewAct) menu.addAction(self.splitOrientationAct) - menu.addAction(self.splitRemoveAct) + menu.addAction(self.splitRemoveAct) menu.addAction(self.nextSplitAct) menu.addAction(self.prevSplitAct) @@ -2465,28 +2467,28 @@ """ self.macroActGrp = createActionGroup(self) - self.macroStartRecAct = E5Action(QApplication.translate('ViewManager', + self.macroStartRecAct = E5Action(QApplication.translate('ViewManager', 'Start Macro Recording'), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'S&tart Macro Recording'), 0, 0, self.macroActGrp, 'vm_macro_start_recording') - self.macroStartRecAct.setStatusTip(QApplication.translate('ViewManager', + self.macroStartRecAct.setStatusTip(QApplication.translate('ViewManager', 'Start Macro Recording')) - self.macroStartRecAct.setWhatsThis(QApplication.translate('ViewManager', + self.macroStartRecAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Start Macro Recording</b>""" """<p>Start recording editor commands into a new macro.</p>""" )) self.macroStartRecAct.triggered[()].connect(self.__macroStartRecording) self.macroActions.append(self.macroStartRecAct) - self.macroStopRecAct = E5Action(QApplication.translate('ViewManager', + self.macroStopRecAct = E5Action(QApplication.translate('ViewManager', 'Stop Macro Recording'), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Sto&p Macro Recording'), 0, 0, self.macroActGrp, 'vm_macro_stop_recording') - self.macroStopRecAct.setStatusTip(QApplication.translate('ViewManager', + self.macroStopRecAct.setStatusTip(QApplication.translate('ViewManager', 'Stop Macro Recording')) - self.macroStopRecAct.setWhatsThis(QApplication.translate('ViewManager', + self.macroStopRecAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Stop Macro Recording</b>""" """<p>Stop recording editor commands into a new macro.</p>""" )) @@ -2497,20 +2499,20 @@ QApplication.translate('ViewManager', '&Run Macro'), 0, 0, self.macroActGrp, 'vm_macro_run') self.macroRunAct.setStatusTip(QApplication.translate('ViewManager', 'Run Macro')) - self.macroRunAct.setWhatsThis(QApplication.translate('ViewManager', + self.macroRunAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Run Macro</b>""" """<p>Run a previously recorded editor macro.</p>""" )) self.macroRunAct.triggered[()].connect(self.__macroRun) self.macroActions.append(self.macroRunAct) - self.macroDeleteAct = E5Action(QApplication.translate('ViewManager', + self.macroDeleteAct = E5Action(QApplication.translate('ViewManager', 'Delete Macro'), QApplication.translate('ViewManager', '&Delete Macro'), 0, 0, self.macroActGrp, 'vm_macro_delete') - self.macroDeleteAct.setStatusTip(QApplication.translate('ViewManager', + self.macroDeleteAct.setStatusTip(QApplication.translate('ViewManager', 'Delete Macro')) - self.macroDeleteAct.setWhatsThis(QApplication.translate('ViewManager', + self.macroDeleteAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Delete Macro</b>""" """<p>Delete a previously recorded editor macro.</p>""" )) @@ -2520,9 +2522,9 @@ self.macroLoadAct = E5Action(QApplication.translate('ViewManager', 'Load Macro'), QApplication.translate('ViewManager', '&Load Macro'), 0, 0, self.macroActGrp, 'vm_macro_load') - self.macroLoadAct.setStatusTip(QApplication.translate('ViewManager', + self.macroLoadAct.setStatusTip(QApplication.translate('ViewManager', 'Load Macro')) - self.macroLoadAct.setWhatsThis(QApplication.translate('ViewManager', + self.macroLoadAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Load Macro</b>""" """<p>Load an editor macro from a file.</p>""" )) @@ -2532,9 +2534,9 @@ self.macroSaveAct = E5Action(QApplication.translate('ViewManager', 'Save Macro'), QApplication.translate('ViewManager', '&Save Macro'), 0, 0, self.macroActGrp, 'vm_macro_save') - self.macroSaveAct.setStatusTip(QApplication.translate('ViewManager', + self.macroSaveAct.setStatusTip(QApplication.translate('ViewManager', 'Save Macro')) - self.macroSaveAct.setWhatsThis(QApplication.translate('ViewManager', + self.macroSaveAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Save Macro</b>""" """<p>Save a previously recorded editor macro to a file.</p>""" )) @@ -2565,109 +2567,109 @@ """ self.bookmarkActGrp = createActionGroup(self) - self.bookmarkToggleAct = E5Action(QApplication.translate('ViewManager', + self.bookmarkToggleAct = E5Action(QApplication.translate('ViewManager', 'Toggle Bookmark'), UI.PixmapCache.getIcon("bookmarkToggle.png"), QApplication.translate('ViewManager', '&Toggle Bookmark'), - QKeySequence(QApplication.translate('ViewManager', + QKeySequence(QApplication.translate('ViewManager', "Alt+Ctrl+T", "Bookmark|Toggle")), 0, self.bookmarkActGrp, 'vm_bookmark_toggle') - self.bookmarkToggleAct.setStatusTip(QApplication.translate('ViewManager', + self.bookmarkToggleAct.setStatusTip(QApplication.translate('ViewManager', 'Toggle Bookmark')) - self.bookmarkToggleAct.setWhatsThis(QApplication.translate('ViewManager', + self.bookmarkToggleAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Toggle Bookmark</b>""" """<p>Toggle a bookmark at the current line of the current editor.</p>""" )) self.bookmarkToggleAct.triggered[()].connect(self.__toggleBookmark) self.bookmarkActions.append(self.bookmarkToggleAct) - self.bookmarkNextAct = E5Action(QApplication.translate('ViewManager', + self.bookmarkNextAct = E5Action(QApplication.translate('ViewManager', 'Next Bookmark'), UI.PixmapCache.getIcon("bookmarkNext.png"), QApplication.translate('ViewManager', '&Next Bookmark'), - QKeySequence(QApplication.translate('ViewManager', + QKeySequence(QApplication.translate('ViewManager', "Ctrl+PgDown", "Bookmark|Next")), 0, self.bookmarkActGrp, 'vm_bookmark_next') - self.bookmarkNextAct.setStatusTip(QApplication.translate('ViewManager', + self.bookmarkNextAct.setStatusTip(QApplication.translate('ViewManager', 'Next Bookmark')) - self.bookmarkNextAct.setWhatsThis(QApplication.translate('ViewManager', + self.bookmarkNextAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Next Bookmark</b>""" """<p>Go to next bookmark of the current editor.</p>""" )) self.bookmarkNextAct.triggered[()].connect(self.__nextBookmark) self.bookmarkActions.append(self.bookmarkNextAct) - self.bookmarkPreviousAct = E5Action(QApplication.translate('ViewManager', + self.bookmarkPreviousAct = E5Action(QApplication.translate('ViewManager', 'Previous Bookmark'), UI.PixmapCache.getIcon("bookmarkPrevious.png"), QApplication.translate('ViewManager', '&Previous Bookmark'), - QKeySequence(QApplication.translate('ViewManager', + QKeySequence(QApplication.translate('ViewManager', "Ctrl+PgUp", "Bookmark|Previous")), 0, self.bookmarkActGrp, 'vm_bookmark_previous') - self.bookmarkPreviousAct.setStatusTip(QApplication.translate('ViewManager', + self.bookmarkPreviousAct.setStatusTip(QApplication.translate('ViewManager', 'Previous Bookmark')) - self.bookmarkPreviousAct.setWhatsThis(QApplication.translate('ViewManager', + self.bookmarkPreviousAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Previous Bookmark</b>""" """<p>Go to previous bookmark of the current editor.</p>""" )) self.bookmarkPreviousAct.triggered[()].connect(self.__previousBookmark) self.bookmarkActions.append(self.bookmarkPreviousAct) - self.bookmarkClearAct = E5Action(QApplication.translate('ViewManager', + self.bookmarkClearAct = E5Action(QApplication.translate('ViewManager', 'Clear Bookmarks'), QApplication.translate('ViewManager', '&Clear Bookmarks'), - QKeySequence(QApplication.translate('ViewManager', - "Alt+Ctrl+C", "Bookmark|Clear")), + QKeySequence(QApplication.translate('ViewManager', + "Alt+Ctrl+C", "Bookmark|Clear")), 0, self.bookmarkActGrp, 'vm_bookmark_clear') - self.bookmarkClearAct.setStatusTip(QApplication.translate('ViewManager', + self.bookmarkClearAct.setStatusTip(QApplication.translate('ViewManager', 'Clear Bookmarks')) - self.bookmarkClearAct.setWhatsThis(QApplication.translate('ViewManager', + self.bookmarkClearAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Clear Bookmarks</b>""" """<p>Clear bookmarks of all editors.</p>""" )) self.bookmarkClearAct.triggered[()].connect(self.__clearAllBookmarks) self.bookmarkActions.append(self.bookmarkClearAct) - self.syntaxErrorGotoAct = E5Action(QApplication.translate('ViewManager', + self.syntaxErrorGotoAct = E5Action(QApplication.translate('ViewManager', 'Goto Syntax Error'), UI.PixmapCache.getIcon("syntaxErrorGoto.png"), QApplication.translate('ViewManager', '&Goto Syntax Error'), 0, 0, self.bookmarkActGrp, 'vm_syntaxerror_goto') - self.syntaxErrorGotoAct.setStatusTip(QApplication.translate('ViewManager', + self.syntaxErrorGotoAct.setStatusTip(QApplication.translate('ViewManager', 'Goto Syntax Error')) - self.syntaxErrorGotoAct.setWhatsThis(QApplication.translate('ViewManager', + self.syntaxErrorGotoAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Goto Syntax Error</b>""" """<p>Go to next syntax error of the current editor.</p>""" )) self.syntaxErrorGotoAct.triggered[()].connect(self.__gotoSyntaxError) self.bookmarkActions.append(self.syntaxErrorGotoAct) - self.syntaxErrorClearAct = E5Action(QApplication.translate('ViewManager', + self.syntaxErrorClearAct = E5Action(QApplication.translate('ViewManager', 'Clear Syntax Errors'), QApplication.translate('ViewManager', 'Clear &Syntax Errors'), 0, 0, self.bookmarkActGrp, 'vm_syntaxerror_clear') - self.syntaxErrorClearAct.setStatusTip(QApplication.translate('ViewManager', + self.syntaxErrorClearAct.setStatusTip(QApplication.translate('ViewManager', 'Clear Syntax Errors')) - self.syntaxErrorClearAct.setWhatsThis(QApplication.translate('ViewManager', + self.syntaxErrorClearAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Clear Syntax Errors</b>""" """<p>Clear syntax errors of all editors.</p>""" )) self.syntaxErrorClearAct.triggered[()].connect(self.__clearAllSyntaxErrors) self.bookmarkActions.append(self.syntaxErrorClearAct) - self.warningsNextAct = E5Action(QApplication.translate('ViewManager', + self.warningsNextAct = E5Action(QApplication.translate('ViewManager', 'Next warning message'), UI.PixmapCache.getIcon("warningNext.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', '&Next warning message'), 0, 0, self.bookmarkActGrp, 'vm_warning_next') - self.warningsNextAct.setStatusTip(QApplication.translate('ViewManager', + self.warningsNextAct.setStatusTip(QApplication.translate('ViewManager', 'Next warning message')) - self.warningsNextAct.setWhatsThis(QApplication.translate('ViewManager', + self.warningsNextAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Next warning message</b>""" """<p>Go to next line of the current editor""" """ having a py3flakes warning.</p>""" @@ -2675,16 +2677,16 @@ self.warningsNextAct.triggered[()].connect(self.__nextWarning) self.bookmarkActions.append(self.warningsNextAct) - self.warningsPreviousAct = E5Action(QApplication.translate('ViewManager', + self.warningsPreviousAct = E5Action(QApplication.translate('ViewManager', 'Previous warning message'), UI.PixmapCache.getIcon("warningPrev.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', '&Previous warning message'), 0, 0, self.bookmarkActGrp, 'vm_warning_previous') - self.warningsPreviousAct.setStatusTip(QApplication.translate('ViewManager', + self.warningsPreviousAct.setStatusTip(QApplication.translate('ViewManager', 'Previous warning message')) - self.warningsPreviousAct.setWhatsThis(QApplication.translate('ViewManager', + self.warningsPreviousAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Previous warning message</b>""" """<p>Go to previous line of the current editor""" """ having a py3flakes warning.</p>""" @@ -2692,46 +2694,46 @@ self.warningsPreviousAct.triggered[()].connect(self.__previousWarning) self.bookmarkActions.append(self.warningsPreviousAct) - self.warningsClearAct = E5Action(QApplication.translate('ViewManager', + self.warningsClearAct = E5Action(QApplication.translate('ViewManager', 'Clear Warning Messages'), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', 'Clear &Warning Messages'), 0, 0, self.bookmarkActGrp, 'vm_warnings_clear') - self.warningsClearAct.setStatusTip(QApplication.translate('ViewManager', + self.warningsClearAct.setStatusTip(QApplication.translate('ViewManager', 'Clear Warning Messages')) - self.warningsClearAct.setWhatsThis(QApplication.translate('ViewManager', + self.warningsClearAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Clear Warning Messages</b>""" """<p>Clear py3flakes warning messages of all editors.</p>""" )) self.warningsClearAct.triggered[()].connect(self.__clearAllWarnings) self.bookmarkActions.append(self.warningsClearAct) - self.notcoveredNextAct = E5Action(QApplication.translate('ViewManager', + self.notcoveredNextAct = E5Action(QApplication.translate('ViewManager', 'Next uncovered line'), UI.PixmapCache.getIcon("notcoveredNext.png"), QApplication.translate('ViewManager', '&Next uncovered line'), 0, 0, self.bookmarkActGrp, 'vm_uncovered_next') - self.notcoveredNextAct.setStatusTip(QApplication.translate('ViewManager', + self.notcoveredNextAct.setStatusTip(QApplication.translate('ViewManager', 'Next uncovered line')) - self.notcoveredNextAct.setWhatsThis(QApplication.translate('ViewManager', + self.notcoveredNextAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Next uncovered line</b>""" """<p>Go to next line of the current editor marked as not covered.</p>""" )) self.notcoveredNextAct.triggered[()].connect(self.__nextUncovered) self.bookmarkActions.append(self.notcoveredNextAct) - self.notcoveredPreviousAct = E5Action(QApplication.translate('ViewManager', + self.notcoveredPreviousAct = E5Action(QApplication.translate('ViewManager', 'Previous uncovered line'), UI.PixmapCache.getIcon("notcoveredPrev.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', '&Previous uncovered line'), 0, 0, self.bookmarkActGrp, 'vm_uncovered_previous') - self.notcoveredPreviousAct.setStatusTip(QApplication.translate('ViewManager', + self.notcoveredPreviousAct.setStatusTip(QApplication.translate('ViewManager', 'Previous uncovered line')) - self.notcoveredPreviousAct.setWhatsThis(QApplication.translate('ViewManager', + self.notcoveredPreviousAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Previous uncovered line</b>""" """<p>Go to previous line of the current editor marked""" """ as not covered.</p>""" @@ -2739,31 +2741,31 @@ self.notcoveredPreviousAct.triggered[()].connect(self.__previousUncovered) self.bookmarkActions.append(self.notcoveredPreviousAct) - self.taskNextAct = E5Action(QApplication.translate('ViewManager', + self.taskNextAct = E5Action(QApplication.translate('ViewManager', 'Next Task'), UI.PixmapCache.getIcon("taskNext.png"), QApplication.translate('ViewManager', '&Next Task'), 0, 0, self.bookmarkActGrp, 'vm_task_next') - self.taskNextAct.setStatusTip(QApplication.translate('ViewManager', + self.taskNextAct.setStatusTip(QApplication.translate('ViewManager', 'Next Task')) - self.taskNextAct.setWhatsThis(QApplication.translate('ViewManager', + self.taskNextAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Next Task</b>""" """<p>Go to next line of the current editor having a task.</p>""" )) self.taskNextAct.triggered[()].connect(self.__nextTask) self.bookmarkActions.append(self.taskNextAct) - self.taskPreviousAct = E5Action(QApplication.translate('ViewManager', + self.taskPreviousAct = E5Action(QApplication.translate('ViewManager', 'Previous Task'), UI.PixmapCache.getIcon("taskPrev.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', '&Previous Task'), 0, 0, self.bookmarkActGrp, 'vm_task_previous') - self.taskPreviousAct.setStatusTip(QApplication.translate('ViewManager', + self.taskPreviousAct.setStatusTip(QApplication.translate('ViewManager', 'Previous Task')) - self.taskPreviousAct.setWhatsThis(QApplication.translate('ViewManager', + self.taskPreviousAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Previous Task</b>""" """<p>Go to previous line of the current editor having a task.</p>""" )) @@ -2779,7 +2781,7 @@ @return the generated menu """ menu = QMenu(QApplication.translate('ViewManager', '&Bookmarks'), self.ui) - self.bookmarksMenu = QMenu(QApplication.translate('ViewManager', '&Bookmarks'), + self.bookmarksMenu = QMenu(QApplication.translate('ViewManager', '&Bookmarks'), menu) menu.setTearOffEnabled(True) @@ -2849,34 +2851,34 @@ """ self.spellingActGrp = createActionGroup(self) - self.spellCheckAct = E5Action(QApplication.translate('ViewManager', + self.spellCheckAct = E5Action(QApplication.translate('ViewManager', 'Spell check'), UI.PixmapCache.getIcon("spellchecking.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', '&Spell Check...'), - QKeySequence(QApplication.translate('ViewManager', - "Shift+F7", "Spelling|Spell Check")), + QKeySequence(QApplication.translate('ViewManager', + "Shift+F7", "Spelling|Spell Check")), 0, self.spellingActGrp, 'vm_spelling_spellcheck') - self.spellCheckAct.setStatusTip(QApplication.translate('ViewManager', + self.spellCheckAct.setStatusTip(QApplication.translate('ViewManager', 'Perform spell check of current editor')) - self.spellCheckAct.setWhatsThis(QApplication.translate('ViewManager', + self.spellCheckAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Spell check</b>""" """<p>Perform a spell check of the current editor.</p>""" )) self.spellCheckAct.triggered[()].connect(self.__spellCheck) self.spellingActions.append(self.spellCheckAct) - self.autoSpellCheckAct = E5Action(QApplication.translate('ViewManager', + self.autoSpellCheckAct = E5Action(QApplication.translate('ViewManager', 'Automatic spell checking'), UI.PixmapCache.getIcon("autospellchecking.png"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', '&Automatic spell checking'), 0, 0, self.spellingActGrp, 'vm_spelling_autospellcheck') - self.autoSpellCheckAct.setStatusTip(QApplication.translate('ViewManager', + self.autoSpellCheckAct.setStatusTip(QApplication.translate('ViewManager', '(De-)Activate automatic spell checking')) - self.autoSpellCheckAct.setWhatsThis(QApplication.translate('ViewManager', + self.autoSpellCheckAct.setWhatsThis(QApplication.translate('ViewManager', """<b>Automatic spell checking</b>""" """<p>Activate or deactivate the automatic spell checking function of""" """ all editors.</p>""" @@ -2929,7 +2931,7 @@ ## Methods and slots that deal with file and window handling ################################################################## - def openFiles(self, prog = None): + def openFiles(self, prog=None): """ Public slot to open some files. @@ -2946,7 +2948,7 @@ self.ui, QApplication.translate('ViewManager', "Open files"), self._getOpenStartDir(), - QScintilla.Lexers.getOpenFileFiltersList(True, True), + QScintilla.Lexers.getOpenFileFiltersList(True, True), filter)[0] else: progs = [prog] @@ -2956,12 +2958,12 @@ # Open up the new files. self.openSourceFile(prog) - def checkDirty(self, editor, autosave = False): + def checkDirty(self, editor, autosave=False): """ Public method to check dirty status and open a message window. @param editor editor window to check - @param autosave flag indicating that the file should be saved + @param autosave flag indicating that the file should be saved automatically (boolean) @return flag indicating successful reset of the dirty flag (boolean) """ @@ -2980,7 +2982,7 @@ else: res = E5MessageBox.okToClearData(self.ui, QApplication.translate('ViewManager', "File Modified"), - QApplication.translate('ViewManager', + QApplication.translate('ViewManager', """<p>The file <b>{0}</b> has unsaved changes.</p>""") .format(fn), editor.saveFile) @@ -3098,8 +3100,8 @@ self.__setSbFile() - def openSourceFile(self, fn, lineno = None, filetype = "", - selStart = 0, selEnd = 0, pos = 0): + def openSourceFile(self, fn, lineno=None, filetype="", + selStart=0, selEnd=0, pos=0): """ Public slot to display a file in an editor. @@ -3110,7 +3112,7 @@ @param selEnd end of an area to be selected (integer) """ try: - newWin, editor = self.getEditor(fn, filetype = filetype) + newWin, editor = self.getEditor(fn, filetype=filetype) except (IOError, UnicodeDecodeError): return @@ -3152,7 +3154,7 @@ editor.selectionChanged.connect(self.searchDlg.selectionChanged) editor.selectionChanged.connect(self.replaceDlg.selectionChanged) - def newEditorView(self, fn, caller, filetype = ""): + def newEditorView(self, fn, caller, filetype=""): """ Public method to create a new editor displaying the given document. @@ -3175,8 +3177,8 @@ @param fn filename of this view @return reference to the new editor object (Editor.Editor) """ - editor = Editor(self.dbs, fn, self, filetype = filetype, editor = caller, - tv = e5App().getObject("TaskViewer")) + editor = Editor(self.dbs, fn, self, filetype=filetype, editor=caller, + tv=e5App().getObject("TaskViewer")) self.editors.append(editor) self.__connectEditor(editor) self.__editorOpened() @@ -3210,7 +3212,7 @@ self.openSourceFile(fn, line) self.setFileLine(fn, line) - def setFileLine(self, fn, line, error = False, syntaxError = False): + def setFileLine(self, fn, line, error=False, syntaxError=False): """ Public method to update the user interface when the current program or line changes. @@ -3228,7 +3230,7 @@ enc = self.currentEditor.getEncoding() lang = self.currentEditor.getLanguage() eol = self.currentEditor.getEolIndicator() - self.__setSbFile(fn, line, encoding = enc, language = lang, eol = eol) + self.__setSbFile(fn, line, encoding=enc, language=lang, eol=eol) # Change the highlighted line. self.currentEditor.highlight(line, error, syntaxError) @@ -3236,8 +3238,8 @@ self.currentEditor.highlightVisible() self._checkActions(self.currentEditor, False) - def __setSbFile(self, fn = None, line = None, pos = None, - encoding = None, language = None, eol = None): + def __setSbFile(self, fn=None, line=None, pos=None, + encoding=None, language=None, eol=None): """ Private method to set the file info in the status bar. @@ -3281,14 +3283,14 @@ eol = '' self.sbEol.setText(eol) - def unhighlight(self, current = False): + def unhighlight(self, current=False): """ Public method to switch off all highlights. @param current flag indicating only the current editor should be unhighlighted (boolean) """ - if current: + if current: if self.currentEditor is not None: self.currentEditor.highlight() else: @@ -3309,7 +3311,7 @@ return filenames - def getEditor(self, fn, filetype = ""): + def getEditor(self, fn, filetype=""): """ Public method to return the editor displaying the given file. @@ -3328,8 +3330,8 @@ if Utilities.samepath(fn, editor.getFileName()): break else: - editor = Editor(self.dbs, fn, self, filetype = filetype, - tv = e5App().getObject("TaskViewer")) + editor = Editor(self.dbs, fn, self, filetype=filetype, + tv=e5App().getObject("TaskViewer")) self.editors.append(editor) self.__connectEditor(editor) self.__editorOpened() @@ -3502,7 +3504,7 @@ """ Public slot to generate a new empty editor. """ - editor = Editor(self.dbs, None, self, tv = e5App().getObject("TaskViewer")) + editor = Editor(self.dbs, None, self, tv=e5App().getObject("TaskViewer")) self.editors.append(editor) self.__connectEditor(editor) self._addView(editor, None) @@ -3558,7 +3560,7 @@ else: formatStr = '{0:d}. {1}' act = self.recentMenu.addAction( - formatStr.format(idx, + formatStr.format(idx, Utilities.compactPath(rs, self.ui.maxMenuFilePathLen))) act.setData(rs) act.setEnabled(QFileInfo(rs).exists()) @@ -3662,7 +3664,7 @@ def editorsCheckFocusInEnabled(self): """ - Public method returning the flag indicating editors should perform + Public method returning the flag indicating editors should perform focus in checks. @return flag indicating focus in checks should be performed (boolean) @@ -3878,9 +3880,9 @@ ## Below are the action and utility methods for the search menu ################################################################## - def textForFind(self, getCurrentWord = True): - """ - Public method to determine the selection or the current word for the next + def textForFind(self, getCurrentWord=True): + """ + Public method to determine the selection or the current word for the next find operation. @param getCurrentWord flag indicating to return the current word, if no selected @@ -4010,7 +4012,7 @@ self.__quickSearchMarkOccurrences(text) lineFrom, indexFrom, lineTo, indexTo = aw.getSelection() - cline, cindex = aw.getCursorPosition () + cline, cindex = aw.getCursorPosition() if again: if back: if indexFrom != 0: @@ -4023,10 +4025,10 @@ index = aw.lineLength(line) ok = aw.findFirst(text, False, False, False, True, False, line, index) else: - ok = aw.findFirst(text, False, False, False, True, not back, + ok = aw.findFirst(text, False, False, False, True, not back, cline, cindex) else: - ok = aw.findFirst(text, False, False, False, True, not back, + ok = aw.findFirst(text, False, False, False, True, not back, lineFrom, indexFrom) if not ok: palette = self.quickFindtextCombo.lineEdit().palette() @@ -4035,9 +4037,9 @@ self.quickFindtextCombo.lineEdit().setPalette(palette) else: palette = self.quickFindtextCombo.lineEdit().palette() - palette.setColor(QPalette.Base, + palette.setColor(QPalette.Base, self.quickFindtextCombo.palette().color(QPalette.Base)) - palette.setColor(QPalette.Text, + palette.setColor(QPalette.Text, self.quickFindtextCombo.palette().color(QPalette.Text)) self.quickFindtextCombo.lineEdit().setPalette(palette) @@ -4309,7 +4311,7 @@ "{0}{1}".format( Utilities.compactPath( filename, - self.ui.maxMenuFilePathLen - len(bmSuffix)), + self.ui.maxMenuFilePathLen - len(bmSuffix)), bmSuffix)) act.setData([filename, bookmark]) @@ -4489,7 +4491,7 @@ def closeViewManager(self): """ - Public method to shutdown the viewmanager. + Public method to shutdown the viewmanager. If it cannot close all editor windows, it aborts the shutdown process. @@ -4584,7 +4586,7 @@ if self.autosaveInterval > 0: self.autosaveTimer.start(self.autosaveInterval * 60000) - def _checkActions(self, editor, setSb = True): + def _checkActions(self, editor, setSb=True): """ Protected slot to check some actions for their enable/disable status and set the statusbar info. @@ -4708,7 +4710,7 @@ def __cursorChanged(self, fn, line, pos): """ - Private slot to handle the cursorChanged signal. + Private slot to handle the cursorChanged signal. It emits the signal cursorChanged with parameter editor. @@ -4799,7 +4801,7 @@ enc = editor.getEncoding() lang = editor.getLanguage() eol = editor.getEolIndicator() - self.__setSbFile(fn, line + 1, pos, encoding = enc, language = lang, eol = eol) + self.__setSbFile(fn, line + 1, pos, encoding=enc, language=lang, eol=eol) ################################################################## ## Below are protected utility methods @@ -4807,7 +4809,7 @@ def _getOpenStartDir(self): """ - Protected method to return the starting directory for a file open dialog. + Protected method to return the starting directory for a file open dialog. The appropriate starting directory is calculated using the following search order, until a match is found:<br /> @@ -4897,8 +4899,8 @@ project = e5App().getObject("Project") if project.isProjectFile(fileName): self.__cooperationClient.sendEditorCommand( - project.getHash(), - project.getRelativeUniversalPath(fileName), + project.getHash(), + project.getRelativeUniversalPath(fileName), message )
--- a/ViewManager/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/ViewManager/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ ## viewmanager depending on the configuration settings ###################################################################### + def factory(parent, ui, dbs, pluginManager): """ Modul factory function to generate the right viewmanager type. @@ -44,4 +45,4 @@ raise RuntimeError("Could not create a viemanager object.") Preferences.setViewManager("tabview") vm.setReferences(ui, dbs) - return vm \ No newline at end of file + return vm
--- a/__init__.py Fri Mar 11 08:55:14 2011 +0100 +++ b/__init__.py Fri Mar 11 16:51:57 2011 +0100 @@ -6,6 +6,6 @@ """ Package implementing the eric5 Python IDE (version 5.2). -To get more information about eric5 please see the +To get more information about eric5 please see the <a href="http://eric-ide.python-projects.org/index.html">eric web site</a>. """
--- a/compileUiFiles.py Fri Mar 11 08:55:14 2011 +0100 +++ b/compileUiFiles.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,6 +11,7 @@ import sys import os + def compileUiFiles(): """ Compile the .ui files to Python sources. @@ -21,7 +22,7 @@ from PyQt4.uic import compileUi def compileUiDir(dir, recurse = False, map = None, # __IGNORE_WARNING__ - **compileUi_args): + ** compileUi_args): """ Creates Python modules from Qt Designer .ui files in a directory or directory tree. @@ -96,6 +97,7 @@ compileUiDir(".", True, pyName) + def main(argv): """ The main function of the script.
--- a/eric5.e4p Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5.e4p Fri Mar 11 16:51:57 2011 +0100 @@ -1538,13 +1538,13 @@ <string>ExcludeFiles</string> </key> <value> - <string>*/ThirdParty/*, */coverage/*</string> + <string>*/ThirdParty/*, */coverage/*, */Ui_*.py, */Examples/*</string> </value> <key> <string>ExcludeMessages</string> </key> <value> - <string>E24, W293</string> + <string>E24, E501, W293</string> </value> <key> <string>FixCodes</string> @@ -1568,7 +1568,7 @@ <string>RepeatMessages</string> </key> <value> - <bool>False</bool> + <bool>True</bool> </value> </dict> </value> @@ -1581,7 +1581,7 @@ <string>ExcludeFiles</string> </key> <value> - <string>*/coverage/*, */ThirdParty/*</string> + <string>*/coverage/*, */ThirdParty/*, */Examples/*</string> </value> </dict> </value> @@ -1594,7 +1594,7 @@ <string>ExcludeFiles</string> </key> <value> - <string>*/coverage/*, */ThirdParty/*</string> + <string>*/coverage/*, */ThirdParty/*, */Examples/*</string> </value> </dict> </value>
--- a/eric5.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,7 +32,7 @@ if "--debug" in sys.argv: del sys.argv[sys.argv.index("--debug")] - logging.basicConfig(level = logging.DEBUG) + logging.basicConfig(level=logging.DEBUG) for arg in sys.argv: if arg.startswith("--config="): @@ -60,6 +60,7 @@ logging.debug("Importing Preferences") import Preferences + def handleSingleApplication(ddindex): """ Global function to handle the single application mode. @@ -86,6 +87,7 @@ print("eric5: {0}".format(client.errstr())) sys.exit(res) + def excepthook(excType, excValue, tracebackobj): """ Global function to catch unhandled exceptions. @@ -119,7 +121,7 @@ sections = [separator, timeString, separator, errmsg, separator, tbinfo] msg = '\n'.join(sections) try: - f = open(logFile, "w", encoding = "utf-8") + f = open(logFile, "w", encoding="utf-8") f.write(msg) f.write(versionInfo) f.close() @@ -127,6 +129,7 @@ pass qWarning(str(notice) + str(msg) + str(versionInfo)) + def uiStartUp(): """ Global function to finalize the start up of the main UI. @@ -144,6 +147,7 @@ mainWindow.performVersionCheck(False) mainWindow.checkConfigurationStatus() + def main(): """ Main entry point into the application. @@ -153,13 +157,13 @@ sys.excepthook = excepthook options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), - ("--debug", "activate debugging output to the console"), + ("--config=configDir", + "use the given directory as the one containing the config files"), + ("--debug", "activate debugging output to the console"), ("--nosplash", "don't show the splash screen"), - ("--noopen", "don't open anything at startup except that given in command"), - ("--plugin=plugin-file", "load the given plugin file (plugin development)"), - ("--start-session", "load the global session file"), + ("--noopen", "don't open anything at startup except that given in command"), + ("--plugin=plugin-file", "load the given plugin file (plugin development)"), + ("--start-session", "load the global session file"), ("--", "indicate that there are options for the program to be debugged"), ("", "(everything after that is considered arguments for this program)") ]
--- a/eric5.pyw Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5.pyw Fri Mar 11 16:51:57 2011 +0100 @@ -5,4 +5,4 @@ from eric5 import main -main() \ No newline at end of file +main()
--- a/eric5_api.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_api.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ import Utilities import DocumentationTools + def usage(): """ Function to print some usage information. @@ -77,6 +78,7 @@ print(" This option may be repeated multiple times.") sys.exit(1) + def version(): """ Function to show the version information. @@ -91,6 +93,7 @@ PARTICULAR PURPOSE.""".format(Version)) sys.exit(1) + def main(): """ Main entry point into the application. @@ -102,12 +105,12 @@ try: opts, args = getopt.getopt(sys.argv[1:], "b:e:hl:o:pRrt:Vx:", ["base=", "eol=", "exclude=", "exclude-file=", "extension=", "help", - "language=", "output=", "private", "recursive", + "language=", "output=", "private", "recursive", "version", ]) except getopt.error: usage() - excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", + excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", ".eric5project", "_eric5project", "dist", "build", "doc", "docs"] excludePatterns = [] outputFileName = "" @@ -183,7 +186,7 @@ for arg in args: if os.path.isdir(arg): - if os.path.exists(os.path.join(arg, + if os.path.exists(os.path.join(arg, Utilities.joinext("__init__", ".py"))): basename = os.path.dirname(arg) if arg == '.': @@ -211,7 +214,7 @@ for ext in supportedExtensions: files.extend(glob.glob(os.path.join(filename, Utilities.joinext("*", ext)))) - initFile = os.path.join(filename, + initFile = os.path.join(filename, Utilities.joinext("__init__", ext)) if initFile in files: inpackage = True @@ -236,8 +239,8 @@ continue try: - module = Utilities.ModuleParser.readModule(file, - basename = basename, inpackage = inpackage) + module = Utilities.ModuleParser.readModule(file, + basename=basename, inpackage=inpackage) apiGenerator = APIGenerator(module) api = apiGenerator.genAPI(True, basePackage, includePrivate) except IOError as v: @@ -256,7 +259,7 @@ if outdir and not os.path.exists(outdir): os.makedirs(outdir) try: - out = open(outputFile, "w", encoding = "utf-8", newline = newline) + out = open(outputFile, "w", encoding="utf-8", newline=newline) out.write("\n".join(sorted(apis)) + "\n") out.close() except IOError as v:
--- a/eric5_compare.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_compare.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ Eric5 Compare This is the main Python script that performs the necessary initialization -of the Compare module and starts the Qt event loop. This is a standalone +of the Compare module and starts the Qt event loop. This is a standalone version of the integrated Compare module. """ @@ -24,6 +24,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -40,13 +41,14 @@ else: return CompareWindow() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Compare",
--- a/eric5_configure.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_configure.py Fri Mar 11 16:51:57 2011 +0100 @@ -29,6 +29,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -42,13 +43,14 @@ w.showConfigurationPageByName("empty") return w + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Configure",
--- a/eric5_diff.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_diff.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ Eric5 Diff This is the main Python script that performs the necessary initialization -of the Diff module and starts the Qt event loop. This is a standalone +of the Diff module and starts the Qt event loop. This is a standalone version of the integrated Diff module. """ @@ -24,6 +24,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -34,13 +35,14 @@ from UI.DiffDialog import DiffWindow return DiffWindow() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Diff",
--- a/eric5_doc.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_doc.py Fri Mar 11 16:51:57 2011 +0100 @@ -26,7 +26,8 @@ import Utilities # list of supported filename extensions -supportedExtensions = [".py", ".pyw", ".ptl", ".rb"] +supportedExtensions = [".py", ".pyw", ".ptl", ".rb"] + def usage(): """ @@ -114,6 +115,7 @@ print(" Enable generation of QtHelp Collection files.") sys.exit(1) + def version(): """ Function to show the version information. @@ -128,6 +130,7 @@ PARTICULAR PURPOSE.""".format(Version)) sys.exit(1) + def main(): """ Main entry point into the application. @@ -139,20 +142,20 @@ opts, args = getopt.getopt(sys.argv[1:], "c:ehio:Rrt:Vx:", ["exclude=", "extension=", "help", "noindex", "noempty", "outdir=", "recursive", "style-sheet=", "version", - "exclude-file=", "eol=", - "body-color=", "body-background-color=", + "exclude-file=", "eol=", + "body-color=", "body-background-color=", "l1header-color=", "l1header-background-color=", "l2header-color=", "l2header-background-color=", "cfheader-color=", "cfheader-background-color=", "link-color=", - "create-qhp", "qhp-outdir=", "qhp-namespace=", - "qhp-virtualfolder=", "qhp-filtername=", "qhp-filterattribs=", - "qhp-title=", "create-qhc", + "create-qhp", "qhp-outdir=", "qhp-namespace=", + "qhp-virtualfolder=", "qhp-filtername=", "qhp-filterattribs=", + "qhp-title=", "create-qhc", ]) except getopt.error: usage() - excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", + excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", ".eric5project", "_eric5project", "dist", "build", "doc", "docs"] excludePatterns = [] outputDir = "doc" @@ -266,7 +269,7 @@ if stylesheetFile: try: - sf = open(stylesheetFile, "r", encoding = "utf-8") + sf = open(stylesheetFile, "r", encoding="utf-8") stylesheet = sf.read() sf.close() except IOError: @@ -293,9 +296,9 @@ qtHelpOutputDir = os.getcwd() qtHelpOutputDir = os.path.abspath(qtHelpOutputDir) - qtHelpGenerator = QtHelpGenerator(outputDir, - qtHelpOutputDir, qtHelpNamespace, qtHelpFolder, - qtHelpFilterName, qtHelpFilterAttribs, + qtHelpGenerator = QtHelpGenerator(outputDir, + qtHelpOutputDir, qtHelpNamespace, qtHelpFolder, + qtHelpFilterName, qtHelpFilterAttribs, qtHelpTitle, qtHelpCreateCollection) for arg in args: @@ -348,8 +351,8 @@ continue try: - module = Utilities.ModuleParser.readModule(file, basename = basename, - inpackage = inpackage, extensions = supportedExtensions) + module = Utilities.ModuleParser.readModule(file, basename=basename, + inpackage=inpackage, extensions=supportedExtensions) moduleDocument = ModuleDocument(module, colors, stylesheet) doc = moduleDocument.genDocument() except IOError as v: @@ -377,7 +380,7 @@ # generate output try: - out = open(f, "w", encoding = "utf-8", newline = newline) + out = open(f, "w", encoding="utf-8", newline=newline) out.write(doc) out.close() except IOError as v: @@ -391,11 +394,11 @@ # write index files if doIndex: - indexGenerator.writeIndices(basename, newline = newline) + indexGenerator.writeIndices(basename, newline=newline) # generate the QtHelp files if qtHelpCreation: - qtHelpGenerator.generateFiles(newline = newline) + qtHelpGenerator.generateFiles(newline=newline) sys.exit(0)
--- a/eric5_editor.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_editor.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ Eric5 Editor This is the main Python script that performs the necessary initialization -of the MiniEditor module and starts the Qt event loop. This is a standalone +of the MiniEditor module and starts the Qt event loop. This is a standalone version of the integrated MiniEditor module. """ @@ -45,13 +45,14 @@ else: return MiniEditor() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ("", "name of file to edit") ] appinfo = Startup.makeAppInfo(sys.argv,
--- a/eric5_iconeditor.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_iconeditor.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,6 +24,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -41,13 +42,14 @@ editor = IconEditorWindow(fileName, None) return editor + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ("", "name of file to edit") ] appinfo = Startup.makeAppInfo(sys.argv,
--- a/eric5_plugininstall.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_plugininstall.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -32,13 +33,14 @@ from PluginManager.PluginInstallDialog import PluginInstallWindow return PluginInstallWindow(argv[1:]) + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ("", "names of plugins to install") ] appinfo = Startup.makeAppInfo(sys.argv,
--- a/eric5_pluginrepository.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_pluginrepository.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -32,13 +33,14 @@ from PluginManager.PluginRepositoryDialog import PluginRepositoryWindow return PluginRepositoryWindow(None) + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Plugin Repository",
--- a/eric5_pluginuninstall.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_pluginuninstall.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -32,13 +33,14 @@ from PluginManager.PluginUninstallDialog import PluginUninstallWindow return PluginUninstallWindow() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Plugin Uninstaller",
--- a/eric5_qregexp.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_qregexp.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ Eric5 QRegExp This is the main Python script that performs the necessary initialization -of the QRegExp wizard module and starts the Qt event loop. This is a standalone +of the QRegExp wizard module and starts the Qt event loop. This is a standalone version of the integrated QRegExp wizard. """ @@ -36,13 +36,14 @@ QRegExpWizardWindow return QRegExpWizardWindow() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 QRegExp",
--- a/eric5_re.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_re.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ Eric5 Re This is the main Python script that performs the necessary initialization -of the PyRegExp wizard module and starts the Qt event loop. This is a standalone +of the PyRegExp wizard module and starts the Qt event loop. This is a standalone version of the integrated PyRegExp wizard. """ @@ -36,13 +36,14 @@ PyRegExpWizardWindow return PyRegExpWizardWindow() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 RE",
--- a/eric5_sqlbrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_sqlbrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -23,6 +23,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -40,13 +41,14 @@ browser = SqlBrowser(connections) return browser + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 SQL Browser",
--- a/eric5_tray.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_tray.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,6 +24,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -34,13 +35,14 @@ from Tools.TrayStarter import TrayStarter return TrayStarter() + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Tray", @@ -49,8 +51,8 @@ options) res = Startup.simpleAppStartup(sys.argv, appinfo, - createMainWidget, - quitOnLastWindowClosed = False) + createMainWidget, + quitOnLastWindowClosed=False) sys.exit(res) if __name__ == '__main__':
--- a/eric5_trpreviewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_trpreviewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -27,6 +27,7 @@ from Tools.TRSingleApplication import TRSingleApplicationClient from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -44,13 +45,14 @@ previewer = TRPreviewer(files, None, 'TRPreviewer') return previewer + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 TR Previewer", @@ -71,8 +73,8 @@ else: res = Startup.simpleAppStartup(sys.argv, appinfo, - createMainWidget, - app = app) + createMainWidget, + app=app) sys.exit(res) if __name__ == '__main__':
--- a/eric5_uipreviewer.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_uipreviewer.py Fri Mar 11 16:51:57 2011 +0100 @@ -24,6 +24,7 @@ from Utilities import Startup + def createMainWidget(argv): """ Function to create the main widget. @@ -41,13 +42,14 @@ previewer = UIPreviewer(fn, None, 'UIPreviewer') return previewer + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 UI Previewer",
--- a/eric5_unittest.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_unittest.py Fri Mar 11 16:51:57 2011 +0100 @@ -8,7 +8,7 @@ Eric5 Unittest This is the main Python script that performs the necessary initialization -of the unittest module and starts the Qt event loop. This is a standalone +of the unittest module and starts the Qt event loop. This is a standalone version of the integrated unittest module. """ @@ -39,13 +39,14 @@ fn = None return UnittestWindow(fn) + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ] appinfo = Startup.makeAppInfo(sys.argv, "Eric5 Unittest",
--- a/eric5_webbrowser.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5_webbrowser.py Fri Mar 11 16:51:57 2011 +0100 @@ -32,6 +32,7 @@ from Utilities import Startup import Utilities + def createMainWidget(argv): """ Function to create the main widget. @@ -54,16 +55,17 @@ except IndexError: home = "" - help = HelpWindow(home, '.', None, 'help viewer', searchWord = searchWord) + help = HelpWindow(home, '.', None, 'help viewer', searchWord=searchWord) return help + def main(): """ Main entry point into the application. """ options = [\ - ("--config=configDir", - "use the given directory as the one containing the config files"), + ("--config=configDir", + "use the given directory as the one containing the config files"), ("--search=word", "search for the given word") ] appinfo = Startup.makeAppInfo(sys.argv,
--- a/eric5config.py Fri Mar 11 08:55:14 2011 +0100 +++ b/eric5config.py Fri Mar 11 16:51:57 2011 +0100 @@ -13,22 +13,23 @@ __ericDir = os.path.dirname(sys.argv[0]) _pkg_config = { - 'ericDir' : __ericDir, - 'ericPixDir' : os.path.join(__ericDir, 'pixmaps'), - 'ericIconDir' : os.path.join(__ericDir, 'icons'), - 'ericDTDDir' : os.path.join(__ericDir, 'DTDs'), - 'ericCSSDir' : os.path.join(__ericDir, 'CSSs'), - 'ericStylesDir' : os.path.join(__ericDir, "Styles"), - 'ericDocDir' : os.path.join(__ericDir, 'Documentation'), - 'ericExamplesDir' : os.path.join(__ericDir, 'Examples'), - 'ericTranslationsDir' : os.path.join(__ericDir, 'i18n'), - 'ericTemplatesDir' : os.path.join(__ericDir, 'DesignerTemplates'), - 'ericCodeTemplatesDir' : os.path.join(__ericDir, 'CodeTemplates'), - 'ericOthersDir' : __ericDir, - 'bindir' : __ericDir, - 'mdir' : __ericDir, + 'ericDir': __ericDir, + 'ericPixDir': os.path.join(__ericDir, 'pixmaps'), + 'ericIconDir': os.path.join(__ericDir, 'icons'), + 'ericDTDDir': os.path.join(__ericDir, 'DTDs'), + 'ericCSSDir': os.path.join(__ericDir, 'CSSs'), + 'ericStylesDir': os.path.join(__ericDir, "Styles"), + 'ericDocDir': os.path.join(__ericDir, 'Documentation'), + 'ericExamplesDir': os.path.join(__ericDir, 'Examples'), + 'ericTranslationsDir': os.path.join(__ericDir, 'i18n'), + 'ericTemplatesDir': os.path.join(__ericDir, 'DesignerTemplates'), + 'ericCodeTemplatesDir': os.path.join(__ericDir, 'CodeTemplates'), + 'ericOthersDir': __ericDir, + 'bindir': __ericDir, + 'mdir': __ericDir, } + def getConfig(name): ''' Module function to get a configuration value.
--- a/install-i18n.py Fri Mar 11 08:55:14 2011 +0100 +++ b/install-i18n.py Fri Mar 11 16:51:57 2011 +0100 @@ -22,6 +22,7 @@ print("The eric5 IDE doesn't seem to be installed. Aborting.") sys.exit(1) + def getConfigDir(): """ Global function to get the name of the directory storing the config data. @@ -47,7 +48,8 @@ configDir = getConfigDir() privateInstall = False -def usage(rcode = 2): + +def usage(rcode=2): """ Display a usage message and exit. @@ -64,6 +66,7 @@ sys.exit(rcode) + def installTranslations(): """ Install the translation files into the right place. @@ -85,6 +88,7 @@ sys.stderr.write( 'OSError: {0}\nTry install-i18n with admin rights.\n'.format(msg)) + def main(argv): """ The main function of the script. @@ -98,7 +102,7 @@ progName = os.path.basename(argv[0]) try: - optlist, args = getopt.getopt(argv[1:],"hp") + optlist, args = getopt.getopt(argv[1:], "hp") except getopt.GetoptError: usage()
--- a/install.py Fri Mar 11 08:55:14 2011 +0100 +++ b/install.py Fri Mar 11 16:51:57 2011 +0100 @@ -35,12 +35,13 @@ # Define blacklisted versions of the prerequisites BlackLists = { - "sip" : ["4.11"], - "PyQt4" : ["4.7.5"], - "QScintilla2" : [], + "sip": ["4.11"], + "PyQt4": ["4.7.5"], + "QScintilla2": [], } -def exit(rcode = 0): + +def exit(rcode=0): """ Exit the install script. """ @@ -49,7 +50,8 @@ sys.exit(rcode) -def usage(rcode = 2): + +def usage(rcode=2): """ Display a usage message and exit. @@ -130,7 +132,7 @@ @param name the name of the file. @param text the contents to copy to the file. """ - f = open(name,"w", encoding = "utf-8") + f = open(name, "w", encoding="utf-8") f.write(text) f.close() @@ -151,7 +153,7 @@ return wname -def createPyWrapper(pydir, wfile, isGuiScript = True): +def createPyWrapper(pydir, wfile, isGuiScript=True): """ Create an executable wrapper for a Python script. @@ -242,14 +244,14 @@ if not os.path.exists(fname): if not os.path.exists(pdir): os.mkdir(pdir, 0o755) - f = open(fname, "w", encoding = "utf-8") + f = open(fname, "w", encoding="utf-8") f.write( '''# -*- coding: utf-8 -*- """ Package containing the global plugins. """ -''' +''' ) f.close() @@ -268,7 +270,7 @@ # Remove the menu entry for Linux systems if sys.platform.startswith("linux"): - for name in ["/usr/share/pixmaps/eric.png", + for name in ["/usr/share/pixmaps/eric.png", "/usr/share/applications/eric5.desktop"]: if os.path.exists(name): os.remove(name) @@ -277,24 +279,24 @@ rem_wnames = [ "eric5-api", "eric5-compare", "eric5-configure", "eric5-diff", - "eric5-doc", - "eric5-qregexp", "eric5-re", + "eric5-doc", + "eric5-qregexp", "eric5-re", "eric5-trpreviewer", "eric5-uipreviewer", "eric5-unittest", "eric5", - "eric5-tray", "eric5-editor", - "eric5-plugininstall", "eric5-pluginuninstall", - "eric5-pluginrepository", "eric5-sqlbrowser", - "eric5-webbrowser", "eric5-iconeditor", + "eric5-tray", "eric5-editor", + "eric5-plugininstall", "eric5-pluginuninstall", + "eric5-pluginrepository", "eric5-sqlbrowser", + "eric5-webbrowser", "eric5-iconeditor", "eric5_api", "eric5_compare", "eric5_configure", "eric5_diff", - "eric5_doc", - "eric5_qregexp", "eric5_re", + "eric5_doc", + "eric5_qregexp", "eric5_re", "eric5_trpreviewer", "eric5_uipreviewer", "eric5_unittest", "eric5", - "eric5_tray", "eric5_editor", - "eric5_plugininstall", "eric5_pluginuninstall", - "eric5_pluginrepository", "eric5_sqlbrowser", - "eric5_webbrowser", "eric5_iconeditor", + "eric5_tray", "eric5_editor", + "eric5_plugininstall", "eric5_pluginuninstall", + "eric5_pluginrepository", "eric5_sqlbrowser", + "eric5_webbrowser", "eric5_iconeditor", ] for rem_wname in rem_wnames: rwname = wrapperName(getConfig('bindir'), rem_wname) @@ -382,34 +384,34 @@ shutil.copy(configName + 'c', modDir) # copy the various parts of eric5 - copyTree(sourceDir, cfg['ericDir'], ['*.py', '*.pyc', '*.pyo', '*.pyw'], + copyTree(sourceDir, cfg['ericDir'], ['*.py', '*.pyc', '*.pyo', '*.pyw'], ['{1}{0}Examples'.format(os.sep, sourceDir)]) - copyTree(sourceDir, cfg['ericDir'], ['*.rb'], + copyTree(sourceDir, cfg['ericDir'], ['*.rb'], ['{1}{0}Examples'.format(os.sep, sourceDir)]) - copyTree('{1}{0}Plugins'.format(os.sep, sourceDir), - '{0}{1}Plugins'.format(cfg['ericDir'], os.sep), + copyTree('{1}{0}Plugins'.format(os.sep, sourceDir), + '{0}{1}Plugins'.format(cfg['ericDir'], os.sep), ['*.png', '*.style']) - copyTree('{1}{0}Documentation'.format(os.sep, sourceDir), cfg['ericDocDir'], + copyTree('{1}{0}Documentation'.format(os.sep, sourceDir), cfg['ericDocDir'], ['*.html', '*.qch']) - copyTree('{1}{0}DTDs'.format(os.sep, sourceDir), cfg['ericDTDDir'], + copyTree('{1}{0}DTDs'.format(os.sep, sourceDir), cfg['ericDTDDir'], ['*.dtd']) - copyTree('{1}{0}CSSs'.format(os.sep, sourceDir), cfg['ericCSSDir'], + copyTree('{1}{0}CSSs'.format(os.sep, sourceDir), cfg['ericCSSDir'], ['*.css']) - copyTree('{1}{0}Styles'.format(os.sep, sourceDir), cfg['ericStylesDir'], + copyTree('{1}{0}Styles'.format(os.sep, sourceDir), cfg['ericStylesDir'], ['*.qss']) - copyTree('{1}{0}i18n'.format(os.sep, sourceDir), cfg['ericTranslationsDir'], + copyTree('{1}{0}i18n'.format(os.sep, sourceDir), cfg['ericTranslationsDir'], ['*.qm']) - copyTree('{1}{0}icons'.format(os.sep, sourceDir), cfg['ericIconDir'], + copyTree('{1}{0}icons'.format(os.sep, sourceDir), cfg['ericIconDir'], ['*.png', 'LICENSE*.*']) - copyTree('{1}{0}pixmaps'.format(os.sep, sourceDir), cfg['ericPixDir'], + copyTree('{1}{0}pixmaps'.format(os.sep, sourceDir), cfg['ericPixDir'], ['*.png', '*.xpm', '*.ico']) - copyTree('{1}{0}DesignerTemplates'.format(os.sep, sourceDir), - cfg['ericTemplatesDir'], + copyTree('{1}{0}DesignerTemplates'.format(os.sep, sourceDir), + cfg['ericTemplatesDir'], ['*.tmpl']) - copyTree('{1}{0}CodeTemplates'.format(os.sep, sourceDir), - cfg['ericCodeTemplatesDir'], + copyTree('{1}{0}CodeTemplates'.format(os.sep, sourceDir), + cfg['ericCodeTemplatesDir'], ['*.tmpl']) - copyTree('{1}{0}Examples'.format(os.sep, sourceDir), cfg['ericExamplesDir'], + copyTree('{1}{0}Examples'.format(os.sep, sourceDir), cfg['ericExamplesDir'], ['*.py', '*.pyc', '*.pyo']) # copy the wrappers @@ -480,9 +482,9 @@ os.makedirs(dst) shutil.copy(os.path.join(sourceDir, "eric5.desktop"), dst) else: - shutil.copy(os.path.join(sourceDir, "icons", "default", "eric.png"), + shutil.copy(os.path.join(sourceDir, "icons", "default", "eric.png"), "/usr/share/pixmaps") - shutil.copy(os.path.join(sourceDir, "eric5.desktop"), + shutil.copy(os.path.join(sourceDir, "eric5.desktop"), "/usr/share/applications") @@ -494,20 +496,20 @@ ericdir = os.path.join(modDir, "eric5") cfg = { - 'ericDir' : ericdir, - 'ericPixDir' : os.path.join(ericdir, "pixmaps"), - 'ericIconDir' : os.path.join(ericdir, "icons"), - 'ericDTDDir' : os.path.join(ericdir, "DTDs"), - 'ericCSSDir' : os.path.join(ericdir, "CSSs"), - 'ericStylesDir' : os.path.join(ericdir, "Styles"), - 'ericDocDir' : os.path.join(ericdir, "Documentation"), - 'ericExamplesDir' : os.path.join(ericdir, "Examples"), - 'ericTranslationsDir' : os.path.join(ericdir, "i18n"), - 'ericTemplatesDir' : os.path.join(ericdir, "DesignerTemplates"), - 'ericCodeTemplatesDir' : os.path.join(ericdir, 'CodeTemplates'), - 'ericOthersDir' : ericdir, - 'bindir' : platBinDir, - 'mdir' : modDir, + 'ericDir': ericdir, + 'ericPixDir': os.path.join(ericdir, "pixmaps"), + 'ericIconDir': os.path.join(ericdir, "icons"), + 'ericDTDDir': os.path.join(ericdir, "DTDs"), + 'ericCSSDir': os.path.join(ericdir, "CSSs"), + 'ericStylesDir': os.path.join(ericdir, "Styles"), + 'ericDocDir': os.path.join(ericdir, "Documentation"), + 'ericExamplesDir': os.path.join(ericdir, "Examples"), + 'ericTranslationsDir': os.path.join(ericdir, "i18n"), + 'ericTemplatesDir': os.path.join(ericdir, "DesignerTemplates"), + 'ericCodeTemplatesDir': os.path.join(ericdir, 'CodeTemplates'), + 'ericOthersDir': ericdir, + 'bindir': platBinDir, + 'mdir': modDir, } if apisDir: cfg['apidir'] = apisDir @@ -515,6 +517,7 @@ cfg['apidir'] = os.path.join(ericdir, "api") configLength = 15 + def createConfig(): """ Create a config file with the respective config entries. @@ -538,22 +541,22 @@ # _pkg_config = {{ - 'ericDir' : r'{0}', - 'ericPixDir' : r'{1}', - 'ericIconDir' : r'{2}', - 'ericDTDDir' : r'{3}', - 'ericCSSDir' : r'{4}', - 'ericStylesDir' : r'{5}', - 'ericDocDir' : r'{6}', - 'ericExamplesDir' : r'{7}', - 'ericTranslationsDir' : r'{8}', - 'ericTemplatesDir' : r'{9}', - 'ericCodeTemplatesDir' : r'{10}', - 'ericOthersDir' : r'{11}', - 'bindir' : r'{12}', - 'mdir' : r'{13}', - 'apidir' : r'{14}', - 'apis' : {15}, + 'ericDir': r'{0}', + 'ericPixDir': r'{1}', + 'ericIconDir': r'{2}', + 'ericDTDDir': r'{3}', + 'ericCSSDir': r'{4}', + 'ericStylesDir': r'{5}', + 'ericDocDir': r'{6}', + 'ericExamplesDir': r'{7}', + 'ericTranslationsDir': r'{8}', + 'ericTemplatesDir': r'{9}', + 'ericCodeTemplatesDir': r'{10}', + 'ericOthersDir': r'{11}', + 'bindir': r'{12}', + 'mdir': r'{13}', + 'apidir': r'{14}', + 'apis': {15}, }} def getConfig(name): @@ -568,17 +571,18 @@ pass raise AttributeError('"{{0}}" is not a valid configuration value'.format(name)) -""".format(cfg['ericDir'], cfg['ericPixDir'], cfg['ericIconDir'], - cfg['ericDTDDir'], cfg['ericCSSDir'], +""".format(cfg['ericDir'], cfg['ericPixDir'], cfg['ericIconDir'], + cfg['ericDTDDir'], cfg['ericCSSDir'], cfg['ericStylesDir'], cfg['ericDocDir'], cfg['ericExamplesDir'], cfg['ericTranslationsDir'], cfg['ericTemplatesDir'], cfg['ericCodeTemplatesDir'], cfg['ericOthersDir'], - cfg['bindir'], cfg['mdir'], + cfg['bindir'], cfg['mdir'], cfg['apidir'], apis) copyToFile(fn, config) -def doDependancyChecks(): + +def doDependancyChecks(): """ Perform some dependency checks. """ @@ -692,6 +696,7 @@ print("All dependencies ok.") print() + def compileUiFiles(): """ Compile the .ui files to Python sources. @@ -703,7 +708,7 @@ from PyQt4.uic import compileUi def compileUiDir(dir, recurse = False, map = None, # __IGNORE_WARNING__ - **compileUi_args): + ** compileUi_args): """ Creates Python modules from Qt Designer .ui files in a directory or directory tree. @@ -778,6 +783,7 @@ compileUiDir(sourceDir, True, pyName) + def main(argv): """ The main function of the script. @@ -796,9 +802,9 @@ try: if sys.platform.startswith("win"): - optlist, args = getopt.getopt(argv[1:],"chxza:b:d:f:") + optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:") else: - optlist, args = getopt.getopt(argv[1:],"chxza:b:d:f:i:") + optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:i:") except getopt.GetoptError: usage() @@ -875,19 +881,19 @@ if doCompile: print("\nCompiling source files...") if distDir: - compileall.compile_dir(sourceDir, - ddir = os.path.join(distDir, modDir, cfg['ericDir']), - rx = re.compile(r"DebugClients[\\/]Python[\\/]|UtilitiesPython2[\\/]"), - quiet = True) - py_compile.compile(configName, - dfile = os.path.join(distDir, modDir, "eric5config.py")) + compileall.compile_dir(sourceDir, + ddir=os.path.join(distDir, modDir, cfg['ericDir']), + rx=re.compile(r"DebugClients[\\/]Python[\\/]|UtilitiesPython2[\\/]"), + quiet=True) + py_compile.compile(configName, + dfile=os.path.join(distDir, modDir, "eric5config.py")) else: - compileall.compile_dir(sourceDir, - ddir = os.path.join(modDir, cfg['ericDir']), - rx = re.compile(r"DebugClients[\\/]Python[\\/]|UtilitiesPython2[\\/]"), - quiet = True) - py_compile.compile(configName, - dfile = os.path.join(modDir, "eric5config.py")) + compileall.compile_dir(sourceDir, + ddir=os.path.join(modDir, cfg['ericDir']), + rx=re.compile(r"DebugClients[\\/]Python[\\/]|UtilitiesPython2[\\/]"), + quiet=True) + py_compile.compile(configName, + dfile=os.path.join(modDir, "eric5config.py")) print("\nInstalling eric5 ...") installEric()
--- a/patch_modpython.py Fri Mar 11 08:55:14 2011 +0100 +++ b/patch_modpython.py Fri Mar 11 16:51:57 2011 +0100 @@ -2,7 +2,7 @@ # Copyright (c) 2003-2011 Detlev Offenbach <detlev@die-offenbachs.de> # -# This is a script to patch mod_python for eric5. +# This is a script to patch mod_python for eric5. """ Script to patch mod_python for usage with the eric5 IDE. @@ -18,7 +18,8 @@ progName = None modDir = None -def usage(rcode = 2): + +def usage(rcode=2): """ Display a usage message and exit. @@ -49,6 +50,7 @@ modDir = os.path.join(distutils.sysconfig.get_python_lib(True), "mod_python") + def main(argv): """The main function of the script. @@ -63,7 +65,7 @@ initGlobals() try: - optlist, args = getopt.getopt(argv[1:],"hd:") + optlist, args = getopt.getopt(argv[1:], "hd:") except getopt.GetoptError: usage() @@ -76,7 +78,7 @@ try: filename = os.path.join(modDir, "apache.py") - f = open(filename, "r", encoding = "utf-8") + f = open(filename, "r", encoding="utf-8") except EnvironmentError: print("The file {0} does not exist. Aborting.".format(filename)) sys.exit(1) @@ -88,7 +90,7 @@ ericFound = False sn = "apache.py" - s = open(sn, "w", encoding = "utf-8") + s = open(sn, "w", encoding="utf-8") for line in lines: if not pdbFound and line.startswith("import pdb"): s.write("import eric5.DebugClients.Python.eric5dbgstub as pdb\n")
--- a/uninstall.py Fri Mar 11 08:55:14 2011 +0100 +++ b/uninstall.py Fri Mar 11 16:51:57 2011 +0100 @@ -21,7 +21,8 @@ progName = None pyModDir = None -def usage(rcode = 2): + +def usage(rcode=2): """Display a usage message and exit. rcode is the return code passed back to the calling process. @@ -45,7 +46,7 @@ pyModDir = distutils.sysconfig.get_python_lib(True) -def wrapperName(dname,wfile): +def wrapperName(dname, wfile): """Create the platform specific name for the wrapper script. """ if sys.platform.startswith("win"): @@ -64,7 +65,7 @@ # Remove the menu entry for Linux systems if sys.platform.startswith("linux"): - for name in ["/usr/share/pixmaps/eric.png", + for name in ["/usr/share/pixmaps/eric.png", "/usr/share/applications/eric5.desktop"]: if os.path.exists(name): os.remove(name) @@ -73,27 +74,27 @@ rem_wnames = [ "eric5-api", "eric5-compare", "eric5-configure", "eric5-diff", - "eric5-doc", - "eric5-qregexp", "eric5-re", + "eric5-doc", + "eric5-qregexp", "eric5-re", "eric5-trpreviewer", "eric5-uipreviewer", "eric5-unittest", "eric5", - "eric5-tray", "eric5-editor", - "eric5-plugininstall", "eric5-pluginuninstall", - "eric5-pluginrepository", "eric5-sqlbrowser", - "eric5-webbrowser", "eric5-iconeditor", + "eric5-tray", "eric5-editor", + "eric5-plugininstall", "eric5-pluginuninstall", + "eric5-pluginrepository", "eric5-sqlbrowser", + "eric5-webbrowser", "eric5-iconeditor", "eric5_api", "eric5_compare", "eric5_configure", "eric5_diff", - "eric5_doc", - "eric5_qregexp", "eric5_re", + "eric5_doc", + "eric5_qregexp", "eric5_re", "eric5_trpreviewer", "eric5_uipreviewer", "eric5_unittest", "eric5", - "eric5_tray", "eric5_editor", - "eric5_plugininstall", "eric5_pluginuninstall", - "eric5_pluginrepository", "eric5_sqlbrowser", - "eric5_webbrowser", "eric5_iconeditor", + "eric5_tray", "eric5_editor", + "eric5_plugininstall", "eric5_pluginuninstall", + "eric5_pluginrepository", "eric5_sqlbrowser", + "eric5_webbrowser", "eric5_iconeditor", ] for rem_wname in rem_wnames: - rwname = wrapperName(getConfig('bindir'),rem_wname) + rwname = wrapperName(getConfig('bindir'), rem_wname) if os.path.exists(rwname): os.remove(rwname) @@ -123,6 +124,7 @@ if os.path.exists(apiname): os.remove(apiname) + def main(argv): """The main function of the script. @@ -137,7 +139,7 @@ progName = os.path.basename(argv[0]) try: - optlist, args = getopt.getopt(argv[1:],"h") + optlist, args = getopt.getopt(argv[1:], "h") except getopt.GetoptError: usage()
