--- a/eric6/Tools/TrayStarter.py Tue Jan 05 18:28:31 2021 +0100 +++ b/eric6/Tools/TrayStarter.py Wed Jan 06 13:47:01 2021 +0100 @@ -61,7 +61,7 @@ self.activated.connect(self.__activated) - self.__menu = QMenu(self.tr("Eric6 tray starter")) + self.__menu = QMenu(self.tr("eric tray starter")) self.recentProjectsMenu = QMenu( self.tr('Recent Projects'), self.__menu) @@ -80,7 +80,7 @@ self.recentFilesMenu.triggered.connect(self.__openRecent) act = self.__menu.addAction( - self.tr("Eric6 tray starter"), self.__about) + self.tr("eric tray starter"), self.__about) font = act.font() font.setBold(True) act.setFont(font) @@ -146,25 +146,27 @@ self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("erict"), - self.tr("eric6 IDE"), self.__startEric) - self.__menu.addAction( UI.PixmapCache.getIcon("editor"), - self.tr("eric6 Mini Editor"), self.__startMiniEditor) + self.tr("eric Mini Editor"), self.__startMiniEditor) self.__menu.addAction( UI.PixmapCache.getIcon("hexEditor"), - self.tr("eric6 Hex Editor"), self.__startHexEditor) - self.__menu.addAction( - UI.PixmapCache.getIcon("ericWeb"), - self.tr("eric6 Web Browser"), self.__startHelpViewer) + self.tr("eric Hex Editor"), self.__startHexEditor) self.__menu.addAction( UI.PixmapCache.getIcon("shell"), - self.tr("eric6 Shell Window"), self.__startShell) + self.tr("eric Shell Window"), self.__startShell) self.__menu.addSeparator() self.__menu.addAction( - UI.PixmapCache.getIcon("configure"), - self.tr('Configure Tray Starter'), self.__showPreferences) + UI.PixmapCache.getIcon("ericWeb"), + self.tr("eric Web Browser"), self.__startWebBrowser) + self.__menu.addAction( + UI.PixmapCache.getIcon("ericWeb"), + self.tr("eric Web Browser (with QtHelp)"), + self.__startWebBrowserQtHelp) + self.__menu.addAction( + UI.PixmapCache.getIcon("ericWeb"), + self.tr("eric Web Browser (Private Mode)"), + self.__startWebBrowserPrivate) self.__menu.addSeparator() # recent files @@ -178,6 +180,16 @@ self.__menu.addSeparator() self.__menu.addAction( + UI.PixmapCache.getIcon("erict"), + self.tr("eric IDE"), self.__startEric) + self.__menu.addSeparator() + + self.__menu.addAction( + UI.PixmapCache.getIcon("configure"), + self.tr('Configure Tray Starter'), self.__showPreferences) + self.__menu.addSeparator() + + self.__menu.addAction( UI.PixmapCache.getIcon("exit"), self.tr('Quit'), e5App().quit) @@ -244,9 +256,9 @@ def __startProc(self, applName, *applArgs): """ - Private method to start an eric6 application. + Private method to start an eric application. - @param applName name of the eric6 application script (string) + @param applName name of the eric application script (string) @param *applArgs variable list of application arguments """ proc = QProcess() @@ -275,117 +287,133 @@ def __startMiniEditor(self): """ - Private slot to start the eric6 Mini Editor. + Private slot to start the eric Mini Editor. """ self.__startProc("eric6_editor.py") def __startEric(self): """ - Private slot to start the eric6 IDE. + Private slot to start the eric IDE. """ self.__startProc("eric6.py") def __startPreferences(self): """ - Private slot to start the eric6 configuration dialog. + Private slot to start the eric configuration dialog. """ self.__startProc("eric6_configure.py") def __startPluginInstall(self): """ - Private slot to start the eric6 plugin installation dialog. + Private slot to start the eric plugin installation dialog. """ self.__startProc("eric6_plugininstall.py") def __startPluginUninstall(self): """ - Private slot to start the eric6 plugin uninstallation dialog. + Private slot to start the eric plugin uninstallation dialog. """ self.__startProc("eric6_pluginuninstall.py") def __startPluginRepository(self): """ - Private slot to start the eric6 plugin repository dialog. + Private slot to start the eric plugin repository dialog. """ self.__startProc("eric6_pluginrepository.py") - def __startHelpViewer(self): + def __startWebBrowser(self): """ - Private slot to start the eric6 web browser. + Private slot to start the eric web browser. """ variant = Globals.getWebBrowserSupport() if variant == "QtWebEngine": self.__startProc("eric6_browser.py") + def __startWebBrowserQtHelp(self): + """ + Private slot to start the eric web browser with QtHelp support. + """ + variant = Globals.getWebBrowserSupport() + if variant == "QtWebEngine": + self.__startProc("eric6_browser.py", "--qthelp") + + def __startWebBrowserPrivate(self): + """ + Private slot to start the eric web browser in private mode. + """ + variant = Globals.getWebBrowserSupport() + if variant == "QtWebEngine": + self.__startProc("eric6_browser.py", "--private") + def __startUIPreviewer(self): """ - Private slot to start the eric6 UI previewer. + Private slot to start the eric UI previewer. """ self.__startProc("eric6_uipreviewer.py") def __startTRPreviewer(self): """ - Private slot to start the eric6 translations previewer. + Private slot to start the eric translations previewer. """ self.__startProc("eric6_trpreviewer.py") def __startUnittest(self): """ - Private slot to start the eric6 unittest dialog. + Private slot to start the eric unittest dialog. """ self.__startProc("eric6_unittest.py") def __startDiff(self): """ - Private slot to start the eric6 diff dialog. + Private slot to start the eric diff dialog. """ self.__startProc("eric6_diff.py") def __startCompare(self): """ - Private slot to start the eric6 compare dialog. + Private slot to start the eric compare dialog. """ self.__startProc("eric6_compare.py") def __startSqlBrowser(self): """ - Private slot to start the eric6 sql browser dialog. + Private slot to start the eric sql browser dialog. """ self.__startProc("eric6_sqlbrowser.py") def __startIconEditor(self): """ - Private slot to start the eric6 icon editor dialog. + Private slot to start the eric icon editor dialog. """ self.__startProc("eric6_iconeditor.py") def __startSnapshot(self): """ - Private slot to start the eric6 snapshot dialog. + Private slot to start the eric snapshot dialog. """ self.__startProc("eric6_snap.py") def __startQRegularExpression(self): """ - Private slot to start the eric6 QRegularExpression editor dialog. + Private slot to start the eric QRegularExpression editor dialog. """ self.__startProc("eric6_qregularexpression.py") def __startPyRe(self): """ - Private slot to start the eric6 Python re editor dialog. + Private slot to start the eric Python re editor dialog. """ self.__startProc("eric6_re.py") def __startHexEditor(self): """ - Private slot to start the eric6 hex editor dialog. + Private slot to start the eric hex editor dialog. """ self.__startProc("eric6_hexeditor.py") def __startShell(self): """ - Private slot to start the eric6 Shell window. + Private slot to start the eric Shell window. """ self.__startProc("eric6_shell.py")