Mercurial Repositories > eric / file diff

--- a/Project/ProjectSourcesBrowser.py	Fri Oct 18 23:00:41 2013 +0200
+++ b/Project/ProjectSourcesBrowser.py	Fri Nov 01 15:48:48 2013 +0100
@@ -138,7 +138,8 @@
             self.trUtf8("Application Diagram..."),
             self.__showApplicationDiagram)
         self.graphicsMenu.addSeparator()
-        self.graphicsMenu.addAction(UI.PixmapCache.getIcon("open.png"),
+        self.graphicsMenu.addAction(
+            UI.PixmapCache.getIcon("open.png"),
             self.trUtf8("Load Diagram..."), self.__loadDiagram)
         self.graphicsMenu.aboutToShow.connect(self.__showContextMenuGraphics)
         
@@ -148,49 +149,48 @@
         act = self.sourceMenu.addAction(
             self.trUtf8('Rename file'), self._renameFile)
         self.menuActions.append(act)
-        act = self.sourceMenu.addAction(self.trUtf8('Remove from project'),
-            self._removeFile)
+        act = self.sourceMenu.addAction(
+            self.trUtf8('Remove from project'), self._removeFile)
         self.menuActions.append(act)
         act = self.sourceMenu.addAction(
             self.trUtf8('Delete'), self.__deleteFile)
         self.menuActions.append(act)
         self.sourceMenu.addSeparator()
-        self.sourceMenu.addAction(self.trUtf8('New package...'),
-            self.__addNewPackage)
-        self.sourceMenu.addAction(self.trUtf8('Add source files...'),
-            self.__addSourceFiles)
-        self.sourceMenu.addAction(self.trUtf8('Add source directory...'),
-            self.__addSourceDirectory)
+        self.sourceMenu.addAction(
+            self.trUtf8('New package...'), self.__addNewPackage)
+        self.sourceMenu.addAction(
+            self.trUtf8('Add source files...'), self.__addSourceFiles)
+        self.sourceMenu.addAction(
+            self.trUtf8('Add source directory...'), self.__addSourceDirectory)
         self.sourceMenu.addSeparator()
         act = self.sourceMenu.addMenu(self.graphicsMenu)
         self.sourceMenu.addSeparator()
         self.sourceMenu.addMenu(self.checksMenu)
         self.sourceMenu.addSeparator()
-        self.sourceMenuActions["Show"] = \
-            self.sourceMenu.addMenu(self.menuShow)
+        self.sourceMenuActions["Show"] = self.sourceMenu.addMenu(self.menuShow)
+        self.sourceMenu.addSeparator()
+        self.sourceMenu.addAction(
+            self.trUtf8('Copy Path to Clipboard'), self._copyToClipboard)
         self.sourceMenu.addSeparator()
-        self.sourceMenu.addAction(self.trUtf8('Copy Path to Clipboard'),
-            self._copyToClipboard)
-        self.sourceMenu.addSeparator()
-        self.sourceMenu.addAction(self.trUtf8('Expand all directories'),
-            self._expandAllDirs)
-        self.sourceMenu.addAction(self.trUtf8('Collapse all directories'),
-            self._collapseAllDirs)
+        self.sourceMenu.addAction(
+            self.trUtf8('Expand all directories'), self._expandAllDirs)
+        self.sourceMenu.addAction(
+            self.trUtf8('Collapse all directories'), self._collapseAllDirs)
         self.sourceMenu.addSeparator()
         self.sourceMenu.addAction(self.trUtf8('Configure...'), self._configure)
 
         self.menu.addSeparator()
-        self.menu.addAction(self.trUtf8('New package...'),
-            self.__addNewPackage)
-        self.menu.addAction(self.trUtf8('Add source files...'),
-            self.__addSourceFiles)
-        self.menu.addAction(self.trUtf8('Add source directory...'),
-            self.__addSourceDirectory)
+        self.menu.addAction(
+            self.trUtf8('New package...'), self.__addNewPackage)
+        self.menu.addAction(
+            self.trUtf8('Add source files...'), self.__addSourceFiles)
+        self.menu.addAction(
+            self.trUtf8('Add source directory...'), self.__addSourceDirectory)
         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,49 +202,49 @@
         self.attributeMenu = QMenu(self)
         self.attributeMenu.addMenu(self.gotoMenu)
         self.attributeMenu.addSeparator()
-        self.attributeMenu.addAction(self.trUtf8('New package...'),
-            self.__addNewPackage)
-        self.attributeMenu.addAction(self.trUtf8('Add source files...'),
-            self.project.addSourceFiles)
-        self.attributeMenu.addAction(self.trUtf8('Add source directory...'),
-            self.project.addSourceDir)
+        self.attributeMenu.addAction(
+            self.trUtf8('New package...'), self.__addNewPackage)
+        self.attributeMenu.addAction(
+            self.trUtf8('Add source files...'), self.project.addSourceFiles)
+        self.attributeMenu.addAction(
+            self.trUtf8('Add source directory...'), self.project.addSourceDir)
         self.attributeMenu.addSeparator()
-        self.attributeMenu.addAction(self.trUtf8('Expand all directories'),
-            self._expandAllDirs)
-        self.attributeMenu.addAction(self.trUtf8('Collapse all directories'),
-            self._collapseAllDirs)
+        self.attributeMenu.addAction(
+            self.trUtf8('Expand all directories'), self._expandAllDirs)
+        self.attributeMenu.addAction(
+            self.trUtf8('Collapse all directories'), self._collapseAllDirs)
         self.attributeMenu.addSeparator()
         self.attributeMenu.addAction(
             self.trUtf8('Configure...'), self._configure)
         
         self.backMenu = QMenu(self)
-        self.backMenu.addAction(self.trUtf8('New package...'),
-            self.__addNewPackage)
-        self.backMenu.addAction(self.trUtf8('Add source files...'),
-            self.project.addSourceFiles)
-        self.backMenu.addAction(self.trUtf8('Add source directory...'),
-            self.project.addSourceDir)
+        self.backMenu.addAction(
+            self.trUtf8('New package...'), self.__addNewPackage)
+        self.backMenu.addAction(
+            self.trUtf8('Add source files...'), self.project.addSourceFiles)
+        self.backMenu.addAction(
+            self.trUtf8('Add source directory...'), self.project.addSourceDir)
         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)
         
         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)
         
