Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserWindow.py

WebBrowser/WebBrowserWindow.py

branch
QtWebEngine
changeset 4732
5ac4fc1dfc20
parent 4731
67d861d9e492
child 4733
ae291a307ea6
equal deleted inserted replaced
4731:67d861d9e492 4732:5ac4fc1dfc20
81 UseQtHelp = QTHELP_AVAILABLE 81 UseQtHelp = QTHELP_AVAILABLE
82 82
83 _networkManager = None 83 _networkManager = None
84 ## _cookieJar = None 84 ## _cookieJar = None
85 ## _helpEngine = None 85 ## _helpEngine = None
86 ## _bookmarksManager = None 86 _bookmarksManager = None
87 ## _historyManager = None 87 ## _historyManager = None
88 ## _passwordManager = None 88 ## _passwordManager = None
89 ## _adblockManager = None 89 ## _adblockManager = None
90 ## _downloadManager = None 90 ## _downloadManager = None
91 ## _feedsManager = None 91 ## _feedsManager = None
622 ## if not self.__initShortcutsOnly: 622 ## if not self.__initShortcutsOnly:
623 ## self.saveVisiblePageScreenAct.triggered.connect( 623 ## self.saveVisiblePageScreenAct.triggered.connect(
624 ## self.__saveVisiblePageScreen) 624 ## self.__saveVisiblePageScreen)
625 ## self.__actions.append(self.saveVisiblePageScreenAct) 625 ## self.__actions.append(self.saveVisiblePageScreenAct)
626 626
627 # TODO: Bookmarks 627 bookmarksManager = self.bookmarksManager()
628 ## bookmarksManager = self.bookmarksManager() 628 self.importBookmarksAct = E5Action(
629 ## self.importBookmarksAct = E5Action( 629 self.tr('Import Bookmarks'),
630 ## self.tr('Import Bookmarks'), 630 self.tr('&Import Bookmarks...'),
631 ## self.tr('&Import Bookmarks...'), 631 0, 0, self, 'webbrowser_file_import_bookmarks')
632 ## 0, 0, self, 'webbrowser_file_import_bookmarks') 632 self.importBookmarksAct.setStatusTip(
633 ## self.importBookmarksAct.setStatusTip( 633 self.tr('Import bookmarks from other browsers'))
634 ## self.tr('Import bookmarks from other browsers')) 634 self.importBookmarksAct.setWhatsThis(self.tr(
635 ## self.importBookmarksAct.setWhatsThis(self.tr( 635 """<b>Import Bookmarks</b>"""
636 ## """<b>Import Bookmarks</b>""" 636 """<p>Import bookmarks from other browsers.</p>"""
637 ## """<p>Import bookmarks from other browsers.</p>""" 637 ))
638 ## )) 638 if not self.__initShortcutsOnly:
639 ## if not self.__initShortcutsOnly: 639 self.importBookmarksAct.triggered.connect(
640 ## self.importBookmarksAct.triggered.connect( 640 bookmarksManager.importBookmarks)
641 ## bookmarksManager.importBookmarks) 641 self.__actions.append(self.importBookmarksAct)
642 ## self.__actions.append(self.importBookmarksAct) 642
643 ## 643 self.exportBookmarksAct = E5Action(
644 ## self.exportBookmarksAct = E5Action( 644 self.tr('Export Bookmarks'),
645 ## self.tr('Export Bookmarks'), 645 self.tr('&Export Bookmarks...'),
646 ## self.tr('&Export Bookmarks...'), 646 0, 0, self, 'webbrowser_file_export_bookmarks')
647 ## 0, 0, self, 'webbrowser_file_export_bookmarks') 647 self.exportBookmarksAct.setStatusTip(
648 ## self.exportBookmarksAct.setStatusTip( 648 self.tr('Export the bookmarks into a file'))
649 ## self.tr('Export the bookmarks into a file')) 649 self.exportBookmarksAct.setWhatsThis(self.tr(
650 ## self.exportBookmarksAct.setWhatsThis(self.tr( 650 """<b>Export Bookmarks</b>"""
651 ## """<b>Export Bookmarks</b>""" 651 """<p>Export the bookmarks into a file.</p>"""
652 ## """<p>Export the bookmarks into a file.</p>""" 652 ))
653 ## )) 653 if not self.__initShortcutsOnly:
654 ## if not self.__initShortcutsOnly: 654 self.exportBookmarksAct.triggered.connect(
655 ## self.exportBookmarksAct.triggered.connect( 655 bookmarksManager.exportBookmarks)
656 ## bookmarksManager.exportBookmarks) 656 self.__actions.append(self.exportBookmarksAct)
657 ## self.__actions.append(self.exportBookmarksAct)
658 657
659 # TODO: print stuff 658 # TODO: print stuff
660 ## self.printAct = E5Action( 659 ## self.printAct = E5Action(
661 ## self.tr('Print'), 660 ## self.tr('Print'),
662 ## UI.PixmapCache.getIcon("print.png"), 661 ## UI.PixmapCache.getIcon("print.png"),
994 if not self.__initShortcutsOnly: 993 if not self.__initShortcutsOnly:
995 self.findPrevAct.triggered.connect( 994 self.findPrevAct.triggered.connect(
996 self.__searchWidget.findPrevious) 995 self.__searchWidget.findPrevious)
997 self.__actions.append(self.findPrevAct) 996 self.__actions.append(self.findPrevAct)
998 997
999 # TODO: Bookmarks 998 self.bookmarksManageAct = E5Action(
1000 ## self.bookmarksManageAct = E5Action( 999 self.tr('Manage Bookmarks'),
1001 ## self.tr('Manage Bookmarks'), 1000 self.tr('&Manage Bookmarks...'),
1002 ## self.tr('&Manage Bookmarks...'), 1001 QKeySequence(self.tr("Ctrl+Shift+B", "Help|Manage bookmarks")),
1003 ## QKeySequence(self.tr("Ctrl+Shift+B", "Help|Manage bookmarks")), 1002 0, self, 'webbrowser_bookmarks_manage')
1004 ## 0, self, 'webbrowser_bookmarks_manage') 1003 self.bookmarksManageAct.setStatusTip(self.tr(
1005 ## self.bookmarksManageAct.setStatusTip(self.tr( 1004 'Open a dialog to manage the bookmarks.'))
1006 ## 'Open a dialog to manage the bookmarks.')) 1005 self.bookmarksManageAct.setWhatsThis(self.tr(
1007 ## self.bookmarksManageAct.setWhatsThis(self.tr( 1006 """<b>Manage Bookmarks...</b>"""
1008 ## """<b>Manage Bookmarks...</b>""" 1007 """<p>Open a dialog to manage the bookmarks.</p>"""
1009 ## """<p>Open a dialog to manage the bookmarks.</p>""" 1008 ))
1010 ## )) 1009 if not self.__initShortcutsOnly:
1011 ## if not self.__initShortcutsOnly: 1010 self.bookmarksManageAct.triggered.connect(
1012 ## self.bookmarksManageAct.triggered.connect( 1011 self.__showBookmarksDialog)
1013 ## self.__showBookmarksDialog) 1012 self.__actions.append(self.bookmarksManageAct)
1014 ## self.__actions.append(self.bookmarksManageAct) 1013
1015 ## 1014 self.bookmarksAddAct = E5Action(
1016 ## self.bookmarksAddAct = E5Action( 1015 self.tr('Add Bookmark'),
1017 ## self.tr('Add Bookmark'), 1016 UI.PixmapCache.getIcon("addBookmark.png"),
1018 ## UI.PixmapCache.getIcon("addBookmark.png"), 1017 self.tr('Add &Bookmark...'),
1019 ## self.tr('Add &Bookmark...'), 1018 QKeySequence(self.tr("Ctrl+D", "Help|Add bookmark")),
1020 ## QKeySequence(self.tr("Ctrl+D", "Help|Add bookmark")), 1019 0, self, 'webbrowser_bookmark_add')
1021 ## 0, self, 'webbrowser_bookmark_add') 1020 self.bookmarksAddAct.setIconVisibleInMenu(False)
1022 ## self.bookmarksAddAct.setIconVisibleInMenu(False) 1021 self.bookmarksAddAct.setStatusTip(self.tr(
1023 ## self.bookmarksAddAct.setStatusTip(self.tr( 1022 'Open a dialog to add a bookmark.'))
1024 ## 'Open a dialog to add a bookmark.')) 1023 self.bookmarksAddAct.setWhatsThis(self.tr(
1025 ## self.bookmarksAddAct.setWhatsThis(self.tr( 1024 """<b>Add Bookmark</b>"""
1026 ## """<b>Add Bookmark</b>""" 1025 """<p>Open a dialog to add the current URL as a bookmark.</p>"""
1027 ## """<p>Open a dialog to add the current URL as a bookmark.</p>""" 1026 ))
1028 ## )) 1027 if not self.__initShortcutsOnly:
1029 ## if not self.__initShortcutsOnly: 1028 self.bookmarksAddAct.triggered.connect(self.__addBookmark)
1030 ## self.bookmarksAddAct.triggered.connect(self.__addBookmark) 1029 self.__actions.append(self.bookmarksAddAct)
1031 ## self.__actions.append(self.bookmarksAddAct) 1030
1032 ## 1031 self.bookmarksAddFolderAct = E5Action(
1033 ## self.bookmarksAddFolderAct = E5Action( 1032 self.tr('Add Folder'),
1034 ## self.tr('Add Folder'), 1033 self.tr('Add &Folder...'),
1035 ## self.tr('Add &Folder...'), 1034 0, 0, self, 'webbrowser_bookmark_show_all')
1036 ## 0, 0, self, 'webbrowser_bookmark_show_all') 1035 self.bookmarksAddFolderAct.setStatusTip(self.tr(
1037 ## self.bookmarksAddFolderAct.setStatusTip(self.tr( 1036 'Open a dialog to add a new bookmarks folder.'))
1038 ## 'Open a dialog to add a new bookmarks folder.')) 1037 self.bookmarksAddFolderAct.setWhatsThis(self.tr(
1039 ## self.bookmarksAddFolderAct.setWhatsThis(self.tr( 1038 """<b>Add Folder...</b>"""
1040 ## """<b>Add Folder...</b>""" 1039 """<p>Open a dialog to add a new bookmarks folder.</p>"""
1041 ## """<p>Open a dialog to add a new bookmarks folder.</p>""" 1040 ))
1042 ## )) 1041 if not self.__initShortcutsOnly:
1043 ## if not self.__initShortcutsOnly: 1042 self.bookmarksAddFolderAct.triggered.connect(
1044 ## self.bookmarksAddFolderAct.triggered.connect( 1043 self.__addBookmarkFolder)
1045 ## self.__addBookmarkFolder) 1044 self.__actions.append(self.bookmarksAddFolderAct)
1046 ## self.__actions.append(self.bookmarksAddFolderAct) 1045
1047 ## 1046 self.bookmarksAllTabsAct = E5Action(
1048 ## self.bookmarksAllTabsAct = E5Action( 1047 self.tr('Bookmark All Tabs'),
1049 ## self.tr('Bookmark All Tabs'), 1048 self.tr('Bookmark All Tabs...'),
1050 ## self.tr('Bookmark All Tabs...'), 1049 0, 0, self, 'webbrowser_bookmark_all_tabs')
1051 ## 0, 0, self, 'webbrowser_bookmark_all_tabs') 1050 self.bookmarksAllTabsAct.setStatusTip(self.tr(
1052 ## self.bookmarksAllTabsAct.setStatusTip(self.tr( 1051 'Bookmark all open tabs.'))
1053 ## 'Bookmark all open tabs.')) 1052 self.bookmarksAllTabsAct.setWhatsThis(self.tr(
1054 ## self.bookmarksAllTabsAct.setWhatsThis(self.tr( 1053 """<b>Bookmark All Tabs...</b>"""
1055 ## """<b>Bookmark All Tabs...</b>""" 1054 """<p>Open a dialog to add a new bookmarks folder for"""
1056 ## """<p>Open a dialog to add a new bookmarks folder for""" 1055 """ all open tabs.</p>"""
1057 ## """ all open tabs.</p>""" 1056 ))
1058 ## )) 1057 if not self.__initShortcutsOnly:
1059 ## if not self.__initShortcutsOnly: 1058 self.bookmarksAllTabsAct.triggered.connect(self.bookmarkAll)
1060 ## self.bookmarksAllTabsAct.triggered.connect(self.bookmarkAll) 1059 self.__actions.append(self.bookmarksAllTabsAct)
1061 ## self.__actions.append(self.bookmarksAllTabsAct)
1062 1060
1063 self.whatsThisAct = E5Action( 1061 self.whatsThisAct = E5Action(
1064 self.tr('What\'s This?'), 1062 self.tr('What\'s This?'),
1065 UI.PixmapCache.getIcon("whatsThis.png"), 1063 UI.PixmapCache.getIcon("whatsThis.png"),
1066 self.tr('&What\'s This?'), 1064 self.tr('&What\'s This?'),
1831 ## self.historyMenu.setTitle(self.tr('H&istory')) 1829 ## self.historyMenu.setTitle(self.tr('H&istory'))
1832 ## self.historyMenu.openUrl.connect(self.openUrl) 1830 ## self.historyMenu.openUrl.connect(self.openUrl)
1833 ## self.historyMenu.newUrl.connect(self.openUrlNewTab) 1831 ## self.historyMenu.newUrl.connect(self.openUrlNewTab)
1834 ## mb.addMenu(self.historyMenu) 1832 ## mb.addMenu(self.historyMenu)
1835 1833
1836 # TODO: Bookmarks 1834 from .Bookmarks.BookmarksMenu import BookmarksMenuBarMenu
1837 ## from .Bookmarks.BookmarksMenu import BookmarksMenuBarMenu 1835 self.bookmarksMenu = BookmarksMenuBarMenu(self)
1838 ## self.bookmarksMenu = BookmarksMenuBarMenu(self) 1836 self.bookmarksMenu.setTearOffEnabled(True)
1839 ## self.bookmarksMenu.setTearOffEnabled(True) 1837 self.bookmarksMenu.setTitle(self.tr('&Bookmarks'))
1840 ## self.bookmarksMenu.setTitle(self.tr('&Bookmarks')) 1838 self.bookmarksMenu.openUrl.connect(self.openUrl)
1841 ## self.bookmarksMenu.openUrl.connect(self.openUrl) 1839 self.bookmarksMenu.newUrl.connect(self.openUrlNewTab)
1842 ## self.bookmarksMenu.newUrl.connect(self.openUrlNewTab) 1840 mb.addMenu(self.bookmarksMenu)
1843 ## mb.addMenu(self.bookmarksMenu) 1841
1844 ## 1842 bookmarksActions = []
1845 ## bookmarksActions = [] 1843 bookmarksActions.append(self.bookmarksManageAct)
1846 ## bookmarksActions.append(self.bookmarksManageAct) 1844 bookmarksActions.append(self.bookmarksAddAct)
1847 ## bookmarksActions.append(self.bookmarksAddAct) 1845 bookmarksActions.append(self.bookmarksAllTabsAct)
1848 ## bookmarksActions.append(self.bookmarksAllTabsAct) 1846 bookmarksActions.append(self.bookmarksAddFolderAct)
1849 ## bookmarksActions.append(self.bookmarksAddFolderAct) 1847 bookmarksActions.append("--SEPARATOR--")
1850 ## bookmarksActions.append("--SEPARATOR--") 1848 bookmarksActions.append(self.importBookmarksAct)
1851 ## bookmarksActions.append(self.importBookmarksAct) 1849 bookmarksActions.append(self.exportBookmarksAct)
1852 ## bookmarksActions.append(self.exportBookmarksAct) 1850 self.bookmarksMenu.setInitialActions(bookmarksActions)
1853 ## self.bookmarksMenu.setInitialActions(bookmarksActions)
1854 1851
1855 menu = mb.addMenu(self.tr('&Settings')) 1852 menu = mb.addMenu(self.tr('&Settings'))
1856 menu.setTearOffEnabled(True) 1853 menu.setTearOffEnabled(True)
1857 menu.addAction(self.prefAct) 1854 menu.addAction(self.prefAct)
1858 ## menu.addAction(self.acceptedLanguagesAct) 1855 ## menu.addAction(self.acceptedLanguagesAct)
2058 self.__navigationMenuActionTriggered) 2055 self.__navigationMenuActionTriggered)
2059 forwardButton = gotb.widgetForAction(self.forwardAct) 2056 forwardButton = gotb.widgetForAction(self.forwardAct)
2060 forwardButton.setMenu(self.forwardMenu) 2057 forwardButton.setMenu(self.forwardMenu)
2061 forwardButton.setPopupMode(QToolButton.MenuButtonPopup) 2058 forwardButton.setPopupMode(QToolButton.MenuButtonPopup)
2062 2059
2063 ## from .Bookmarks.BookmarksToolBar import BookmarksToolBar 2060 from .Bookmarks.BookmarksToolBar import BookmarksToolBar
2064 ## bookmarksModel = self.bookmarksManager().bookmarksModel() 2061 bookmarksModel = self.bookmarksManager().bookmarksModel()
2065 ## self.bookmarksToolBar = BookmarksToolBar(self, bookmarksModel, self) 2062 self.bookmarksToolBar = BookmarksToolBar(self, bookmarksModel, self)
2066 ## self.bookmarksToolBar.setObjectName("BookmarksToolBar") 2063 self.bookmarksToolBar.setObjectName("BookmarksToolBar")
2067 ## self.bookmarksToolBar.setIconSize(UI.Config.ToolBarIconSize) 2064 self.bookmarksToolBar.setIconSize(UI.Config.ToolBarIconSize)
2068 ## self.bookmarksToolBar.openUrl.connect(self.openUrl) 2065 self.bookmarksToolBar.openUrl.connect(self.openUrl)
2069 ## self.bookmarksToolBar.newUrl.connect(self.openUrlNewTab) 2066 self.bookmarksToolBar.newUrl.connect(self.openUrlNewTab)
2070 ## self.addToolBarBreak() 2067 self.addToolBarBreak()
2071 ## self.addToolBar(self.bookmarksToolBar) 2068 self.addToolBar(self.bookmarksToolBar)
2072 2069
2073 ## self.addToolBarBreak() 2070 ## self.addToolBarBreak()
2074 ## vttb = self.addToolBar(self.tr("VirusTotal")) 2071 ## vttb = self.addToolBar(self.tr("VirusTotal"))
2075 ## vttb.setObjectName("VirusTotalToolBar") 2072 ## vttb.setObjectName("VirusTotalToolBar")
2076 ## vttb.setIconSize(UI.Config.ToolBarIconSize) 2073 ## vttb.setIconSize(UI.Config.ToolBarIconSize)
2314 @param b flag indicating the loading state to consider (boolean) 2311 @param b flag indicating the loading state to consider (boolean)
2315 """ 2312 """
2316 self.reloadAct.setEnabled(not b) 2313 self.reloadAct.setEnabled(not b)
2317 self.stopAct.setEnabled(b) 2314 self.stopAct.setEnabled(b)
2318 2315
2319 ## def __addBookmark(self): 2316 def __addBookmark(self):
2320 ## """ 2317 """
2321 ## Private slot called to add the displayed file to the bookmarks. 2318 Private slot called to add the displayed file to the bookmarks.
2322 ## """ 2319 """
2323 ## view = self.currentBrowser() 2320 view = self.currentBrowser()
2324 ## url = bytes(view.url().toEncoded()).decode() 2321 url = bytes(view.url().toEncoded()).decode()
2325 ## title = view.title() 2322 title = view.title()
2326 ## description = "" 2323 description = ""
2327 ## meta = view.page().mainFrame().metaData() 2324 meta = view.page().mainFrame().metaData()
2328 ## if "description" in meta: 2325 if "description" in meta:
2329 ## description = meta["description"][0] 2326 description = meta["description"][0]
2330 ## 2327
2331 ## from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog 2328 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
2332 ## dlg = AddBookmarkDialog() 2329 dlg = AddBookmarkDialog()
2333 ## dlg.setUrl(url) 2330 dlg.setUrl(url)
2334 ## dlg.setTitle(title) 2331 dlg.setTitle(title)
2335 ## dlg.setDescription(description) 2332 dlg.setDescription(description)
2336 ## menu = self.bookmarksManager().menu() 2333 menu = self.bookmarksManager().menu()
2337 ## idx = self.bookmarksManager().bookmarksModel().nodeIndex(menu) 2334 idx = self.bookmarksManager().bookmarksModel().nodeIndex(menu)
2338 ## dlg.setCurrentIndex(idx) 2335 dlg.setCurrentIndex(idx)
2339 ## dlg.exec_() 2336 dlg.exec_()
2340 ## 2337
2341 ## def __addBookmarkFolder(self): 2338 def __addBookmarkFolder(self):
2342 ## """ 2339 """
2343 ## Private slot to add a new bookmarks folder. 2340 Private slot to add a new bookmarks folder.
2344 ## """ 2341 """
2345 ## from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog 2342 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
2346 ## dlg = AddBookmarkDialog() 2343 dlg = AddBookmarkDialog()
2347 ## menu = self.bookmarksManager().menu() 2344 menu = self.bookmarksManager().menu()
2348 ## idx = self.bookmarksManager().bookmarksModel().nodeIndex(menu) 2345 idx = self.bookmarksManager().bookmarksModel().nodeIndex(menu)
2349 ## dlg.setCurrentIndex(idx) 2346 dlg.setCurrentIndex(idx)
2350 ## dlg.setFolder(True) 2347 dlg.setFolder(True)
2351 ## dlg.exec_() 2348 dlg.exec_()
2352 ## 2349
2353 ## def __showBookmarksDialog(self): 2350 def __showBookmarksDialog(self):
2354 ## """ 2351 """
2355 ## Private slot to show the bookmarks dialog. 2352 Private slot to show the bookmarks dialog.
2356 ## """ 2353 """
2357 ## from .Bookmarks.BookmarksDialog import BookmarksDialog 2354 from .Bookmarks.BookmarksDialog import BookmarksDialog
2358 ## self.__bookmarksDialog = BookmarksDialog(self) 2355 self.__bookmarksDialog = BookmarksDialog(self)
2359 ## self.__bookmarksDialog.openUrl.connect(self.openUrl) 2356 self.__bookmarksDialog.openUrl.connect(self.openUrl)
2360 ## self.__bookmarksDialog.newUrl.connect(self.openUrlNewTab) 2357 self.__bookmarksDialog.newUrl.connect(self.openUrlNewTab)
2361 ## self.__bookmarksDialog.show() 2358 self.__bookmarksDialog.show()
2362 ## 2359
2363 ## def bookmarkAll(self): 2360 def bookmarkAll(self):
2364 ## """ 2361 """
2365 ## Public slot to bookmark all open tabs. 2362 Public slot to bookmark all open tabs.
2366 ## """ 2363 """
2367 ## from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog 2364 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
2368 ## dlg = AddBookmarkDialog() 2365 dlg = AddBookmarkDialog()
2369 ## dlg.setFolder(True) 2366 dlg.setFolder(True)
2370 ## dlg.setTitle(self.tr("Saved Tabs")) 2367 dlg.setTitle(self.tr("Saved Tabs"))
2371 ## dlg.exec_() 2368 dlg.exec_()
2372 ## 2369
2373 ## folder = dlg.addedNode() 2370 folder = dlg.addedNode()
2374 ## if folder is None: 2371 if folder is None:
2375 ## return 2372 return
2376 ## 2373
2377 ## from .Bookmarks.BookmarkNode import BookmarkNode 2374 from .Bookmarks.BookmarkNode import BookmarkNode
2378 ## for browser in self.__tabWidget.browsers(): 2375 for browser in self.__tabWidget.browsers():
2379 ## bookmark = BookmarkNode(BookmarkNode.Bookmark) 2376 bookmark = BookmarkNode(BookmarkNode.Bookmark)
2380 ## bookmark.url = bytes(browser.url().toEncoded()).decode() 2377 bookmark.url = bytes(browser.url().toEncoded()).decode()
2381 ## bookmark.title = browser.title() 2378 bookmark.title = browser.title()
2382 ## meta = browser.page().mainFrame().metaData() 2379 meta = browser.page().mainFrame().metaData()
2383 ## if "description" in meta: 2380 if "description" in meta:
2384 ## bookmark.desc = meta["description"][0] 2381 bookmark.desc = meta["description"][0]
2385 ## 2382
2386 ## self.bookmarksManager().addBookmark(folder, bookmark) 2383 self.bookmarksManager().addBookmark(folder, bookmark)
2387 2384
2388 def __find(self): 2385 def __find(self):
2389 """ 2386 """
2390 Private slot to handle the find action. 2387 Private slot to handle the find action.
2391 2388
2438 ## 2435 ##
2439 ## self.__closeNetworkMonitor() 2436 ## self.__closeNetworkMonitor()
2440 ## 2437 ##
2441 ## self.cookieJar().close() 2438 ## self.cookieJar().close()
2442 ## 2439 ##
2443 ## self.bookmarksToolBar.setModel(None) 2440 self.bookmarksToolBar.setModel(None)
2444 ## self.bookmarksManager().close() 2441 self.bookmarksManager().close()
2445 ## 2442
2446 ## self.historyManager().close() 2443 ## self.historyManager().close()
2447 ## 2444 ##
2448 ## self.passwordManager().close() 2445 ## self.passwordManager().close()
2449 ## 2446 ##
2450 ## self.adBlockManager().close() 2447 ## self.adBlockManager().close()
3415 @param url URL to get icon for (QUrl) 3412 @param url URL to get icon for (QUrl)
3416 @return icon for the URL (QIcon) 3413 @return icon for the URL (QIcon)
3417 """ 3414 """
3418 return WebIconProvider.instance().iconForUrl(url) 3415 return WebIconProvider.instance().iconForUrl(url)
3419 3416
3420 ## @classmethod 3417 @classmethod
3421 ## def bookmarksManager(cls): 3418 def bookmarksManager(cls):
3422 ## """ 3419 """
3423 ## Class method to get a reference to the bookmarks manager. 3420 Class method to get a reference to the bookmarks manager.
3424 ## 3421
3425 ## @return reference to the bookmarks manager (BookmarksManager) 3422 @return reference to the bookmarks manager (BookmarksManager)
3426 ## """ 3423 """
3427 ## if cls._bookmarksManager is None: 3424 if cls._bookmarksManager is None:
3428 ## from .Bookmarks.BookmarksManager import BookmarksManager 3425 from .Bookmarks.BookmarksManager import BookmarksManager
3429 ## cls._bookmarksManager = BookmarksManager() 3426 cls._bookmarksManager = BookmarksManager()
3430 ## 3427
3431 ## return cls._bookmarksManager 3428 return cls._bookmarksManager
3432 ## 3429
3433 def openUrl(self, url, title): 3430 def openUrl(self, url, title):
3434 """ 3431 """
3435 Public slot to load a URL in the current tab. 3432 Public slot to load a URL in the current tab.
3436 3433
3437 @param url URL to be opened (QUrl) 3434 @param url URL to be opened (QUrl)
3438 @param title title of the bookmark (string) 3435 @param title title of the bookmark (string)
3439 """ 3436 """
3440 self.__linkActivated(url) 3437 self.__linkActivated(url)
3441 3438
3442 def openUrlNewTab(self, url, title): 3439 def openUrlNewTab(self, url, title):
3443 """ 3440 """
3444 Public slot to load a URL in a new tab. 3441 Public slot to load a URL in a new tab.
3445 3442
3446 @param url URL to be opened (QUrl) 3443 @param url URL to be opened (QUrl)

Mercurial Repository: eric

eric ide

mercurial