Mercurial Repositories > eric / changeset

--- a/Preferences/ConfigurationDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -22,11 +22,8 @@
 
 from Globals import isMacPlatform
 
-import QScintilla.Lexers
-
 import Preferences
 
-from .PreferencesLexer import PreferencesLexer, PreferencesLexerLanguageError
 import UI.PixmapCache
 
 from eric5config import getConfig
@@ -520,6 +517,9 @@
         """
         Private method to initialize the dictionary of preferences lexers.
         """
+        import QScintilla.Lexers
+        from .PreferencesLexer import PreferencesLexer, PreferencesLexerLanguageError
+        
         self.lexers = {}
         for language in QScintilla.Lexers.getSupportedLanguages():
             if language not in self.lexers:

--- a/Preferences/ConfigurationPages/EditorAPIsPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAPIsPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -17,9 +17,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAPIsPage import Ui_EditorAPIsPage
 
-from QScintilla.APIsManager import APIsManager
-import QScintilla.Lexers
-
 import Preferences
 import Utilities
 
@@ -37,7 +34,6 @@
         self.setObjectName("EditorAPIsPage")
         
         self.prepareApiButton.setText(self.trUtf8("Compile APIs"))
-        self.__apisManager = APIsManager()
         self.__currentAPI = None
         self.__inPreparation = False
         
@@ -48,6 +44,7 @@
         self.apiAutoPrepareCheckBox.setChecked(
             Preferences.getEditor("AutoPrepareAPIs"))
         
+        import QScintilla.Lexers
         self.apis = {}
         apiLanguages = sorted([''] + \
                        list(QScintilla.Lexers.getSupportedLanguages().keys()))
@@ -95,7 +92,9 @@
         for api in self.apis[self.currentApiLanguage]:
             if api:
                 self.apiList.addItem(api)
-        self.__currentAPI = self.__apisManager.getAPIs(self.currentApiLanguage)
+        
+        from QScintilla.APIsManager import APIsManager
+        self.__currentAPI = APIsManager().getAPIs(self.currentApiLanguage)
         if self.__currentAPI is not None:
             self.__currentAPI.apiPreparationFinished.connect(
                 self.__apiPreparationFinished)

--- a/Preferences/ConfigurationPages/EditorFilePage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorFilePage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -13,8 +13,6 @@
 
 from E5Gui import E5MessageBox
 
-import QScintilla.Lexers
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorFilePage import Ui_EditorFilePage
 
@@ -135,6 +133,7 @@
             selectedOpenFilter = self.openFilesFilterComboBox.currentText()
             selectedSaveFilter = self.saveFilesFilterComboBox.currentText()
         
+        import QScintilla.Lexers
         openFileFiltersList = \
             QScintilla.Lexers.getOpenFileFiltersList(False, withAdditional=False) + \
             self.openFileFilters

--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -16,9 +16,6 @@
 
 from E5Gui import E5MessageBox, E5FileDialog
 
-from E5XML.HighlightingStylesWriter import HighlightingStylesWriter
-from E5XML.HighlightingStylesReader import HighlightingStylesReader
-
 import Preferences
 
 
@@ -383,6 +380,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.WriteOnly):
+            from E5XML.HighlightingStylesWriter import HighlightingStylesWriter
             HighlightingStylesWriter(f, lexers).writeXML()
             f.close()
         else:
@@ -410,6 +408,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.ReadOnly):
+            from E5XML.HighlightingStylesReader import HighlightingStylesReader
             reader = HighlightingStylesReader(f, lexers)
             reader.readXML()
             f.close()

--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -12,9 +12,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorKeywordsPage import Ui_EditorKeywordsPage
 
-import QScintilla.Lexers
-from QScintilla.Lexers.LexerContainer import LexerContainer
-
 import Preferences
 
 
@@ -31,6 +28,9 @@
         self.setObjectName("EditorKeywordsPage")
         
         # set initial values
+        import QScintilla.Lexers
+        from QScintilla.Lexers.LexerContainer import LexerContainer
+        
         self.__keywords = {
             "": ["", "", "", "", "", "", "", "", "", ""]
         }

--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -18,8 +18,6 @@
 import Preferences
 import Utilities
 
