Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sat Feb 25 18:30:46 2012 +0100
+++ b/APIs/Python3/eric5.api	Sat Feb 25 18:45:34 2012 +0100
@@ -1391,7 +1391,7 @@
 eric5.E5Gui.E5TabWidget.E5DnDTabBar.mousePressEvent?4(event)
 eric5.E5Gui.E5TabWidget.E5DnDTabBar.tabMoveRequested?7
 eric5.E5Gui.E5TabWidget.E5DnDTabBar?1(parent=None)
-eric5.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile)
+eric5.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile, speed=100)
 eric5.E5Gui.E5TabWidget.E5TabWidget.customTabContextMenuRequested?7
 eric5.E5Gui.E5TabWidget.E5TabWidget.moveTab?4(curIndex, newIndex)
 eric5.E5Gui.E5TabWidget.E5TabWidget.nextTab?4()
@@ -1823,9 +1823,12 @@
 eric5.Helpviewer.Bookmarks.BookmarksManager.extract_js?7
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.createBaseMenu?4()
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.newUrl?7
+eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.openAll?4()
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.openUrl?7
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu.postPopulated?4()
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenu?1(parent=None)
+eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu.openUrl?7
+eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu.postPopulated?4()
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu.prePopulated?4()
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu.setInitialActions?4(actions)
 eric5.Helpviewer.Bookmarks.BookmarksMenu.BookmarksMenuBarMenu?1(parent=None)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Feb 25 18:30:46 2012 +0100
+++ b/Documentation/Help/source.qhp	Sat Feb 25 18:45:34 2012 +0100
@@ -1381,14 +1381,16 @@
       <keyword name="BookmarksMenu (Module)" id="BookmarksMenu (Module)" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html" />
       <keyword name="BookmarksMenu.__activated" id="BookmarksMenu.__activated" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.__activated" />
       <keyword name="BookmarksMenu.__contextMenuRequested" id="BookmarksMenu.__contextMenuRequested" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.__contextMenuRequested" />
-      <keyword name="BookmarksMenu.__openAll" id="BookmarksMenu.__openAll" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.__openAll" />
       <keyword name="BookmarksMenu.__openBookmark" id="BookmarksMenu.__openBookmark" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.__openBookmark" />
       <keyword name="BookmarksMenu.__openBookmarkInNewTab" id="BookmarksMenu.__openBookmarkInNewTab" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.__openBookmarkInNewTab" />
       <keyword name="BookmarksMenu.__removeBookmark" id="BookmarksMenu.__removeBookmark" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.__removeBookmark" />
       <keyword name="BookmarksMenu.createBaseMenu" id="BookmarksMenu.createBaseMenu" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.createBaseMenu" />
+      <keyword name="BookmarksMenu.openAll" id="BookmarksMenu.openAll" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.openAll" />
       <keyword name="BookmarksMenu.postPopulated" id="BookmarksMenu.postPopulated" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenu.postPopulated" />
       <keyword name="BookmarksMenuBarMenu" id="BookmarksMenuBarMenu" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenuBarMenu" />
       <keyword name="BookmarksMenuBarMenu (Constructor)" id="BookmarksMenuBarMenu (Constructor)" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenuBarMenu.__init__" />
+      <keyword name="BookmarksMenuBarMenu.__defaultBookmarkTriggered" id="BookmarksMenuBarMenu.__defaultBookmarkTriggered" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenuBarMenu.__defaultBookmarkTriggered" />
+      <keyword name="BookmarksMenuBarMenu.postPopulated" id="BookmarksMenuBarMenu.postPopulated" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenuBarMenu.postPopulated" />
       <keyword name="BookmarksMenuBarMenu.prePopulated" id="BookmarksMenuBarMenu.prePopulated" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenuBarMenu.prePopulated" />
       <keyword name="BookmarksMenuBarMenu.setInitialActions" id="BookmarksMenuBarMenu.setInitialActions" ref="eric5.Helpviewer.Bookmarks.BookmarksMenu.html#BookmarksMenuBarMenu.setInitialActions" />
       <keyword name="BookmarksModel" id="BookmarksModel" ref="eric5.Helpviewer.Bookmarks.BookmarksModel.html#BookmarksModel" />
@@ -9280,6 +9282,7 @@
       <keyword name="SyncCheckPage" id="SyncCheckPage" ref="eric5.Helpviewer.Sync.SyncCheckPage.html#SyncCheckPage" />
       <keyword name="SyncCheckPage (Constructor)" id="SyncCheckPage (Constructor)" ref="eric5.Helpviewer.Sync.SyncCheckPage.html#SyncCheckPage.__init__" />
       <keyword name="SyncCheckPage (Module)" id="SyncCheckPage (Module)" ref="eric5.Helpviewer.Sync.SyncCheckPage.html" />
