Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Thu Mar 03 19:26:50 2011 +0100
+++ b/APIs/Python3/eric5.api	Fri Mar 04 18:26:02 2011 +0100
@@ -1395,7 +1395,7 @@
 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.addToolBar?4(toolBar, category)
 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.categories?4()
 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.categoryActions?4(category)
-eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.createToolBar?4(title)
+eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.createToolBar?4(title, name="")
 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.defaultToolBarActions?4(tbID)
 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.defaultToolBars?4()
 eric5.E5Gui.E5ToolBarManager.E5ToolBarManager.deleteToolBar?4(toolBar)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric5.E5Gui.E5ToolBarManager.html	Thu Mar 03 19:26:50 2011 +0100
+++ b/Documentation/Source/eric5.E5Gui.E5ToolBarManager.html	Fri Mar 04 18:26:02 2011 +0100
@@ -277,13 +277,16 @@
 </dd>
 </dl><a NAME="E5ToolBarManager.createToolBar" ID="E5ToolBarManager.createToolBar"></a>
 <h4>E5ToolBarManager.createToolBar</h4>
-<b>createToolBar</b>(<i>title</i>)
+<b>createToolBar</b>(<i>title, name=""</i>)
 <p>
         Public method to create a custom toolbar.
 </p><dl>
 <dt><i>title</i></dt>
 <dd>
 title to be used for the toolbar (string)
+</dd><dt><i>name</i></dt>
+<dd>
+optional name for the new toolbar (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>

--- a/E5Gui/E5ToolBarManager.py	Thu Mar 03 19:26:50 2011 +0100
+++ b/E5Gui/E5ToolBarManager.py	Fri Mar 04 18:26:02 2011 +0100
@@ -289,11 +289,12 @@
         return toolBar is not None and \
                id(toolBar) in self.__defaultToolBars
     
-    def createToolBar(self, title):
+    def createToolBar(self, title, name=""):
         """
         Public method to create a custom toolbar.
         
         @param title title to be used for the toolbar (string)
+        @param name optional name for the new toolbar (string)
         @return reference to the created toolbar (QToolBar)
         """
         if self.__mainWindow is None:
@@ -301,12 +302,13 @@
         
         toolBar = QToolBar(title, self.__mainWindow)
         toolBar.setToolTip(title)
-        index = 1
-        customPrefix = "__CustomPrefix__"
-        name = "{0}{1:d}".format(customPrefix, index)
-        while self.__toolBarByName(name) is not None:
-            index += 1
+        if not name:
+            index = 1
+            customPrefix = "__CustomPrefix__"
             name = "{0}{1:d}".format(customPrefix, index)
+            while self.__toolBarByName(name) is not None:
+                index += 1
+                name = "{0}{1:d}".format(customPrefix, index)
         toolBar.setObjectName(name)
         self.__mainWindow.addToolBar(toolBar)
         
@@ -547,7 +549,7 @@
                 toolBar.setWindowTitle(toolBarTitle)
                 oldCustomToolBars.remove(toolBar)
             else:
-                toolBar = self.createToolBar(toolBarTitle)
+                toolBar = self.createToolBar(toolBarTitle, objectName)
             if toolBar is not None:
                 toolBar.setObjectName(objectName)
                 self.setToolBar(toolBar, actions)