-from QScintilla.SpellChecker import SpellChecker
-
 
 class EditorSpellCheckingPage(ConfigurationPageBase, Ui_EditorSpellCheckingPage):
     """
@@ -33,6 +31,7 @@
         self.setupUi(self)
         self.setObjectName("EditorSpellCheckingPage")
         
+        from QScintilla.SpellChecker import SpellChecker
         languages = sorted(SpellChecker.getAvailableLanguages())
         self.defaultLanguageCombo.addItems(languages)
         if languages:

--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -11,8 +11,6 @@
 from PyQt4.QtGui import QColor, QPalette, QColorDialog
 from PyQt4.Qsci import QsciScintilla
 
-from QScintilla.QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorStylesPage import Ui_EditorStylesPage
 
@@ -31,6 +29,7 @@
         self.setupUi(self)
         self.setObjectName("EditorStylesPage")
         
+        from QScintilla.QsciScintillaCompat import QsciScintillaCompat, QSCINTILLA_VERSION
         self.foldStyles = [
             QsciScintilla.PlainFoldStyle,
             QsciScintilla.CircledFoldStyle,

--- a/Preferences/ConfigurationPages/HelpAppearancePage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpAppearancePage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -15,8 +15,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HelpAppearancePage import Ui_HelpAppearancePage
 
-from ..ConfigurationDialog import ConfigurationWidget
-
 import Preferences
 import Utilities
 
@@ -69,6 +67,7 @@
             (ConfigurationWidget.DefaultMode, ConfigurationWidget.HelpBrowserMode,
              ConfigurationWidget.TrayStarterMode)
         """
