Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Fri Nov 11 18:40:37 2016 +0100
+++ b/APIs/Python3/eric6.api	Fri Nov 11 18:41:16 2016 +0100
@@ -3559,7 +3559,7 @@
 eric6.MultiProject.MultiProject.MultiProject.setDirty?4(b)
 eric6.MultiProject.MultiProject.MultiProject.showMenu?7
 eric6.MultiProject.MultiProject.MultiProject?1(project, parent=None, filename=None)
-eric6.MultiProject.MultiProjectBrowser.MultiProjectBrowser?1(multiProject, parent=None)
+eric6.MultiProject.MultiProjectBrowser.MultiProjectBrowser?1(multiProject, project, parent=None)
 eric6.MultiProject.PropertiesDialog.PropertiesDialog.storeData?4()
 eric6.MultiProject.PropertiesDialog.PropertiesDialog?1(multiProject, new=True, parent=None)
 eric6.Network.IRC.IrcChannelEditDialog.IrcChannelEditDialog.getData?4()

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Fri Nov 11 18:40:37 2016 +0100
+++ b/Documentation/Help/source.qhp	Fri Nov 11 18:41:16 2016 +0100
@@ -9724,6 +9724,7 @@
       <keyword name="MultiProjectBrowser.__newMultiProject" id="MultiProjectBrowser.__newMultiProject" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__newMultiProject" />
       <keyword name="MultiProjectBrowser.__openItem" id="MultiProjectBrowser.__openItem" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__openItem" />
       <keyword name="MultiProjectBrowser.__projectAdded" id="MultiProjectBrowser.__projectAdded" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__projectAdded" />
+      <keyword name="MultiProjectBrowser.__projectClosed" id="MultiProjectBrowser.__projectClosed" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__projectClosed" />
       <keyword name="MultiProjectBrowser.__projectDataChanged" id="MultiProjectBrowser.__projectDataChanged" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__projectDataChanged" />
       <keyword name="MultiProjectBrowser.__projectOpened" id="MultiProjectBrowser.__projectOpened" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__projectOpened" />
       <keyword name="MultiProjectBrowser.__projectRemoved" id="MultiProjectBrowser.__projectRemoved" ref="eric6.MultiProject.MultiProjectBrowser.html#MultiProjectBrowser.__projectRemoved" />

--- a/Documentation/Source/eric6.MultiProject.MultiProjectBrowser.html	Fri Nov 11 18:40:37 2016 +0100
+++ b/Documentation/Source/eric6.MultiProject.MultiProjectBrowser.html	Fri Nov 11 18:41:16 2016 +0100
@@ -96,6 +96,9 @@
 <td><a href="#MultiProjectBrowser.__projectAdded">__projectAdded</a></td>
 <td>Private slot to handle the addition of a project to the multi project.</td>
 </tr><tr>
+<td><a href="#MultiProjectBrowser.__projectClosed">__projectClosed</a></td>
+<td>Private slot to handle the closing of a project.</td>
+</tr><tr>
 <td><a href="#MultiProjectBrowser.__projectDataChanged">__projectDataChanged</a></td>
 <td>Private slot to handle the change of a project of the multi project.</td>
 </tr><tr>
@@ -121,16 +124,19 @@
 </table>
 <a NAME="MultiProjectBrowser.__init__" ID="MultiProjectBrowser.__init__"></a>
 <h4>MultiProjectBrowser (Constructor)</h4>
