Mercurial Repositories > eric / file comparison
comparison: Helpviewer/UrlBar/UrlBar.py
Helpviewer/UrlBar/UrlBar.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3057
- 10516539f238
- parent 3035
- 36e9f388958b
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 158 from Helpviewer.Bookmarks.BookmarkNode import BookmarkNode | 158 from Helpviewer.Bookmarks.BookmarkNode import BookmarkNode |
| 159 for bookmark in bookmarks: | 159 for bookmark in bookmarks: |
| 160 manager.setTimestamp(bookmark, BookmarkNode.TsVisited, | 160 manager.setTimestamp(bookmark, BookmarkNode.TsVisited, |
| 161 QDateTime.currentDateTime()) | 161 QDateTime.currentDateTime()) |
| 162 elif Helpviewer.HelpWindow.HelpWindow.speedDial()\ | 162 elif Helpviewer.HelpWindow.HelpWindow.speedDial()\ |
| 163 .pageForUrl(self.__browser.url()).url != "": | 163 .pageForUrl(self.__browser.url()).url != "": |
| 164 self.__bookmarkButton.setIcon(self.__bmActiveIcon) | 164 self.__bookmarkButton.setIcon(self.__bmActiveIcon) |
| 165 else: | 165 else: |
| 166 self.__bookmarkButton.setIcon(self.__bmInactiveIcon) | 166 self.__bookmarkButton.setIcon(self.__bmInactiveIcon) |
| 167 | 167 |
| 168 def __loadFinished(self, ok): | 168 def __loadFinished(self, ok): |
| 263 action = dlg.getAction() | 263 action = dlg.getAction() |
| 264 if action == BookmarkActionSelectionDialog.AddBookmark: | 264 if action == BookmarkActionSelectionDialog.AddBookmark: |
| 265 self.__browser.addBookmark() | 265 self.__browser.addBookmark() |
| 266 elif action == BookmarkActionSelectionDialog.EditBookmark: | 266 elif action == BookmarkActionSelectionDialog.EditBookmark: |
| 267 bookmark = Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ | 267 bookmark = Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ |
| 268 .bookmarkForUrl(url) | 268 .bookmarkForUrl(url) |
| 269 from .BookmarkInfoDialog import BookmarkInfoDialog | 269 from .BookmarkInfoDialog import BookmarkInfoDialog |
| 270 dlg = BookmarkInfoDialog(bookmark, self.__browser) | 270 dlg = BookmarkInfoDialog(bookmark, self.__browser) |
| 271 dlg.exec_() | 271 dlg.exec_() |
| 272 elif action == BookmarkActionSelectionDialog.AddSpeeddial: | 272 elif action == BookmarkActionSelectionDialog.AddSpeeddial: |
| 273 Helpviewer.HelpWindow.HelpWindow.speedDial().addPage( | 273 Helpviewer.HelpWindow.HelpWindow.speedDial().addPage( |
| 320 r = (highlight.red() + 2 * backgroundColor.red()) // 3 | 320 r = (highlight.red() + 2 * backgroundColor.red()) // 3 |
| 321 g = (highlight.green() + 2 * backgroundColor.green()) // 3 | 321 g = (highlight.green() + 2 * backgroundColor.green()) // 3 |
| 322 b = (highlight.blue() + 2 * backgroundColor.blue()) // 3 | 322 b = (highlight.blue() + 2 * backgroundColor.blue()) // 3 |
| 323 | 323 |
| 324 loadingColor = QColor(r, g, b) | 324 loadingColor = QColor(r, g, b) |
| 325 if abs(loadingColor.lightness() - | 325 if abs(loadingColor.lightness() - |
| 326 backgroundColor.lightness()) < 20: | 326 backgroundColor.lightness()) < 20: |
| 327 # special handling for special color schemes (e.g Gaia) | 327 # special handling for special color schemes (e.g Gaia) |
| 328 r = (2 * highlight.red() + backgroundColor.red()) // 3 | 328 r = (2 * highlight.red() + backgroundColor.red()) // 3 |
| 329 g = (2 * highlight.green() + backgroundColor.green()) // 3 | 329 g = (2 * highlight.green() + backgroundColor.green()) // 3 |
| 330 b = (2 * highlight.blue() + backgroundColor.blue()) // 3 | 330 b = (2 * highlight.blue() + backgroundColor.blue()) // 3 |