+        from ..ConfigurationDialog import ConfigurationWidget
         assert displayMode in (
             ConfigurationWidget.DefaultMode,
             ConfigurationWidget.HelpBrowserMode,
@@ -95,6 +94,7 @@
         
         self.saveColours(Preferences.setHelp)
         
+        from ..ConfigurationDialog import ConfigurationWidget
         if self.__displayMode == ConfigurationWidget.HelpBrowserMode:
             Preferences.setUI("SingleCloseButton",
                 self.tabsCloseButtonCheckBox.isChecked())

--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -12,8 +12,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HelpVirusTotalPage import Ui_HelpVirusTotalPage
 
-from Helpviewer.VirusTotalApi import VirusTotalAPI
-
 import Preferences
 
 
@@ -33,6 +31,7 @@
         
         self.testResultLabel.setHidden(True)
         
+        from Helpviewer.VirusTotalApi import VirusTotalAPI
         self.__vt = VirusTotalAPI(self)
         self.__vt.checkServiceKeyFinished.connect(self.__checkServiceKeyFinished)
         

--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -14,8 +14,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HelpWebBrowserPage import Ui_HelpWebBrowserPage
 
-from Helpviewer.Network.SendRefererWhitelistDialog import SendRefererWhitelistDialog
-
 import Preferences
 import UI.PixmapCache
 
@@ -281,6 +279,8 @@
         """
         Private slot to edit the referer whitelist.
         """
+        from Helpviewer.Network.SendRefererWhitelistDialog import \
+            SendRefererWhitelistDialog
         SendRefererWhitelistDialog(self).exec_()
 
 

--- a/Preferences/ConfigurationPages/IconsPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/IconsPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -14,7 +14,6 @@
 from E5Gui import E5FileDialog
 
 from .ConfigurationPageBase import ConfigurationPageBase
-from .IconsPreviewDialog import IconsPreviewDialog
 from .Ui_IconsPage import Ui_IconsPage
 
 import Preferences
@@ -166,6 +165,7 @@
             if itm is not None:
                 dir = itm.text()
         if dir:
+            from .IconsPreviewDialog import IconsPreviewDialog
             dlg = IconsPreviewDialog(self, dir)
             dlg.exec_()
     

--- a/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -12,8 +12,6 @@
 
 from .Ui_MasterPasswordEntryDialog import Ui_MasterPasswordEntryDialog
 
-from Utilities.crypto.py3PBKDF2 import verifyPassword
-
 
 class MasterPasswordEntryDialog(QDialog, Ui_MasterPasswordEntryDialog):
     """
@@ -45,6 +43,7 @@
         enable = True
         error = ""
         if self.currentPasswordEdit.isEnabled():
+            from Utilities.crypto.py3PBKDF2 import verifyPassword
             enable = \
                 verifyPassword(self.currentPasswordEdit.text(), self.__oldPasswordHash)
             if not enable:

--- a/Preferences/ConfigurationPages/NetworkPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -18,8 +18,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_NetworkPage import Ui_NetworkPage
 
-from Helpviewer.Download.DownloadManager import DownloadManager
-
 import Preferences
 import Utilities
 
@@ -62,6 +60,7 @@
         self.requestFilenameCheckBox.setChecked(
             Preferences.getUI("RequestDownloadFilename"))
         policy = Preferences.getHelp("DownloadManagerRemovePolicy")
+        from Helpviewer.Download.DownloadManager import DownloadManager
         if policy == DownloadManager.RemoveNever:
             self.cleanupNeverButton.setChecked(True)
         elif policy == DownloadManager.RemoveExit:
@@ -113,6 +112,7 @@
             self.downloadDirEdit.text())
         Preferences.setUI("RequestDownloadFilename",
             self.requestFilenameCheckBox.isChecked())
+        from Helpviewer.Download.DownloadManager import DownloadManager
         if self.cleanupNeverButton.isChecked():
             policy = DownloadManager.RemoveNever
         elif self.cleanupExitButton.isChecked():

--- a/Preferences/ConfigurationPages/NotificationsPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/NotificationsPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -13,8 +13,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_NotificationsPage import Ui_NotificationsPage
 
-from UI.NotificationWidget import NotificationWidget
-
 import Preferences
 import UI.PixmapCache
 
@@ -73,6 +71,7 @@
         @param checked state of the button (boolean)
         """
         if checked:
+            from UI.NotificationWidget import NotificationWidget
             self.__notification = NotificationWidget(parent=self, setPosition=True)
             self.__notification.setPixmap(UI.PixmapCache.getPixmap("notification48.png"))
             self.__notification.setHeading(self.trUtf8("Visual Selection"))

--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -14,10 +14,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ProjectBrowserPage import Ui_ProjectBrowserPage
 
-from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
-    ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
-    OthersBrowserFlag
-
 import Preferences
 
 
@@ -80,6 +76,10 @@
         
         @param projectType type of the selected project (string)
         """
+        from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
+            ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
+            OthersBrowserFlag
+        
         flags = 0
         if self.sourcesBrowserCheckBox.isChecked():
             flags |= SourcesBrowserFlag
@@ -102,6 +102,10 @@
         
         @param projectType type of the selected project (string)
         """
+        from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
+            ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
+            OthersBrowserFlag
+        
         flags = self.__projectBrowserFlags[projectType]
         
         self.sourcesBrowserCheckBox.setChecked(flags & SourcesBrowserFlag)

--- a/Preferences/ConfigurationPages/SecurityPage.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ConfigurationPages/SecurityPage.py	Mon Feb 11 14:08:08 2013 +0100
@@ -14,8 +14,6 @@
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_SecurityPage import Ui_SecurityPage
 
-from .MasterPasswordEntryDialog import MasterPasswordEntryDialog
-
 import Preferences
 
 
@@ -74,6 +72,7 @@
         @param checked flag indicating the state of the check box (boolean)
         """
         if checked:
+            from .MasterPasswordEntryDialog import MasterPasswordEntryDialog
             dlg = MasterPasswordEntryDialog("", self)
             if dlg.exec_() == QDialog.Accepted:
                 Preferences.setUser("MasterPassword",
@@ -91,6 +90,7 @@
         """
         Private slot to change the master password.
         """
+        from .MasterPasswordEntryDialog import MasterPasswordEntryDialog
         dlg = MasterPasswordEntryDialog(Preferences.getUser("MasterPassword"), self)
         if dlg.exec_() == QDialog.Accepted:
             Preferences.setUser("MasterPassword",

--- a/Preferences/PreferencesLexer.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/PreferencesLexer.py	Mon Feb 11 14:08:08 2013 +0100
@@ -10,8 +10,6 @@
 from PyQt4.QtGui import QColor, QFont, QApplication
 from PyQt4.Qsci import QsciLexer
 
-import QScintilla.Lexers
-
 import Preferences
 
 
@@ -72,6 +70,7 @@
         super().__init__(parent)
         
         # instantiate a lexer object for the given language
+        import QScintilla.Lexers
         lex = QScintilla.Lexers.getLexer(language)
         if lex is None:
             raise PreferencesLexerLanguageError(language)

--- a/Preferences/Shortcuts.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/Shortcuts.py	Mon Feb 11 14:08:08 2013 +0100
@@ -15,9 +15,6 @@
 
 from Preferences import Prefs, syncPreferences
 
-from E5XML.ShortcutsReader import ShortcutsReader
-from E5XML.ShortcutsWriter import ShortcutsWriter
-
 
 def __readShortcut(act, category, prefClass):
     """
@@ -196,6 +193,7 @@
     
     f = QFile(fn)
     if f.open(QIODevice.WriteOnly):
+        from E5XML.ShortcutsWriter import ShortcutsWriter
         ShortcutsWriter(f).writeXML()
         f.close()
     else:
@@ -218,6 +216,7 @@
     
     f = QFile(fn)
     if f.open(QIODevice.ReadOnly):
+        from E5XML.ShortcutsReader import ShortcutsReader
         reader = ShortcutsReader(f)
         reader.readXML()
         f.close()

--- a/Preferences/ShortcutsDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/ShortcutsDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -14,7 +14,6 @@
 from E5Gui import E5MessageBox
 
 from .Ui_ShortcutsDialog import Ui_ShortcutsDialog
-from .ShortcutDialog import ShortcutDialog
 
 import Preferences
 from Preferences import Shortcuts
@@ -49,6 +48,7 @@
         self.shortcutsList.headerItem().setText(self.shortcutsList.columnCount(), "")
         self.shortcutsList.header().setSortIndicator(0, Qt.AscendingOrder)
         
+        from .ShortcutDialog import ShortcutDialog
         self.shortcutDialog = ShortcutDialog()
         self.shortcutDialog.shortcutChanged.connect(self.__shortcutChanged)
         

--- a/Preferences/__init__.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Preferences/__init__.py	Mon Feb 11 14:08:08 2013 +0100
@@ -31,8 +31,6 @@
 
 from E5Network.E5Ftp import E5FtpProxyType
 
-import QScintilla.Lexers
-
 from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \
     isWindowsPlatform, isLinuxPlatform, findPython2Interpreters
 
@@ -1708,6 +1706,8 @@
     prefClass.settings.beginGroup("Editor/LexerAssociations")
     keyList = prefClass.settings.childKeys()
     prefClass.settings.endGroup()
+    
+    import QScintilla.Lexers
     editorLexerAssocDefaults = QScintilla.Lexers.getDefaultLexerAssociations()
     
     if len(keyList) == 0:

--- a/Project/CreateDialogCodeDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/CreateDialogCodeDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -18,11 +18,8 @@
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 
-from .NewDialogClassDialog import NewDialogClassDialog
 from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog
 
-from Utilities import ModuleParser
-
 from eric5config import getConfig
 
 pyqtSignatureRole = Qt.UserRole + 1
@@ -81,6 +78,7 @@
                     exts = [splitExt[1]]
                 else:
                     exts = None
+                from Utilities import ModuleParser
                 self.__module = ModuleParser.readModule(self.srcFile, extensions=exts,
                                                         caching=False)
             except ImportError:
@@ -506,6 +504,7 @@
         path, file = os.path.split(self.srcFile)
         objName = self.__objectName()
         if objName:
+            from .NewDialogClassDialog import NewDialogClassDialog
             dlg = NewDialogClassDialog(objName, file, path, self)
             if dlg.exec_() == QDialog.Accepted:
                 className, fileName = dlg.getData()

--- a/Project/LexerAssociationDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/LexerAssociationDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -9,13 +9,9 @@
 
 import os
 
-from pygments.lexers import get_all_lexers
-
 from PyQt4.QtCore import Qt, pyqtSlot, qVersion
 from PyQt4.QtGui import QHeaderView, QTreeWidgetItem, QDialog
 
-import QScintilla.Lexers
-
 from .Ui_LexerAssociationDialog import Ui_LexerAssociationDialog
 
 
@@ -47,10 +43,13 @@
             self.extsep = "."
         
         self.extras = ["-----------", self.trUtf8("Alternative")]
+        
+        import QScintilla.Lexers
         languages = \
             [''] + sorted(QScintilla.Lexers.getSupportedLanguages().keys()) + self.extras
         self.editorLexerCombo.addItems(languages)
         
+        from pygments.lexers import get_all_lexers
         pygmentsLexers = [''] + sorted([l[0] for l in get_all_lexers()])
         self.pygmentsLexerCombo.addItems(pygmentsLexers)
         

--- a/Project/Project.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/Project.py	Mon Feb 11 14:08:08 2013 +0100
@@ -26,39 +26,6 @@
 
 from Globals import recentNameProject
 
-from .ProjectBrowserModel import ProjectBrowserModel
-
-from .AddLanguageDialog import AddLanguageDialog
-from .AddFileDialog import AddFileDialog
-from .AddDirectoryDialog import AddDirectoryDialog
-from .PropertiesDialog import PropertiesDialog
-from .AddFoundFilesDialog import AddFoundFilesDialog
-from .DebuggerPropertiesDialog import DebuggerPropertiesDialog
-from .FiletypeAssociationDialog import FiletypeAssociationDialog
-from .LexerAssociationDialog import LexerAssociationDialog
-from .UserPropertiesDialog import UserPropertiesDialog
-
-from E5XML.ProjectReader import ProjectReader
-from E5XML.ProjectWriter import ProjectWriter
-from E5XML.UserProjectReader import UserProjectReader
-from E5XML.UserProjectWriter import UserProjectWriter
-from E5XML.SessionReader import SessionReader
-from E5XML.SessionWriter import SessionWriter
-from E5XML.TasksReader import TasksReader
-from E5XML.TasksWriter import TasksWriter
-from E5XML.DebuggerPropertiesReader import DebuggerPropertiesReader
-from E5XML.DebuggerPropertiesWriter import DebuggerPropertiesWriter
-
-import VCS
-from VCS.CommandOptionsDialog import vcsCommandOptionsDialog
-from VCS.ProjectHelper import VcsProjectHelper
-
-from Graphics.UMLDialog import UMLDialog
-
-from DataViews.CodeMetricsDialog import CodeMetricsDialog
-from DataViews.PyCoverageDialog import PyCoverageDialog
-from DataViews.PyProfileDialog import PyProfileDialog
-
 import UI.PixmapCache
 
 from E5Gui.E5Action import E5Action, createActionGroup
@@ -233,6 +200,7 @@
         else:
             self.vcs = self.initVCS()
         
+        from .ProjectBrowserModel import ProjectBrowserModel
         self.__model = ProjectBrowserModel(self)
         
         self.codemetrics = None
@@ -675,6 +643,7 @@
         """
         f = QFile(fn)
         if f.open(QIODevice.ReadOnly):
+            from E5XML.ProjectReader import ProjectReader
             reader = ProjectReader(f, self)
             reader.readXML()
             res = not reader.hasError()
@@ -771,6 +740,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.WriteOnly):
+            from E5XML.ProjectWriter import ProjectWriter
             ProjectWriter(f, os.path.splitext(os.path.basename(fn))[0]).writeXML()
             res = True
         else:
@@ -804,6 +774,7 @@
         if os.path.exists(fn):
             f = QFile(fn)
             if f.open(QIODevice.ReadOnly):
+                from E5XML.UserProjectReader import UserProjectReader
                 reader = UserProjectReader(f, self)
                 reader.readXML()
                 f.close()
@@ -825,6 +796,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.WriteOnly):
+            from E5XML.UserProjectWriter import UserProjectWriter
             UserProjectWriter(f, os.path.splitext(os.path.basename(fn))[0]).writeXML()
             f.close()
         else:
@@ -854,6 +826,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.ReadOnly):
+            from E5XML.SessionReader import SessionReader
             reader = SessionReader(f, False)
             reader.readXML(quiet=quiet)
             f.close()
@@ -885,6 +858,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.WriteOnly):
+            from E5XML.SessionWriter import SessionWriter
             SessionWriter(f, os.path.splitext(os.path.basename(fn))[0]).writeXML()
             f.close()
         else:
@@ -932,6 +906,7 @@
             return
         f = QFile(fn)
         if f.open(QIODevice.ReadOnly):
+            from E5XML.TasksReader import TasksReader
             reader = TasksReader(f, True)
             reader.readXML()
             f.close()
@@ -960,6 +935,7 @@
                     .format(fn))
             return
         
+        from E5XML.TasksWriter import TasksWriter
         TasksWriter(f, True, os.path.splitext(os.path.basename(fn))[0]).writeXML()
         f.close()
         
@@ -982,6 +958,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.ReadOnly):
+            from E5XML.DebuggerPropertiesReader import DebuggerPropertiesReader
             reader = DebuggerPropertiesReader(f, self)
             reader.readXML(quiet=quiet)
             f.close()
@@ -1011,6 +988,7 @@
         
         f = QFile(fn)
         if f.open(QIODevice.WriteOnly):
+            from E5XML.DebuggerPropertiesWriter import DebuggerPropertiesWriter
             DebuggerPropertiesWriter(f, os.path.splitext(os.path.basename(fn))[0])\
                 .writeXML()
             f.close()
@@ -1072,6 +1050,7 @@
         """
         Private slot to display the debugger properties dialog.
         """
+        from .DebuggerPropertiesDialog import DebuggerPropertiesDialog
         dlg = DebuggerPropertiesDialog(self)
         if dlg.exec_() == QDialog.Accepted:
             dlg.storeData()
@@ -1137,6 +1116,7 @@
                 self.trUtf8("You have to specify a translation pattern first."))
             return
         
+        from .AddLanguageDialog import AddLanguageDialog
         dlg = AddLanguageDialog(self.parent())
         if dlg.exec_() == QDialog.Accepted:
             lang = dlg.getSelectedLanguage()
@@ -1348,6 +1328,7 @@
         """
         if startdir is None:
             startdir = self.ppath
+        from .AddFileDialog import AddFileDialog
         dlg = AddFileDialog(self, self.parent(), filter, startdir=startdir)
         if dlg.exec_() == QDialog.Accepted:
             fnames, target, isSource = dlg.getData()
@@ -1480,6 +1461,7 @@
         """
         if startdir is None:
             startdir = self.ppath
+        from .AddDirectoryDialog import AddDirectoryDialog
         dlg = AddDirectoryDialog(self, filter, self.parent(), startdir=startdir)
         if dlg.exec_() == QDialog.Accepted:
             filetype, source, target, recursive = dlg.getData()
@@ -1881,6 +1863,7 @@
         if not self.checkDirty():
             return
             
+        from .PropertiesDialog import PropertiesDialog
         dlg = PropertiesDialog(self, True)
         if dlg.exec_() == QDialog.Accepted:
             self.closeProject()
@@ -2039,6 +2022,8 @@
                                 self.trUtf8("""Would you like to edit the VCS"""
                                     """ command options?"""))
                             if vcores:
+                                from VCS.CommandOptionsDialog import \
+                                    vcsCommandOptionsDialog
                                 codlg = vcsCommandOptionsDialog(self.vcs)
                                 if codlg.exec_() == QDialog.Accepted:
                                     self.vcs.vcsSetOptions(codlg.getOptions())
@@ -2199,6 +2184,7 @@
         """
         Private slot to display the properties dialog.
         """
+        from .PropertiesDialog import PropertiesDialog
         dlg = PropertiesDialog(self, False)
         if dlg.exec_() == QDialog.Accepted:
             projectType = self.pdata["PROJECTTYPE"][0]
@@ -2246,6 +2232,7 @@
         vcsSystemOverride = \
             self.pudata["VCSOVERRIDE"] and self.pudata["VCSOVERRIDE"][0] or None
         
+        from .UserPropertiesDialog import UserPropertiesDialog
         dlg = UserPropertiesDialog(self)
         if dlg.exec_() == QDialog.Accepted:
             dlg.storeData()
@@ -2259,8 +2246,6 @@
                 # stop the VCS monitor thread and shutdown VCS
                 if self.vcs is not None:
                     self.vcs.stopStatusMonitor()
-##                    self.vcs.vcsStatusMonitorData.disconnect(self.__model.changeVCSStates)
-##                    self.vcs.vcsStatusMonitorStatus.disconnect(self.__statusMonitorStatus)
                     self.vcs.vcsShutdown()
                     self.vcs.deleteLater()
                     self.vcs = None
@@ -2285,6 +2270,7 @@
         """
         Public slot to display the filetype association dialog.
         """
+        from .FiletypeAssociationDialog import FiletypeAssociationDialog
         dlg = FiletypeAssociationDialog(self)
         if dlg.exec_() == QDialog.Accepted:
             dlg.transferData()
@@ -2294,6 +2280,7 @@
         """
         Public slot to display the lexer association dialog.
         """
+        from .LexerAssociationDialog import LexerAssociationDialog
         dlg = LexerAssociationDialog(self)
         if dlg.exec_() == QDialog.Accepted:
             dlg.transferData()
@@ -2623,16 +2610,6 @@
         # stop the VCS monitor thread
         if self.vcs is not None:
             self.vcs.stopStatusMonitor()
-##            try:
-##                self.vcs.vcsStatusMonitorData.disconnect(
-##                    self.__model.changeVCSStates)
-##            except TypeError:
-##                pass
-##            try:
-##                self.vcs.vcsStatusMonitorStatus.disconnect(
-##                    self.__statusMonitorStatus)
-##            except TypeError:
-##                pass
         
         # now save the tasks
         if not noSave:
@@ -3762,6 +3739,7 @@
             return
             
         # autoInclude is not set, show a dialog
+        from .AddFoundFilesDialog import AddFoundFilesDialog
         dlg = AddFoundFilesDialog(newFiles, self.parent(), None)
         res = dlg.exec_()
         
@@ -3871,6 +3849,7 @@
                 override = True
         
         if vcsSystem is not None:
+            import VCS
             try:
                 vcs = VCS.factory(vcsSystem)
             except ImportError:
@@ -3921,6 +3900,7 @@
                 pass
         
         if vcs is None:
+            from VCS.ProjectHelper import VcsProjectHelper
             self.vcsProjectHelper = VcsProjectHelper(None, self)
             self.vcsBasicHelper = True
         else:
@@ -3990,6 +3970,7 @@
         """
         files = [os.path.join(self.ppath, file) \
             for file in self.pdata["SOURCES"] if file.endswith(".py")]
+        from DataViews.CodeMetricsDialog import CodeMetricsDialog
         self.codemetrics = CodeMetricsDialog()
         self.codemetrics.show()
         self.codemetrics.prepare(files, self)
@@ -4036,6 +4017,7 @@
         
         files = [os.path.join(self.ppath, file) \
             for file in self.pdata["SOURCES"] if file.endswith(".py")]
+        from DataViews.PyCoverageDialog import PyCoverageDialog
         self.codecoverage = PyCoverageDialog()
         self.codecoverage.show()
         self.codecoverage.start(fn, files)
@@ -4080,6 +4062,7 @@
         else:
             return
         
+        from DataViews.PyProfileDialog import PyProfileDialog
         self.profiledata = PyProfileDialog()
         self.profiledata.show()
         self.profiledata.start(fn)
@@ -4125,6 +4108,7 @@
             self.trUtf8("""Include module names?"""),
             yesDefault=True)
         
