--- a/Project/ProjectFormsBrowser.py Fri Oct 18 23:00:41 2013 +0200
+++ b/Project/ProjectFormsBrowser.py Fri Nov 01 15:48:48 2013 +0100
@@ -83,13 +83,15 @@
# templates for Qt4
# these two lists have to stay in sync
- self.templates4 = ['dialog4.tmpl', 'widget4.tmpl', 'mainwindow4.tmpl',
+ self.templates4 = [
+ 'dialog4.tmpl', 'widget4.tmpl', 'mainwindow4.tmpl',
'dialogbuttonboxbottom4.tmpl', 'dialogbuttonboxright4.tmpl',
'dialogbuttonsbottom4.tmpl', 'dialogbuttonsbottomcenter4.tmpl',
'dialogbuttonsright4.tmpl', '', 'wizard4.tmpl', 'wizardpage4.tmpl',
'qdockwidget4.tmpl', 'qframe4.tmpl', 'qgroupbox4.tmpl',
'qscrollarea4.tmpl', 'qmdiarea4.tmpl', 'qtabwidget4.tmpl',
- 'qtoolbox4.tmpl', 'qstackedwidget4.tmpl']
+ 'qtoolbox4.tmpl', 'qstackedwidget4.tmpl'
+ ]
self.templateTypes4 = [
self.trUtf8("Dialog"),
self.trUtf8("Widget"),
@@ -130,9 +132,11 @@
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
self.menu.addAction(
self.trUtf8('Compile form'), self.__compileForm)
- self.menu.addAction(self.trUtf8('Compile all forms'),
+ self.menu.addAction(
+ self.trUtf8('Compile all forms'),
self.__compileAllForms)
- self.menu.addAction(self.trUtf8('Generate Dialog Code...'),
+ self.menu.addAction(
+ self.trUtf8('Generate Dialog Code...'),
self.__generateDialogCode)
self.menu.addSeparator()
self.menu.addAction(
@@ -146,16 +150,19 @@
else:
if self.hooks["compileForm"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("compileForm",
+ self.hooksMenuEntries.get(
+ "compileForm",
self.trUtf8('Compile form')), self.__compileForm)
if self.hooks["compileAllForms"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("compileAllForms",
+ self.hooksMenuEntries.get(
+ "compileAllForms",
self.trUtf8('Compile all forms')),
self.__compileAllForms)
if self.hooks["generateDialogCode"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("generateDialogCode",
+ self.hooksMenuEntries.get(
+ "generateDialogCode",
self.trUtf8('Generate Dialog Code...')),
self.__generateDialogCode)
if self.hooks["compileForm"] is not None or \
@@ -182,19 +189,19 @@
else:
if self.hooks["newForm"] is not None:
self.menu.addAction(
- self.hooksMenuEntries.get("newForm",
- self.trUtf8('New form...')), self.__newForm)
+ self.hooksMenuEntries.get(
+ "newForm", self.trUtf8('New form...')), self.__newForm)
self.menu.addAction(self.trUtf8('Add forms...'), self.__addFormFiles)
- self.menu.addAction(self.trUtf8('Add forms directory...'),
- self.__addFormsDirectory)
+ self.menu.addAction(
+ self.trUtf8('Add forms directory...'), self.__addFormsDirectory)
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)
@@ -202,24 +209,24 @@
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"] or \
self.hooks["compileAllForms"] is not None:
- self.backMenu.addAction(self.trUtf8('Compile all forms'),
- self.__compileAllForms)
+ self.backMenu.addAction(
+ self.trUtf8('Compile all forms'), self.__compileAllForms)
self.backMenu.addSeparator()
self.backMenu.addAction(self.trUtf8('New form...'), self.__newForm)
else:
if self.hooks["newForm"] is not None:
self.backMenu.addAction(
- self.hooksMenuEntries.get("newForm",
- self.trUtf8('New form...')), self.__newForm)
+ self.hooksMenuEntries.get(
+ "newForm", self.trUtf8('New form...')), self.__newForm)
self.backMenu.addAction(
self.trUtf8('Add forms...'), self.project.addUiFiles)
- self.backMenu.addAction(self.trUtf8('Add forms directory...'),
- self.project.addUiDir)
+ self.backMenu.addAction(
+ self.trUtf8('Add forms directory...'), self.project.addUiDir)
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)
@@ -228,20 +235,21 @@
self.multiMenu = QMenu(self)
if self.project.getProjectType() in \
["Qt4", "PyQt5", "E4Plugin", "PySide"]:
- act = self.multiMenu.addAction(self.trUtf8('Compile forms'),
- self.__compileSelectedForms)
+ act = self.multiMenu.addAction(
+ self.trUtf8('Compile forms'), self.__compileSelectedForms)
self.multiMenu.addSeparator()
- self.multiMenu.addAction(self.trUtf8('Open in Qt-Designer'),
- self.__openFile)
- self.multiMenu.addAction(self.trUtf8('Open in Editor'),
- self.__openFileInEditor)
+ self.multiMenu.addAction(
+ self.trUtf8('Open in Qt-Designer'), self.__openFile)
+ self.multiMenu.addAction(
+ self.trUtf8('Open in Editor'), self.__openFileInEditor)
self.multiMenu.addSeparator()
- self.multiMenu.addAction(self.trUtf8('Preview translations'),
- self.__TRPreview)
+ self.multiMenu.addAction(
+ self.trUtf8('Preview translations'), self.__TRPreview)
else:
if self.hooks["compileSelectedForms"] is not None:
act = self.multiMenu.addAction(
- self.hooksMenuEntries.get("compileSelectedForms",
+ self.hooksMenuEntries.get(
+ "compileSelectedForms",
self.trUtf8('Compile forms')),
self.__compileSelectedForms)
self.multiMenu.addSeparator()
@@ -252,30 +260,31 @@
self.multiMenu.addAction(
self.trUtf8('Open'), self.__openFileInEditor)
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 forms'),
- self.__compileAllForms)
+ self.dirMenu.addAction(
+ self.trUtf8('Compile all forms'), self.__compileAllForms)
self.dirMenu.addSeparator()
else:
if self.hooks["compileAllForms"] is not None:
self.dirMenu.addAction(
- self.hooksMenuEntries.get("compileAllForms",
+ self.hooksMenuEntries.get(
+ "compileAllForms",
self.trUtf8('Compile all forms')),
self.__compileAllForms)
self.dirMenu.addSeparator()
@@ -292,45 +301,47 @@
else:
if self.hooks["newForm"] is not None:
self.dirMenu.addAction(
- self.hooksMenuEntries.get("newForm",
+ self.hooksMenuEntries.get(
+ "newForm",
self.trUtf8('New form...')), self.__newForm)
self.dirMenu.addAction(
self.trUtf8('Add forms...'), self.__addFormFiles)
- self.dirMenu.addAction(self.trUtf8('Add forms directory...'),
- self.__addFormsDirectory)
+ self.dirMenu.addAction(
+ self.trUtf8('Add forms directory...'), self.__addFormsDirectory)
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 forms'),
- self.__compileAllForms)
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Compile all forms'), self.__compileAllForms)
self.dirMultiMenu.addSeparator()
else:
if self.hooks["compileAllForms"] is not None:
self.dirMultiMenu.addAction(
- self.hooksMenuEntries.get("compileAllForms",
+ self.hooksMenuEntries.get(
+ "compileAllForms",
self.trUtf8('Compile all forms')),
self.__compileAllForms)
self.dirMultiMenu.addSeparator()
- self.dirMultiMenu.addAction(self.trUtf8('Add forms...'),
- self.project.addUiFiles)
- self.dirMultiMenu.addAction(self.trUtf8('Add forms directory...'),
- self.project.addUiDir)
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Add forms...'), self.project.addUiFiles)
+ self.dirMultiMenu.addAction(
+ self.trUtf8('Add forms directory...'), self.project.addUiDir)
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)
@@ -549,8 +560,8 @@
return
templateIndex = self.templateTypes4.index(selectedForm)
- templateFile = os.path.join(getConfig('ericTemplatesDir'),
- self.templates4[templateIndex])
+ templateFile = os.path.join(
+ getConfig('ericTemplatesDir'), self.templates4[templateIndex])
fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
self,
@@ -571,7 +582,8 @@
fname += ex
if os.path.exists(fname):
- res = E5MessageBox.yesNo(self,
+ res = E5MessageBox.yesNo(
+ self,
self.trUtf8("New Form"),
self.trUtf8("The file already exists! Overwrite it?"),
icon=E5MessageBox.Warning)
@@ -582,7 +594,8 @@
try:
shutil.copy(templateFile, fname)
except IOError as e:
- E5MessageBox.critical(self,
+ E5MessageBox.critical(
+ self,
self.trUtf8("New Form"),
self.trUtf8(
"<p>The new form file <b>{0}</b> could not be created.<br>"
@@ -608,7 +621,8 @@
from UI.DeleteFilesConfirmationDialog import \
DeleteFilesConfirmationDialog
- dlg = DeleteFilesConfirmationDialog(self.parent(),
+ dlg = DeleteFilesConfirmationDialog(
+ self.parent(),
self.trUtf8("Delete forms"),
self.trUtf8(
"Do you really want to delete these forms from the project?"),
@@ -678,20 +692,22 @@
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("Form Compilation"),
self.trUtf8("The compilation of the form file"
- " was successful."))
+ " was successful."))
else:
ui.showNotification(
UI.PixmapCache.getPixmap("designer48.png"),
self.trUtf8("Form Compilation"),
self.trUtf8("The compilation of the form file"
- " was successful."))
+ " was successful."))
self.project.projectFormCompiled.emit(self.compiledFile)
except IOError as msg:
if not self.noDialog:
- E5MessageBox.information(self,
+ E5MessageBox.information(
+ self,
self.trUtf8("Form Compilation"),
self.trUtf8(
"<p>The compilation of the form file failed.</p>"
@@ -705,11 +721,13 @@
"<p>Reason: {0}</p>").format(str(msg)))
else:
if not self.noDialog:
- E5MessageBox.information(self,
+ E5MessageBox.information(
+ self,
self.trUtf8("Form Compilation"),
self.trUtf8("The compilation of the form file failed."))
else:
- ui.showNotification(UI.PixmapCache.getPixmap("designer48.png"),
+ ui.showNotification(
+ UI.PixmapCache.getPixmap("designer48.png"),
self.trUtf8("Form Compilation"),
self.trUtf8("The compilation of the form file failed."))
self.compileProc = None
@@ -786,7 +804,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>'
@@ -839,7 +858,8 @@
self.hooks["compileAllForms"](self.project.pdata["FORMS"])
else:
numForms = len(self.project.pdata["FORMS"])
- progress = QProgressDialog(self.trUtf8("Compiling forms..."),
+ progress = QProgressDialog(
+ self.trUtf8("Compiling forms..."),
self.trUtf8("Abort"), 0, numForms, self)
progress.setModal(True)
progress.setMinimumDuration(0)
@@ -874,7 +894,8 @@
self.hooks["compileSelectedForms"](files)
else:
numForms = len(files)
- progress = QProgressDialog(self.trUtf8("Compiling forms..."),
+ progress = QProgressDialog(
+ self.trUtf8("Compiling forms..."),
self.trUtf8("Abort"), 0, numForms, self)
progress.setModal(True)
progress.setMinimumDuration(0)