@@ -260,28 +260,28 @@
             self.trUtf8('New package...'), self.__addNewPackage)
         self.dirMenu.addAction(
             self.trUtf8('Add source files...'), self.__addSourceFiles)
-        self.dirMenu.addAction(self.trUtf8('Add source directory...'),
-            self.__addSourceDirectory)
+        self.dirMenu.addAction(
+            self.trUtf8('Add source directory...'), self.__addSourceDirectory)
         self.dirMenu.addSeparator()
         act = self.dirMenu.addMenu(self.graphicsMenu)
         self.dirMenu.addSeparator()
         self.dirMenu.addMenu(self.checksMenu)
         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)
-        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)
@@ -300,49 +300,51 @@
         self.graphicsMenu = QMenu(self.trUtf8('Diagrams'))
         self.classDiagramAction = self.graphicsMenu.addAction(
             self.trUtf8("Class Diagram..."), self.__showClassDiagram)
-        self.graphicsMenu.addAction(self.trUtf8("Package Diagram..."),
-            self.__showPackageDiagram)
-        self.graphicsMenu.addAction(self.trUtf8("Application Diagram..."),
+        self.graphicsMenu.addAction(
+            self.trUtf8("Package Diagram..."), self.__showPackageDiagram)
+        self.graphicsMenu.addAction(
+            self.trUtf8("Application Diagram..."),
             self.__showApplicationDiagram)
         self.graphicsMenu.addSeparator()
-        self.graphicsMenu.addAction(UI.PixmapCache.getIcon("fileOpen.png"),
+        self.graphicsMenu.addAction(
+            UI.PixmapCache.getIcon("fileOpen.png"),
             self.trUtf8("Load Diagram..."), self.__loadDiagram)
         
         self.sourceMenu.addSeparator()
         act = self.sourceMenu.addAction(
             self.trUtf8('Rename file'), self._renameFile)
         self.menuActions.append(act)
-        act = self.sourceMenu.addAction(self.trUtf8('Remove from project'),
-            self._removeFile)
+        act = self.sourceMenu.addAction(
+            self.trUtf8('Remove from project'), self._removeFile)
         self.menuActions.append(act)
         act = self.sourceMenu.addAction(
             self.trUtf8('Delete'), self.__deleteFile)
         self.menuActions.append(act)
         self.sourceMenu.addSeparator()
-        self.sourceMenu.addAction(self.trUtf8('Add source files...'),
-            self.__addSourceFiles)
-        self.sourceMenu.addAction(self.trUtf8('Add source directory...'),
-            self.__addSourceDirectory)
+        self.sourceMenu.addAction(
+            self.trUtf8('Add source files...'), self.__addSourceFiles)
+        self.sourceMenu.addAction(
+            self.trUtf8('Add source directory...'), self.__addSourceDirectory)
         self.sourceMenu.addSeparator()
         act = self.sourceMenu.addMenu(self.graphicsMenu)
         self.sourceMenu.addSeparator()
-        self.sourceMenu.addAction(self.trUtf8('Expand all directories'),
-            self._expandAllDirs)
-        self.sourceMenu.addAction(self.trUtf8('Collapse all directories'),
-            self._collapseAllDirs)
+        self.sourceMenu.addAction(
+            self.trUtf8('Expand all directories'), self._expandAllDirs)
+        self.sourceMenu.addAction(
+            self.trUtf8('Collapse all directories'), self._collapseAllDirs)
         self.sourceMenu.addSeparator()
         self.sourceMenu.addAction(self.trUtf8('Configure...'), self._configure)
 
         self.menu.addSeparator()
         self.menu.addAction(
             self.trUtf8('Add source files...'), self.__addSourceFiles)
-        self.menu.addAction(self.trUtf8('Add source directory...'),
-            self.__addSourceDirectory)
+        self.menu.addAction(
+            self.trUtf8('Add source directory...'), self.__addSourceDirectory)
         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)
 
@@ -354,47 +356,47 @@
         self.attributeMenu = QMenu(self)
         self.attributeMenu.addMenu(self.gotoMenu)
         self.attributeMenu.addSeparator()
-        self.attributeMenu.addAction(self.trUtf8('New package...'),
-            self.__addNewPackage)
-        self.attributeMenu.addAction(self.trUtf8('Add source files...'),
-            self.project.addSourceFiles)
-        self.attributeMenu.addAction(self.trUtf8('Add source directory...'),
-            self.project.addSourceDir)
+        self.attributeMenu.addAction(
+            self.trUtf8('New package...'), self.__addNewPackage)
+        self.attributeMenu.addAction(
+            self.trUtf8('Add source files...'), self.project.addSourceFiles)
+        self.attributeMenu.addAction(
+            self.trUtf8('Add source directory...'), self.project.addSourceDir)
         self.attributeMenu.addSeparator()
-        self.attributeMenu.addAction(self.trUtf8('Expand all directories'),
-            self._expandAllDirs)
-        self.attributeMenu.addAction(self.trUtf8('Collapse all directories'),
-            self._collapseAllDirs)
+        self.attributeMenu.addAction(
+            self.trUtf8('Expand all directories'), self._expandAllDirs)
+        self.attributeMenu.addAction(
+            self.trUtf8('Collapse all directories'), self._collapseAllDirs)
         self.attributeMenu.addSeparator()
         self.attributeMenu.addAction(
             self.trUtf8('Configure...'), self._configure)
         
         self.backMenu = QMenu(self)
-        self.backMenu.addAction(self.trUtf8('Add source files...'),
-            self.project.addSourceFiles)
-        self.backMenu.addAction(self.trUtf8('Add source directory...'),
-            self.project.addSourceDir)
+        self.backMenu.addAction(
+            self.trUtf8('Add source files...'), self.project.addSourceFiles)
+        self.backMenu.addAction(
+            self.trUtf8('Add source directory...'), self.project.addSourceDir)
         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.setEnabled(False)
         self.backMenu.addSeparator()
         self.backMenu.addAction(self.trUtf8('Configure...'), self._configure)
         
         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)
         
