Merge pull request 'Fix for allow ipv6' (#31) from 24-02-2025 into main

Reviewed-on: #31

.idea/workspace.xml

@@ -4,21 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change&#10;- optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets&#10;- add new Frame for Widgets on Bottom&#10;- optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Update Translate Files">
-      <change afterPath="$PROJECT_DIR$/lx-icons/128/error.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/128/info.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/256/error.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/256/info.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/32/error.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/32/info.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/48/error.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/48/info.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/64/error.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lx-icons/64/info.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cls_mth_fc.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,25 +44,25 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    "Python.INSTALL.executor": "Run",
+    &quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
-    "Python.install.executor": "Run",
+    &quot;Python.install.executor&quot;: &quot;Run&quot;,
-    "Python.main.executor": "Run",
+    &quot;Python.main.executor&quot;: &quot;Run&quot;,
-    "Python.messagebox.executor": "Run",
+    &quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
-    "Python.start_wg.executor": "Run",
+    &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
-    "Python.testtheme.executor": "Run",
+    &quot;Python.testtheme.executor&quot;: &quot;Run&quot;,
-    "Python.wg_func.executor": "Run",
+    &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
-    "Python.wg_main.executor": "Run",
+    &quot;Python.wg_main.executor&quot;: &quot;Run&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "Shell Script.install.executor": "Run",
+    &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
-    "Shell Script.run_as.executor": "Run",
+    &quot;Shell Script.run_as.executor&quot;: &quot;Run&quot;,
-    "git-widget-placeholder": "1.11.0824",
+    &quot;git-widget-placeholder&quot;: &quot;1.11.1024&quot;,
-    "last_opened_file_path": "/home/punix/Pyapps/wire-py/lx-icons",
+    &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
-    "settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors"
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.IDE.editor.colors&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/lx-icons" />
@@ -154,78 +142,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723279982210</updated>
     </task>
-    <task id="LOCAL-00020" summary="columnconfigure on all widgets set">
-      <option name="closed" value="true" />
-      <created>1724778892233</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1724778892233</updated>
-    </task>
-    <task id="LOCAL-00021" summary="little fixes a &quot; &quot; to ' '">
-      <option name="closed" value="true" />
-      <created>1725119445803</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1725119445803</updated>
-    </task>
-    <task id="LOCAL-00022" summary="add class FileHandle,&#10;add Label to show autoconnect Tunnel&#10;disable checkbox when Listbox is empty or no select Tunnel">
-      <option name="closed" value="true" />
-      <created>1725391658456</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1725391658456</updated>
-    </task>
-    <task id="LOCAL-00023" summary="add if question and add autoconnect, autoconnect_var to class Filehandle in box_set no finish!">
-      <option name="closed" value="true" />
-      <created>1725434328731</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1725434328731</updated>
-    </task>
-    <task id="LOCAL-00024" summary="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write">
-      <option name="closed" value="true" />
-      <created>1725475967338</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1725475967338</updated>
-    </task>
-    <task id="LOCAL-00025" summary="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)">
-      <option name="closed" value="true" />
-      <created>1725567453540</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1725567453540</updated>
-    </task>
-    <task id="LOCAL-00026" summary="little fixes">
-      <option name="closed" value="true" />
-      <created>1725639633873</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1725639633873</updated>
-    </task>
-    <task id="LOCAL-00027" summary="little fixes">
-      <option name="closed" value="true" />
-      <created>1725746027132</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1725746027132</updated>
-    </task>
-    <task id="LOCAL-00028" summary="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file">
-      <option name="closed" value="true" />
-      <created>1725820337669</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1725820337669</updated>
-    </task>
     <task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
       <option name="closed" value="true" />
       <created>1725991610908</created>
@@ -546,7 +462,79 @@
       <option name="project" value="LOCAL" />
       <updated>1731098372497</updated>
     </task>
-    <option name="localTasksCounter" value="69" />
+    <task id="LOCAL-00069" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
+      <option name="closed" value="true" />
+      <created>1731690583059</created>
+      <option name="number" value="00069" />
+      <option name="presentableId" value="LOCAL-00069" />
+      <option name="project" value="LOCAL" />
+      <updated>1731690583060</updated>
+    </task>
+    <task id="LOCAL-00070" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
+      <option name="closed" value="true" />
+      <created>1731836942211</created>
+      <option name="number" value="00070" />
+      <option name="presentableId" value="LOCAL-00070" />
+      <option name="project" value="LOCAL" />
+      <updated>1731836942212</updated>
+    </task>
+    <task id="LOCAL-00071" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731840048762</created>
+      <option name="number" value="00071" />
+      <option name="presentableId" value="LOCAL-00071" />
+      <option name="project" value="LOCAL" />
+      <updated>1731840048763</updated>
+    </task>
+    <task id="LOCAL-00072" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731840089956</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1731840089956</updated>
+    </task>
+    <task id="LOCAL-00073" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731840188277</created>
+      <option name="number" value="00073" />
+      <option name="presentableId" value="LOCAL-00073" />
+      <option name="project" value="LOCAL" />
+      <updated>1731840188278</updated>
+    </task>
+    <task id="LOCAL-00074" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731840383592</created>
+      <option name="number" value="00074" />
+      <option name="presentableId" value="LOCAL-00074" />
+      <option name="project" value="LOCAL" />
+      <updated>1731840383592</updated>
+    </task>
+    <task id="LOCAL-00075" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731841930614</created>
+      <option name="number" value="00075" />
+      <option name="presentableId" value="LOCAL-00075" />
+      <option name="project" value="LOCAL" />
+      <updated>1731841930615</updated>
+    </task>
+    <task id="LOCAL-00076" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731844213239</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1731844213239</updated>
+    </task>
+    <task id="LOCAL-00077" summary=" - Update Translate Files">
+      <option name="closed" value="true" />
+      <created>1731844339039</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1731844339039</updated>
+    </task>
+    <option name="localTasksCounter" value="78" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -577,8 +565,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="install rollback bash to py wirepy and wirepy rollback to py" />
-    <MESSAGE value="fix install and .desktop File Tar works now for user home and filebrowser.askfilebrowser start now in user home" />
     <MESSAGE value="replace tar with zip and Check if Zip file is empty" />
     <MESSAGE value="Create your own message boxes for export" />
     <MESSAGE value="chown Export File to 1000:1000" />
@@ -602,15 +588,17 @@
     <MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
     <MESSAGE value="- Optimize Class and Tooltip" />
     <MESSAGE value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change&#10;- optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets&#10;- add new Frame for Widgets on Bottom&#10;- optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
-    <option name="LAST_COMMIT_MESSAGE" value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change&#10;- optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets&#10;- add new Frame for Widgets on Bottom&#10;- optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
+    <MESSAGE value=" - - Fix Checkbutton Autostart when first install Wire-Py" />
+    <MESSAGE value=" - Update Translate Files" />
+    <option name="LAST_COMMIT_MESSAGE" value=" - Update Translate Files" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/start_wg.py</url>
+          <url>file://$PROJECT_DIR$/wg_main.py</url>
-          <line>1</line>
+          <line>1128</line>
-          <option name="timeStamp" value="2" />
+          <option name="timeStamp" value="3" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

Changelog

@@ -8,6 +8,17 @@ My standard System: Linux Mint 22 Cinnamon
  - for loops with lists replaced by List Comprehensions
  - Update search after start of Wire-Py
 
+  ### Added
+07-11-2024
+
+- remove classes and add methods to class FrameWidgets (removed self errors)
+
+
+  ### Added
+10-11-2024
+
+ - Fix Checkbutton Autostart when first install Wire-Py
+ - Update Translate Files
 
   ### Added
 10-11-2024

cls_mth_fc.py

@@ -12,7 +12,7 @@ from pathlib import Path
 from tkinter import ttk
 import requests
 
-APP = 'cls_mth_fc'
+APP = 'wirepy'
 LOCALE_DIR = "/usr/share/locale/"
 locale.bindtextdomain(APP, LOCALE_DIR)
 gettext.bindtextdomain(APP, LOCALE_DIR)
@@ -32,7 +32,6 @@ class GiteaUpdate:
     the taskbar image for the “Download OK” window, the taskbar image for the
     “Download error” window and the variable res
     """
-
     @staticmethod
     def api_down(update_api_url, version):
         try:
@@ -45,7 +44,7 @@ class GiteaUpdate:
                     if version[3:] != response_dict['tag_name']:
                         return response_dict['tag_name']
                     else:
-                        return _('No Updates')
+                        return 'No Updates'
                 else:
                     return 'False'
         except requests.exceptions.ConnectionError:
@@ -93,7 +92,6 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
     txt2 = Text for Button two
     com = function for Button command
     """
-
     msg = tk.Toplevel()
     msg.resizable(width=False, height=False)
     msg.title(w_title)
@@ -135,7 +133,6 @@ class Tunnel:
     The config file is packed into a dictionary,
     to display the values Address , DNS and Peer in the labels
     """
-
     @classmethod
     def con_to_dict(cls, file):
 
@@ -180,7 +177,6 @@ class Tunnel:
     """
     Shows the Active Tunnel
     """
-
     @staticmethod
     def active():
 
@@ -195,7 +191,6 @@ class Tunnel:
     """
     Shows all existing Wireguard tunnels
     """
-
     @staticmethod
     def list():
         wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
@@ -209,7 +204,6 @@ class Tunnel:
     A zipfile with current date and time is created
     in the user's home directory with correct right
     """
-
     @staticmethod
     def export():
         _u1 = str(_u[6:])

wg_main.py

@@ -14,7 +14,7 @@ from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, _u, wg_tips, wg_set)
 tcl_path = Path('/usr/share/TK-Themes')
 
 ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
