diff -r 0665c4d509c9 -r d001bc703c29 eric6/Project/ProjectFormsBrowser.py
--- a/eric6/Project/ProjectFormsBrowser.py Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectFormsBrowser.py Wed Sep 25 18:25:43 2019 +0200
@@ -19,9 +19,10 @@
from E5Gui import E5MessageBox, E5FileDialog
from E5Gui.E5ProgressDialog import E5ProgressDialog
-from .ProjectBrowserModel import ProjectBrowserFileItem, \
- ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
- ProjectBrowserFormType
+from .ProjectBrowserModel import (
+ ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
+ ProjectBrowserDirectoryItem, ProjectBrowserFormType
+)
from .ProjectBaseBrowser import ProjectBaseBrowser
import UI.PixmapCache
@@ -61,8 +62,8 @@
ProjectBaseBrowser.__init__(self, project, ProjectBrowserFormType,
parent)
- self.selectedItemsFilter = \
- [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
+ self.selectedItemsFilter = [ProjectBrowserFileItem,
+ ProjectBrowserSimpleDirectoryItem]
self.setWindowTitle(self.tr('Forms'))
@@ -124,8 +125,9 @@
self.menusAboutToBeCreated.emit()
self.menu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.menu.addAction(
self.tr('Compile form'), self.__compileForm)
self.menu.addAction(
@@ -165,9 +167,11 @@
"generateDialogCode",
self.tr('Generate Dialog Code...')),
self.__generateDialogCode)
- if self.hooks["compileForm"] is not None or \
- self.hooks["compileAllForms"] is not None or \
- self.hooks["generateDialogCode"] is not None:
+ if (
+ self.hooks["compileForm"] is not None or
+ self.hooks["compileAllForms"] is not None or
+ self.hooks["generateDialogCode"] is not None
+ ):
self.menu.addSeparator()
if self.hooks["open"] is not None:
self.menu.addAction(
@@ -183,8 +187,9 @@
act = self.menu.addAction(self.tr('Delete'), self.__deleteFile)
self.menuActions.append(act)
self.menu.addSeparator()
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.menu.addAction(self.tr('New form...'), self.__newForm)
else:
if self.hooks["newForm"] is not None:
@@ -206,9 +211,12 @@
self.menu.addAction(self.tr('Configure...'), self._configure)
self.backMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"] or \
- self.hooks["compileAllForms"] is not None:
+ if (
+ self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ] or
+ self.hooks["compileAllForms"] is not None
+ ):
self.backMenu.addAction(
self.tr('Compile all forms'), self.__compileAllForms)
self.backMenu.addSeparator()
@@ -237,8 +245,9 @@
# create the menu for multiple selected files
self.multiMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.multiMenu.addAction(
self.tr('Compile forms'), self.__compileSelectedForms)
self.multiMenu.addSeparator()
@@ -283,8 +292,9 @@
self.multiMenu.addAction(self.tr('Configure...'), self._configure)
self.dirMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.dirMenu.addAction(
self.tr('Compile all forms'), self.__compileAllForms)
self.dirMenu.addSeparator()
@@ -307,8 +317,9 @@
self.tr('Delete'), self._deleteDirectory)
self.dirMenuActions.append(act)
self.dirMenu.addSeparator()
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.dirMenu.addAction(self.tr('New form...'), self.__newForm)
else:
if self.hooks["newForm"] is not None:
@@ -332,8 +343,9 @@
self.dirMenu.addAction(self.tr('Configure...'), self._configure)
self.dirMultiMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.dirMultiMenu.addAction(
self.tr('Compile all forms'), self.__compileAllForms)
self.dirMultiMenu.addSeparator()
@@ -458,8 +470,10 @@
itm = self.model().item(self.currentIndex())
if isinstance(itm, ProjectBrowserFileItem):
dn = os.path.dirname(itm.fileName())
- elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
- isinstance(itm, ProjectBrowserDirectoryItem):
+ elif isinstance(
+ itm,
+ (ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem)
+ ):
dn = itm.dirName()
else:
dn = None
@@ -472,8 +486,10 @@
itm = self.model().item(self.currentIndex())
if isinstance(itm, ProjectBrowserFileItem):
dn = os.path.dirname(itm.fileName())
- elif isinstance(itm, ProjectBrowserSimpleDirectoryItem) or \
- isinstance(itm, ProjectBrowserDirectoryItem):
+ elif isinstance(
+ itm,
+ (ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem)
+ ):
dn = itm.dirName()
else:
dn = None
@@ -554,8 +570,9 @@
if self.hooks["newForm"] is not None:
self.hooks["newForm"](path)
else:
- if self.project.getProjectType() in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
self.__newUiForm(path)
def __newUiForm(self, path):
@@ -635,8 +652,9 @@
fn = self.project.getRelativePath(fn2)
files.append(fn)
- from UI.DeleteFilesConfirmationDialog import \
+ from UI.DeleteFilesConfirmationDialog import (
DeleteFilesConfirmationDialog
+ )
dlg = DeleteFilesConfirmationDialog(
self.parent(),
self.tr("Delete forms"),
@@ -665,8 +683,9 @@
"""
self.__resetUiCompiler()
- if self.project.getProjectLanguage() in \
- ["Python", "Python2", "Python3"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2", "Python3"
+ ]:
if self.project.getProjectType() in ["Qt4", ]:
self.__uicompiler = Utilities.generatePyQtToolPath(
'pyuic4', ["py3uic4"])
@@ -677,17 +696,17 @@
self.__uicompiler = Utilities.generatePyQtToolPath(
'pyuic5', ["py3uic5"])
elif self.project.getProjectType() == "PySide":
- self.__uicompiler = \
- Utilities.generatePySideToolPath('pyside-uic', "1")
+ self.__uicompiler = Utilities.generatePySideToolPath(
+ 'pyside-uic', "1")
elif self.project.getProjectType() == "PySide2":
- self.__uicompiler = \
- Utilities.generatePySideToolPath('pyside2-uic', "2")
+ self.__uicompiler = Utilities.generatePySideToolPath(
+ 'pyside2-uic', "2")
elif self.project.getProjectLanguage() == "Ruby":
if self.project.getProjectType() == "Qt4":
self.__uicompiler = 'rbuic4'
if Utilities.isWindowsPlatform():
- self.__uicompiler = \
- Utilities.getWindowsExecutablePath(self.__uicompiler)
+ self.__uicompiler = Utilities.getWindowsExecutablePath(
+ self.__uicompiler)
def getUiCompiler(self):
"""
@@ -816,8 +835,9 @@
ofn, ext = os.path.splitext(fn)
fn = os.path.join(self.project.ppath, fn)
- if self.project.getProjectLanguage() in \
- ["Python", "Python2", "Python3"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2", "Python3"
+ ]:
dirname, filename = os.path.split(ofn)
self.compiledFile = os.path.join(dirname, "Ui_" + filename + ".py")
args.append("-x")
@@ -831,8 +851,10 @@
args.append("--from-imports")
else:
# PyQt4 and PyQt5
- if 'uic5' in uicompiler and \
- self.project.pdata["UICPARAMS"]["Package"]:
+ if (
+ 'uic5' in uicompiler and
+ self.project.pdata["UICPARAMS"]["Package"]
+ ):
args.append("--import-from={0}".format(
self.project.pdata["UICPARAMS"]["Package"]))
elif Preferences.getQt("PyuicFromImports"):
@@ -986,8 +1008,9 @@
if self.hooks["compileChangedForms"] is not None:
self.hooks["compileChangedForms"](self.project.pdata["FORMS"])
else:
- if self.project.getProjectType() not in \
- ["Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"]:
+ if self.project.getProjectType() not in [
+ "Qt4", "PyQt5", "E6Plugin", "PySide", "PySide2"
+ ]:
# ignore the request for non Qt GUI projects
return
@@ -1006,14 +1029,17 @@
QApplication.processEvents()
ifn = os.path.join(self.project.ppath, fn)
- if self.project.getProjectLanguage() in \
- ["Python", "Python2", "Python3"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2", "Python3"
+ ]:
dirname, filename = os.path.split(os.path.splitext(ifn)[0])
ofn = os.path.join(dirname, "Ui_" + filename + ".py")
elif self.project.getProjectLanguage() == "Ruby":
ofn = os.path.splitext(ifn)[0] + '.rb'
- if not os.path.exists(ofn) or \
- os.stat(ifn).st_mtime > os.stat(ofn).st_mtime:
+ if (
+ not os.path.exists(ofn) or
+ os.stat(ifn).st_mtime > os.stat(ofn).st_mtime
+ ):
changedForms.append(fn)
i += 1
progress.setValue(i)