+      <keyword name="SyncCheckPage.__makeAnimatedLabel" id="SyncCheckPage.__makeAnimatedLabel" ref="eric5.Helpviewer.Sync.SyncCheckPage.html#SyncCheckPage.__makeAnimatedLabel" />
       <keyword name="SyncCheckPage.__syncError" id="SyncCheckPage.__syncError" ref="eric5.Helpviewer.Sync.SyncCheckPage.html#SyncCheckPage.__syncError" />
       <keyword name="SyncCheckPage.__updatePage" id="SyncCheckPage.__updatePage" ref="eric5.Helpviewer.Sync.SyncCheckPage.html#SyncCheckPage.__updatePage" />
       <keyword name="SyncCheckPage.initializePage" id="SyncCheckPage.initializePage" ref="eric5.Helpviewer.Sync.SyncCheckPage.html#SyncCheckPage.initializePage" />
@@ -11787,8 +11790,6 @@
       <file>eric5.Helpviewer.WebPlugins.ClickToFlash.ClickToFlashWhitelistDialog.html</file>
       <file>eric5.Helpviewer.WebPlugins.WebPluginFactory.html</file>
       <file>eric5.Helpviewer.WebPlugins.WebPluginInterface.html</file>
-      <file>eric5.Helpviewer.data.html_rc.html</file>
-      <file>eric5.Helpviewer.data.icons_rc.html</file>
       <file>eric5.IconEditor.IconEditorGrid.html</file>
       <file>eric5.IconEditor.IconEditorPalette.html</file>
       <file>eric5.IconEditor.IconEditorWindow.html</file>

--- a/Documentation/Source/eric5.E5Gui.E5TabWidget.html	Sat Feb 25 18:30:46 2012 +0100
+++ b/Documentation/Source/eric5.E5Gui.E5TabWidget.html	Sat Feb 25 18:45:34 2012 +0100
@@ -261,7 +261,7 @@
 </dd>
 </dl><a NAME="E5TabWidget.animationLabel" ID="E5TabWidget.animationLabel"></a>
 <h4>E5TabWidget.animationLabel</h4>
-<b>animationLabel</b>(<i>index, animationFile</i>)
+<b>animationLabel</b>(<i>index, animationFile, speed=100</i>)
 <p>
         Public slot to set an animated icon.
 </p><dl>
@@ -271,6 +271,10 @@
 </dd><dt><i>animationFile</i></dt>
 <dd>
 name of the file containing the animation (string)
+</dd><dt><i>speed</i></dt>
+<dd>
+animation speed of the icon in percent of the original
+            icon's speed (integer)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>

--- a/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksMenu.html	Sat Feb 25 18:30:46 2012 +0100
+++ b/Documentation/Source/eric5.Helpviewer.Bookmarks.BookmarksMenu.html	Sat Feb 25 18:45:34 2012 +0100
@@ -51,10 +51,12 @@
 <dl>
 <dt>newUrl(QUrl, str)</dt>
 <dd>
-emitted to open a URL in a new tab
+emitted to open a URL with the given title in a
+        new tab
 </dd><dt>openUrl(QUrl, str)</dt>
 <dd>
-emitted to open a URL in the current tab
+emitted to open a URL with the given title in the
+        current tab
 </dd>
 </dl>
 <h3>Derived from</h3>
@@ -79,9 +81,6 @@
 <td><a href="#BookmarksMenu.__contextMenuRequested">__contextMenuRequested</a></td>
 <td>Private slot to handle the context menu request.</td>
 </tr><tr>
-<td><a href="#BookmarksMenu.__openAll">__openAll</a></td>
-<td>Private slot to open all the menu's items.</td>
-</tr><tr>
 <td><a href="#BookmarksMenu.__openBookmark">__openBookmark</a></td>
 <td>Private slot to open a bookmark in the current browser tab.</td>
 </tr><tr>
@@ -94,6 +93,9 @@
 <td><a href="#BookmarksMenu.createBaseMenu">createBaseMenu</a></td>
 <td>Public method to get the menu that is used to populate sub menu's.</td>
 </tr><tr>
+<td><a href="#BookmarksMenu.openAll">openAll</a></td>
+<td>Public slot to open all the menu's items.</td>
+</tr><tr>
 <td><a href="#BookmarksMenu.postPopulated">postPopulated</a></td>
 <td>Public method to add any actions after the tree.</td>
 </tr>
@@ -132,12 +134,7 @@
 <dd>
 position the context menu shall be shown (QPoint)
 </dd>