+        from Graphics.UMLDialog import UMLDialog
         self.applicationDiagram = UMLDialog(UMLDialog.ApplicationDiagram, self,
                                             self.parent(), noModules=not res)
         self.applicationDiagram.show()
@@ -4133,6 +4117,7 @@
         """
         Private slot to load a diagram from file.
         """
+        from Graphics.UMLDialog import UMLDialog
         self.loadedDiagram = None
         loadedDiagram = UMLDialog(UMLDialog.NoDiagram, self, parent=self.parent())
         if loadedDiagram.load():

--- a/Project/ProjectBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -15,13 +15,6 @@
 from E5Gui.E5TabWidget import E5TabWidget
 from E5Gui.E5Led import E5Led
 
-from .ProjectSourcesBrowser import ProjectSourcesBrowser
-from .ProjectFormsBrowser import ProjectFormsBrowser
-from .ProjectTranslationsBrowser import ProjectTranslationsBrowser
-from .ProjectResourcesBrowser import ProjectResourcesBrowser
-from .ProjectInterfacesBrowser import ProjectInterfacesBrowser
-from .ProjectOthersBrowser import ProjectOthersBrowser
-
 import UI.PixmapCache
 import Preferences
 
@@ -82,6 +75,12 @@
         self.__vcsStateChanged(" ")
         
         # step 1: create all the individual browsers
