eric: comparison Helpviewer/HelpWindow.py

-:e8020b9ac2b9
+:0540f3c52b46
 from .Bookmarks.BookmarkNode import BookmarkNode
 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
 from .Bookmarks.BookmarksDialog import BookmarksDialog
 from .History.HistoryManager import HistoryManager
 from .History.HistoryMenu import HistoryMenu
-from .History.HistoryCompleter import HistoryCompletionModel, HistoryCompleter
 from .Passwords.PasswordManager import PasswordManager
 from .Network.NetworkAccessManager import NetworkAccessManager
 from .AdBlock.AdBlockManager import AdBlockManager
 from .OfflineStorage.OfflineStorageConfigDialog import OfflineStorageConfigDialog
 from .UserAgent.UserAgentMenu import UserAgentMenu
 @signal zoomTextOnlyChanged(bool) emitted after the zoom text only setting was
 changed
 """
 zoomTextOnlyChanged = pyqtSignal(bool)
 helpClosed = pyqtSignal()
+privacyChanged = pyqtSignal(bool)
 helpwindows = []
 maxMenuFilePathLen = 75
 self.fromEric = fromEric
 self.initShortcutsOnly = initShortcutsOnly
 self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
 self.mHistory = []
-self.pathCombo = None
 if self.initShortcutsOnly:
 self.__initActions()
 else:
 self.__helpEngine = \
 QHelpEngine(os.path.join(Utilities.getConfigDir(),
 "browser", "eric5help.qhc"), self)
 self.__helpEngine.warning.connect(self.__warning)
 self.__helpInstaller = None
-# Attributes for WebKit based browser
-self.__progressBar = None
 self.tabWidget = HelpTabWidget(self)
 self.tabWidget.currentChanged[int].connect(self.__currentChanged)
-self.tabWidget.sourceChanged.connect(self.__sourceChanged)
 self.tabWidget.titleChanged.connect(self.__titleChanged)
 self.tabWidget.showMessage.connect(self.statusBar().showMessage)
 self.findDlg = SearchWidget(self, self)
 centralWidget = QWidget()
 gotb.addAction(self.reloadAct)
 gotb.addAction(self.stopAct)
 gotb.addAction(self.homeAct)
 gotb.addSeparator()
-self.iconLabel = QLabel()
+self.__navigationSplitter = QSplitter(gotb)
-gotb.addWidget(self.iconLabel)
+self.__navigationSplitter.addWidget(self.tabWidget.stackedUrlBar())
-self.pathCombo = QComboBox()
-self.pathCombo.setDuplicatesEnabled(False)
-self.pathCombo.setInsertPolicy(QComboBox.InsertAtTop)
-self.pathCombo.setEditable(1)
-self.pathCombo.setAutoCompletion(True)
-self.pathCombo.activated[str].connect(self.__pathSelected)
-self.pathCombo.setWhatsThis(self.trUtf8(
-"""<p>Enter the help file to be displayed directly into this"""
-""" edit field. Select a previously shown help file from the"""
-""" drop down list.</p>"""
-))
-sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
-sizePolicy.setHorizontalStretch(6)
-sizePolicy.setVerticalStretch(0)
-sizePolicy.setHeightForWidth(self.pathCombo.sizePolicy().hasHeightForWidth())
-self.pathCombo.setSizePolicy(sizePolicy)
-gotb.addWidget(self.pathCombo)
-self.pathComboDefaultColor = \
-self.pathCombo.lineEdit().palette().color(QPalette.Base)
-self.__historyCompletionModel = HistoryCompletionModel(self)
-self.__historyCompletionModel.setSourceModel(
-self.historyManager().historyFilterModel())
-self.__historyCompleter = HistoryCompleter(self.__historyCompletionModel, self)
-self.__historyCompleter.activated[str].connect(self.__pathSelected)
-self.pathCombo.setCompleter(self.__historyCompleter)
-self.privacyLabel = QLabel()
-gotb.addWidget(self.privacyLabel)
-gotb.addSeparator()
 self.searchEdit = HelpWebSearchWidget(self)
 sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
 sizePolicy.setHorizontalStretch(2)
 sizePolicy.setVerticalStretch(0)
-sizePolicy.setHeightForWidth(self.searchEdit.sizePolicy().hasHeightForWidth())
 self.searchEdit.setSizePolicy(sizePolicy)
 self.searchEdit.search.connect(self.__linkActivated)
-gotb.addWidget(self.searchEdit)
+self.__navigationSplitter.addWidget(self.searchEdit)
+gotb.addWidget(self.__navigationSplitter)
+self.__navigationSplitter.setSizePolicy(
+QSizePolicy.Expanding, QSizePolicy.Maximum)
+self.__navigationSplitter.setCollapsible(0, False)
 self.backMenu = QMenu(self)
 self.backMenu.aboutToShow.connect(self.__showBackMenu)
 self.backMenu.triggered.connect(self.__navigationMenuActionTriggered)
 backButton = gotb.widgetForAction(self.backAct)
 Utilities.compactPath(hist, self.maxMenuFilePathLen))
 act.setData(idx)
 idx += 1
 act.setIcon(HelpWindow.__getWebIcon(QUrl(hist)))
-def __pathSelected(self, path):
-"""
-Private slot called when a file is selected in the combobox.
-@param path path to be shown (string)
-"""
-url = self.__guessUrlFromPath(path)
-self.currentBrowser().setSource(url)
-self.__setPathComboBackground()
-def __guessUrlFromPath(self, path):
-"""
-Private method to guess an URL given a path string.
-@param path path string to guess an URL for (string)
-@return guessed URL (QUrl)
-"""
-manager = self.searchEdit.openSearchManager()
-path = Utilities.fromNativeSeparators(path)
-url = manager.convertKeywordSearchToUrl(path)
-if url.isValid():
-return url
-try:
-return QUrl.fromUserInput(path)
-except AttributeError:
-return QUrl(path)
-def __setPathComboBackground(self):
-"""
-Private slot to change the path combo background to indicate save URLs.
-"""
-url = QUrl(self.pathCombo.currentText())
-le = self.pathCombo.lineEdit()
-p = le.palette()
-if url.isEmpty() or url.scheme() != "https":
-p.setBrush(QPalette.Base, self.pathComboDefaultColor)
-else:
-p.setBrush(QPalette.Base, QBrush(Preferences.getHelp("SaveUrlColor")))
-le.setPalette(p)
-le.update()
-def __sourceChanged(self, url):
-"""
-Private slot called when the displayed text of the combobox is changed.
-@param url URL of the new site (QUrl)
-"""
-selectedURL = url.toString()
-if selectedURL != "" and self.pathCombo is not None:
-i = self.pathCombo.findText(selectedURL)
-if i == -1:
-if not QWebSettings.globalSettings()\
-.testAttribute(QWebSettings.PrivateBrowsingEnabled):
-self.pathCombo.insertItem(0, selectedURL)
-self.pathCombo.setCurrentIndex(0)
-else:
-self.pathCombo.setCurrentIndex(i)
-self.__setPathComboBackground()
-self.iconChanged(self.currentBrowser().icon())
 def __titleChanged(self, title):
 """
 Private slot called to handle a change of the current browsers title.
 @param title new title (string)
 """ Until you close the window, you can still click"""
 """ the Back and Forward buttons to return to the"""
 """ web pages you have opened.</p>""")
 res = E5MessageBox.yesNo(self, "", txt)
 if res:
