--- a/Project/ProjectResourcesBrowser.py Fri Oct 18 23:00:41 2013 +0200
+++ b/Project/ProjectResourcesBrowser.py Fri Nov 01 15:48:48 2013 +0100
@@ -86,20 +86,24 @@
self.menu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
- self.menu.addAction(self.trUtf8('Compile resource'),
+ self.menu.addAction(
+ self.trUtf8('Compile resource'),
self.__compileResource)
- self.menu.addAction(self.trUtf8('Compile all resources'),
+ self.menu.addAction(
+ self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.menu.addSeparator()
else:
if self.hooks["compileResource"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("compileResource",
+ self.hooksMenuEntries.get(
+ "compileResource",
self.trUtf8('Compile resource')),
self.__compileResource)
if self.hooks["compileAllResources"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("compileAllResources",
+ self.hooksMenuEntries.get(
+ "compileAllResources",
self.trUtf8('Compile all resources')),
self.__compileAllResources)
if self.hooks["compileResource"] is not None or \
@@ -122,27 +126,30 @@
else:
if self.hooks["newResource"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("newResource",
+ self.hooksMenuEntries.get(
+ "newResource",
self.trUtf8('New resource...')), self.__newResource)
self.menu.addAction(
self.trUtf8('Add resources...'), self.__addResourceFiles)
- self.menu.addAction(self.trUtf8('Add resources directory...'),
+ self.menu.addAction(
+ self.trUtf8('Add resources directory...'),
self.__addResourcesDirectory)
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8('Copy Path to Clipboard'),
- self._copyToClipboard)
+ self.menu.addAction(
+ self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard)
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8('Expand all directories'),
- self._expandAllDirs)
- self.menu.addAction(self.trUtf8('Collapse all directories'),
- self._collapseAllDirs)
+ self.menu.addAction(
+ self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.menu.addAction(
+ self.trUtf8('Collapse all directories'), self._collapseAllDirs)
self.menu.addSeparator()
self.menu.addAction(self.trUtf8('Configure...'), self._configure)
self.backMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
- self.backMenu.addAction(self.trUtf8('Compile all resources'),
+ self.backMenu.addAction(
+ self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.backMenu.addSeparator()
self.backMenu.addAction(
@@ -150,23 +157,26 @@
else:
if self.hooks["compileAllResources"] is not None:
self.backMenu.addAction(
- self.hooksMenuEntries.get("compileAllResources",
+ self.hooksMenuEntries.get(
+ "compileAllResources",
self.trUtf8('Compile all resources')),
self.__compileAllResources)
self.backMenu.addSeparator()
if self.hooks["newResource"] is not None:
self.backMenu.addAction(
- self.hooksMenuEntries.get("newResource",
+ self.hooksMenuEntries.get(
+ "newResource",
self.trUtf8('New resource...')), self.__newResource)
- self.backMenu.addAction(self.trUtf8('Add resources...'),
- self.project.addResourceFiles)
- self.backMenu.addAction(self.trUtf8('Add resources directory...'),
+ self.backMenu.addAction(
+ self.trUtf8('Add resources...'), self.project.addResourceFiles)
+ self.backMenu.addAction(
+ self.trUtf8('Add resources directory...'),
self.project.addResourceDir)
self.backMenu.addSeparator()
- self.backMenu.addAction(self.trUtf8('Expand all directories'),
- self._expandAllDirs)
- self.backMenu.addAction(self.trUtf8('Collapse all directories'),
- self._collapseAllDirs)
+ self.backMenu.addAction(
+ self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.backMenu.addAction(
+ self.trUtf8('Collapse all directories'), self._collapseAllDirs)
self.backMenu.addSeparator()
self.backMenu.addAction(self.trUtf8('Configure...'), self._configure)
self.backMenu.setEnabled(False)
@@ -175,42 +185,46 @@
self.multiMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
- act = self.multiMenu.addAction(self.trUtf8('Compile resources'),
+ act = self.multiMenu.addAction(
+ self.trUtf8('Compile resources'),
self.__compileSelectedResources)
self.multiMenu.addSeparator()
else:
if self.hooks["compileSelectedResources"] is not None:
act = self.multiMenu.addAction(
- self.hooksMenuEntries.get("compileSelectedResources",
+ self.hooksMenuEntries.get(
+ "compileSelectedResources",
self.trUtf8('Compile resources')),
self.__compileSelectedResources)
self.multiMenu.addSeparator()
self.multiMenu.addAction(self.trUtf8('Open'), self.__openFile)
self.multiMenu.addSeparator()
- act = self.multiMenu.addAction(self.trUtf8('Remove from project'),
- self._removeFile)
+ act = self.multiMenu.addAction(
+ self.trUtf8('Remove from project'), self._removeFile)
self.multiMenuActions.append(act)
act = self.multiMenu.addAction(
self.trUtf8('Delete'), self.__deleteFile)
self.multiMenuActions.append(act)
self.multiMenu.addSeparator()
- self.multiMenu.addAction(self.trUtf8('Expand all directories'),
- self._expandAllDirs)
- self.multiMenu.addAction(self.trUtf8('Collapse all directories'),
- self._collapseAllDirs)
+ self.multiMenu.addAction(
+ self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.multiMenu.addAction(
+ self.trUtf8('Collapse all directories'), self._collapseAllDirs)
self.multiMenu.addSeparator()
self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure)
self.dirMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
- self.dirMenu.addAction(self.trUtf8('Compile all resources'),
+ self.dirMenu.addAction(
+ self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.dirMenu.addSeparator()
else:
if self.hooks["compileAllResources"] is not None:
self.dirMenu.addAction(
- self.hooksMenuEntries.get("compileAllResources",
+ self.hooksMenuEntries.get(
+ "compileAllResources",
self.trUtf8('Compile all resources')),
self.__compileAllResources)
self.dirMenu.addSeparator()
@@ -225,41 +239,46 @@
self.trUtf8('New resource...'), self.__newResource)
self.dirMenu.addAction(
self.trUtf8('Add resources...'), self.__addResourceFiles)
- self.dirMenu.addAction(self.trUtf8('Add resources directory...'),
+ self.dirMenu.addAction(
+ self.trUtf8('Add resources directory...'),
self.__addResourcesDirectory)
self.dirMenu.addSeparator()
- self.dirMenu.addAction(self.trUtf8('Copy Path to Clipboard'),
- self._copyToClipboard)
+ self.dirMenu.addAction(
+ self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard)
self.dirMenu.addSeparator()
- self.dirMenu.addAction(self.trUtf8('Expand all directories'),
- self._expandAllDirs)
- self.dirMenu.addAction(self.trUtf8('Collapse all directories'),
- self._collapseAllDirs)
+ self.dirMenu.addAction(
+ self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.dirMenu.addAction(
+ self.trUtf8('Collapse all directories'), self._collapseAllDirs)
self.dirMenu.addSeparator()
self.dirMenu.addAction(self.trUtf8('Configure...'), self._configure)
self.dirMultiMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
- self.dirMultiMenu.addAction(self.trUtf8('Compile all resources'),
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Compile all resources'),
self.__compileAllResources)
self.dirMultiMenu.addSeparator()
else:
if self.hooks["compileAllResources"] is not None:
self.dirMultiMenu.addAction(
- self.hooksMenuEntries.get("compileAllResources",
+ self.hooksMenuEntries.get(
+ "compileAllResources",
self.trUtf8('Compile all resources')),
self.__compileAllResources)
self.dirMultiMenu.addSeparator()
- self.dirMultiMenu.addAction(self.trUtf8('Add resources...'),
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Add resources...'),
self.project.addResourceFiles)
- self.dirMultiMenu.addAction(self.trUtf8('Add resources directory...'),
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Add resources directory...'),
self.project.addResourceDir)
self.dirMultiMenu.addSeparator()
- self.dirMultiMenu.addAction(self.trUtf8('Expand all directories'),
- self._expandAllDirs)
- self.dirMultiMenu.addAction(self.trUtf8('Collapse all directories'),
- self._collapseAllDirs)
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Expand all directories'), self._expandAllDirs)
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Collapse all directories'), self._collapseAllDirs)
self.dirMultiMenu.addSeparator()
self.dirMultiMenu.addAction(
self.trUtf8('Configure...'), self._configure)
@@ -434,7 +453,8 @@
fname += ex
if os.path.exists(fname):
- res = E5MessageBox.yesNo(self,
+ res = E5MessageBox.yesNo(
+ self,
self.trUtf8("New Resource"),
self.trUtf8("The file already exists! Overwrite it?"),
icon=E5MessageBox.Warning)
@@ -455,9 +475,11 @@
rcfile.write('</RCC>\n')
rcfile.close()
except IOError as e:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("New Resource"),
- self.trUtf8("<p>The new resource file <b>{0}</b> could not"
+ self.trUtf8(
+ "<p>The new resource file <b>{0}</b> could not"
" be created.<br>Problem: {1}</p>")\
.format(fname, str(e)))
return
@@ -481,7 +503,8 @@
from UI.DeleteFilesConfirmationDialog import \
DeleteFilesConfirmationDialog
- dlg = DeleteFilesConfirmationDialog(self.parent(),
+ dlg = DeleteFilesConfirmationDialog(
+ self.parent(),
self.trUtf8("Delete resources"),
self.trUtf8(
"Do you really want to delete these resources from the"
@@ -553,26 +576,29 @@
if self.compiledFile not in self.project.pdata["SOURCES"]:
self.project.appendFile(ofn)
if not self.noDialog and not ui.notificationsEnabled():
- E5MessageBox.information(self,
+ E5MessageBox.information(
+ self,
self.trUtf8("Resource Compilation"),
self.trUtf8("The compilation of the resource file"
- " was successful."))
+ " was successful."))
else:
ui.showNotification(
UI.PixmapCache.getPixmap("resourcesCompiler48.png"),
self.trUtf8("Resource Compilation"),
self.trUtf8("The compilation of the resource file"
- " was successful."))
+ " was successful."))
except IOError as msg:
if not self.noDialog:
- E5MessageBox.information(self,
+ E5MessageBox.information(
+ self,
self.trUtf8("Resource Compilation"),
self.trUtf8(
"<p>The compilation of the resource file"
" failed.</p><p>Reason: {0}</p>").format(str(msg)))
else:
if not self.noDialog:
- E5MessageBox.information(self,
+ E5MessageBox.information(
+ self,
self.trUtf8("Resource Compilation"),
self.trUtf8(
"The compilation of the resource file failed."))
@@ -663,7 +689,8 @@
self.compileRunning = False
if progress is not None:
progress.cancel()
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8('Process Generation Error'),
self.trUtf8(
'Could not start {0}.<br>'
@@ -691,7 +718,8 @@
self.hooks["compileAllResources"](self.project.pdata["RESOURCES"])
else:
numResources = len(self.project.pdata["RESOURCES"])
- progress = QProgressDialog(self.trUtf8("Compiling resources..."),
+ progress = QProgressDialog(
+ self.trUtf8("Compiling resources..."),
self.trUtf8("Abort"), 0, numResources, self)
progress.setModal(True)
progress.setMinimumDuration(0)
@@ -725,7 +753,8 @@
self.hooks["compileSelectedResources"](files)
else:
numResources = len(files)
- progress = QProgressDialog(self.trUtf8("Compiling resources..."),
+ progress = QProgressDialog(
+ self.trUtf8("Compiling resources..."),
self.trUtf8("Abort"), 0, numResources, self)
progress.setModal(True)
progress.setMinimumDuration(0)