-</dl><a NAME="BookmarksMenu.__openAll" ID="BookmarksMenu.__openAll"></a>
-<h4>BookmarksMenu.__openAll</h4>
-<b>__openAll</b>(<i></i>)
-<p>
-        Private slot to open all the menu's items.
-</p><a NAME="BookmarksMenu.__openBookmark" ID="BookmarksMenu.__openBookmark"></a>
+</dl><a NAME="BookmarksMenu.__openBookmark" ID="BookmarksMenu.__openBookmark"></a>
 <h4>BookmarksMenu.__openBookmark</h4>
 <b>__openBookmark</b>(<i></i>)
 <p>
@@ -162,7 +159,12 @@
 <dd>
 reference to the menu (BookmarksMenu)
 </dd>
-</dl><a NAME="BookmarksMenu.postPopulated" ID="BookmarksMenu.postPopulated"></a>
+</dl><a NAME="BookmarksMenu.openAll" ID="BookmarksMenu.openAll"></a>
+<h4>BookmarksMenu.openAll</h4>
+<b>openAll</b>(<i></i>)
+<p>
+        Public slot to open all the menu's items.
+</p><a NAME="BookmarksMenu.postPopulated" ID="BookmarksMenu.postPopulated"></a>
 <h4>BookmarksMenu.postPopulated</h4>
 <b>postPopulated</b>(<i></i>)
 <p>
@@ -174,7 +176,14 @@
 <h2>BookmarksMenuBarMenu</h2>
 <p>
     Class implementing a dynamically populated menu for bookmarks.
-</p>
+</p><h3>Signals</h3>
+<dl>
+<dt>openUrl(QUrl, str)</dt>
+<dd>
+emitted to open a URL with the given title in the
+        current tab
+</dd>
+</dl>
 <h3>Derived from</h3>
 BookmarksMenu
 <h3>Class Attributes</h3>
@@ -191,6 +200,12 @@
 <td><a href="#BookmarksMenuBarMenu.__init__">BookmarksMenuBarMenu</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#BookmarksMenuBarMenu.__defaultBookmarkTriggered">__defaultBookmarkTriggered</a></td>
+<td>Private slot handling the default bookmark menu entries.</td>
+</tr><tr>
+<td><a href="#BookmarksMenuBarMenu.postPopulated">postPopulated</a></td>
+<td>Public method to add any actions after the tree.</td>
+</tr><tr>
 <td><a href="#BookmarksMenuBarMenu.prePopulated">prePopulated</a></td>
 <td>Public method to add any actions before the tree.</td>
 </tr><tr>
@@ -212,7 +227,17 @@
 <dd>
 reference to the parent widget (QWidget)
 </dd>
-</dl><a NAME="BookmarksMenuBarMenu.prePopulated" ID="BookmarksMenuBarMenu.prePopulated"></a>
+</dl><a NAME="BookmarksMenuBarMenu.__defaultBookmarkTriggered" ID="BookmarksMenuBarMenu.__defaultBookmarkTriggered"></a>
+<h4>BookmarksMenuBarMenu.__defaultBookmarkTriggered</h4>
+<b>__defaultBookmarkTriggered</b>(<i></i>)
+<p>
+        Private slot handling the default bookmark menu entries.
+</p><a NAME="BookmarksMenuBarMenu.postPopulated" ID="BookmarksMenuBarMenu.postPopulated"></a>
+<h4>BookmarksMenuBarMenu.postPopulated</h4>
+<b>postPopulated</b>(<i></i>)
+<p>
+        Public method to add any actions after the tree.
+</p><a NAME="BookmarksMenuBarMenu.prePopulated" ID="BookmarksMenuBarMenu.prePopulated"></a>
 <h4>BookmarksMenuBarMenu.prePopulated</h4>
 <b>prePopulated</b>(<i></i>)
 <p>

--- a/Documentation/Source/eric5.Helpviewer.Sync.SyncCheckPage.html	Sat Feb 25 18:30:46 2012 +0100
+++ b/Documentation/Source/eric5.Helpviewer.Sync.SyncCheckPage.html	Sat Feb 25 18:45:34 2012 +0100
@@ -61,6 +61,9 @@
 <td><a href="#SyncCheckPage.__init__">SyncCheckPage</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#SyncCheckPage.__makeAnimatedLabel">__makeAnimatedLabel</a></td>
+<td>Private slot to create an animated label.</td>
+</tr><tr>
 <td><a href="#SyncCheckPage.__syncError">__syncError</a></td>
 <td>Private slot to handle general synchronization issues.</td>
 </tr><tr>
@@ -85,6 +88,19 @@
 <dd>
 reference to the parent widget (QWidget)
 </dd>
