eric: comparison Helpviewer/HelpBrowserWV.py

-:52e8c820d0dd
+:c679fb30c8f3
 """
 Public method to add data to a network request.
 @param request reference to the network request object (QNetworkRequest)
 """
-request.setAttribute(QNetworkRequest.User + 100, QVariant(self))
+request.setAttribute(QNetworkRequest.User + 100, self)
-request.setAttribute(QNetworkRequest.User + 101,
+request.setAttribute(QNetworkRequest.User + 101, self.__lastRequestType)
-QVariant(self.__lastRequestType))
 def pageAttributeId(self):
 """
 Public method to get the attribute id of the page attribute.
 @param relation relation to extract (string)
 @return list of linked resources (list of LinkedResource)
 """
 resources = []
-lst = self.page().mainFrame().evaluateJavaScript(fetchLinks_js).toList()
+lst = self.page().mainFrame().evaluateJavaScript(fetchLinks_js)
-for variant in lst:
+for m in lst:
-m = variant.toMap()
+rel = m["rel"]
-rel = m["rel"].toString()
+type_ = m["type"]
-type_ = m["type"].toString()
+href = m["href"]
-href = m["href"].toString()
+title =  m["title"]
-title =  m["title"].toString()
 if href == "" or type_ == "":
 continue
 if relation and rel != relation:
 continue
 self.trUtf8("""<p>Could not start an application"""
 """ for URL <b>{0}</b>.</p>""").format(name.toString()))
 return
 elif name.scheme() == "javascript":
 scriptSource = name.toString()[11:]
-res = self.page().mainFrame().evaluateJavaScript(scriptSource).toString()
+res = self.page().mainFrame().evaluateJavaScript(scriptSource)
 if res:
 self.setHtml(res)
 return
 else:
 if name.toString().endswith(".pdf") or \
 hit = self.page().mainFrame().hitTestContent(evt.pos())
 if not hit.linkUrl().isEmpty():
 act = menu.addAction(self.trUtf8("Open Link in New Tab\tCtrl+LMB"),
 self.__openLinkInNewTab)
-act.setData(QVariant(hit.linkUrl()))
+act.setData(hit.linkUrl())
 menu.addSeparator()
 menu.addAction(self.trUtf8("Save Lin&k"), self.__downloadLink)
 act = menu.addAction(self.trUtf8("Bookmark this Link"), self.__bookmarkLink)
-act.setData(QVariant(hit.linkUrl()))
+act.setData(hit.linkUrl())
 menu.addSeparator()
 menu.addAction(self.trUtf8("Copy Link to Clipboard"), self.__copyLink)
 if not hit.imageUrl().isEmpty():
 if not menu.isEmpty():
 menu.addSeparator()
 act = menu.addAction(self.trUtf8("Open Image in New Tab"),
 self.__openLinkInNewTab)
-act.setData(QVariant(hit.imageUrl()))
+act.setData(hit.imageUrl())
 menu.addSeparator()
 menu.addAction(self.trUtf8("Save Image"), self.__downloadImage)
 menu.addAction(self.trUtf8("Copy Image to Clipboard"), self.__copyImage)
 act = menu.addAction(self.trUtf8("Copy Image Location to Clipboard"),
 self.__copyImageLocation)
-act.setData(QVariant(hit.imageUrl().toString()))
+act.setData(hit.imageUrl().toString())
 menu.addSeparator()
 act = menu.addAction(self.trUtf8("Block Image"), self.__blockImage)
-act.setData(QVariant(hit.imageUrl().toString()))
+act.setData(hit.imageUrl().toString())
 if not menu.isEmpty():
 menu.addSeparator()
 menu.addAction(self.mw.newTabAct)
 menu.addAction(self.mw.newAct)
 engineNames = HelpWebSearchWidget.openSearchManager().allEnginesNames()
 for engineName in engineNames:
 engine = HelpWebSearchWidget.openSearchManager().engine(engineName)
 act = OpenSearchEngineAction(engine, self.__searchMenu)
 self.__searchMenu.addAction(act)
-act.setData(QVariant(engineName))
+act.setData(engineName)
 self.connect(self.__searchMenu, SIGNAL("triggered(QAction *)"),
 self.__searchRequested)
 menu.addSeparator()
 menu.addAction(self.trUtf8("Web Inspector..."), self.__webInspector)
 def __openLinkInNewTab(self):
 """
 Private method called by the context menu to open a link in a new window.
 """
 act = self.sender()
-url = act.data().toUrl()
+url = act.data()
 if url.isEmpty():
 return
 oldCtrlPressed = self.ctrlPressed
 self.ctrlPressed = True
 def __bookmarkLink(self):
 """
 Private slot to bookmark a link via the context menu.
 """
 act = self.sender()
-url = act.data().toUrl()
+url = act.data()
 if url.isEmpty():
 return
 dlg = AddBookmarkDialog()
 dlg.setUrl(unicode(url.toEncoded()))
 def __copyImageLocation(self):
 """
 Private slot to copy an image location to the clipboard.
 """
 act = self.sender()
-url = act.data().toString()
+url = act.data()
 QApplication.clipboard().setText(url)
 def __blockImage(self):
 """
 Private slot to add a block rule for an image URL.
 """
 act = self.sender()
-url = act.data().toString()
+url = act.data()
 dlg = Helpviewer.HelpWindow.HelpWindow.adblockManager().showDialog()
 dlg.addCustomRule(url)
 def __searchRequested(self, act):
 """
 searchText = self.selectedText()
 if not searchText:
 return
-engineName = act.data().toString()
+engineName = act.data()
 if engineName:
 engine = HelpWebSearchWidget.openSearchManager().engine(engineName)
 self.emit(SIGNAL("search(const QUrl &)"), engine.searchUrl(searchText))
 def __webInspector(self):
 if reply.error() == QNetworkReply.NoError:
 if reply.url().isEmpty():
 return
 header = reply.header(QNetworkRequest.ContentLengthHeader)
-size, ok = header.toInt()
+size = header
 if ok and size == 0:
 return
 if requestFilename is None:
 requestFilename = Preferences.getUI("RequestDownloadFilename")

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/HelpBrowserWV.py

Helpviewer/HelpBrowserWV.py