Mercurial Repositories > eric / changeset
changeset
Renamed e5App to e5App.
Tue, 12 Jan 2010 18:36:05 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 12 Jan 2010 18:36:05 +0000
- changeset 53
- c3eb7cc1ff8b
- parent 52
- ba69827929ee
- child 54
- 31463df17fd5
Renamed e5App to e5App.
--- a/Debugger/BreakPointViewer.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/BreakPointViewer.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .EditBreakpointDialog import EditBreakpointDialog @@ -436,4 +436,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("debuggerGeneralPage") + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file
--- a/Debugger/DebugServer.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/DebugServer.py Tue Jan 12 18:36:05 2010 +0000 @@ -16,7 +16,7 @@ from PyQt4.QtGui import QMessageBox from PyQt4.QtNetwork import QTcpServer, QHostAddress, QHostInfo -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .BreakPointModel import BreakPointModel from .WatchPointModel import WatchPointModel @@ -315,7 +315,7 @@ self.__createDebuggerInterface() if forProject: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if not project.isDebugPropertiesLoaded(): self.clientProcess, isNetworked = \ self.debuggerInterface.startRemote(self.serverPort(), @@ -1256,4 +1256,4 @@ @return flag indicating a connection (boolean) """ - return self.debuggerInterface and self.debuggerInterface.isConnected() + return self.debuggerInterface and self.debuggerInterface.isConnected() \ No newline at end of file
--- a/Debugger/DebuggerInterfacePython.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/DebuggerInterfacePython.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import QInputDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .DebugProtocol import * from . import DebugClientCapabilities @@ -251,7 +251,7 @@ @return client process object (QProcess) and a flag to indicate a network connection (boolean) """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if not project.isDebugPropertiesLoaded(): return None, self.__isNetworked @@ -941,4 +941,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8')) else: - self.queue.append(cmd) + self.queue.append(cmd) \ No newline at end of file
--- a/Debugger/DebuggerInterfacePython3.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/DebuggerInterfacePython3.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import QInputDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .DebugProtocol import * from . import DebugClientCapabilities @@ -250,7 +250,7 @@ @return client process object (QProcess) and a flag to indicate a network connection (boolean) """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if not project.isDebugPropertiesLoaded(): return None, self.__isNetworked @@ -940,4 +940,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8', 'backslashreplace')) else: - self.queue.append(cmd) + self.queue.append(cmd) \ No newline at end of file
--- a/Debugger/DebuggerInterfaceRuby.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/DebuggerInterfaceRuby.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .DebugProtocol import * from . import DebugClientCapabilities @@ -230,7 +230,7 @@ @return pid of the client process (integer) and a flag to indicate a network connection (boolean) """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if not project.isDebugPropertiesLoaded(): return None, self.__isNetworked @@ -832,4 +832,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8')) else: - self.queue.append(cmd) + self.queue.append(cmd) \ No newline at end of file
--- a/Debugger/ExceptionLogger.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/ExceptionLogger.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App class ExceptionLogger(QTreeWidget): @@ -136,4 +136,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("debuggerGeneralPage") + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file
--- a/Debugger/VariablesViewer.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/VariablesViewer.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings from .VariableDetailDialog import VariableDetailDialog @@ -156,8 +156,8 @@ par = par.parent() # step 2: request the variable from the debugger - filter = e4App().getObject("DebugUI").variablesFilter(self.scope) - e4App().getObject("DebugServer").remoteClientVariable(\ + filter = e5App().getObject("DebugUI").variablesFilter(self.scope) + e5App().getObject("DebugServer").remoteClientVariable(\ self.scope, filter, pathlist, self.framenr) class ArrayElementVarItem(VariableItem): @@ -711,4 +711,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("debuggerGeneralPage") + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file
--- a/Debugger/WatchPointViewer.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Debugger/WatchPointViewer.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .EditWatchpointDialog import EditWatchpointDialog @@ -419,4 +419,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("debuggerGeneralPage") + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") \ No newline at end of file
--- a/E4Gui/E4Application.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E4Gui/E4Application.py Tue Jan 12 18:36:05 2010 +0000 @@ -112,4 +112,4 @@ else: raise KeyError('Pluginobject "%s" is not registered.' % name) -e4App = QCoreApplication.instance +e5App = QCoreApplication.instance \ No newline at end of file
--- a/E4Gui/E4SideBar.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E4Gui/E4SideBar.py Tue Jan 12 18:36:05 2010 +0000 @@ -11,7 +11,7 @@ QDataStream, QIODevice from PyQt4.QtGui import QTabBar, QWidget, QStackedWidget, QBoxLayout, QToolButton -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import UI.PixmapCache @@ -78,7 +78,7 @@ self.connect(self.__tabBar, SIGNAL("currentChanged(int)"), self.__stackedWidget, SLOT("setCurrentIndex(int)")) - self.connect(e4App(), SIGNAL("focusChanged(QWidget*, QWidget*)"), + self.connect(e5App(), SIGNAL("focusChanged(QWidget*, QWidget*)"), self.__appFocusChanged) self.connect(self.__autoHideButton, SIGNAL("toggled(bool)"), self.__autoHideToggled) @@ -547,4 +547,4 @@ @param event reference to the event (QEvent) """ if self.__autoHide and not self.__hasFocus and not self.isMinimized(): - self.shrink() + self.shrink() \ No newline at end of file
--- a/E4Gui/E4SingleApplication.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E4Gui/E4SingleApplication.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import sys import os -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from Utilities.SingleApplication import SingleApplicationClient, SingleApplicationServer @@ -62,7 +62,7 @@ @param fname filename to be opened (string) """ - e4App().getObject("ViewManager").openSourceFile(fname) + e5App().getObject("ViewManager").openSourceFile(fname) def __saOpenProject(self, pfname): """ @@ -70,7 +70,7 @@ @param pfname filename of the project to be opened (string) """ - e4App().getObject("Project").openProject(pfname) + e5App().getObject("Project").openProject(pfname) def __saArguments(self, argsStr): """ @@ -78,7 +78,7 @@ @param argsStr space delimited list of command args(string) """ - e4App().getObject("DebugUI").setArgvHistory(argsStr) + e5App().getObject("DebugUI").setArgvHistory(argsStr) class E4SingleApplicationClient(SingleApplicationClient): """ @@ -161,4 +161,4 @@ @param argsStr space delimited list of command args (string) """ cmd = "%s%s\n" % (SAArguments, argsStr) - self.sendCommand(cmd) + self.sendCommand(cmd) \ No newline at end of file
--- a/E5XML/DebuggerPropertiesWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/DebuggerPropertiesWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import debuggerPropertiesFileFormatVersion @@ -32,7 +32,7 @@ XMLWriterBase.__init__(self, file) self.name = projectName - self.project = e4App().getObject("Project") + self.project = e5App().getObject("Project") def writeXML(self): """
--- a/E5XML/HighlightingStylesWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/HighlightingStylesWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import highlightingStylesFileFormatVersion @@ -62,4 +62,4 @@ ) self._write(' </Lexer>') - self._write("</HighlightingStyles>", newline = False) + self._write("</HighlightingStyles>", newline = False) \ No newline at end of file
--- a/E5XML/MultiProjectWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/MultiProjectWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import multiProjectFileFormatVersion
--- a/E5XML/ProjectWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/ProjectWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import projectFileFormatVersion @@ -31,7 +31,7 @@ """ XMLWriterBase.__init__(self, file) - self.pdata = e4App().getObject("Project").pdata + self.pdata = e5App().getObject("Project").pdata self.name = projectName def writeXML(self):
--- a/E5XML/SessionHandler.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/SessionHandler.py Tue Jan 12 18:36:05 2010 +0000 @@ -7,7 +7,7 @@ Module implementing the handler class for reading an XML project session file. """ -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Config import sessionFileFormatVersion from .XMLHandlerBase import XMLHandlerBase @@ -66,11 +66,11 @@ self.project = project self.isGlobal = project is None - self.project = e4App().getObject("Project") - self.multiProject = e4App().getObject("MultiProject") - self.vm = e4App().getObject("ViewManager") - self.dbg = e4App().getObject("DebugUI") - self.dbs = e4App().getObject("DebugServer") + self.project = e5App().getObject("Project") + self.multiProject = e5App().getObject("MultiProject") + self.vm = e5App().getObject("ViewManager") + self.dbg = e5App().getObject("DebugUI") + self.dbs = e5App().getObject("DebugServer") def startDocumentSession(self): """ @@ -400,4 +400,4 @@ @return String containing the version number. """ - return self.version + return self.version \ No newline at end of file
--- a/E5XML/SessionWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/SessionWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import sessionFileFormatVersion @@ -32,11 +32,11 @@ XMLWriterBase.__init__(self, file) self.name = projectName - self.project = e4App().getObject("Project") - self.multiProject = e4App().getObject("MultiProject") - self.vm = e4App().getObject("ViewManager") - self.dbg = e4App().getObject("DebugUI") - self.dbs = e4App().getObject("DebugServer") + self.project = e5App().getObject("Project") + self.multiProject = e5App().getObject("MultiProject") + self.vm = e5App().getObject("ViewManager") + self.dbg = e5App().getObject("DebugUI") + self.dbs = e5App().getObject("DebugServer") def writeXML(self): """
--- a/E5XML/ShortcutsWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/ShortcutsWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -9,7 +9,7 @@ import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import shortcutsFileFormatVersion @@ -47,7 +47,7 @@ # add the main tag self._write('<Shortcuts version="%s">' % shortcutsFileFormatVersion) - for act in e4App().getObject("Project").getActions(): + for act in e5App().getObject("Project").getActions(): self._write(' <Shortcut category="Project">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -56,7 +56,7 @@ % self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("UserInterface").getActions('ui'): + for act in e5App().getObject("UserInterface").getActions('ui'): self._write(' <Shortcut category="General">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -65,7 +65,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("UserInterface").getActions('wizards'): + for act in e5App().getObject("UserInterface").getActions('wizards'): self._write(' <Shortcut category="Wizards">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -74,7 +74,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("DebugUI").getActions(): + for act in e5App().getObject("DebugUI").getActions(): self._write(' <Shortcut category="Debug">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -83,7 +83,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('edit'): + for act in e5App().getObject("ViewManager").getActions('edit'): self._write(' <Shortcut category="Edit">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -92,7 +92,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('file'): + for act in e5App().getObject("ViewManager").getActions('file'): self._write(' <Shortcut category="File">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -101,7 +101,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('search'): + for act in e5App().getObject("ViewManager").getActions('search'): self._write(' <Shortcut category="Search">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -110,7 +110,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('view'): + for act in e5App().getObject("ViewManager").getActions('view'): self._write(' <Shortcut category="View">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -119,7 +119,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('macro'): + for act in e5App().getObject("ViewManager").getActions('macro'): self._write(' <Shortcut category="Macro">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -128,7 +128,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('bookmark'): + for act in e5App().getObject("ViewManager").getActions('bookmark'): self._write(' <Shortcut category="Bookmarks">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -137,7 +137,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("ViewManager").getActions('spelling'): + for act in e5App().getObject("ViewManager").getActions('spelling'): self._write(' <Shortcut category="Spelling">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -146,7 +146,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - actions = e4App().getObject("ViewManager").getActions('window') + actions = e5App().getObject("ViewManager").getActions('window') for act in actions: self._write(' <Shortcut category="Window">') self._write(' <Name>%s</Name>' % act.objectName()) @@ -156,7 +156,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for category, ref in e4App().getPluginObjects(): + for category, ref in e5App().getPluginObjects(): if hasattr(ref, "getActions"): actions = ref.getActions() for act in actions: @@ -170,7 +170,7 @@ self.escape("%s" % act.alternateShortcut().toString())) self._write(' </Shortcut>') - for act in e4App().getObject("DummyHelpViewer").getActions(): + for act in e5App().getObject("DummyHelpViewer").getActions(): self._write(' <Shortcut category="HelpViewer">') self._write(' <Name>%s</Name>' % act.objectName()) self._write(' <Accel>%s</Accel>' % \ @@ -180,4 +180,4 @@ self._write(' </Shortcut>') # add the main end tag - self._write("</Shortcuts>", newline = False) + self._write("</Shortcuts>", newline = False) \ No newline at end of file
--- a/E5XML/TasksHandler.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/TasksHandler.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Config import tasksFileFormatVersion from .XMLHandlerBase import XMLHandlerBase @@ -48,7 +48,7 @@ if taskViewer: self.taskViewer = taskViewer else: - self.taskViewer = e4App().getObject("TaskViewer") + self.taskViewer = e5App().getObject("TaskViewer") def startDocumentTasks(self): """ @@ -194,4 +194,4 @@ @return String containing the version number. """ - return self.version + return self.version \ No newline at end of file
--- a/E5XML/TasksWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/TasksWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import tasksFileFormatVersion @@ -57,9 +57,9 @@ # do the tasks if self.forProject: - tasks = e4App().getObject("TaskViewer").getProjectTasks() + tasks = e5App().getObject("TaskViewer").getProjectTasks() else: - tasks = e4App().getObject("TaskViewer").getGlobalTasks() + tasks = e5App().getObject("TaskViewer").getGlobalTasks() for task in tasks: self._write(' <Task priority="%d" completed="%s" bugfix="%s">' % \ (task.priority, task.completed, task.isBugfixTask))
--- a/E5XML/TemplatesHandler.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/TemplatesHandler.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ import os import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Config import templatesFileFormatVersion from .XMLHandlerBase import XMLHandlerBase @@ -41,7 +41,7 @@ if templateViewer: self.viewer = templateViewer else: - self.viewer = e4App().getObject("TemplateViewer") + self.viewer = e5App().getObject("TemplateViewer") def startDocumentTemplates(self): """ @@ -108,4 +108,4 @@ @return String containing the version number. """ - return self.version + return self.version \ No newline at end of file
--- a/E5XML/UserProjectWriter.py Tue Jan 12 18:33:34 2010 +0000 +++ b/E5XML/UserProjectWriter.py Tue Jan 12 18:36:05 2010 +0000 @@ -9,7 +9,7 @@ import time -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .XMLWriterBase import XMLWriterBase from .Config import userProjectFileFormatVersion @@ -29,8 +29,8 @@ """ XMLWriterBase.__init__(self, file) - self.pudata = e4App().getObject("Project").pudata - self.pdata = e4App().getObject("Project").pdata + self.pudata = e5App().getObject("Project").pudata + self.pdata = e5App().getObject("Project").pdata self.name = projectName def writeXML(self):
--- a/MultiProject/MultiProject.py Tue Jan 12 18:33:34 2010 +0000 +++ b/MultiProject/MultiProject.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from Globals import recentNameMultiProject
--- a/MultiProject/MultiProjectBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/MultiProject/MultiProjectBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .AddProjectDialog import AddProjectDialog @@ -246,4 +246,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("multiProjectPage") + e5App().getObject("UserInterface").showPreferences("multiProjectPage") \ No newline at end of file
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_SyntaxCheckerDialog import Ui_SyntaxCheckerDialog @@ -156,7 +156,7 @@ lineno = int(itm.text(1)) error = itm.text(2) - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") vm.openSourceFile(fn, lineno) editor = vm.getOpenEditor(fn) editor.toggleSyntaxError(lineno, True, error) @@ -172,7 +172,7 @@ # go through the list again to clear syntax error markers # for files, that are ok - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") openFiles = vm.getOpenFilenames() errorFiles = [] for index in range(self.resultList.topLevelItemCount()): @@ -187,8 +187,8 @@ """ Private method to clear all error markers of open editors. """ - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") openFiles = vm.getOpenFilenames() for file in openFiles: editor = vm.getOpenEditor(file) - editor.clearSyntaxError() + editor.clearSyntaxError() \ No newline at end of file
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_TabnannyDialog import Ui_TabnannyDialog @@ -142,4 +142,4 @@ fn = Utilities.normabspath(itm.text(0)) lineno = int(itm.text(1)) - e4App().getObject("ViewManager").openSourceFile(fn, lineno) + e5App().getObject("ViewManager").openSourceFile(fn, lineno) \ No newline at end of file
--- a/Plugins/PluginEricapi.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginEricapi.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QApplication -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action @@ -90,7 +90,7 @@ @return tuple of None and activation status (boolean) """ - menu = e4App().getObject("Project").getMenu("Apidoc") + menu = e5App().getObject("Project").getMenu("Apidoc") if menu: self.__projectAct = E4Action(self.trUtf8('Generate API file (eric5-api)'), self.trUtf8('Generate &API file (eric5-api)'), 0, 0, @@ -102,10 +102,10 @@ """<p>Generate an API file using eric5-api.</p>""" )) self.connect(self.__projectAct, SIGNAL('triggered()'), self.__doEricapi) - e4App().getObject("Project").addE4Actions([self.__projectAct]) + e5App().getObject("Project").addE4Actions([self.__projectAct]) menu.addAction(self.__projectAct) - self.connect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) return None, True @@ -114,13 +114,13 @@ """ Public method to deactivate this plugin. """ - self.disconnect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - menu = e4App().getObject("Project").getMenu("Apidoc") + menu = e5App().getObject("Project").getMenu("Apidoc") if menu: menu.removeAction(self.__projectAct) - e4App().getObject("Project").removeE4Actions([self.__projectAct]) + e5App().getObject("Project").removeE4Actions([self.__projectAct]) self.__initialize() def __projectShowMenu(self, menuName, menu): @@ -134,14 +134,14 @@ if menuName == "Apidoc": if self.__projectAct is not None: self.__projectAct.setEnabled(\ - e4App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in \ ["Python", "Python3", "Ruby"]) def __doEricapi(self): """ Private slot to perform the eric5-api api generation. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4API") dlg = EricapiConfigDialog(project, parms) if dlg.exec_() == QDialog.Accepted: @@ -171,4 +171,4 @@ if outfile not in project.pdata['OTHERS']: project.pdata['OTHERS'].append(outfile) project.setDirty(True) - project.othersAdded(outfile) + project.othersAdded(outfile) \ No newline at end of file
--- a/Plugins/PluginEricdoc.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginEricdoc.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QApplication -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action @@ -91,7 +91,7 @@ @return tuple of None and activation status (boolean) """ - menu = e4App().getObject("Project").getMenu("Apidoc") + menu = e5App().getObject("Project").getMenu("Apidoc") if menu: self.__projectAct = \ E4Action(self.trUtf8('Generate documentation (eric5-doc)'), @@ -104,10 +104,10 @@ """<p>Generate API documentation using eric5-doc.</p>""" )) self.connect(self.__projectAct, SIGNAL('triggered()'), self.__doEricdoc) - e4App().getObject("Project").addE4Actions([self.__projectAct]) + e5App().getObject("Project").addE4Actions([self.__projectAct]) menu.addAction(self.__projectAct) - self.connect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) return None, True @@ -116,13 +116,13 @@ """ Public method to deactivate this plugin. """ - self.disconnect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - menu = e4App().getObject("Project").getMenu("Apidoc") + menu = e5App().getObject("Project").getMenu("Apidoc") if menu: menu.removeAction(self.__projectAct) - e4App().getObject("Project").removeE4Actions([self.__projectAct]) + e5App().getObject("Project").removeE4Actions([self.__projectAct]) self.__initialize() def __projectShowMenu(self, menuName, menu): @@ -136,14 +136,14 @@ if menuName == "Apidoc": if self.__projectAct is not None: self.__projectAct.setEnabled(\ - e4App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in \ ["Python", "Python3", "Ruby"]) def __doEricdoc(self): """ Private slot to perform the eric5-doc api documentation generation. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4DOC") dlg = EricdocConfigDialog(project.getProjectPath(), parms) if dlg.exec_() == QDialog.Accepted: @@ -177,4 +177,4 @@ if outdir not in project.pdata['OTHERS']: project.pdata['OTHERS'].append(outdir) project.setDirty(True) - project.othersAdded(outdir) + project.othersAdded(outdir) \ No newline at end of file
--- a/Plugins/PluginSyntaxChecker.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginSyntaxChecker.py Tue Jan 12 18:36:05 2010 +0000 @@ -11,7 +11,7 @@ from PyQt4.QtCore import QObject, SIGNAL -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action @@ -70,7 +70,7 @@ @return tuple of None and activation status (boolean) """ - menu = e4App().getObject("Project").getMenu("Checks") + menu = e5App().getObject("Project").getMenu("Checks") if menu: self.__projectAct = E4Action(self.trUtf8('Check Syntax'), self.trUtf8('&Syntax...'), 0, 0, @@ -83,7 +83,7 @@ )) self.connect(self.__projectAct, SIGNAL('triggered()'), self.__projectSyntaxCheck) - e4App().getObject("Project").addE4Actions([self.__projectAct]) + e5App().getObject("Project").addE4Actions([self.__projectAct]) menu.addAction(self.__projectAct) self.__editorAct = E4Action(self.trUtf8('Check Syntax'), @@ -95,16 +95,16 @@ )) self.connect(self.__editorAct, SIGNAL('triggered()'), self.__editorSyntaxCheck) - self.connect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - self.connect(e4App().getObject("ProjectBrowser").getProjectBrowser("sources"), + self.connect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), SIGNAL("showMenu"), self.__projectBrowserShowMenu) - self.connect(e4App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), + self.connect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), self.__editorOpened) - self.connect(e4App().getObject("ViewManager"), SIGNAL("editorClosedEd"), + self.connect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), self.__editorClosed) - for editor in e4App().getObject("ViewManager").getOpenEditors(): + for editor in e5App().getObject("ViewManager").getOpenEditors(): self.__editorOpened(editor) return None, True @@ -113,16 +113,16 @@ """ Public method to deactivate this plugin. """ - self.disconnect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - self.disconnect(e4App().getObject("ProjectBrowser").getProjectBrowser("sources"), + self.disconnect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), SIGNAL("showMenu"), self.__projectBrowserShowMenu) - self.disconnect(e4App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), + self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), self.__editorOpened) - self.disconnect(e4App().getObject("ViewManager"), SIGNAL("editorClosedEd"), + self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), self.__editorClosed) - menu = e4App().getObject("Project").getMenu("Checks") + menu = e5App().getObject("Project").getMenu("Checks") if menu: menu.removeAction(self.__projectAct) @@ -148,7 +148,7 @@ """ if menuName == "Checks" and self.__projectAct is not None: self.__projectAct.setEnabled(\ - e4App().getObject("Project").getProjectLanguage() == "Python3") + e5App().getObject("Project").getProjectLanguage() == "Python3") def __projectBrowserShowMenu(self, menuName, menu): """ @@ -159,7 +159,7 @@ @param menu reference to the menu (QMenu) """ if menuName == "Checks" and \ - e4App().getObject("Project").getProjectLanguage() == "Python3": + e5App().getObject("Project").getProjectLanguage() == "Python3": self.__projectBrowserMenu = menu if self.__projectBrowserAct is None: self.__projectBrowserAct = E4Action(self.trUtf8('Check Syntax'), @@ -178,7 +178,7 @@ """ Public slot used to check the project files for bad indentations. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") project.saveAllScripts() files = [os.path.join(project.ppath, file) \ for file in project.pdata["SOURCES"] \ @@ -193,7 +193,7 @@ Private method to handle the syntax check context menu action of the project sources browser. """ - browser = e4App().getObject("ProjectBrowser").getProjectBrowser("sources") + browser = e5App().getObject("ProjectBrowser").getProjectBrowser("sources") itm = browser.model().item(browser.currentIndex()) try: fn = itm.fileName() @@ -245,9 +245,9 @@ """ Private slot to handle the syntax check context menu action of the editors. """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: self.__editorSyntaxCheckerDialog = SyntaxCheckerDialog() self.__editorSyntaxCheckerDialog.show() self.__editorSyntaxCheckerDialog.start(editor.getFileName(), - editor.text()) + editor.text()) \ No newline at end of file
--- a/Plugins/PluginTabnanny.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginTabnanny.py Tue Jan 12 18:36:05 2010 +0000 @@ -11,7 +11,7 @@ from PyQt4.QtCore import QObject, SIGNAL -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action @@ -70,7 +70,7 @@ @return tuple of None and activation status (boolean) """ - menu = e4App().getObject("Project").getMenu("Checks") + menu = e5App().getObject("Project").getMenu("Checks") if menu: self.__projectAct = E4Action(self.trUtf8('Check Indentations'), self.trUtf8('&Indentations...'), 0, 0, @@ -83,7 +83,7 @@ """ for bad indentations using tabnanny.</p>""" )) self.connect(self.__projectAct, SIGNAL('triggered()'), self.__projectTabnanny) - e4App().getObject("Project").addE4Actions([self.__projectAct]) + e5App().getObject("Project").addE4Actions([self.__projectAct]) menu.addAction(self.__projectAct) self.__editorAct = E4Action(self.trUtf8('Check Indentations'), @@ -96,16 +96,16 @@ )) self.connect(self.__editorAct, SIGNAL('triggered()'), self.__editorTabnanny) - self.connect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - self.connect(e4App().getObject("ProjectBrowser").getProjectBrowser("sources"), + self.connect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), SIGNAL("showMenu"), self.__projectBrowserShowMenu) - self.connect(e4App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), + self.connect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), self.__editorOpened) - self.connect(e4App().getObject("ViewManager"), SIGNAL("editorClosedEd"), + self.connect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), self.__editorClosed) - for editor in e4App().getObject("ViewManager").getOpenEditors(): + for editor in e5App().getObject("ViewManager").getOpenEditors(): self.__editorOpened(editor) return None, True @@ -114,16 +114,16 @@ """ Public method to deactivate this plugin. """ - self.disconnect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - self.disconnect(e4App().getObject("ProjectBrowser").getProjectBrowser("sources"), + self.disconnect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), SIGNAL("showMenu"), self.__projectBrowserShowMenu) - self.disconnect(e4App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), + self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), self.__editorOpened) - self.disconnect(e4App().getObject("ViewManager"), SIGNAL("editorClosedEd"), + self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), self.__editorClosed) - menu = e4App().getObject("Project").getMenu("Checks") + menu = e5App().getObject("Project").getMenu("Checks") if menu: menu.removeAction(self.__projectAct) @@ -149,7 +149,7 @@ """ if menuName == "Checks" and self.__projectAct is not None: self.__projectAct.setEnabled(\ - e4App().getObject("Project").getProjectLanguage() == "Python3") + e5App().getObject("Project").getProjectLanguage() == "Python3") def __projectBrowserShowMenu(self, menuName, menu): """ @@ -160,7 +160,7 @@ @param menu reference to the menu (QMenu) """ if menuName == "Checks" and \ - e4App().getObject("Project").getProjectLanguage() == "Python3": + e5App().getObject("Project").getProjectLanguage() == "Python3": self.__projectBrowserMenu = menu if self.__projectBrowserAct is None: self.__projectBrowserAct = E4Action(self.trUtf8('Check Indentations'), @@ -180,7 +180,7 @@ """ Public slot used to check the project files for bad indentations. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") project.saveAllScripts() files = [os.path.join(project.ppath, file) \ for file in project.pdata["SOURCES"] \ @@ -195,7 +195,7 @@ Private method to handle the tabnanny context menu action of the project sources browser. """ - browser = e4App().getObject("ProjectBrowser").getProjectBrowser("sources") + browser = e5App().getObject("ProjectBrowser").getProjectBrowser("sources") itm = browser.model().item(browser.currentIndex()) try: fn = itm.fileName() @@ -247,11 +247,11 @@ """ Private slot to handle the tabnanny context menu action of the editors. """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: if not editor.checkDirty(): return self.__editorTabnannyDialog = TabnannyDialog() self.__editorTabnannyDialog.show() - self.__editorTabnannyDialog.start(editor.getFileName()) + self.__editorTabnannyDialog.start(editor.getFileName()) \ No newline at end of file
--- a/Plugins/PluginVcsPySvn.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginVcsPySvn.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtGui import QApplication -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import Preferences from Preferences.Shortcuts import readShortcuts @@ -125,7 +125,7 @@ """ Module function to prepare for an uninstallation. """ - if not e4App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): + if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): Preferences.Prefs.settings.remove("Subversion") class VcsPySvnPlugin(object): @@ -149,7 +149,7 @@ from VcsPlugins.vcsPySvn.ProjectHelper import SvnProjectHelper self.__projectHelperObject = SvnProjectHelper(None, None) try: - e4App().registerPluginObject(pluginTypename, self.__projectHelperObject, + e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration @@ -230,4 +230,4 @@ """ Public method to prepare for an uninstallation. """ - e4App().unregisterPluginObject(pluginTypename) + e5App().unregisterPluginObject(pluginTypename) \ No newline at end of file
--- a/Plugins/PluginVcsSubversion.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginVcsSubversion.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtGui import QApplication -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import Preferences from Preferences.Shortcuts import readShortcuts @@ -127,7 +127,7 @@ """ Module function to prepare for an uninstallation. """ - if not e4App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): + if not e5App().getObject("PluginManager").isPluginLoaded("PluginVcsSubversion"): Preferences.Prefs.settings.remove("Subversion") class VcsSubversionPlugin(object): @@ -151,7 +151,7 @@ from VcsPlugins.vcsSubversion.ProjectHelper import SvnProjectHelper self.__projectHelperObject = SvnProjectHelper(None, None) try: - e4App().registerPluginObject(pluginTypename, self.__projectHelperObject, + e5App().registerPluginObject(pluginTypename, self.__projectHelperObject, pluginType) except KeyError: pass # ignore duplicate registration @@ -232,4 +232,4 @@ """ Public method to prepare for an uninstallation. """ - e4App().unregisterPluginObject(pluginTypename) + e5App().unregisterPluginObject(pluginTypename) \ No newline at end of file
--- a/Plugins/PluginWizardPyRegExp.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardPyRegExp.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/PluginWizardQColorDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardQColorDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.ColorDialogWizard.ColorDialogWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/PluginWizardQFileDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardQFileDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.FileDialogWizard.FileDialogWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/PluginWizardQFontDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardQFontDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.FontDialogWizard.FontDialogWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/PluginWizardQInputDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardQInputDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.InputDialogWizard.InputDialogWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/PluginWizardQMessageBox.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardQMessageBox.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/PluginWizardQRegExp.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginWizardQRegExp.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QMessageBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action from WizardPlugins.QRegExpWizard.QRegExpWizardDialog import \ @@ -113,7 +113,7 @@ """ Private method to handle the wizards action """ - editor = e4App().getObject("ViewManager").activeWindow() + editor = e5App().getObject("ViewManager").activeWindow() if editor == None: QMessageBox.critical(None, @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() + editor.endUndoAction() \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper @@ -869,7 +869,7 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("zzz_subversionPage") + e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") def __SVNAddToChangelist(self): """ @@ -909,4 +909,4 @@ for itm in items: if isinstance(itm, ProjectBrowserFileItem): return True - return False + return False \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.ProjectHelper import VcsProjectHelper @@ -618,4 +618,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("zzz_subversionPage") + e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -16,7 +16,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .SvnDialogMixin import SvnDialogMixin from .Ui_SvnDiffDialog import Ui_SvnDiffDialog @@ -186,7 +186,7 @@ cwd = os.getcwd() os.chdir(dname) try: - ppath = e4App().getObject('Project').getProjectPath() + ppath = e5App().getObject('Project').getProjectPath() dname = dname.replace(ppath, '') if dname: dname += "/" @@ -362,4 +362,4 @@ """ self.errorGroup.show() self.errors.insertPlainText(msg) - self.errors.ensureCursorVisible() + self.errors.ensureCursorVisible() \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .SvnConst import svnStatusMap from .SvnDialogMixin import SvnDialogMixin @@ -397,7 +397,7 @@ return if Preferences.getVCS("AutoSaveFiles"): - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") for name in names: vm.saveEditor(name) self.vcs.vcsCommit(names, '') @@ -425,7 +425,7 @@ self.vcs.vcsAdd(names) self.on_refreshButton_clicked() - project = e4App().getObject("Project") + project = e5App().getObject("Project") for name in names: project.getModel().updateVCSStatus(name) @@ -599,4 +599,4 @@ for itm in self.statusList.selectedItems(): if not itm.text(self.__changelistColumn): clitems.append(itm) - return clitems + return clitems \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import pysvn @@ -71,7 +71,7 @@ self.repoRootLabel1.setText(reposRoot) self.repoRootLabel2.setText(reposRoot) else: - ppath = e4App().getObject('Project').getProjectPath() + ppath = e5App().getObject('Project').getProjectPath() if path != ppath: path = path.replace(ppath, '') reposURL = reposURL.replace(path, '') @@ -143,4 +143,4 @@ url1 = self.labelCombo1.currentText() url2 = self.labelCombo2.currentText() - return [url1, url2], self.summaryCheckBox.isChecked() + return [url1, url2], self.summaryCheckBox.isChecked() \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Jan 12 18:36:05 2010 +0000 @@ -16,7 +16,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.VersionControl import VersionControl @@ -877,11 +877,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return self.diff = SvnDiffDialog(self) @@ -1663,11 +1663,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return dlg = SvnRevisionSelectionDialog() @@ -1697,11 +1697,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper @@ -853,7 +853,7 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("zzz_subversionPage") + e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") def __SVNAddToChangelist(self): """ @@ -893,4 +893,4 @@ for itm in items: if isinstance(itm, ProjectBrowserFileItem): return True - return False + return False \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.ProjectHelper import VcsProjectHelper @@ -597,4 +597,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("zzz_subversionPage") + e5App().getObject("UserInterface").showPreferences("zzz_subversionPage") \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_SvnDiffDialog import Ui_SvnDiffDialog @@ -143,7 +143,7 @@ else: dname, fname = self.vcs.splitPath(fn) fnames = [fname] - ppath = e4App().getObject('Project').getProjectPath() + ppath = e5App().getObject('Project').getProjectPath() if dname == ppath: path = "" else: @@ -364,4 +364,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) + QWidget.keyPressEvent(self, evt) \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_SvnStatusDialog import Ui_SvnStatusDialog @@ -507,7 +507,7 @@ return if Preferences.getVCS("AutoSaveFiles"): - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") for name in names: vm.saveEditor(name) self.vcs.vcsCommit(names, '') @@ -535,7 +535,7 @@ self.vcs.vcsAdd(names) self.on_refreshButton_clicked() - project = e4App().getObject("Project") + project = e5App().getObject("Project") for name in names: project.getModel().updateVCSStatus(name) @@ -709,4 +709,4 @@ for itm in self.statusList.selectedItems(): if itm.text(self.__changelistColumn) == "": clitems.append(itm) - return clitems + return clitems \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog @@ -69,7 +69,7 @@ self.repoRootLabel1.setText(reposRoot) self.repoRootLabel2.setText(reposRoot) else: - ppath = e4App().getObject('Project').getProjectPath() + ppath = e5App().getObject('Project').getProjectPath() if path != ppath: path = path.replace(ppath, '') reposURL = reposURL.replace(path, '') @@ -141,4 +141,4 @@ url1 = self.labelCombo1.currentText() url2 = self.labelCombo2.currentText() - return [url1, url2], self.summaryCheckBox.isChecked() + return [url1, url2], self.summaryCheckBox.isChecked() \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.VersionControl import VersionControl @@ -770,11 +770,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return self.diff = SvnDiffDialog(self) @@ -1504,11 +1504,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return dlg = SvnRevisionSelectionDialog() @@ -1537,11 +1537,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return @@ -1818,4 +1818,4 @@ @param interval check interval for the monitor thread in seconds (integer) @return reference to the monitor thread (QThread) """ - return SvnStatusMonitorThread(interval, project.ppath, self) + return SvnStatusMonitorThread(interval, project.ppath, self) \ No newline at end of file
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from ViewManager.ViewManager import ViewManager @@ -199,7 +199,7 @@ self.contextMenuEditor = self.editors[row] if self.contextMenuEditor: self.saveMenuAct.setEnabled(self.contextMenuEditor.isModified()) - self.projectMenuAct.setEnabled(e4App().getObject("Project").isOpen()) + self.projectMenuAct.setEnabled(e5App().getObject("Project").isOpen()) self.__menu.popup(self.viewlist.mapToGlobal(point)) def canCascade(self): @@ -648,4 +648,4 @@ else: self.emit(SIGNAL('changeCaption'), "") - return False + return False \ No newline at end of file
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from ViewManager.ViewManager import ViewManager @@ -263,7 +263,7 @@ self.contextMenuEditor = self.widget(index) if self.contextMenuEditor: self.saveMenuAct.setEnabled(self.contextMenuEditor.isModified()) - self.projectMenuAct.setEnabled(e4App().getObject("Project").isOpen()) + self.projectMenuAct.setEnabled(e5App().getObject("Project").isOpen()) self.contextMenuIndex = index self.leftMenuAct.setEnabled(index > 0) @@ -374,7 +374,7 @@ txt = os.path.basename(fn) else: txt = fn - ppath = e4App().getObject("Project").getProjectPath() + ppath = e5App().getObject("Project").getProjectPath() if ppath: txt = txt.replace(ppath + os.sep, "") @@ -735,7 +735,7 @@ txt = os.path.basename(fn) else: txt = fn - ppath = e4App().getObject("Project").getProjectPath() + ppath = e5App().getObject("Project").getProjectPath() if ppath: txt = txt.replace(ppath + os.sep, "") if len(txt) > self.maxFileNameChars: @@ -775,7 +775,7 @@ txt = os.path.basename(fn) else: txt = fn - ppath = e4App().getObject("Project").getProjectPath() + ppath = e5App().getObject("Project").getProjectPath() if ppath: txt = txt.replace(ppath + os.sep, "") if len(txt) > self.maxFileNameChars: @@ -846,7 +846,7 @@ tabName = os.path.basename(newName) else: tabName = newName - ppath = e4App().getObject("Project").getProjectPath() + ppath = e5App().getObject("Project").getProjectPath() if ppath: tabName = tabName.replace(ppath + os.sep, "") if len(tabName) > self.maxFileNameChars: @@ -1076,7 +1076,7 @@ txt = os.path.basename(fn) else: txt = fn - ppath = e4App().getObject("Project").getProjectPath() + ppath = e5App().getObject("Project").getProjectPath() if ppath: txt = txt.replace(ppath + os.sep, "") if len(txt) > self.maxFileNameChars:
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Completers import E4FileCompleter, E4DirCompleter @@ -291,4 +291,4 @@ @param indString string used for indentation (space or tab) (string) @return generated code (string) """ - return self.__getCode4(indLevel, indString) + return self.__getCode4(indLevel, indString) \ No newline at end of file
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog @@ -194,4 +194,4 @@ @param indString string used for indentation (space or tab) (string) @return generated code (string) """ - return self.__getCode4(indLevel, indString) + return self.__getCode4(indLevel, indString) \ No newline at end of file
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog @@ -318,4 +318,4 @@ if not self.rAbout.isChecked() and not self.rAboutQt.isChecked(): msgdlg += self.__getQt42ButtonCode(istring, indString) msgdlg +=')%s' % os.linesep - return msgdlg + return msgdlg \ No newline at end of file
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_QRegExpWizardDialog import Ui_QRegExpWizardDialog @@ -76,7 +76,7 @@ if fromEric: self.buttonBox.button(QDialogButtonBox.Close).hide() self.copyButton = None - uitype = e4App().getObject("Project").getProjectType() + uitype = e5App().getObject("Project").getProjectType() else: self.copyButton = \ self.buttonBox.addButton(self.trUtf8("Copy"), QDialogButtonBox.ActionRole) @@ -529,4 +529,4 @@ self.resize(size) self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.close) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) \ No newline at end of file
--- a/Preferences/ConfigurationDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ConfigurationDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import QScintilla.Lexers @@ -77,10 +77,10 @@ if not fromEric: from PluginManager.PluginManager import PluginManager try: - self.pluginManager = e4App().getObject("PluginManager") + self.pluginManager = e5App().getObject("PluginManager") except KeyError: self.pluginManager = PluginManager(self) - e4App().registerObject("PluginManager", self.pluginManager) + e5App().registerObject("PluginManager", self.pluginManager) if not helpBrowserMode: self.configItems = { @@ -250,7 +250,7 @@ } self.configItems.update( - e4App().getObject("PluginManager").getPluginConfigData()) + e5App().getObject("PluginManager").getPluginConfigData()) else: self.configItems = { # key : [display string, pixmap name, dialog module name or
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtGui import * from PyQt4.QtNetwork import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Completers import E4FileCompleter, E4DirCompleter @@ -41,7 +41,7 @@ self.execLineEdit.setWhatsThis(t) try: - backends = e4App().getObject("DebugServer").getSupportedLanguages() + backends = e5App().getObject("DebugServer").getSupportedLanguages() for backend in sorted(backends): self.passiveDbgBackendCombo.addItem(backend) except KeyError: @@ -261,4 +261,4 @@ @param dlg reference to the configuration dialog """ page = DebuggerGeneralPage() - return page + return page \ No newline at end of file
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import QDir, pyqtSlot, SIGNAL, QFileInfo from PyQt4.QtGui import QFileDialog, QInputDialog -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Completers import E4FileCompleter from .ConfigurationPageBase import ConfigurationPageBase @@ -42,7 +42,7 @@ self.apiFileCompleter = E4FileCompleter(self.apiFileEdit) # set initial values - self.pluginManager = e4App().getObject("PluginManager") + self.pluginManager = e5App().getObject("PluginManager") self.apiAutoPrepareCheckBox.setChecked(\ Preferences.getEditor("AutoPrepareAPIs")) @@ -257,4 +257,4 @@ @param dlg reference to the configuration dialog """ page = EditorAPIsPage() - return page + return page \ No newline at end of file
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py Tue Jan 12 18:36:05 2010 +0000 @@ -9,7 +9,7 @@ from PyQt4.QtCore import pyqtSlot -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .ConfigurationPageBase import ConfigurationPageBase from .Ui_ProjectBrowserPage import Ui_ProjectBrowserPage @@ -39,7 +39,7 @@ self.projectTypeCombo.addItem('', '') self.__projectBrowserFlags = {'' : 0} try: - projectTypes = e4App().getObject("Project").getProjectTypes() + projectTypes = e5App().getObject("Project").getProjectTypes() for projectType in sorted(projectTypes.keys()): self.projectTypeCombo.addItem(projectTypes[projectType], projectType) @@ -147,4 +147,4 @@ @param dlg reference to the configuration dialog """ page = ProjectBrowserPage() - return page + return page \ No newline at end of file
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ConfigurationPages/ViewmanagerPage.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import pyqtSlot from PyQt4.QtGui import QPixmap -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .ConfigurationPageBase import ConfigurationPageBase from .Ui_ViewmanagerPage import Ui_ViewmanagerPage @@ -34,7 +34,7 @@ self.setObjectName("ViewmanagerPage") # set initial values - self.pluginManager = e4App().getObject("PluginManager") + self.pluginManager = e5App().getObject("PluginManager") self.viewmanagers = self.pluginManager.getPluginDisplayStrings("viewmanager") self.windowComboBox.clear() currentVm = Preferences.getViewManager()
--- a/Preferences/ProgramsDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ProgramsDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtGui import QApplication, QTreeWidgetItem, QHeaderView, QCursor, \ QDialog, QDialogButtonBox -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_ProgramsDialog import Ui_ProgramsDialog @@ -170,7 +170,7 @@ self.__createEntry(self.trUtf8("Spell Checker - PyEnchant"), text, version) # do the plugin related programs - pm = e4App().getObject("PluginManager") + pm = e5App().getObject("PluginManager") for info in pm.getPluginExeDisplayData(): if info["programEntry"]: self.__createProgramEntry( @@ -277,4 +277,4 @@ itm.setText(1, self.trUtf8("(not found)")) QApplication.processEvents() self.programsList.header().resizeSections(QHeaderView.ResizeToContents) - self.programsList.header().setStretchLastSection(True) + self.programsList.header().setStretchLastSection(True) \ No newline at end of file
--- a/Preferences/Shortcuts.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/Shortcuts.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from Preferences import Prefs, syncPreferences @@ -49,45 +49,45 @@ @keyparam pluginName name of the plugin for which to load shortcuts (string) """ if helpViewer is None and pluginName is None: - for act in e4App().getObject("Project").getActions(): + for act in e5App().getObject("Project").getActions(): __readShortcut(act, "Project", prefClass) - for act in e4App().getObject("UserInterface").getActions('ui'): + for act in e5App().getObject("UserInterface").getActions('ui'): __readShortcut(act, "General", prefClass) - for act in e4App().getObject("UserInterface").getActions('wizards'): + for act in e5App().getObject("UserInterface").getActions('wizards'): __readShortcut(act, "Wizards", prefClass) - for act in e4App().getObject("DebugUI").getActions(): + for act in e5App().getObject("DebugUI").getActions(): __readShortcut(act, "Debug", prefClass) - for act in e4App().getObject("ViewManager").getActions('edit'): + for act in e5App().getObject("ViewManager").getActions('edit'): __readShortcut(act, "Edit", prefClass) - for act in e4App().getObject("ViewManager").getActions('file'): + for act in e5App().getObject("ViewManager").getActions('file'): __readShortcut(act, "File", prefClass) - for act in e4App().getObject("ViewManager").getActions('search'): + for act in e5App().getObject("ViewManager").getActions('search'): __readShortcut(act, "Search", prefClass) - for act in e4App().getObject("ViewManager").getActions('view'): + for act in e5App().getObject("ViewManager").getActions('view'): __readShortcut(act, "View", prefClass) - for act in e4App().getObject("ViewManager").getActions('macro'): + for act in e5App().getObject("ViewManager").getActions('macro'): __readShortcut(act, "Macro", prefClass) - for act in e4App().getObject("ViewManager").getActions('bookmark'): + for act in e5App().getObject("ViewManager").getActions('bookmark'): __readShortcut(act, "Bookmarks", prefClass) - for act in e4App().getObject("ViewManager").getActions('spelling'): + for act in e5App().getObject("ViewManager").getActions('spelling'): __readShortcut(act, "Spelling", prefClass) - actions = e4App().getObject("ViewManager").getActions('window') + actions = e5App().getObject("ViewManager").getActions('window') if actions: for act in actions: __readShortcut(act, "Window", prefClass) - for category, ref in e4App().getPluginObjects(): + for category, ref in e5App().getPluginObjects(): if hasattr(ref, "getActions"): actions = ref.getActions() for act in actions: @@ -99,7 +99,7 @@ if pluginName is not None: try: - ref = e4App().getPluginObject(pluginName) + ref = e5App().getPluginObject(pluginName) if hasattr(ref, "getActions"): actions = ref.getActions() for act in actions: @@ -136,51 +136,51 @@ prefClass.settings.endGroup() # step 2: save the various shortcuts - for act in e4App().getObject("Project").getActions(): + for act in e5App().getObject("Project").getActions(): __saveShortcut(act, "Project", prefClass) - for act in e4App().getObject("UserInterface").getActions('ui'): + for act in e5App().getObject("UserInterface").getActions('ui'): __saveShortcut(act, "General", prefClass) - for act in e4App().getObject("UserInterface").getActions('wizards'): + for act in e5App().getObject("UserInterface").getActions('wizards'): __saveShortcut(act, "Wizards", prefClass) - for act in e4App().getObject("DebugUI").getActions(): + for act in e5App().getObject("DebugUI").getActions(): __saveShortcut(act, "Debug", prefClass) - for act in e4App().getObject("ViewManager").getActions('edit'): + for act in e5App().getObject("ViewManager").getActions('edit'): __saveShortcut(act, "Edit", prefClass) - for act in e4App().getObject("ViewManager").getActions('file'): + for act in e5App().getObject("ViewManager").getActions('file'): __saveShortcut(act, "File", prefClass) - for act in e4App().getObject("ViewManager").getActions('search'): + for act in e5App().getObject("ViewManager").getActions('search'): __saveShortcut(act, "Search", prefClass) - for act in e4App().getObject("ViewManager").getActions('view'): + for act in e5App().getObject("ViewManager").getActions('view'): __saveShortcut(act, "View", prefClass) - for act in e4App().getObject("ViewManager").getActions('macro'): + for act in e5App().getObject("ViewManager").getActions('macro'): __saveShortcut(act, "Macro", prefClass) - for act in e4App().getObject("ViewManager").getActions('bookmark'): + for act in e5App().getObject("ViewManager").getActions('bookmark'): __saveShortcut(act, "Bookmarks", prefClass) - for act in e4App().getObject("ViewManager").getActions('spelling'): + for act in e5App().getObject("ViewManager").getActions('spelling'): __saveShortcut(act, "Spelling", prefClass) - actions = e4App().getObject("ViewManager").getActions('window') + actions = e5App().getObject("ViewManager").getActions('window') if actions: for act in actions: __saveShortcut(act, "Window", prefClass) - for category, ref in e4App().getPluginObjects(): + for category, ref in e5App().getPluginObjects(): if hasattr(ref, "getActions"): actions = ref.getActions() for act in actions: __saveShortcut(act, category, prefClass) - for act in e4App().getObject("DummyHelpViewer").getActions(): + for act in e5App().getObject("DummyHelpViewer").getActions(): __saveShortcut(act, "HelpViewer", prefClass) def exportShortcuts(fn): @@ -343,59 +343,59 @@ read from a XML file """ if "Project" in shortcuts: - __setAction(e4App().getObject("Project").getActions(), + __setAction(e5App().getObject("Project").getActions(), shortcuts["Project"]) if "General" in shortcuts: - __setAction(e4App().getObject("UserInterface").getActions('ui'), + __setAction(e5App().getObject("UserInterface").getActions('ui'), shortcuts["General"]) if "Wizards" in shortcuts: - __setAction(e4App().getObject("UserInterface").getActions('wizards'), + __setAction(e5App().getObject("UserInterface").getActions('wizards'), shortcuts["Wizards"]) if "Debug" in shortcuts: - __setAction(e4App().getObject("DebugUI").getActions(), + __setAction(e5App().getObject("DebugUI").getActions(), shortcuts["Debug"]) if "Edit" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('edit'), + __setAction(e5App().getObject("ViewManager").getActions('edit'), shortcuts["Edit"]) if "File" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('file'), + __setAction(e5App().getObject("ViewManager").getActions('file'), shortcuts["File"]) if "Search" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('search'), + __setAction(e5App().getObject("ViewManager").getActions('search'), shortcuts["Search"]) if "View" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('view'), + __setAction(e5App().getObject("ViewManager").getActions('view'), shortcuts["View"]) if "Macro" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('macro'), + __setAction(e5App().getObject("ViewManager").getActions('macro'), shortcuts["Macro"]) if "Bookmarks" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('bookmark'), + __setAction(e5App().getObject("ViewManager").getActions('bookmark'), shortcuts["Bookmarks"]) if "Spelling" in shortcuts: - __setAction(e4App().getObject("ViewManager").getActions('spelling'), + __setAction(e5App().getObject("ViewManager").getActions('spelling'), shortcuts["Spelling"]) if "Window" in shortcuts: - actions = e4App().getObject("ViewManager").getActions('window') + actions = e5App().getObject("ViewManager").getActions('window') if actions: __setAction(actions, shortcuts["Window"]) - for category, ref in e4App().getPluginObjects(): + for category, ref in e5App().getPluginObjects(): if category in shortcuts and hasattr(ref, "getActions"): actions = ref.getActions() __setAction(actions, shortcuts[category]) if "HelpViewer" in shortcuts: - __setAction(e4App().getObject("DummyHelpViewer").getActions(), + __setAction(e5App().getObject("DummyHelpViewer").getActions(), shortcuts["HelpViewer"]) \ No newline at end of file
--- a/Preferences/ShortcutsDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Preferences/ShortcutsDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_ShortcutsDialog import Ui_ShortcutsDialog from .ShortcutDialog import ShortcutDialog @@ -109,72 +109,72 @@ self.actionButton.setChecked(True) # let the plugin manager create on demand plugin objects - pm = e4App().getObject("PluginManager") + pm = e5App().getObject("PluginManager") pm.initOnDemandPlugins() # populate the various lists self.projectItem = self.__generateCategoryItem(self.trUtf8("Project")) - for act in e4App().getObject("Project").getActions(): + for act in e5App().getObject("Project").getActions(): self.__generateShortcutItem(self.projectItem, act) self.uiItem = self.__generateCategoryItem(self.trUtf8("General")) - for act in e4App().getObject("UserInterface").getActions('ui'): + for act in e5App().getObject("UserInterface").getActions('ui'): self.__generateShortcutItem(self.uiItem, act) self.wizardsItem = self.__generateCategoryItem(self.trUtf8("Wizards")) - for act in e4App().getObject("UserInterface").getActions('wizards'): + for act in e5App().getObject("UserInterface").getActions('wizards'): self.__generateShortcutItem(self.wizardsItem, act) self.debugItem = self.__generateCategoryItem(self.trUtf8("Debug")) - for act in e4App().getObject("DebugUI").getActions(): + for act in e5App().getObject("DebugUI").getActions(): self.__generateShortcutItem(self.debugItem, act) self.editItem = self.__generateCategoryItem(self.trUtf8("Edit")) - for act in e4App().getObject("ViewManager").getActions('edit'): + for act in e5App().getObject("ViewManager").getActions('edit'): self.__generateShortcutItem(self.editItem, act) self.fileItem = self.__generateCategoryItem(self.trUtf8("File")) - for act in e4App().getObject("ViewManager").getActions('file'): + for act in e5App().getObject("ViewManager").getActions('file'): self.__generateShortcutItem(self.fileItem, act) self.searchItem = self.__generateCategoryItem(self.trUtf8("Search")) - for act in e4App().getObject("ViewManager").getActions('search'): + for act in e5App().getObject("ViewManager").getActions('search'): self.__generateShortcutItem(self.searchItem, act) self.viewItem = self.__generateCategoryItem(self.trUtf8("View")) - for act in e4App().getObject("ViewManager").getActions('view'): + for act in e5App().getObject("ViewManager").getActions('view'): self.__generateShortcutItem(self.viewItem, act) self.macroItem = self.__generateCategoryItem(self.trUtf8("Macro")) - for act in e4App().getObject("ViewManager").getActions('macro'): + for act in e5App().getObject("ViewManager").getActions('macro'): self.__generateShortcutItem(self.macroItem, act) self.bookmarkItem = self.__generateCategoryItem(self.trUtf8("Bookmarks")) - for act in e4App().getObject("ViewManager").getActions('bookmark'): + for act in e5App().getObject("ViewManager").getActions('bookmark'): self.__generateShortcutItem(self.bookmarkItem, act) self.spellingItem = self.__generateCategoryItem(self.trUtf8("Spelling")) - for act in e4App().getObject("ViewManager").getActions('spelling'): + for act in e5App().getObject("ViewManager").getActions('spelling'): self.__generateShortcutItem(self.spellingItem, act) - actions = e4App().getObject("ViewManager").getActions('window') + actions = e5App().getObject("ViewManager").getActions('window') if actions: self.windowItem = self.__generateCategoryItem(self.trUtf8("Window")) for act in actions: self.__generateShortcutItem(self.windowItem, act) self.pluginCategoryItems = [] - for category, ref in e4App().getPluginObjects(): + for category, ref in e5App().getPluginObjects(): if hasattr(ref, "getActions"): categoryItem = self.__generateCategoryItem(category) - objectType = e4App().getPluginObjectType(category) + objectType = e5App().getPluginObjectType(category) for act in ref.getActions(): self.__generateShortcutItem(categoryItem, act, objectType = objectType) self.pluginCategoryItems.append(categoryItem) self.helpViewerItem = self.__generateCategoryItem(self.trUtf8("Web Browser")) - for act in e4App().getObject("DummyHelpViewer").getActions(): + for act in e5App().getObject("DummyHelpViewer").getActions(): self.__generateShortcutItem(self.helpViewerItem, act, True) self.__resort() @@ -369,40 +369,40 @@ Private slot to handle the OK button press. """ self.__saveCategoryActions(self.projectItem, - e4App().getObject("Project").getActions()) + e5App().getObject("Project").getActions()) self.__saveCategoryActions(self.uiItem, - e4App().getObject("UserInterface").getActions('ui')) + e5App().getObject("UserInterface").getActions('ui')) self.__saveCategoryActions(self.wizardsItem, - e4App().getObject("UserInterface").getActions('wizards')) + e5App().getObject("UserInterface").getActions('wizards')) self.__saveCategoryActions(self.debugItem, - e4App().getObject("DebugUI").getActions()) + e5App().getObject("DebugUI").getActions()) self.__saveCategoryActions(self.editItem, - e4App().getObject("ViewManager").getActions('edit')) + e5App().getObject("ViewManager").getActions('edit')) self.__saveCategoryActions(self.fileItem, - e4App().getObject("ViewManager").getActions('file')) + e5App().getObject("ViewManager").getActions('file')) self.__saveCategoryActions(self.searchItem, - e4App().getObject("ViewManager").getActions('search')) + e5App().getObject("ViewManager").getActions('search')) self.__saveCategoryActions(self.viewItem, - e4App().getObject("ViewManager").getActions('view')) + e5App().getObject("ViewManager").getActions('view')) self.__saveCategoryActions(self.macroItem, - e4App().getObject("ViewManager").getActions('macro')) + e5App().getObject("ViewManager").getActions('macro')) self.__saveCategoryActions(self.bookmarkItem, - e4App().getObject("ViewManager").getActions('bookmark')) + e5App().getObject("ViewManager").getActions('bookmark')) self.__saveCategoryActions(self.spellingItem, - e4App().getObject("ViewManager").getActions('spelling')) + e5App().getObject("ViewManager").getActions('spelling')) - actions = e4App().getObject("ViewManager").getActions('window') + actions = e5App().getObject("ViewManager").getActions('window') if actions: self.__saveCategoryActions(self.windowItem, actions) for categoryItem in self.pluginCategoryItems: category = categoryItem.text(0) - ref = e4App().getPluginObject(category) + ref = e5App().getPluginObject(category) if ref is not None and hasattr(ref, "getActions"): self.__saveCategoryActions(categoryItem, ref.getActions()) self.__saveCategoryActions(self.helpViewerItem, - e4App().getObject("DummyHelpViewer").getActions()) + e5App().getObject("DummyHelpViewer").getActions()) Shortcuts.saveShortcuts() Preferences.syncPreferences()
--- a/Project/CreateDialogCodeDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/CreateDialogCodeDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtGui import * from PyQt4 import uic -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .NewDialogClassDialog import NewDialogClassDialog from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog @@ -67,7 +67,7 @@ self.__module = None if os.path.exists(self.srcFile): - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") ed = vm.getOpenEditor(self.srcFile) if ed and not vm.checkDirty(ed): self.__initError = True @@ -462,4 +462,4 @@ """ if button == self.okButton: self.__generateCode() - self.accept() + self.accept() \ No newline at end of file
--- a/Project/Project.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/Project.py Tue Jan 12 18:36:05 2010 +0000 @@ -21,7 +21,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from Globals import recentNameProject @@ -2327,7 +2327,7 @@ # check, if the existing project directory is already under # VCS control - pluginManager = e4App().getObject("PluginManager") + pluginManager = e5App().getObject("PluginManager") for indicator, vcsData in list(pluginManager.getVcsSystemIndicators().items()): if os.path.exists(os.path.join(self.ppath, indicator)): if len(vcsData) > 1: @@ -2388,7 +2388,7 @@ # put the project under VCS control if self.vcs is None: - vcsSystemsDict = e4App().getObject("PluginManager")\ + vcsSystemsDict = e5App().getObject("PluginManager")\ .getPluginDisplayStrings("version_control") vcsSystemsDisplay = [self.trUtf8("None")] keys = sorted(vcsSystemsDict.keys()) @@ -2597,7 +2597,7 @@ self.__statusMonitorStatus) self.vcs.vcsShutdown() self.vcs = None - e4App().getObject("PluginManager").deactivateVcsPlugins() + e5App().getObject("PluginManager").deactivateVcsPlugins() # reinit VCS self.vcs = self.initVCS() # start the VCS monitor thread @@ -2709,7 +2709,7 @@ self.vcs = self.initVCS() if self.vcs is None: # check, if project is version controlled - pluginManager = e4App().getObject("PluginManager") + pluginManager = e5App().getObject("PluginManager") for indicator, vcsData in \ list(pluginManager.getVcsSystemIndicators().items()): if os.path.exists(os.path.join(self.ppath, indicator)): @@ -2948,7 +2948,7 @@ self.__writeDebugProperties(True) # now save all open modified files of the project - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") success = True for fn in vm.getOpenFilenames(): if self.isProjectFile(fn): @@ -2976,7 +2976,7 @@ if self.vcs: self.vcs.vcsShutdown() self.vcs = None - e4App().getObject("PluginManager").deactivateVcsPlugins() + e5App().getObject("PluginManager").deactivateVcsPlugins() # now close all project related windows self.__closeAllWindows() @@ -3015,7 +3015,7 @@ for syntax errors (boolean) @return flag indicating success (boolean) """ - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") success = True filesWithSyntaxErrors = 0 for fn in vm.getOpenFilenames():
--- a/Project/ProjectBaseBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/ProjectBaseBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from UI.Browser import * @@ -643,4 +643,4 @@ """ Protected method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("projectBrowserPage") + e5App().getObject("UserInterface").showPreferences("projectBrowserPage") \ No newline at end of file
--- a/Project/ProjectFormsBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/ProjectFormsBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .ProjectBrowserModel import ProjectBrowserFileItem, \ ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ @@ -608,7 +608,7 @@ @param exitStatus exit status of the process (QProcess.ExitStatus) """ self.compileRunning = False - e4App().getObject("ViewManager").enableEditorsCheckFocusIn(True) + e5App().getObject("ViewManager").enableEditorsCheckFocusIn(True) if exitStatus == QProcess.NormalExit and exitCode == 0 and self.buf: ofn = os.path.join(self.project.ppath, self.compiledFile) try: @@ -700,7 +700,7 @@ procStarted = self.compileProc.waitForStarted() if procStarted: self.compileRunning = True - e4App().getObject("ViewManager").enableEditorsCheckFocusIn(False) + e5App().getObject("ViewManager").enableEditorsCheckFocusIn(False) return self.compileProc else: self.compileRunning = False @@ -908,4 +908,4 @@ "compileSelectedForms" : None, "generateDialogCode" : None, "newForm" : None, - } + } \ No newline at end of file
--- a/Project/ProjectInterfacesBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/ProjectInterfacesBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .ProjectBrowserModel import ProjectBrowserFileItem, \ ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ @@ -581,4 +581,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("corbaPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("corbaPage") \ No newline at end of file
--- a/Project/ProjectResourcesBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/ProjectResourcesBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .ProjectBrowserModel import ProjectBrowserFileItem, \ ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ @@ -506,7 +506,7 @@ @param exitStatus exit status of the process (QProcess.ExitStatus) """ self.compileRunning = False - e4App().getObject("ViewManager").enableEditorsCheckFocusIn(True) + e5App().getObject("ViewManager").enableEditorsCheckFocusIn(True) if exitStatus == QProcess.NormalExit and exitCode == 0 and self.buf: ofn = os.path.join(self.project.ppath, self.compiledFile) try: @@ -599,7 +599,7 @@ procStarted = self.compileProc.waitForStarted() if procStarted: self.compileRunning = True - e4App().getObject("ViewManager").enableEditorsCheckFocusIn(False) + e5App().getObject("ViewManager").enableEditorsCheckFocusIn(False) return self.compileProc else: self.compileRunning = False @@ -815,4 +815,4 @@ "compileChangedResources" : None, "compileSelectedResources" : None, "newResource" : None, - } + } \ No newline at end of file
--- a/Project/ProjectSourcesBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/ProjectSourcesBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from UI.BrowserModel import BrowserFileItem, BrowserClassItem, BrowserMethodItem, \ BrowserClassAttributeItem @@ -884,4 +884,4 @@ QMessageBox.Yes) self.applicationDiagram = ApplicationDiagram(self.project, self, noModules = (res != QMessageBox.Yes)) - self.applicationDiagram.show() + self.applicationDiagram.show() \ No newline at end of file
--- a/Project/ProjectTranslationsBrowser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/ProjectTranslationsBrowser.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .ProjectBrowserModel import ProjectBrowserFileItem, \ ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \ @@ -1106,4 +1106,4 @@ "generateSelectedWithObsolete" : None, "releaseAll" : None, "releaseSelected" : None, - } + } \ No newline at end of file
--- a/Project/PropertiesDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/PropertiesDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Completers import E4FileCompleter, E4DirCompleter @@ -52,7 +52,7 @@ self.mainscriptCompleter = E4FileCompleter(self.mainscriptEdit) projectLanguages = sorted( - e4App().getObject("DebugServer").getSupportedLanguages()) + e5App().getObject("DebugServer").getSupportedLanguages()) self.languageComboBox.addItems(projectLanguages) projectTypes = project.getProjectTypes() @@ -97,7 +97,7 @@ pass self.vcsLabel.show() if self.project.vcs is not None: - vcsSystemsDict = e4App().getObject("PluginManager")\ + vcsSystemsDict = e5App().getObject("PluginManager")\ .getPluginDisplayStrings("version_control") try: vcsSystemDisplay = vcsSystemsDict[self.project.pdata["VCS"][0]] @@ -257,4 +257,4 @@ self.spellPropertiesDlg.storeData() if self.transPropertiesDlg is not None: - self.transPropertiesDlg.storeData() + self.transPropertiesDlg.storeData() \ No newline at end of file
--- a/Project/UserPropertiesDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Project/UserPropertiesDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -10,7 +10,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import Preferences @@ -45,7 +45,7 @@ enableVcsGroup = False if self.project.pdata["VCS"]: found = False - for indicator, vcsData in list(e4App().getObject("PluginManager")\ + for indicator, vcsData in list(e5App().getObject("PluginManager")\ .getVcsSystemIndicators().items()): for vcsSystem, vcsSystemDisplay in vcsData: if vcsSystem == self.project.pdata["VCS"][0]: @@ -91,4 +91,4 @@ if vcsSystem != self.project.pdata["VCS"][0]: self.project.pudata["VCSOVERRIDE"] = [vcsSystem] else: - self.project.pudata["VCSOVERRIDE"] = [] + self.project.pudata["VCSOVERRIDE"] = [] \ No newline at end of file
--- a/PyUnit/UnittestDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/PyUnit/UnittestDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -17,7 +17,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Completers import E4FileCompleter from .Ui_UnittestDialog import Ui_UnittestDialog @@ -228,7 +228,7 @@ if self.dbs and not self.localCheckBox.isChecked(): # we are cooperating with the eric5 IDE - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(prog): mainScript = project.getMainScript(True) else: @@ -268,7 +268,7 @@ if self.coverageCheckBox.isChecked(): if self.dbs: # we are cooperating with the eric5 IDE - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(prog): mainScript = project.getMainScript(True) else: @@ -592,4 +592,4 @@ QApplication.exit() return True - return False + return False \ No newline at end of file
--- a/QScintilla/Editor.py Tue Jan 12 18:33:34 2010 +0000 +++ b/QScintilla/Editor.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from . import Exporters from . import Lexers @@ -1279,7 +1279,7 @@ self.disconnect(self, SIGNAL("SCN_STYLENEEDED(int)"), self.__styleNeeded) language = "" - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectFile(filename): language = project.getEditorLexerAssoc(os.path.basename(filename)) if not language: @@ -1974,7 +1974,7 @@ Public slot to print the text. """ printer = Printer(mode = QPrinter.HighResolution) - sb = e4App().getObject("UserInterface").statusBar() + sb = e5App().getObject("UserInterface").statusBar() printDialog = QPrintDialog(printer, self) if self.hasSelectedText(): printDialog.addEnabledOption(QAbstractPrintDialog.PrintSelection) @@ -3779,7 +3779,7 @@ coEnable = False # first check if the file belongs to a project - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(self.fileName): fn = project.getMainScript(True) if fn is not None: @@ -3823,7 +3823,7 @@ """ Private slot handling the aboutToShow signal of the diagrams context menu. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(self.fileName): self.applicationDiagramMenuAct.setEnabled(True) else: @@ -4023,7 +4023,7 @@ # first check if the file belongs to a project and there is # a project coverage file - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(self.fileName): fn = project.getMainScript(True) if fn is not None: @@ -4162,7 +4162,7 @@ # first check if the file belongs to a project and there is # a project profile file - project = e4App().getObject("Project") + project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(self.fileName): fn = project.getMainScript(True) if fn is not None: @@ -4535,7 +4535,7 @@ SIGNAL("rowsInserted(const QModelIndex &, int, int)"), self.__addBreakPoints) - self.disconnect(e4App().getObject("Project"), SIGNAL("projectPropertiesChanged"), + self.disconnect(e5App().getObject("Project"), SIGNAL("projectPropertiesChanged"), self.__projectPropertiesChanged) if self.spell: @@ -4982,7 +4982,7 @@ QMessageBox.No | \ QMessageBox.Yes), QMessageBox.Yes) - self.applicationDiagram = ApplicationDiagram(e4App().getObject("Project"), + self.applicationDiagram = ApplicationDiagram(e5App().getObject("Project"), self, noModules = (res == QMessageBox.No)) self.applicationDiagram.show() @@ -5013,12 +5013,12 @@ line, index = self.getCursorPosition() tmplName = self.getWordLeft(line, index) if tmplName: - if e4App().getObject("TemplateViewer").hasTemplate(tmplName): + if e5App().getObject("TemplateViewer").hasTemplate(tmplName): self.__applyTemplate(tmplName) return else: templateNames = \ - e4App().getObject("TemplateViewer").getTemplateNames(tmplName) + e5App().getObject("TemplateViewer").getTemplateNames(tmplName) if len(templateNames) == 1: self.__applyTemplate(templateNames[0]) return @@ -5045,9 +5045,9 @@ @param templateName name of the template to apply (string) """ - if e4App().getObject("TemplateViewer").hasTemplate(templateName): + if e5App().getObject("TemplateViewer").hasTemplate(templateName): self.extendSelectionWordLeft() - e4App().getObject("TemplateViewer").applyNamedTemplate(templateName) + e5App().getObject("TemplateViewer").applyNamedTemplate(templateName) ####################################################################### ## Project related methods @@ -5057,7 +5057,7 @@ """ Private slot to handle changes of the project properties. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if self.spell: pwl, pel = project.getProjectDictionaries() self.__setSpellingLanguage(project.getProjectSpellLanguage(), @@ -5067,7 +5067,7 @@ """ Public method to signal, that this editor has been added to a project. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if self.spell: pwl, pel = project.getProjectDictionaries() self.__setSpellingLanguage(project.getProjectSpellLanguage(), @@ -5101,7 +5101,7 @@ self.spell = SpellChecker(self, self.spellingIndicator, checkRegion = self.isSpellCheckRegion) self.setSpellingForProject() - self.connect(e4App().getObject("Project"), SIGNAL("projectPropertiesChanged"), + self.connect(e5App().getObject("Project"), SIGNAL("projectPropertiesChanged"), self.__projectPropertiesChanged) self.spell.setMinimumWordSize( Preferences.getEditor("SpellCheckingMinWordSize")) @@ -5116,7 +5116,7 @@ Public method to set the spell checking options for files belonging to the current project. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") if self.fileName and \ project.isOpen() and \ project.isProjectSource(self.fileName): @@ -5265,4 +5265,4 @@ word = self.getWord(line, index) self.spell.ignoreAlways(word) if Preferences.getEditor("AutoSpellCheckingEnabled"): - self.spell.checkDocumentIncrementally() + self.spell.checkDocumentIncrementally() \ No newline at end of file
--- a/QScintilla/MiniEditor.py Tue Jan 12 18:33:34 2010 +0000 +++ b/QScintilla/MiniEditor.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtGui import * from PyQt4.Qsci import QsciScintilla -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action, createActionGroup from . import Lexers @@ -2297,4 +2297,4 @@ fileEol = self.__textEdit.detectEolString(txt) self.__textEdit.setEolModeByEolString(fileEol) - self.__textEdit.setModified(False) + self.__textEdit.setModified(False) \ No newline at end of file
--- a/QScintilla/Shell.py Tue Jan 12 18:33:34 2010 +0000 +++ b/QScintilla/Shell.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtGui import * from PyQt4.Qsci import QsciScintilla -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from . import Lexers from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION @@ -1429,4 +1429,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("shellPage") + e5App().getObject("UserInterface").showPreferences("shellPage") \ No newline at end of file
--- a/QScintilla/Terminal.py Tue Jan 12 18:33:34 2010 +0000 +++ b/QScintilla/Terminal.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtGui import * from PyQt4.Qsci import QsciScintilla -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from . import Lexers from .QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION @@ -927,4 +927,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("terminalPage") + e5App().getObject("UserInterface").showPreferences("terminalPage") \ No newline at end of file
--- a/Tasks/TaskViewer.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Tasks/TaskViewer.py Tue Jan 12 18:36:05 2010 +0000 @@ -18,7 +18,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .TaskPropertiesDialog import TaskPropertiesDialog from .TaskFilterConfigDialog import TaskFilterConfigDialog @@ -811,4 +811,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("tasksPage") + e5App().getObject("UserInterface").showPreferences("tasksPage") \ No newline at end of file
--- a/Templates/TemplateViewer.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Templates/TemplateViewer.py Tue Jan 12 18:36:05 2010 +0000 @@ -16,7 +16,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .TemplatePropertiesDialog import TemplatePropertiesDialog from .TemplateMultipleVariablesDialog import TemplateMultipleVariablesDialog @@ -33,7 +33,7 @@ import UI.PixmapCache import Utilities -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App class TemplateGroup(QTreeWidgetItem): """ @@ -584,7 +584,7 @@ @return dictionary of predefined variables and their values """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") editor = self.viewmanager.activeWindow() today = datetime.datetime.now().date() sepchar = Preferences.getTemplates("SeparatorChar") @@ -877,7 +877,7 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("templatesPage") + e5App().getObject("UserInterface").showPreferences("templatesPage") def hasTemplate(self, entryName): """
--- a/UI/Browser.py Tue Jan 12 18:33:34 2010 +0000 +++ b/UI/Browser.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .BrowserModel import BrowserModel, \ BrowserDirectoryItem, BrowserFileItem, BrowserClassItem, BrowserMethodItem, \ @@ -431,7 +431,7 @@ index = self.currentIndex() searchDir = self.model().item(index).dirName() - findFilesDialog = e4App().getObject("FindFilesDialog") + findFilesDialog = e5App().getObject("FindFilesDialog") findFilesDialog.setSearchDirectory(searchDir) findFilesDialog.show() findFilesDialog.raise_() @@ -444,7 +444,7 @@ index = self.currentIndex() searchDir = self.model().item(index).dirName() - replaceFilesDialog = e4App().getObject("ReplaceFilesDialog") + replaceFilesDialog = e5App().getObject("ReplaceFilesDialog") replaceFilesDialog.setSearchDirectory(searchDir) replaceFilesDialog.show() replaceFilesDialog.raise_() @@ -544,6 +544,6 @@ Private method to open the configuration dialog. """ if self.__embeddedBrowser == 1: - e4App().getObject("UserInterface").showPreferences("debuggerGeneralPage") + e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") elif self.__embeddedBrowser == 2: - e4App().getObject("UserInterface").showPreferences("projectBrowserPage") + e5App().getObject("UserInterface").showPreferences("projectBrowserPage") \ No newline at end of file
--- a/UI/FindFileDialog.py Tue Jan 12 18:33:34 2010 +0000 +++ b/UI/FindFileDialog.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from .Ui_FindFileDialog import Ui_FindFileDialog @@ -253,7 +253,7 @@ """ Private slot to handle the find button being pressed. """ - if self.__replaceMode and not e4App().getObject("ViewManager").checkAllDirty(): + if self.__replaceMode and not e5App().getObject("ViewManager").checkAllDirty(): return self.__cancelSearch = False @@ -300,7 +300,7 @@ files = self.__getFileList(os.path.abspath(self.dirEdit.text()), filterRe) elif self.openFilesButton.isChecked(): - files = e4App().getObject("ViewManager").getOpenFilenames() + files = e5App().getObject("ViewManager").getOpenFilenames() self.findList.clear() QApplication.processEvents() @@ -597,4 +597,4 @@ fn = itm.text(0) cb = QApplication.clipboard() - cb.setText(fn) + cb.setText(fn) \ No newline at end of file
--- a/UI/LogView.py Tue Jan 12 18:33:34 2010 +0000 +++ b/UI/LogView.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from E4Gui.E4TabWidget import E4TabWidget -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import UI.PixmapCache import Preferences @@ -105,4 +105,4 @@ """ Private method to open the configuration dialog. """ - e4App().getObject("UserInterface").showPreferences("interfacePage") + e5App().getObject("UserInterface").showPreferences("interfacePage") \ No newline at end of file
--- a/UI/UserInterface.py Tue Jan 12 18:33:34 2010 +0000 +++ b/UI/UserInterface.py Tue Jan 12 18:36:05 2010 +0000 @@ -17,7 +17,7 @@ from PyQt4.Qsci import QSCINTILLA_VERSION_STR from PyQt4.QtNetwork import QHttp, QNetworkProxy -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from Debugger.DebugUI import DebugUI from Debugger.DebugServer import DebugServer @@ -511,22 +511,22 @@ # register all relevant objects splash.showMessage(self.trUtf8("Registering Objects...")) - e4App().registerObject("UserInterface", self) - e4App().registerObject("DebugUI", self.debuggerUI) - e4App().registerObject("DebugServer", debugServer) - e4App().registerObject("ViewManager", self.viewmanager) - e4App().registerObject("Project", self.project) - e4App().registerObject("ProjectBrowser", self.projectBrowser) - e4App().registerObject("MultiProject", self.multiProject) - e4App().registerObject("TaskViewer", self.taskViewer) - e4App().registerObject("TemplateViewer", self.templateViewer) - e4App().registerObject("Shell", self.shell) - e4App().registerObject("FindFilesDialog", self.findFilesDialog) - e4App().registerObject("ReplaceFilesDialog", self.replaceFilesDialog) - e4App().registerObject("DummyHelpViewer", self.dummyHelpViewer) - e4App().registerObject("PluginManager", self.pluginManager) - e4App().registerObject("ToolbarManager", self.toolbarManager) - e4App().registerObject("Terminal", self.terminal) + e5App().registerObject("UserInterface", self) + e5App().registerObject("DebugUI", self.debuggerUI) + e5App().registerObject("DebugServer", debugServer) + e5App().registerObject("ViewManager", self.viewmanager) + e5App().registerObject("Project", self.project) + e5App().registerObject("ProjectBrowser", self.projectBrowser) + e5App().registerObject("MultiProject", self.multiProject) + e5App().registerObject("TaskViewer", self.taskViewer) + e5App().registerObject("TemplateViewer", self.templateViewer) + e5App().registerObject("Shell", self.shell) + e5App().registerObject("FindFilesDialog", self.findFilesDialog) + e5App().registerObject("ReplaceFilesDialog", self.replaceFilesDialog) + e5App().registerObject("DummyHelpViewer", self.dummyHelpViewer) + e5App().registerObject("PluginManager", self.pluginManager) + e5App().registerObject("ToolbarManager", self.toolbarManager) + e5App().registerObject("Terminal", self.terminal) # Initialize the actions, menus, toolbars and statusbar splash.showMessage(self.trUtf8("Initializing Actions...")) @@ -637,7 +637,7 @@ else: styleSheet = "" - e4App().setStyleSheet(styleSheet) + e5App().setStyleSheet(styleSheet) def __createLayout(self, debugServer): """ @@ -2905,7 +2905,7 @@ Private method to quit the application. """ if self.__shutdown(): - e4App().closeAllWindows() + e5App().closeAllWindows() def __restart(self): """ @@ -2920,7 +2920,7 @@ QMessageBox.Yes) if res == QMessageBox.Yes and self.__shutdown(): - e4App().closeAllWindows() + e5App().closeAllWindows() program = sys.executable eric5 = os.path.join(getConfig("ericDir"), "eric5.py") args = [eric5] @@ -4733,7 +4733,7 @@ Private slot to handle the projectOpened signal. """ self.__setWindowCaption(project = self.project.name) - cap = e4App().getObject("DebugServer")\ + cap = e5App().getObject("DebugServer")\ .getClientCapabilities(self.project.pdata["PROGLANGUAGE"][0]) self.utProjectAct.setEnabled(cap & HasUnittest) self.utProjectOpen = cap & HasUnittest @@ -4782,7 +4782,7 @@ self.wizardsMenuAct.setEnabled(len(self.__menus["wizards"].actions()) > 0) if fn and str(fn) != "None": - dbs = e4App().getObject("DebugServer") + dbs = e5App().getObject("DebugServer") for language in dbs.getSupportedLanguages(): exts = dbs.getExtensions(language) if fn.endswith(exts): @@ -4808,7 +4808,7 @@ fn = None if fn: - dbs = e4App().getObject("DebugServer") + dbs = e5App().getObject("DebugServer") for language in dbs.getSupportedLanguages(): exts = dbs.getExtensions(language) if fn.endswith(exts): @@ -5114,7 +5114,7 @@ event.accept() if not self.inCloseEevent: self.inCloseEevent = True - QTimer.singleShot(0, e4App().closeAllWindows) + QTimer.singleShot(0, e5App().closeAllWindows) else: event.ignore()
--- a/Utilities/__init__.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Utilities/__init__.py Tue Jan 12 18:36:05 2010 +0000 @@ -26,7 +26,7 @@ from Globals import isWindowsPlatform # import this method into the Utilities namespace -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from UI.Info import Program, Version @@ -131,14 +131,14 @@ """ f = open(filename, "rb") text = f.read() - f.close() - return decode(text) - -def decode(text): - """ - Function to decode some byte text into a string. - - @param text byte text to decode (bytes) + f.close() + return decode(text) + +def decode(text): + """ + Function to decode some byte text into a string. + + @param text byte text to decode (bytes) @return tuple of decoded text and encoding (string, string) """ try: @@ -204,21 +204,21 @@ @param text text to be written (string) @param orig_coding type of the original encoding (string) @return encoding used for writing the file (string) - """ - etext, encoding = encode(text, orig_coding) - + """ + etext, encoding = encode(text, orig_coding) + f = open(filename, "wb") f.write(etext) f.close() return encoding - -def encode(text, orig_coding): - """ - Function to encode text into a byte text. - - @param text text to be encoded (string) - @param orig_coding type of the original encoding (string) + +def encode(text, orig_coding): + """ + Function to encode text into a byte text. + + @param text text to be encoded (string) + @param orig_coding type of the original encoding (string) @return tuple of encoded text and encoding used (bytes, string) """ encoding = None @@ -745,7 +745,7 @@ """ if code in ["C", "%C"]: # column of the cursor of the current editor - aw = e4App().getObject("ViewManager").activeWindow() + aw = e5App().getObject("ViewManager").activeWindow() if aw is None: column = -1 else: @@ -753,7 +753,7 @@ return "%d" % column elif code in ["D", "%D"]: # directory of active editor - aw = e4App().getObject("ViewManager").activeWindow() + aw = e5App().getObject("ViewManager").activeWindow() if aw is None: dn = "not_available" else: @@ -765,7 +765,7 @@ return dn elif code in ["F", "%F"]: # filename (complete) of active editor - aw = e4App().getObject("ViewManager").activeWindow() + aw = e5App().getObject("ViewManager").activeWindow() if aw is None: fn = "not_available" else: @@ -778,7 +778,7 @@ return getHomeDir() elif code in ["L", "%L"]: # line of the cursor of the current editor - aw = e4App().getObject("ViewManager").activeWindow() + aw = e5App().getObject("ViewManager").activeWindow() if aw is None: line = 0 else: @@ -786,13 +786,13 @@ return "%d" % line elif code in ["P", "%P"]: # project path - projectPath = e4App().getObject("Project").getProjectPath() + projectPath = e5App().getObject("Project").getProjectPath() if not projectPath: projectPath = "not_available" return projectPath elif code in ["S", "%S"]: # selected text of the current editor - aw = e4App().getObject("ViewManager").activeWindow() + aw = e5App().getObject("ViewManager").activeWindow() if aw is None: text = "not_available" else: @@ -1123,7 +1123,7 @@ @return string with plugins version infos (string) """ infoStr = "" - app = e4App() + app = e5App() if app is not None: try: pm = app.getObject("PluginManager") @@ -1242,4 +1242,4 @@ u = getEnvironmentEntry('USERNAME') except KeyError: u = getEnvironmentEntry('username', None) - return u + return u \ No newline at end of file
--- a/VCS/ProjectBrowserHelper.py Tue Jan 12 18:33:34 2010 +0000 +++ b/VCS/ProjectBrowserHelper.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog @@ -165,7 +165,7 @@ name = itm.dirName() names.append(name) if Preferences.getVCS("AutoSaveFiles"): - vm = e4App().getObject("ViewManager") + vm = e5App().getObject("ViewManager") for name in names: vm.saveEditor(name) self.vcs.vcsCommit(names, '') @@ -370,4 +370,4 @@ @param name filename or directoryname of the item to be updated (string) """ - self.project.getModel().updateVCSStatus(name) + self.project.getModel().updateVCSStatus(name) \ No newline at end of file
--- a/VCS/ProjectHelper.py Tue Jan 12 18:33:34 2010 +0000 +++ b/VCS/ProjectHelper.py Tue Jan 12 18:36:05 2010 +0000 @@ -15,7 +15,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import VCS from .CommandOptionsDialog import vcsCommandOptionsDialog @@ -130,7 +130,7 @@ if not self.project.checkDirty(): return - vcsSystemsDict = e4App().getObject("PluginManager")\ + vcsSystemsDict = e5App().getObject("PluginManager")\ .getPluginDisplayStrings("version_control") vcsSystemsDisplay = [] keys = sorted(vcsSystemsDict.keys()) @@ -301,7 +301,7 @@ pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"]) vcs = self.project.vcs vcsHelper = self.project.vcsProjectHelper - vcsSystemsDict = e4App().getObject("PluginManager")\ + vcsSystemsDict = e5App().getObject("PluginManager")\ .getPluginDisplayStrings("version_control") vcsSystemsDisplay = [] keys = sorted(list(vcsSystemsDict.keys())) @@ -472,4 +472,4 @@ """ info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) - dlg.exec_() + dlg.exec_() \ No newline at end of file
--- a/VCS/__init__.py Tue Jan 12 18:33:34 2010 +0000 +++ b/VCS/__init__.py Tue Jan 12 18:36:05 2010 +0000 @@ -12,7 +12,7 @@ interfaces (i.e. CVS) have to be subclasses of this base class. """ -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App import Preferences @@ -28,7 +28,7 @@ @param vcs name of the VCS system to be used (string) @return the instantiated VCS object """ - pluginManager = e4App().getObject("PluginManager") + pluginManager = e5App().getObject("PluginManager") if pluginManager is None: # that should not happen vc = None
--- a/ViewManager/ViewManager.py Tue Jan 12 18:33:34 2010 +0000 +++ b/ViewManager/ViewManager.py Tue Jan 12 18:36:05 2010 +0000 @@ -13,7 +13,7 @@ from PyQt4.QtGui import * from PyQt4.Qsci import QsciScintilla -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from Globals import recentNameFiles @@ -3143,7 +3143,7 @@ @return reference to the new editor object (Editor.Editor) """ editor = Editor(self.dbs, fn, self, filetype = filetype, editor = caller, - tv = e4App().getObject("TaskViewer")) + tv = e5App().getObject("TaskViewer")) self.editors.append(editor) self.__connectEditor(editor) self.__editorOpened() @@ -3295,7 +3295,7 @@ break else: editor = Editor(self.dbs, fn, self, filetype = filetype, - tv = e4App().getObject("TaskViewer")) + tv = e5App().getObject("TaskViewer")) self.editors.append(editor) self.__connectEditor(editor) self.__editorOpened() @@ -3459,7 +3459,7 @@ @param ed editor to be saved """ - pro = e4App().getObject("Project") + pro = e5App().getObject("Project") path = pro.ppath if ed: ok, newName = ed.saveFileAs(path) @@ -3492,7 +3492,7 @@ """ Public slot to generate a new empty editor. """ - editor = Editor(self.dbs, None, self, tv = e4App().getObject("TaskViewer")) + editor = Editor(self.dbs, None, self, tv = e5App().getObject("TaskViewer")) self.editors.append(editor) self.__connectEditor(editor) self._addView(editor, None) @@ -3706,10 +3706,10 @@ """ Private method to handle the cut action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - e4App().getObject("Shell").cut() - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - e4App().getObject("Terminal").cut() + if QApplication.focusWidget() == e5App().getObject("Shell"): + e5App().getObject("Shell").cut() + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + e5App().getObject("Terminal").cut() else: self.activeWindow().cut() @@ -3717,10 +3717,10 @@ """ Private method to handle the copy action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - e4App().getObject("Shell").copy() - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - e4App().getObject("Terminal").copy() + if QApplication.focusWidget() == e5App().getObject("Shell"): + e5App().getObject("Shell").copy() + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + e5App().getObject("Terminal").copy() else: self.activeWindow().copy() @@ -3728,10 +3728,10 @@ """ Private method to handle the paste action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - e4App().getObject("Shell").paste() - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - e4App().getObject("Terminal").paste() + if QApplication.focusWidget() == e5App().getObject("Shell"): + e5App().getObject("Shell").paste() + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + e5App().getObject("Terminal").paste() else: self.activeWindow().paste() @@ -3739,10 +3739,10 @@ """ Private method to handle the delete action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - e4App().getObject("Shell").clear() - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - e4App().getObject("Terminal").clear() + if QApplication.focusWidget() == e5App().getObject("Shell"): + e5App().getObject("Shell").clear() + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + e5App().getObject("Terminal").clear() else: self.activeWindow().clear() @@ -4103,10 +4103,10 @@ """ Private method to handle the zoom in action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - e4App().getObject("Shell").zoomIn() - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - e4App().getObject("Terminal").zoomIn() + if QApplication.focusWidget() == e5App().getObject("Shell"): + e5App().getObject("Shell").zoomIn() + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + e5App().getObject("Terminal").zoomIn() else: aw = self.activeWindow() if aw: @@ -4116,10 +4116,10 @@ """ Private method to handle the zoom out action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - e4App().getObject("Shell").zoomOut() - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - e4App().getObject("Terminal").zoomOut() + if QApplication.focusWidget() == e5App().getObject("Shell"): + e5App().getObject("Shell").zoomOut() + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + e5App().getObject("Terminal").zoomOut() else: aw = self.activeWindow() if aw: @@ -4129,10 +4129,10 @@ """ Private method to handle the zoom action. """ - if QApplication.focusWidget() == e4App().getObject("Shell"): - aw = e4App().getObject("Shell") - elif QApplication.focusWidget() == e4App().getObject("Terminal"): - aw = e4App().getObject("Terminal") + if QApplication.focusWidget() == e5App().getObject("Shell"): + aw = e5App().getObject("Shell") + elif QApplication.focusWidget() == e5App().getObject("Terminal"): + aw = e5App().getObject("Terminal") else: aw = self.activeWindow() if aw: @@ -4709,10 +4709,10 @@ @param cmd the scintilla command to be sent """ focusWidget = QApplication.focusWidget() - if focusWidget == e4App().getObject("Shell"): - e4App().getObject("Shell").editorCommand(cmd) - elif focusWidget == e4App().getObject("Terminal"): - e4App().getObject("Terminal").editorCommand(cmd) + if focusWidget == e5App().getObject("Shell"): + e5App().getObject("Shell").editorCommand(cmd) + elif focusWidget == e5App().getObject("Terminal"): + e5App().getObject("Terminal").editorCommand(cmd) elif focusWidget == self.quickFindtextCombo: self.quickFindtextCombo._editor.editorCommand(cmd) else: @@ -4726,8 +4726,8 @@ cursor is not at the end of the line. """ focusWidget = QApplication.focusWidget() - if focusWidget == e4App().getObject("Shell") or \ - focusWidget == e4App().getObject("Terminal") or \ + if focusWidget == e5App().getObject("Shell") or \ + focusWidget == e5App().getObject("Terminal") or \ focusWidget == self.quickFindtextCombo: return else: @@ -4769,8 +4769,8 @@ return os.path.dirname(self.activeWindow().getFileName()) # check, if there is an active project and return its path - elif e4App().getObject("Project").isOpen(): - return e4App().getObject("Project").ppath + elif e5App().getObject("Project").isOpen(): + return e5App().getObject("Project").ppath else: # None will cause open dialog to start with cwd
