eric: comparison WebBrowser/WebBrowserWindow.py

-:fc72c0c81a0f
+:b4d0cddecd64
 @keyparam searchWord word to search for (string)
 @keyparam private flag indicating a private browsing window (bool)
 @keyparam qthelp flag indicating to enable the QtHelp support (bool)
 @keyparam settingsDir directory to be used for the settings files (str)
 """
+self.__hideNavigationTimer = None
 super(WebBrowserWindow, self).__init__(parent)
 self.setObjectName(name)
 if private:
 self.setWindowTitle(self.tr("eric6 Web Browser (Private Mode)"))
 else:
 if self.__searchWord is not None:
 QTimer.singleShot(0, self.__searchForWord)
 e5App().focusChanged.connect(self.__appFocusChanged)
+self.__toolbarStates = self.saveState()
+self.__hideNavigationTimer = QTimer(self)
+self.__hideNavigationTimer.setInterval(1000)
+self.__hideNavigationTimer.setSingleShot(True)
+self.__hideNavigationTimer.timeout.connect(self.__hideNavigation)
 QTimer.singleShot(0, syncMgr.loadSettings)
 def __del__(self):
 """
 Special method called during object destruction.
 def __initToolbars(self):
 """
 Private method to create the toolbars.
 """
+# save references to toolbars in order to hide them
+# when going full screen
+self.__toolbars = []
 filetb = self.addToolBar(self.tr("File"))
 filetb.setObjectName("FileToolBar")
 filetb.setIconSize(UI.Config.ToolBarIconSize)
 filetb.addAction(self.newTabAct)
 filetb.addAction(self.newAct)
 filetb.addAction(self.printPdfAct)
 if self.printPreviewAct or self.printAct or self.printPdfAct:
 filetb.addSeparator()
 filetb.addAction(self.closeAct)
 filetb.addAction(self.exitAct)
+self.__toolbars.append(filetb)
 self.savePageScreenMenu = QMenu(self)
 self.savePageScreenMenu.addAction(self.savePageScreenAct)
 self.savePageScreenMenu.addAction(self.saveVisiblePageScreenAct)
 savePageScreenButton = filetb.widgetForAction(self.savePageScreenAct)
 edittb.addAction(self.copyAct)
 edittb.addAction(self.cutAct)
 edittb.addAction(self.pasteAct)
 edittb.addSeparator()
 edittb.addAction(self.selectAllAct)
+self.__toolbars.append(edittb)
 viewtb = self.addToolBar(self.tr("View"))
 viewtb.setObjectName("ViewToolBar")
 viewtb.setIconSize(UI.Config.ToolBarIconSize)
 viewtb.addAction(self.zoomInAct)
 viewtb.addAction(self.zoomResetAct)
 viewtb.addAction(self.zoomOutAct)
 viewtb.addSeparator()
 viewtb.addAction(self.fullScreenAct)
+self.__toolbars.append(viewtb)
 findtb = self.addToolBar(self.tr("Find"))
 findtb.setObjectName("FindToolBar")
 findtb.setIconSize(UI.Config.ToolBarIconSize)
 findtb.addAction(self.findAct)
 findtb.addAction(self.findNextAct)
 findtb.addAction(self.findPrevAct)
+self.__toolbars.append(findtb)
 if WebBrowserWindow._useQtHelp:
 filtertb = self.addToolBar(self.tr("Filter"))
 filtertb.setObjectName("FilterToolBar")
 self.filterCombo = QComboBox()
 filtertb.addWidget(self.filterCombo)
 self.__helpEngine.setupFinished.connect(self.__setupFilterCombo)
 self.filterCombo.activated[str].connect(
 self.__filterQtHelpDocumentation)
 self.__setupFilterCombo()
+self.__toolbars.append(filtertb)
 settingstb = self.addToolBar(self.tr("Settings"))
 settingstb.setObjectName("SettingsToolBar")
 settingstb.setIconSize(UI.Config.ToolBarIconSize)
 settingstb.addAction(self.prefAct)
 settingstb.addAction(self.cookiesAct)
 settingstb.addAction(self.flashCookiesAct)
 settingstb.addAction(self.personalDataAct)
 settingstb.addAction(self.greaseMonkeyAct)
 settingstb.addAction(self.featurePermissionAct)
+self.__toolbars.append(settingstb)
 toolstb = self.addToolBar(self.tr("Tools"))
 toolstb.setObjectName("ToolsToolBar")
 toolstb.setIconSize(UI.Config.ToolBarIconSize)
 toolstb.addAction(self.feedsManagerAct)
 toolstb.addAction(self.siteInfoAct)
 toolstb.addSeparator()
 toolstb.addAction(self.synchronizationAct)
+self.__toolbars.append(toolstb)
 helptb = self.addToolBar(self.tr("Help"))
 helptb.setObjectName("HelpToolBar")
 helptb.setIconSize(UI.Config.ToolBarIconSize)
 helptb.addAction(self.whatsThisAct)
