eric: comparison eric6/Project/Project.py

-:49f3377aebf1
+:787a6b3f8c9f
 import copy
 import zipfile
 from PyQt5.QtCore import (
 pyqtSlot, QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice,
-QByteArray, QObject, Qt, QProcess
+QByteArray, QObject, QProcess
 )
-from PyQt5.QtGui import QCursor, QKeySequence
+from PyQt5.QtGui import QKeySequence
 from PyQt5.QtWidgets import (
 QLineEdit, QToolBar, QDialog, QInputDialog, QApplication, QMenu, QAction
 )
 from PyQt5.Qsci import QsciScintilla
 from E5Gui.E5Application import e5App
 from E5Gui import E5FileDialog, E5MessageBox
 from E5Gui.E5ListSelectionDialog import E5ListSelectionDialog
 from E5Gui.E5ProgressDialog import E5ProgressDialog
+from E5Gui.E5OverrideCursor import E5OverrideCursor, E5OverridenCursor
 from Globals import recentNameProject
 import UI.PixmapCache
 reader = ProjectReader(f, self)
 reader.readXML()
 res = not reader.hasError()
 f.close()
 else:
-QApplication.restoreOverrideCursor()
 E5MessageBox.critical(
 self.ui,
 self.tr("Read project file"),
 self.tr(
 "<p>The project file <b>{0}</b> could not be read.</p>")
 @param mainscript name of the mainscript (string)
 """
 # Show the file type associations for the user to change
 self.__showFiletypeAssociations()
-QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+with E5OverrideCursor():
-QApplication.processEvents()
+# search the project directory for files with known extensions
+filespecs = list(self.pdata["FILETYPES"].keys())
-# search the project directory for files with known extensions
+for filespec in filespecs:
-filespecs = list(self.pdata["FILETYPES"].keys())
+files = Utilities.direntries(self.ppath, True, filespec)
-for filespec in filespecs:
+for file in files:
-files = Utilities.direntries(self.ppath, True, filespec)
+self.appendFile(file)
-for file in files:
-self.appendFile(file)
+# special handling for translation files
+if self.translationsRoot:
-# special handling for translation files
+tpd = os.path.join(self.ppath, self.translationsRoot)
-if self.translationsRoot:
+if not self.translationsRoot.endswith(os.sep):
-tpd = os.path.join(self.ppath, self.translationsRoot)
+tpd = os.path.dirname(tpd)
-if not self.translationsRoot.endswith(os.sep):
-tpd = os.path.dirname(tpd)
-else:
-tpd = self.ppath
-tslist = []
-if self.pdata["TRANSLATIONPATTERN"]:
-pattern = os.path.basename(self.pdata["TRANSLATIONPATTERN"])
-if "%language%" in pattern:
-pattern = pattern.replace("%language%", "*")
 else:
-tpd = self.pdata["TRANSLATIONPATTERN"].split(
+tpd = self.ppath
-"%language%")[0]
+tslist = []
-else:
+if self.pdata["TRANSLATIONPATTERN"]:
-pattern = "*.ts"
+pattern = os.path.basename(self.pdata["TRANSLATIONPATTERN"])
-tslist.extend(Utilities.direntries(tpd, True, pattern))
+if "%language%" in pattern:
-pattern = self.__binaryTranslationFile(pattern)
+pattern = pattern.replace("%language%", "*")
-if pattern:
+else:
+tpd = self.pdata["TRANSLATIONPATTERN"].split(
+"%language%")[0]
+else:
+pattern = "*.ts"
 tslist.extend(Utilities.direntries(tpd, True, pattern))
-if tslist:
+pattern = self.__binaryTranslationFile(pattern)
-if '_' in os.path.basename(tslist[0]):
+if pattern:
-# the first entry determines the mainscript name
+tslist.extend(Utilities.direntries(tpd, True, pattern))
-mainscriptname = (
+if tslist:
-os.path.splitext(mainscript)[0] or
+if '_' in os.path.basename(tslist[0]):
-os.path.basename(tslist[0]).split('_')[0]
+# the first entry determines the mainscript name
-)
+mainscriptname = (
-self.pdata["TRANSLATIONPATTERN"] = os.path.join(
+os.path.splitext(mainscript)[0] or
-os.path.dirname(tslist[0]),
+os.path.basename(tslist[0]).split('_')[0]
-"{0}_%language%{1}".format(
+)
-os.path.basename(tslist[0]).split('_')[0],
+self.pdata["TRANSLATIONPATTERN"] = os.path.join(
-os.path.splitext(tslist[0])[1]))
+os.path.dirname(tslist[0]),
-else:
+"{0}_%language%{1}".format(
-mainscriptname = ""
+os.path.basename(tslist[0]).split('_')[0],
-pattern, ok = QInputDialog.getText(
+os.path.splitext(tslist[0])[1]))
-None,
+else:
-self.tr("Translation Pattern"),
+mainscriptname = ""
-self.tr(
+pattern, ok = QInputDialog.getText(
-"Enter the path pattern for translation files "
+None,
-"(use '%language%' in place of the language code):"),
+self.tr("Translation Pattern"),
-# __IGNORE_WARNING_M601__
+self.tr(
-QLineEdit.Normal,
+"Enter the path pattern for translation files "
-tslist[0])
+"(use '%language%' in place of the language"
-if pattern:
+" code):"),
-self.pdata["TRANSLATIONPATTERN"] = pattern
+QLineEdit.Normal,
-if self.pdata["TRANSLATIONPATTERN"]:
+tslist[0])
-self.pdata["TRANSLATIONPATTERN"] = self.getRelativePath(
+if pattern:
-self.pdata["TRANSLATIONPATTERN"])
+self.pdata["TRANSLATIONPATTERN"] = pattern
-pattern = self.pdata["TRANSLATIONPATTERN"].replace(
+if self.pdata["TRANSLATIONPATTERN"]:
-"%language%", "*")
+self.pdata["TRANSLATIONPATTERN"] = self.getRelativePath(
-for ts in tslist:
+self.pdata["TRANSLATIONPATTERN"])
-if fnmatch.fnmatch(ts, pattern):
+pattern = self.pdata["TRANSLATIONPATTERN"].replace(
-self.pdata["TRANSLATIONS"].append(ts)
-self.projectLanguageAdded.emit(ts)
-if self.pdata["TRANSLATIONSBINPATH"]:
-tpd = os.path.join(self.ppath,
-self.pdata["TRANSLATIONSBINPATH"])
-pattern = os.path.basename(
-self.pdata["TRANSLATIONPATTERN"]).replace(
 "%language%", "*")
-pattern = self.__binaryTranslationFile(pattern)
+for ts in tslist:
-qmlist = Utilities.direntries(tpd, True, pattern)
+if fnmatch.fnmatch(ts, pattern):
-for qm in qmlist:
+self.pdata["TRANSLATIONS"].append(ts)
-self.pdata["TRANSLATIONS"].append(qm)
+self.projectLanguageAdded.emit(ts)
-self.projectLanguageAdded.emit(qm)
+if self.pdata["TRANSLATIONSBINPATH"]:
-if not self.pdata["MAINSCRIPT"] and bool(mainscriptname):
+tpd = os.path.join(self.ppath,
-if self.pdata["PROGLANGUAGE"] in [
+self.pdata["TRANSLATIONSBINPATH"])
-"Python3", "MicroPython"
+pattern = os.path.basename(
-]:
+self.pdata["TRANSLATIONPATTERN"]).replace(
-self.pdata["MAINSCRIPT"] = '{0}.py'.format(mainscriptname)
+"%language%", "*")
-elif self.pdata["PROGLANGUAGE"] == "Ruby":
+pattern = self.__binaryTranslationFile(pattern)
-self.pdata["MAINSCRIPT"] = '{0}.rb'.format(mainscriptname)
+qmlist = Utilities.direntries(tpd, True, pattern)
-self.setDirty(True)
+for qm in qmlist:
-QApplication.restoreOverrideCursor()
+self.pdata["TRANSLATIONS"].append(qm)
+self.projectLanguageAdded.emit(qm)
+if not self.pdata["MAINSCRIPT"] and bool(mainscriptname):
+if self.pdata["PROGLANGUAGE"] in [
+"Python3", "MicroPython"
+]:
+self.pdata["MAINSCRIPT"] = '{0}.py'.format(
+mainscriptname)
+elif self.pdata["PROGLANGUAGE"] == "Ruby":
+self.pdata["MAINSCRIPT"] = '{0}.rb'.format(
+mainscriptname)
+self.setDirty(True)
 def __showProperties(self):
 """
 Private slot to display the properties dialog.
 """
 QApplication.processEvents()
 if fn:
 if self.closeProject():
-QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+with E5OverrideCursor():
-QApplication.processEvents()
+ok = self.__readProject(fn)
-if self.__readProject(fn):
+if ok:
 self.opened = True
 if not self.pdata["FILETYPES"]:
 self.initFileTypes()
 else:
 self.updateFileTypes()
-QApplication.restoreOverrideCursor()
-QApplication.processEvents()
 try:
 # create management directory if not present
 self.createProjectManagementDir()
 except EnvironmentError:
 return
 # read a user specific project file
 self.__readUserProperties()
-QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+with E5OverrideCursor():
-QApplication.processEvents()
+oldState = self.isDirty()
+self.vcs = self.initVCS()
-oldState = self.isDirty()
+if self.vcs is None and self.isDirty() == oldState:
-self.vcs = self.initVCS()
+# check, if project is version controlled
-if self.vcs is None and self.isDirty() == oldState:
+pluginManager = e5App().getObject("PluginManager")
-# check, if project is version controlled
+for indicator, vcsData in (
-pluginManager = e5App().getObject("PluginManager")
+pluginManager.getVcsSystemIndicators().items()
-for indicator, vcsData in (
+):
-pluginManager.getVcsSystemIndicators().items()
+if os.path.exists(
-):
+os.path.join(self.ppath, indicator)):
-if os.path.exists(
+if len(vcsData) > 1:
-os.path.join(self.ppath, indicator)):
+vcsList = []
-if len(vcsData) > 1:
+for (
-vcsList = []
+_vcsSystemStr, vcsSystemDisplay
-for _vcsSystemStr, vcsSystemDisplay in (
+) in vcsData:
-vcsData
+vcsList.append(vcsSystemDisplay)
-):
+with E5OverridenCursor():
-vcsList.append(vcsSystemDisplay)
+res, vcs_ok = QInputDialog.getItem(
-QApplication.restoreOverrideCursor()
+None,
-res, vcs_ok = QInputDialog.getItem(
+self.tr("New Project"),
-None,
+self.tr(
-self.tr("New Project"),
+"Select Version Control"
-self.tr(
+" System"),
-"Select Version Control System"),
+vcsList,
-vcsList,
+0, False)
-0, False)
+if vcs_ok:
-QApplication.setOverrideCursor(
+for (
-QCursor(Qt.WaitCursor))
+vcsSystemStr, vcsSystemDisplay
-QApplication.processEvents()
+) in vcsData:
-if vcs_ok:
+if res == vcsSystemDisplay:
-for vcsSystemStr, vcsSystemDisplay in (
+vcsSystem = vcsSystemStr
-vcsData
+break
-):
+else:
-if res == vcsSystemDisplay:
+vcsSystem = "None"
-vcsSystem = vcsSystemStr
-break
 else:
 vcsSystem = "None"
 else:
-vcsSystem = "None"
+vcsSystem = vcsData[0][0]
-else:
+self.pdata["VCS"] = vcsSystem
-vcsSystem = vcsData[0][0]
+self.vcs = self.initVCS()
-self.pdata["VCS"] = vcsSystem
+self.setDirty(True)
-self.vcs = self.initVCS()
+if (
-self.setDirty(True)
+self.vcs is not None and
-if (
+(self.vcs.vcsRegisteredState(self.ppath) !=
-self.vcs is not None and
+self.vcs.canBeCommitted)
-(self.vcs.vcsRegisteredState(self.ppath) !=
+):
-self.vcs.canBeCommitted)
+self.pdata["VCS"] = 'None'
-):
+self.vcs = self.initVCS()
-self.pdata["VCS"] = 'None'
+self.closeAct.setEnabled(True)
-self.vcs = self.initVCS()
+self.saveasAct.setEnabled(True)
-self.closeAct.setEnabled(True)
+self.actGrp2.setEnabled(True)
-self.saveasAct.setEnabled(True)
+self.propsAct.setEnabled(True)
-self.actGrp2.setEnabled(True)
+self.userPropsAct.setEnabled(True)
-self.propsAct.setEnabled(True)
+self.filetypesAct.setEnabled(True)
-self.userPropsAct.setEnabled(True)
+self.lexersAct.setEnabled(True)
-self.filetypesAct.setEnabled(True)
+self.sessActGrp.setEnabled(True)
-self.lexersAct.setEnabled(True)
+self.dbgActGrp.setEnabled(True)
-self.sessActGrp.setEnabled(True)
+self.menuDebuggerAct.setEnabled(True)
-self.dbgActGrp.setEnabled(True)
+self.menuSessionAct.setEnabled(True)
-self.menuDebuggerAct.setEnabled(True)
+self.menuCheckAct.setEnabled(True)
-self.menuSessionAct.setEnabled(True)
+self.menuShowAct.setEnabled(True)
-self.menuCheckAct.setEnabled(True)
+self.menuDiagramAct.setEnabled(True)
-self.menuShowAct.setEnabled(True)
+self.menuApidocAct.setEnabled(True)
-self.menuDiagramAct.setEnabled(True)
+self.menuPackagersAct.setEnabled(True)
-self.menuApidocAct.setEnabled(True)
+self.pluginGrp.setEnabled(
-self.menuPackagersAct.setEnabled(True)
+self.pdata["PROJECTTYPE"] in ["E6Plugin"])
-self.pluginGrp.setEnabled(
+self.addLanguageAct.setEnabled(
-self.pdata["PROJECTTYPE"] in ["E6Plugin"])
+bool(self.pdata["TRANSLATIONPATTERN"]))
-self.addLanguageAct.setEnabled(
+self.makeGrp.setEnabled(
-bool(self.pdata["TRANSLATIONPATTERN"]))
+self.pdata["MAKEPARAMS"]["MakeEnabled"])
-self.makeGrp.setEnabled(
+self.menuMakeAct.setEnabled(
 self.pdata["MAKEPARAMS"]["MakeEnabled"])
-self.menuMakeAct.setEnabled(
-self.pdata["MAKEPARAMS"]["MakeEnabled"])
+# open a project debugger properties file being quiet
+# about errors
-# open a project debugger properties file being quiet
+if Preferences.getProject("AutoLoadDbgProperties"):
-# about errors
+self.__readDebugProperties(True)
-if Preferences.getProject("AutoLoadDbgProperties"):
-self.__readDebugProperties(True)
+self.__model.projectOpened()
+self.projectOpenedHooks.emit()
-self.__model.projectOpened()
+self.projectOpened.emit()
-self.projectOpenedHooks.emit()
-self.projectOpened.emit()
-QApplication.restoreOverrideCursor()
 if Preferences.getProject("SearchNewFiles"):
 self.__doSearchNewFiles()
 # read a project tasks file
 self.__statusMonitorStatus)
 self.vcs.vcsStatusMonitorInfo.connect(
 self.vcsStatusMonitorInfo)
 self.vcs.vcsStatusChanged.connect(
 self.__vcsStatusChanged)
-else:
-QApplication.restoreOverrideCursor()
 def reopenProject(self):
 """
 Public slot to reopen the current project.
 """
 @param fullname full name of the item to repopulate (string)
 """
 if not self.isOpen():
 return
-name = self.getRelativePath(fullname)
+with E5OverrideCursor():
-self.prepareRepopulateItem.emit(name)
+name = self.getRelativePath(fullname)
-self.__model.repopulateItem(name)
+self.prepareRepopulateItem.emit(name)
-self.completeRepopulateItem.emit(name)
+self.__model.repopulateItem(name)
+self.completeRepopulateItem.emit(name)
 ##############################################################
 ## Below is the VCS interface
 ##############################################################
 if vcs:
 vcsExists, msg = vcs.vcsExists()
 if not vcsExists:
 if override:
 # override failed, revert to original
-QApplication.restoreOverrideCursor()
+with E5OverridenCursor():
+E5MessageBox.critical(
+self.ui,
+self.tr("Version Control System"),
+self.tr(
+"<p>The selected VCS <b>{0}</b> could not be"
+" found. <br/>Reverting override.</p><p>{1}"
+"</p>")
+.format(vcsSystem, msg))
+self.pudata["VCSOVERRIDE"] = ""
+return self.initVCS(nooverride=True)
+with E5OverridenCursor():
 E5MessageBox.critical(
 self.ui,
 self.tr("Version Control System"),
 self.tr(
 "<p>The selected VCS <b>{0}</b> could not be"
-" found. <br/>Reverting override.</p><p>{1}</p>")
+" found.<br/>Disabling version control.</p>"
-.format(vcsSystem, msg))
+"<p>{1}</p>").format(vcsSystem, msg))
-self.pudata["VCSOVERRIDE"] = ""
-return self.initVCS(nooverride=True)
-QApplication.restoreOverrideCursor()
-E5MessageBox.critical(
-self.ui,
-self.tr("Version Control System"),
-self.tr(
-"<p>The selected VCS <b>{0}</b> could not be"
-" found.<br/>Disabling version control.</p>"
-"<p>{1}</p>").format(vcsSystem, msg))
 vcs = None
 if forProject:
 self.pdata["VCS"] = 'None'
 self.setDirty(True)
 else:
 "CompressionThreshold": 70,     # default value
 "CompressLevel": 0,             # use zlib default
 "CompressionDisable": False,
 "PathPrefix": "",
 }
+#
+# eflag: noqa = M601

Mercurial Repositories > eric / file comparison

comparison: eric6/Project/Project.py

eric6/Project/Project.py