Mercurial Repositories > eric / file comparison
comparison: eric6/WebBrowser/UrlBar/UrlBar.py
eric6/WebBrowser/UrlBar/UrlBar.py
- changeset 7270
- 41d09cf20415
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7269:0c63ea7f94bd | 7270:41d09cf20415 |
|---|---|
| 142 bookmarks = manager.bookmarksForUrl(self.__browser.url()) | 142 bookmarks = manager.bookmarksForUrl(self.__browser.url()) |
| 143 from WebBrowser.Bookmarks.BookmarkNode import BookmarkNode | 143 from WebBrowser.Bookmarks.BookmarkNode import BookmarkNode |
| 144 for bookmark in bookmarks: | 144 for bookmark in bookmarks: |
| 145 manager.setTimestamp(bookmark, BookmarkNode.TsVisited, | 145 manager.setTimestamp(bookmark, BookmarkNode.TsVisited, |
| 146 QDateTime.currentDateTime()) | 146 QDateTime.currentDateTime()) |
| 147 elif self.__mw.speedDial()\ | 147 elif self.__mw.speedDial().pageForUrl(self.__browser.url()).url != "": |
| 148 .pageForUrl(self.__browser.url()).url != "": | |
| 149 self.__bookmarkButton.setIcon(self.__bmActiveIcon) | 148 self.__bookmarkButton.setIcon(self.__bmActiveIcon) |
| 150 else: | 149 else: |
| 151 self.__bookmarkButton.setIcon(self.__bmInactiveIcon) | 150 self.__bookmarkButton.setIcon(self.__bmInactiveIcon) |
| 152 | 151 |
| 153 def __loadFinished(self, ok): | 152 def __loadFinished(self, ok): |
| 185 | 184 |
| 186 def __showBookmarkInfo(self): | 185 def __showBookmarkInfo(self): |
| 187 """ | 186 """ |
| 188 Private slot to show a dialog with some bookmark info. | 187 Private slot to show a dialog with some bookmark info. |
| 189 """ | 188 """ |
| 190 from .BookmarkActionSelectionDialog import \ | 189 from .BookmarkActionSelectionDialog import ( |
| 191 BookmarkActionSelectionDialog | 190 BookmarkActionSelectionDialog |
| 191 ) | |
| 192 url = self.__browser.url() | 192 url = self.__browser.url() |
| 193 dlg = BookmarkActionSelectionDialog(url) | 193 dlg = BookmarkActionSelectionDialog(url) |
| 194 if dlg.exec_() == QDialog.Accepted: | 194 if dlg.exec_() == QDialog.Accepted: |
| 195 action = dlg.getAction() | 195 action = dlg.getAction() |
| 196 if action == BookmarkActionSelectionDialog.AddBookmark: | 196 if action == BookmarkActionSelectionDialog.AddBookmark: |
| 197 self.__browser.addBookmark() | 197 self.__browser.addBookmark() |
| 198 elif action == BookmarkActionSelectionDialog.EditBookmark: | 198 elif action == BookmarkActionSelectionDialog.EditBookmark: |
| 199 bookmark = self.__mw.bookmarksManager()\ | 199 bookmark = ( |
| 200 .bookmarkForUrl(url) | 200 self.__mw.bookmarksManager().bookmarkForUrl(url) |
| 201 ) | |
| 201 from .BookmarkInfoDialog import BookmarkInfoDialog | 202 from .BookmarkInfoDialog import BookmarkInfoDialog |
| 202 dlg = BookmarkInfoDialog(bookmark, self.__browser) | 203 dlg = BookmarkInfoDialog(bookmark, self.__browser) |
| 203 dlg.exec_() | 204 dlg.exec_() |
| 204 elif action == BookmarkActionSelectionDialog.AddSpeeddial: | 205 elif action == BookmarkActionSelectionDialog.AddSpeeddial: |
| 205 self.__mw.speedDial().addPage( | 206 self.__mw.speedDial().addPage( |
| 319 if completer: | 320 if completer: |
| 320 completer.popup().hide() | 321 completer.popup().hide() |
| 321 return | 322 return |
| 322 | 323 |
| 323 currentText = self.text().strip() | 324 currentText = self.text().strip() |
| 324 if evt.key() in [Qt.Key_Enter, Qt.Key_Return] and \ | 325 if ( |
| 325 not currentText.lower().startswith("http://"): | 326 evt.key() in [Qt.Key_Enter, Qt.Key_Return] and |
| 327 not currentText.lower().startswith(("http://", "https://")) | |
| 328 ): | |
| 326 append = "" | 329 append = "" |
| 327 if evt.modifiers() == Qt.KeyboardModifiers(Qt.ControlModifier): | 330 if evt.modifiers() == Qt.KeyboardModifiers(Qt.ControlModifier): |
| 328 append = ".com" | 331 append = ".com" |
| 329 elif evt.modifiers() == Qt.KeyboardModifiers( | 332 elif evt.modifiers() == Qt.KeyboardModifiers( |
| 330 Qt.ControlModifier | Qt.ShiftModifier): | 333 Qt.ControlModifier | Qt.ShiftModifier): |
| 401 @param pos position to show the info at | 404 @param pos position to show the info at |
| 402 @type QPoint | 405 @type QPoint |
| 403 """ | 406 """ |
| 404 threatInfo = self.__safeBrowsingLabel.getThreatInfo() | 407 threatInfo = self.__safeBrowsingLabel.getThreatInfo() |
| 405 if threatInfo: | 408 if threatInfo: |
| 406 from WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget import \ | 409 from WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget import ( |
| 407 SafeBrowsingInfoWidget | 410 SafeBrowsingInfoWidget |
| 411 ) | |
| 408 widget = SafeBrowsingInfoWidget(threatInfo, self.__browser) | 412 widget = SafeBrowsingInfoWidget(threatInfo, self.__browser) |
| 409 widget.showAt(pos) | 413 widget.showAt(pos) |
