Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Mon Aug 31 19:38:48 2015 +0200
+++ b/UI/UserInterface.py	Tue Sep 01 18:50:01 2015 +0200
@@ -2433,8 +2433,9 @@
         self.toolGroupsMenu.aboutToShow.connect(self.__showToolGroupsMenu)
         self.toolGroupsMenu.triggered.connect(self.__toolGroupSelected)
         self.toolGroupsMenuTriggered = False
-        self.__menus["tools"] = self.__initToolsMenu()
-        self.__menus["extras"].addMenu(self.__menus["tools"])
+        self.__menus["extras"].addSeparator()
+        self.__initToolsMenus(self.__menus["extras"])
+        self.__menus["extras"].addSeparator()
         
         self.__menus["settings"] = QMenu(self.tr('Se&ttings'), self)
         mb.addMenu(self.__menus["settings"])
@@ -3293,15 +3294,13 @@
             args = [eric6]
             QProcess.startDetached(program, args)
         
-    def __initToolsMenu(self):
-        """
-        Private slot to initialize the Tools menu.
-        
-        @return populated Tools menu
-        @rtype QMenu
-        """
-        menu = QMenu(self.tr('&Tools'), self)
-        
+    def __initToolsMenus(self, menu):
+        """
+        Private slot to initialize the various tool menus.
+        
+        @param menu reference to the parent menu
+        @type QMenu
+        """
         btMenu = QMenu(self.tr("&Builtin Tools"), self)
         if self.designer4Act is not None:
             btMenu.addAction(self.designer4Act)
@@ -3332,8 +3331,6 @@
         self.__menus["plugin_tools"] = ptMenu
         self.__menus["user_tools"] = utMenu
         
-        return menu
-        
     def __showPluginToolsMenu(self):
         """
         Private slot to show the Plugin Tools menu.