Fixed forgotten references to '.e5m' files and added multi project support to the single application logic.

Sun, 08 Feb 2015 16:16:32 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 08 Feb 2015 16:16:32 +0100
changeset 4107
501c964e20e7
parent 4103
ce70c1a618ca
child 4108
0059d2d09ab8

Fixed forgotten references to '.e5m' files and added multi project support to the single application logic.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
APIs/Python3/eric6.bas file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5SingleApplication.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.UserInterface.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.MultiProject.html file | annotate | diff | comparison | revisions
E5Gui/E5SingleApplication.py file | annotate | diff | comparison | revisions
MultiProject/__init__.py file | annotate | diff | comparison | revisions
QScintilla/Lexers/__init__.py file | annotate | diff | comparison | revisions
UI/BrowserModel.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Sun Feb 08 13:24:28 2015 +0100
+++ b/APIs/Python3/eric6.api	Sun Feb 08 16:16:32 2015 +0100
@@ -1475,6 +1475,7 @@
 eric6.E5Gui.E5SingleApplication.SAArguments?7
 eric6.E5Gui.E5SingleApplication.SAFile?7
 eric6.E5Gui.E5SingleApplication.SAOpenFile?7
+eric6.E5Gui.E5SingleApplication.SAOpenMultiProject?7
 eric6.E5Gui.E5SingleApplication.SAOpenProject?7
 eric6.E5Gui.E5SqueezeLabels.E5SqueezeLabel.paintEvent?4(event)
 eric6.E5Gui.E5SqueezeLabels.E5SqueezeLabel.setText?4(txt)
--- a/APIs/Python3/eric6.bas	Sun Feb 08 13:24:28 2015 +0100
+++ b/APIs/Python3/eric6.bas	Sun Feb 08 16:16:32 2015 +0100
@@ -60,7 +60,7 @@
 ChangeBookmarkCommand QUndoCommand
 ChatWidget QWidget Ui_ChatWidget
 ChromeImporter BookmarksImporter
-Class ClbrBaseClasses.Class VisibilityMixin
+Class ClbrBase
 ClassItem UMLItem
 ClassModel UMLModel
 ClbrBase _ClbrBase
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sun Feb 08 13:24:28 2015 +0100
+++ b/Documentation/Help/source.qhp	Sun Feb 08 16:16:32 2015 +0100
@@ -3851,6 +3851,7 @@
       <keyword name="E5SingleApplicationClient" id="E5SingleApplicationClient" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient" />
       <keyword name="E5SingleApplicationClient (Constructor)" id="E5SingleApplicationClient (Constructor)" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.__init__" />
       <keyword name="E5SingleApplicationClient.__openFile" id="E5SingleApplicationClient.__openFile" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.__openFile" />
+      <keyword name="E5SingleApplicationClient.__openMultiProject" id="E5SingleApplicationClient.__openMultiProject" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.__openMultiProject" />
       <keyword name="E5SingleApplicationClient.__openProject" id="E5SingleApplicationClient.__openProject" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.__openProject" />
       <keyword name="E5SingleApplicationClient.__sendArguments" id="E5SingleApplicationClient.__sendArguments" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.__sendArguments" />
       <keyword name="E5SingleApplicationClient.processArgs" id="E5SingleApplicationClient.processArgs" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationClient.processArgs" />
@@ -3858,6 +3859,7 @@
       <keyword name="E5SingleApplicationServer (Constructor)" id="E5SingleApplicationServer (Constructor)" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationServer.__init__" />
       <keyword name="E5SingleApplicationServer.__saArguments" id="E5SingleApplicationServer.__saArguments" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationServer.__saArguments" />
       <keyword name="E5SingleApplicationServer.__saOpenFile" id="E5SingleApplicationServer.__saOpenFile" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationServer.__saOpenFile" />
+      <keyword name="E5SingleApplicationServer.__saOpenMultiProject" id="E5SingleApplicationServer.__saOpenMultiProject" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationServer.__saOpenMultiProject" />
       <keyword name="E5SingleApplicationServer.__saOpenProject" id="E5SingleApplicationServer.__saOpenProject" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationServer.__saOpenProject" />
       <keyword name="E5SingleApplicationServer.handleCommand" id="E5SingleApplicationServer.handleCommand" ref="eric6.E5Gui.E5SingleApplication.html#E5SingleApplicationServer.handleCommand" />
       <keyword name="E5SqueezeLabel" id="E5SqueezeLabel" ref="eric6.E5Gui.E5SqueezeLabels.html#E5SqueezeLabel" />
