diff -r 0665c4d509c9 -r d001bc703c29 eric6/Project/ProjectResourcesBrowser.py
--- a/eric6/Project/ProjectResourcesBrowser.py Tue Sep 24 19:44:17 2019 +0200
+++ b/eric6/Project/ProjectResourcesBrowser.py Wed Sep 25 18:25:43 2019 +0200
@@ -17,9 +17,10 @@
from E5Gui import E5MessageBox, E5FileDialog
from E5Gui.E5ProgressDialog import E5ProgressDialog
-from .ProjectBrowserModel import ProjectBrowserFileItem, \
- ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
- ProjectBrowserResourceType
+from .ProjectBrowserModel import (
+ ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
+ ProjectBrowserDirectoryItem, ProjectBrowserResourceType
+)
from .ProjectBaseBrowser import ProjectBaseBrowser
import UI.PixmapCache
@@ -53,8 +54,8 @@
ProjectBaseBrowser.__init__(self, project, ProjectBrowserResourceType,
parent)
- self.selectedItemsFilter = \
- [ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem]
+ self.selectedItemsFilter = [ProjectBrowserFileItem,
+ ProjectBrowserSimpleDirectoryItem]
self.setWindowTitle(self.tr('Resources'))
@@ -77,9 +78,10 @@
self.dirMultiMenuActions = []
self.menu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+ "PySide", "PySideC", "PySide2", "PySideC2"
+ ]:
self.menu.addAction(
self.tr('Compile resource'),
self.__compileResource)
@@ -104,8 +106,10 @@
"compileAllResources",
self.tr('Compile all resources')),
self.__compileAllResources)
- if self.hooks["compileResource"] is not None or \
- self.hooks["compileAllResources"] is not None:
+ if (
+ self.hooks["compileResource"] is not None or
+ self.hooks["compileAllResources"] is not None
+ ):
self.menu.addSeparator()
self.menu.addAction(self.tr('Open'), self.__openFile)
self.menu.addSeparator()
@@ -117,9 +121,10 @@
act = self.menu.addAction(self.tr('Delete'), self.__deleteFile)
self.menuActions.append(act)
self.menu.addSeparator()
- if self.project.getProjectType() in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+ "PySide", "PySideC", "PySide2", "PySideC2"
+ ]:
self.menu.addAction(
self.tr('New resource...'), self.__newResource)
else:
@@ -145,9 +150,10 @@
self.menu.addAction(self.tr('Configure...'), self._configure)
self.backMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+ "PySide", "PySideC", "PySide2", "PySideC2"
+ ]:
self.backMenu.addAction(
self.tr('Compile all resources'),
self.__compileAllResources)
@@ -187,9 +193,10 @@
# create the menu for multiple selected files
self.multiMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+ "PySide", "PySideC", "PySide2", "PySideC2"
+ ]:
act = self.multiMenu.addAction(
self.tr('Compile resources'),
self.__compileSelectedResources)
@@ -223,9 +230,10 @@
self.multiMenu.addAction(self.tr('Configure...'), self._configure)
self.dirMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+ "PySide", "PySideC", "PySide2", "PySideC2"
+ ]:
self.dirMenu.addAction(
self.tr('Compile all resources'),
self.__compileAllResources)
@@ -268,9 +276,10 @@
self.dirMenu.addAction(self.tr('Configure...'), self._configure)
self.dirMultiMenu = QMenu(self)
- if self.project.getProjectType() in \
- ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
- "PySide", "PySideC", "PySide2", "PySideC2"]:
+ if self.project.getProjectType() in [
+ "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
+ "PySide", "PySideC", "PySide2", "PySideC2"
+ ]:
self.dirMultiMenu.addAction(
self.tr('Compile all resources'),
self.__compileAllResources)
@@ -398,8 +407,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
@@ -412,8 +423,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
@@ -520,8 +533,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 resources"),
@@ -642,12 +656,14 @@
args = []
self.buf = ""
- if self.project.getProjectLanguage() in \
- ["Python", "Python2", "Python3"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2", "Python3"
+ ]:
if self.project.getProjectType() in ["Qt4", "Qt4C"]:
self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc4')
- if self.project.getProjectLanguage() in \
- ["Python", "Python2"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2"
+ ]:
args.append("-py2")
else:
args.append("-py3")
@@ -658,16 +674,18 @@
elif self.project.getProjectType() in ["PySide", "PySideC"]:
self.rccCompiler = Utilities.generatePySideToolPath(
'pyside-rcc', "1")
- if self.project.getProjectLanguage() in \
- ["Python", "Python2"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2"
+ ]:
args.append("-py2")
else:
args.append("-py3")
elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
self.rccCompiler = Utilities.generatePySideToolPath(
'pyside2-rcc', "2")
- if self.project.getProjectLanguage() in \
- ["Python", "Python2"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2"
+ ]:
args.append("-py2")
else:
args.append("-py3")
@@ -675,19 +693,24 @@
return None
defaultParameters = self.project.getDefaultRccCompilerParameters()
rccParameters = self.project.pdata["RCCPARAMS"]
- if rccParameters["CompressionThreshold"] != \
- defaultParameters["CompressionThreshold"]:
+ if (
+ rccParameters["CompressionThreshold"] !=
+ defaultParameters["CompressionThreshold"]
+ ):
args.append("-threshold")
args.append(str(rccParameters["CompressionThreshold"]))
- if rccParameters["CompressLevel"] != \
- defaultParameters["CompressLevel"]:
+ if (
+ rccParameters["CompressLevel"] !=
+ defaultParameters["CompressLevel"]
+ ):
args.append("-compress")
args.append(str(rccParameters["CompressLevel"]))
- if rccParameters["CompressionDisable"] != \
- defaultParameters["CompressionDisable"]:
+ if (
+ rccParameters["CompressionDisable"] !=
+ defaultParameters["CompressionDisable"]
+ ):
args.append("-no-compress")
- if rccParameters["PathPrefix"] != \
- defaultParameters["PathPrefix"]:
+ if rccParameters["PathPrefix"] != defaultParameters["PathPrefix"]:
args.append("-root")
args.append(rccParameters["PathPrefix"])
elif self.project.getProjectLanguage() == "Ruby":
@@ -706,8 +729,9 @@
fn = os.path.join(self.project.ppath, fn)
dirname, filename = os.path.split(ofn)
- if self.project.getProjectLanguage() in \
- ["Python", "Python2", "Python3"]:
+ if self.project.getProjectLanguage() in [
+ "Python", "Python2", "Python3"
+ ]:
self.compiledFile = os.path.join(
dirname, self.RCFilenameFormatPython.format(filename))
elif self.project.getProjectLanguage() == "Ruby":
@@ -842,8 +866,10 @@
lbuf = ""
for line in buf.splitlines():
line = line.strip()
- if line.lower().startswith("<file>") or \
- line.lower().startswith("<file "):
+ if (
+ line.lower().startswith("<file>") or
+ line.lower().startswith("<file ")
+ ):
lbuf = line
elif lbuf:
lbuf = "{0}{1}".format(lbuf, line)
@@ -851,8 +877,10 @@
rfile = lbuf.split(">", 1)[1].split("<", 1)[0]
if not os.path.isabs(rfile):
rfile = os.path.join(qrcDirName, rfile)
- if os.path.exists(rfile) and \
- os.stat(rfile).st_mtime > mtime:
+ if (
+ os.path.exists(rfile) and
+ os.stat(rfile).st_mtime > mtime
+ ):
return True
lbuf = ""
@@ -881,8 +909,9 @@
progress.setValue(i)
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, self.RCFilenameFormatPython.format(filename))
@@ -892,8 +921,10 @@
dirname, self.RCFilenameFormatRuby.format(filename))
else:
return
- 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
+ ):
changedResources.append(fn)
elif self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime):
changedResources.append(fn)