+self.__toolbars.append(helptb)
 self.addToolBarBreak()
 gotb = self.addToolBar(self.tr("Go"))
 gotb.setObjectName("GoToolBar")
 self.forwardMenu.triggered.connect(
 self.__navigationMenuActionTriggered)
 forwardButton = gotb.widgetForAction(self.forwardAct)
 forwardButton.setMenu(self.forwardMenu)
 forwardButton.setPopupMode(QToolButton.MenuButtonPopup)
+self.__toolbars.append(gotb)
+self.__gotb = gotb
 from .Bookmarks.BookmarksToolBar import BookmarksToolBar
 bookmarksModel = self.bookmarksManager().bookmarksModel()
 self.bookmarksToolBar = BookmarksToolBar(self, bookmarksModel, self)
 self.bookmarksToolBar.setObjectName("BookmarksToolBar")
 self.bookmarksToolBar.openUrl.connect(self.openUrl)
 self.bookmarksToolBar.newTab.connect(self.openUrlNewTab)
 self.bookmarksToolBar.newWindow.connect(self.openUrlNewWindow)
 self.addToolBarBreak()
 self.addToolBar(self.bookmarksToolBar)
+self.__toolbars.append(self.bookmarksToolBar)
 self.addToolBarBreak()
 vttb = self.addToolBar(self.tr("VirusTotal"))
 vttb.setObjectName("VirusTotalToolBar")
 vttb.setIconSize(UI.Config.ToolBarIconSize)
 if not Preferences.getWebBrowser("VirusTotalEnabled") or \
 Preferences.getWebBrowser("VirusTotalServiceKey") == "":
 self.virustotalScanCurrentAct.setEnabled(False)
 self.virustotalIpReportAct.setEnabled(False)
 self.virustotalDomainReportAct.setEnabled(False)
+self.__toolbars.append(vttb)
 def __nextTab(self):
 """
 Private slot used to show the next tab.
 """
 return
 if self.isFullScreen():
 # switch back to normal
 self.showNormal()
-self.menuBar().show()
-self.fullScreenAct.setIcon(
-UI.PixmapCache.getIcon("windowFullscreen.png"))
-self.fullScreenAct.setIconText(self.tr('Full Screen'))
 else:
 # switch to full screen
 self.showFullScreen()
-self.menuBar().hide()
-self.fullScreenAct.setIcon(
-UI.PixmapCache.getIcon("windowRestore.png"))
-self.fullScreenAct.setIconText(self.tr('Restore Window'))
 def enterHtmlFullScreen(self):
 """
 Public method to switch to full screen initiated by the
 HTML page.
 """
 self.showFullScreen()
 self.__htmlFullScreen = True
+def isFullScreenNavigationVisible(self):
+"""
+Public method to check, if full screen navigation is active.
+"""
+# TODO: change this to navigation widget
+return self.isFullScreen() and self.__gotb.isVisible()
+def showFullScreenNavigation(self):
+"""
+Public slot to show full screen navigation.
+"""
+if self.__htmlFullScreen:
+return
+if self.__hideNavigationTimer.isActive():
+self.__hideNavigationTimer.stop()
+# TODO: change this to navigation widget
+self.__gotb.show()
+def hideFullScreenNavigation(self):
+"""
+Public slot to hide full screen navigation.
+"""
+if not self.__hideNavigationTimer.isActive():
+self.__hideNavigationTimer.start()
+def __hideNavigation(self):
+"""
+Private slot to hide full screen navigation by timer.
+"""
+browser = self.currentBrowser()
+mouseInBrowser = browser and browser.underMouse()
+if self.isFullScreen() and mouseInBrowser:
+# TODO: change this to navigation widget
+self.__gotb.hide()
 def __copy(self):
 """
 Private slot called to handle the copy action.
 """
 if evt.type() == QEvent.WindowStateChange:
 if not bool(evt.oldState() & Qt.WindowFullScreen) and \
 bool(self.windowState() & Qt.WindowFullScreen):
 # enter full screen mode
 self.__windowStates = evt.oldState()
+self.__toolbarStates = self.saveState()
+self.menuBar().hide()
+self.statusBar().hide()
+for toolbar in self.__toolbars:
+toolbar.hide()
+self.__tabWidget.tabBar().hide()
+self.__searchWidget.hide()
+##                self.fullScreenAct.setIcon(
+##                    UI.PixmapCache.getIcon("windowRestore.png"))
+##                self.fullScreenAct.setIconText(self.tr('Restore Window'))
 elif bool(evt.oldState() & Qt.WindowFullScreen) and \
 not bool(self.windowState() & Qt.WindowFullScreen):
 # leave full screen mode
 self.setWindowState(self.__windowStates)
 self.__htmlFullScreen = False
+self.menuBar().show()
+self.statusBar().show()
+self.restoreState(self.__toolbarStates)
+self.__tabWidget.tabBar().show()
+##                self.fullScreenAct.setIcon(
+##                    UI.PixmapCache.getIcon("windowFullscreen.png"))
+##                self.fullScreenAct.setIconText(self.tr('Full Screen'))
+if self.__hideNavigationTimer:
+self.__hideNavigationTimer.stop()
 return super(WebBrowserWindow, self).event(evt)
 ###########################################################################
 ## Interface to VirusTotal below                                         ##

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserWindow.py

WebBrowser/WebBrowserWindow.py