Mercurial Repositories > eric / changeset
changeset
Continued to shorten the code lines to max. 79 characters.
Wed, 09 Oct 2013 19:26:41 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 09 Oct 2013 19:26:41 +0200
- changeset 2999
- 28c75409a78f
- parent 2998
- 95581102e03e
- child 3000
- 971d84f7a6d6
Continued to shorten the code lines to max. 79 characters.
--- a/Helpviewer/ClosedTabsManager.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/ClosedTabsManager.py Wed Oct 09 19:26:41 2013 +0200 @@ -43,8 +43,8 @@ """ Class implementing a manager for closed tabs. - @signal closedTabAvailable(boolean) emitted to signal a change in availability - of closed tabs + @signal closedTabAvailable(boolean) emitted to signal a change of + availability of closed tabs """ closedTabAvailable = pyqtSignal(bool)
--- a/Helpviewer/HelpBrowserWV.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpBrowserWV.py Wed Oct 09 19:26:41 2013 +0200 @@ -8,12 +8,12 @@ Module implementing the helpbrowser using QWebView. """ -from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, QUrl, \ - QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile, QPoint, \ - QByteArray, qVersion +from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, \ + QUrl, QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile, \ + QPoint, QByteArray, qVersion from PyQt4.QtGui import qApp, QDesktopServices, QStyle, QMenu, QApplication, \ - QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, QColor, \ - QPalette, QFrame, QPrinter, QPrintDialog, QDialog + QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, \ + QColor, QPalette, QFrame, QPrinter, QPrintDialog, QDialog from PyQt4.QtWebKit import QWebView, QWebPage, QWebSettings try: from PyQt4.QtWebKit import QWebElement @@ -33,7 +33,7 @@ except ImportError: SSL_AVAILABLE = False -########################################################################################## +############################################################################### class JavaScriptExternalObject(QObject): @@ -74,16 +74,19 @@ self.href = "" self.title = "" -########################################################################################## +############################################################################### class JavaScriptEricObject(QObject): """ - Class implementing an external javascript object to search via the startpage. + Class implementing an external javascript object to search via the + startpage. """ - # these must be in line with the strings used by the javascript part of the start page + # these must be in line with the strings used by the javascript part of + # the start page translations = [ - QT_TRANSLATE_NOOP("JavaScriptEricObject", "Welcome to eric5 Web Browser!"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", + "Welcome to eric5 Web Browser!"), QT_TRANSLATE_NOOP("JavaScriptEricObject", "eric5 Web Browser"), QT_TRANSLATE_NOOP("JavaScriptEricObject", "Search!"), QT_TRANSLATE_NOOP("JavaScriptEricObject", "About eric5"), @@ -139,7 +142,7 @@ self.__mw.openSearchManager().currentEngine()\ .searchUrl(searchStr).toEncoded()).decode() -########################################################################################## +############################################################################### class HelpWebPage(QWebPage): @@ -162,7 +165,8 @@ self.__lastRequestType = QWebPage.NavigationTypeOther import Helpviewer.HelpWindow - from .Network.NetworkAccessManagerProxy import NetworkAccessManagerProxy + from .Network.NetworkAccessManagerProxy import \ + NetworkAccessManagerProxy self.__proxy = NetworkAccessManagerProxy(self) self.__proxy.setWebPage(self) self.__proxy.setPrimaryNetworkAccessManager( @@ -197,11 +201,12 @@ if type_ == QWebPage.NavigationTypeFormResubmitted: res = E5MessageBox.yesNo(self.view(), self.trUtf8("Resending POST request"), - self.trUtf8("""In order to display the site, the request along with""" - """ all the data must be sent once again, which may lead""" - """ to some unexpected behaviour of the site e.g. the""" - """ same action might be performed once again. Do you want""" - """ to continue anyway?"""), + self.trUtf8( + """In order to display the site, the request along with""" + """ all the data must be sent once again, which may lead""" + """ to some unexpected behaviour of the site e.g. the""" + """ same action might be performed once again. Do you""" + """ want to continue anyway?"""), icon=E5MessageBox.Warning) if not res: return False @@ -212,14 +217,18 @@ """ Public method to add data to a network request. - @param request reference to the network request object (QNetworkRequest) + @param request reference to the network request object + (QNetworkRequest) """ try: request.setAttribute(QNetworkRequest.User + 100, self) if self.__lastRequest.url() == request.url(): - request.setAttribute(QNetworkRequest.User + 101, self.__lastRequestType) - if self.__lastRequestType == QWebPage.NavigationTypeLinkClicked: - request.setRawHeader("X-Eric5-UserLoadAction", QByteArray("1")) + request.setAttribute(QNetworkRequest.User + 101, + self.__lastRequestType) + if self.__lastRequestType == \ + QWebPage.NavigationTypeLinkClicked: + request.setRawHeader("X-Eric5-UserLoadAction", + QByteArray("1")) except TypeError: pass @@ -252,13 +261,16 @@ Public method to implement a specific extension. @param extension extension to be executed (QWebPage.Extension) - @param option provides input to the extension (QWebPage.ExtensionOption) + @param option provides input to the extension + (QWebPage.ExtensionOption) @param output stores the output results (QWebPage.ExtensionReturn) @return flag indicating a successful call of the extension (boolean) """ if extension == QWebPage.ChooseMultipleFilesExtension: - info = sip.cast(option, QWebPage.ChooseMultipleFilesExtensionOption) - files = sip.cast(output, QWebPage.ChooseMultipleFilesExtensionReturn) + info = sip.cast(option, + QWebPage.ChooseMultipleFilesExtensionOption) + files = sip.cast(output, + QWebPage.ChooseMultipleFilesExtensionReturn) if info is None or files is None: return super().extension(extension, option, output) @@ -275,7 +287,8 @@ if extension == QWebPage.ErrorPageExtension: info = sip.cast(option, QWebPage.ErrorPageExtensionOption) if info.error == 102: - # this is something of a hack; hopefully it will work in the future + # this is something of a hack; hopefully it will work in + # the future return False errorPage = sip.cast(output, QWebPage.ErrorPageExtensionReturn) @@ -286,7 +299,8 @@ info.errorString.startswith("AdBlockRule:"): if info.frame != info.frame.page().mainFrame(): # content in <iframe> - docElement = info.frame.page().mainFrame().documentElement() + docElement = info.frame.page().mainFrame()\ + .documentElement() for element in docElement.findAll("iframe"): src = element.attribute("src") if src in info.url.toString(): @@ -296,13 +310,16 @@ # the whole page is blocked rule = info.errorString.replace("AdBlockRule:", "") title = self.trUtf8("Content blocked by AdBlock Plus") - message = self.trUtf8("Blocked by rule: <i>{0}</i>").format(rule) + message = self.trUtf8( + "Blocked by rule: <i>{0}</i>").format(rule) htmlFile = QFile(":/html/adblockPage.html") htmlFile.open(QFile.ReadOnly) html = htmlFile.readAll() - html = html.replace("@FAVICON@", "qrc:icons/adBlockPlus16.png") - html = html.replace("@IMAGE@", "qrc:icons/adBlockPlus64.png") + html = html.replace( + "@FAVICON@", "qrc:icons/adBlockPlus16.png") + html = html.replace( + "@IMAGE@", "qrc:icons/adBlockPlus64.png") html = html.replace("@TITLE@", title.encode("utf8")) html = html.replace("@MESSAGE@", message.encode("utf8")) errorPage.content = html @@ -328,27 +345,32 @@ imageBuffer = QBuffer() imageBuffer.open(QIODevice.ReadWrite) if pixmap.save(imageBuffer, "PNG"): - html = html.replace("@FAVICON@", imageBuffer.buffer().toBase64()) + html = html.replace( + "@FAVICON@", imageBuffer.buffer().toBase64()) html = html.replace("@TITLE@", title.encode("utf8")) html = html.replace("@H1@", info.errorString.encode("utf8")) - html = html.replace("@H2@", self.trUtf8("When connecting to: {0}.")\ + html = html.replace( + "@H2@", self.trUtf8("When connecting to: {0}.")\ .format(urlString).encode("utf8")) html = html.replace("@LI-1@", self.trUtf8("Check the address for errors such as " "<b>ww</b>.example.org instead of " "<b>www</b>.example.org").encode("utf8")) html = html.replace("@LI-2@", - self.trUtf8("If the address is correct, try checking the network " - "connection.").encode("utf8")) + self.trUtf8( + "If the address is correct, try checking the network " + "connection.").encode("utf8")) html = html.replace("@LI-3@", - self.trUtf8("If your computer or network is protected by a firewall " - "or proxy, make sure that the browser is permitted to " - "access the network.").encode("utf8")) + self.trUtf8( + "If your computer or network is protected by a firewall " + "or proxy, make sure that the browser is permitted to " + "access the network.").encode("utf8")) html = html.replace("@LI-4@", self.trUtf8("If your cache policy is set to offline browsing," "only pages in the local cache are available.")\ .encode("utf8")) - html = html.replace("@BUTTON@", self.trUtf8("Try Again").encode("utf8")) + html = html.replace( + "@BUTTON@", self.trUtf8("Try Again").encode("utf8")) errorPage.content = html return True @@ -417,7 +439,8 @@ @return user agent string (string) """ import Helpviewer.HelpWindow - agent = Helpviewer.HelpWindow.HelpWindow.userAgentsManager().userAgentForUrl(url) + agent = Helpviewer.HelpWindow.HelpWindow.userAgentsManager()\ + .userAgentForUrl(url) if agent == "": # no agent string specified for the given host -> use global one agent = Preferences.getHelp("UserAgent") @@ -463,7 +486,8 @@ manager = Helpviewer.HelpWindow.HelpWindow.bookmarksManager() from .Bookmarks.BookmarkNode import BookmarkNode for bookmark in manager.bookmarksForUrl(reply.url()): - manager.setTimestamp(bookmark, BookmarkNode.TsModified, modified) + manager.setTimestamp(bookmark, BookmarkNode.TsModified, + modified) def getSslCertificate(self): """ @@ -506,8 +530,8 @@ """ if SSL_AVAILABLE and self.__sslConfiguration is not None: from E5Network.E5SslInfoWidget import E5SslInfoWidget - widget = E5SslInfoWidget(self.mainFrame().url(), self.__sslConfiguration, - self.view()) + widget = E5SslInfoWidget( + self.mainFrame().url(), self.__sslConfiguration, self.view()) widget.showAt(pos) else: E5MessageBox.warning(self.view(), @@ -576,7 +600,7 @@ return super().event(evt) -########################################################################################## +############################################################################### class HelpBrowser(QWebView): @@ -618,8 +642,8 @@ super().__init__(parent) self.setObjectName(name) self.setWhatsThis(self.trUtf8( - """<b>Help Window</b>""" - """<p>This window displays the selected help information.</p>""" + """<b>Help Window</b>""" + """<p>This window displays the selected help information.</p>""" )) import Helpviewer.HelpWindow @@ -689,7 +713,8 @@ @param frame reference to the web frame (QWebFrame) """ - self.page().settings().setAttribute(QWebSettings.JavascriptEnabled, True) + self.page().settings().setAttribute(QWebSettings.JavascriptEnabled, + True) if self.__javaScriptBinding is None: self.__javaScriptBinding = JavaScriptExternalObject(self.mw, self) @@ -700,14 +725,19 @@ frame = frame.mainFrame() if frame.url().scheme() == "eric" and frame.url().path() == "home": if self.__javaScriptEricObject is None: - self.__javaScriptEricObject = JavaScriptEricObject(self.mw, self) - frame.addToJavaScriptWindowObject("eric", self.__javaScriptEricObject) - elif frame.url().scheme() == "eric" and frame.url().path() == "speeddial": - frame.addToJavaScriptWindowObject("speeddial", self.__speedDial) + self.__javaScriptEricObject = JavaScriptEricObject( + self.mw, self) + frame.addToJavaScriptWindowObject( + "eric", self.__javaScriptEricObject) + elif frame.url().scheme() == "eric" and \ + frame.url().path() == "speeddial": + frame.addToJavaScriptWindowObject( + "speeddial", self.__speedDial) self.__speedDial.addWebFrame(frame) else: # called from QWebPage.frameCreated - frame.javaScriptWindowObjectCleared.connect(self.__addExternalBinding) + frame.javaScriptWindowObjectCleared.connect( + self.__addExternalBinding) frame.addToJavaScriptWindowObject("external", self.__javaScriptBinding) def linkedResources(self, relation=""): @@ -721,7 +751,8 @@ baseUrl = self.page().mainFrame().baseUrl() - linkElements = self.page().mainFrame().findAllElements("html > head > link") + linkElements = self.page().mainFrame().findAllElements( + "html > head > link") for linkElement in linkElements.toList(): rel = linkElement.attribute("rel") @@ -784,7 +815,8 @@ if not QFileInfo(name.toLocalFile()).exists(): E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>The file <b>{0}</b> does not exist.</p>""")\ + self.trUtf8( + """<p>The file <b>{0}</b> does not exist.</p>""")\ .format(name.toLocalFile())) return @@ -983,7 +1015,8 @@ @param case flag indicating a case sensitive search (boolean) @param backwards flag indicating a backwards search (boolean) @param wrap flag indicating to wrap around (boolean) - @param highlightAll flag indicating to highlight all occurrences (boolean) + @param highlightAll flag indicating to highlight all occurrences + (boolean) @return flag indicating that a match was found (boolean) """ findFlags = QWebPage.FindFlags() @@ -1016,7 +1049,8 @@ This method is overridden from QWebView. - @param evt reference to the context menu event object (QContextMenuEvent) + @param evt reference to the context menu event object + (QContextMenuEvent) """ from .UserAgent.UserAgentMenu import UserAgentMenu menu = QMenu(self) @@ -1036,13 +1070,16 @@ menu.addSeparator() menu.addAction(UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8("Copy Link to Clipboard"), self.__copyLink) - menu.addAction(UI.PixmapCache.getIcon("mailSend.png"), - self.trUtf8("Send Link"), self.__sendLink).setData(hit.linkUrl()) + menu.addAction( + UI.PixmapCache.getIcon("mailSend.png"), + self.trUtf8("Send Link"), + self.__sendLink).setData(hit.linkUrl()) if Preferences.getHelp("VirusTotalEnabled") and \ Preferences.getHelp("VirusTotalServiceKey") != "": - menu.addAction(UI.PixmapCache.getIcon("virustotal.png"), - self.trUtf8("Scan Link with VirusTotal"), self.__virusTotal)\ - .setData(hit.linkUrl()) + menu.addAction( + UI.PixmapCache.getIcon("virustotal.png"), + self.trUtf8("Scan Link with VirusTotal"), + self.__virusTotal).setData(hit.linkUrl()) if not hit.imageUrl().isEmpty(): if not menu.isEmpty(): @@ -1053,21 +1090,25 @@ menu.addSeparator() menu.addAction(UI.PixmapCache.getIcon("download.png"), self.trUtf8("Save Image"), self.__downloadImage) - menu.addAction(self.trUtf8("Copy Image to Clipboard"), self.__copyImage) + menu.addAction( + self.trUtf8("Copy Image to Clipboard"), self.__copyImage) menu.addAction(UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8("Copy Image Location to Clipboard"), self.__copyLocation).setData(hit.imageUrl().toString()) - menu.addAction(UI.PixmapCache.getIcon("mailSend.png"), - self.trUtf8("Send Image Link"), self.__sendLink).setData(hit.imageUrl()) + menu.addAction( + UI.PixmapCache.getIcon("mailSend.png"), + self.trUtf8("Send Image Link"), + self.__sendLink).setData(hit.imageUrl()) menu.addSeparator() menu.addAction(UI.PixmapCache.getIcon("adBlockPlus.png"), self.trUtf8("Block Image"), self.__blockImage)\ .setData(hit.imageUrl().toString()) if Preferences.getHelp("VirusTotalEnabled") and \ Preferences.getHelp("VirusTotalServiceKey") != "": - menu.addAction(UI.PixmapCache.getIcon("virustotal.png"), - self.trUtf8("Scan Image with VirusTotal"), self.__virusTotal)\ - .setData(hit.imageUrl()) + menu.addAction( + UI.PixmapCache.getIcon("virustotal.png"), + self.trUtf8("Scan Image with VirusTotal"), + self.__virusTotal).setData(hit.imageUrl()) element = hit.element() if not element.isNull(): @@ -1082,16 +1123,20 @@ videoUrl = QUrl(element.evaluateJavaScript("this.currentSrc")) if paused: - menu.addAction(UI.PixmapCache.getIcon("mediaPlaybackStart.png"), + menu.addAction( + UI.PixmapCache.getIcon("mediaPlaybackStart.png"), self.trUtf8("Play"), self.__pauseMedia) else: - menu.addAction(UI.PixmapCache.getIcon("mediaPlaybackPause.png"), + menu.addAction( + UI.PixmapCache.getIcon("mediaPlaybackPause.png"), self.trUtf8("Pause"), self.__pauseMedia) if muted: - menu.addAction(UI.PixmapCache.getIcon("audioVolumeHigh.png"), + menu.addAction( + UI.PixmapCache.getIcon("audioVolumeHigh.png"), self.trUtf8("Unmute"), self.__muteMedia) else: - menu.addAction(UI.PixmapCache.getIcon("audioVolumeMuted.png"), + menu.addAction( + UI.PixmapCache.getIcon("audioVolumeMuted.png"), self.trUtf8("Mute"), self.__muteMedia) menu.addSeparator() menu.addAction(UI.PixmapCache.getIcon("editCopy.png"), @@ -1107,14 +1152,16 @@ if element.tagName().lower() in ["input", "textarea"]: if menu.isEmpty(): pageMenu = self.page().createStandardContextMenu() - directionFound = False # used to detect double direction entry + directionFound = False # used to detect double + # direction entry for act in pageMenu.actions(): if act.isSeparator(): menu.addSeparator() continue if act.menu(): - if self.pageAction(QWebPage.SetTextDirectionDefault) in \ - act.menu().actions(): + if self.pageAction( + QWebPage.SetTextDirectionDefault) in \ + act.menu().actions(): if directionFound: act.setVisible(False) directionFound = True @@ -1174,7 +1221,8 @@ menu.addAction(UI.PixmapCache.getIcon("mailSend.png"), self.trUtf8("Send Page Link"), self.__sendLink).setData(self.url()) menu.addSeparator() - self.__userAgentMenu = UserAgentMenu(self.trUtf8("User Agent"), url=self.url()) + self.__userAgentMenu = UserAgentMenu(self.trUtf8("User Agent"), + url=self.url()) menu.addMenu(self.__userAgentMenu) menu.addSeparator() menu.addAction(self.mw.backAct) @@ -1187,14 +1235,17 @@ menu.addSeparator() if self.selectedText(): menu.addAction(self.mw.copyAct) - menu.addAction(UI.PixmapCache.getIcon("mailSend.png"), - self.trUtf8("Send Text"), self.__sendLink).setData(self.selectedText()) + menu.addAction( + UI.PixmapCache.getIcon("mailSend.png"), + self.trUtf8("Send Text"), + self.__sendLink).setData(self.selectedText()) menu.addAction(self.mw.findAct) menu.addSeparator() if self.selectedText(): self.__searchMenu = menu.addMenu(self.trUtf8("Search with...")) - from .OpenSearch.OpenSearchEngineAction import OpenSearchEngineAction + from .OpenSearch.OpenSearchEngineAction import \ + OpenSearchEngineAction engineNames = self.mw.openSearchManager().allEnginesNames() for engineName in engineNames: engine = self.mw.openSearchManager().engine(engineName) @@ -1219,8 +1270,8 @@ self.trUtf8("Google Translate"), self.__openLinkInNewTab)\ .setData(googleTranslatorUrl) wiktionaryUrl = QUrl( - "http://{0}.wiktionary.org/wiki/Special:Search?search={1}".format( - langCode, self.selectedText())) + "http://{0}.wiktionary.org/wiki/Special:Search?search={1}" + .format(langCode, self.selectedText())) menu.addAction(UI.PixmapCache.getIcon("wikipedia.png"), self.trUtf8("Dictionary"), self.__openLinkInNewTab)\ .setData(wiktionaryUrl) @@ -1228,8 +1279,9 @@ guessedUrl = QUrl.fromUserInput(self.selectedText().strip()) if self.__isUrlValid(guessedUrl): - menu.addAction(self.trUtf8("Go to web address"), self.__openLinkInNewTab)\ - .setData(guessedUrl) + menu.addAction( + self.trUtf8("Go to web address"), + self.__openLinkInNewTab).setData(guessedUrl) menu.addSeparator() element = hit.element() @@ -1259,7 +1311,8 @@ def __openLinkInNewTab(self): """ - Private method called by the context menu to open a link in a new window. + Private method called by the context menu to open a link in a new + window. """ act = self.sender() url = act.data() @@ -1415,7 +1468,8 @@ if method != "get": E5MessageBox.warning(self, self.trUtf8("Method not supported"), - self.trUtf8("""{0} method is not supported.""").format(method.upper())) + self.trUtf8( + """{0} method is not supported.""").format(method.upper())) return searchUrl = QUrl(self.page().mainFrame().baseUrl().resolved( @@ -1445,7 +1499,8 @@ selectFields = formElement.findAll("select") for selectField in selectFields.toList(): name = selectField.attribute("name") - selectedIndex = selectField.evaluateJavaScript("this.selectedIndex") + selectedIndex = selectField.evaluateJavaScript( + "this.selectedIndex") if selectedIndex == -1: continue @@ -1465,7 +1520,8 @@ return if searchEngines[searchEngine] != "": - searchUrl.addQueryItem(searchEngines[searchEngine], searchEngine) + searchUrl.addQueryItem( + searchEngines[searchEngine], searchEngine) engineName = "" labels = formElement.findAll('label[for="{0}"]'.format(elementName)) @@ -1698,9 +1754,9 @@ self.history().clear() self.__urlChanged(self.history().currentItem().url()) - ############################################################################ + ########################################################################### ## Signal converters below - ############################################################################ + ########################################################################### def __urlChanged(self, url): """ @@ -1731,9 +1787,9 @@ """ self.highlighted.emit(link) - ############################################################################ + ########################################################################### ## Signal handlers below - ############################################################################ + ########################################################################### def __loadStarted(self): """ @@ -1794,7 +1850,8 @@ self.mw.downloadManager().download(url, True, mainWindow=self.mw) - def __unsupportedContent(self, reply, requestFilename=None, download=False): + def __unsupportedContent(self, reply, requestFilename=None, + download=False): """ Private slot to handle the unsupportedContent signal. @@ -1861,14 +1918,16 @@ self.trUtf8("If the address is correct, try checking the network " "connection.").encode("utf8")) html = html.replace("@LI-3@", - self.trUtf8("If your computer or network is protected by a firewall " - "or proxy, make sure that the browser is permitted to " - "access the network.").encode("utf8")) + self.trUtf8( + "If your computer or network is protected by a firewall " + "or proxy, make sure that the browser is permitted to " + "access the network.").encode("utf8")) html = html.replace("@LI-4@", self.trUtf8("If your cache policy is set to offline browsing," "only pages in the local cache are available.")\ .encode("utf8")) - html = html.replace("@BUTTON@", self.trUtf8("Try Again").encode("utf8")) + html = html.replace( + "@BUTTON@", self.trUtf8("Try Again").encode("utf8")) notFoundFrame.setHtml(bytes(html).decode("utf8"), replyUrl) self.mw.historyManager().removeHistoryEntry(replyUrl, self.title()) self.loadFinished.emit(False) @@ -1897,20 +1956,25 @@ res = E5MessageBox.yesNo(self, self.trUtf8("Web Database Quota"), - self.trUtf8("""<p>The database quota of <strong>{0}</strong> has""" - """ been exceeded while accessing database <strong>{1}""" - """</strong>.</p><p>Shall it be changed?</p>""")\ - .format(self.__dataString(securityOrigin.databaseQuota()), databaseName), + self.trUtf8( + """<p>The database quota of <strong>{0}</strong> has""" + """ been exceeded while accessing database <strong>{1}""" + """</strong>.</p><p>Shall it be changed?</p>""")\ + .format(self.__dataString(securityOrigin.databaseQuota()), + databaseName), yesDefault=True) if res: newQuota, ok = QInputDialog.getInt( self, self.trUtf8("New Web Database Quota"), - self.trUtf8("Enter the new quota in MB (current = {0}, used = {1}; " - "step size = 5 MB):"\ - .format(self.__dataString(securityOrigin.databaseQuota()), - self.__dataString(securityOrigin.databaseUsage()))), - securityOrigin.databaseQuota() // (1024 * 1024), 0, 2147483647, 5) + self.trUtf8( + "Enter the new quota in MB (current = {0}, used = {1}; " + "step size = 5 MB):"\ + .format( + self.__dataString(securityOrigin.databaseQuota()), + self.__dataString(securityOrigin.databaseUsage()))), + securityOrigin.databaseQuota() // (1024 * 1024), + 0, 2147483647, 5) if ok: securityOrigin.setDatabaseQuota(newQuota * 1024 * 1024) @@ -1932,9 +1996,9 @@ unit = self.trUtf8("MB") return "{0:.1f} {1}".format(size, unit) - ############################################################################ + ########################################################################### ## Access key related methods below - ############################################################################ + ########################################################################### def __accessKeyShortcut(self): """ @@ -1978,11 +2042,15 @@ while frame and frame != self.page().mainFrame(): p -= frame.scrollPosition() frame = frame.parentFrame() - pevent = QMouseEvent(QEvent.MouseButtonPress, p, Qt.LeftButton, - Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier)) + pevent = QMouseEvent( + QEvent.MouseButtonPress, p, Qt.LeftButton, + Qt.MouseButtons(Qt.NoButton), + Qt.KeyboardModifiers(Qt.NoModifier)) qApp.sendEvent(self, pevent) - revent = QMouseEvent(QEvent.MouseButtonRelease, p, Qt.LeftButton, - Qt.MouseButtons(Qt.NoButton), Qt.KeyboardModifiers(Qt.NoModifier)) + revent = QMouseEvent( + QEvent.MouseButtonRelease, p, Qt.LeftButton, + Qt.MouseButtons(Qt.NoButton), + Qt.KeyboardModifiers(Qt.NoModifier)) qApp.sendEvent(self, revent) handled = True @@ -2015,7 +2083,8 @@ # Priority first goes to elements with accesskey attributes alreadyLabeled = [] for elementType in supportedElements: - result = self.page().mainFrame().findAllElements(elementType).toList() + result = self.page().mainFrame().findAllElements(elementType)\ + .toList() for element in result: geometry = element.geometry() if geometry.size().isEmpty() or \ @@ -2039,10 +2108,11 @@ self.__makeAccessLabel(accessKey, element) alreadyLabeled.append(element) - # Pick an access key first from the letters in the text and then from the - # list of unused access keys + # Pick an access key first from the letters in the text and then + # from the list of unused access keys for elementType in supportedElements: - result = self.page().mainFrame().findAllElements(elementType).toList() + result = self.page().mainFrame().findAllElements(elementType)\ + .toList() for element in result: geometry = element.geometry() if not unusedKeys or \ @@ -2159,9 +2229,9 @@ """ return len(self.__rss) > 0 - ############################################################################ + ########################################################################### ## Clicked Frame slots - ############################################################################ + ########################################################################### def __loadClickedFrame(self): """ @@ -2198,8 +2268,9 @@ except AttributeError: E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>Printing is not available due to a bug in PyQt4.""" - """Please upgrade.</p>""")) + self.trUtf8( + """<p>Printing is not available due to a bug in""" + """ PyQt4. Please upgrade.</p>""")) def __printPreviewClickedFrame(self): """ @@ -2240,8 +2311,9 @@ except AttributeError: E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>Printing is not available due to a bug in PyQt4.""" - """Please upgrade.</p>""")) + self.trUtf8( + """<p>Printing is not available due to a bug in PyQt4.""" + """Please upgrade.</p>""")) return def __printPdfClickedFrame(self): @@ -2268,17 +2340,20 @@ except AttributeError: E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>Printing is not available due to a bug in PyQt4.""" - """Please upgrade.</p>""")) + self.trUtf8( + """<p>Printing is not available due to a bug in""" + """ PyQt4. Please upgrade.</p>""")) return def __zoomInClickedFrame(self): """ Private slot to zoom into the clicked frame. """ - index = self.__levelForZoom(int(self.__clickedFrame.zoomFactor() * 100)) + index = self.__levelForZoom( + int(self.__clickedFrame.zoomFactor() * 100)) if index < len(self.__zoomLevels) - 1: - self.__clickedFrame.setZoomFactor(self.__zoomLevels[index + 1] / 100) + self.__clickedFrame.setZoomFactor( + self.__zoomLevels[index + 1] / 100) def __zoomResetClickedFrame(self): """ @@ -2290,9 +2365,11 @@ """ Private slot to zoom out of the clicked frame. """ - index = self.__levelForZoom(int(self.__clickedFrame.zoomFactor() * 100)) + index = self.__levelForZoom( + int(self.__clickedFrame.zoomFactor() * 100)) if index > 0: - self.__clickedFrame.setZoomFactor(self.__zoomLevels[index - 1] / 100) + self.__clickedFrame.setZoomFactor( + self.__zoomLevels[index - 1] / 100) def __showClickedFrameSource(self): """
--- a/Helpviewer/HelpClearPrivateDataDialog.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpClearPrivateDataDialog.py Wed Oct 09 19:26:41 2013 +0200 @@ -29,10 +29,10 @@ """ Public method to get the data from the dialog. - @return tuple with flags indicating which data to clear (browsing history, - search history, favicons, disk cache, cookies, passwords, web - databases, downloads, flash) and the selected history period in milliseconds - (tuple of booleans and integer) + @return tuple with flags indicating which data to clear + (browsing history, search history, favicons, disk cache, cookies, + passwords, web databases, downloads, flash) and the selected + history period in milliseconds (tuple of booleans and integer) """ index = self.historyCombo.currentIndex() if index == 0:
--- a/Helpviewer/HelpDocsInstaller.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpDocsInstaller.py Wed Oct 09 19:26:41 2013 +0200 @@ -66,11 +66,13 @@ changes = False qt4Docs = ["designer", "linguist", "qt"] - qt5Docs = ["activeqt", "qtconcurrent", "qtcore", "qtdbus", "qtdesigner", "qtdoc", - "qtgraphicaleffects", "qtgui", "qthelp", "qtimageformats", "qtlinguist", - "qtmultimedia", "qtnetwork", "qtopengl", "qtprintsupport", "qtqml", "qtquick", - "qtscript", "qtsql", "qtsvg", "qttestlib", "qtuitools", "qtwebkit", - "qtwebkitexamples", "qtwidgets", "qtxml", "qtxmlpatterns"] + qt5Docs = [ + "activeqt", "qtconcurrent", "qtcore", "qtdbus", "qtdesigner", + "qtdoc", "qtgraphicaleffects", "qtgui", "qthelp", "qtimageformats", + "qtlinguist", "qtmultimedia", "qtnetwork", "qtopengl", + "qtprintsupport", "qtqml", "qtquick", "qtscript", "qtsql", "qtsvg", + "qttestlib", "qtuitools", "qtwebkit", "qtwebkitexamples", + "qtwidgets", "qtxml", "qtxmlpatterns"] for qtDocs, version in [(qt4Docs, 4), (qt5Docs, 5)]: for doc in qtDocs: changes |= self.__installQtDoc(doc, version, engine) @@ -108,10 +110,12 @@ qchFile = lst[1] if version == 4: - docsPath = QDir(QLibraryInfo.location(QLibraryInfo.DocumentationPath) + \ - QDir.separator() + "qch") + docsPath = QDir( + QLibraryInfo.location(QLibraryInfo.DocumentationPath) + \ + QDir.separator() + "qch") elif version == 5: - docsPath = QDir(QLibraryInfo.location(QLibraryInfo.DocumentationPath)) + docsPath = QDir( + QLibraryInfo.location(QLibraryInfo.DocumentationPath)) else: # unsupported Qt version return False @@ -125,13 +129,15 @@ for f in files: if f.startswith(name): fi = QFileInfo(docsPath.absolutePath() + QDir.separator() + f) - namespace = QHelpEngineCore.namespaceName(fi.absoluteFilePath()) + namespace = QHelpEngineCore.namespaceName( + fi.absoluteFilePath()) if not namespace: continue if dt.isValid() and \ namespace in engine.registeredDocumentations() and \ - fi.lastModified().toString(Qt.ISODate) == dt.toString(Qt.ISODate) and \ + fi.lastModified().toString(Qt.ISODate) == \ + dt.toString(Qt.ISODate) and \ qchFile == fi.absoluteFilePath(): return False @@ -140,8 +146,9 @@ if not engine.registerDocumentation(fi.absoluteFilePath()): self.errorMessage.emit( - self.trUtf8("""<p>The file <b>{0}</b> could not be registered.""" - """<br/>Reason: {1}</p>""")\ + self.trUtf8( + """<p>The file <b>{0}</b> could not be""" + """ registered. <br/>Reason: {1}</p>""")\ .format(fi.absoluteFilePath, engine.error()) ) return False @@ -184,11 +191,13 @@ if f == "source.qch": fi = QFileInfo(docsPath.absolutePath() + QDir.separator() + f) if dt.isValid() and \ - fi.lastModified().toString(Qt.ISODate) == dt.toString(Qt.ISODate) and \ + fi.lastModified().toString(Qt.ISODate) == \ + dt.toString(Qt.ISODate) and \ qchFile == fi.absoluteFilePath(): return False - namespace = QHelpEngineCore.namespaceName(fi.absoluteFilePath()) + namespace = QHelpEngineCore.namespaceName( + fi.absoluteFilePath()) if not namespace: continue @@ -197,8 +206,9 @@ if not engine.registerDocumentation(fi.absoluteFilePath()): self.errorMessage.emit( - self.trUtf8("""<p>The file <b>{0}</b> could not be registered.""" - """<br/>Reason: {1}</p>""")\ + self.trUtf8( + """<p>The file <b>{0}</b> could not be""" + """ registered. <br/>Reason: {1}</p>""")\ .format(fi.absoluteFilePath, engine.error()) ) return False
--- a/Helpviewer/HelpIndexWidget.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpIndexWidget.py Wed Oct 09 19:26:41 2013 +0200 @@ -16,8 +16,8 @@ Class implementing a window for showing the QtHelp index. @signal linkActivated(QUrl) emitted when an index entry is activated - @signal linksActivated(links, keyword) emitted when an index entry referencing - multiple targets is activated + @signal linksActivated(links, keyword) emitted when an index entry + referencing multiple targets is activated @signal escapePressed() emitted when the ESC key was pressed """ linkActivated = pyqtSignal(QUrl) @@ -52,10 +52,13 @@ self.__index = self.__engine.indexWidget() self.__index.installEventFilter(self) - self.__engine.indexModel().indexCreationStarted.connect(self.__disableSearchEdit) - self.__engine.indexModel().indexCreated.connect(self.__enableSearchEdit) + self.__engine.indexModel().indexCreationStarted.connect( + self.__disableSearchEdit) + self.__engine.indexModel().indexCreated.connect( + self.__enableSearchEdit) self.__index.activated.connect(self.__activated) - self.__searchEdit.returnPressed.connect(self.__index.activateCurrentItem) + self.__searchEdit.returnPressed.connect( + self.__index.activateCurrentItem) self.__layout.addWidget(self.__index) self.__index.viewport().installEventFilter(self)
--- a/Helpviewer/HelpLanguagesDialog.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpLanguagesDialog.py Wed Oct 09 19:26:41 2013 +0200 @@ -30,7 +30,8 @@ self.__model = QStringListModel() self.languagesList.setModel(self.__model) - self.languagesList.selectionModel().currentChanged.connect(self.__currentChanged) + self.languagesList.selectionModel().currentChanged.connect( + self.__currentChanged) languages = Preferences.toList(Preferences.Prefs.settings.value( "Help/AcceptLanguages", self.defaultAcceptLanguages())) @@ -53,7 +54,8 @@ self.removeButton.setEnabled(current.isValid()) row = current.row() self.upButton.setEnabled(row > 0) - self.downButton.setEnabled(row != -1 and row < self.__model.rowCount() - 1) + self.downButton.setEnabled( + row != -1 and row < self.__model.rowCount() - 1) @pyqtSlot() def on_upButton_clicked(self): @@ -82,7 +84,8 @@ @pyqtSlot() def on_removeButton_clicked(self): """ - Private slot to remove a language from the list of acceptable languages. + Private slot to remove a language from the list of acceptable + languages. """ currentRow = self.languagesList.currentIndex().row() self.__model.removeRow(currentRow) @@ -116,8 +119,11 @@ @classmethod def httpString(cls, languages): """ - Class method to convert a list of acceptable languages into a byte array that - can be sent along with the Accept-Language http header (see RFC 2616). + Class method to convert a list of acceptable languages into a byte + array. + + The byte array can be sent along with the Accept-Language http header + (see RFC 2616). @param languages list of acceptable languages (list of strings) @return converted list (QByteArray) @@ -168,7 +174,8 @@ languageString = "{0}/{1} [{2}]"\ .format(QLocale.languageToString(language), QLocale.countryToString(country), - '-'.join(QLocale(language, country).name().split('_')).lower()) + '-'.join(QLocale(language, country).name() + .split('_')).lower()) if languageString not in allLanguages: allLanguages.append(languageString)
--- a/Helpviewer/HelpSnap.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpSnap.py Wed Oct 09 19:26:41 2013 +0200 @@ -24,9 +24,11 @@ oldSize = page.viewportSize() width = page.mainFrame().contentsSize().width() page.setViewportSize(QSize(width, int(width * h / w))) - pageImage = __render(page, page.viewportSize().width(), page.viewportSize().height()) + pageImage = __render(page, page.viewportSize().width(), + page.viewportSize().height()) page.setViewportSize(oldSize) - return pageImage.scaled(w, h, Qt.IgnoreAspectRatio, Qt.SmoothTransformation) + return pageImage.scaled( + w, h, Qt.IgnoreAspectRatio, Qt.SmoothTransformation) def __render(page, w, h):
--- a/Helpviewer/HelpTabBar.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpTabBar.py Wed Oct 09 19:26:41 2013 +0200 @@ -39,7 +39,8 @@ """ Private slot to show the tab preview. """ - indexedBrowser = self.__tabWidget.browserAt(self.__currentTabPreviewIndex) + indexedBrowser = self.__tabWidget.browserAt( + self.__currentTabPreviewIndex) currentBrowser = self.__tabWidget.currentBrowser() if indexedBrowser is None or currentBrowser is None:
--- a/Helpviewer/HelpTabWidget.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpTabWidget.py Wed Oct 09 19:26:41 2013 +0200 @@ -33,13 +33,14 @@ Class implementing the central widget showing the web pages. @signal sourceChanged(HelpBrowser, QUrl) emitted after the URL of a browser - has changed + has changed @signal titleChanged(HelpBrowser, str) emitted after the title of a browser - has changed - @signal showMessage(str) emitted to show a message in the main window status bar + has changed + @signal showMessage(str) emitted to show a message in the main window + status bar @signal browserClosed(QWidget) emitted after a browser was closed - @signal browserZoomValueChanged(int) emitted to signal a change of the current - browser's zoom level + @signal browserZoomValueChanged(int) emitted to signal a change of the + current browser's zoom level """ sourceChanged = pyqtSignal(HelpBrowser, QUrl) titleChanged = pyqtSignal(HelpBrowser, str) @@ -67,7 +68,8 @@ from .ClosedTabsManager import ClosedTabsManager self.__closedTabsManager = ClosedTabsManager(self) - self.__closedTabsManager.closedTabAvailable.connect(self.__closedTabAvailable) + self.__closedTabsManager.closedTabAvailable.connect( + self.__closedTabAvailable) from .UrlBar.StackedUrlBar import StackedUrlBar self.__stackedUrlBar = StackedUrlBar(self) @@ -88,15 +90,18 @@ self.__navigationMenu.triggered.connect(self.__navigationMenuTriggered) self.__navigationButton = QToolButton(self) - self.__navigationButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) - self.__navigationButton.setToolTip(self.trUtf8("Show a navigation menu")) + self.__navigationButton.setIcon( + UI.PixmapCache.getIcon("1downarrow.png")) + self.__navigationButton.setToolTip( + self.trUtf8("Show a navigation menu")) self.__navigationButton.setPopupMode(QToolButton.InstantPopup) self.__navigationButton.setMenu(self.__navigationMenu) self.__navigationButton.setEnabled(False) self.__rightCornerWidgetLayout.addWidget(self.__navigationButton) self.__closedTabsMenu = QMenu(self) - self.__closedTabsMenu.aboutToShow.connect(self.__aboutToShowClosedTabsMenu) + self.__closedTabsMenu.aboutToShow.connect( + self.__aboutToShowClosedTabsMenu) self.__closedTabsButton = QToolButton(self) self.__closedTabsButton.setIcon(UI.PixmapCache.getIcon("trash.png")) @@ -109,7 +114,8 @@ self.__closeButton = QToolButton(self) self.__closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) - self.__closeButton.setToolTip(self.trUtf8("Close the current help window")) + self.__closeButton.setToolTip( + self.trUtf8("Close the current help window")) self.__closeButton.setEnabled(False) self.__closeButton.clicked[bool].connect(self.closeBrowser) self.__rightCornerWidgetLayout.addWidget(self.__closeButton) @@ -125,7 +131,8 @@ self.__newTabButton = QToolButton(self) self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.__newTabButton.setToolTip(self.trUtf8("Open a new help window tab")) + self.__newTabButton.setToolTip( + self.trUtf8("Open a new help window tab")) self.setCornerWidget(self.__newTabButton, Qt.TopLeftCorner) self.__newTabButton.clicked[bool].connect(self.newBrowser) @@ -138,49 +145,55 @@ Private method to create the tab context menu. """ self.__tabContextMenu = QMenu(self) - self.tabContextNewAct = \ - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("tabNew.png"), + self.tabContextNewAct = self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("tabNew.png"), self.trUtf8('New Tab'), self.newBrowser) self.__tabContextMenu.addSeparator() - self.leftMenuAct = \ - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("1leftarrow.png"), + self.leftMenuAct = self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("1leftarrow.png"), self.trUtf8('Move Left'), self.__tabContextMenuMoveLeft) - self.rightMenuAct = \ - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("1rightarrow.png"), + self.rightMenuAct = self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("1rightarrow.png"), self.trUtf8('Move Right'), self.__tabContextMenuMoveRight) self.__tabContextMenu.addSeparator() - self.tabContextCloneAct = \ - self.__tabContextMenu.addAction(self.trUtf8("Duplicate Page"), - self.__tabContextMenuClone) + self.tabContextCloneAct = self.__tabContextMenu.addAction( + self.trUtf8("Duplicate Page"), self.__tabContextMenuClone) self.__tabContextMenu.addSeparator() - self.tabContextCloseAct = \ - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("tabClose.png"), - self.trUtf8('Close'), self.__tabContextMenuClose) - self.tabContextCloseOthersAct = \ - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("tabCloseOther.png"), - self.trUtf8("Close Others"), self.__tabContextMenuCloseOthers) + self.tabContextCloseAct = self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("tabClose.png"), + self.trUtf8('Close'), self.__tabContextMenuClose) + self.tabContextCloseOthersAct = self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("tabCloseOther.png"), + self.trUtf8("Close Others"), self.__tabContextMenuCloseOthers) self.__tabContextMenu.addAction(self.trUtf8('Close All'), self.closeAllBrowsers) self.__tabContextMenu.addSeparator() - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("printPreview.png"), + self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8('Print Preview'), self.__tabContextMenuPrintPreview) - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("print.png"), + self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.__tabContextMenuPrint) - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("printPdf.png"), + self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("printPdf.png"), self.trUtf8('Print as PDF'), self.__tabContextMenuPrintPdf) self.__tabContextMenu.addSeparator() - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("reload.png"), + self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("reload.png"), self.trUtf8('Reload All'), self.reloadAllBrowsers) self.__tabContextMenu.addSeparator() - self.__tabContextMenu.addAction(UI.PixmapCache.getIcon("addBookmark.png"), + self.__tabContextMenu.addAction( + UI.PixmapCache.getIcon("addBookmark.png"), self.trUtf8('Bookmark All Tabs'), self.__mainWindow.bookmarkAll) self.__tabBackContextMenu = QMenu(self) self.__tabBackContextMenu.addAction(self.trUtf8('Close All'), self.closeAllBrowsers) - self.__tabBackContextMenu.addAction(UI.PixmapCache.getIcon("reload.png"), + self.__tabBackContextMenu.addAction( + UI.PixmapCache.getIcon("reload.png"), self.trUtf8('Reload All'), self.reloadAllBrowsers) - self.__tabBackContextMenu.addAction(UI.PixmapCache.getIcon("addBookmark.png"), + self.__tabBackContextMenu.addAction( + UI.PixmapCache.getIcon("addBookmark.png"), self.trUtf8('Bookmark All Tabs'), self.__mainWindow.bookmarkAll) self.__tabBackContextMenu.addSeparator() self.__restoreClosedTabAct = self.__tabBackContextMenu.addAction( @@ -212,13 +225,15 @@ """ Private method to move a tab one position to the left. """ - self.moveTab(self.__tabContextMenuIndex, self.__tabContextMenuIndex - 1) + self.moveTab(self.__tabContextMenuIndex, + self.__tabContextMenuIndex - 1) def __tabContextMenuMoveRight(self): """ Private method to move a tab one position to the right. """ - self.moveTab(self.__tabContextMenuIndex, self.__tabContextMenuIndex + 1) + self.moveTab(self.__tabContextMenuIndex, + self.__tabContextMenuIndex + 1) def __tabContextMenuClone(self): """ @@ -277,8 +292,8 @@ @param link link to be shown (string or QUrl) @param requestData tuple containing the request data (QNetworkRequest, QNetworkAccessManager.Operation, QByteArray) - @keyparam position position to create the new tab at or -1 to add it to the end - (integer) + @keyparam position position to create the new tab at or -1 to add it + to the end (integer) """ if link is None: linkName = "" @@ -291,10 +306,12 @@ urlbar = UrlBar(self.__mainWindow, self) if self.__historyCompleter is None: import Helpviewer.HelpWindow - from .History.HistoryCompleter import HistoryCompletionModel, HistoryCompleter + from .History.HistoryCompleter import HistoryCompletionModel, \ + HistoryCompleter self.__historyCompletionModel = HistoryCompletionModel(self) self.__historyCompletionModel.setSourceModel( - Helpviewer.HelpWindow.HelpWindow.historyManager().historyFilterModel()) + Helpviewer.HelpWindow.HelpWindow.historyManager() + .historyFilterModel()) self.__historyCompleter = HistoryCompleter( self.__historyCompletionModel, self) self.__historyCompleter.activated[str].connect(self.__pathSelected) @@ -311,13 +328,15 @@ browser.sourceChanged.connect(self.__sourceChanged) browser.titleChanged.connect(self.__titleChanged) browser.highlighted.connect(self.showMessage) - browser.backwardAvailable.connect(self.__mainWindow.setBackwardAvailable) + browser.backwardAvailable.connect( + self.__mainWindow.setBackwardAvailable) browser.forwardAvailable.connect(self.__mainWindow.setForwardAvailable) browser.loadStarted.connect(self.__loadStarted) browser.loadFinished.connect(self.__loadFinished) browser.iconChanged.connect(self.__iconChanged) browser.search.connect(self.newBrowser) - browser.page().windowCloseRequested.connect(self.__windowCloseRequested) + browser.page().windowCloseRequested.connect( + self.__windowCloseRequested) browser.page().printRequested.connect(self.__printRequested) browser.zoomValueChanged.connect(self.browserZoomValueChanged) @@ -502,8 +521,9 @@ except AttributeError: E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>Printing is not available due to a bug in PyQt4.""" - """Please upgrade.</p>""")) + self.trUtf8( + """<p>Printing is not available due to a bug in""" + """ PyQt4. Please upgrade.</p>""")) return def printBrowserPdf(self, browser=None): @@ -543,8 +563,9 @@ except AttributeError: E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>Printing is not available due to a bug in PyQt4.""" - """Please upgrade.</p>""")) + self.trUtf8( + """<p>Printing is not available due to a bug in""" + """ PyQt4. Please upgrade.</p>""")) return def printPreviewBrowser(self, browser=None): @@ -592,8 +613,9 @@ except AttributeError: E5MessageBox.critical(self, self.trUtf8("eric5 Web Browser"), - self.trUtf8("""<p>Printing is not available due to a bug in PyQt4.""" - """Please upgrade.</p>""")) + self.trUtf8( + """<p>Printing is not available due to a bug in PyQt4.""" + """Please upgrade.</p>""")) return def __sourceChanged(self, url): @@ -679,9 +701,11 @@ if browser is not None: index = self.indexOf(browser) anim = self.animationLabel( - index, os.path.join(getConfig("ericPixDir"), "loading.gif"), 100) + index, os.path.join(getConfig("ericPixDir"), "loading.gif"), + 100) if not anim: - loading = QIcon(os.path.join(getConfig("ericPixDir"), "loading.gif")) + loading = QIcon(os.path.join(getConfig("ericPixDir"), + "loading.gif")) self.setTabIcon(index, loading) else: self.setTabIcon(index, QIcon()) @@ -705,7 +729,8 @@ import Helpviewer.HelpWindow index = self.indexOf(browser) self.resetAnimation(index) - self.setTabIcon(index, Helpviewer.HelpWindow.HelpWindow.icon(browser.url())) + self.setTabIcon( + index, Helpviewer.HelpWindow.HelpWindow.icon(browser.url())) if ok: self.showMessage.emit(self.trUtf8("Finished loading")) else: @@ -723,7 +748,8 @@ import Helpviewer.HelpWindow self.setTabIcon(self.indexOf(browser), Helpviewer.HelpWindow.HelpWindow.icon(browser.url())) - Helpviewer.HelpWindow.HelpWindow.bookmarksManager().iconChanged(browser.url()) + Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ + .iconChanged(browser.url()) def getSourceFileList(self): """ @@ -754,10 +780,12 @@ modal=True, parent=self) if self.__mainWindow.fromEric: - quitButton = mb.addButton(self.trUtf8("&Close"), E5MessageBox.AcceptRole) + quitButton = mb.addButton( + self.trUtf8("&Close"), E5MessageBox.AcceptRole) quitButton.setIcon(UI.PixmapCache.getIcon("close.png")) else: - quitButton = mb.addButton(self.trUtf8("&Quit"), E5MessageBox.AcceptRole) + quitButton = mb.addButton( + self.trUtf8("&Quit"), E5MessageBox.AcceptRole) quitButton.setIcon(UI.PixmapCache.getIcon("exit.png")) closeTabButton = mb.addButton(self.trUtf8("C&lose Current Tab"), E5MessageBox.AcceptRole) @@ -798,7 +826,8 @@ request = QNetworkRequest(url) request.setRawHeader("X-Eric5-UserLoadAction", b"1") if e5App().keyboardModifiers() == Qt.AltModifier: - self.newBrowser(None, (request, QNetworkAccessManager.GetOperation, b"")) + self.newBrowser( + None, (request, QNetworkAccessManager.GetOperation, b"")) else: self.currentBrowser().setSource(None, (request, QNetworkAccessManager.GetOperation, b"")) @@ -910,7 +939,8 @@ index = 0 for tab in self.__closedTabsManager.allClosedTabs(): title = fm.elidedText(tab.title, Qt.ElideRight, maxWidth) - self.__closedTabsMenu.addAction(self.__mainWindow.icon(tab.url), title, + self.__closedTabsMenu.addAction( + self.__mainWindow.icon(tab.url), title, self.restoreClosedTab).setData(index) index += 1 self.__closedTabsMenu.addSeparator()
--- a/Helpviewer/HelpTocWidget.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpTocWidget.py Wed Oct 09 19:26:41 2013 +0200 @@ -42,7 +42,8 @@ self.__layout = QVBoxLayout(self) self.__layout.addWidget(self.__tocWidget) - self.__tocWidget.customContextMenuRequested.connect(self.__showContextMenu) + self.__tocWidget.customContextMenuRequested.connect( + self.__showContextMenu) self.__tocWidget.linkActivated.connect(self.linkActivated) model = self.__tocWidget.model()
--- a/Helpviewer/HelpUtilities.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpUtilities.py Wed Oct 09 19:26:41 2013 +0200 @@ -58,7 +58,8 @@ Module function to generate an unique file name based on a pattern. @param name desired file name (string) - @param appendFormat format pattern to be used to make the unique name (string) + @param appendFormat format pattern to be used to make the unique name + (string) @return unique file name """ if not os.path.exists(name): @@ -74,7 +75,8 @@ if index == -1: tmpFileName += appendString else: - tmpFileName = tmpFileName[:index] + appendString + tmpFileName[index:] + tmpFileName = tmpFileName[:index] + appendString + \ + tmpFileName[index:] i += 1 return tmpFileName
--- a/Helpviewer/HelpWebSearchWidget.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Wed Oct 09 19:26:41 2013 +0200 @@ -42,7 +42,8 @@ self.__mw = parent self.__openSearchManager = OpenSearchManager(self) - self.__openSearchManager.currentEngineChanged.connect(self.__currentEngineChanged) + self.__openSearchManager.currentEngineChanged.connect( + self.__currentEngineChanged) self.__currentEngine = "" self.__enginesMenu = QMenu(self) @@ -58,14 +59,17 @@ self.__model = QStandardItemModel(self) self.__completer = QCompleter() self.__completer.setModel(self.__model) - self.__completer.setCompletionMode(QCompleter.UnfilteredPopupCompletion) + self.__completer.setCompletionMode( + QCompleter.UnfilteredPopupCompletion) self.__completer.setWidget(self) self.__searchButton.clicked[()].connect(self.__searchButtonClicked) self.textEdited.connect(self.__textEdited) self.returnPressed[()].connect(self.__searchNow) - self.__completer.activated[QModelIndex].connect(self.__completerActivated) - self.__completer.highlighted[QModelIndex].connect(self.__completerHighlighted) + self.__completer.activated[QModelIndex].connect( + self.__completerActivated) + self.__completer.highlighted[QModelIndex].connect( + self.__completerHighlighted) self.__enginesMenu.aboutToShow.connect(self.__showEnginesMenu) self.__suggestionsItem = None @@ -91,12 +95,14 @@ return globalSettings = QWebSettings.globalSettings() - if not globalSettings.testAttribute(QWebSettings.PrivateBrowsingEnabled): + if not globalSettings.testAttribute( + QWebSettings.PrivateBrowsingEnabled): if searchText in self.__recentSearches: self.__recentSearches.remove(searchText) self.__recentSearches.insert(0, searchText) if len(self.__recentSearches) > self.__maxSavedSearches: - self.__recentSearches = self.__recentSearches[:self.__maxSavedSearches] + self.__recentSearches = \ + self.__recentSearches[:self.__maxSavedSearches] self.__setupCompleterMenu() url = self.__openSearchManager.currentEngine().searchUrl(searchText) @@ -120,7 +126,8 @@ if self.__suggestions: if self.__model.rowCount() == 0: if not self.__suggestionsItem: - self.__suggestionsItem = QStandardItem(self.trUtf8("Suggestions")) + self.__suggestionsItem = QStandardItem( + self.trUtf8("Suggestions")) self.__suggestionsItem.setFont(boldFont) self.__model.appendRow(self.__suggestionsItem) @@ -128,19 +135,21 @@ self.__model.appendRow(QStandardItem(suggestion)) if not self.__recentSearches: - self.__recentSearchesItem = QStandardItem(self.trUtf8("No Recent Searches")) + self.__recentSearchesItem = QStandardItem( + self.trUtf8("No Recent Searches")) self.__recentSearchesItem.setFont(boldFont) self.__model.appendRow(self.__recentSearchesItem) else: - self.__recentSearchesItem = QStandardItem(self.trUtf8("Recent Searches")) + self.__recentSearchesItem = QStandardItem( + self.trUtf8("Recent Searches")) self.__recentSearchesItem.setFont(boldFont) self.__model.appendRow(self.__recentSearchesItem) for recentSearch in self.__recentSearches: self.__model.appendRow(QStandardItem(recentSearch)) view = self.__completer.popup() - view.setFixedHeight( - view.sizeHintForRow(0) * self.__model.rowCount() + view.frameWidth() * 2) + view.setFixedHeight(view.sizeHintForRow(0) * self.__model.rowCount() + + view.frameWidth() * 2) self.__searchButton.setEnabled( bool(self.__recentSearches or self.__suggestions)) @@ -198,11 +207,13 @@ def __getSuggestions(self): """ - Private slot to get search suggestions from the configured search engine. + Private slot to get search suggestions from the configured search + engine. """ searchText = self.text() if searchText: - self.__openSearchManager.currentEngine().requestSuggestions(searchText) + self.__openSearchManager.currentEngine()\ + .requestSuggestions(searchText) def __newSuggestions(self, suggestions): """ @@ -258,8 +269,9 @@ else: title = ct.title() - action = self.__enginesMenu.addAction(self.trUtf8("Add '{0}'").format(title), - self.__addEngineFromUrl) + action = self.__enginesMenu.addAction( + self.trUtf8("Add '{0}'").format(title), + self.__addEngineFromUrl) action.setData(url) action.setIcon(ct.icon()) @@ -358,8 +370,8 @@ self.setInactiveText(self.__openSearchManager.currentEngineName()) self.__currentEngine = self.__openSearchManager.currentEngineName() - self.__engineButton.setIcon( - QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image()))) + self.__engineButton.setIcon(QIcon(QPixmap.fromImage( + self.__openSearchManager.currentEngine().image()))) self.__suggestions = [] self.__setupCompleterMenu() @@ -367,8 +379,8 @@ """ Private slot to handle a change of the current search engine icon. """ - self.__engineButton.setIcon( - QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image()))) + self.__engineButton.setIcon(QIcon(QPixmap.fromImage( + self.__openSearchManager.currentEngine().image()))) def mousePressEvent(self, evt): """
--- a/Helpviewer/HelpWindow.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/HelpWindow.py Wed Oct 09 19:26:41 2013 +0200 @@ -9,14 +9,15 @@ import os -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, \ - QThread, QTextCodec +from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \ + QUrl, QThread, QTextCodec from PyQt4.QtGui import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \ QDesktopServices, QKeySequence, QComboBox, QFont, QFontMetrics, QLabel, \ - QSplitter, QMenu, QToolButton, QLineEdit, QApplication, QWhatsThis, QDialog, \ - QHBoxLayout, QProgressBar, QAction, QIcon + QSplitter, QMenu, QToolButton, QLineEdit, QApplication, QWhatsThis, \ + QDialog, QHBoxLayout, QProgressBar, QAction, QIcon from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest -from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin, QWebPage +from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin, \ + QWebPage try: from PyQt4.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery QTHELP_AVAILABLE = True @@ -50,8 +51,8 @@ Class implementing the web browser main window. @signal helpClosed() emitted after the window was requested to close down - @signal zoomTextOnlyChanged(bool) emitted after the zoom text only setting was - changed + @signal zoomTextOnlyChanged(bool) emitted after the zoom text only setting + was changed """ zoomTextOnlyChanged = pyqtSignal(bool) helpClosed = pyqtSignal() @@ -89,9 +90,10 @@ @param path the path of the working dir (usually '.') (string) @param parent parent widget of this window (QWidget) @param name name of this window (string) - @param fromEric flag indicating whether it was called from within eric5 (boolean) - @keyparam initShortcutsOnly flag indicating to just initialize the keyboard - shortcuts (boolean) + @param fromEric flag indicating whether it was called from within + eric5 (boolean) + @keyparam initShortcutsOnly flag indicating to just initialize the + keyboard shortcuts (boolean) @keyparam searchWord word to search for (string) """ super().__init__(parent) @@ -124,7 +126,8 @@ HelpWindow.setUseQtHelp(self.fromEric) if not self.fromEric: - self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) + self.setStyle(Preferences.getUI("Style"), + Preferences.getUI("StyleSheet")) if self.useQtHelp: self.__helpEngine = \ @@ -136,7 +139,8 @@ self.__helpEngine = None self.__helpInstaller = None - self.__zoomWidget = E5ZoomWidget(UI.PixmapCache.getPixmap("zoomOut.png"), + self.__zoomWidget = E5ZoomWidget( + UI.PixmapCache.getPixmap("zoomOut.png"), UI.PixmapCache.getPixmap("zoomIn.png"), UI.PixmapCache.getPixmap("zoomReset.png"), self) self.statusBar().addPermanentWidget(self.__zoomWidget) @@ -149,7 +153,8 @@ self.tabWidget.titleChanged.connect(self.__titleChanged) self.tabWidget.showMessage.connect(self.statusBar().showMessage) self.tabWidget.browserClosed.connect(self.__browserClosed) - self.tabWidget.browserZoomValueChanged.connect(self.__zoomWidget.setValue) + self.tabWidget.browserZoomValueChanged.connect( + self.__zoomWidget.setValue) self.findDlg = SearchWidget(self, self) centralWidget = QWidget() @@ -183,9 +188,12 @@ self.__indexing = False self.__indexingProgress = None self.__searchEngine = self.__helpEngine.searchEngine() - self.__searchEngine.indexingStarted.connect(self.__indexingStarted) - self.__searchEngine.indexingFinished.connect(self.__indexingFinished) - self.__searchWindow = HelpSearchWidget(self.__searchEngine, self) + self.__searchEngine.indexingStarted.connect( + self.__indexingStarted) + self.__searchEngine.indexingFinished.connect( + self.__indexingFinished) + self.__searchWindow = HelpSearchWidget( + self.__searchEngine, self) self.__searchDock = QDockWidget(self.trUtf8("Search"), self) self.__searchDock.setObjectName("SearchWindow") self.__searchDock.setWidget(self.__searchWindow) @@ -221,9 +229,12 @@ self.__adBlockIcon = AdBlockIcon(self) self.statusBar().addPermanentWidget(self.__adBlockIcon) - self.__adBlockIcon.setEnabled(Preferences.getHelp("AdBlockEnabled")) - self.tabWidget.currentChanged[int].connect(self.__adBlockIcon.currentChanged) - self.tabWidget.sourceChanged.connect(self.__adBlockIcon.sourceChanged) + self.__adBlockIcon.setEnabled( + Preferences.getHelp("AdBlockEnabled")) + self.tabWidget.currentChanged[int].connect( + self.__adBlockIcon.currentChanged) + self.tabWidget.sourceChanged.connect( + self.__adBlockIcon.sourceChanged) QDesktopServices.setUrlHandler("http", self.__linkActivated) QDesktopServices.setUrlHandler("https", self.__linkActivated) @@ -233,14 +244,19 @@ if self.useQtHelp: # TOC window self.__tocWindow.linkActivated.connect(self.__linkActivated) - self.__tocWindow.escapePressed.connect(self.__activateCurrentBrowser) + self.__tocWindow.escapePressed.connect( + self.__activateCurrentBrowser) # index window self.__indexWindow.linkActivated.connect(self.__linkActivated) - self.__indexWindow.linksActivated.connect(self.__linksActivated) - self.__indexWindow.escapePressed.connect(self.__activateCurrentBrowser) + self.__indexWindow.linksActivated.connect( + self.__linksActivated) + self.__indexWindow.escapePressed.connect( + self.__activateCurrentBrowser) # search window - self.__searchWindow.linkActivated.connect(self.__linkActivated) - self.__searchWindow.escapePressed.connect(self.__activateCurrentBrowser) + self.__searchWindow.linkActivated.connect( + self.__linkActivated) + self.__searchWindow.escapePressed.connect( + self.__activateCurrentBrowser) state = Preferences.getHelp("HelpViewerState") self.restoreState(state) @@ -248,9 +264,12 @@ self.__initHelpDb() self.__virusTotal = VirusTotalAPI(self) - self.__virusTotal.submitUrlError.connect(self.__virusTotalSubmitUrlError) - self.__virusTotal.urlScanReport.connect(self.__virusTotalUrlScanReport) - self.__virusTotal.fileScanReport.connect(self.__virusTotalFileScanReport) + self.__virusTotal.submitUrlError.connect( + self.__virusTotalSubmitUrlError) + self.__virusTotal.urlScanReport.connect( + self.__virusTotalUrlScanReport) + self.__virusTotal.fileScanReport.connect( + self.__virusTotalFileScanReport) self.__previewer = None self.__shutdownCalled = False @@ -287,10 +306,13 @@ settings = QWebSettings.globalSettings() settings.setAttribute(QWebSettings.DeveloperExtrasEnabled, True) - settings.setFontFamily(QWebSettings.StandardFont, standardFont.family()) - settings.setFontSize(QWebSettings.DefaultFontSize, standardFont.pointSize()) + settings.setFontFamily(QWebSettings.StandardFont, + standardFont.family()) + settings.setFontSize(QWebSettings.DefaultFontSize, + standardFont.pointSize()) settings.setFontFamily(QWebSettings.FixedFont, fixedFont.family()) - settings.setFontSize(QWebSettings.DefaultFixedFontSize, fixedFont.pointSize()) + settings.setFontSize(QWebSettings.DefaultFixedFontSize, + fixedFont.pointSize()) styleSheet = Preferences.getHelp("UserStyleSheet") settings.setUserStyleSheetUrl(self.__userStyleSheet(styleSheet)) @@ -321,10 +343,12 @@ os.makedirs(webDatabaseDir) settings.setOfflineStoragePath(webDatabaseDir) settings.setOfflineStorageDefaultQuota( - Preferences.getHelp("OfflineStorageDatabaseQuota") * 1024 * 1024) + Preferences.getHelp("OfflineStorageDatabaseQuota") * \ + 1024 * 1024) if hasattr(QWebSettings, "OfflineWebApplicationCacheEnabled"): - settings.setAttribute(QWebSettings.OfflineWebApplicationCacheEnabled, + settings.setAttribute( + QWebSettings.OfflineWebApplicationCacheEnabled, Preferences.getHelp("OfflineWebApplicationCacheEnabled")) appCacheDir = os.path.join( Utilities.getConfigDir(), "browser", "webappcaches") @@ -332,7 +356,8 @@ os.makedirs(appCacheDir) settings.setOfflineWebApplicationCachePath(appCacheDir) settings.setOfflineWebApplicationCacheQuota( - Preferences.getHelp("OfflineWebApplicationCacheQuota") * 1024 * 1024) + Preferences.getHelp("OfflineWebApplicationCacheQuota") * \ + 1024 * 1024) if hasattr(QWebSettings, "LocalStorageEnabled"): settings.setAttribute(QWebSettings.LocalStorageEnabled, @@ -467,15 +492,18 @@ self.savePageScreenAct.triggered[()].connect(self.__savePageScreen) self.__actions.append(self.savePageScreenAct) - self.saveVisiblePageScreenAct = E5Action(self.trUtf8('Save Visible Page Screen'), + self.saveVisiblePageScreenAct = E5Action( + self.trUtf8('Save Visible Page Screen'), UI.PixmapCache.getIcon("fileSaveVisiblePixmap.png"), self.trUtf8('Save Visible Page Screen...'), 0, 0, self, 'help_file_save_visible_page_screen') self.saveVisiblePageScreenAct.setStatusTip( - self.trUtf8('Save the visible part of the current page as a screen shot')) + self.trUtf8('Save the visible part of the current page as a' + ' screen shot')) self.saveVisiblePageScreenAct.setWhatsThis(self.trUtf8( - """<b>Save Visible Page Screen...</b>""" - """<p>Saves the visible part of the current page as a screen shot.</p>""" + """<b>Save Visible Page Screen...</b>""" + """<p>Saves the visible part of the current page as a""" + """ screen shot.</p>""" )) if not self.initShortcutsOnly: self.saveVisiblePageScreenAct.triggered[()].connect( @@ -529,13 +557,15 @@ UI.PixmapCache.getIcon("printPdf.png"), self.trUtf8('Print as PDF'), 0, 0, self, 'help_file_print_pdf') - self.printPdfAct.setStatusTip(self.trUtf8('Print the displayed help as PDF')) + self.printPdfAct.setStatusTip(self.trUtf8( + 'Print the displayed help as PDF')) self.printPdfAct.setWhatsThis(self.trUtf8( - """<b>Print as PDF</b>""" - """<p>Print the displayed help text as a PDF file.</p>""" + """<b>Print as PDF</b>""" + """<p>Print the displayed help text as a PDF file.</p>""" )) if not self.initShortcutsOnly: - self.printPdfAct.triggered[()].connect(self.tabWidget.printBrowserPdf) + self.printPdfAct.triggered[()].connect( + self.tabWidget.printBrowserPdf) self.__actions.append(self.printPdfAct) self.printPreviewAct = E5Action(self.trUtf8('Print Preview'), @@ -549,7 +579,8 @@ """<p>Print preview of the displayed help text.</p>""" )) if not self.initShortcutsOnly: - self.printPreviewAct.triggered[()].connect(self.tabWidget.printPreviewBrowser) + self.printPreviewAct.triggered[()].connect( + self.tabWidget.printPreviewBrowser) self.__actions.append(self.printPreviewAct) self.closeAct = E5Action(self.trUtf8('Close'), @@ -557,10 +588,11 @@ self.trUtf8('&Close'), QKeySequence(self.trUtf8("Ctrl+W", "File|Close")), 0, self, 'help_file_close') - self.closeAct.setStatusTip(self.trUtf8('Close the current help window')) + self.closeAct.setStatusTip(self.trUtf8( + 'Close the current help window')) self.closeAct.setWhatsThis(self.trUtf8( - """<b>Close</b>""" - """<p>Closes the current help window.</p>""" + """<b>Close</b>""" + """<p>Closes the current help window.</p>""" )) if not self.initShortcutsOnly: self.closeAct.triggered[()].connect(self.tabWidget.closeBrowser) @@ -575,7 +607,8 @@ """<p>Closes all help windows except the first one.</p>""" )) if not self.initShortcutsOnly: - self.closeAllAct.triggered[()].connect(self.tabWidget.closeAllBrowsers) + self.closeAllAct.triggered[()].connect( + self.tabWidget.closeAllBrowsers) self.__actions.append(self.closeAllAct) self.privateBrowsingAct = E5Action(self.trUtf8('Private Browsing'), @@ -589,7 +622,8 @@ """ recorded anymore.</p>""" )) if not self.initShortcutsOnly: - self.privateBrowsingAct.triggered[()].connect(self.__privateBrowsing) + self.privateBrowsingAct.triggered[()].connect( + self.__privateBrowsing) self.privateBrowsingAct.setCheckable(True) self.__actions.append(self.privateBrowsingAct) @@ -632,11 +666,12 @@ QKeySequence(self.trUtf8("Alt+Right", "Go|Forward")), QKeySequence(self.trUtf8("Shift+Backspace", "Go|Forward")), self, 'help_go_foreward') - self.forwardAct.setStatusTip(self.trUtf8('Move one help screen forward')) + self.forwardAct.setStatusTip(self.trUtf8( + 'Move one help screen forward')) self.forwardAct.setWhatsThis(self.trUtf8( - """<b>Forward</b>""" - """<p>Moves one help screen forward. If none is""" - """ available, this action is disabled.</p>""" + """<b>Forward</b>""" + """<p>Moves one help screen forward. If none is""" + """ available, this action is disabled.</p>""" )) if not self.initShortcutsOnly: self.forwardAct.triggered[()].connect(self.__forward) @@ -647,10 +682,11 @@ self.trUtf8('&Home'), QKeySequence(self.trUtf8("Ctrl+Home", "Go|Home")), 0, self, 'help_go_home') - self.homeAct.setStatusTip(self.trUtf8('Move to the initial help screen')) + self.homeAct.setStatusTip(self.trUtf8( + 'Move to the initial help screen')) self.homeAct.setWhatsThis(self.trUtf8( - """<b>Home</b>""" - """<p>Moves to the initial help screen.</p>""" + """<b>Home</b>""" + """<p>Moves to the initial help screen.</p>""" )) if not self.initShortcutsOnly: self.homeAct.triggered[()].connect(self.__home) @@ -662,10 +698,11 @@ QKeySequence(self.trUtf8("Ctrl+R", "Go|Reload")), QKeySequence(self.trUtf8("F5", "Go|Reload")), self, 'help_go_reload') - self.reloadAct.setStatusTip(self.trUtf8('Reload the current help screen')) + self.reloadAct.setStatusTip(self.trUtf8( + 'Reload the current help screen')) self.reloadAct.setWhatsThis(self.trUtf8( - """<b>Reload</b>""" - """<p>Reloads the current help screen.</p>""" + """<b>Reload</b>""" + """<p>Reloads the current help screen.</p>""" )) if not self.initShortcutsOnly: self.reloadAct.triggered[()].connect(self.__reload) @@ -719,10 +756,11 @@ self.trUtf8('Find &next'), QKeySequence(self.trUtf8("F3", "Edit|Find next")), 0, self, 'help_edit_find_next') - self.findNextAct.setStatusTip(self.trUtf8('Find next occurrence of text in page')) + self.findNextAct.setStatusTip(self.trUtf8( + 'Find next occurrence of text in page')) self.findNextAct.setWhatsThis(self.trUtf8( - """<b>Find next</b>""" - """<p>Find the next occurrence of text in the current page.</p>""" + """<b>Find next</b>""" + """<p>Find the next occurrence of text in the current page.</p>""" )) if not self.initShortcutsOnly: self.findNextAct.triggered[()].connect(self.findDlg.findNext) @@ -736,8 +774,9 @@ self.findPrevAct.setStatusTip( self.trUtf8('Find previous occurrence of text in page')) self.findPrevAct.setWhatsThis(self.trUtf8( - """<b>Find previous</b>""" - """<p>Find the previous occurrence of text in the current page.</p>""" + """<b>Find previous</b>""" + """<p>Find the previous occurrence of text in the current""" + """ page.</p>""" )) if not self.initShortcutsOnly: self.findPrevAct.triggered[()].connect(self.findDlg.findPrevious) @@ -754,7 +793,8 @@ """<p>Open a dialog to manage the bookmarks.</p>""" )) if not self.initShortcutsOnly: - self.bookmarksManageAct.triggered[()].connect(self.__showBookmarksDialog) + self.bookmarksManageAct.triggered[()].connect( + self.__showBookmarksDialog) self.__actions.append(self.bookmarksManageAct) self.bookmarksAddAct = E5Action(self.trUtf8('Add Bookmark'), @@ -763,10 +803,11 @@ QKeySequence(self.trUtf8("Ctrl+D", "Help|Add bookmark")), 0, self, 'help_bookmark_add') self.bookmarksAddAct.setIconVisibleInMenu(False) - self.bookmarksAddAct.setStatusTip(self.trUtf8('Open a dialog to add a bookmark.')) + self.bookmarksAddAct.setStatusTip(self.trUtf8( + 'Open a dialog to add a bookmark.')) self.bookmarksAddAct.setWhatsThis(self.trUtf8( - """<b>Add Bookmark</b>""" - """<p>Open a dialog to add the current URL as a bookmark.</p>""" + """<b>Add Bookmark</b>""" + """<p>Open a dialog to add the current URL as a bookmark.</p>""" )) if not self.initShortcutsOnly: self.bookmarksAddAct.triggered[()].connect(self.__addBookmark) @@ -782,7 +823,8 @@ """<p>Open a dialog to add a new bookmarks folder.</p>""" )) if not self.initShortcutsOnly: - self.bookmarksAddFolderAct.triggered[()].connect(self.__addBookmarkFolder) + self.bookmarksAddFolderAct.triggered[()].connect( + self.__addBookmarkFolder) self.__actions.append(self.bookmarksAddFolderAct) self.bookmarksAllTabsAct = E5Action(self.trUtf8('Bookmark All Tabs'), @@ -806,12 +848,12 @@ 0, self, 'help_help_whats_this') self.whatsThisAct.setStatusTip(self.trUtf8('Context sensitive help')) self.whatsThisAct.setWhatsThis(self.trUtf8( - """<b>Display context sensitive help</b>""" - """<p>In What's This? mode, the mouse cursor shows an arrow with a""" - """ question mark, and you can click on the interface elements to get""" - """ a short description of what they do and how to use them. In""" - """ dialogs, this feature can be accessed using the context help button""" - """ in the titlebar.</p>""" + """<b>Display context sensitive help</b>""" + """<p>In What's This? mode, the mouse cursor shows an arrow""" + """ with a question mark, and you can click on the interface""" + """ elements to get a short description of what they do and how""" + """ to use them. In dialogs, this feature can be accessed using""" + """ the context help button in the titlebar.</p>""" )) if not self.initShortcutsOnly: self.whatsThisAct.triggered[()].connect(self.__whatsThis) @@ -820,10 +862,11 @@ self.aboutAct = E5Action(self.trUtf8('About'), self.trUtf8('&About'), 0, 0, self, 'help_help_about') - self.aboutAct.setStatusTip(self.trUtf8('Display information about this software')) + self.aboutAct.setStatusTip(self.trUtf8( + 'Display information about this software')) self.aboutAct.setWhatsThis(self.trUtf8( - """<b>About</b>""" - """<p>Display some information about this software.</p>""" + """<b>About</b>""" + """<p>Display some information about this software.</p>""" )) if not self.initShortcutsOnly: self.aboutAct.triggered[()].connect(self.__about) @@ -877,11 +920,12 @@ self.trUtf8('Zoom &reset'), QKeySequence(self.trUtf8("Ctrl+0", "View|Zoom reset")), 0, self, 'help_view_zoom_reset') - self.zoomResetAct.setStatusTip(self.trUtf8('Reset the zoom of the text')) + self.zoomResetAct.setStatusTip(self.trUtf8( + 'Reset the zoom of the text')) self.zoomResetAct.setWhatsThis(self.trUtf8( - """<b>Zoom reset</b>""" - """<p>Reset the zoom of the text. """ - """This sets the zoom factor to 100%.</p>""" + """<b>Zoom reset</b>""" + """<p>Reset the zoom of the text. """ + """This sets the zoom factor to 100%.</p>""" )) if not self.initShortcutsOnly: self.zoomResetAct.triggered[()].connect(self.__zoomReset) @@ -899,7 +943,8 @@ """<p>Zoom text only; pictures remain constant.</p>""" )) if not self.initShortcutsOnly: - self.zoomTextOnlyAct.triggered[bool].connect(self.__zoomTextOnly) + self.zoomTextOnlyAct.triggered[bool].connect( + self.__zoomTextOnly) self.__actions.append(self.zoomTextOnlyAct) else: self.zoomTextOnlyAct = None @@ -908,10 +953,11 @@ self.trUtf8('Show page source'), QKeySequence(self.trUtf8('Ctrl+U')), 0, self, 'help_show_page_source') - self.pageSourceAct.setStatusTip(self.trUtf8('Show the page source in an editor')) + self.pageSourceAct.setStatusTip(self.trUtf8( + 'Show the page source in an editor')) self.pageSourceAct.setWhatsThis(self.trUtf8( - """<b>Show page source</b>""" - """<p>Show the page source in an editor.</p>""" + """<b>Show page source</b>""" + """<p>Show the page source in an editor.</p>""" )) if not self.initShortcutsOnly: self.pageSourceAct.triggered[()].connect(self.__showPageSource) @@ -958,7 +1004,8 @@ self.prefAct = E5Action(self.trUtf8('Preferences'), UI.PixmapCache.getIcon("configure.png"), self.trUtf8('&Preferences...'), 0, 0, self, 'help_preferences') - self.prefAct.setStatusTip(self.trUtf8('Set the prefered configuration')) + self.prefAct.setStatusTip(self.trUtf8( + 'Set the prefered configuration')) self.prefAct.setWhatsThis(self.trUtf8( """<b>Preferences</b>""" """<p>Set the configuration items of the application""" @@ -968,9 +1015,11 @@ self.prefAct.triggered[()].connect(self.__showPreferences) self.__actions.append(self.prefAct) - self.acceptedLanguagesAct = E5Action(self.trUtf8('Languages'), + self.acceptedLanguagesAct = E5Action( + self.trUtf8('Languages'), UI.PixmapCache.getIcon("flag.png"), - self.trUtf8('&Languages...'), 0, 0, self, 'help_accepted_languages') + self.trUtf8('&Languages...'), 0, 0, + self, 'help_accepted_languages') self.acceptedLanguagesAct.setStatusTip(self.trUtf8( 'Configure the accepted languages for web pages')) self.acceptedLanguagesAct.setWhatsThis(self.trUtf8( @@ -978,7 +1027,8 @@ """<p>Configure the accepted languages for web pages.</p>""" )) if not self.initShortcutsOnly: - self.acceptedLanguagesAct.triggered[()].connect(self.__showAcceptedLanguages) + self.acceptedLanguagesAct.triggered[()].connect( + self.__showAcceptedLanguages) self.__actions.append(self.acceptedLanguagesAct) self.cookiesAct = E5Action(self.trUtf8('Cookies'), @@ -991,12 +1041,14 @@ """<p>Configure cookies handling.</p>""" )) if not self.initShortcutsOnly: - self.cookiesAct.triggered[()].connect(self.__showCookiesConfiguration) + self.cookiesAct.triggered[()].connect( + self.__showCookiesConfiguration) self.__actions.append(self.cookiesAct) self.offlineStorageAct = E5Action(self.trUtf8('Offline Storage'), UI.PixmapCache.getIcon("preferences-html5.png"), - self.trUtf8('Offline &Storage...'), 0, 0, self, 'help_offline_storage') + self.trUtf8('Offline &Storage...'), 0, 0, + self, 'help_offline_storage') self.offlineStorageAct.setStatusTip(self.trUtf8( 'Configure offline storage')) self.offlineStorageAct.setWhatsThis(self.trUtf8( @@ -1017,8 +1069,8 @@ 'Configure personal information for completing form fields')) self.personalDataAct.setWhatsThis(self.trUtf8( """<b>Personal Information...</b>""" - """<p>Opens a dialog to configure the personal information used for""" - """ completing form fields.</p>""" + """<p>Opens a dialog to configure the personal information""" + """ used for completing form fields.</p>""" )) if not self.initShortcutsOnly: self.personalDataAct.triggered[()].connect( @@ -1034,23 +1086,26 @@ 'Configure the GreaseMonkey Scripts')) self.greaseMonkeyAct.setWhatsThis(self.trUtf8( """<b>GreaseMonkey Scripts...</b>""" - """<p>Opens a dialog to configure the available GreaseMonkey Scripts.</p>""" + """<p>Opens a dialog to configure the available GreaseMonkey""" + """ Scripts.</p>""" )) if not self.initShortcutsOnly: self.greaseMonkeyAct.triggered[()].connect( self.__showGreaseMonkeyConfigDialog) self.__actions.append(self.greaseMonkeyAct) - self.editMessageFilterAct = E5Action(self.trUtf8('Edit Message Filters'), - UI.PixmapCache.getIcon("warning.png"), - self.trUtf8('Edit Message Filters...'), 0, 0, self, - 'help_manage_message_filters') + self.editMessageFilterAct = E5Action( + self.trUtf8('Edit Message Filters'), + UI.PixmapCache.getIcon("warning.png"), + self.trUtf8('Edit Message Filters...'), 0, 0, self, + 'help_manage_message_filters') self.editMessageFilterAct.setStatusTip(self.trUtf8( 'Edit the message filters used to suppress unwanted messages')) self.editMessageFilterAct.setWhatsThis(self.trUtf8( """<b>Edit Message Filters</b>""" - """<p>Opens a dialog to edit the message filters used to suppress""" - """ unwanted messages been shown in an error window.</p>""" + """<p>Opens a dialog to edit the message filters used to""" + """ suppress unwanted messages been shown in an error""" + """ window.</p>""" )) if not self.initShortcutsOnly: self.editMessageFilterAct.triggered[()].connect( @@ -1058,15 +1113,17 @@ self.__actions.append(self.editMessageFilterAct) if self.useQtHelp or self.initShortcutsOnly: - self.syncTocAct = E5Action(self.trUtf8('Sync with Table of Contents'), + self.syncTocAct = E5Action( + self.trUtf8('Sync with Table of Contents'), UI.PixmapCache.getIcon("syncToc.png"), self.trUtf8('Sync with Table of Contents'), 0, 0, self, 'help_sync_toc') self.syncTocAct.setStatusTip(self.trUtf8( 'Synchronizes the table of contents with current page')) self.syncTocAct.setWhatsThis(self.trUtf8( - """<b>Sync with Table of Contents</b>""" - """<p>Synchronizes the table of contents with current page.</p>""" + """<b>Sync with Table of Contents</b>""" + """<p>Synchronizes the table of contents with current""" + """ page.</p>""" )) if not self.initShortcutsOnly: self.syncTocAct.triggered[()].connect(self.__syncTOC) @@ -1108,24 +1165,28 @@ """<p>Shows the search window.</p>""" )) if not self.initShortcutsOnly: - self.showSearchAct.triggered[()].connect(self.__showSearchWindow) + self.showSearchAct.triggered[()].connect( + self.__showSearchWindow) self.__actions.append(self.showSearchAct) - self.manageQtHelpDocsAct = E5Action(self.trUtf8('Manage QtHelp Documents'), + self.manageQtHelpDocsAct = E5Action( + self.trUtf8('Manage QtHelp Documents'), self.trUtf8('Manage QtHelp &Documents'), 0, 0, self, 'help_qthelp_documents') self.manageQtHelpDocsAct.setStatusTip(self.trUtf8( - 'Shows a dialog to manage the QtHelp documentation set')) + 'Shows a dialog to manage the QtHelp documentation set')) self.manageQtHelpDocsAct.setWhatsThis(self.trUtf8( - """<b>Manage QtHelp Documents</b>""" - """<p>Shows a dialog to manage the QtHelp documentation set.</p>""" + """<b>Manage QtHelp Documents</b>""" + """<p>Shows a dialog to manage the QtHelp documentation""" + """ set.</p>""" )) if not self.initShortcutsOnly: self.manageQtHelpDocsAct.triggered[()].connect( self.__manageQtHelpDocumentation) self.__actions.append(self.manageQtHelpDocsAct) - self.manageQtHelpFiltersAct = E5Action(self.trUtf8('Manage QtHelp Filters'), + self.manageQtHelpFiltersAct = E5Action( + self.trUtf8('Manage QtHelp Filters'), self.trUtf8('Manage QtHelp &Filters'), 0, 0, self, 'help_qthelp_filters') self.manageQtHelpFiltersAct.setStatusTip(self.trUtf8( @@ -1139,7 +1200,8 @@ self.__manageQtHelpFilters) self.__actions.append(self.manageQtHelpFiltersAct) - self.reindexDocumentationAct = E5Action(self.trUtf8('Reindex Documentation'), + self.reindexDocumentationAct = E5Action( + self.trUtf8('Reindex Documentation'), self.trUtf8('&Reindex Documentation'), 0, 0, self, 'help_qthelp_reindex') self.reindexDocumentationAct.setStatusTip(self.trUtf8( @@ -1157,38 +1219,44 @@ self.trUtf8('&Clear private data'), 0, 0, self, 'help_clear_private_data') - self.clearPrivateDataAct.setStatusTip(self.trUtf8('Clear private data')) + self.clearPrivateDataAct.setStatusTip(self.trUtf8( + 'Clear private data')) self.clearPrivateDataAct.setWhatsThis(self.trUtf8( - """<b>Clear private data</b>""" - """<p>Clears the private data like browsing history, search history""" - """ or the favicons database.</p>""" + """<b>Clear private data</b>""" + """<p>Clears the private data like browsing history, search""" + """ history or the favicons database.</p>""" )) if not self.initShortcutsOnly: - self.clearPrivateDataAct.triggered[()].connect(self.__clearPrivateData) + self.clearPrivateDataAct.triggered[()].connect( + self.__clearPrivateData) self.__actions.append(self.clearPrivateDataAct) self.clearIconsAct = E5Action(self.trUtf8('Clear icons database'), self.trUtf8('Clear &icons database'), 0, 0, self, 'help_clear_icons_db') - self.clearIconsAct.setStatusTip(self.trUtf8('Clear the database of favicons')) + self.clearIconsAct.setStatusTip(self.trUtf8( + 'Clear the database of favicons')) self.clearIconsAct.setWhatsThis(self.trUtf8( - """<b>Clear icons database</b>""" - """<p>Clears the database of favicons of previously visited URLs.</p>""" + """<b>Clear icons database</b>""" + """<p>Clears the database of favicons of previously visited""" + """ URLs.</p>""" )) if not self.initShortcutsOnly: self.clearIconsAct.triggered[()].connect(self.__clearIconsDatabase) self.__actions.append(self.clearIconsAct) - self.searchEnginesAct = E5Action(self.trUtf8('Configure Search Engines'), - self.trUtf8('Configure Search &Engines...'), - 0, 0, - self, 'help_search_engines') + self.searchEnginesAct = E5Action( + self.trUtf8('Configure Search Engines'), + self.trUtf8('Configure Search &Engines...'), + 0, 0, + self, 'help_search_engines') self.searchEnginesAct.setStatusTip(self.trUtf8( - 'Configure the available search engines')) + 'Configure the available search engines')) self.searchEnginesAct.setWhatsThis(self.trUtf8( - """<b>Configure Search Engines...</b>""" - """<p>Opens a dialog to configure the available search engines.</p>""" + """<b>Configure Search Engines...</b>""" + """<p>Opens a dialog to configure the available search""" + """ engines.</p>""" )) if not self.initShortcutsOnly: self.searchEnginesAct.triggered[()].connect( @@ -1216,10 +1284,11 @@ 0, 0, self, 'help_adblock') self.adblockAct.setStatusTip(self.trUtf8( - 'Configure AdBlock subscriptions and rules')) + 'Configure AdBlock subscriptions and rules')) self.adblockAct.setWhatsThis(self.trUtf8( - """<b>Ad Block...</b>""" - """<p>Opens a dialog to configure AdBlock subscriptions and rules.</p>""" + """<b>Ad Block...</b>""" + """<p>Opens a dialog to configure AdBlock subscriptions and""" + """ rules.</p>""" )) if not self.initShortcutsOnly: self.adblockAct.triggered[()].connect(self.__showAdBlockDialog) @@ -1231,42 +1300,49 @@ 0, 0, self, 'help_flashblock') self.flashblockAct.setStatusTip(self.trUtf8( - 'Configure ClickToFlash whitelist')) + 'Configure ClickToFlash whitelist')) self.flashblockAct.setWhatsThis(self.trUtf8( - """<b>ClickToFlash...</b>""" - """<p>Opens a dialog to configure the ClickToFlash whitelist.</p>""" + """<b>ClickToFlash...</b>""" + """<p>Opens a dialog to configure the ClickToFlash""" + """ whitelist.</p>""" )) if not self.initShortcutsOnly: - self.flashblockAct.triggered[()].connect(self.__showClickToFlashDialog) + self.flashblockAct.triggered[()].connect( + self.__showClickToFlashDialog) self.__actions.append(self.flashblockAct) if SSL_AVAILABLE: - self.certificatesAct = E5Action(self.trUtf8('Manage SSL Certificates'), - UI.PixmapCache.getIcon("certificates.png"), - self.trUtf8('Manage SSL Certificates...'), - 0, 0, - self, 'help_manage_certificates') + self.certificatesAct = E5Action( + self.trUtf8('Manage SSL Certificates'), + UI.PixmapCache.getIcon("certificates.png"), + self.trUtf8('Manage SSL Certificates...'), + 0, 0, + self, 'help_manage_certificates') self.certificatesAct.setStatusTip(self.trUtf8( - 'Manage the saved SSL certificates')) + 'Manage the saved SSL certificates')) self.certificatesAct.setWhatsThis(self.trUtf8( - """<b>Manage SSL Certificates...</b>""" - """<p>Opens a dialog to manage the saved SSL certificates.</p>""" + """<b>Manage SSL Certificates...</b>""" + """<p>Opens a dialog to manage the saved SSL""" + """ certificates.</p>""" )) if not self.initShortcutsOnly: - self.certificatesAct.triggered[()].connect(self.__showCertificatesDialog) + self.certificatesAct.triggered[()].connect( + self.__showCertificatesDialog) self.__actions.append(self.certificatesAct) self.toolsMonitorAct = E5Action(self.trUtf8('Network Monitor'), self.trUtf8('&Network Monitor...'), 0, 0, self, 'help_tools_network_monitor') - self.toolsMonitorAct.setStatusTip(self.trUtf8('Show the network monitor dialog')) + self.toolsMonitorAct.setStatusTip(self.trUtf8( + 'Show the network monitor dialog')) self.toolsMonitorAct.setWhatsThis(self.trUtf8( - """<b>Network Monitor...</b>""" - """<p>Shows the network monitor dialog.</p>""" + """<b>Network Monitor...</b>""" + """<p>Shows the network monitor dialog.</p>""" )) if not self.initShortcutsOnly: - self.toolsMonitorAct.triggered[()].connect(self.__showNetworkMonitor) + self.toolsMonitorAct.triggered[()].connect( + self.__showNetworkMonitor) self.__actions.append(self.toolsMonitorAct) self.showDownloadManagerAct = E5Action(self.trUtf8('Downloads'), @@ -1279,7 +1355,8 @@ """<p>Shows the downloads window.</p>""" )) if not self.initShortcutsOnly: - self.showDownloadManagerAct.triggered[()].connect(self.__showDownloadsWindow) + self.showDownloadManagerAct.triggered[()].connect( + self.__showDownloadsWindow) self.__actions.append(self.showDownloadManagerAct) self.feedsManagerAct = E5Action(self.trUtf8('RSS Feeds Dialog'), @@ -1288,11 +1365,12 @@ QKeySequence(self.trUtf8("Ctrl+Shift+F", "Help|RSS Feeds Dialog")), 0, self, 'help_rss_feeds') self.feedsManagerAct.setStatusTip(self.trUtf8( - 'Open a dialog showing the configured RSS feeds.')) + 'Open a dialog showing the configured RSS feeds.')) self.feedsManagerAct.setWhatsThis(self.trUtf8( - """<b>RSS Feeds Dialog...</b>""" - """<p>Open a dialog to show the configured RSS feeds.""" - """ It can be used to mange the feeds and to show their contents.</p>""" + """<b>RSS Feeds Dialog...</b>""" + """<p>Open a dialog to show the configured RSS feeds.""" + """ It can be used to mange the feeds and to show their""" + """ contents.</p>""" )) if not self.initShortcutsOnly: self.feedsManagerAct.triggered[()].connect(self.__showFeedsManager) @@ -1304,17 +1382,18 @@ QKeySequence(self.trUtf8("Ctrl+Shift+I", "Help|Siteinfo Dialog")), 0, self, 'help_siteinfo') self.siteInfoAct.setStatusTip(self.trUtf8( - 'Open a dialog showing some information about the current site.')) + 'Open a dialog showing some information about the current site.')) self.siteInfoAct.setWhatsThis(self.trUtf8( - """<b>Siteinfo Dialog...</b>""" - """<p>Opens a dialog showing some information about the current""" - """ site.</p>""" + """<b>Siteinfo Dialog...</b>""" + """<p>Opens a dialog showing some information about the current""" + """ site.</p>""" )) if not self.initShortcutsOnly: self.siteInfoAct.triggered[()].connect(self.__showSiteinfoDialog) self.__actions.append(self.siteInfoAct) - self.userAgentManagerAct = E5Action(self.trUtf8('Manage User Agent Settings'), + self.userAgentManagerAct = E5Action( + self.trUtf8('Manage User Agent Settings'), self.trUtf8('Manage &User Agent Settings'), 0, 0, self, 'help_user_agent_settings') self.userAgentManagerAct.setStatusTip(self.trUtf8( @@ -1333,10 +1412,11 @@ self.trUtf8('&Synchronize Data...'), 0, 0, self, 'help_synchronize_data') self.synchronizationAct.setStatusTip(self.trUtf8( - 'Shows a dialog to synchronize data via the network')) + 'Shows a dialog to synchronize data via the network')) self.synchronizationAct.setWhatsThis(self.trUtf8( - """<b>Synchronize Data...</b>""" - """<p>This shows a dialog to synchronize data via the network.</p>""" + """<b>Synchronize Data...</b>""" + """<p>This shows a dialog to synchronize data via the""" + """ network.</p>""" )) if not self.initShortcutsOnly: self.synchronizationAct.triggered[()].connect( @@ -1404,7 +1484,8 @@ menu.addAction(self.pageSourceAct) menu.addAction(self.fullScreenAct) if hasattr(QWebSettings, 'defaultTextEncoding'): - self.__textEncodingMenu = menu.addMenu(self.trUtf8("Text Encoding")) + self.__textEncodingMenu = menu.addMenu( + self.trUtf8("Text Encoding")) self.__textEncodingMenu.aboutToShow.connect( self.__aboutToShowTextEncodingMenu) self.__textEncodingMenu.triggered.connect(self.__setTextEncoding) @@ -1571,7 +1652,8 @@ filtertb.addWidget(QLabel(self.trUtf8("Filtered by: "))) filtertb.addWidget(self.filterCombo) self.__helpEngine.setupFinished.connect(self.__setupFilterCombo) - self.filterCombo.activated[str].connect(self.__filterQtHelpDocumentation) + self.filterCombo.activated[str].connect( + self.__filterQtHelpDocumentation) self.__setupFilterCombo() settingstb = self.addToolBar(self.trUtf8("Settings")) @@ -1635,7 +1717,8 @@ self.forwardMenu = QMenu(self) self.forwardMenu.aboutToShow.connect(self.__showForwardMenu) - self.forwardMenu.triggered.connect(self.__navigationMenuActionTriggered) + self.forwardMenu.triggered.connect( + self.__navigationMenuActionTriggered) forwardButton = gotb.widgetForAction(self.forwardAct) forwardButton.setMenu(self.forwardMenu) forwardButton.setPopupMode(QToolButton.MenuButtonPopup) @@ -1659,24 +1742,26 @@ self.virustotalSearchEdit.setMaximumWidth(250) self.virustotalSearchEdit.setWhatsThis(self.trUtf8( """<h2>File search</h2>""" - """<p>In order to search for the last VirusTotal report on a given file""" - """ just enter its hash. Currently the allowed hashes are MD5, SHA1 and""" - """ SHA256. You can also search for a particular file report by typing""" - """ in its permalink id.</p>""" + """<p>In order to search for the last VirusTotal report on a""" + """ given file just enter its hash. Currently the allowed""" + """ hashes are MD5, SHA1 and SHA256. You can also search for""" + """ a particular file report by typing in its permalink id.</p>""" """<h2>URL search</h2>""" - """<p>URL searches are simple, just type in the given URL, the application""" - """ will normalize it and compare it with the entries in VirusTotal's""" - """ database. Alternatively you may enter the MD5 hash of an URL preceded""" - """ by "url:", e.g. url:7f911bbcf618f052ac6b9928600d2820.</p>""" + """<p>URL searches are simple, just type in the given URL, the""" + """ application will normalize it and compare it with the""" + """ entries in VirusTotal's database. Alternatively you may""" + """ enter the MD5 hash of an URL preceded by "url:", e.g.""" + """ url:7f911bbcf618f052ac6b9928600d2820.</p>""" """<h2>User search</h2>""" - """<p>Do you want to know whether a friend has a VT Community account?""" - """ Simply type in his nick preceded by the symbol "@", e.g.""" - """ @EmilianoMartinez.</p>""" + """<p>Do you want to know whether a friend has a VT Community""" + """ account? Simply type in his nick preceded by the symbol""" + """ "@", e.g. @EmilianoMartinez.</p>""" """<h2>Search through comments</h2>""" - """<p>The comments in VT Community may often help in disinfecting your PC""" - """ or may proof themselves useful when analysing a particular malware""" - """ sample, comment tags enable users to search through the VT Community""" - """ reviews. The standard file tags are: {0} The standard URL tags are: {1}""" + """<p>The comments in VT Community may often help in""" + """ disinfecting your PC or may proof themselves useful when""" + """ analysing a particular malware sample, comment tags enable""" + """ users to search through the VT Community reviews. The""" + """ standard file tags are: {0} The standard URL tags are: {1}""" """User generated tags are preceded by the symbol "#", e.g.""" """ #disinfect.</p>""" ).format( @@ -1698,8 +1783,10 @@ """<li>spamlink</li>""" """</ul>""", )) - self.virustotalSearchEdit.textChanged.connect(self.__virusTotalSearchChanged) - self.virustotalSearchEdit.returnPressed.connect(self.__virusTotalSearch) + self.virustotalSearchEdit.textChanged.connect( + self.__virusTotalSearchChanged) + self.virustotalSearchEdit.returnPressed.connect( + self.__virusTotalSearch) vttb.addWidget(self.virustotalSearchEdit) self.virustotalSearchAct = vttb.addAction( UI.PixmapCache.getIcon("virustotal.png"), @@ -1738,7 +1825,8 @@ def __switchTab(self): """ - Private slot used to switch between the current and the previous current tab. + Private slot used to switch between the current and the previous + current tab. """ fwidget = QApplication.focusWidget() while fwidget and not hasattr(fwidget, 'switchTab'): @@ -1873,7 +1961,8 @@ def __saveVisiblePageScreen(self): """ - Private slot to save the visible part of the current page as a screen shot. + Private slot to save the visible part of the current page as a screen + shot. """ self.__savePageScreen(visibleOnly=True) @@ -1883,8 +1972,8 @@ """ E5MessageBox.about(self, self.trUtf8("eric5 Web Browser"), self.trUtf8( """<b>eric5 Web Browser - {0}</b>""" - """<p>The eric5 Web Browser is a combined help file and HTML browser.""" - """ It is part of the eric5 development toolset.</p>""" + """<p>The eric5 Web Browser is a combined help file and HTML""" + """ browser. It is part of the eric5 development toolset.</p>""" ).format(Version)) def __aboutQt(self): @@ -1905,7 +1994,8 @@ """ Public slot called when forward references are available. - @param b flag indicating the availability of the forwards action (boolean) + @param b flag indicating the availability of the forwards action + (boolean) """ self.forwardAct.setEnabled(b) @@ -2074,13 +2164,15 @@ if Preferences.getHelp("SaveGeometry"): if not self.__isFullScreen(): - Preferences.setGeometry("HelpViewerGeometry", self.saveGeometry()) + Preferences.setGeometry("HelpViewerGeometry", + self.saveGeometry()) else: Preferences.setGeometry("HelpViewerGeometry", QByteArray()) try: if self.fromEric or len(self.__class__.helpwindows) > 1: - del self.__class__.helpwindows[self.__class__.helpwindows.index(self)] + del self.__class__.helpwindows[ + self.__class__.helpwindows.index(self)] except ValueError: pass @@ -2155,7 +2247,8 @@ @param textOnly flag indicating to zoom text only (boolean) """ - QWebSettings.globalSettings().setAttribute(QWebSettings.ZoomTextOnly, textOnly) + QWebSettings.globalSettings().setAttribute( + QWebSettings.ZoomTextOnly, textOnly) self.zoomTextOnlyChanged.emit(textOnly) def __viewFullScreen(self,): @@ -2166,13 +2259,15 @@ # switch back to normal self.setWindowState(self.windowState() & ~Qt.WindowFullScreen) self.menuBar().show() - self.fullScreenAct.setIcon(UI.PixmapCache.getIcon("windowFullscreen.png")) + self.fullScreenAct.setIcon( + UI.PixmapCache.getIcon("windowFullscreen.png")) self.fullScreenAct.setIconText(self.trUtf8('Full Screen')) else: # switch to full screen self.setWindowState(self.windowState() | Qt.WindowFullScreen) self.menuBar().hide() - self.fullScreenAct.setIcon(UI.PixmapCache.getIcon("windowRestore.png")) + self.fullScreenAct.setIcon( + UI.PixmapCache.getIcon("windowRestore.png")) self.fullScreenAct.setIconText(self.trUtf8('Restore Window')) def __isFullScreen(self): @@ -2196,15 +2291,16 @@ settings = QWebSettings.globalSettings() pb = settings.testAttribute(QWebSettings.PrivateBrowsingEnabled) if not pb: - txt = self.trUtf8("""<b>Are you sure you want to turn on private""" - """ browsing?</b><p>When private browsing is turned on,""" - """ web pages are not added to the history, searches""" - """ are not added to the list of recent searches and""" - """ web site icons and cookies are not stored.""" - """ HTML5 offline storage will be deactivated.""" - """ Until you close the window, you can still click""" - """ the Back and Forward buttons to return to the""" - """ web pages you have opened.</p>""") + txt = self.trUtf8( + """<b>Are you sure you want to turn on private""" + """ browsing?</b><p>When private browsing is turned on,""" + """ web pages are not added to the history, searches""" + """ are not added to the list of recent searches and""" + """ web site icons and cookies are not stored.""" + """ HTML5 offline storage will be deactivated.""" + """ 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: self.setPrivateMode(True) @@ -2236,7 +2332,8 @@ def browserAt(self, index): """ - Public method to get a reference to the help browser with the given index. + Public method to get a reference to the help browser with the given + index. @param index index of the browser to get (integer) @return reference to the indexed help browser (HelpBrowser) @@ -2272,9 +2369,9 @@ Private slot to set the preferences. """ from Preferences.ConfigurationDialog import ConfigurationDialog - dlg = ConfigurationDialog(self, 'Configuration', True, - fromEric=self.fromEric, - displayMode=ConfigurationDialog.HelpBrowserMode) + dlg = ConfigurationDialog( + self, 'Configuration', True, fromEric=self.fromEric, + displayMode=ConfigurationDialog.HelpBrowserMode) dlg.preferencesChanged.connect(self.preferencesChanged) dlg.masterPasswordChanged.connect(self.masterPasswordChanged) dlg.show() @@ -2295,7 +2392,8 @@ Public slot to handle a change of preferences. """ if not self.fromEric: - self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) + self.setStyle(Preferences.getUI("Style"), + Preferences.getUI("StyleSheet")) self.__initWebSettings() @@ -2344,7 +2442,8 @@ """ Private slot to configure the cookies handling. """ - from .CookieJar.CookiesConfigurationDialog import CookiesConfigurationDialog + from .CookieJar.CookiesConfigurationDialog import \ + CookiesConfigurationDialog dlg = CookiesConfigurationDialog(self) dlg.exec_() @@ -2352,7 +2451,8 @@ """ Private slot to configure the offline storage. """ - from .OfflineStorage.OfflineStorageConfigDialog import OfflineStorageConfigDialog + from .OfflineStorage.OfflineStorageConfigDialog import \ + OfflineStorageConfigDialog dlg = OfflineStorageConfigDialog(self) if dlg.exec_() == QDialog.Accepted: dlg.storeData() @@ -2584,7 +2684,8 @@ self.__indexingProgress = QWidget() layout = QHBoxLayout(self.__indexingProgress) layout.setContentsMargins(0, 0, 0, 0) - sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Maximum) + sizePolicy = QSizePolicy(QSizePolicy.Preferred, + QSizePolicy.Maximum) label = QLabel(self.trUtf8("Updating search index")) label.setSizePolicy(sizePolicy) @@ -2597,7 +2698,8 @@ progressBar.setSizePolicy(sizePolicy) layout.addWidget(progressBar) - self.statusBar().insertPermanentWidget(0, self.__indexingProgress) + self.statusBar().insertPermanentWidget( + 0, self.__indexingProgress) def __indexingFinished(self): """ @@ -2614,10 +2716,12 @@ """ Private slot to search for a word. """ - if self.useQtHelp and not self.__indexing and self.__searchWord is not None: + if self.useQtHelp and not self.__indexing and \ + self.__searchWord is not None: self.__searchDock.show() self.__searchDock.raise_() - query = QHelpSearchQuery(QHelpSearchQuery.DEFAULT, [self.__searchWord]) + query = QHelpSearchQuery(QHelpSearchQuery.DEFAULT, + [self.__searchWord]) self.__searchEngine.search([query]) self.__searchWord = None @@ -2647,11 +2751,14 @@ """ if self.useQtHelp: from .HelpDocsInstaller import HelpDocsInstaller - self.__helpInstaller = HelpDocsInstaller(self.__helpEngine.collectionFile()) - self.__helpInstaller.errorMessage.connect(self.__showInstallationError) + self.__helpInstaller = HelpDocsInstaller( + self.__helpEngine.collectionFile()) + self.__helpInstaller.errorMessage.connect( + self.__showInstallationError) self.__helpInstaller.docsInstalled.connect(self.__docsInstalled) - self.statusBar().showMessage(self.trUtf8("Looking for Documentation...")) + self.statusBar().showMessage( + self.trUtf8("Looking for Documentation...")) self.__helpInstaller.installDocs() def __showInstallationError(self, message): @@ -2668,7 +2775,8 @@ """ Private slot handling the end of documentation installation. - @param installed flag indicating that documents were installed (boolean) + @param installed flag indicating that documents were installed + (boolean) """ if self.useQtHelp: if installed: @@ -2709,7 +2817,8 @@ """ Private slot to show the Settings menu. """ - self.editMessageFilterAct.setEnabled(E5ErrorMessage.messageHandlerInstalled()) + self.editMessageFilterAct.setEnabled( + E5ErrorMessage.messageHandlerInstalled()) def __showBackMenu(self): """ @@ -2749,7 +2858,8 @@ """ Private slot to go to the selected page. - @param act reference to the action selected in the navigation menu (QAction) + @param act reference to the action selected in the navigation menu + (QAction) """ offset = act.data() history = self.currentBrowser().history() @@ -2806,9 +2916,10 @@ if languages: language = languages[0] langCode = language.split("[")[1][:2] - self.newTab("http://www.macromedia.com/support/documentation/" - "{0}/flashplayer/help/settings_manager07.html".format( - langCode)) + self.newTab( + "http://www.macromedia.com/support/documentation/" + "{0}/flashplayer/help/settings_manager07.html".format( + langCode)) def __showEnginesConfigurationDialog(self): """ @@ -2821,7 +2932,8 @@ def searchEnginesAction(self): """ - Public method to get a reference to the search engines configuration action. + Public method to get a reference to the search engines configuration + action. @return reference to the search engines configuration action (QAction) """ @@ -2918,10 +3030,12 @@ icon = HelpWindow.__getWebIcon(hostUrl) if icon.isNull(): - pixmap = QWebSettings.webGraphic(QWebSettings.DefaultFrameIconGraphic) + pixmap = QWebSettings.webGraphic( + QWebSettings.DefaultFrameIconGraphic) if pixmap.isNull(): pixmap = UI.PixmapCache.getPixmap("defaultIcon.png") - QWebSettings.setWebGraphic(QWebSettings.DefaultFrameIconGraphic, pixmap) + QWebSettings.setWebGraphic( + QWebSettings.DefaultFrameIconGraphic, pixmap) return QIcon(pixmap) return icon @@ -3053,11 +3167,12 @@ """ Class method to get a reference to the personal information manager. - @return reference to the personal information manager (PersonalInformationManager) + @return reference to the personal information manager + (PersonalInformationManager) """ if cls._personalInformationManager is None: - from .PersonalInformationManager.PersonalInformationManager import \ - PersonalInformationManager + from .PersonalInformationManager.PersonalInformationManager \ + import PersonalInformationManager cls._personalInformationManager = PersonalInformationManager() return cls._personalInformationManager @@ -3115,7 +3230,8 @@ codecs.append(str(codec, encoding="utf-8").lower()) codecs.sort() - defaultTextEncoding = QWebSettings.globalSettings().defaultTextEncoding().lower() + defaultTextEncoding = \ + QWebSettings.globalSettings().defaultTextEncoding().lower() if defaultTextEncoding in codecs: currentCodec = defaultTextEncoding else: @@ -3149,7 +3265,8 @@ act.setChecked(True) isDefaultEncodingUsed = False - act = self.__textEncodingMenu.addAction(self.trUtf8("Default Encoding")) + act = self.__textEncodingMenu.addAction( + self.trUtf8("Default Encoding")) act.setData("") act.setCheckable(True) act.setChecked(isDefaultEncodingUsed) @@ -3384,7 +3501,8 @@ def __virusTotalScanCurrentSite(self): """ - Private slot to ask VirusTotal for a scan of the URL of the current browser. + Private slot to ask VirusTotal for a scan of the URL of the current + browser. """ cb = self.currentBrowser() if cb is not None: @@ -3456,7 +3574,8 @@ pass encodedStyle = bytes(QByteArray(userStyle).toBase64()).decode() - dataString = "data:text/css;charset=utf-8;base64,{0}".format(encodedStyle) + dataString = "data:text/css;charset=utf-8;base64,{0}".format( + encodedStyle) return QUrl(dataString) @@ -3474,7 +3593,8 @@ @param text text of the notification (string) """ if cls._fromEric: - e5App().getObject("UserInterface").showNotification(icon, heading, text) + e5App().getObject("UserInterface").showNotification( + icon, heading, text) else: if Preferences.getUI("NotificationsEnabled"): if cls._notification is None: @@ -3483,8 +3603,10 @@ cls._notification.setPixmap(icon) cls._notification.setHeading(heading) cls._notification.setText(text) - cls._notification.setTimeout(Preferences.getUI("NotificationTimeout")) - cls._notification.move(Preferences.getUI("NotificationPosition")) + cls._notification.setTimeout( + Preferences.getUI("NotificationTimeout")) + cls._notification.move( + Preferences.getUI("NotificationPosition")) cls._notification.show() @classmethod
--- a/Helpviewer/PageScreenDialog.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/PageScreenDialog.py Wed Oct 09 19:26:41 2013 +0200 @@ -8,8 +8,8 @@ """ from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QImage, QPainter, \ - QPixmap +from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QImage, \ + QPainter, QPixmap from E5Gui import E5FileDialog, E5MessageBox
--- a/Helpviewer/QtHelpDocumentationDialog.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/QtHelpDocumentationDialog.py Wed Oct 09 19:26:41 2013 +0200 @@ -47,7 +47,8 @@ """ Private slot handling a change of the documents selection. """ - self.removeButton.setEnabled(len(self.documentsList.selectedItems()) != 0) + self.removeButton.setEnabled( + len(self.documentsList.selectedItems()) != 0) @pyqtSlot() def on_addButton_clicked(self): @@ -67,15 +68,17 @@ if not ns: E5MessageBox.warning(self, self.trUtf8("Add Documentation"), - self.trUtf8("""The file <b>{0}</b> is not a valid Qt Help File.""")\ - .format(fileName) + self.trUtf8( + """The file <b>{0}</b> is not a valid""" + """ Qt Help File.""").format(fileName) ) continue if len(self.documentsList.findItems(ns, Qt.MatchFixedString)): E5MessageBox.warning(self, self.trUtf8("Add Documentation"), - self.trUtf8("""The namespace <b>{0}</b> is already registered.""")\ + self.trUtf8( + """The namespace <b>{0}</b> is already registered.""")\ .format(ns) ) continue @@ -93,8 +96,9 @@ """ res = E5MessageBox.question(self, self.trUtf8("Remove Documentation"), - self.trUtf8("""Do you really want to remove the selected documentation """ - """sets from the database?""")) + self.trUtf8( + """Do you really want to remove the selected documentation """ + """sets from the database?""")) if not res: return @@ -106,10 +110,11 @@ if ns in list(openedDocs.values()): res = E5MessageBox.yesNo(self, self.trUtf8("Remove Documentation"), - self.trUtf8("""Some documents currently opened reference the """ - """documentation you are attempting to remove. """ - """Removing the documentation will close those """ - """documents. Remove anyway?"""), + self.trUtf8( + """Some documents currently opened reference the """ + """documentation you are attempting to remove. """ + """Removing the documentation will close those """ + """documents. Remove anyway?"""), icon=E5MessageBox.Warning) if not res: return @@ -123,7 +128,8 @@ self.__engine.unregisterDocumentation(ns) if self.documentsList.count(): - self.documentsList.setCurrentRow(0, QItemSelectionModel.ClearAndSelect) + self.documentsList.setCurrentRow( + 0, QItemSelectionModel.ClearAndSelect) def hasChanges(self): """
--- a/Helpviewer/QtHelpFiltersDialog.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/QtHelpFiltersDialog.py Wed Oct 09 19:26:41 2013 +0200 @@ -10,7 +10,8 @@ import sqlite3 from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QTreeWidgetItem, QListWidgetItem, QInputDialog, QLineEdit +from PyQt4.QtGui import QDialog, QTreeWidgetItem, QListWidgetItem, \ + QInputDialog, QLineEdit from PyQt4.QtHelp import QHelpEngineCore from .Ui_QtHelpFiltersDialog import Ui_QtHelpFiltersDialog @@ -64,7 +65,8 @@ Private slot to update the attributes depending on the current filter. @param current reference to the current item (QListWidgetitem) - @param previous reference to the previous current item (QListWidgetItem) + @param previous reference to the previous current item + (QListWidgetItem) """ checkedList = [] if current is not None: @@ -164,7 +166,8 @@ for attr in self.__removedAttributes: self.__db.execute( - "DELETE FROM FilterAttributeTable WHERE Name = '{0}'".format(attr)) + "DELETE FROM FilterAttributeTable WHERE Name = '{0}'" + .format(attr)) self.__db.commit() self.__db.close()
--- a/Helpviewer/SearchWidget.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/SearchWidget.py Wed Oct 09 19:26:41 2013 +0200 @@ -46,8 +46,10 @@ self.havefound = False self.__findBackwards = False - self.findtextCombo.lineEdit().returnPressed.connect(self.__findByReturnPressed) - self.findtextCombo.lineEdit().textEdited.connect(self.__searchTextEdited) + self.findtextCombo.lineEdit().returnPressed.connect( + self.__findByReturnPressed) + self.findtextCombo.lineEdit().textEdited.connect( + self.__searchTextEdited) if hasattr(QWebPage, "HighlightAllOccurrences"): self.highlightAllCheckBox.setChecked(True) @@ -67,7 +69,8 @@ """ Private slot to perform an incremental search. - @param txt current text of the search combos line edit (string) (unused) + @param txt current text of the search combos line edit (string) + (unused) """ self.on_highlightAllCheckBox_toggled(True) self.__findNextPrev() @@ -167,7 +170,8 @@ def __findByReturnPressed(self): """ - Private slot to handle the returnPressed signal of the findtext combobox. + Private slot to handle the returnPressed signal of the findtext + combobox. """ if self.__findBackwards: self.on_findPrevButton_clicked() @@ -217,7 +221,8 @@ def __setFindtextComboBackground(self, error): """ - Private slot to change the findtext combo background to indicate errors. + Private slot to change the findtext combo background to indicate + errors. @param error flag indicating an error condition (boolean) """
--- a/Helpviewer/VirusTotalApi.py Wed Oct 09 18:40:07 2013 +0200 +++ b/Helpviewer/VirusTotalApi.py Wed Oct 09 19:26:41 2013 +0200 @@ -4,28 +4,32 @@ # """ -Module implementing the <a href="http://www.virustotal.com">VirusTotal</a> API class. +Module implementing the <a href="http://www.virustotal.com">VirusTotal</a> +API class. """ import json from PyQt4.QtCore import QObject, QUrl, QByteArray, pyqtSignal -from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager +from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply, \ + QNetworkAccessManager import Preferences class VirusTotalAPI(QObject): """ - Class implementing the <a href="http://www.virustotal.com">VirusTotal</a> API. + Class implementing the <a href="http://www.virustotal.com">VirusTotal</a> + API. - @signal checkServiceKeyFinished(bool, str) emitted after the service key check - has been performed. It gives a flag indicating validity (boolean) and - an error message in case of a network error (string). + @signal checkServiceKeyFinished(bool, str) emitted after the service key + check has been performed. It gives a flag indicating validity + (boolean) and an error message in case of a network error (string). @signal submitUrlError(str) emitted with the error string, if the URL scan - submission returned an error. + submission returned an error. @signal urlScanReport(str) emitted with the URL of the URL scan report page - @signal fileScanReport(str) emitted with the URL of the file scan report page + @signal fileScanReport(str) emitted with the URL of the file scan report + page """ checkServiceKeyFinished = pyqtSignal(bool, str) submitUrlError = pyqtSignal(str) @@ -44,8 +48,10 @@ ScanUrlPattern = "{0}://www.virustotal.com/api/scan_url.json" GetUrlReportPattern = "{0}://www.virustotal.com/api/get_url_report.json" - ReportUrlScanPagePattern = "http://www.virustotal.com/url-scan/report.html?id={0}" - ReportFileScanPagePattern = "http://www.virustotal.com/file-scan/report.html?id={0}" + ReportUrlScanPagePattern = \ + "http://www.virustotal.com/url-scan/report.html?id={0}" + ReportFileScanPagePattern = \ + "http://www.virustotal.com/file-scan/report.html?id={0}" SearchUrl = "http://www.virustotal.com/search.html" @@ -135,8 +141,8 @@ request = QNetworkRequest(QUrl(self.ScanUrlUrl)) request.setHeader(QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") - params = QByteArray( - "key={0}&url=".format(Preferences.getHelp("VirusTotalServiceKey")))\ + params = QByteArray("key={0}&url=".format( + Preferences.getHelp("VirusTotalServiceKey")))\ .append(QUrl.toPercentEncoding(url.toString())) import Helpviewer.HelpWindow @@ -182,14 +188,16 @@ def __getFileScanReportUrlFinished(self): """ - Private slot to determine the result of the file scan report URL request. + Private slot to determine the result of the file scan report URL + request. """ reply = self.sender() if reply.error() == QNetworkReply.NoError: result = json.loads(str(reply.readAll(), "utf-8")) if "file-report" in result: self.fileScanReport.emit( - self.ReportFileScanPagePattern.format(result["file-report"])) + self.ReportFileScanPagePattern.format( + result["file-report"])) self.__replies.remove(reply) @classmethod
