Mercurial Repositories > eric / file comparison
comparison: eric7/UI/UserInterface.py
eric7/UI/UserInterface.py
- branch
- eric7
- changeset 8705
- 327e596607f8
- parent 8697
- 936662560d04
- child 8714
- 85deb98a0a6c
equal
deleted
inserted
replaced
| 8704:e4042abf2a5b | 8705:327e596607f8 |
|---|---|
| 5897 home = pythonDocDir | 5897 home = pythonDocDir |
| 5898 | 5898 |
| 5899 if home.endswith(".chm"): | 5899 if home.endswith(".chm"): |
| 5900 self.__chmViewer(home) | 5900 self.__chmViewer(home) |
| 5901 else: | 5901 else: |
| 5902 # TODO: add logic for internal help viewer (= 0) | 5902 hvType = Preferences.getHelp("HelpViewerType") |
| 5903 hvType = Preferences.getWebBrowser("HelpViewerType") | 5903 if hvType == 0: |
| 5904 if hvType == 1: | 5904 self.__activateHelpViewerWidget(urlStr=home) |
| 5905 elif hvType == 1: | |
| 5905 self.launchHelpViewer(home) | 5906 self.launchHelpViewer(home) |
| 5906 elif hvType == 2: | 5907 elif hvType == 2: |
| 5907 if home.startswith("qthelp://"): | 5908 if home.startswith("qthelp://"): |
| 5908 self.__assistant(home) | 5909 self.__assistant(home) |
| 5909 else: | 5910 else: |
| 5952 if Utilities.isWindowsPlatform(): | 5953 if Utilities.isWindowsPlatform(): |
| 5953 home = "file:///" + Utilities.fromNativeSeparators(home) | 5954 home = "file:///" + Utilities.fromNativeSeparators(home) |
| 5954 else: | 5955 else: |
| 5955 home = "file://" + home | 5956 home = "file://" + home |
| 5956 | 5957 |
| 5957 # TODO: add logic for internal help viewer (= 0) | 5958 hvType = Preferences.getHelp("HelpViewerType") |
| 5958 hvType = Preferences.getWebBrowser("HelpViewerType") | 5959 if hvType == 0: |
| 5959 if hvType == 1: | 5960 self.__activateHelpViewerWidget(urlStr=home) |
| 5961 elif hvType == 1: | |
| 5960 self.launchHelpViewer(home) | 5962 self.launchHelpViewer(home) |
| 5961 elif hvType == 2: | 5963 elif hvType == 2: |
| 5962 if home.startswith("qthelp://"): | 5964 if home.startswith("qthelp://"): |
| 5963 self.__assistant(home) | 5965 self.__assistant(home) |
| 5964 else: | 5966 else: |
| 6021 else: | 6023 else: |
| 6022 home = "file://" + home | 6024 home = "file://" + home |
| 6023 else: | 6025 else: |
| 6024 home = pyqtDocDir | 6026 home = pyqtDocDir |
| 6025 | 6027 |
| 6026 # TODO: add logic for internal help viewer (= 0) | 6028 hvType = Preferences.getHelp("HelpViewerType") |
| 6027 hvType = Preferences.getWebBrowser("HelpViewerType") | 6029 if hvType == 0: |
| 6028 if hvType == 1: | 6030 self.__activateHelpViewerWidget(urlStr=home) |
| 6031 elif hvType == 1: | |
| 6029 self.launchHelpViewer(home) | 6032 self.launchHelpViewer(home) |
| 6030 elif hvType == 2: | 6033 elif hvType == 2: |
| 6031 if home.startswith("qthelp://"): | 6034 if home.startswith("qthelp://"): |
| 6032 self.__assistant(home) | 6035 self.__assistant(home) |
| 6033 else: | 6036 else: |
| 6059 if Utilities.isWindowsPlatform(): | 6062 if Utilities.isWindowsPlatform(): |
| 6060 home = "file:///" + Utilities.fromNativeSeparators(home) | 6063 home = "file:///" + Utilities.fromNativeSeparators(home) |
| 6061 else: | 6064 else: |
| 6062 home = "file://" + home | 6065 home = "file://" + home |
| 6063 | 6066 |
| 6064 # TODO: add logic for internal help viewer (= 0) | 6067 hvType = Preferences.getHelp("HelpViewerType") |
| 6065 hvType = Preferences.getWebBrowser("HelpViewerType") | 6068 if hvType == 0: |
| 6066 if hvType == 1: | 6069 self.__activateHelpViewerWidget(urlStr=home) |
| 6070 elif hvType == 1: | |
| 6067 self.launchHelpViewer(home) | 6071 self.launchHelpViewer(home) |
| 6068 elif hvType == 2: | 6072 elif hvType == 2: |
| 6069 if home.startswith("qthelp://"): | 6073 if home.startswith("qthelp://"): |
| 6070 self.__assistant(home) | 6074 self.__assistant(home) |
| 6071 else: | 6075 else: |
| 6118 else: | 6122 else: |
| 6119 home = "file://" + home | 6123 home = "file://" + home |
| 6120 else: | 6124 else: |
| 6121 home = pysideDocDir | 6125 home = pysideDocDir |
| 6122 | 6126 |
| 6123 # TODO: add logic for internal help viewer (= 0) | 6127 hvType = Preferences.getHelp("HelpViewerType") |
| 6124 hvType = Preferences.getWebBrowser("HelpViewerType") | 6128 if hvType == 0: |
| 6125 if hvType == 1: | 6129 self.__activateHelpViewerWidget(urlStr=home) |
| 6130 elif hvType == 1: | |
| 6126 self.launchHelpViewer(home) | 6131 self.launchHelpViewer(home) |
| 6127 elif hvType == 2: | 6132 elif hvType == 2: |
| 6128 if home.startswith("qthelp://"): | 6133 if home.startswith("qthelp://"): |
| 6129 self.__assistant(home) | 6134 self.__assistant(home) |
| 6130 else: | 6135 else: |
| 7034 self.leftSidebar.show() | 7039 self.leftSidebar.show() |
| 7035 self.leftSidebar.setCurrentWidget(self.__vcsStatusWidget) | 7040 self.leftSidebar.setCurrentWidget(self.__vcsStatusWidget) |
| 7036 self.__vcsStatusWidget.setFocus( | 7041 self.__vcsStatusWidget.setFocus( |
| 7037 Qt.FocusReason.ActiveWindowFocusReason) | 7042 Qt.FocusReason.ActiveWindowFocusReason) |
| 7038 | 7043 |
| 7039 def __activateHelpViewerWidget(self): | 7044 def __activateHelpViewerWidget(self, urlStr=None): |
| 7040 """ | 7045 """ |
| 7041 Private method to activate the embedded Help Viewer window. | 7046 Private method to activate the embedded Help Viewer window. |
| 7047 | |
| 7048 @param urlStr URL to be shown | |
| 7049 @type str | |
| 7042 """ | 7050 """ |
| 7043 if self.__layoutType == "Toolboxes": | 7051 if self.__layoutType == "Toolboxes": |
| 7044 self.rToolboxDock.show() | 7052 self.rToolboxDock.show() |
| 7045 self.rToolbox.setCurrentWidget(self.__helpViewerWidget) | 7053 self.rToolbox.setCurrentWidget(self.__helpViewerWidget) |
| 7046 elif self.__layoutType == "Sidebars": | 7054 elif self.__layoutType == "Sidebars": |
| 7047 self.rightSidebar.show() | 7055 self.rightSidebar.show() |
| 7048 self.rightSidebar.setCurrentWidget(self.__helpViewerWidget) | 7056 self.rightSidebar.setCurrentWidget(self.__helpViewerWidget) |
| 7049 self.__helpViewerWidget.setFocus( | 7057 self.__helpViewerWidget.setFocus( |
| 7050 Qt.FocusReason.ActiveWindowFocusReason) | 7058 Qt.FocusReason.ActiveWindowFocusReason) |
| 7051 | 7059 |
| 7052 searchWord = self.viewmanager.textForFind(False) | 7060 url = None |
| 7053 if searchWord == "": | 7061 searchWord = None |
| 7054 searchWord = None | 7062 |
| 7055 self.__helpViewerWidget.activate(searchWord=searchWord) | 7063 if urlStr: |
| 7064 url = QUrl(urlStr) | |
| 7065 if not url.isValid(): | |
| 7066 url = None | |
| 7067 | |
| 7068 if url is None: | |
| 7069 searchWord = self.viewmanager.textForFind(False) | |
| 7070 if searchWord == "": | |
| 7071 searchWord = None | |
| 7072 | |
| 7073 self.__helpViewerWidget.activate(searchWord=searchWord, url=url) | |
| 7056 | 7074 |
| 7057 ########################################################## | 7075 ########################################################## |
| 7058 ## Below are slots to handle StdOut and StdErr | 7076 ## Below are slots to handle StdOut and StdErr |
| 7059 ########################################################## | 7077 ########################################################## |
| 7060 | 7078 |
