Mercurial Repositories > eric / file diff

--- a/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Thu Mar 17 20:22:20 2016 +0100
+++ b/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Fri Mar 18 20:05:12 2016 +0100
@@ -43,25 +43,22 @@
         
         self.icon.setPixmap(UI.PixmapCache.getPixmap("bookmark32.png"))
         
-        import WebBrowser.WebBrowserWindow
+        from WebBrowser.WebBrowserWindow import WebBrowserWindow
         
-        if WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager()\
-           .bookmarkForUrl(url) is None:
+        if WebBrowserWindow.bookmarksManager().bookmarkForUrl(url) is None:
             self.__bmAction = self.AddBookmark
             self.bookmarkPushButton.setText(self.tr("Add Bookmark"))
         else:
             self.__bmAction = self.EditBookmark
             self.bookmarkPushButton.setText(self.tr("Edit Bookmark"))
         
-        # TODO: SpeedDial
-        self.speeddialPushButton.setText("Future Speed Dial Entry")
-##        if WebBrowser.WebBrowserWindow.WebBrowserWindow.speedDial().pageForUrl(url).url:
-##            self.__sdAction = self.RemoveSpeeddial
-##            self.speeddialPushButton.setText(
-##                self.tr("Remove from Speed Dial"))
-##        else:
-##            self.__sdAction = self.AddSpeeddial
-##            self.speeddialPushButton.setText(self.tr("Add to Speed Dial"))
+        if WebBrowserWindow.speedDial().pageForUrl(url).url:
+            self.__sdAction = self.RemoveSpeeddial
+            self.speeddialPushButton.setText(
+                self.tr("Remove from Speed Dial"))
+        else:
+            self.__sdAction = self.AddSpeeddial
+            self.speeddialPushButton.setText(self.tr("Add to Speed Dial"))
         
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())