+        from .ProjectSourcesBrowser import ProjectSourcesBrowser
+        from .ProjectFormsBrowser import ProjectFormsBrowser
+        from .ProjectTranslationsBrowser import ProjectTranslationsBrowser
+        from .ProjectResourcesBrowser import ProjectResourcesBrowser
+        from .ProjectInterfacesBrowser import ProjectInterfacesBrowser
+        from .ProjectOthersBrowser import ProjectOthersBrowser
         # sources browser
         self.psBrowser = ProjectSourcesBrowser(self.project)
         # forms browser

--- a/Project/ProjectFormsBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectFormsBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -22,7 +22,6 @@
     ProjectBrowserFormType
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 import UI.PixmapCache
 
 import Preferences
@@ -549,6 +548,7 @@
             fn = self.project.getRelativePath(fn2)
             files.append(fn)
         
+        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(self.parent(),
             self.trUtf8("Delete forms"),
             self.trUtf8("Do you really want to delete these forms from the project?"),

--- a/Project/ProjectInterfacesBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectInterfacesBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -23,7 +23,6 @@
 
 from UI.BrowserModel import BrowserFileItem, BrowserClassItem, BrowserMethodItem, \
     BrowserClassAttributeItem
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 import UI.PixmapCache
 
 import Preferences
@@ -386,6 +385,7 @@
             fn = self.project.getRelativePath(fn2)
             files.append(fn)
         
+        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(self.parent(),
             self.trUtf8("Delete interfaces"),
             self.trUtf8("Do you really want to delete these interfaces from"

--- a/Project/ProjectOthersBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectOthersBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -18,8 +18,6 @@
     ProjectBrowserOthersType
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-
 
 class ProjectOthersBrowser(ProjectBaseBrowser):
     """
@@ -283,6 +281,7 @@
         del dirFullNames
         del dirNames
         
+        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(self.parent(),
             self.trUtf8("Delete files/directories"),
             self.trUtf8("Do you really want to delete these entries from the project?"),

--- a/Project/ProjectResourcesBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectResourcesBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -20,7 +20,6 @@
     ProjectBrowserResourceType
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 import UI.PixmapCache
 
 import Preferences
@@ -453,6 +452,7 @@
             fn = self.project.getRelativePath(fn2)
             files.append(fn)
         
+        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(self.parent(),
             self.trUtf8("Delete resources"),
             self.trUtf8("Do you really want to delete these resources from the project?"),

--- a/Project/ProjectSourcesBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectSourcesBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -16,19 +16,11 @@
 
 from UI.BrowserModel import BrowserFileItem, BrowserClassItem, BrowserMethodItem, \
     BrowserClassAttributeItem
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-
-from DataViews.CodeMetricsDialog import CodeMetricsDialog
-from DataViews.PyCoverageDialog import PyCoverageDialog
-from DataViews.PyProfileDialog import PyProfileDialog
-
-from Graphics.UMLDialog import UMLDialog
 
 from .ProjectBrowserModel import ProjectBrowserFileItem, \
     ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
     ProjectBrowserSourceType
 from .ProjectBaseBrowser import ProjectBaseBrowser
-from .NewPythonPackageDialog import NewPythonPackageDialog
 
 import Utilities
 import UI.PixmapCache
@@ -621,6 +613,7 @@
         dn = self.project.getRelativePath(dn)
         if dn.startswith(os.sep):
             dn = dn[1:]
+        from .NewPythonPackageDialog import NewPythonPackageDialog
         dlg = NewPythonPackageDialog(dn, self)
         if dlg.exec_() == QDialog.Accepted:
             packageName = dlg.getData()
@@ -703,6 +696,7 @@
             fn = self.project.getRelativePath(fn2)
             files.append(fn)
         
+        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(self.parent(),
             self.trUtf8("Delete files"),
             self.trUtf8("Do you really want to delete these files from the project?"),
@@ -734,6 +728,7 @@
         itm = self.model().item(self.currentIndex())
         fn = itm.fileName()
         
+        from DataViews.CodeMetricsDialog import CodeMetricsDialog
         self.codemetrics = CodeMetricsDialog()
         self.codemetrics.show()
         self.codemetrics.start(fn)
@@ -787,6 +782,7 @@
         else:
             return
         
+        from DataViews.PyCoverageDialog import PyCoverageDialog
         self.codecoverage = PyCoverageDialog()
         self.codecoverage.show()
         self.codecoverage.start(pfn, fn)
@@ -840,6 +836,7 @@
         else:
             return
             
+        from DataViews.PyProfileDialog import PyProfileDialog
         self.profiledata = PyProfileDialog()
         self.profiledata.show()
         self.profiledata.start(pfn, fn)
@@ -867,6 +864,7 @@
             self.trUtf8("Class Diagram"),
             self.trUtf8("""Include class attributes?"""),
             yesDefault=True)
+        from Graphics.UMLDialog import UMLDialog
         self.classDiagram = UMLDialog(UMLDialog.ClassDiagram, self.project, fn,
                                       self, noAttrs=not res)
         self.classDiagram.show()
@@ -884,6 +882,7 @@
         res = E5MessageBox.yesNo(self,
             self.trUtf8("Imports Diagram"),
             self.trUtf8("""Include imports from external modules?"""))
+        from Graphics.UMLDialog import UMLDialog
         self.importsDiagram = UMLDialog(UMLDialog.ImportsDiagram, self.project, package,
                                         self, showExternalImports=res)
         self.importsDiagram.show()
@@ -902,6 +901,7 @@
             self.trUtf8("Package Diagram"),
             self.trUtf8("""Include class attributes?"""),
             yesDefault=True)
+        from Graphics.UMLDialog import UMLDialog
         self.packageDiagram = UMLDialog(UMLDialog.PackageDiagram, self.project, package,
                                         self, noAttrs=not res)
         self.packageDiagram.show()
@@ -914,6 +914,7 @@
             self.trUtf8("Application Diagram"),
             self.trUtf8("""Include module names?"""),
             yesDefault=True)
+        from Graphics.UMLDialog import UMLDialog
         self.applicationDiagram = UMLDialog(UMLDialog.ApplicationDiagram, self.project,
                                             self, noModules=not res)
         self.applicationDiagram.show()
@@ -922,6 +923,7 @@
         """
         Private slot to load a diagram from file.
         """
+        from Graphics.UMLDialog import UMLDialog
         self.loadedDiagram = None
         loadedDiagram = UMLDialog(UMLDialog.NoDiagram, self.project, parent=self)
         if loadedDiagram.load():

--- a/Project/ProjectTranslationsBrowser.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/ProjectTranslationsBrowser.py	Mon Feb 11 14:08:08 2013 +0100
@@ -22,7 +22,6 @@
     ProjectBrowserTranslationType
 from .ProjectBaseBrowser import ProjectBaseBrowser
 
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
 import UI.PixmapCache
 
 import Preferences
@@ -604,6 +603,7 @@
         
         translationFiles = [itm.fileName() for itm in itmList]
         
+        from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
         dlg = DeleteFilesConfirmationDialog(self.parent(),
             self.trUtf8("Delete translation files"),
             self.trUtf8("Do you really want to delete these translation files"

--- a/Project/PropertiesDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/PropertiesDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -17,10 +17,6 @@
 from E5Gui import E5FileDialog
 
 from .Ui_PropertiesDialog import Ui_PropertiesDialog
-from .TranslationPropertiesDialog import TranslationPropertiesDialog
-from .SpellingPropertiesDialog import SpellingPropertiesDialog
-
-from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 
 import Utilities
 import Preferences
@@ -162,6 +158,7 @@
         Private slot to display the spelling properties dialog.
         """
         if self.spellPropertiesDlg is None:
+            from .SpellingPropertiesDialog import SpellingPropertiesDialog
             self.spellPropertiesDlg = \
                 SpellingPropertiesDialog(self.project, self.newProject, self)
         res = self.spellPropertiesDlg.exec_()
@@ -174,6 +171,7 @@
         Private slot to display the translations properties dialog.
         """
         if self.transPropertiesDlg is None:
+            from .TranslationPropertiesDialog import TranslationPropertiesDialog
             self.transPropertiesDlg = \
                 TranslationPropertiesDialog(self.project, self.newProject, self)
         else:
@@ -217,6 +215,7 @@
         if self.project.vcs is None:
             return
             
+        from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
         info = self.project.vcs.vcsRepositoryInfos(self.project.ppath)
         dlg = VcsRepositoryInfoDialog(self, info)
         dlg.exec_()

--- a/Project/SpellingPropertiesDialog.py	Sun Feb 10 19:46:21 2013 +0100
+++ b/Project/SpellingPropertiesDialog.py	Mon Feb 11 14:08:08 2013 +0100
@@ -15,8 +15,6 @@
 from E5Gui.E5Completers import E5FileCompleter
 from E5Gui import E5FileDialog
 
-from QScintilla.SpellChecker import SpellChecker
-
 from .Ui_SpellingPropertiesDialog import Ui_SpellingPropertiesDialog
 
 import Utilities
@@ -44,6 +42,7 @@
         self.pwlCompleter = E5FileCompleter(self.pwlEdit)
         self.pelCompleter = E5FileCompleter(self.pelEdit)
         
+        from QScintilla.SpellChecker import SpellChecker
         self.spellingComboBox.addItem(self.trUtf8("<default>"))
         self.spellingComboBox.addItems(sorted(SpellChecker.getAvailableLanguages()))