@@ -405,23 +407,23 @@
         self.dirMenu.addSeparator()
         self.dirMenu.addAction(
             self.trUtf8('Add source files...'), self.__addSourceFiles)
-        self.dirMenu.addAction(self.trUtf8('Add source directory...'),
-            self.__addSourceDirectory)
+        self.dirMenu.addAction(
+            self.trUtf8('Add source directory...'), self.__addSourceDirectory)
         self.dirMenu.addSeparator()
         act = self.dirMenu.addMenu(self.graphicsMenu)
         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)
-        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)
@@ -578,8 +580,8 @@
                 os.path.isfile("{0}.profile".format(basename)) or \
                 os.path.isfile("{0}.profile".format(tbasename))
             coEnable = (coEnable or \
-                os.path.isfile("{0}.coverage".format(basename)) or \
-                os.path.isfile("{0}.coverage".format(tbasename))) and \
+                        os.path.isfile("{0}.coverage".format(basename)) or \
+                        os.path.isfile("{0}.coverage".format(tbasename))) and \
                 self.project.isPy3Project()
         
         # now check the selected item
@@ -590,7 +592,7 @@
             prEnable = prEnable or \
                 os.path.isfile("{0}.profile".format(basename))
             coEnable = (coEnable or \
-                os.path.isfile("{0}.coverage".format(basename))) and \
+                        os.path.isfile("{0}.coverage".format(basename))) and \
                 itm.isPython3File()
         
         self.profileMenuAction.setEnabled(prEnable)