-<b>MultiProjectBrowser</b>(<i>multiProject, parent=None</i>)
+<b>MultiProjectBrowser</b>(<i>multiProject, project, parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>multiProject</i></dt>
+<dt><i>multiProject</i> (MultiProject)</dt>
 <dd>
 reference to the multi project object
-</dd><dt><i>parent</i></dt>
+</dd><dt><i>project</i> (Project)</dt>
 <dd>
-parent widget (QWidget)
+reference to the project object
+</dd><dt><i>parent</i> (QWidget)</dt>
+<dd>
+parent widget
 </dd>
 </dl><a NAME="MultiProjectBrowser.__addNewProject" ID="MultiProjectBrowser.__addNewProject"></a>
 <h4>MultiProjectBrowser.__addNewProject</h4>
@@ -233,7 +239,12 @@
 <dd>
 reference to the project data dictionary
 </dd>
-</dl><a NAME="MultiProjectBrowser.__projectDataChanged" ID="MultiProjectBrowser.__projectDataChanged"></a>
+</dl><a NAME="MultiProjectBrowser.__projectClosed" ID="MultiProjectBrowser.__projectClosed"></a>
+<h4>MultiProjectBrowser.__projectClosed</h4>
+<b>__projectClosed</b>(<i></i>)
+<p>
+        Private slot to handle the closing of a project.
+</p><a NAME="MultiProjectBrowser.__projectDataChanged" ID="MultiProjectBrowser.__projectDataChanged"></a>
 <h4>MultiProjectBrowser.__projectDataChanged</h4>
 <b>__projectDataChanged</b>(<i>project</i>)
 <p>
@@ -245,15 +256,10 @@
 </dd>
 </dl><a NAME="MultiProjectBrowser.__projectOpened" ID="MultiProjectBrowser.__projectOpened"></a>
 <h4>MultiProjectBrowser.__projectOpened</h4>
-<b>__projectOpened</b>(<i>projectfile</i>)
+<b>__projectOpened</b>(<i></i>)
 <p>
         Private slot to handle the opening of a project.
-</p><dl>
-<dt><i>projectfile</i></dt>
-<dd>
-file name of the opened project file (string)
-</dd>
-</dl><a NAME="MultiProjectBrowser.__projectRemoved" ID="MultiProjectBrowser.__projectRemoved"></a>
+</p><a NAME="MultiProjectBrowser.__projectRemoved" ID="MultiProjectBrowser.__projectRemoved"></a>
 <h4>MultiProjectBrowser.__projectRemoved</h4>
 <b>__projectRemoved</b>(<i>project</i>)
 <p>

--- a/MultiProject/MultiProjectBrowser.py	Fri Nov 11 18:40:37 2016 +0100
+++ b/MultiProject/MultiProjectBrowser.py	Fri Nov 11 18:41:16 2016 +0100
@@ -21,15 +21,20 @@
     """
     Class implementing the multi project browser.
     """
-    def __init__(self, multiProject, parent=None):
+    def __init__(self, multiProject, project, parent=None):
         """
         Constructor
         
         @param multiProject reference to the multi project object
-        @param parent parent widget (QWidget)
+        @type MultiProject
+        @param project reference to the project object
+        @type Project
+        @param parent parent widget
+        @type QWidget
         """
         super(MultiProjectBrowser, self).__init__(parent)
         self.multiProject = multiProject
+        self.project = project
         
         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
         self.setAlternatingRowColors(True)
@@ -52,8 +57,9 @@
             self.__projectAdded)
         self.multiProject.projectRemoved.connect(
             self.__projectRemoved)
-        self.multiProject.projectOpened.connect(
-            self.__projectOpened)
+        
+        self.project.projectOpened.connect(self.__projectOpened)
+        self.project.projectClosed.connect(self.__projectClosed)
         
         self.__createPopupMenu()
         self.setContextMenuPolicy(Qt.CustomContextMenu)
@@ -132,12 +138,11 @@
             
         self.sortItems(0, Qt.AscendingOrder)
     
-    def __projectOpened(self, projectfile):
+    def __projectOpened(self):
         """
         Private slot to handle the opening of a project.
-        
-        @param projectfile file name of the opened project file (string)
         """
+        projectfile = self.project.getProjectFile()
         project = {
             'name': "",
             'file': projectfile,
@@ -147,7 +152,21 @@
         }
         itm = self.__findProjectItem(project)
         if itm:
-            itm.setSelected(True)
+            font = itm.font(0)
+            font.setBold(True)
+            itm.setFont(0, font)
+    
+    def __projectClosed(self):
+        """
+        Private slot to handle the closing of a project.
+        """
+        for topIndex in range(self.topLevelItemCount()):
+            topItem = self.topLevelItem(topIndex)
+            for childIndex in range(topItem.childCount()):
+                childItem = topItem.child(childIndex)
+                font = childItem.font(0)
+                font.setBold(False)
+                childItem.setFont(0, font)
     
     def __contextMenuRequested(self, coord):
         """

--- a/UI/UserInterface.py	Fri Nov 11 18:40:37 2016 +0100
+++ b/UI/UserInterface.py	Fri Nov 11 18:41:16 2016 +0100
@@ -704,7 +704,8 @@
 
         # Create the multi project browser
         from MultiProject.MultiProjectBrowser import MultiProjectBrowser
-        self.multiProjectBrowser = MultiProjectBrowser(self.multiProject)
+        self.multiProjectBrowser = MultiProjectBrowser(self.multiProject,
+                                                       self.project)
         self.lToolbox.addItem(self.multiProjectBrowser,
                               UI.PixmapCache.getIcon("multiProjectViewer.png"),
                               self.tr("Multiproject-Viewer"))
@@ -827,7 +828,8 @@
         # Create the multi project browser
         logging.debug("Creating Multiproject Browser...")
         from MultiProject.MultiProjectBrowser import MultiProjectBrowser
-        self.multiProjectBrowser = MultiProjectBrowser(self.multiProject)
+        self.multiProjectBrowser = MultiProjectBrowser(self.multiProject,
+                                                       self.project)
         self.leftSidebar.addTab(
             self.multiProjectBrowser,
             UI.PixmapCache.getIcon("multiProjectViewer.png"),