Mercurial Repositories > eric / file comparison
comparison: WebBrowser/UrlBar/UrlBar.py
WebBrowser/UrlBar/UrlBar.py
- branch
- QtWebEngine
- changeset 4715
- 79009bc4acd5
- parent 4709
- 8612533a223f
- child 4725
- b19ff70ba509
equal
deleted
inserted
replaced
| 4713:8dca047daf4b | 4715:79009bc4acd5 |
|---|---|
| 53 self.__mw = mainWindow | 53 self.__mw = mainWindow |
| 54 self.__browser = None | 54 self.__browser = None |
| 55 ## self.__privateMode = QWebSettings.globalSettings().testAttribute( | 55 ## self.__privateMode = QWebSettings.globalSettings().testAttribute( |
| 56 ## QWebSettings.PrivateBrowsingEnabled) | 56 ## QWebSettings.PrivateBrowsingEnabled) |
| 57 | 57 |
| 58 # TODO: re-enable once bookmarks are done | 58 # TODO: Bookmarks |
| 59 ## self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16.png") | 59 ## self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16.png") |
| 60 ## self.__bmInactiveIcon = QIcon( | 60 ## self.__bmInactiveIcon = QIcon( |
| 61 ## self.__bmActiveIcon.pixmap(16, 16, QIcon.Disabled)) | 61 ## self.__bmActiveIcon.pixmap(16, 16, QIcon.Disabled)) |
| 62 | 62 |
| 63 # TODO: FavIcon | |
| 63 ## self.__favicon = FavIconLabel(self) | 64 ## self.__favicon = FavIconLabel(self) |
| 64 ## self.addWidget(self.__favicon, E5LineEdit.LeftSide) | 65 ## self.addWidget(self.__favicon, E5LineEdit.LeftSide) |
| 65 ## | 66 |
| 67 # TODO: SSL | |
| 66 ## self.__sslLabel = SslLabel(self) | 68 ## self.__sslLabel = SslLabel(self) |
| 67 ## self.addWidget(self.__sslLabel, E5LineEdit.LeftSide) | 69 ## self.addWidget(self.__sslLabel, E5LineEdit.LeftSide) |
| 68 ## self.__sslLabel.setVisible(False) | 70 ## self.__sslLabel.setVisible(False) |
| 69 ## | 71 |
| 72 # TODO: Privacy | |
| 70 ## self.__privacyButton = E5LineEditButton(self) | 73 ## self.__privacyButton = E5LineEditButton(self) |
| 71 ## self.__privacyButton.setIcon( | 74 ## self.__privacyButton.setIcon( |
| 72 ## UI.PixmapCache.getIcon("privateBrowsing.png")) | 75 ## UI.PixmapCache.getIcon("privateBrowsing.png")) |
| 73 ## self.addWidget(self.__privacyButton, E5LineEdit.RightSide) | 76 ## self.addWidget(self.__privacyButton, E5LineEdit.RightSide) |
| 74 ## self.__privacyButton.setVisible(self.__privateMode) | 77 ## self.__privacyButton.setVisible(self.__privateMode) |
| 75 ## | 78 |
| 79 # TODO: RSS | |
| 76 ## self.__rssButton = E5LineEditButton(self) | 80 ## self.__rssButton = E5LineEditButton(self) |
| 77 ## self.__rssButton.setIcon(UI.PixmapCache.getIcon("rss16.png")) | 81 ## self.__rssButton.setIcon(UI.PixmapCache.getIcon("rss16.png")) |
| 78 ## self.addWidget(self.__rssButton, E5LineEdit.RightSide) | 82 ## self.addWidget(self.__rssButton, E5LineEdit.RightSide) |
| 79 ## self.__rssButton.setVisible(False) | 83 ## self.__rssButton.setVisible(False) |
| 80 | 84 |
| 85 # TODO: Bookmarks | |
| 81 ## self.__bookmarkButton = E5LineEditButton(self) | 86 ## self.__bookmarkButton = E5LineEditButton(self) |
| 82 ## self.addWidget(self.__bookmarkButton, E5LineEdit.RightSide) | 87 ## self.addWidget(self.__bookmarkButton, E5LineEdit.RightSide) |
| 83 ## self.__bookmarkButton.setVisible(False) | 88 ## self.__bookmarkButton.setVisible(False) |
| 84 | 89 |
| 85 self.__clearButton = E5LineEditButton(self) | 90 self.__clearButton = E5LineEditButton(self) |
| 86 self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) | 91 self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) |
| 87 self.addWidget(self.__clearButton, E5LineEdit.RightSide) | 92 self.addWidget(self.__clearButton, E5LineEdit.RightSide) |
| 88 self.__clearButton.setVisible(False) | 93 self.__clearButton.setVisible(False) |
| 89 | 94 |
| 95 # TODO: Bookmarks | |
| 90 ## self.__bookmarkButton.clicked.connect(self.__showBookmarkInfo) | 96 ## self.__bookmarkButton.clicked.connect(self.__showBookmarkInfo) |
| 97 # TODO: RSS | |
| 98 ## self.__rssButton.clicked.connect(self.__rssClicked) | |
| 99 # TODO: Privacy | |
| 91 ## self.__privacyButton.clicked.connect(self.__privacyClicked) | 100 ## self.__privacyButton.clicked.connect(self.__privacyClicked) |
| 92 ## self.__rssButton.clicked.connect(self.__rssClicked) | |
| 93 self.__clearButton.clicked.connect(self.clear) | 101 self.__clearButton.clicked.connect(self.clear) |
| 94 ## self.__mw.privacyChanged.connect(self.__privacyButton.setVisible) | 102 ## self.__mw.privacyChanged.connect(self.__privacyButton.setVisible) |
| 95 self.textChanged.connect(self.__textChanged) | 103 self.textChanged.connect(self.__textChanged) |
| 96 | 104 |
| 105 # TODO: Bookmarks | |
| 97 ## Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ | 106 ## Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ |
| 98 ## .entryChanged.connect(self.__bookmarkChanged) | 107 ## .entryChanged.connect(self.__bookmarkChanged) |
| 99 ## Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ | 108 ## Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ |
| 100 ## .entryAdded.connect(self.__bookmarkChanged) | 109 ## .entryAdded.connect(self.__bookmarkChanged) |
| 101 ## Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ | 110 ## Helpviewer.HelpWindow.HelpWindow.bookmarksManager()\ |
| 102 ## .entryRemoved.connect(self.__bookmarkChanged) | 111 ## .entryRemoved.connect(self.__bookmarkChanged) |
| 112 # TODO: Speed Dial | |
| 103 ## Helpviewer.HelpWindow.HelpWindow.speedDial().pagesChanged.connect( | 113 ## Helpviewer.HelpWindow.HelpWindow.speedDial().pagesChanged.connect( |
| 104 ## self.__bookmarkChanged) | 114 ## self.__bookmarkChanged) |
| 105 | 115 |
| 106 def setBrowser(self, browser): | 116 def setBrowser(self, browser): |
| 107 """ | 117 """ |
| 108 Public method to set the browser connection. | 118 Public method to set the browser connection. |
| 109 | 119 |
| 110 @param browser reference to the browser widget (WebBrowserView) | 120 @param browser reference to the browser widget (WebBrowserView) |
| 111 """ | 121 """ |
| 112 self.__browser = browser | 122 self.__browser = browser |
| 123 # TODO: FavIcon | |
| 113 ## self.__favicon.setBrowser(browser) | 124 ## self.__favicon.setBrowser(browser) |
| 114 | 125 |
| 115 self.__browser.urlChanged.connect(self.__browserUrlChanged) | 126 self.__browser.urlChanged.connect(self.__browserUrlChanged) |
| 116 self.__browser.loadProgress.connect(self.update) | 127 self.__browser.loadProgress.connect(self.update) |
| 117 self.__browser.loadFinished.connect(self.__loadFinished) | 128 self.__browser.loadFinished.connect(self.__loadFinished) |
| 118 self.__browser.loadStarted.connect(self.__loadStarted) | 129 self.__browser.loadStarted.connect(self.__loadStarted) |
| 119 ## | 130 |
| 131 # TODO: SSL | |
| 120 ## self.__sslLabel.clicked.connect(self.__browser.page().showSslInfo) | 132 ## self.__sslLabel.clicked.connect(self.__browser.page().showSslInfo) |
| 121 | 133 |
| 122 def browser(self): | 134 def browser(self): |
| 123 """ | 135 """ |
| 124 Public method to get the associated browser. | 136 Public method to get the associated browser. |
| 145 def __loadStarted(self): | 157 def __loadStarted(self): |
| 146 """ | 158 """ |
| 147 Private slot to perform actions before the page is loaded. | 159 Private slot to perform actions before the page is loaded. |
| 148 """ | 160 """ |
| 149 pass | 161 pass |
| 162 # TODO: SSL | |
| 150 ## self.__sslLabel.setVisible(False) | 163 ## self.__sslLabel.setVisible(False) |
| 164 # TODO: Bookmarks | |
| 151 ## self.__bookmarkButton.setVisible(False) | 165 ## self.__bookmarkButton.setVisible(False) |
| 152 | 166 |
| 167 # TODO: Bookmarks | |
| 153 ## def __checkBookmark(self): | 168 ## def __checkBookmark(self): |
| 154 ## """ | 169 ## """ |
| 155 ## Private slot to check the current URL for the bookmarked state. | 170 ## Private slot to check the current URL for the bookmarked state. |
| 156 ## """ | 171 ## """ |
| 157 ## manager = Helpviewer.HelpWindow.HelpWindow.bookmarksManager() | 172 ## manager = Helpviewer.HelpWindow.HelpWindow.bookmarksManager() |
| 174 | 189 |
| 175 @param ok flag indicating a successful load (boolean) | 190 @param ok flag indicating a successful load (boolean) |
| 176 """ | 191 """ |
| 177 pass | 192 pass |
| 178 ## try: | 193 ## try: |
| 179 # TODO: re-enable once Bookmarks are done | 194 # TODO: Bookmarks |
| 180 ## if self.__browser.url().scheme() in ["eric", "about"]: | 195 ## if self.__browser.url().scheme() in ["eric", "about"]: |
| 181 ## self.__bookmarkButton.setVisible(False) | 196 ## self.__bookmarkButton.setVisible(False) |
| 182 ## else: | 197 ## else: |
| 183 ## self.__checkBookmark() | 198 ## self.__checkBookmark() |
| 184 ## self.__bookmarkButton.setVisible(True) | 199 ## self.__bookmarkButton.setVisible(True) |
| 185 | 200 |
| 186 # TODO: re-enable once RSS is done | 201 # TODO: RSS |
| 187 ## if ok: | 202 ## if ok: |
| 188 ## self.__rssButton.setVisible(self.__browser.checkRSS()) | 203 ## self.__rssButton.setVisible(self.__browser.checkRSS()) |
| 189 | 204 |
| 190 # TODO: do the SSL certificate stuff (if possible) | 205 # TODO: SSL certificate stuff (if possible) |
| 191 ## if ok and \ | 206 ## if ok and \ |
| 192 ## self.__browser.url().scheme() == "https" and \ | 207 ## self.__browser.url().scheme() == "https" and \ |
| 193 ## QSslCertificate is not None: | 208 ## QSslCertificate is not None: |
| 194 ## sslInfo = self.__browser.page().getSslCertificate() | 209 ## sslInfo = self.__browser.page().getSslCertificate() |
| 195 ## if sslInfo is not None: | 210 ## if sslInfo is not None: |
| 215 ## | 230 ## |
| 216 ## self.__sslLabel.setVisible(False) | 231 ## self.__sslLabel.setVisible(False) |
| 217 ## except RuntimeError: | 232 ## except RuntimeError: |
| 218 ## pass | 233 ## pass |
| 219 | 234 |
| 235 # TODO: Privacy | |
| 220 ## def setPrivateMode(self, on): | 236 ## def setPrivateMode(self, on): |
| 221 ## """ | 237 ## """ |
| 222 ## Public method to set the private mode. | 238 ## Public method to set the private mode. |
| 223 ## | 239 ## |
| 224 ## @param on flag indicating the privacy state (boolean) | 240 ## @param on flag indicating the privacy state (boolean) |
| 244 """ | 260 """ |
| 245 Public slot to handle a change of preferences. | 261 Public slot to handle a change of preferences. |
| 246 """ | 262 """ |
| 247 self.update() | 263 self.update() |
| 248 | 264 |
| 265 # TODO: Bookmarks | |
| 249 ## def __showBookmarkInfo(self): | 266 ## def __showBookmarkInfo(self): |
| 250 ## """ | 267 ## """ |
| 251 ## Private slot to show a dialog with some bookmark info. | 268 ## Private slot to show a dialog with some bookmark info. |
| 252 ## """ | 269 ## """ |
| 253 ## from .BookmarkActionSelectionDialog import \ | 270 ## from .BookmarkActionSelectionDialog import \ |
| 281 """ | 298 """ |
| 282 Protected method handling a paint event. | 299 Protected method handling a paint event. |
| 283 | 300 |
| 284 @param evt reference to the paint event (QPaintEvent) | 301 @param evt reference to the paint event (QPaintEvent) |
| 285 """ | 302 """ |
| 303 # TODO: Privacy | |
| 286 ## if self.__privateMode: | 304 ## if self.__privateMode: |
| 287 ## backgroundColor = QColor(220, 220, 220) # light gray | 305 ## backgroundColor = QColor(220, 220, 220) # light gray |
| 288 ## foregroundColor = Qt.black | 306 ## foregroundColor = Qt.black |
| 289 ## else: | 307 ## else: |
| 290 backgroundColor = QApplication.palette().color(QPalette.Base) | 308 backgroundColor = QApplication.palette().color(QPalette.Base) |
