Mercurial Repositories > eric / changeset

--- a/eric7/Tools/TrayStarter.py	Fri Sep 24 20:12:16 2021 +0200
+++ b/eric7/Tools/TrayStarter.py	Sat Sep 25 16:02:59 2021 +0200
@@ -162,20 +162,18 @@
             self.tr("eric Shell Window"), self.__startShell)
         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()
+        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 Sep 24 20:12:16 2021 +0200
+++ b/eric7/eric7_post_install.py	Sat Sep 25 16:02:59 2021 +0200
@@ -95,11 +95,10 @@
          os.path.join(scriptsDir, "eric7.exe"),
          os.path.join(scriptsDir, "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(scriptsDir, "eric7_browser.exe"),  # __IGNORE_WARNING__
-        #~  os.path.join(scriptsDir, "ericWeb48.ico")       # __IGNORE_WARNING__
-        #~  ),
+        ("eric7 Browser (Python {0}.{1}).lnk",
+         os.path.join(scriptsDir, "eric7_browser.exe"),
+         os.path.join(scriptsDir, "ericWeb48.ico")
+         ),
     ]
     
     return [
@@ -158,9 +157,7 @@
         copyMetaFilesTree(os.path.join(srcDir, metaDir),
                           os.path.join(dstDir, metaDir))
     
-    # TODO: add 'eric7_browser.desktop' this once PyQt 6.2.0/Qt 6.2.0 is
-    #       released
-    for desktop in ["eric7.desktop"]:
+    for desktop in ["eric7.desktop", "eric7_browser.desktop"]:
         copyDesktopFile(
             os.path.join(srcDir, "applications", desktop),
             os.path.join(dstDir, "applications", desktop),

--- a/scripts/create_windows_links.py	Fri Sep 24 20:12:16 2021 +0200
+++ b/scripts/create_windows_links.py	Sat Sep 25 16:02:59 2021 +0200
@@ -126,10 +126,9 @@
         ("eric7 (Python {0}.{1}).lnk",
          os.path.join(getConfig("bindir"), "eric7.cmd"),
          os.path.join(getConfig("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(getConfig("bindir"), "eric7_browser.cmd"),     # __IGNORE_WARNING__
-        #~  os.path.join(getConfig("ericPixDir"), "ericWeb48.ico")),
+        ("eric7 Browser (Python {0}.{1}).lnk",
+         os.path.join(getConfig("bindir"), "eric7_browser.cmd"),
+         os.path.join(getConfig("ericPixDir"), "ericWeb48.ico")),
     ]
     
     return [

--- a/scripts/install.py	Fri Sep 24 20:12:16 2021 +0200
+++ b/scripts/install.py	Sat Sep 25 16:02:59 2021 +0200
@@ -577,10 +577,9 @@
             "/usr/share/pixmaps/eric.png",
             "/usr/share/icons/eric.png",
             
-            # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-            #~ "/usr/share/applications/eric7_browser.desktop",
-            #~ "/usr/share/pixmaps/ericWeb.png",
-            #~ "/usr/share/icons/ericWeb.png",
+            "/usr/share/applications/eric7_browser.desktop",
+            "/usr/share/pixmaps/ericWeb.png",
+            "/usr/share/icons/ericWeb.png",
         ]:
             if os.path.exists(name):
                 os.remove(name)
@@ -593,10 +592,9 @@
             "~/.local/share/pixmaps/eric.png",
             "~/.local/share/icons/eric.png",
             
-            # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-            #~ "~/.local/share/applications/eric7_browser.desktop",
-            #~ "~/.local/share/pixmaps/ericWeb.png",
-            #~ "~/.local/share/icons/ericWeb.png",
+            "~/.local/share/applications/eric7_browser.desktop",
+            "~/.local/share/pixmaps/ericWeb.png",
+            "~/.local/share/icons/ericWeb.png",
         ]:
             path = os.path.expanduser(name)
             if os.path.exists(path):
@@ -934,11 +932,9 @@
             os.makedirs(dst)
         copyDesktopFile(os.path.join(sourceDir, "linux", "eric7.desktop.in"),
                         os.path.join(dst, "eric7.desktop"))
-        # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-        if False:
-            copyDesktopFile(
-                os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
-                os.path.join(dst, "eric7_browser.desktop"))
+        copyDesktopFile(
+            os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
+            os.path.join(dst, "eric7_browser.desktop"))
         dst = os.path.normpath(
             os.path.join(distDir, "usr/share/metainfo"))
         if not os.path.exists(dst):
@@ -964,11 +960,9 @@
         shutilCopy(
             os.path.join(eric7SourceDir, "pixmaps", "ericWeb48_icon.png"),
             "/usr/share/icons/ericWeb.png")
-        # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-        if False:
-            copyDesktopFile(
-                os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
-                "/usr/share/applications/eric7_browser.desktop")
+        copyDesktopFile(
+            os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
+            "/usr/share/applications/eric7_browser.desktop")
     elif os.getuid() >= 1000:
         # it is assumed, that user ids start at 1000
         localPath = os.path.join(os.path.expanduser("~"),
@@ -995,12 +989,10 @@
         shutilCopy(
             os.path.join(eric7SourceDir, "pixmaps", "ericWeb48_icon.png"),
             os.path.join(localPath, "icons", "ericWeb.png"))
-        # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-        if False:
-            copyDesktopFile(
-                os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
-                os.path.join(localPath, "applications",
-                             "eric7_browser.desktop"))
+        copyDesktopFile(
+            os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
+            os.path.join(localPath, "applications",
+                         "eric7_browser.desktop"))
 
 
 def createWindowsLinks():
@@ -1498,17 +1490,15 @@
     try:
         from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
     except ImportError as msg:
-        # TODO: enable this once PyQt 6.2.0/Qt 6.2.0 is released
-        if False:
-            if isSudo:
-                print("Optional 'PyQt6-WebEngine' could not be detected.")
-            else:
-                pipInstall(
-                    "PyQt6-WebEngine>={0}".format(
-                        versionToStr(requiredVersions["pyqt6-webengine"])),
-                    "Optional 'PyQt6-WebEngine' could not be detected.\n"
-                    "Error: {0}".format(msg)
-                )
+        if isSudo:
+            print("Optional 'PyQt6-WebEngine' could not be detected.")
+        else:
+            pipInstall(
+                "PyQt6-WebEngine>={0}".format(
+                    versionToStr(requiredVersions["pyqt6-webengine"])),
+                "Optional 'PyQt6-WebEngine' could not be detected.\n"
+                "Error: {0}".format(msg)
+            )
     
     try:
         from PyQt6 import QtCharts    # __IGNORE_WARNING__
@@ -1846,10 +1836,9 @@
         ("eric7 (Python {0}.{1}).lnk",
          os.path.join(cfg["bindir"], "eric7.cmd"),
          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_browser.cmd"),    # __IGNORE_WARNING__
-        #~  os.path.join(cfg["ericPixDir"], "ericWeb48.ico")),
+        ("eric7 Browser (Python {0}.{1}).lnk",
+         os.path.join(cfg["bindir"], "eric7_browser.cmd"),
+         os.path.join(cfg["ericPixDir"], "ericWeb48.ico")),
     ]
     
     return [

--- a/setup.py	Fri Sep 24 20:12:16 2021 +0200
+++ b/setup.py	Sat Sep 25 16:02:59 2021 +0200
@@ -338,8 +338,7 @@
         "wheel",
         "PyQt6>=6.1.1",
         "PyQt6-Charts>=6.1.1",
-        # TODO: enable this line once PyQt 6.2 has been released
-        #~ "PyQt6-WebEngine>=6.2.0",        # __IGNORE_WARNING__
+        "PyQt6-WebEngine>=6.2.0",        # __IGNORE_WARNING__
         "PyQt6-QScintilla>=2.13.0",
         "docutils",
         "Markdown",
@@ -371,8 +370,7 @@
     entry_points={
         "gui_scripts": [
             "eric7 = eric7.eric7:main",
-            # TODO: enable this line once PyQt 6.2 has been released
-            #~ "eric7_browser = eric7.eric7_browser:main",      # __IGNORE_WARNING__
+            "eric7_browser = eric7.eric7_browser:main",
             "eric7_compare = eric7.eric7_compare:main",
             "eric7_configure = eric7.eric7_configure:main",
             "eric7_diff = eric7.eric7_diff:main",