Update Putty and Firewall Prompts

Opticos · Aug 10, 2021 · 43ddcb2 · 43ddcb2
1 parent e4a6e5f
commit 43ddcb2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/GWSL_putty old.exe b/GWSL_putty old.exe
diff --git a/PUTTY/GWSL_putty.exe b/PUTTY/GWSL_putty.exe
diff --git a/assets/Licenses138.txt b/assets/Licenses138.txt
@@ -1,4 +1,4 @@
-GWSL 1.3.8 Licenses:
+GWSL 1.4.0 Licenses:
 
 Paul-E/Opticos Website:
 https://sites.google.com/bartimee.com/opticos-studios/home

diff --git a/build.py b/build.py
@@ -3,7 +3,7 @@
 import shutil
 from distutils.dir_util import copy_tree
 
-version = "139 MSIX build 4"
+version = "140 WIN32 build 1"
 
 
 print("\nBuilding Dashboard...")

diff --git a/manager.py b/manager.py
@@ -34,7 +34,7 @@
 import logging
 import ipaddress
 
-BUILD_MODE = "MSIX"  # MSIX or WIN32
+BUILD_MODE = "WIN32"  # MSIX or WIN32
 
 version = "1.4.0"
 
@@ -112,6 +112,7 @@ def filter(self, record):
 logger.addFilter(DuplicateFilter())
 
 updated = False
+new_install = False
 
 
 try:
@@ -120,6 +121,7 @@ def filter(self, record):
     if os.path.exists(app_path + "\\settings.json") == False:
         iset.create(app_path + "\\settings.json")
         print("creating settings")
+        new_install = True
     else:
         sett = iset.read()
         if "conf_ver" not in sett:
@@ -1152,9 +1154,9 @@ def about():
 
                             elif i == "Allow GWSL Through The Firewall": #TODO
                                 os.popen("control /name Microsoft.WindowsFirewall /page pageConfigureApps")
-                                pymsgbox.confirm(text=_('GWSL needs access through the Windows Firewall \
-                                                to communicate with WSL version 2. Please allow public access to "GWSL_vcxsrv.exe", \
-                                                "GWSL_vcxsrv_lowdpi.exe", and "pulseaudio.exe" for audio. You will need Admin Priviledges to do this.'),
+                                pymsgbox.confirm(text=_('GWSL needs access through the Windows Firewall '
+                                                'to communicate with WSL version 2. Please allow public access to "GWSL_vcxsrv.exe", '
+                                                '"GWSL_vcxsrv_lowdpi.exe", and "pulseaudio.exe" for audio. You will need Admin Priviledges to do this.'),
                                                  title=_('Allow GWSL Firewall Access'), buttons=["Ok"])
                             elif i == "GWSL Discord Server":
                                 webbrowser.get('windows-default').open("https://discord.com/invite/VkvNgkH")
@@ -4359,6 +4361,15 @@ def on_validate(self, new_value):
 if "--r" not in args: # start normally
     running = True
     service_loaded = False
+    if new_install == True:
+        ch = pymsgbox.confirm(text=_('Welcome to GWSL! '
+                                'Note: GWSL needs access through the Windows Firewall '
+                                'to communicate with WSL version 2. Please allow public access to "GWSL_vcxsrv.exe" and'
+                                '"pulseaudio.exe" for audio if Windows Firewall prompts appear. '
+                                'Missing this step is the most common cause of GWSL issues.'),
+                                 title=_('Allow GWSL Firewall Access'), buttons=["Ok", "Help"])
+        if ch == "Help":
+            webbrowser.open("https://opticos.github.io/gwsl/tutorials/manual.html#installing-gwsl")
     updater = threading.Thread(target=update_running)
     updater.daemon = True
     updater.start()
@@ -4403,18 +4414,19 @@ def on_validate(self, new_value):
 
         if updated == True:
             #os.popen("control /name Microsoft.WindowsFirewall /page pageConfigureApps")
-            ch = pymsgbox.confirm(text=_(f'GWSL was just updated to version {version}. \
-                            Sometimes after an update, GWSL firewall access is reset,\
-                            This is the most likely cause of issues after an update.\
-                            If GWSL does not work, re-allow it through the firewall with: \
-                            "GWSL Dashboard --> About --> Allow GWSL through the Firewall" \
-                            You can also ensure firewall access is enabled from here with "Check Now".'),
+            ch = pymsgbox.confirm(text=_(f'GWSL was just updated to version {version}. '
+                            'Sometimes after an update, GWSL firewall access is reset, '
+                            'This is the most likely cause of issues after an update. '
+                            'You may recieve the firewall prompts again. Be sure to check the public access box. '
+                            'If you miss these and/or GWSL does not work, re-allow it through the firewall with: '
+                            '"GWSL Dashboard --> About --> Allow GWSL through the Firewall". '
+                            'You can also ensure firewall access is enabled from here with "Check Now".'),
                              title=_('GWSL Updated Message'), buttons=["Ok", "Check Now"])
             if ch == "Check Now":
                 os.popen("control /name Microsoft.WindowsFirewall /page pageConfigureApps")
-                pymsgbox.confirm(text=_('GWSL needs access through the Windows Firewall \
-                                to communicate with WSL version 2. Please allow public access to "GWSL_vcxsrv.exe", \
-                                "GWSL_vcxsrv_lowdpi.exe", and "pulseaudio.exe" for audio. You will need Admin Priviledges to do this.'),
+                pymsgbox.confirm(text=_('GWSL needs access through the Windows Firewall '
+                                'to communicate with WSL version 2. Please allow public access to "GWSL_vcxsrv.exe", '
+                                '"GWSL_vcxsrv_lowdpi.exe", and "pulseaudio.exe" for audio. You will need Admin Priviledges to do this.'),
                                  title=_('Allow GWSL Firewall Access'), buttons=["Ok"])
         while True:
             try: