Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserTabWidget.py
WebBrowser/WebBrowserTabWidget.py
- branch
- QtWebEngine
- changeset 4908
- f1859c36d564
- parent 4846
- 960e5e18894b
- child 4910
- e97af1181efd
equal
deleted
inserted
replaced
| 4907:1e3d61349671 | 4908:f1859c36d564 |
|---|---|
| 299 """ | 299 """ |
| 300 Private slot to open a new browser tab. | 300 Private slot to open a new browser tab. |
| 301 """ | 301 """ |
| 302 self.newBrowser() | 302 self.newBrowser() |
| 303 | 303 |
| 304 # TODO: get rid of requestData | 304 def newBrowser(self, link=None, position=-1): |
| 305 def newBrowser(self, link=None, requestData=None, position=-1): | |
| 306 """ | 305 """ |
| 307 Public method to create a new web browser tab. | 306 Public method to create a new web browser tab. |
| 308 | 307 |
| 309 @param link link to be shown (string or QUrl) | 308 @param link link to be shown (string or QUrl) |
| 310 @param requestData page load request data (LoadRequest) | |
| 311 @keyparam position position to create the new tab at or -1 to add it | 309 @keyparam position position to create the new tab at or -1 to add it |
| 312 to the end (integer) | 310 to the end (integer) |
| 313 """ | 311 """ |
| 314 if link is None: | 312 if link is None: |
| 315 linkName = "" | 313 linkName = "" |
| 364 self.__mainWindow.closeAct.setEnabled(True) | 362 self.__mainWindow.closeAct.setEnabled(True) |
| 365 self.__mainWindow.closeAllAct.setEnabled(True) | 363 self.__mainWindow.closeAllAct.setEnabled(True) |
| 366 self.__closeButton.setEnabled(True) | 364 self.__closeButton.setEnabled(True) |
| 367 self.__navigationButton.setEnabled(True) | 365 self.__navigationButton.setEnabled(True) |
| 368 | 366 |
| 369 if not linkName and not requestData: | 367 if not linkName: |
| 370 if Preferences.getWebBrowser("StartupBehavior") == 0: | 368 if Preferences.getWebBrowser("StartupBehavior") == 0: |
| 371 linkName = Preferences.getWebBrowser("HomePage") | 369 linkName = Preferences.getWebBrowser("HomePage") |
| 372 elif Preferences.getWebBrowser("StartupBehavior") == 1: | 370 elif Preferences.getWebBrowser("StartupBehavior") == 1: |
| 373 linkName = "eric:speeddial" | 371 linkName = "eric:speeddial" |
| 374 | 372 |
| 380 else: | 378 else: |
| 381 self.setTabText( | 379 self.setTabText( |
| 382 index, | 380 index, |
| 383 self.__elide(browser.documentTitle().replace("&", "&&"))) | 381 self.__elide(browser.documentTitle().replace("&", "&&"))) |
| 384 self.setTabToolTip(index, browser.documentTitle()) | 382 self.setTabToolTip(index, browser.documentTitle()) |
| 385 ## elif requestData: | 383 |
| 386 ## browser.load(requestData) | 384 def newBrowserAfter(self, browser, link=None): |
| 387 | |
| 388 def newBrowserAfter(self, browser, link=None, requestData=None): | |
| 389 """ | 385 """ |
| 390 Public method to create a new web browser tab after a given one. | 386 Public method to create a new web browser tab after a given one. |
| 391 | 387 |
| 392 @param browser reference to the browser to add after (WebBrowserView) | 388 @param browser reference to the browser to add after (WebBrowserView) |
| 393 @param link link to be shown (string or QUrl) | 389 @param link link to be shown (string or QUrl) |
| 394 @param requestData page load request data (LoadRequest) | |
| 395 """ | 390 """ |
| 396 if browser: | 391 if browser: |
| 397 position = self.indexOf(browser) + 1 | 392 position = self.indexOf(browser) + 1 |
| 398 else: | 393 else: |
| 399 position = -1 | 394 position = -1 |
| 400 self.newBrowser(link, requestData, position) | 395 self.newBrowser(link, position) |
| 401 | 396 |
| 402 def __showNavigationMenu(self): | 397 def __showNavigationMenu(self): |
| 403 """ | 398 """ |
| 404 Private slot to show the navigation button menu. | 399 Private slot to show the navigation button menu. |
| 405 """ | 400 """ |