+</dl><a NAME="SyncCheckPage.__makeAnimatedLabel" ID="SyncCheckPage.__makeAnimatedLabel"></a>
+<h4>SyncCheckPage.__makeAnimatedLabel</h4>
+<b>__makeAnimatedLabel</b>(<i>fileName, label</i>)
+<p>
+        Private slot to create an animated label.
+</p><dl>
+<dt><i>fileName</i></dt>
+<dd>
+name of the file containing the animation (string)
+</dd><dt><i>label</i></dt>
+<dd>
+reference to the label to be animated (QLabel)
+</dd>
 </dl><a NAME="SyncCheckPage.__syncError" ID="SyncCheckPage.__syncError"></a>
 <h4>SyncCheckPage.__syncError</h4>
 <b>__syncError</b>(<i>message</i>)

--- a/E5Gui/E5TabWidget.py	Sat Feb 25 18:30:46 2012 +0100
+++ b/E5Gui/E5TabWidget.py	Sat Feb 25 18:45:34 2012 +0100
@@ -298,12 +298,14 @@
             side = QTabBar.LeftSide
         return side
     
-    def animationLabel(self, index, animationFile):
+    def animationLabel(self, index, animationFile, speed=100):
         """
         Public slot to set an animated icon.
         
         @param index tab index (integer)
         @param animationFile name of the file containing the animation (string)
+        @param speed animation speed of the icon in percent of the original
+            icon's speed (integer)
         @return reference to the created label (QLabel)
         """
         if index == -1:
@@ -314,7 +316,7 @@
             animation = QLabel(self)
             if animationFile and not animation.movie():
                 movie = QMovie(animationFile, QByteArray(), animation)
-                movie.setSpeed(50)
+                movie.setSpeed(speed)
                 animation.setMovie(movie)
                 movie.start()
             self.__tabBar.setTabButton(index, side, None)

--- a/Helpviewer/HelpTabWidget.py	Sat Feb 25 18:30:46 2012 +0100
+++ b/Helpviewer/HelpTabWidget.py	Sat Feb 25 18:45:34 2012 +0100
@@ -618,7 +618,7 @@
         if browser is not None:
             index = self.indexOf(browser)
             anim = self.animationLabel(
-                index, os.path.join(getConfig("ericPixDir"), "loading.gif"))
+                index, os.path.join(getConfig("ericPixDir"), "loading.gif"), 100)
             if not anim:
                 loading = QIcon(os.path.join(getConfig("ericPixDir"), "loading.gif"))
                 self.setTabIcon(index, loading)

--- a/Helpviewer/Sync/SyncCheckPage.py	Sat Feb 25 18:30:46 2012 +0100
+++ b/Helpviewer/Sync/SyncCheckPage.py	Sat Feb 25 18:45:34 2012 +0100
@@ -68,43 +68,43 @@
         
         # bookmarks
         if Preferences.getHelp("SyncBookmarks"):
-            movie = QMovie(animationFile, QByteArray(), self.bookmarkLabel)
-            movie.setSpeed(50)
-            self.bookmarkLabel.setMovie(movie)
-            movie.start()
+            self.__makeAnimatedLabel(animationFile, self.bookmarkLabel)
         else:
             self.bookmarkLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo.png"))
         
         # history
         if Preferences.getHelp("SyncHistory"):
-            movie = QMovie(animationFile, QByteArray(), self.historyLabel)
-            movie.setSpeed(50)
-            self.historyLabel.setMovie(movie)
-            movie.start()
+            self.__makeAnimatedLabel(animationFile, self.historyLabel)
         else:
             self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo.png"))
         
         # Passwords
         if Preferences.getHelp("SyncPasswords"):
-            movie = QMovie(animationFile, QByteArray(), self.passwordsLabel)
-            movie.setSpeed(50)
-            self.passwordsLabel.setMovie(movie)
-            movie.start()
+            self.__makeAnimatedLabel(animationFile, self.passwordsLabel)
         else:
             self.passwordsLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo.png"))
         
         # user agent settings
         if Preferences.getHelp("SyncUserAgents"):
-            movie = QMovie(animationFile, QByteArray(), self.userAgentsLabel)
-            movie.setSpeed(50)
-            self.userAgentsLabel.setMovie(movie)
-            movie.start()
+            self.__makeAnimatedLabel(animationFile, self.userAgentsLabel)
         else:
             self.userAgentsLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo.png"))
         
         handler = syncMgr.handler()
         handler.syncStatus.connect(self.__updatePage)
     
+    def __makeAnimatedLabel(self, fileName, label):
+        """
+        Private slot to create an animated label.
+        
+        @param fileName name of the file containing the animation (string)
+        @param label reference to the label to be animated (QLabel)
+        """
+        movie = QMovie(fileName, QByteArray(), label)
+        movie.setSpeed(100)
+        label.setMovie(movie)
+        movie.start()
+    
     def __updatePage(self, type_, done, msg):
         """
         Private slot to update the synchronization status info.