--- a/Documentation/Source/eric6.E5Gui.E5SingleApplication.html	Sun Feb 08 13:24:28 2015 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5SingleApplication.html	Sun Feb 08 16:16:32 2015 +0100
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>SAArguments</td></tr><tr><td>SAFile</td></tr><tr><td>SAOpenFile</td></tr><tr><td>SAOpenProject</td></tr>
+<tr><td>SAArguments</td></tr><tr><td>SAFile</td></tr><tr><td>SAOpenFile</td></tr><tr><td>SAOpenMultiProject</td></tr><tr><td>SAOpenProject</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
@@ -66,6 +66,9 @@
 <td><a href="#E5SingleApplicationClient.__openFile">__openFile</a></td>
 <td>Private method to open a file in the application server.</td>
 </tr><tr>
+<td><a href="#E5SingleApplicationClient.__openMultiProject">__openMultiProject</a></td>
+<td>Private method to open a project in the application server.</td>
+</tr><tr>
 <td><a href="#E5SingleApplicationClient.__openProject">__openProject</a></td>
 <td>Private method to open a project in the application server.</td>
 </tr><tr>
@@ -95,6 +98,16 @@
 <dd>
 name of file to be opened (string)
 </dd>
+</dl><a NAME="E5SingleApplicationClient.__openMultiProject" ID="E5SingleApplicationClient.__openMultiProject"></a>
+<h4>E5SingleApplicationClient.__openMultiProject</h4>
+<b>__openMultiProject</b>(<i>pfname</i>)
+<p>
+        Private method to open a project in the application server.
+</p><dl>
+<dt><i>pfname</i></dt>
+<dd>
+name of the projectfile to be opened (string)
+</dd>
 </dl><a NAME="E5SingleApplicationClient.__openProject" ID="E5SingleApplicationClient.__openProject"></a>
 <h4>E5SingleApplicationClient.__openProject</h4>
 <b>__openProject</b>(<i>pfname</i>)
@@ -155,6 +168,9 @@
 <td><a href="#E5SingleApplicationServer.__saOpenFile">__saOpenFile</a></td>
 <td>Private method used to handle the "Open File" command.</td>
 </tr><tr>
+<td><a href="#E5SingleApplicationServer.__saOpenMultiProject">__saOpenMultiProject</a></td>
+<td>Private method used to handle the "Open Multi-Project" command.</td>
+</tr><tr>
 <td><a href="#E5SingleApplicationServer.__saOpenProject">__saOpenProject</a></td>
 <td>Private method used to handle the "Open Project" command.</td>
 </tr><tr>
@@ -191,6 +207,16 @@
 <dd>
 filename to be opened (string)
 </dd>
+</dl><a NAME="E5SingleApplicationServer.__saOpenMultiProject" ID="E5SingleApplicationServer.__saOpenMultiProject"></a>
+<h4>E5SingleApplicationServer.__saOpenMultiProject</h4>
+<b>__saOpenMultiProject</b>(<i>pfname</i>)
+<p>
+        Private method used to handle the "Open Multi-Project" command.
+</p><dl>
+<dt><i>pfname</i></dt>
+<dd>
+filename of the multi project to be opened (string)
+</dd>
 </dl><a NAME="E5SingleApplicationServer.__saOpenProject" ID="E5SingleApplicationServer.__saOpenProject"></a>
 <h4>E5SingleApplicationServer.__saOpenProject</h4>
 <b>__saOpenProject</b>(<i>pfname</i>)
--- a/Documentation/Source/eric6.UI.UserInterface.html	Sun Feb 08 13:24:28 2015 +0100
+++ b/Documentation/Source/eric6.UI.UserInterface.html	Sun Feb 08 16:16:32 2015 +0100
@@ -2175,7 +2175,7 @@
             for the debugger. All files named before the '--' option
             are opened in a text editor, unless the argument ends in
             .e4p, then it is opened as a project file. If it ends in
-            .e4m, it is opened as a multiproject.
+            .e4m or .e5m, it is opened as a multiproject.
 </dd>
 </dl><a NAME="UserInterface.registerToolbar" ID="UserInterface.registerToolbar"></a>
 <h4>UserInterface.registerToolbar</h4>
--- a/Documentation/Source/index-eric6.MultiProject.html	Sun Feb 08 13:24:28 2015 +0100
+++ b/Documentation/Source/index-eric6.MultiProject.html	Sun Feb 08 16:16:32 2015 +0100
@@ -24,7 +24,7 @@
 Package implementing the multi project management module of eric6.
 </p><p>
 The multi project management module consists of the main part, which is
-used for reading and writing of eric6 multi project files (*.e4m) and
+used for reading and writing of eric6 multi project files (*.e5m) and
 for performing all operations on the multi project. It is accompanied by
 various UI related modules implementing different dialogs and a browser
 for the display of projects belonging to the current multi project.
