Mercurial Repositories > eric / changeset
changeset
Continued implementing the delayed import.
Sun, 10 Feb 2013 19:46:21 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 10 Feb 2013 19:46:21 +0100
- changeset 2407
- b98cc8ee1142
- parent 2406
- 975af671146d
- child 2408
- dc3a7c9d8f6e
Continued implementing the delayed import.
--- a/Plugins/PluginAbout.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginAbout.py Sun Feb 10 19:46:21 2013 +0100 @@ -16,8 +16,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from AboutPlugin.AboutDialog import AboutDialog - # Start-Of-Header name = "About Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -121,6 +119,7 @@ """ Private slot to handle the About dialog. """ + from AboutPlugin.AboutDialog import AboutDialog dlg = AboutDialog(self.__ui) dlg.exec_()
--- a/Plugins/PluginEricapi.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginEricapi.py Sun Feb 10 19:46:21 2013 +0100 @@ -16,9 +16,6 @@ from E5Gui.E5Action import E5Action -from DocumentationPlugins.Ericapi.EricapiConfigDialog import EricapiConfigDialog -from DocumentationPlugins.Ericapi.EricapiExecDialog import EricapiExecDialog - import Utilities from eric5config import getConfig @@ -141,6 +138,7 @@ """ Private slot to perform the eric5_api api generation. """ + from DocumentationPlugins.Ericapi.EricapiConfigDialog import EricapiConfigDialog eolTranslation = { '\r': 'cr', '\n': 'lf', @@ -158,6 +156,7 @@ args.append("--eol={0}".format(eolTranslation[project.getEolString()])) # now do the call + from DocumentationPlugins.Ericapi.EricapiExecDialog import EricapiExecDialog dia = EricapiExecDialog("Ericapi") res = dia.start(args, project.ppath) if res:
--- a/Plugins/PluginEricdoc.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginEricdoc.py Sun Feb 10 19:46:21 2013 +0100 @@ -16,9 +16,6 @@ from E5Gui.E5Action import E5Action -from DocumentationPlugins.Ericdoc.EricdocConfigDialog import EricdocConfigDialog -from DocumentationPlugins.Ericdoc.EricdocExecDialog import EricdocExecDialog - import Utilities from eric5config import getConfig @@ -177,6 +174,7 @@ """ Private slot to perform the eric5_doc api documentation generation. """ + from DocumentationPlugins.Ericdoc.EricdocConfigDialog import EricdocConfigDialog eolTranslation = { '\r': 'cr', '\n': 'lf', @@ -194,6 +192,7 @@ args.append("--eol={0}".format(eolTranslation[project.getEolString()])) # now do the call + from DocumentationPlugins.Ericdoc.EricdocExecDialog import EricdocExecDialog dia = EricdocExecDialog("Ericdoc") res = dia.start(args, project.ppath) if res:
--- a/Plugins/PluginPep8Checker.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginPep8Checker.py Sun Feb 10 19:46:21 2013 +0100 @@ -15,8 +15,6 @@ from E5Gui.E5Action import E5Action -from CheckerPlugins.Pep8.Pep8Dialog import Pep8Dialog - import Preferences # Start-Of-Header @@ -194,6 +192,7 @@ tuple(Preferences.getPython("Python3Extensions")) + tuple(Preferences.getPython("PythonExtensions")))] + from CheckerPlugins.Pep8.Pep8Dialog import Pep8Dialog self.__projectPep8CheckerDialog = Pep8Dialog() self.__projectPep8CheckerDialog.show() self.__projectPep8CheckerDialog.prepare(files, project) @@ -213,6 +212,7 @@ fn = itm.dirName() isDir = True + from CheckerPlugins.Pep8.Pep8Dialog import Pep8Dialog self.__projectBrowserPep8CheckerDialog = Pep8Dialog() self.__projectBrowserPep8CheckerDialog.show() if isDir: @@ -267,6 +267,7 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: if editor.checkDirty() and editor.getFileName() is not None: + from CheckerPlugins.Pep8.Pep8Dialog import Pep8Dialog self.__editorPep8CheckerDialog = Pep8Dialog() self.__editorPep8CheckerDialog.show() self.__editorPep8CheckerDialog.start(
--- a/Plugins/PluginSyntaxChecker.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginSyntaxChecker.py Sun Feb 10 19:46:21 2013 +0100 @@ -15,8 +15,6 @@ from E5Gui.E5Action import E5Action -from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import SyntaxCheckerDialog - import Preferences # Start-Of-Header @@ -182,6 +180,7 @@ if file.endswith(tuple(Preferences.getPython("Python3Extensions")) + tuple(Preferences.getPython("PythonExtensions")))] + from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import SyntaxCheckerDialog self.__projectSyntaxCheckerDialog = SyntaxCheckerDialog() self.__projectSyntaxCheckerDialog.show() self.__projectSyntaxCheckerDialog.prepare(files, project) @@ -198,6 +197,7 @@ except AttributeError: fn = itm.dirName() + from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import SyntaxCheckerDialog self.__projectBrowserSyntaxCheckerDialog = SyntaxCheckerDialog() self.__projectBrowserSyntaxCheckerDialog.show() self.__projectBrowserSyntaxCheckerDialog.start(fn) @@ -245,6 +245,8 @@ """ editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: + from CheckerPlugins.SyntaxChecker.SyntaxCheckerDialog import \ + SyntaxCheckerDialog self.__editorSyntaxCheckerDialog = SyntaxCheckerDialog() self.__editorSyntaxCheckerDialog.show() self.__editorSyntaxCheckerDialog.start(
--- a/Plugins/PluginTabnanny.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginTabnanny.py Sun Feb 10 19:46:21 2013 +0100 @@ -15,8 +15,6 @@ from E5Gui.E5Action import E5Action -from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog - import Preferences # Start-Of-Header @@ -185,6 +183,7 @@ if file.endswith(tuple(Preferences.getPython("Python3Extensions")) + tuple(Preferences.getPython("PythonExtensions")))] + from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog self.__projectTabnannyDialog = TabnannyDialog() self.__projectTabnannyDialog.show() self.__projectTabnannyDialog.prepare(files, project) @@ -201,6 +200,7 @@ except AttributeError: fn = itm.dirName() + from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog self.__projectBrowserTabnannyDialog = TabnannyDialog() self.__projectBrowserTabnannyDialog.show() self.__projectBrowserTabnannyDialog.start(fn) @@ -249,6 +249,7 @@ editor = e5App().getObject("ViewManager").activeWindow() if editor is not None: if editor.checkDirty() and editor.getFileName() is not None: + from CheckerPlugins.Tabnanny.TabnannyDialog import TabnannyDialog self.__editorTabnannyDialog = TabnannyDialog() self.__editorTabnannyDialog.show() self.__editorTabnannyDialog.start(editor.getFileName())
--- a/Plugins/PluginWizardE5MessageBox.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardE5MessageBox.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog import \ - E5MessageBoxWizardDialog - # Start-Of-Header name = "E5MessageBox Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.E5MessageBoxWizard.E5MessageBoxWizardDialog import \ + E5MessageBoxWizardDialog dlg = E5MessageBoxWizardDialog(None) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardPyRegExp.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardPyRegExp.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog import \ - PyRegExpWizardDialog - # Start-Of-Header name = "Python re Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog import \ + PyRegExpWizardDialog dlg = PyRegExpWizardDialog(None, True) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardQColorDialog.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardQColorDialog.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.ColorDialogWizard.ColorDialogWizardDialog import \ - ColorDialogWizardDialog - # Start-Of-Header name = "QColorDialog Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) and a success flag (boolean) """ + from WizardPlugins.ColorDialogWizard.ColorDialogWizardDialog import \ + ColorDialogWizardDialog dlg = ColorDialogWizardDialog(None) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardQFileDialog.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardQFileDialog.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.FileDialogWizard.FileDialogWizardDialog import \ - FileDialogWizardDialog - # Start-Of-Header name = "QFileDialog Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.FileDialogWizard.FileDialogWizardDialog import \ + FileDialogWizardDialog dlg = FileDialogWizardDialog(None) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardQFontDialog.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardQFontDialog.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.FontDialogWizard.FontDialogWizardDialog import \ - FontDialogWizardDialog - # Start-Of-Header name = "QFontDialog Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.FontDialogWizard.FontDialogWizardDialog import \ + FontDialogWizardDialog dlg = FontDialogWizardDialog(None) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardQInputDialog.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardQInputDialog.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.InputDialogWizard.InputDialogWizardDialog import \ - InputDialogWizardDialog - # Start-Of-Header name = "QInputDialog Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.InputDialogWizard.InputDialogWizardDialog import \ + InputDialogWizardDialog dlg = InputDialogWizardDialog(None) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardQMessageBox.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardQMessageBox.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog import \ - MessageBoxWizardDialog - # Start-Of-Header name = "QMessageBox Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog import \ + MessageBoxWizardDialog dlg = MessageBoxWizardDialog(None) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/PluginWizardQRegExp.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/PluginWizardQRegExp.py Sun Feb 10 19:46:21 2013 +0100 @@ -14,9 +14,6 @@ from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox -from WizardPlugins.QRegExpWizard.QRegExpWizardDialog import \ - QRegExpWizardDialog - # Start-Of-Header name = "QRegExp Wizard Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -99,6 +96,8 @@ @param editor reference to the current editor @return the generated code (string) """ + from WizardPlugins.QRegExpWizard.QRegExpWizardDialog import \ + QRegExpWizardDialog dlg = QRegExpWizardDialog(None, True) if dlg.exec_() == QDialog.Accepted: line, index = editor.getCursorPosition()
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Feb 10 19:46:21 2013 +0100 @@ -19,9 +19,6 @@ from .Ui_PyRegExpWizardDialog import Ui_PyRegExpWizardDialog -from .PyRegExpWizardRepeatDialog import PyRegExpWizardRepeatDialog -from .PyRegExpWizardCharactersDialog import PyRegExpWizardCharactersDialog - import UI.PixmapCache import Utilities @@ -250,6 +247,7 @@ """ Private slot to handle the repeat toolbutton. """ + from .PyRegExpWizardRepeatDialog import PyRegExpWizardRepeatDialog dlg = PyRegExpWizardRepeatDialog(self) if dlg.exec_() == QDialog.Accepted: self.__insertString(dlg.getRepeat()) @@ -259,6 +257,7 @@ """ Private slot to handle the characters toolbutton. """ + from .PyRegExpWizardCharactersDialog import PyRegExpWizardCharactersDialog dlg = PyRegExpWizardCharactersDialog(self) if dlg.exec_() == QDialog.Accepted: self.__insertString(dlg.getCharacters())
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Feb 10 19:36:30 2013 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Feb 10 19:46:21 2013 +0100 @@ -18,9 +18,6 @@ from .Ui_QRegExpWizardDialog import Ui_QRegExpWizardWidget -from .QRegExpWizardRepeatDialog import QRegExpWizardRepeatDialog -from .QRegExpWizardCharactersDialog import QRegExpWizardCharactersDialog - import UI.PixmapCache import Utilities @@ -218,6 +215,7 @@ """ Private slot to handle the repeat toolbutton. """ + from .QRegExpWizardRepeatDialog import QRegExpWizardRepeatDialog dlg = QRegExpWizardRepeatDialog(self) if dlg.exec_() == QDialog.Accepted: self.__insertString(dlg.getRepeat()) @@ -227,6 +225,7 @@ """ Private slot to handle the characters toolbutton. """ + from .QRegExpWizardCharactersDialog import QRegExpWizardCharactersDialog dlg = QRegExpWizardCharactersDialog( mode=QRegExpWizardCharactersDialog.RegExpMode, parent=self) if dlg.exec_() == QDialog.Accepted: @@ -237,6 +236,7 @@ """ Private slot to handle the wildcard characters toolbutton. """ + from .QRegExpWizardCharactersDialog import QRegExpWizardCharactersDialog dlg = QRegExpWizardCharactersDialog( mode=QRegExpWizardCharactersDialog.WildcardMode, parent=self) if dlg.exec_() == QDialog.Accepted: @@ -261,6 +261,7 @@ """ Private slot to handle the wildcard characters toolbutton. """ + from .QRegExpWizardCharactersDialog import QRegExpWizardCharactersDialog dlg = QRegExpWizardCharactersDialog( mode=QRegExpWizardCharactersDialog.W3CMode, parent=self) if dlg.exec_() == QDialog.Accepted: @@ -278,6 +279,7 @@ """ Private slot to handle the W3C repeat toolbutton. """ + from .QRegExpWizardRepeatDialog import QRegExpWizardRepeatDialog dlg = QRegExpWizardRepeatDialog(self) if dlg.exec_() == QDialog.Accepted: self.__insertString(dlg.getRepeat())