-version = 'v. 1.11.1024'
+version = 'v. 2.02.2425'
 
 res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version)
 
@@ -427,8 +427,8 @@ class FrameWidgets(ttk.Frame):
                 self.l_box.delete(self.select_tunnel[0])
                 with open(wg_set, 'r') as set_file6:
                     lines6 = set_file6.readlines()
-                    if select_tl == lines6[7].strip() and 'off' not in lines6[7].strip():
+                    if select_tl == lines6[7].strip() and 'off\n' not in lines6[7].strip():
-                        lines6[7] = 'off'
+                        lines6[7] = 'off\n'
                         with open(wg_set, 'w') as set_file7:
                             set_file7.writelines(lines6)
                         self.selected_option.set(0)
@@ -649,7 +649,7 @@ class FrameWidgets(ttk.Frame):
                         self.StrVar.set(value=self.a)
                         with open(wg_set, 'r') as set_file5:
                             lines5 = set_file5.readlines()
-                        if select_tl == lines5[7].strip() and 'off' not in lines5[7].strip():
+                        if select_tl == lines5[7].strip() and 'off\n' not in lines5[7].strip():
                             lines5[7] = new_a_connect
                             with open(wg_set, 'w') as theme_set5:
                                 theme_set5.writelines(lines5)
@@ -906,7 +906,7 @@ class FrameWidgets(ttk.Frame):
             if self.selected_option.get() == 0:
                 with open(wg_set, 'r') as set_file3:
                     lines3 = set_file3.readlines()
-                    lines3[7] = 'off'
+                    lines3[7] = 'off\n'
                 with open(wg_set, 'w') as set_file3:
                     set_file3.writelines(lines3)
 
@@ -936,15 +936,16 @@ class FrameWidgets(ttk.Frame):
         with open(wg_set, 'r') as set_file4:
             lines4 = set_file4.readlines()
 
-        if lines4[7] != 'off':
+        if lines4[7] != 'off\n':
+            print(lines4[7])
             self.selected_option.set(1)
             self.autoconnect_var.set('')
             self.auto_con = lines4[7]
 
         else:
-
+            self.selected_option.set(0)
-            self.wg_autostart.configure(state='disabled')
             self.auto_con = _('no Autoconnect')
+
         self.autoconnect_var.set('')
         self.autoconnect_var = tk.StringVar()
         self.autoconnect_var.set(self.auto_con)