Mercurial Repositories > eric / changeset
changeset
Renamed the iconChanged signal of WebBrowserView to faviconChanged in order to get rid of a name clash with Qt 5.7+.
Sun, 17 Jul 2016 15:53:07 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 17 Jul 2016 15:53:07 +0200
- changeset 5039
- 200f12184a43
- parent 5038
- df7103c3f2a6
- child 5040
- 73c784b7b3bc
Renamed the iconChanged signal of WebBrowserView to faviconChanged in order to get rid of a name clash with Qt 5.7+.
--- a/APIs/Python3/eric6.api Sun Jul 17 15:36:11 2016 +0200 +++ b/APIs/Python3/eric6.api Sun Jul 17 15:53:07 2016 +0200 @@ -9782,8 +9782,8 @@ eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.entryChanged?7 eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.entryRemoved?7 eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.exportBookmarks?4() +eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.faviconChanged?4(url) eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.getFileName?4() -eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.iconChanged?4(url) eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.importBookmarks?4() eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.incVisitCount?4(node) eric6.WebBrowser.Bookmarks.BookmarksManager.BookmarksManager.load?4() @@ -10923,6 +10923,7 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.dropEvent?4(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView.event?4(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView.eventFilter?4(obj, evt) +eric6.WebBrowser.WebBrowserView.WebBrowserView.faviconChanged?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.findNextPrev?4(txt, case, backwards, callback) eric6.WebBrowser.WebBrowserView.WebBrowserView.focusOutEvent?4(evt) eric6.WebBrowser.WebBrowserView.WebBrowserView.forward?4() @@ -10934,7 +10935,6 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.highlighted?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.home?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.icon?4() -eric6.WebBrowser.WebBrowserView.WebBrowserView.iconChanged?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.inputWidget?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.isBackwardAvailable?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.isForwardAvailable?4()
--- a/Documentation/Help/source.qhp Sun Jul 17 15:36:11 2016 +0200 +++ b/Documentation/Help/source.qhp Sun Jul 17 15:53:07 2016 +0200 @@ -2165,10 +2165,10 @@ <keyword name="BookmarksManager.close" id="BookmarksManager.close" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.close" /> <keyword name="BookmarksManager.exportBookmarks" id="BookmarksManager.exportBookmarks" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#BookmarksManager.exportBookmarks" /> <keyword name="BookmarksManager.exportBookmarks" id="BookmarksManager.exportBookmarks" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.exportBookmarks" /> + <keyword name="BookmarksManager.faviconChanged" id="BookmarksManager.faviconChanged" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.faviconChanged" /> <keyword name="BookmarksManager.getFileName" id="BookmarksManager.getFileName" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#BookmarksManager.getFileName" /> <keyword name="BookmarksManager.getFileName" id="BookmarksManager.getFileName" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.getFileName" /> <keyword name="BookmarksManager.iconChanged" id="BookmarksManager.iconChanged" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#BookmarksManager.iconChanged" /> - <keyword name="BookmarksManager.iconChanged" id="BookmarksManager.iconChanged" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.iconChanged" /> <keyword name="BookmarksManager.importBookmarks" id="BookmarksManager.importBookmarks" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#BookmarksManager.importBookmarks" /> <keyword name="BookmarksManager.importBookmarks" id="BookmarksManager.importBookmarks" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.importBookmarks" /> <keyword name="BookmarksManager.incVisitCount" id="BookmarksManager.incVisitCount" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#BookmarksManager.incVisitCount" />
--- a/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksManager.html Sun Jul 17 15:36:11 2016 +0200 +++ b/Documentation/Source/eric6.WebBrowser.Bookmarks.BookmarksManager.html Sun Jul 17 15:53:07 2016 +0200 @@ -126,7 +126,7 @@ <td><a href="#BookmarksManager.exportBookmarks">exportBookmarks</a></td> <td>Public method to export the bookmarks.</td> </tr><tr> -<td><a href="#BookmarksManager.iconChanged">iconChanged</a></td> +<td><a href="#BookmarksManager.faviconChanged">faviconChanged</a></td> <td>Public slot to update the icon image for an URL.</td> </tr><tr> <td><a href="#BookmarksManager.importBookmarks">importBookmarks</a></td> @@ -328,9 +328,9 @@ <b>exportBookmarks</b>(<i></i>) <p> Public method to export the bookmarks. -</p><a NAME="BookmarksManager.iconChanged" ID="BookmarksManager.iconChanged"></a> -<h4>BookmarksManager.iconChanged</h4> -<b>iconChanged</b>(<i>url</i>) +</p><a NAME="BookmarksManager.faviconChanged" ID="BookmarksManager.faviconChanged"></a> +<h4>BookmarksManager.faviconChanged</h4> +<b>faviconChanged</b>(<i>url</i>) <p> Public slot to update the icon image for an URL. </p><dl>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sun Jul 17 15:36:11 2016 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sun Jul 17 15:53:07 2016 +0200 @@ -48,15 +48,15 @@ <dt>backwardAvailable(bool)</dt> <dd> emitted after the current URL has changed +</dd><dt>faviconChanged()</dt> +<dd> +emitted to signal a changed web site icon </dd><dt>forwardAvailable(bool)</dt> <dd> emitted after the current URL has changed </dd><dt>highlighted(str)</dt> <dd> emitted, when the mouse hovers over a link -</dd><dt>iconChanged()</dt> -<dd> -emitted to signal a changed web site icon </dd><dt>search(QUrl)</dt> <dd> emitted, when a search is requested
--- a/WebBrowser/Bookmarks/BookmarksManager.py Sun Jul 17 15:36:11 2016 +0200 +++ b/WebBrowser/Bookmarks/BookmarksManager.py Sun Jul 17 15:53:07 2016 +0200 @@ -420,7 +420,7 @@ self.tr("""Error exporting bookmarks to <b>{0}</b>.""") .format(fileName)) - def iconChanged(self, url): + def faviconChanged(self, url): """ Public slot to update the icon image for an URL.
--- a/WebBrowser/TabManager/TabManagerWidget.py Sun Jul 17 15:36:11 2016 +0200 +++ b/WebBrowser/TabManager/TabManagerWidget.py Sun Jul 17 15:53:07 2016 +0200 @@ -350,7 +350,7 @@ view.page().loadFinished.connect(self.delayedRefreshTree) view.page().loadStarted.connect(self.delayedRefreshTree) view.titleChanged.connect(self.delayedRefreshTree) - view.iconChanged.connect(self.delayedRefreshTree) + view.faviconChanged.connect(self.delayedRefreshTree) @pyqtSlot() def __refreshTree(self):
--- a/WebBrowser/UrlBar/FavIconLabel.py Sun Jul 17 15:36:11 2016 +0200 +++ b/WebBrowser/UrlBar/FavIconLabel.py Sun Jul 17 15:53:07 2016 +0200 @@ -62,7 +62,7 @@ """ self.__browser = browser self.__browser.loadFinished.connect(self.__browserIconChanged) - self.__browser.iconChanged.connect(self.__browserIconChanged) + self.__browser.faviconChanged.connect(self.__browserIconChanged) self.__browser.loadStarted.connect(self.__clearIcon) def mousePressEvent(self, evt):
--- a/WebBrowser/WebBrowserTabWidget.py Sun Jul 17 15:36:11 2016 +0200 +++ b/WebBrowser/WebBrowserTabWidget.py Sun Jul 17 15:53:07 2016 +0200 @@ -352,7 +352,7 @@ browser.forwardAvailable.connect(self.__mainWindow.setForwardAvailable) browser.loadStarted.connect(self.__loadStarted) browser.loadFinished.connect(self.__loadFinished) - browser.iconChanged.connect(self.__iconChanged) + browser.faviconChanged.connect(self.__iconChanged) browser.search.connect(self.newBrowser) browser.page().windowCloseRequested.connect( self.__windowCloseRequested) @@ -794,7 +794,7 @@ self.setTabIcon( self.indexOf(browser), browser.icon()) - self.__mainWindow.bookmarksManager().iconChanged(browser.url()) + self.__mainWindow.bookmarksManager().faviconChanged(browser.url()) def getSourceFileList(self): """
--- a/WebBrowser/WebBrowserView.py Sun Jul 17 15:36:11 2016 +0200 +++ b/WebBrowser/WebBrowserView.py Sun Jul 17 15:53:07 2016 +0200 @@ -46,7 +46,7 @@ @signal highlighted(str) emitted, when the mouse hovers over a link @signal search(QUrl) emitted, when a search is requested @signal zoomValueChanged(int) emitted to signal a change of the zoom value - @signal iconChanged() emitted to signal a changed web site icon + @signal faviconChanged() emitted to signal a changed web site icon """ sourceChanged = pyqtSignal(QUrl) forwardAvailable = pyqtSignal(bool) @@ -54,7 +54,7 @@ highlighted = pyqtSignal(str) search = pyqtSignal(QUrl) zoomValueChanged = pyqtSignal(int) - iconChanged = pyqtSignal() + faviconChanged = pyqtSignal() ZoomLevels = [ 30, 40, 50, 67, 80, 90, @@ -1427,7 +1427,7 @@ from .Tools import WebIconProvider WebIconProvider.instance().saveIcon(self) - self.iconChanged.emit() + self.faviconChanged.emit() def icon(self): """
