Mercurial Repositories > eric / changeset
changeset
Removed reference to 'eric7_browser' in certain files due to unavailability of PyQt6.QtWebEngine.
Sat, 29 May 2021 14:43:34 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 29 May 2021 14:43:34 +0200
- branch
- eric7
- changeset 8387
- a68072a69dfc
- parent 8386
- 41a27cbdb5c1
- child 8388
- f864abd11a5b
Removed reference to 'eric7_browser' in certain files due to unavailability of PyQt6.QtWebEngine.
--- a/eric7/Tools/TrayStarter.py Fri May 28 17:50:00 2021 +0200 +++ b/eric7/Tools/TrayStarter.py Sat May 29 14:43:34 2021 +0200 @@ -157,18 +157,20 @@ self.tr("eric Shell Window"), self.__startShell) self.__menu.addSeparator() - self.__menu.addAction( - 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() + # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released + if False: + self.__menu.addAction( + 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 self.menuRecentFilesAct = self.__menu.addMenu(self.recentFilesMenu)
--- a/eric7/eric7_post_install.py Fri May 28 17:50:00 2021 +0200 +++ b/eric7/eric7_post_install.py Sat May 29 14:43:34 2021 +0200 @@ -95,10 +95,11 @@ os.path.join(scriptsDir, "eric7.exe"), os.path.join(scriptsDir, "eric7.ico") ), - ("eric7 Browser (Python {0}.{1}).lnk", - os.path.join(scriptsDir, "eric7_browser.exe"), - os.path.join(scriptsDir, "ericWeb48.ico") - ), + # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released + #~ ("eric7 Browser (Python {0}.{1}).lnk", + #~ os.path.join(scriptsDir, "eric7_browser.exe"), # __IGNORE_WARNING__ + #~ os.path.join(scriptsDir, "ericWeb48.ico") # __IGNORE_WARNING__ + #~ ), ] return [ @@ -157,7 +158,9 @@ copyMetaFilesTree(os.path.join(srcDir, metaDir), os.path.join(dstDir, metaDir)) - for desktop in ["eric7.desktop", "eric7_browser.desktop"]: + # TODO: add 'eric7_browser.desktop' this once PyQt 6.2.0/Qt 6.2.0 is + # released + for desktop in ["eric7.desktop"]: copyDesktopFile( os.path.join(srcDir, "applications", desktop), os.path.join(dstDir, "applications", desktop),
--- a/scripts/create_windows_links.py Fri May 28 17:50:00 2021 +0200 +++ b/scripts/create_windows_links.py Sat May 29 14:43:34 2021 +0200 @@ -126,9 +126,10 @@ ("eric7 (Python {0}.{1}).lnk", os.path.join(getConfig("bindir"), "eric7.cmd"), os.path.join(getConfig("ericPixDir"), "eric7.ico")), - ("eric7 Browser (Python {0}.{1}).lnk", - os.path.join(getConfig("bindir"), "eric7_browser.cmd"), - os.path.join(getConfig("ericPixDir"), "ericWeb48.ico")), + # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released + #~ ("eric7 Browser (Python {0}.{1}).lnk", + #~ os.path.join(getConfig("bindir"), "eric7_browser.cmd"), # __IGNORE_WARNING__ + #~ os.path.join(getConfig("ericPixDir"), "ericWeb48.ico")), ] return [
--- a/scripts/install.py Fri May 28 17:50:00 2021 +0200 +++ b/scripts/install.py Sat May 29 14:43:34 2021 +0200 @@ -1859,7 +1859,7 @@ os.path.join(cfg["ericPixDir"], "eric7.ico")), # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released #~ ("eric7 Browser (Python {0}.{1}).lnk", - #~ os.path.join(cfg["bindir"], "eric7_browse.cmd"), # __IGNORE_WARNING__ + #~ os.path.join(cfg["bindir"], "eric7_browser.cmd"), # __IGNORE_WARNING__ #~ os.path.join(cfg["ericPixDir"], "ericWeb48.ico")), ]