--- a/E5Gui/E5SingleApplication.py	Sun Feb 08 13:24:28 2015 +0100
+++ b/E5Gui/E5SingleApplication.py	Sun Feb 08 16:16:32 2015 +0100
@@ -27,6 +27,7 @@
 # define the protocol tokens
 SAOpenFile = '>OpenFile<'
 SAOpenProject = '>OpenProject<'
+SAOpenMultiProject = '>OpenMultiProject<'
 SAArguments = '>Arguments<'
 
 
@@ -55,6 +56,10 @@
             self.__saOpenProject(params)
             return
 
+        if cmd == SAOpenMultiProject:
+            self.__saOpenMultiProject(params)
+            return
+
         if cmd == SAArguments:
             self.__saArguments(params)
             return
@@ -75,6 +80,14 @@
         """
         e5App().getObject("Project").openProject(pfname)
         
+    def __saOpenMultiProject(self, pfname):
+        """
+        Private method used to handle the "Open Multi-Project" command.
+        
+        @param pfname filename of the multi project to be opened (string)
+        """
+        e5App().getObject("MultiProject").openMultiProject(pfname)
+        
     def __saArguments(self, argsStr):
         """
         Private method used to handle the "Arguments" command.
@@ -131,6 +144,8 @@
             
             if ext in ['.e4p']:
                 self.__openProject(arg)
+            elif ext in ['.e4m', '.e5m']:
+                self.__openMultiProject(arg)
             else:
                 self.__openFile(arg)
         
@@ -158,6 +173,16 @@
         cmd = "{0}{1}\n".format(SAOpenProject, Utilities.normabspath(pfname))
         self.sendCommand(cmd)
         
+    def __openMultiProject(self, pfname):
+        """
+        Private method to open a project in the application server.
+        
+        @param pfname name of the projectfile to be opened (string)
+        """
+        cmd = "{0}{1}\n".format(SAOpenMultiProject,
+                                Utilities.normabspath(pfname))
+        self.sendCommand(cmd)
+        
     def __sendArguments(self, argsStr):
         """
         Private method to set the command arguments in the application server.
--- a/MultiProject/__init__.py	Sun Feb 08 13:24:28 2015 +0100
+++ b/MultiProject/__init__.py	Sun Feb 08 16:16:32 2015 +0100
@@ -7,7 +7,7 @@
 Package implementing the multi project management module of eric6.
 
 The multi project management module consists of the main part, which is
-used for reading and writing of eric6 multi project files (*.e4m) and
+used for reading and writing of eric6 multi project files (*.e5m) and
 for performing all operations on the multi project. It is accompanied by
 various UI related modules implementing different dialogs and a browser
 for the display of projects belonging to the current multi project.
--- a/QScintilla/Lexers/__init__.py	Sun Feb 08 13:24:28 2015 +0100
+++ b/QScintilla/Lexers/__init__.py	Sun Feb 08 16:16:32 2015 +0100
@@ -831,7 +831,6 @@
         '*.e4q': "XML",
         '*.e4s': "XML",
         '*.e4t': "XML",
-        '*.e6t': "XML",
         '*.e5d': "XML",
         '*.e5k': "XML",
         '*.e5m': "XML",
@@ -839,6 +838,13 @@
         '*.e5q': "XML",
         '*.e5s': "XML",
         '*.e5t': "XML",
+        '*.e6d': "XML",
+        '*.e6k': "XML",
+        '*.e6m': "XML",
+        '*.e6p': "XML",
+        '*.e6q': "XML",
+        '*.e6s': "XML",
+        '*.e6t': "XML",
     }
     
     if QSCINTILLA_VERSION() >= 0x020501:
--- a/UI/BrowserModel.py	Sun Feb 08 13:24:28 2015 +0100
+++ b/UI/BrowserModel.py	Sun Feb 08 16:16:32 2015 +0100
@@ -1232,7 +1232,7 @@
         
         @return flag indicating an eric project file (boolean)
         """
-        return self.fileext in ['.e4m']
+        return self.fileext in ['.e4m', '.e5m']
     
     def isIdlFile(self):
         """
--- a/UI/UserInterface.py	Sun Feb 08 13:24:28 2015 +0100
+++ b/UI/UserInterface.py	Sun Feb 08 16:16:32 2015 +0100
@@ -1052,7 +1052,7 @@
             for the debugger. All files named before the '--' option
             are opened in a text editor, unless the argument ends in
             .e4p, then it is opened as a project file. If it ends in
-            .e4m, it is opened as a multiproject.
+            .e4m or .e5m, it is opened as a multiproject.
         """
         # no args, return
         if args is None:
@@ -1111,7 +1111,7 @@
             if ext in ['.e4p']:
                 self.project.openProject(arg)
                 opens += 1
-            elif ext in ['.e4m']:
+            elif ext in ['.e4m', '.e5m']:
                 self.multiProject.openMultiProject(arg)
                 opens += 1
             else:

eric ide

mercurial