Mercurial Repositories > eric / file comparison
comparison: eric6/Helpviewer/HelpTabWidget.py
eric6/Helpviewer/HelpTabWidget.py
- changeset 6999
- f23e546a7eb9
- parent 6942
- 2602857055c5
equal
deleted
inserted
replaced
| 6998:a63ca2373f44 | 6999:f23e546a7eb9 |
|---|---|
| 114 self.__closedTabsButton.setPopupMode(QToolButton.InstantPopup) | 114 self.__closedTabsButton.setPopupMode(QToolButton.InstantPopup) |
| 115 self.__closedTabsButton.setMenu(self.__closedTabsMenu) | 115 self.__closedTabsButton.setMenu(self.__closedTabsMenu) |
| 116 self.__closedTabsButton.setEnabled(False) | 116 self.__closedTabsButton.setEnabled(False) |
| 117 self.__rightCornerWidgetLayout.addWidget(self.__closedTabsButton) | 117 self.__rightCornerWidgetLayout.addWidget(self.__closedTabsButton) |
| 118 | 118 |
| 119 self.__closeButton = QToolButton(self) | 119 self.setTabsClosable(True) |
| 120 self.__closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) | 120 self.tabCloseRequested.connect(self.closeBrowserAt) |
| 121 self.__closeButton.setToolTip( | |
| 122 self.tr("Close the current help window")) | |
| 123 self.__closeButton.setEnabled(False) | |
| 124 self.__closeButton.clicked.connect(self.closeBrowser) | |
| 125 self.__rightCornerWidgetLayout.addWidget(self.__closeButton) | |
| 126 if Preferences.getUI("SingleCloseButton") or \ | |
| 127 not hasattr(self, 'setTabsClosable'): | |
| 128 self.__closeButton.show() | |
| 129 else: | |
| 130 self.setTabsClosable(True) | |
| 131 self.tabCloseRequested.connect(self.closeBrowserAt) | |
| 132 self.__closeButton.hide() | |
| 133 | 121 |
| 134 self.setCornerWidget(self.__rightCornerWidget, Qt.TopRightCorner) | 122 self.setCornerWidget(self.__rightCornerWidget, Qt.TopRightCorner) |
| 135 | 123 |
| 136 self.__newTabButton = QToolButton(self) | 124 self.__newTabButton = QToolButton(self) |
| 137 self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus.png")) | 125 self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus.png")) |
| 365 index = self.insertTab(position, browser, self.tr("...")) | 353 index = self.insertTab(position, browser, self.tr("...")) |
| 366 self.setCurrentIndex(index) | 354 self.setCurrentIndex(index) |
| 367 | 355 |
| 368 self.__mainWindow.closeAct.setEnabled(True) | 356 self.__mainWindow.closeAct.setEnabled(True) |
| 369 self.__mainWindow.closeAllAct.setEnabled(True) | 357 self.__mainWindow.closeAllAct.setEnabled(True) |
| 370 self.__closeButton.setEnabled(True) | |
| 371 self.__navigationButton.setEnabled(True) | 358 self.__navigationButton.setEnabled(True) |
| 372 | 359 |
| 373 if not linkName and not requestData: | 360 if not linkName and not requestData: |
| 374 if Preferences.getHelp("StartupBehavior") == 0: | 361 if Preferences.getHelp("StartupBehavior") == 0: |
| 375 linkName = Preferences.getHelp("HomePage") | 362 linkName = Preferences.getHelp("HomePage") |
| 735 for browser in self.browsers(): | 722 for browser in self.browsers(): |
| 736 browser.preferencesChanged() | 723 browser.preferencesChanged() |
| 737 | 724 |
| 738 for urlbar in self.__stackedUrlBar.urlBars(): | 725 for urlbar in self.__stackedUrlBar.urlBars(): |
| 739 urlbar.preferencesChanged() | 726 urlbar.preferencesChanged() |
| 740 | |
| 741 if Preferences.getUI("SingleCloseButton") or \ | |
| 742 not hasattr(self, 'setTabsClosable'): | |
| 743 if hasattr(self, 'setTabsClosable'): | |
| 744 self.setTabsClosable(False) | |
| 745 try: | |
| 746 self.tabCloseRequested.disconnect(self.closeBrowserAt) | |
| 747 except TypeError: | |
| 748 pass | |
| 749 self.__closeButton.show() | |
| 750 else: | |
| 751 self.setTabsClosable(True) | |
| 752 self.tabCloseRequested.connect(self.closeBrowserAt) | |
| 753 self.__closeButton.hide() | |
| 754 | 727 |
| 755 def __loadStarted(self, browser): | 728 def __loadStarted(self, browser): |
| 756 """ | 729 """ |
| 757 Private method to handle the loadStarted signal. | 730 Private method to handle the loadStarted signal. |
| 758 | 731 |