@@ -661,7 +663,8 @@
                     try:
                         os.mkdir(packagePath)
                     except OSError as err:
-                        E5MessageBox.critical(self,
+                        E5MessageBox.critical(
+                            self,
                             self.trUtf8("Add new Python package"),
                             self.trUtf8(
                                 """<p>The package directory <b>{0}</b> could"""
@@ -675,7 +678,8 @@
                         f = open(packageFile, "w", encoding="utf-8")
                         f.close()
                     except IOError as err:
-                        E5MessageBox.critical(self,
+                        E5MessageBox.critical(
+                            self,
                             self.trUtf8("Add new Python package"),
                             self.trUtf8(
                                 """<p>The package file <b>{0}</b> could"""
@@ -735,7 +739,8 @@
         
         from UI.DeleteFilesConfirmationDialog import \
             DeleteFilesConfirmationDialog
-        dlg = DeleteFilesConfirmationDialog(self.parent(),
+        dlg = DeleteFilesConfirmationDialog(
+            self.parent(),
             self.trUtf8("Delete files"),
             self.trUtf8(
                 "Do you really want to delete these files from the project?"),
@@ -899,7 +904,8 @@
             fn = itm.fileName()
         except AttributeError:
             fn = itm.dirName()
-        res = E5MessageBox.yesNo(self,
+        res = E5MessageBox.yesNo(
+            self,
             self.trUtf8("Class Diagram"),
             self.trUtf8("""Include class attributes?"""),
             yesDefault=True)
@@ -918,7 +924,8 @@
         except AttributeError:
             fn = itm.dirName()
         package = os.path.isdir(fn) and fn or os.path.dirname(fn)
-        res = E5MessageBox.yesNo(self,
+        res = E5MessageBox.yesNo(
+            self,
             self.trUtf8("Imports Diagram"),
             self.trUtf8("""Include imports from external modules?"""))
         from Graphics.UMLDialog import UMLDialog
@@ -937,7 +944,8 @@
         except AttributeError:
             fn = itm.dirName()
         package = os.path.isdir(fn) and fn or os.path.dirname(fn)
-        res = E5MessageBox.yesNo(self,
+        res = E5MessageBox.yesNo(
+            self,
             self.trUtf8("Package Diagram"),
             self.trUtf8("""Include class attributes?"""),
             yesDefault=True)
@@ -951,7 +959,8 @@
         """
         Private method to handle the application diagram context menu action.
         """
-        res = E5MessageBox.yesNo(self,
+        res = E5MessageBox.yesNo(
+            self,
             self.trUtf8("Application Diagram"),
             self.trUtf8("""Include module names?"""),
             yesDefault=True)