-settings.setAttribute(QWebSettings.PrivateBrowsingEnabled, True)
+self.setPrivateMode(True)
-self.pathCombo.setInsertPolicy(QComboBox.NoInsert)
-self.privacyLabel.setPixmap(
-UI.PixmapCache.getPixmap("privateBrowsing.png"))
-self.__setIconDatabasePath(False)
 else:
-settings.setAttribute(QWebSettings.PrivateBrowsingEnabled, False)
+self.setPrivateMode(False)
-self.pathCombo.setInsertPolicy(QComboBox.InsertAtTop)
-self.privacyLabel.setPixmap(QPixmap())
+def setPrivateMode(self, on):
+"""
+Public method to set the privacy mode.
+@param on flag indicating the privacy state (boolean)
+"""
+QWebSettings.globalSettings().setAttribute(
+QWebSettings.PrivateBrowsingEnabled, on)
+if on:
+self.__setIconDatabasePath(False)
+else:
 self.__setIconDatabasePath(True)
+self.privateBrowsingAct.setChecked(on)
+self.privacyChanged.emit(on)
 def currentBrowser(self):
 """
 Public method to get a reference to the current help browser.
 cb = self.currentBrowser()
 if cb is not None:
 self.setForwardAvailable(cb.isForwardAvailable())
 self.setBackwardAvailable(cb.isBackwardAvailable())
 self.setLoadingActions(cb.isLoading())
-url = cb.source().toString()
-index2 = self.pathCombo.findText(url)
-if index2 > -1:
-self.pathCombo.setCurrentIndex(index2)
-else:
-self.pathCombo.clearEditText()
-self.__setPathComboBackground()
-self.iconChanged(cb.icon())
 def __showPreferences(self):
 """
 Private slot to set the preferences.
 """
 def preferencesChanged(self):
 """
 Public slot to handle a change of preferences.
 """
-self.__setPathComboBackground()
 self.__initWebSettings()
 self.networkAccessManager().preferencesChanged()
 self.historyManager().preferencesChanged()
 dlg = OfflineStorageConfigDialog(self)
 if dlg.exec_() == QDialog.Accepted:
 dlg.storeData()
 self.__initWebSettings()
-############################################################################
-## Methods to support Webkit based browser below.
-############################################################################
-def progressBar(self):
-"""
-Public method to get a reference to the load progress bar.
-@return reference to the load progress bar (QProgressBar)
-"""
-if self.__progressBar is None:
-self.__progressBar = QProgressBar()
-self.statusBar().addPermanentWidget(self.__progressBar)
-self.__progressBar.setMaximumWidth(100)
-self.__progressBar.setFixedHeight(16)
-self.__progressBar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
-self.__progressBar.hide()
-return self.__progressBar
 @classmethod
 def helpEngine(cls):
 """
 Class method to get a reference to the help engine.
 Class method to get a reference to the cookie jar.
 @return reference to the cookie jar (CookieJar)
 """
 return cls.networkAccessManager().cookieJar()
-def iconChanged(self, icon):
-"""
-Public slot to change the icon shown to the left of the URL entry.
-@param icon icon to be shown (QIcon)
-"""
-self.iconLabel.setPixmap(icon.pixmap(16, 16))
 def __clearIconsDatabase(self):
 """
 Private slot to clear the icons databse.
 """

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/HelpWindow.py

Helpviewer/HelpWindow.py