diff -r e97af1181efd -r e16573640cb8 WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py Sat Apr 02 19:44:09 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py Sun Apr 03 16:22:18 2016 +0200
@@ -18,14 +18,12 @@
import sys
from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \
- QUrl, QThread, QTextCodec, QProcess, QEvent
-from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics, \
- QIcon
+ QUrl, QTextCodec, QProcess, QEvent
+from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics
from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \
QComboBox, QLabel, QSplitter, QMenu, QToolButton, QLineEdit, \
QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar, QAction, \
QInputDialog
-##from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest
from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEnginePage, \
QWebEngineProfile, QWebEngineScript
try:
@@ -77,8 +75,6 @@
BrowserWindows = []
-## maxMenuFilePathLen = 75
-##
_fromEric = False
UseQtHelp = QTHELP_AVAILABLE
_isPrivate = False
@@ -1684,6 +1680,7 @@
menu.addAction(self.openAct)
menu.addAction(self.openTabAct)
menu.addSeparator()
+ # TODO: Qt 5.7: Save
## menu.addAction(self.saveAsAct)
menu.addAction(self.savePageScreenAct)
menu.addAction(self.saveVisiblePageScreenAct)
@@ -1844,6 +1841,7 @@
filetb.addAction(self.openAct)
filetb.addAction(self.openTabAct)
filetb.addSeparator()
+ # TODO: Qt 5.7: Save
## filetb.addAction(self.saveAsAct)
filetb.addAction(self.savePageScreenAct)
filetb.addSeparator()
@@ -2159,6 +2157,7 @@
url = "file://" + fn
self.newTab(url)
+ # TODO: Qt 5.7: Save
## def __savePageAs(self):
## """
## Private slot to save the current page.
@@ -2485,8 +2484,7 @@
"""
Private slot called to handle the reload action.
"""
-## self.currentBrowser().reloadBypassingCache()
- self.currentBrowser().reload()
+ self.currentBrowser().reloadBypassingCache()
def __stopLoading(self):
"""
@@ -2863,13 +2861,6 @@
if WebBrowserWindow.useQtHelp:
self.__activateDock(self.__tocWindow)
-## def __hideTocWindow(self):
-## """
-## Private method to hide the table of contents window.
-## """
-## if WebBrowserWindow.UseQtHelp:
-## self.__tocDock.hide()
-##
def __showIndexWindow(self):
"""
Private method to show the index window.
@@ -2877,13 +2868,6 @@
if WebBrowserWindow.useQtHelp:
self.__activateDock(self.__indexWindow)
-## def __hideIndexWindow(self):
-## """
-## Private method to hide the index window.
-## """
-## if WebBrowserWindow.UseQtHelp:
-## self.__indexDock.hide()
-##
def __showSearchWindow(self):
"""
Private method to show the search window.
@@ -2891,13 +2875,6 @@
if WebBrowserWindow.useQtHelp:
self.__activateDock(self.__searchWindow)
-## def __hideSearchWindow(self):
-## """
-## Private method to hide the search window.
-## """
-## if WebBrowserWindow.UseQtHelp:
-## self.__searchDock.hide()
-##
def __activateDock(self, widget):
"""
Private method to activate the dock widget of the given widget.
