From 18e042400c1bfe07c3585d0f5e61a9c59cfa8a42 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Sat, 26 Oct 2024 12:35:18 +0200
Subject: [PATCH 1/5] - Optimize Class and Tooltip

---
 .idea/workspace.xml | 107 +++++-----
 Changelog           |   6 +
 testtheme.py        |  27 ---
 wg_func.py          | 154 +++++++--------
 wg_main.py          | 473 ++++++++++++++++++++++++++++----------------
 5 files changed, 431 insertions(+), 336 deletions(-)
 delete mode 100644 testtheme.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 16447c5..f798ee1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Fix a ConToDict Class when Endpoint not in Wireguard config file">
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Changelog" beforeDir="false" afterPath="$PROJECT_DIR$/Changelog" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/testtheme.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
@@ -48,24 +47,24 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
-    &quot;Python.install.executor&quot;: &quot;Run&quot;,
-    &quot;Python.main.executor&quot;: &quot;Run&quot;,
-    &quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
-    &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
-    &quot;Python.testtheme.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
-    &quot;Python.wg_main.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.editor&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "Python.INSTALL.executor": "Run",
+    "Python.install.executor": "Run",
+    "Python.main.executor": "Run",
+    "Python.messagebox.executor": "Run",
+    "Python.start_wg.executor": "Run",
+    "Python.testtheme.executor": "Run",
+    "Python.wg_func.executor": "Run",
+    "Python.wg_main.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "Shell Script.install.executor": "Run",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "/home/punix/Pyapps/wire-py",
+    "settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$" />
@@ -144,30 +143,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723279982210</updated>
     </task>
-    <task id="LOCAL-00013" summary="In FrameWidged Class else Block StrVar, this resorts reference and variable assignment together">
-      <option name="closed" value="true" />
-      <created>1724401340512</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1724401340512</updated>
-    </task>
-    <task id="LOCAL-00014" summary="add method  init_and_report and label_empty to Class ShowAddress">
-      <option name="closed" value="true" />
-      <created>1724410630021</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1724410630021</updated>
-    </task>
-    <task id="LOCAL-00015" summary="little fixes in Class Import">
-      <option name="closed" value="true" />
-      <created>1724416642213</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1724416642213</updated>
-    </task>
     <task id="LOCAL-00016" summary="fix label when laat Tunnel delete and fix Tuple error in delete and Start/Stop when listbox empty">
       <option name="closed" value="true" />
       <created>1724495688099</created>
@@ -536,7 +511,31 @@
       <option name="project" value="LOCAL" />
       <updated>1729353898830</updated>
     </task>
-    <option name="localTasksCounter" value="62" />
+    <task id="LOCAL-00062" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
+      <option name="closed" value="true" />
+      <created>1729541504291</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1729541504292</updated>
+    </task>
+    <task id="LOCAL-00063" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
+      <option name="closed" value="true" />
+      <created>1729541561434</created>
+      <option name="number" value="00063" />
+      <option name="presentableId" value="LOCAL-00063" />
+      <option name="project" value="LOCAL" />
+      <updated>1729541561434</updated>
+    </task>
+    <task id="LOCAL-00064" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
+      <option name="closed" value="true" />
+      <created>1729593628907</created>
+      <option name="number" value="00064" />
+      <option name="presentableId" value="LOCAL-00064" />
+      <option name="project" value="LOCAL" />
+      <updated>1729593628908</updated>
+    </task>
+    <option name="localTasksCounter" value="65" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -577,7 +576,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
     <MESSAGE value="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
     <MESSAGE value="fix a filedialog for hidden Files work&#10;install rollback to bash for start wirepy and wirepy rollback to bash" />
     <MESSAGE value="install rollback bash to py wirepy and wirepy rollback to py" />
@@ -602,22 +600,7 @@
     <MESSAGE value=" - Menu add &#10; - New Modern Dark and Light(default) Theme" />
     <MESSAGE value=" - Theme modify to water-theme&#10; - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu" />
     <MESSAGE value=" - Add Options, Help, Update Label and Update Menubutton &#10; - Theme now separate Light and Dark" />
-    <option name="LAST_COMMIT_MESSAGE" value=" - Add Options, Help, Update Label and Update Menubutton &#10; - Theme now separate Light and Dark" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/wg_func.py</url>
-          <line>341</line>
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/wg_main.py</url>
-          <line>273</line>
-          <option name="timeStamp" value="11" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
+    <option name="LAST_COMMIT_MESSAGE" value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Changelog b/Changelog
index 1bfdf2a..9d8a975 100644
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,12 @@ My standard System: Linux Mint 22 Cinnamon
  - Keeping Classes Together
 
 
+  ### Added
+25-10-2024
+
+- Optimize Class and Tooltip
+
+
   ### Added
 21-10-2024
 
diff --git a/testtheme.py b/testtheme.py
deleted file mode 100644
index fd3958d..0000000
--- a/testtheme.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import tkinter as tk
-from tkinter import ttk
-
-root = tk.Tk()
-
-# Pack a big frame so, it behaves like the window background
-big_frame = ttk.Frame(root)
-big_frame.pack(fill="both", expand=True)
-
-# Set the initial theme
-root.tk.call("source", "TK-Themes/azure.tcl")
-root.tk.call("set_theme", "light")
-
-def change_theme():
-    # NOTE: The theme's real name is azure-<mode>
-    if root.tk.call("ttk::style", "theme", "use") == "azure-dark":
-        # Set light theme
-        root.tk.call("set_theme", "light")
-    else:
-        # Set dark theme
-        root.tk.call("set_theme", "dark")
-
-# Remember, you have to use ttk widgets
-button = ttk.Button(big_frame, text="Change theme!", command=change_theme)
-button.pack()
-
-root.mainloop()
diff --git a/wg_func.py b/wg_func.py
index 9f07af3..01eb6a4 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -3,6 +3,7 @@
 import os
 import shutil
 import subprocess
+import time
 import tkinter as tk
 import zipfile
 from datetime import datetime
@@ -22,6 +23,7 @@ _u = Path.read_text(Path('/tmp/_u'))
 
 UPDATE_API_URL = 'https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases'
 
+tips = True
 
 class WirePyUpdate:
     @staticmethod
@@ -107,16 +109,25 @@ def msg_window(img_w, img_i, w_title, w_txt):
     msg.winfo_toplevel()
 
 
-class GreenLabel:
+class Tunnel:
+
     """
-    Show the active tunnel in green in the label
+    Show the active tunnel in green or yellow in the label
     """
 
     def __init__(self):
         self.StrVar = None
         self.lb_tunnel = None
+        self.lb_frame2 = None
+        self.lb_frame = None
+        self.endpoint = None
+        self.dns = None
+        self.address = None
+        self.enp = None
+        self.DNS = None
+        self.add = None
 
-    def green_show_label(self):
+    def color(self):
         with open(path_to_file3, 'r') as read_file:
             if 'light' in read_file:
                 self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
@@ -136,14 +147,13 @@ class GreenLabel:
         pass
 
 
-class ConToDict:
     """
     The config file is packed into a dictionary,
     to display the values Address , DNS and Peer in the labels
     """
 
     @classmethod
-    def covert_to_dict(cls, file):
+    def con_to_dict(cls, file):
 
         dictlist = []
         for lines in file.readlines():
@@ -184,7 +194,6 @@ class ConToDict:
         return address, dns, endpoint, pre_key
 
 
-class TunnelActiv:
     """
     Shows the Active Tunnel
     """
@@ -201,21 +210,11 @@ class TunnelActiv:
         return active
 
 
-class ShowAddress:
     """
     Displays the value address, DNS and peer in the labels
     or empty it again
     """
 
-    def __init__(self):
-        self.lb_frame2 = None
-        self.lb_frame = None
-        self.endpoint = None
-        self.dns = None
-        self.address = None
-        self.enp = None
-        self.DNS = None
-        self.add = None
 
     def init_and_report(self, data=None):
         """ Address Label """
@@ -248,13 +247,12 @@ class ShowAddress:
         self.endpoint.config(font=('Ubuntu', 9))
 
 
-class ListTunnels:
     """
     Shows all existing Wireguard tunnels
     """
 
     @staticmethod
-    def tl_list():
+    def list():
         wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
 
         ''' tl = Tunnel list # Show of 4.Element in list '''
@@ -262,6 +260,63 @@ class ListTunnels:
         return tl
 
 
+    """
+    This will export the tunnels.
+    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:])
+        now_time = datetime.now()
+        now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
+        tl = Tunnel.list()
+
+        try:
+            if len(tl) != 0:
+                wg_tar = str(_u) + '/' + now_datetime
+                shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
+                source = Path('/tmp/wire_py')
+                Path.unlink(Path(source) / 'wg_py', missing_ok=True)
+                Path.unlink(Path(source) / '.keys', missing_ok=True)
+                Path.unlink(Path(source) / 'settings', missing_ok=True)
+                Path.unlink(Path(source) / 'theme', missing_ok=True)
+                shutil.make_archive(wg_tar, 'zip', source)
+                shutil.chown(wg_tar + '.zip', 1000, 1000)
+                shutil.rmtree(source)
+                with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
+                    if len(zf.namelist()) != 0:
+
+                        """img_w, img_i, w_title, w_txt hand over"""
+                        iw = r'/usr/share/icons/wp-icons/64/info.png'
+                        ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
+                        wt = 'Export Successful'
+                        msg_t = 'Your zip file is in home directory'
+                        msg_window(iw, ii, wt, msg_t)
+
+                    else:
+
+                        """img_w, img_i, w_title, w_txt hand over"""
+                        iw = r'/usr/share/icons/wp-icons/64/error.png'
+                        ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                        wt = 'Export error'
+                        msg_t = 'Export failed! Please try again'
+                        msg_window(iw, ii, wt, msg_t)
+
+            else:
+
+                """img_w, img_i, w_title, w_txt hand over"""
+                iw = r'/usr/share/icons/wp-icons/64/info.png'
+                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                wt = 'Select tunnel'
+                msg_t = 'Please first import tunnel.'
+                msg_window(iw, ii, wt, msg_t)
+
+        except TypeError:
+            pass
+
+
 class FileHandle:
     """
     This class will display the autostart label which
@@ -287,7 +342,7 @@ class FileHandle:
 
             if self.selected_option.get() == 0:
                 Path.unlink(path_to_file)
-                tl = ListTunnels.tl_list()
+                tl = Tunnel.list()
 
                 if len(tl) == 0:
                     self.wg_autostart.configure(state='disabled')
@@ -337,64 +392,3 @@ class OnOff:
         self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var, foreground='#0071ff')
         self.autoconnect.config(font=('Ubuntu', 11))
         self.autoconnect.grid(column=0, row=4, sticky='ne', pady=19)
-
-
-class ExportTunnels:
-    """
-    This will export the tunnels.
-    A zipfile with current date and time is created
-    in the user's home directory with correct right
-    """
-
-    @staticmethod
-    def wg_export():
-        _u1 = str(_u[6:])
-        now_time = datetime.now()
-        now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
-        tl = ListTunnels.tl_list()
-
-        try:
-            if len(tl) != 0:
-                wg_tar = str(_u) + '/' + now_datetime
-                shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
-                source = Path('/tmp/wire_py')
-                Path.unlink(Path(source) / 'wg_py', missing_ok=True)
-                Path.unlink(Path(source) / '.keys', missing_ok=True)
-                Path.unlink(Path(source) / 'settings', missing_ok=True)
-                Path.unlink(Path(source) / 'theme', missing_ok=True)
-                shutil.make_archive(wg_tar, 'zip', source)
-                shutil.chown(wg_tar + '.zip', 1000, 1000)
-                shutil.rmtree(source)
-                with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
-                    if len(zf.namelist()) != 0:
-
-                        """img_w, img_i, w_title, w_txt hand over"""
-                        iw = r'/usr/share/icons/wp-icons/64/info.png'
-                        ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
-                        wt = 'Export Successful'
-                        msg_t = 'Your zip file is in home directory'
-                        msg_window(iw, ii, wt, msg_t)
-
-                    else:
-
-                        """img_w, img_i, w_title, w_txt hand over"""
-                        iw = r'/usr/share/icons/wp-icons/64/error.png'
-                        ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
-                        wt = 'Export error'
-                        msg_t = 'Export failed! Please try again'
-                        msg_window(iw, ii, wt, msg_t)
-
-            else:
-
-                """img_w, img_i, w_title, w_txt hand over"""
-                iw = r'/usr/share/icons/wp-icons/64/info.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
-                wt = 'Select tunnel'
-                msg_t = 'Please first import tunnel.'
-                msg_window(iw, ii, wt, msg_t)
-
-        except TypeError:
-            pass
-
-
-
diff --git a/wg_main.py b/wg_main.py
index cdf1c67..a872a36 100755
--- a/wg_main.py
+++ b/wg_main.py
@@ -8,13 +8,11 @@ from subprocess import check_call
 from tkinter import *
 from tkinter import filedialog, ttk
 
-from wg_func import (TunnelActiv, ListTunnels, ConToDict, GreenLabel, ShowAddress, FileHandle,
-                     ExportTunnels, OnOff, msg_window, WirePyUpdate, res, _u, version, path_to_file2,
-                     path_to_file3)
+from wg_func import (Tunnel, FileHandle, OnOff, msg_window, WirePyUpdate, res, _u, version, path_to_file2,
+                     path_to_file3, tips)
 
 tcl_path = Path('/usr/share/TK-Themes')
 
-
 class MainWindow(tk.Tk):
 
     def __init__(self, *args, **kwargs):
@@ -70,12 +68,17 @@ class MainWindow(tk.Tk):
                 with open(path_to_file3, 'w') as theme_set2:
                     theme_set2.write('dark')
 
-        def instruction():
+        def info():
             """img_w, img_i, w_title, w_txt hand over"""
             iw = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
             ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
             wt = 'Instruction'
-            msg_t = 'Here comes the instructions for Wire-Py'
+            msg_t = ('Wire-Py: Wireguard Gui for Linux systems.\n\n'
+                     'Wire-Py is open source software written in Python.\n\n'
+                     'Email: polunga40@unity-mail.de also likes for donation.\n\n'
+                     'https://git.ilunix.de/punix/Wire-P\n\n'
+                     'Use without warranty!\n')
+
             msg_window(iw, ii, wt, msg_t)
 
         ''' Frame for Menu '''
@@ -90,11 +93,11 @@ class MainWindow(tk.Tk):
         self.version_lb.config(font=('Ubuntu', 11), foreground='#00c4ff')
         self.version_lb.grid(column=0, row=0, padx=10)
 
-        def version_mouse_enter(event):
+        def version_enter(event):
             """ The mouse moves into the Version widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root, f'Version: {version[2:]}')
 
-        def version_mouse_leave(event):
+        def version_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
@@ -102,19 +105,19 @@ class MainWindow(tk.Tk):
         self.options_btn = ttk.Menubutton(self.menu_frame, text='Options')
         self.options_btn.grid(column=1, row=0)
 
-        def sets_mouse_enter(event):
+        def sets_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root, 'Click for Settings')
 
-        def sets_mouse_leave(event):
+        def sets_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        self.version_lb.bind('<Enter>', version_mouse_enter)
-        self.version_lb.bind('<Leave>', version_mouse_leave)
-        self.options_btn.bind('<Enter>', sets_mouse_enter)
-        self.options_btn.bind('<Leave>', sets_mouse_leave)
+        self.version_lb.bind('<Enter>', version_enter)
+        self.version_lb.bind('<Leave>', version_leave)
+        self.options_btn.bind('<Enter>', sets_enter)
+        self.options_btn.bind('<Leave>', sets_leave)
 
         set_option = tk.IntVar()
 
@@ -124,24 +127,24 @@ class MainWindow(tk.Tk):
         self.settings.add_command(label='Light', command=theme_change_light)
         self.settings.add_command(label='Dark', command=theme_change_dark)
 
-        ''' Help BTN Menu / Label '''
-        self.help_btn = ttk.Menubutton(self.menu_frame, text='Help')
-        self.help_btn.grid(column=2, row=0)
+        ''' About BTN Menu / Label '''
+        self.about_btn = ttk.Menubutton(self.menu_frame, text='About')
+        self.about_btn.grid(column=2, row=0)
 
-        def help_mouse_enter(event):
+        def about_enter(event):
             """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root, 'Click for Help')
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root, 'Click for Info')
 
-        def help_mouse_leave(event):
+        def about_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        self.help_btn.bind('<Enter>', help_mouse_enter)
-        self.help_btn.bind('<Leave>', help_mouse_leave)
+        self.about_btn.bind('<Enter>', about_enter)
+        self.about_btn.bind('<Leave>', about_leave)
         self.readme = tk.Menu(self)
-        self.help_btn.configure(menu=self.readme, style='Toolbutton')
-        self.readme.add_command(label='Instruction', command=instruction)
+        self.about_btn.configure(menu=self.readme, style='Toolbutton')
+        self.readme.add_command(label='Info', command=info)
 
         ''' Update Label '''
         self.updates_lb = ttk.Label(self.menu_frame)
@@ -151,34 +154,34 @@ class MainWindow(tk.Tk):
             set_option.set(value=1)
             self.updates_lb.configure(text='Update search off')
 
-            def disable_mouse_enter(event):
+            def disable_enter(event):
                 """ The mouse moves into the entry widget """
                 window.my_tool_tip = MyToolTip(event.x_root, event.y_root, 'Updates you have disabled')
 
-            def disable_mouse_leave(event):
+            def disable_leave(_):
                 """ The mouse moves from the entry widget """
                 ''' Remove Tool-Tip '''
                 window.my_tool_tip.destroy()
 
-            self.updates_lb.bind('<Enter>', disable_mouse_enter)
-            self.updates_lb.bind('<Leave>', disable_mouse_leave)
+            self.updates_lb.bind('<Enter>', disable_enter)
+            self.updates_lb.bind('<Leave>', disable_leave)
         elif res == 'No Internet Connection!':
             self.updates_lb.configure(text='No Server Connection!', foreground='red')
         elif res == 'No Updates':
             self.updates_lb.configure(text='No Updates')
 
-            def congratulations_mouse_enter(event):
+            def congratulations_enter(event):
                 """ The mouse moves into the entry widget """
                 window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                                'Congratulations! Wire-Py is up to date')
 
-            def congratulations_mouse_leave(event):
+            def congratulations_leave(_):
                 """ The mouse moves from the entry widget """
                 ''' Remove Tool-Tip '''
                 window.my_tool_tip.destroy()
 
-            self.updates_lb.bind('<Enter>', congratulations_mouse_enter)
-            self.updates_lb.bind('<Leave>', congratulations_mouse_leave)
+            self.updates_lb.bind('<Enter>', congratulations_enter)
+            self.updates_lb.bind('<Leave>', congratulations_leave)
         else:
             set_option.set(value=0)
             text = f'Update {res} available!'
@@ -188,18 +191,18 @@ class MainWindow(tk.Tk):
             self.update_btn = ttk.Menubutton(self.menu_frame, text=text)
             self.update_btn.grid(column=4, row=0, padx=0)
 
-            def download_mouse_enter(event):
+            def download_enter(event):
                 """ The mouse moves into the entry widget """
                 window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                                'Click to download new version')
 
-            def download_mouse_leave(event):
+            def download_leave(_):
                 """ The mouse moves from the entry widget """
                 ''' Remove Tool-Tip '''
                 window.my_tool_tip.destroy()
 
-            self.update_btn.bind('<Enter>', download_mouse_enter)
-            self.update_btn.bind('<Leave>', download_mouse_leave)
+            self.update_btn.bind('<Enter>', download_enter)
+            self.update_btn.bind('<Leave>', download_leave)
 
             self.download = tk.Menu(self)
 
@@ -209,7 +212,7 @@ class MainWindow(tk.Tk):
         FrameWidgets(self).grid()
 
 
-class StartStopBTN:
+class StSt:
     """
     Show Start and Stop Button in Label
     """
@@ -221,57 +224,58 @@ class StartStopBTN:
         self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
         self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
 
-    def button_stop(self):
+    def stop(self):
         self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, command=self.wg_switch, padding=0)
         self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
 
-        def stop_mouse_enter(event):
+        def stop_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'Click to stop selected Wireguard Tunnel')
 
-        def stop_mouse_leave(event):
+        def stop_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        self.btn_stst.bind('<Enter>', stop_mouse_enter)
-        self.btn_stst.bind('<Leave>', stop_mouse_leave)
+        self.btn_stst.bind('<Enter>', stop_enter)
+        self.btn_stst.bind('<Leave>', stop_leave)
 
-    def button_start(self):
+    def start(self):
         self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_start, command=self.wg_switch, padding=0)
         self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
 
-        def empty_list_start_mouse_enter(event):
+        def empty_list_start_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'No tunnels to start in the list')
 
-        def empty_list_start_mouse_leave(event):
+        def empty_list_start_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        def start_mouse_enter(event):
+        def start_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'Click to start selected Wireguard Tunnel')
 
-        def start_mouse_leave(event):
+        def start_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        tl = ListTunnels.tl_list()
+        tl = Tunnel.list()
         if len(tl) == 0:
-            self.btn_stst.bind('<Enter>', empty_list_start_mouse_enter)
-            self.btn_stst.bind('<Leave>', empty_list_start_mouse_leave)
+            self.btn_stst.bind('<Enter>', empty_list_start_enter)
+            self.btn_stst.bind('<Leave>', empty_list_start_leave)
         else:
-            self.btn_stst.bind('<Enter>', start_mouse_enter)
-            self.btn_stst.bind('<Leave>', start_mouse_leave)
+            self.btn_stst.bind('<Enter>', start_enter)
+            self.btn_stst.bind('<Leave>', start_leave)
 
 
-class ImportTunnel:
+# noinspection PyTypeChecker
+class TLImp:
     """
     Import Class for Wireguard config Files.
     Before importing, it is checked whether PrivateKey and PublicKey are in the file.
@@ -285,6 +289,10 @@ class ImportTunnel:
 
     def __init__(self):
 
+        self.lb_rename = None
+        self.btn_tr = None
+        self.btn_exp = None
+        self.wg_autostart = None
         self.select_tunnel = None
         self.wg_switch = None
         self.btn_stst = None
@@ -293,7 +301,7 @@ class ImportTunnel:
         self.a = None
         self.l_box = None
 
-    def wg_import_select(self):
+    def import_sl(self):
 
         try:
             filepath = filedialog.askopenfilename(initialdir=str(_u), title='Select Wireguard config File',
@@ -303,11 +311,11 @@ class ImportTunnel:
                 read = file.read()
             path_split = filepath.split('/')
             path_split1 = path_split[-1]
-            self.a = TunnelActiv.active()
+            self.a = Tunnel.active()
 
             if 'PrivateKey = ' in read and 'PublicKey = 'in read and 'Endpoint =' in read:
                 with open(filepath, 'r') as file:
-                    key = ConToDict.covert_to_dict(file)
+                    key = Tunnel.con_to_dict(file)
                     pre_key = key[3]
                     if len(pre_key) != 0:
                         with open('/etc/wire_py/.keys', 'r') as readfile:
@@ -330,8 +338,8 @@ class ImportTunnel:
                                         os.rename(p1, Path('/etc/wire_py') / str(path_split))
                                         new_conf = '/etc/wire_py/' + path_split
                                         if self.a != '':
-                                            check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
-                                            ShowAddress.label_empty(self)
+                                            check_call(['nmcli', 'connection', 'down', Tunnel.active()])
+                                            Tunnel.label_empty(self)
 
                                         subprocess.check_output(['nmcli', 'connection', 'import', 'type',
                                                                  'wireguard', 'file', new_conf], text=True)
@@ -339,30 +347,101 @@ class ImportTunnel:
                                     else:
                                         shutil.copy(filepath, Path('/etc/wire_py/'))
                                         if self.a != '':
-                                            check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
-                                            ShowAddress.label_empty(self)
+                                            check_call(['nmcli', 'connection', 'down', Tunnel.active()])
+                                            Tunnel.label_empty(self)
 
                                         subprocess.check_output(['nmcli', 'connection', 'import', 'type',
                                                                  'wireguard', 'file', filepath], text=True)
 
                                     self.StrVar.set('')
-                                    self.a = TunnelActiv.active()
+                                    self.a = Tunnel.active()
                                     self.l_box.insert(0, self.a)
+                                    self.wg_autostart.configure(state='normal')
+                                    self.l_box.selection_clear(0, tk.END)
                                     self.l_box.update()
+                                    self.l_box.selection_set(0)
+
+                                    def chk_a_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'To use the autostart, enable this '
+                                                                       'Checkbox')
+
+                                    def chk_a_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def list_info_enter(event):
+                                            """ The mouse moves into the entry widget """
+                                            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                           'List of available tunnels')
+
+                                    def list_info_leave(_):
+                                            """ The mouse moves from the entry widget """
+                                            ''' Remove Tool-Tip '''
+                                            window.my_tool_tip.destroy()
+
+                                    def del_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'Click to delete a Wireguard '
+                                                                       'Tunnel\nSelect from the list!')
+
+                                    def del_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def exp_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       '         Click to export '
+                                                                       'all\nWireguard Tunnel to Zipfile')
+
+                                    def exp_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def rename_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'To rename a tunnel, you need to\n'
+                                                                       'select a tunnel from the list')
+
+                                    def rename_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+
+                                    self.wg_autostart.bind('<Enter>', chk_a_enter)
+                                    self.wg_autostart.bind('<Leave>', chk_a_leave)
+                                    self.l_box.bind('<Enter>', list_info_enter)
+                                    self.l_box.bind('<Leave>', list_info_leave)
+                                    self.btn_tr.bind('<Enter>', del_enter)
+                                    self.btn_tr.bind('<Leave>', del_leave)
+                                    self.btn_exp.bind('<Enter>', exp_enter)
+                                    self.btn_exp.bind('<Leave>', exp_leave)
+                                    self.lb_rename.bind('<Enter>', rename_enter)
+                                    self.lb_rename.bind('<Leave>', rename_leave)
+                                    self.lb_rename.insert(0, 'Max. 12 characters!')
                                     self.StrVar = tk.StringVar()
                                     self.StrVar.set(self.a)
-                                    GreenLabel.green_show_label(self)
-                                    StartStopBTN.button_stop(self)
+                                    Tunnel.color(self)
+                                    StSt.stop(self)
                                     wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
                                     with open(wg_read, 'r') as file_for_key:
-                                        data = ConToDict.covert_to_dict(file_for_key)
+                                        data = Tunnel.con_to_dict(file_for_key)
 
                                     ''' Address Label '''
-                                    ShowAddress.init_and_report(self, data)
-                                    ShowAddress.show_data(self)
+                                    Tunnel.init_and_report(self, data)
+                                    Tunnel.show_data(self)
                                     check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
                                     Path.chmod(wg_read, 0o600)
 
+
             if 'PrivateKey = ' and 'Endpoint = ' not in read:
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/wp-icons/64/error.png'
@@ -382,6 +461,7 @@ class ImportTunnel:
             print('Tunnel exist!')
 
 
+# noinspection PyTypeChecker
 class FrameWidgets(ttk.Frame):
     def __init__(self, container, **kwargs):
         super().__init__(container, **kwargs)
@@ -403,7 +483,7 @@ class FrameWidgets(ttk.Frame):
         self.warning_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/64/error.png')
 
         ''' Show active Tunnel '''
-        self.a = TunnelActiv.active()
+        self.a = Tunnel.active()
 
         ''' Label Frame 1 '''
         self.lb_frame_btn_lbox = ttk.Frame(self)
@@ -436,7 +516,7 @@ class FrameWidgets(ttk.Frame):
 
         ''' Label to Show active Tunnel '''
         self.StrVar = tk.StringVar(value=self.a)
-        GreenLabel.green_show_label(self)
+        Tunnel.color(self)
 
         ''' Interface Label '''
         self.interface = ttk.Label(self.lb_frame, text='Interface')
@@ -450,21 +530,9 @@ class FrameWidgets(ttk.Frame):
 
         ''' Listbox with Scrollbar '''
 
+        def enable_check_box(_):
 
-        def box_info_mouse_enter(event):
-            """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                           'You must first import\na Wireguard tunnel')
-
-        def box_info_mouse_leave(event):
-            """ The mouse moves from the entry widget """
-            ''' Remove Tool-Tip '''
-            window.my_tool_tip.destroy()
-
-
-        def enable_check_box(event):
-
-            if len(tl) != 0:
+            if self.l_box.size() != 0:
                 self.wg_autostart.configure(state='normal')
                 self.lb_rename.config(state='normal')
                 self.lb_rename.delete(0, tk.END)
@@ -474,10 +542,6 @@ class FrameWidgets(ttk.Frame):
         self.l_box = tk.Listbox(self.lb_frame_btn_lbox, selectmode='single')
         self.l_box.config(relief='ridge', font=('Ubuntu', 12, 'bold'))
         self.l_box.grid(column=1, rowspan=4, row=0, sticky='ns')
-        tl = ListTunnels.tl_list()
-        if len(tl) == 0:
-            self.l_box.bind('<Enter>', box_info_mouse_enter)
-            self.l_box.bind('<Leave>', box_info_mouse_leave)
         self.l_box.event_add('<<ClickEvent>>', '<Button-1>')
         self.l_box.bind('<<ClickEvent>>', enable_check_box)
         self.scrollbar = ttk.Scrollbar(self.lb_frame_btn_lbox, orient='vertical', command=self.l_box.yview)
@@ -486,49 +550,76 @@ class FrameWidgets(ttk.Frame):
         self.rowconfigure(0, weight=1)
 
         ''' Tunnel List '''
-        self.tl = ListTunnels.tl_list()
+        self.tl = Tunnel.list()
         for tunnels in self.tl:
             self.l_box.insert("end", tunnels)
             self.l_box.update()
 
+        def list_empty_enter(event):
+            """ The mouse moves into the entry widget """
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                           'You must first import\na Wireguard tunnel')
+
+        def list_empty_leave(_):
+            """ The mouse moves from the entry widget """
+            ''' Remove Tool-Tip '''
+            window.my_tool_tip.destroy()
+
+        def list_not_empty_enter(event):
+            """ The mouse moves into the entry widget """
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root, 'Select a Tunnel')
+
+        def list_not_empty_leave(_):
+            """ The mouse moves from the entry widget """
+            ''' Remove Tool-Tip '''
+            window.my_tool_tip.destroy()
+
+        if self.l_box.size() == 0:
+            self.l_box.bind('<Enter>', list_empty_enter)
+            self.l_box.bind('<Leave>', list_empty_leave)
+        else:
+            self.l_box.bind('<Enter>', list_not_empty_enter)
+            self.l_box.bind('<Leave>', list_not_empty_leave)
+
+
         ''' Button Vpn '''
         if self.a != '':
-            StartStopBTN.button_stop(self)
+            StSt.stop(self)
             wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
             with open(wg_read, 'r') as file:
-                data = ConToDict.covert_to_dict(file)
+                data = Tunnel.con_to_dict(file)
 
             ''' Address Label '''
-            ShowAddress.init_and_report(self, data)
-            ShowAddress.show_data(self)
+            Tunnel.init_and_report(self, data)
+            Tunnel.show_data(self)
         else:
-            StartStopBTN.button_start(self)
+            StSt.start(self)
 
             ''' Address Label '''
             self.add = tk.StringVar()
             self.DNS = tk.StringVar()
             self.enp = tk.StringVar()
-            ShowAddress.label_empty(self)
-            ShowAddress.show_data(self)
+            Tunnel.label_empty(self)
+            Tunnel.show_data(self)
 
         ''' Button Import '''
         self.btn_i = ttk.Button(self.lb_frame_btn_lbox,
-                                image=self.imp_pic, command=lambda: ImportTunnel.wg_import_select(self),
+                                image=self.imp_pic, command=lambda: TLImp.import_sl(self),
                                 padding=0)
         self.btn_i.grid(column=0, row=1, padx=15, pady=8)
 
-        def import_mouse_enter(event):
+        def imp_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'Click to import a Wireguard Tunnel')
 
-        def import_mouse_leave(event):
+        def imp_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        self.btn_i.bind('<Enter>', import_mouse_enter)
-        self.btn_i.bind('<Leave>', import_mouse_leave)
+        self.btn_i.bind('<Enter>', imp_enter)
+        self.btn_i.bind('<Leave>', imp_leave)
 
         def delete():
 
@@ -536,7 +627,7 @@ class FrameWidgets(ttk.Frame):
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 with open('/etc/wire_py/' + select_tl + '.conf', 'r+') as file2:
-                    key = ConToDict.covert_to_dict(file2)
+                    key = Tunnel.con_to_dict(file2)
                     pre_key = key[3]
                 check_call(['nmcli', 'connection', 'delete', select_tl])
                 self.l_box.delete(self.select_tunnel[0])
@@ -546,7 +637,7 @@ class FrameWidgets(ttk.Frame):
                     if select_tl == a_con:
                         self.selected_option.set(0)
                         self.autoconnect_var.set('no Autoconnect')
-                        self.wg_autostart.configure(state='disabled')
+
                         Path.unlink(path_to_file)
                 Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
                 with open('/etc/wire_py/.keys', 'r') as readfile:
@@ -557,14 +648,39 @@ class FrameWidgets(ttk.Frame):
                 file_one = Path('/etc/wire_py/.keys2')
                 file_two = file_one.with_name('.keys')
                 file_one.replace(file_two)
+                self.wg_autostart.configure(state='disabled')
 
                 ''' for disable checkbox when Listbox empty '''
+                def empty_list_start_enter(event):
+                    """ The mouse moves into the entry widget """
+                    window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                   'No tunnels to start in the list')
 
-                if len(tl) == 0:
+                def empty_list_start_leave(_):
+                    """ The mouse moves from the entry widget """
+                    ''' Remove Tool-Tip '''
+                    window.my_tool_tip.destroy()
+
+                if self.l_box.size() == 0:
                     self.wg_autostart.configure(state='disabled')
+                    self.lb_rename.configure(state='disabled')
+                    self.l_box.bind('<Enter>', list_empty_enter)
+                    self.l_box.bind('<Leave>', list_empty_leave)
+                    self.wg_autostart.bind('<Enter>', chk_enter)
+                    self.wg_autostart.bind('<Leave>', chk_leave)
+                    self.btn_tr.bind('<Enter>', empty_list_enter)
+                    self.btn_tr.bind('<Leave>', empty_list_leave)
+                    self.btn_exp.bind('<Enter>', empty_list_enter)
+                    self.btn_exp.bind('<Leave>', empty_list_leave)
+                    self.btn_stst.bind('<Enter>', empty_list_start_enter)
+                    self.btn_stst.bind('<Leave>', empty_list_start_leave)
+                    self.lb_rename.bind('<Enter>', rename_no_active_enter)
+                    self.lb_rename.bind('<Leave>', rename_no_active_leave)
+                    self.lb_rename.insert(0, 'Max. 12 characters!')
+
                 if self.a != '' and self.a == select_tl:
                     self.StrVar.set(value='')
-                    StartStopBTN.button_start(self)
+                    StSt.start(self)
                     self.l_box.update()
 
                     ''' Address Label '''
@@ -572,9 +688,10 @@ class FrameWidgets(ttk.Frame):
                     self.DNS.set('')
                     self.enp.set('')
                 return select_tl
+
             except IndexError:
 
-                if len(tl) != 0:
+                if self.l_box.size() != 0:
 
                     """img_w, img_i, w_title, w_txt hand over"""
                     iw = r'/usr/share/icons/wp-icons/64/info.png'
@@ -597,94 +714,96 @@ class FrameWidgets(ttk.Frame):
                                  style='CButton.TButton')
         self.btn_tr.grid(column=0, row=2, padx=15, pady=8)
 
-        def empty_list_del_mouse_enter(event):
+        def empty_list_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'No tunnels to delete in the list')
 
-        def empty_list_del_mouse_leave(event):
+        def empty_list_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        def delete_mouse_enter(event):
+        def del_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'Click to delete a Wireguard Tunnel\nSelect from the list!')
 
-        def delete_mouse_leave(event):
+        def del_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        if len(tl) == 0:
-            self.btn_tr.bind('<Enter>', empty_list_del_mouse_enter)
-            self.btn_tr.bind('<Leave>', empty_list_del_mouse_leave)
+        if self.l_box.size() == 0:
+            self.btn_tr.bind('<Enter>', empty_list_enter)
+            self.btn_tr.bind('<Leave>', empty_list_leave)
         else:
-            self.btn_tr.bind('<Enter>', delete_mouse_enter)
-            self.btn_tr.bind('<Leave>', delete_mouse_leave)
+            self.btn_tr.bind('<Enter>', del_enter)
+            self.btn_tr.bind('<Leave>', del_leave)
 
         ''' Button Export '''
-        self.btn_exp = ttk.Button(self.lb_frame_btn_lbox, image=self.exp_pic, command=ExportTunnels.wg_export,
+        self.btn_exp = ttk.Button(self.lb_frame_btn_lbox, image=self.exp_pic, command=Tunnel.export,
                                   padding=0)
         self.btn_exp.grid(column=0, row=3, padx=15, pady=8)
-        def empty_list_mouse_enter(event):
+        def empty_list_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'No Tunnels in List for Export')
 
-        def empty_list_mouse_leave(event):
+        def empty_list_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        def export_mouse_enter(event):
+        def exp_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            '         Click to export all\nWireguard Tunnel to Zipfile')
 
-        def export_mouse_leave(event):
+        def exp_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        if len(tl) == 0:
-            self.btn_exp.bind('<Enter>', empty_list_mouse_enter)
-            self.btn_exp.bind('<Leave>', empty_list_mouse_leave)
+        if self.l_box.size() == 0:
+            self.btn_exp.bind('<Enter>', empty_list_enter)
+            self.btn_exp.bind('<Leave>', empty_list_leave)
         else:
-            self.btn_exp.bind('<Enter>', export_mouse_enter)
-            self.btn_exp.bind('<Leave>', export_mouse_leave)
+            self.btn_exp.bind('<Enter>', exp_enter)
+            self.btn_exp.bind('<Leave>', exp_leave)
 
         ''' Label Entry '''
         self.lb_rename = ttk.Entry(self, width=20)
         self.lb_rename.grid(column=2, row=4, padx=30, pady=15, sticky='nw')
         self.lb_rename.insert(0, 'Max. 12 characters!')
         self.lb_rename.config(state='disable')
-        def rename_mouse_enter(event):
-            """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                           'To rename a tunnel, you need to\nselect a tunnel from the list')
 
-        def rename_no_active_mouse_leave(event):
+        def rename_no_active_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        def rename_no_active_mouse_enter(event):
+        def rename_no_active_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'To rename a tunnel, at least one must be in the list')
 
-        def rename_mouse_leave(event):
+        def rename_enter(event):
+            """ The mouse moves into the entry widget """
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                           'To rename a tunnel, you need to\nselect a tunnel from the list')
+
+        def rename_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
-        if len(tl) != 0:
-            self.lb_rename.bind('<Enter>', rename_mouse_enter)
-            self.lb_rename.bind('<Leave>', rename_mouse_leave)
+
+        if self.l_box.size() != 0:
+            self.lb_rename.bind('<Enter>', rename_enter)
+            self.lb_rename.bind('<Leave>', rename_leave)
         else:
-            self.lb_rename.bind('<Enter>', rename_no_active_mouse_enter)
-            self.lb_rename.bind('<Leave>', rename_no_active_mouse_leave)
+            self.lb_rename.bind('<Enter>', rename_no_active_enter)
+            self.lb_rename.bind('<Leave>', rename_no_active_leave)
         def tl_rename():
             special_characters = ['\\', '/', '{', '}', ' ']
 
@@ -732,7 +851,7 @@ class FrameWidgets(ttk.Frame):
                     new_a_connect = self.lb_rename.get()
                     self.lb_rename.delete(0, tk.END)
                     if self.a != '' and self.a == select_tl:
-                        self.a = TunnelActiv.active()
+                        self.a = Tunnel.active()
                         self.StrVar.set(value=self.a)
                     if Path.is_file(Path('/etc/wire_py/wg_py')):
                         path_to_file = Path('/etc/wire_py') / 'wg_py'
@@ -740,6 +859,7 @@ class FrameWidgets(ttk.Frame):
                         if select_tl == a_con:
                             self.autoconnect_var.set(value=new_a_connect)
                             Path.write_text(path_to_file, new_a_connect)
+
                     return select_tl
 
                 except IndexError:
@@ -770,82 +890,98 @@ class FrameWidgets(ttk.Frame):
                                             variable=self.selected_option,
                                             command=lambda: FileHandle.box_set(self))
         self.wg_autostart.grid(column=0, row=4, pady=15, padx=15, sticky='nw')
-        def chk_mouse_enter(event):
+        def chk_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
                                            'You must have at least one\n'
                                            'tunnel in the list,to use the autostart')
 
-        def chk_mouse_leave(event):
+        def chk_leave(_):
             """ The mouse moves from the entry widget """
             ''' Remove Tool-Tip '''
             window.my_tool_tip.destroy()
 
-        if len(tl) == 0:
-            self.wg_autostart.bind('<Enter>', chk_mouse_enter)
-            self.wg_autostart.bind('<Leave>', chk_mouse_leave)
-        else:
-            def chk_a_mouse_enter(event):
+        if self.l_box.size() >= 1 and len(self.l_box.curselection()) >= 1:
+
+            def chk_a_enter(event):
                 """ The mouse moves into the entry widget """
                 window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                               'To use the autostart, a tunnel must be selected from the list')
+                                               'To use the autostart, enable this Checkbox')
 
-            def chk_a_mouse_leave(event):
+            def chk_a_leave(_):
                 """ The mouse moves from the entry widget """
                 ''' Remove Tool-Tip '''
                 window.my_tool_tip.destroy()
 
-            self.wg_autostart.bind('<Enter>', chk_a_mouse_enter)
-            self.wg_autostart.bind('<Leave>', chk_a_mouse_leave)
+            self.wg_autostart.bind('<Enter>', chk_a_enter)
+            self.wg_autostart.bind('<Leave>', chk_a_leave)
+
+
+        if self.l_box.size() == 0:
+            self.wg_autostart.bind('<Enter>', chk_enter)
+            self.wg_autostart.bind('<Leave>', chk_leave)
+        else:
+            def chk_a_enter(event):
+                """ The mouse moves into the entry widget """
+                window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                               'To use the autostart, a tunnel must be selected from the list')
+
+            def chk_a_leave(_):
+                """ The mouse moves from the entry widget """
+                ''' Remove Tool-Tip '''
+                window.my_tool_tip.destroy()
+
+            self.wg_autostart.bind('<Enter>', chk_a_enter)
+            self.wg_autostart.bind('<Leave>', chk_a_leave)
+
 
         OnOff.on_off(self)
 
     def wg_switch(self):
-        self.a = TunnelActiv.active()
+        self.a = Tunnel.active()
         try:
             if self.a == '':
 
-                StartStopBTN.button_start(self)
+                StSt.start(self)
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 check_call(['nmcli', 'connection', 'up', select_tl])
                 wg_read = Path('/etc/wire_py') / str(select_tl + '.conf')
                 with open(wg_read, 'r') as file:
-                    data = ConToDict.covert_to_dict(file)
+                    data = Tunnel.con_to_dict(file)
 
                 ''' Address Label '''
-                ShowAddress.init_and_report(self, data)
-                ShowAddress.show_data(self)
+                Tunnel.init_and_report(self, data)
+                Tunnel.show_data(self)
 
                 ''' Button Start/Stop '''
-                StartStopBTN.button_stop(self)
-                self.a = TunnelActiv.active()
+                StSt.stop(self)
+                self.a = Tunnel.active()
                 self.StrVar = tk.StringVar()
                 self.StrVar.set(self.a)
-                GreenLabel.green_show_label(self)
+                Tunnel.color(self)
 
             elif self.a != '':
 
                 ''' Button Start/Stop '''
-                StartStopBTN.button_stop(self)
+                StSt.stop(self)
                 check_call(['nmcli', 'connection', 'down', self.a])
 
                 ''' Button Start/Stop '''
-                StartStopBTN.button_start(self)
-                self.a = TunnelActiv.active()
+                StSt.start(self)
+                self.a = Tunnel.active()
                 self.StrVar.set('')
-                GreenLabel.green_show_label(self)
+                Tunnel.color(self)
 
                 ''' Address Label '''
                 self.add.set('')
                 self.DNS.set('')
                 self.enp.set('')
-                ShowAddress.show_data(self)
+                Tunnel.show_data(self)
 
         except IndexError:
 
-            tl = ListTunnels.tl_list()
-            if len(tl) != 0:
+            if self.l_box.size() != 0:
 
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/wp-icons/64/info.png'
@@ -865,11 +1001,14 @@ class FrameWidgets(ttk.Frame):
 
 
 class MyToolTip(tk.Toplevel):
-    TIP_X_OFFSET = 8
-    TIP_Y_OFFSET = 8
-    AUTO_CLEAR_TIME = 10  # Millisecond. (1/100 sec.)
+    TIP_X_OFFSET = 20
+    TIP_Y_OFFSET = 20
+    if not tips:
+        AUTO_CLEAR_TIME = 0
+    else:
+        AUTO_CLEAR_TIME = 900  # Millisecond. (1/90 sec.)
 
-    def __init__(self, x_pos, y_pos, message=None, auto_clear=False):
+    def __init__(self, x_pos, y_pos, message=None, auto_clear=True):
         self.x_pos = x_pos
         self.y_pos = y_pos
         self.message = message
@@ -878,7 +1017,7 @@ class MyToolTip(tk.Toplevel):
         tk.Toplevel.__init__(self)
         self.overrideredirect(True)
 
-        self.message_label = ttk.Label(self, compound='left', text=self.message, padding=4)
+        self.message_label = ttk.Label(self, compound='left', text=self.message, padding=6)
         self.message_label.pack()
 
         self.geometry("+%d+%d" % (self.x_pos + self.TIP_X_OFFSET,
-- 
2.45.2


From 9d44e7ab42d2c1ab4e2ef2265e460338b2f4b243 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Mon, 28 Oct 2024 07:13:44 +0100
Subject: [PATCH 2/5] - Add Autoconnect settings to settings.conf - Add run_as
 Bash script and open_gitea.py python script - Add Tooltip disable/enable -
 Rename settings to settings.conf for theme, updates and tooltip enable in one
 file

---
 .idea/workspace.xml |  76 +++++++++++++++----------
 Changelog           |  19 +++++--
 install             |  16 +++---
 run_as              |   2 +
 settings            |   1 -
 start_wg.py         |  14 +++--
 theme               |   1 -
 wg_func.py          |  71 ++++++++++++++++-------
 wg_main.py          | 133 +++++++++++++++++++++++++++-----------------
 9 files changed, 211 insertions(+), 122 deletions(-)
 create mode 100755 run_as
 delete mode 100644 settings
 delete mode 100644 theme

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f798ee1..0f8ea06 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- Optimize Class and Tooltip">
+      <change afterPath="$PROJECT_DIR$/run_as" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Changelog" beforeDir="false" afterPath="$PROJECT_DIR$/Changelog" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testtheme.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/settings" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/theme" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
     </list>
@@ -47,24 +51,25 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "Python.INSTALL.executor": "Run",
-    "Python.install.executor": "Run",
-    "Python.main.executor": "Run",
-    "Python.messagebox.executor": "Run",
-    "Python.start_wg.executor": "Run",
-    "Python.testtheme.executor": "Run",
-    "Python.wg_func.executor": "Run",
-    "Python.wg_main.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "Shell Script.install.executor": "Run",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "/home/punix/Pyapps/wire-py",
-    "settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
+    &quot;Python.install.executor&quot;: &quot;Run&quot;,
+    &quot;Python.main.executor&quot;: &quot;Run&quot;,
+    &quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
+    &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
+    &quot;Python.testtheme.executor&quot;: &quot;Run&quot;,
+    &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
+    &quot;Python.wg_main.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
+    &quot;Shell Script.run_as.executor&quot;: &quot;Run&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
+    &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$" />
@@ -143,14 +148,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723279982210</updated>
     </task>
-    <task id="LOCAL-00016" summary="fix label when laat Tunnel delete and fix Tuple error in delete and Start/Stop when listbox empty">
-      <option name="closed" value="true" />
-      <created>1724495688099</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1724495688099</updated>
-    </task>
     <task id="LOCAL-00017" summary="remove a ',' in DNS Name">
       <option name="closed" value="true" />
       <created>1724576599289</created>
@@ -535,7 +532,15 @@
       <option name="project" value="LOCAL" />
       <updated>1729593628908</updated>
     </task>
-    <option name="localTasksCounter" value="65" />
+    <task id="LOCAL-00065" summary="- Optimize Class and Tooltip">
+      <option name="closed" value="true" />
+      <created>1729938941026</created>
+      <option name="number" value="00065" />
+      <option name="presentableId" value="LOCAL-00065" />
+      <option name="project" value="LOCAL" />
+      <updated>1729938941027</updated>
+    </task>
+    <option name="localTasksCounter" value="66" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -576,7 +581,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
     <MESSAGE value="fix a filedialog for hidden Files work&#10;install rollback to bash for start wirepy and wirepy rollback to bash" />
     <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" />
@@ -601,6 +605,18 @@
     <MESSAGE value=" - Theme modify to water-theme&#10; - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu" />
     <MESSAGE value=" - Add Options, Help, Update Label and Update Menubutton &#10; - Theme now separate Light and Dark" />
     <MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
-    <option name="LAST_COMMIT_MESSAGE" value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
+    <MESSAGE value="- Optimize Class and Tooltip" />
+    <option name="LAST_COMMIT_MESSAGE" value="- Optimize Class and Tooltip" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/start_wg.py</url>
+          <line>1</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>
\ No newline at end of file
diff --git a/Changelog b/Changelog
index 9d8a975..8e3b619 100644
--- a/Changelog
+++ b/Changelog
@@ -4,12 +4,23 @@ My standard System: Linux Mint 22 Cinnamon
 ## [Unreleased]
 
  - os import in wg_func replaced by other methods
- - Guide to menu '?' with pictures
- - In Gitea Readme enter text, images
- - Own filedialog for import
  - If Wire-Py already runs, prevent further start
  - for loops with lists replaced by List Comprehensions
- - Keeping Classes Together
+ - Update search after start of Wire-Py
+
+
+  ### Added
+27-10-2024
+
+- Add Autoconnect settings to settings.conf
+
+
+  ### Added
+26-10-2024
+
+- Add run_as Bash script and open_gitea.py python script
+- Add Tooltip disable/enable
+- Rename settings to settings.conf for theme, updates and tooltip enable in one file
 
 
   ### Added
diff --git a/install b/install
index 7a967c4..e6af75c 100755
--- a/install
+++ b/install
@@ -7,8 +7,8 @@ BLUE='\033[30;1;34m'
 install_file_with(){
   clear
   sudo apt install python3-tk && \
-  sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
-  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings theme /etc/wire_py/ && \
+  sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
+  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /etc/wire_py/ && \
   sudo cp -uR wp-icons /usr/share/icons/ &&  sudo cp -uR TK-Themes /usr/share/ && \
   sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
   sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
@@ -21,8 +21,8 @@ install_file_with(){
 install_arch_d(){
   clear
   sudo pacman -S --noconfirm tk python3 python-requests && \
-  sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
-  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings theme /etc/wire_py/ && \
+  sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
+  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf  /etc/wire_py/ && \
   sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
   sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
   sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
@@ -89,9 +89,9 @@ elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
         if ! which python3-tkinter &> /dev/null
             then sudo dnf install python3-tkinter -y
 
-                sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
+                sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
                 sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
-                sudo cp -u settings theme /etc/wire_py/ && \
+                sudo cp -u settings.conf /etc/wire_py/ && \
                 sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
                 sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
                 sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
@@ -105,9 +105,9 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
     then
         if ! which python311-tk &> /dev/null
             then sudo zypper install python311-tk
-                 sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
+                 sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
                  sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
-                 sudo cp -u settings theme /etc/wire_py/ && \
+                 sudo cp -u settings.conf /etc/wire_py/ && \
                  sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
                  sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
                  sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
diff --git a/run_as b/run_as
new file mode 100755
index 0000000..d15cff4
--- /dev/null
+++ b/run_as
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/./open_gitea.py
\ No newline at end of file
diff --git a/settings b/settings
deleted file mode 100644
index 66cb652..0000000
--- a/settings
+++ /dev/null
@@ -1 +0,0 @@
-Update on
\ No newline at end of file
diff --git a/start_wg.py b/start_wg.py
index 41bb29b..3140e90 100755
--- a/start_wg.py
+++ b/start_wg.py
@@ -2,11 +2,13 @@
 from subprocess import check_call
 from pathlib import Path
 
-path_to_file = Path('/etc/wire_py/wg_py')
+path_to_file = Path('/etc/wire_py/settings.conf')
 
-if Path.exists(path_to_file):
-    a_con = Path.read_text(path_to_file)
-    check_call(['nmcli', 'connection', 'up', a_con])
-else:
-    pass
+with open(path_to_file, 'r') as a_con:
+    lines = a_con.readlines()
+    a_con = lines[7].strip()
+    if a_con != 'off':
+        check_call(['nmcli', 'connection', 'up', a_con])
+    else:
+        pass
 
diff --git a/theme b/theme
deleted file mode 100644
index b8b4ecb..0000000
--- a/theme
+++ /dev/null
@@ -1 +0,0 @@
-light
\ No newline at end of file
diff --git a/wg_func.py b/wg_func.py
index 01eb6a4..4bd0b2b 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -16,14 +16,11 @@ import requests
 ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
 version = 'v. 1.10.2124'
 
-path_to_file = Path('/etc/wire_py/wg_py')
-path_to_file2 = Path('/etc/wire_py/settings')
-path_to_file3 = Path('/etc/wire_py/theme')
+path_to_file2 = Path('/etc/wire_py/settings.conf')
 _u = Path.read_text(Path('/tmp/_u'))
 
 UPDATE_API_URL = 'https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases'
 
-tips = True
 
 class WirePyUpdate:
     @staticmethod
@@ -34,7 +31,7 @@ class WirePyUpdate:
             response_dict = response_dict[0]
             with open(path_to_file2, 'r') as set_file:
                 set_file = set_file.read()
-                if 'Update on' in set_file:
+                if 'on\n' in set_file:
                     if version[3:] != response_dict['tag_name']:
                         return response_dict['tag_name']
                     else:
@@ -78,7 +75,8 @@ class WirePyUpdate:
 res = WirePyUpdate.api_down()
 
 
-def msg_window(img_w, img_i, w_title, w_txt):
+
+def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
     """
     Function for different message windows for the user. with 4 arguments to be passed.
     To create messages with your own images, icons, and titles. As an alternative to Python Messagebox.
@@ -95,13 +93,25 @@ def msg_window(img_w, img_i, w_title, w_txt):
     msg.configure(pady=15, padx=15)
     msg.img = tk.PhotoImage(file=img_w)
     msg.i_window = tk.Label(msg, image=msg.img)
-    msg.i_window.grid(column=0, row=0)
+
     label = tk.Label(msg, text=w_txt)
-    label.config(font=('Ubuntu', 11), padx=15)
+
     label.grid(column=1, row=0)
-    button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
-    button.config()
-    button.grid(column=0, columnspan=2, row=1)
+
+    if txt2 != None and com != None:
+        label.config(font=('Ubuntu', 11), padx=15, justify='left')
+        msg.i_window.grid(column=0, row=0, sticky='nw')
+        button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
+        button2.grid(column=0, row=1, sticky='e', columnspan=2)
+        button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
+        button.grid(column=0, row=1, sticky='w', columnspan=2)
+
+    else:
+        label.config(font=('Ubuntu', 11), padx=15)
+        msg.i_window.grid(column=0, row=0)
+        button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
+        button.grid(column=0, columnspan=2, row=1)
+
     img_i = tk.PhotoImage(file=img_i)
     msg.iconphoto(True, img_i)
     msg.columnconfigure(0, weight=1)
@@ -128,8 +138,9 @@ class Tunnel:
         self.add = None
 
     def color(self):
-        with open(path_to_file3, 'r') as read_file:
-            if 'light' in read_file:
+        with open(path_to_file2, 'r') as read_file:
+            lines = read_file.readlines()
+            if 'light\n' in lines:
                 self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
 
             else:
@@ -280,8 +291,7 @@ class Tunnel:
                 source = Path('/tmp/wire_py')
                 Path.unlink(Path(source) / 'wg_py', missing_ok=True)
                 Path.unlink(Path(source) / '.keys', missing_ok=True)
-                Path.unlink(Path(source) / 'settings', missing_ok=True)
-                Path.unlink(Path(source) / 'theme', missing_ok=True)
+                Path.unlink(Path(source) / 'settings.conf', missing_ok=True)
                 shutil.make_archive(wg_tar, 'zip', source)
                 shutil.chown(wg_tar + '.zip', 1000, 1000)
                 shutil.rmtree(source)
@@ -316,6 +326,16 @@ class Tunnel:
         except TypeError:
             pass
 
+    @staticmethod
+    def if_tip():
+        with open(path_to_file2, 'r') as set_file2:
+                lines2 = set_file2.readlines()
+                if 'False\n' in lines2:
+                    return False
+                else:
+                    return True
+
+tips = Tunnel.if_tip()
 
 class FileHandle:
     """
@@ -341,14 +361,23 @@ class FileHandle:
             select_tl = self.l_box.get(select_tunnel[0])
 
             if self.selected_option.get() == 0:
-                Path.unlink(path_to_file)
+                with open(path_to_file2, 'r') as set_file3:
+                    lines3 = set_file3.readlines()
+                    lines3[7] = 'off'
+                with open(path_to_file2, 'w') as set_file3:
+                    set_file3.writelines(lines3)
+
                 tl = Tunnel.list()
 
                 if len(tl) == 0:
                     self.wg_autostart.configure(state='disabled')
 
             if self.selected_option.get() >= 1:
-                Path.write_text(path_to_file, select_tl)
+                with open(path_to_file2, 'r') as set_file3:
+                    lines3 = set_file3.readlines()
+                    lines3[7] = select_tl
+                with open(path_to_file2, 'w') as set_file3:
+                    set_file3.writelines(lines3)
 
         except IndexError:
             self.selected_option.set(1)
@@ -373,13 +402,13 @@ class OnOff:
         self.lb_frame_buttons = None
 
     def on_off(self):
+        with open(path_to_file2, 'r') as set_file4:
+            lines4 = set_file4.readlines()
 
-        if Path.exists(path_to_file):
+        if lines4[7] != 'off':
             self.selected_option.set(1)
             self.autoconnect_var.set('')
-            if not Path.is_dir(Path('/etc/wire_py')):
-                Path.mkdir(Path('/etc/wire_py'))
-            self.auto_con = Path.read_text(path_to_file)
+            self.auto_con = lines4[7]
 
         else:
 
diff --git a/wg_main.py b/wg_main.py
index a872a36..02599da 100755
--- a/wg_main.py
+++ b/wg_main.py
@@ -8,8 +8,7 @@ from subprocess import check_call
 from tkinter import *
 from tkinter import filedialog, ttk
 
-from wg_func import (Tunnel, FileHandle, OnOff, msg_window, WirePyUpdate, res, _u, version, path_to_file2,
-                     path_to_file3, tips)
+from wg_func import (Tunnel, FileHandle, OnOff, msg_window, WirePyUpdate, res, _u, version, path_to_file2, tips)
 
 tcl_path = Path('/usr/share/TK-Themes')
 
@@ -31,8 +30,9 @@ class MainWindow(tk.Tk):
         self.style = ttk.Style(self)
         self.tk.call('source', str(tcl_path) + '/water.tcl')
         #self.tk.call('source', 'TK-Themes/water.tcl')
-        with open(path_to_file3, 'r') as read_file:
-            if 'light' in read_file:
+        with open(path_to_file2, 'r') as read_file:
+            lines = read_file.readlines()
+            if 'light\n' in lines:
                 self.tk.call('set_theme', 'light')
             else:
                 self.tk.call('set_theme', 'dark')
@@ -44,42 +44,77 @@ class MainWindow(tk.Tk):
         self.iconphoto(True, self.wg_icon)
 
         #Set on or off in file
-        def on_off():
-            if set_option.get() == 1:
+        def update():
+            if set_update.get() == 1:
+                with open(path_to_file2, 'r') as set_file2:
+                    lines2  = set_file2.readlines()
+                    lines2[1] = 'off\n'
                 with open(path_to_file2, 'w') as set_file2:
-                    set_file2.write('Update off')
+                    set_file2.writelines(lines2)
 
-            if set_option.get() == 0:
+            if set_update.get() == 0:
+                with open(path_to_file2, 'r') as set_file2:
+                    lines2  = set_file2.readlines()
+                    lines2[1] = 'on\n'
                 with open(path_to_file2, 'w') as set_file2:
-                    set_file2.write('Update on')
+                    set_file2.writelines(lines2)
+
+        #Set on or off in file
+        def tooltip():
+            if set_tip.get():
+                print(set_tip.get())
+                with open(path_to_file2, 'r') as set_file2:
+                    lines2  = set_file2.readlines()
+                    lines2[5] = 'False\n'
+                with open(path_to_file2, 'w') as set_file2:
+                    set_file2.writelines(lines2)
+
+            else:
+                with open(path_to_file2, 'r') as set_file2:
+                    lines2  = set_file2.readlines()
+                    lines2[5] = 'True\n'
+                with open(path_to_file2, 'w') as set_file2:
+                    set_file2.writelines(lines2)
 
         # Set dark or light
         def theme_change_light():
             if self.tk.call("ttk::style", "theme", "use") == "water-dark":
                 # Set light theme
                 self.tk.call('set_theme', 'light')
-                with open(path_to_file3, 'w') as theme_set2:
-                    theme_set2.write('light')
+                with open(path_to_file2, 'r') as theme_set2:
+                    lines3  = theme_set2.readlines()
+                    lines3[3] = 'light\n'
+                with open(path_to_file2, 'w') as theme_set2:
+                    theme_set2.writelines(lines3)
 
         def theme_change_dark():
             if not self.tk.call("ttk::style", "theme", "use") == "water-dark":
                 # Set dark theme
                 self.tk.call('set_theme', 'dark')
-                with open(path_to_file3, 'w') as theme_set2:
-                    theme_set2.write('dark')
+                with open(path_to_file2, 'r') as theme_set2:
+                    lines4  = theme_set2.readlines()
+                    lines4[3] = 'dark\n'
+                with open(path_to_file2, 'w') as theme_set2:
+                    theme_set2.writelines(lines4)
 
         def info():
-            """img_w, img_i, w_title, w_txt hand over"""
+            def link_btn():
+                _u1 = str(_u[6:])
+                path_to_file = Path('/usr/bin/./run_as')
+                check_call(['su', _u1, path_to_file])
+
+            """img_w, img_i, w_title, w_txt , txt2, com hand over"""
             iw = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
             ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
-            wt = 'Instruction'
-            msg_t = ('Wire-Py: Wireguard Gui for Linux systems.\n\n'
+            wt = 'Info'
+            msg_t = ('Wire-Py a simple Wireguard Gui for Linux systems.\n\n'
                      'Wire-Py is open source software written in Python.\n\n'
                      'Email: polunga40@unity-mail.de also likes for donation.\n\n'
-                     'https://git.ilunix.de/punix/Wire-P\n\n'
                      'Use without warranty!\n')
+            txt2 = 'Go to Wire-Py git'
+            com = link_btn
 
-            msg_window(iw, ii, wt, msg_t)
+            msg_window(iw, ii, wt, msg_t, txt2, com)
 
         ''' Frame for Menu '''
         self.menu_frame = ttk.Frame(self)
@@ -119,39 +154,34 @@ class MainWindow(tk.Tk):
         self.options_btn.bind('<Enter>', sets_enter)
         self.options_btn.bind('<Leave>', sets_leave)
 
-        set_option = tk.IntVar()
-
-        self.settings = tk.Menu(self)
+        set_update = tk.IntVar()
+        set_tip = tk.BooleanVar()
+        self.settings = tk.Menu(self, relief='flat')
         self.options_btn.configure(menu=self.settings, style='Toolbutton')
-        self.settings.add_checkbutton(label='Disable updates', command=on_off, variable=set_option)
+        self.settings.add_checkbutton(label='Disable Updates', command=update, variable=set_update)
+        self.settings.add_checkbutton(label='Disable Tooltips', command=tooltip, variable=set_tip)
         self.settings.add_command(label='Light', command=theme_change_light)
         self.settings.add_command(label='Dark', command=theme_change_dark)
 
         ''' About BTN Menu / Label '''
-        self.about_btn = ttk.Menubutton(self.menu_frame, text='About')
+        self.about_btn = ttk.Button(self.menu_frame, text='About', style='Toolbutton', command=info)
         self.about_btn.grid(column=2, row=0)
 
-        def about_enter(event):
-            """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root, 'Click for Info')
-
-        def about_leave(_):
-            """ The mouse moves from the entry widget """
-            ''' Remove Tool-Tip '''
-            window.my_tool_tip.destroy()
-
-        self.about_btn.bind('<Enter>', about_enter)
-        self.about_btn.bind('<Leave>', about_leave)
         self.readme = tk.Menu(self)
-        self.about_btn.configure(menu=self.readme, style='Toolbutton')
-        self.readme.add_command(label='Info', command=info)
 
-        ''' Update Label '''
+        ''' Update and Tooltip Label '''
         self.updates_lb = ttk.Label(self.menu_frame)
         self.updates_lb.grid(column=3, row=0, padx=10)
 
+        '''View Checkbox for enable or disable Tooltip '''
+        if tips:
+            set_tip.set(value=False)
+        else:
+            set_tip.set(value=True)
+
+        '''View Checkbox for enable or disable Updates '''
         if res == 'False':
-            set_option.set(value=1)
+            set_update.set(value=1)
             self.updates_lb.configure(text='Update search off')
 
             def disable_enter(event):
@@ -183,11 +213,10 @@ class MainWindow(tk.Tk):
             self.updates_lb.bind('<Enter>', congratulations_enter)
             self.updates_lb.bind('<Leave>', congratulations_leave)
         else:
-            set_option.set(value=0)
+            set_update.set(value=0)
             text = f'Update {res} available!'
 
             ''' Update BTN Menu'''
-
             self.update_btn = ttk.Menubutton(self.menu_frame, text=text)
             self.update_btn.grid(column=4, row=0, padx=0)
 
@@ -204,7 +233,7 @@ class MainWindow(tk.Tk):
             self.update_btn.bind('<Enter>', download_enter)
             self.update_btn.bind('<Leave>', download_leave)
 
-            self.download = tk.Menu(self)
+            self.download = tk.Menu(self, relief='flat')
 
             self.update_btn.configure(menu=self.download, style='Toolbutton')
             self.download.add_command(label='Download', command=WirePyUpdate.download)
@@ -631,14 +660,15 @@ class FrameWidgets(ttk.Frame):
                     pre_key = key[3]
                 check_call(['nmcli', 'connection', 'delete', select_tl])
                 self.l_box.delete(self.select_tunnel[0])
-                if Path.is_file(Path('/etc/wire_py/wg_py')):
-                    path_to_file = Path('/etc/wire_py') / 'wg_py'
-                    a_con = Path.read_text(path_to_file)
-                    if select_tl == a_con:
+                with open(path_to_file2, 'r') as set_file6:
+                    lines6 = set_file6.readlines()
+                    if select_tl == lines6[7].strip() and not 'off' in lines6[7].strip():
+                        lines6[7] = 'off'
+                        with open(path_to_file2, 'w') as set_file7:
+                            set_file7.writelines(lines6)
                         self.selected_option.set(0)
                         self.autoconnect_var.set('no Autoconnect')
 
-                        Path.unlink(path_to_file)
                 Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
                 with open('/etc/wire_py/.keys', 'r') as readfile:
                     with open('/etc/wire_py/.keys2', 'w') as writefile:
@@ -853,12 +883,13 @@ class FrameWidgets(ttk.Frame):
                     if self.a != '' and self.a == select_tl:
                         self.a = Tunnel.active()
                         self.StrVar.set(value=self.a)
-                    if Path.is_file(Path('/etc/wire_py/wg_py')):
-                        path_to_file = Path('/etc/wire_py') / 'wg_py'
-                        a_con = Path.read_text(path_to_file)
-                        if select_tl == a_con:
+                        with open(path_to_file2, 'r') as set_file5:
+                            lines5 = set_file5.readlines()
+                        if select_tl == lines5[7].strip() and not 'off' in lines5[7].strip():
+                            lines5[7] = new_a_connect
+                            with open(path_to_file2, 'w') as theme_set5:
+                                theme_set5.writelines(lines5)
                             self.autoconnect_var.set(value=new_a_connect)
-                            Path.write_text(path_to_file, new_a_connect)
 
                     return select_tl
 
-- 
2.45.2


From fecbf2ab46eb08d84bc7ef0e1339275784edf522 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Mon, 28 Oct 2024 07:14:39 +0100
Subject: [PATCH 3/5] - Add Autoconnect settings to settings.conf - Add run_as
 Bash script and open_gitea.py python script - Add Tooltip disable/enable -
 Rename settings to settings.conf for theme, updates and tooltip enable in one
 file

---
 open_gitea.py | 5 +++++
 settings.conf | 8 ++++++++
 2 files changed, 13 insertions(+)
 create mode 100755 open_gitea.py
 create mode 100644 settings.conf

diff --git a/open_gitea.py b/open_gitea.py
new file mode 100755
index 0000000..4fdbad1
--- /dev/null
+++ b/open_gitea.py
@@ -0,0 +1,5 @@
+#!/usr/bin/python3
+
+import webbrowser
+
+webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
\ No newline at end of file
diff --git a/settings.conf b/settings.conf
new file mode 100644
index 0000000..c0aaccd
--- /dev/null
+++ b/settings.conf
@@ -0,0 +1,8 @@
+[UPDATES]
+on
+[THEME]
+light
+[TOOLTIP]
+True
+[AUTOSTART ON]
+off
-- 
2.45.2


From 414a36b436b6ccc4581ca98617a81ec919170ef8 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Thu, 7 Nov 2024 17:15:35 +0100
Subject: [PATCH 4/5] small corrections

---
 wg_func.py |  8 -------
 wg_main.py | 62 ++++++++++++++++++++++++------------------------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/wg_func.py b/wg_func.py
index 4bd0b2b..9b225cb 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -148,14 +148,6 @@ class Tunnel:
 
         self.lb_tunnel.config(font=('Ubuntu', 11, 'bold'))
         self.lb_tunnel.grid(column=2, padx=10, row=1)
-        self.columnconfigure(2, weight=1)
-        self.rowconfigure(0, weight=1)
-
-    def columnconfigure(self, param, weight):
-        pass
-
-    def rowconfigure(self, param, weight):
-        pass
 
 
     """
diff --git a/wg_main.py b/wg_main.py
index 02599da..43dd7ff 100755
--- a/wg_main.py
+++ b/wg_main.py
@@ -12,6 +12,7 @@ from wg_func import (Tunnel, FileHandle, OnOff, msg_window, WirePyUpdate, res, _
 
 tcl_path = Path('/usr/share/TK-Themes')
 
+
 class MainWindow(tk.Tk):
 
     def __init__(self, *args, **kwargs):
@@ -29,7 +30,7 @@ class MainWindow(tk.Tk):
         self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
         self.style = ttk.Style(self)
         self.tk.call('source', str(tcl_path) + '/water.tcl')
-        #self.tk.call('source', 'TK-Themes/water.tcl')
+        ''' self.tk.call('source', 'TK-Themes/water.tcl') '''
         with open(path_to_file2, 'r') as read_file:
             lines = read_file.readlines()
             if 'light\n' in lines:
@@ -40,59 +41,58 @@ class MainWindow(tk.Tk):
         ''' Load the image file from disk. '''
         self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn.png')
 
-        # Set it as the window icon.
+        ''' Set it as the window icon '''
         self.iconphoto(True, self.wg_icon)
 
-        #Set on or off in file
+        ''' Set on or off in file '''
         def update():
             if set_update.get() == 1:
                 with open(path_to_file2, 'r') as set_file2:
-                    lines2  = set_file2.readlines()
+                    lines2 = set_file2.readlines()
                     lines2[1] = 'off\n'
                 with open(path_to_file2, 'w') as set_file2:
                     set_file2.writelines(lines2)
 
             if set_update.get() == 0:
                 with open(path_to_file2, 'r') as set_file2:
-                    lines2  = set_file2.readlines()
+                    lines2 = set_file2.readlines()
                     lines2[1] = 'on\n'
                 with open(path_to_file2, 'w') as set_file2:
                     set_file2.writelines(lines2)
 
-        #Set on or off in file
+        ''' Set on or off in file '''
         def tooltip():
             if set_tip.get():
-                print(set_tip.get())
                 with open(path_to_file2, 'r') as set_file2:
-                    lines2  = set_file2.readlines()
+                    lines2 = set_file2.readlines()
                     lines2[5] = 'False\n'
                 with open(path_to_file2, 'w') as set_file2:
                     set_file2.writelines(lines2)
 
             else:
                 with open(path_to_file2, 'r') as set_file2:
-                    lines2  = set_file2.readlines()
+                    lines2 = set_file2.readlines()
                     lines2[5] = 'True\n'
                 with open(path_to_file2, 'w') as set_file2:
                     set_file2.writelines(lines2)
 
-        # Set dark or light
+        ''' Set dark or light '''
         def theme_change_light():
             if self.tk.call("ttk::style", "theme", "use") == "water-dark":
-                # Set light theme
+                ''' Set light theme '''
                 self.tk.call('set_theme', 'light')
                 with open(path_to_file2, 'r') as theme_set2:
-                    lines3  = theme_set2.readlines()
+                    lines3 = theme_set2.readlines()
                     lines3[3] = 'light\n'
                 with open(path_to_file2, 'w') as theme_set2:
                     theme_set2.writelines(lines3)
 
         def theme_change_dark():
             if not self.tk.call("ttk::style", "theme", "use") == "water-dark":
-                # Set dark theme
+                ''' Set dark theme '''
                 self.tk.call('set_theme', 'dark')
                 with open(path_to_file2, 'r') as theme_set2:
-                    lines4  = theme_set2.readlines()
+                    lines4 = theme_set2.readlines()
                     lines4[3] = 'dark\n'
                 with open(path_to_file2, 'w') as theme_set2:
                     theme_set2.writelines(lines4)
@@ -123,7 +123,7 @@ class MainWindow(tk.Tk):
         self.columnconfigure(0, weight=1)
         self.rowconfigure(0, weight=1)
 
-        # App Menu
+        ''' App Menu '''
         self.version_lb = ttk.Label(self.menu_frame, text=version)
         self.version_lb.config(font=('Ubuntu', 11), foreground='#00c4ff')
         self.version_lb.grid(column=0, row=0, padx=10)
@@ -303,7 +303,6 @@ class StSt:
             self.btn_stst.bind('<Leave>', start_leave)
 
 
-# noinspection PyTypeChecker
 class TLImp:
     """
     Import Class for Wireguard config Files.
@@ -342,7 +341,7 @@ class TLImp:
             path_split1 = path_split[-1]
             self.a = Tunnel.active()
 
-            if 'PrivateKey = ' in read and 'PublicKey = 'in read and 'Endpoint =' in read:
+            if 'PrivateKey = ' in read and 'PublicKey = ' in read and 'Endpoint =' in read:
                 with open(filepath, 'r') as file:
                     key = Tunnel.con_to_dict(file)
                     pre_key = key[3]
@@ -402,14 +401,14 @@ class TLImp:
                                         window.my_tool_tip.destroy()
 
                                     def list_info_enter(event):
-                                            """ The mouse moves into the entry widget """
-                                            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                                                           'List of available tunnels')
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'List of available tunnels')
 
                                     def list_info_leave(_):
-                                            """ The mouse moves from the entry widget """
-                                            ''' Remove Tool-Tip '''
-                                            window.my_tool_tip.destroy()
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
 
                                     def del_enter(event):
                                         """ The mouse moves into the entry widget """
@@ -444,7 +443,6 @@ class TLImp:
                                         ''' Remove Tool-Tip '''
                                         window.my_tool_tip.destroy()
 
-
                                     self.wg_autostart.bind('<Enter>', chk_a_enter)
                                     self.wg_autostart.bind('<Leave>', chk_a_leave)
                                     self.l_box.bind('<Enter>', list_info_enter)
@@ -470,7 +468,6 @@ class TLImp:
                                     check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
                                     Path.chmod(wg_read, 0o600)
 
-
             if 'PrivateKey = ' and 'Endpoint = ' not in read:
                 """img_w, img_i, w_title, w_txt hand over"""
                 iw = r'/usr/share/icons/wp-icons/64/error.png'
@@ -490,7 +487,6 @@ class TLImp:
             print('Tunnel exist!')
 
 
-# noinspection PyTypeChecker
 class FrameWidgets(ttk.Frame):
     def __init__(self, container, **kwargs):
         super().__init__(container, **kwargs)
@@ -567,7 +563,6 @@ class FrameWidgets(ttk.Frame):
                 self.lb_rename.delete(0, tk.END)
                 self.btn_rename.config(state='normal')
 
-
         self.l_box = tk.Listbox(self.lb_frame_btn_lbox, selectmode='single')
         self.l_box.config(relief='ridge', font=('Ubuntu', 12, 'bold'))
         self.l_box.grid(column=1, rowspan=4, row=0, sticky='ns')
@@ -610,7 +605,6 @@ class FrameWidgets(ttk.Frame):
             self.l_box.bind('<Enter>', list_not_empty_enter)
             self.l_box.bind('<Leave>', list_not_empty_leave)
 
-
         ''' Button Vpn '''
         if self.a != '':
             StSt.stop(self)
@@ -662,7 +656,7 @@ class FrameWidgets(ttk.Frame):
                 self.l_box.delete(self.select_tunnel[0])
                 with open(path_to_file2, 'r') as set_file6:
                     lines6 = set_file6.readlines()
-                    if select_tl == lines6[7].strip() and not 'off' in lines6[7].strip():
+                    if select_tl == lines6[7].strip() and 'off' not in lines6[7].strip():
                         lines6[7] = 'off'
                         with open(path_to_file2, 'w') as set_file7:
                             set_file7.writelines(lines6)
@@ -681,6 +675,7 @@ class FrameWidgets(ttk.Frame):
                 self.wg_autostart.configure(state='disabled')
 
                 ''' for disable checkbox when Listbox empty '''
+
                 def empty_list_start_enter(event):
                     """ The mouse moves into the entry widget """
                     window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
@@ -775,6 +770,7 @@ class FrameWidgets(ttk.Frame):
         self.btn_exp = ttk.Button(self.lb_frame_btn_lbox, image=self.exp_pic, command=Tunnel.export,
                                   padding=0)
         self.btn_exp.grid(column=0, row=3, padx=15, pady=8)
+
         def empty_list_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
@@ -834,6 +830,7 @@ class FrameWidgets(ttk.Frame):
         else:
             self.lb_rename.bind('<Enter>', rename_no_active_enter)
             self.lb_rename.bind('<Leave>', rename_no_active_leave)
+
         def tl_rename():
             special_characters = ['\\', '/', '{', '}', ' ']
 
@@ -885,7 +882,7 @@ class FrameWidgets(ttk.Frame):
                         self.StrVar.set(value=self.a)
                         with open(path_to_file2, 'r') as set_file5:
                             lines5 = set_file5.readlines()
-                        if select_tl == lines5[7].strip() and not 'off' in lines5[7].strip():
+                        if select_tl == lines5[7].strip() and 'off' not in lines5[7].strip():
                             lines5[7] = new_a_connect
                             with open(path_to_file2, 'w') as theme_set5:
                                 theme_set5.writelines(lines5)
@@ -907,7 +904,6 @@ class FrameWidgets(ttk.Frame):
                                      style='RnButton.TButton')
         self.btn_rename.grid(column=2, row=4, padx=20, pady=15, sticky='ne')
 
-
         ''' Check Buttons '''
         self.selected_option = tk.IntVar()
         self.autoconnect_var = tk.StringVar()
@@ -921,6 +917,7 @@ class FrameWidgets(ttk.Frame):
                                             variable=self.selected_option,
                                             command=lambda: FileHandle.box_set(self))
         self.wg_autostart.grid(column=0, row=4, pady=15, padx=15, sticky='nw')
+
         def chk_enter(event):
             """ The mouse moves into the entry widget """
             window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
@@ -933,7 +930,6 @@ class FrameWidgets(ttk.Frame):
             window.my_tool_tip.destroy()
 
         if self.l_box.size() >= 1 and len(self.l_box.curselection()) >= 1:
-
             def chk_a_enter(event):
                 """ The mouse moves into the entry widget """
                 window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
@@ -947,7 +943,6 @@ class FrameWidgets(ttk.Frame):
             self.wg_autostart.bind('<Enter>', chk_a_enter)
             self.wg_autostart.bind('<Leave>', chk_a_leave)
 
-
         if self.l_box.size() == 0:
             self.wg_autostart.bind('<Enter>', chk_enter)
             self.wg_autostart.bind('<Leave>', chk_leave)
@@ -965,7 +960,6 @@ class FrameWidgets(ttk.Frame):
             self.wg_autostart.bind('<Enter>', chk_a_enter)
             self.wg_autostart.bind('<Leave>', chk_a_leave)
 
-
         OnOff.on_off(self)
 
     def wg_switch(self):
-- 
2.45.2


From 0a5341fab7ed5a5d2d1b7736884bac6f69ee838e Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Thu, 7 Nov 2024 18:04:58 +0100
Subject: [PATCH 5/5] remove classes and add methods to class FrameWidgets
 (removed self errors)

---
 wg_func.py | 147 +------------
 wg_main.py | 627 ++++++++++++++++++++++++++++++-----------------------
 2 files changed, 358 insertions(+), 416 deletions(-)

diff --git a/wg_func.py b/wg_func.py
index 9b225cb..2dd71fc 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -122,34 +122,9 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
 class Tunnel:
 
     """
-    Show the active tunnel in green or yellow in the label
+    Class of Methods for Wire-Py
     """
 
-    def __init__(self):
-        self.StrVar = None
-        self.lb_tunnel = None
-        self.lb_frame2 = None
-        self.lb_frame = None
-        self.endpoint = None
-        self.dns = None
-        self.address = None
-        self.enp = None
-        self.DNS = None
-        self.add = None
-
-    def color(self):
-        with open(path_to_file2, 'r') as read_file:
-            lines = read_file.readlines()
-            if 'light\n' in lines:
-                self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
-
-            else:
-                self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='yellow')
-
-        self.lb_tunnel.config(font=('Ubuntu', 11, 'bold'))
-        self.lb_tunnel.grid(column=2, padx=10, row=1)
-
-
     """
     The config file is packed into a dictionary,
     to display the values Address , DNS and Peer in the labels
@@ -212,44 +187,6 @@ class Tunnel:
 
         return active
 
-
-    """
-    Displays the value address, DNS and peer in the labels
-    or empty it again
-    """
-
-
-    def init_and_report(self, data=None):
-        """ Address Label """
-        self.add = tk.StringVar()
-        self.add.set('Address:    ' + data[0])
-        self.DNS = tk.StringVar()
-        self.DNS.set('       DNS:    ' + data[1])
-        self.enp = tk.StringVar()
-        self.enp.set('Endpoint:    ' + data[2])
-
-    def label_empty(self):
-        self.add.set('')
-        self.DNS.set('')
-        self.enp.set('')
-
-    def show_data(self):
-        """ Address Label """
-        self.address = ttk.Label(self.lb_frame, textvariable=self.add, foreground='#0071ff')
-        self.address.grid(column=0, row=5, sticky='w', padx=10, pady=6)
-        self.address.config(font=('Ubuntu', 9))
-
-        ''' DNS Label '''
-        self.dns = ttk.Label(self.lb_frame, textvariable=self.DNS, foreground='#0071ff')
-        self.dns.grid(column=0, row=7, sticky='w', padx=10, pady=6)
-        self.dns.config(font=('Ubuntu', 9))
-
-        ''' Endpoint Label '''
-        self.endpoint = ttk.Label(self.lb_frame2, textvariable=self.enp, foreground='#0071ff')
-        self.endpoint.grid(column=0, row=8, sticky='w', padx=10, pady=20)
-        self.endpoint.config(font=('Ubuntu', 9))
-
-
     """
     Shows all existing Wireguard tunnels
     """
@@ -329,87 +266,5 @@ class Tunnel:
 
 tips = Tunnel.if_tip()
 
-class FileHandle:
-    """
-    This class will display the autostart label which
-    Tunnel is automatically started regardless of the active tunnel.
-    The selected tunnel is written into a file to read it after the start of the system.
-    """
-
-    def __init__(self):
-
-        self.wg_autostart = None
-        self.autoconnect = None
-        self.auto_con = None
-        self.autoconnect_var = None
-        self.tl = None
-        self.selected_option = None
-        self.l_box = None
-
-    def box_set(self):
-
-        try:
-            select_tunnel = self.l_box.curselection()
-            select_tl = self.l_box.get(select_tunnel[0])
-
-            if self.selected_option.get() == 0:
-                with open(path_to_file2, 'r') as set_file3:
-                    lines3 = set_file3.readlines()
-                    lines3[7] = 'off'
-                with open(path_to_file2, 'w') as set_file3:
-                    set_file3.writelines(lines3)
-
-                tl = Tunnel.list()
-
-                if len(tl) == 0:
-                    self.wg_autostart.configure(state='disabled')
-
-            if self.selected_option.get() >= 1:
-                with open(path_to_file2, 'r') as set_file3:
-                    lines3 = set_file3.readlines()
-                    lines3[7] = select_tl
-                with open(path_to_file2, 'w') as set_file3:
-                    set_file3.writelines(lines3)
-
-        except IndexError:
-            self.selected_option.set(1)
-
-        OnOff.on_off(self)
 
 
-class OnOff:
-    """
-    Here it is checked whether the path to the file is there if not it is created.
-    Set (on), the selected tunnel is displayed in the label.
-    At (off) the label is first emptied then filled with No Autoconnect
-    """
-
-    def __init__(self):
-
-        self.wg_autostart = None
-        self.selected_option = None
-        self.auto_con = None
-        self.autoconnect = None
-        self.autoconnect_var = None
-        self.lb_frame_buttons = None
-
-    def on_off(self):
-        with open(path_to_file2, 'r') as set_file4:
-            lines4 = set_file4.readlines()
-
-        if lines4[7] != 'off':
-            self.selected_option.set(1)
-            self.autoconnect_var.set('')
-            self.auto_con = lines4[7]
-
-        else:
-
-            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)
-
-        self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var, foreground='#0071ff')
-        self.autoconnect.config(font=('Ubuntu', 11))
-        self.autoconnect.grid(column=0, row=4, sticky='ne', pady=19)
diff --git a/wg_main.py b/wg_main.py
index 43dd7ff..e98155f 100755
--- a/wg_main.py
+++ b/wg_main.py
@@ -8,7 +8,7 @@ from subprocess import check_call
 from tkinter import *
 from tkinter import filedialog, ttk
 
-from wg_func import (Tunnel, FileHandle, OnOff, msg_window, WirePyUpdate, res, _u, version, path_to_file2, tips)
+from wg_func import (Tunnel, msg_window, WirePyUpdate, res, _u, version, path_to_file2, tips)
 
 tcl_path = Path('/usr/share/TK-Themes')
 
@@ -45,6 +45,7 @@ class MainWindow(tk.Tk):
         self.iconphoto(True, self.wg_icon)
 
         ''' Set on or off in file '''
+
         def update():
             if set_update.get() == 1:
                 with open(path_to_file2, 'r') as set_file2:
@@ -61,6 +62,7 @@ class MainWindow(tk.Tk):
                     set_file2.writelines(lines2)
 
         ''' Set on or off in file '''
+
         def tooltip():
             if set_tip.get():
                 with open(path_to_file2, 'r') as set_file2:
@@ -77,6 +79,7 @@ class MainWindow(tk.Tk):
                     set_file2.writelines(lines2)
 
         ''' Set dark or light '''
+
         def theme_change_light():
             if self.tk.call("ttk::style", "theme", "use") == "water-dark":
                 ''' Set light theme '''
@@ -241,256 +244,13 @@ class MainWindow(tk.Tk):
         FrameWidgets(self).grid()
 
 
-class StSt:
-    """
-    Show Start and Stop Button in Label
-    """
-
-    def __init__(self):
-        self.lb_frame_btn_lbox = None
-        self.wg_switch = None
-        self.btn_stst = None
-        self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
-        self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
-
-    def stop(self):
-        self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, command=self.wg_switch, padding=0)
-        self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
-
-        def stop_enter(event):
-            """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                           'Click to stop selected Wireguard Tunnel')
-
-        def stop_leave(_):
-            """ The mouse moves from the entry widget """
-            ''' Remove Tool-Tip '''
-            window.my_tool_tip.destroy()
-
-        self.btn_stst.bind('<Enter>', stop_enter)
-        self.btn_stst.bind('<Leave>', stop_leave)
-
-    def start(self):
-        self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_start, command=self.wg_switch, padding=0)
-        self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
-
-        def empty_list_start_enter(event):
-            """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                           'No tunnels to start in the list')
-
-        def empty_list_start_leave(_):
-            """ The mouse moves from the entry widget """
-            ''' Remove Tool-Tip '''
-            window.my_tool_tip.destroy()
-
-        def start_enter(event):
-            """ The mouse moves into the entry widget """
-            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                           'Click to start selected Wireguard Tunnel')
-
-        def start_leave(_):
-            """ The mouse moves from the entry widget """
-            ''' Remove Tool-Tip '''
-            window.my_tool_tip.destroy()
-
-        tl = Tunnel.list()
-        if len(tl) == 0:
-            self.btn_stst.bind('<Enter>', empty_list_start_enter)
-            self.btn_stst.bind('<Leave>', empty_list_start_leave)
-        else:
-            self.btn_stst.bind('<Enter>', start_enter)
-            self.btn_stst.bind('<Leave>', start_leave)
-
-
-class TLImp:
-    """
-    Import Class for Wireguard config Files.
-    Before importing, it is checked whether PrivateKey and PublicKey are in the file.
-    If True then it is checked whether the PreSharedKey is already in the key file
-    to avoid an import error so that no double wgconf are imported.
-    Thus, tunnels can be renamed without the problems arise. If False then the key is written into the file.
-    Furthermore, it is checked whether the name is longer than 12 characters.
-    If True then the name is automatically shortened to 12 characters and then imported.
-    If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
-    """
-
-    def __init__(self):
-
-        self.lb_rename = None
-        self.btn_tr = None
-        self.btn_exp = None
-        self.wg_autostart = None
-        self.select_tunnel = None
-        self.wg_switch = None
-        self.btn_stst = None
-        self.lb_tunnel = None
-        self.StrVar = None
-        self.a = None
-        self.l_box = None
-
-    def import_sl(self):
-
-        try:
-            filepath = filedialog.askopenfilename(initialdir=str(_u), title='Select Wireguard config File',
-                                                  filetypes=[('WG config files', '*.conf')], )
-
-            with open(filepath, 'r') as file:
-                read = file.read()
-            path_split = filepath.split('/')
-            path_split1 = path_split[-1]
-            self.a = Tunnel.active()
-
-            if 'PrivateKey = ' in read and 'PublicKey = ' in read and 'Endpoint =' in read:
-                with open(filepath, 'r') as file:
-                    key = Tunnel.con_to_dict(file)
-                    pre_key = key[3]
-                    if len(pre_key) != 0:
-                        with open('/etc/wire_py/.keys', 'r') as readfile:
-                            p_key = readfile.readlines()
-                            if pre_key in p_key or pre_key + '\n' in p_key:
-                                """img_w, img_i, w_title, w_txt hand over"""
-                                iw = r'/usr/share/icons/wp-icons/64/error.png'
-                                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
-                                wt = 'Import Error'
-                                msg_t = 'Tunnel already available!\nPlease use another file for import'
-                                msg_window(iw, ii, wt, msg_t)
-
-                            else:
-
-                                with open('/etc/wire_py/.keys', 'a') as keyfile:
-                                    keyfile.write(pre_key + '\r')
-                                    if len(path_split1) > 17:
-                                        p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
-                                        path_split = path_split1[len(path_split1) - 17:]
-                                        os.rename(p1, Path('/etc/wire_py') / str(path_split))
-                                        new_conf = '/etc/wire_py/' + path_split
-                                        if self.a != '':
-                                            check_call(['nmcli', 'connection', 'down', Tunnel.active()])
-                                            Tunnel.label_empty(self)
-
-                                        subprocess.check_output(['nmcli', 'connection', 'import', 'type',
-                                                                 'wireguard', 'file', new_conf], text=True)
-
-                                    else:
-                                        shutil.copy(filepath, Path('/etc/wire_py/'))
-                                        if self.a != '':
-                                            check_call(['nmcli', 'connection', 'down', Tunnel.active()])
-                                            Tunnel.label_empty(self)
-
-                                        subprocess.check_output(['nmcli', 'connection', 'import', 'type',
-                                                                 'wireguard', 'file', filepath], text=True)
-
-                                    self.StrVar.set('')
-                                    self.a = Tunnel.active()
-                                    self.l_box.insert(0, self.a)
-                                    self.wg_autostart.configure(state='normal')
-                                    self.l_box.selection_clear(0, tk.END)
-                                    self.l_box.update()
-                                    self.l_box.selection_set(0)
-
-                                    def chk_a_enter(event):
-                                        """ The mouse moves into the entry widget """
-                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                                                       'To use the autostart, enable this '
-                                                                       'Checkbox')
-
-                                    def chk_a_leave(_):
-                                        """ The mouse moves from the entry widget """
-                                        ''' Remove Tool-Tip '''
-                                        window.my_tool_tip.destroy()
-
-                                    def list_info_enter(event):
-                                        """ The mouse moves into the entry widget """
-                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                                                       'List of available tunnels')
-
-                                    def list_info_leave(_):
-                                        """ The mouse moves from the entry widget """
-                                        ''' Remove Tool-Tip '''
-                                        window.my_tool_tip.destroy()
-
-                                    def del_enter(event):
-                                        """ The mouse moves into the entry widget """
-                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                                                       'Click to delete a Wireguard '
-                                                                       'Tunnel\nSelect from the list!')
-
-                                    def del_leave(_):
-                                        """ The mouse moves from the entry widget """
-                                        ''' Remove Tool-Tip '''
-                                        window.my_tool_tip.destroy()
-
-                                    def exp_enter(event):
-                                        """ The mouse moves into the entry widget """
-                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                                                       '         Click to export '
-                                                                       'all\nWireguard Tunnel to Zipfile')
-
-                                    def exp_leave(_):
-                                        """ The mouse moves from the entry widget """
-                                        ''' Remove Tool-Tip '''
-                                        window.my_tool_tip.destroy()
-
-                                    def rename_enter(event):
-                                        """ The mouse moves into the entry widget """
-                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
-                                                                       'To rename a tunnel, you need to\n'
-                                                                       'select a tunnel from the list')
-
-                                    def rename_leave(_):
-                                        """ The mouse moves from the entry widget """
-                                        ''' Remove Tool-Tip '''
-                                        window.my_tool_tip.destroy()
-
-                                    self.wg_autostart.bind('<Enter>', chk_a_enter)
-                                    self.wg_autostart.bind('<Leave>', chk_a_leave)
-                                    self.l_box.bind('<Enter>', list_info_enter)
-                                    self.l_box.bind('<Leave>', list_info_leave)
-                                    self.btn_tr.bind('<Enter>', del_enter)
-                                    self.btn_tr.bind('<Leave>', del_leave)
-                                    self.btn_exp.bind('<Enter>', exp_enter)
-                                    self.btn_exp.bind('<Leave>', exp_leave)
-                                    self.lb_rename.bind('<Enter>', rename_enter)
-                                    self.lb_rename.bind('<Leave>', rename_leave)
-                                    self.lb_rename.insert(0, 'Max. 12 characters!')
-                                    self.StrVar = tk.StringVar()
-                                    self.StrVar.set(self.a)
-                                    Tunnel.color(self)
-                                    StSt.stop(self)
-                                    wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
-                                    with open(wg_read, 'r') as file_for_key:
-                                        data = Tunnel.con_to_dict(file_for_key)
-
-                                    ''' Address Label '''
-                                    Tunnel.init_and_report(self, data)
-                                    Tunnel.show_data(self)
-                                    check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
-                                    Path.chmod(wg_read, 0o600)
-
-            if 'PrivateKey = ' and 'Endpoint = ' not in read:
-                """img_w, img_i, w_title, w_txt hand over"""
-                iw = r'/usr/share/icons/wp-icons/64/error.png'
-                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
-                wt = 'Import Error'
-                msg_t = 'Oh... no valid Wireguard File!\nPlease select a valid Wireguard File'
-                msg_window(iw, ii, wt, msg_t)
-
-        except EOFError:
-            pass
-        except TypeError:
-            pass
-        except FileNotFoundError:
-            pass
-        except subprocess.CalledProcessError:
-
-            print('Tunnel exist!')
-
-
 class FrameWidgets(ttk.Frame):
     def __init__(self, container, **kwargs):
         super().__init__(container, **kwargs)
 
+        self.endpoint = None
+        self.dns = None
+        self.address = None
         self.btn_stst = None
         self.auto_con = None
         self.enp = None
@@ -506,6 +266,8 @@ class FrameWidgets(ttk.Frame):
         self.tr_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_trash.png')
         self.exp_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_export.png')
         self.warning_pic = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/64/error.png')
+        self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
+        self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
 
         ''' Show active Tunnel '''
         self.a = Tunnel.active()
@@ -541,7 +303,7 @@ class FrameWidgets(ttk.Frame):
 
         ''' Label to Show active Tunnel '''
         self.StrVar = tk.StringVar(value=self.a)
-        Tunnel.color(self)
+        self.color_label()
 
         ''' Interface Label '''
         self.interface = ttk.Label(self.lb_frame, text='Interface')
@@ -607,27 +369,27 @@ class FrameWidgets(ttk.Frame):
 
         ''' Button Vpn '''
         if self.a != '':
-            StSt.stop(self)
+            self.stop()
             wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
             with open(wg_read, 'r') as file:
                 data = Tunnel.con_to_dict(file)
 
             ''' Address Label '''
-            Tunnel.init_and_report(self, data)
-            Tunnel.show_data(self)
+            self.init_and_report(data)
+            self.show_data()
         else:
-            StSt.start(self)
+            self.start()
 
             ''' Address Label '''
             self.add = tk.StringVar()
             self.DNS = tk.StringVar()
             self.enp = tk.StringVar()
-            Tunnel.label_empty(self)
-            Tunnel.show_data(self)
+            self.label_empty()
+            self.show_data()
 
         ''' Button Import '''
         self.btn_i = ttk.Button(self.lb_frame_btn_lbox,
-                                image=self.imp_pic, command=lambda: TLImp.import_sl(self),
+                                image=self.imp_pic, command=self.import_sl,
                                 padding=0)
         self.btn_i.grid(column=0, row=1, padx=15, pady=8)
 
@@ -705,7 +467,7 @@ class FrameWidgets(ttk.Frame):
 
                 if self.a != '' and self.a == select_tl:
                     self.StrVar.set(value='')
-                    StSt.start(self)
+                    self.start()
                     self.l_box.update()
 
                     ''' Address Label '''
@@ -912,10 +674,8 @@ class FrameWidgets(ttk.Frame):
         self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var)
         self.autoconnect.config(font=('Ubuntu', 11))
         self.autoconnect.grid(column=0, row=4, sticky='ne', padx=10, pady=15)
-        self.wg_autostart = ttk.Checkbutton(self,
-                                            text='Autoconnect on:',
-                                            variable=self.selected_option,
-                                            command=lambda: FileHandle.box_set(self))
+        self.wg_autostart = ttk.Checkbutton(self, text='Autoconnect on:', variable=self.selected_option,
+                                            command=self.box_set)
         self.wg_autostart.grid(column=0, row=4, pady=15, padx=15, sticky='nw')
 
         def chk_enter(event):
@@ -960,14 +720,341 @@ class FrameWidgets(ttk.Frame):
             self.wg_autostart.bind('<Enter>', chk_a_enter)
             self.wg_autostart.bind('<Leave>', chk_a_leave)
 
-        OnOff.on_off(self)
+        self.on_off()
+
+    """
+    Import Methode for Wireguard config Files.
+    Before importing, it is checked whether PrivateKey and PublicKey are in the file.
+    If True then it is checked whether the PreSharedKey is already in the key file
+    to avoid an import error so that no double wgconf are imported.
+    Thus, tunnels can be renamed without the problems arise. If False then the key is written into the file.
+    Furthermore, it is checked whether the name is longer than 12 characters.
+    If True then the name is automatically shortened to 12 characters and then imported.
+    If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
+    """
+
+    def import_sl(self):
+
+        try:
+            filepath = filedialog.askopenfilename(initialdir=str(_u), title='Select Wireguard config File',
+                                                  filetypes=[('WG config files', '*.conf')], )
+
+            with open(filepath, 'r') as file:
+                read = file.read()
+            path_split = filepath.split('/')
+            path_split1 = path_split[-1]
+            self.a = Tunnel.active()
+
+            if 'PrivateKey = ' in read and 'PublicKey = ' in read and 'Endpoint =' in read:
+                with open(filepath, 'r') as file:
+                    key = Tunnel.con_to_dict(file)
+                    pre_key = key[3]
+                    if len(pre_key) != 0:
+                        with open('/etc/wire_py/.keys', 'r') as readfile:
+                            p_key = readfile.readlines()
+                            if pre_key in p_key or pre_key + '\n' in p_key:
+                                """img_w, img_i, w_title, w_txt hand over"""
+                                iw = r'/usr/share/icons/wp-icons/64/error.png'
+                                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                                wt = 'Import Error'
+                                msg_t = 'Tunnel already available!\nPlease use another file for import'
+                                msg_window(iw, ii, wt, msg_t)
+
+                            else:
+
+                                with open('/etc/wire_py/.keys', 'a') as keyfile:
+                                    keyfile.write(pre_key + '\r')
+                                    if len(path_split1) > 17:
+                                        p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
+                                        path_split = path_split1[len(path_split1) - 17:]
+                                        os.rename(p1, Path('/etc/wire_py') / str(path_split))
+                                        new_conf = '/etc/wire_py/' + path_split
+                                        if self.a != '':
+                                            check_call(['nmcli', 'connection', 'down', Tunnel.active()])
+                                            self.label_empty()
+
+                                        subprocess.check_output(['nmcli', 'connection', 'import', 'type',
+                                                                 'wireguard', 'file', new_conf], text=True)
+
+                                    else:
+                                        shutil.copy(filepath, Path('/etc/wire_py/'))
+                                        if self.a != '':
+                                            check_call(['nmcli', 'connection', 'down', Tunnel.active()])
+                                            self.label_empty()
+
+                                        subprocess.check_output(['nmcli', 'connection', 'import', 'type',
+                                                                 'wireguard', 'file', filepath], text=True)
+
+                                    self.StrVar.set('')
+                                    self.a = Tunnel.active()
+                                    self.l_box.insert(0, self.a)
+                                    self.wg_autostart.configure(state='normal')
+                                    self.l_box.selection_clear(0, tk.END)
+                                    self.l_box.update()
+                                    self.l_box.selection_set(0)
+
+                                    def chk_a_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'To use the autostart, enable this '
+                                                                       'Checkbox')
+
+                                    def chk_a_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def list_info_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'List of available tunnels')
+
+                                    def list_info_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def del_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'Click to delete a Wireguard '
+                                                                       'Tunnel\nSelect from the list!')
+
+                                    def del_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def exp_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       '         Click to export '
+                                                                       'all\nWireguard Tunnel to Zipfile')
+
+                                    def exp_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    def rename_enter(event):
+                                        """ The mouse moves into the entry widget """
+                                        window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                                                       'To rename a tunnel, you need to\n'
+                                                                       'select a tunnel from the list')
+
+                                    def rename_leave(_):
+                                        """ The mouse moves from the entry widget """
+                                        ''' Remove Tool-Tip '''
+                                        window.my_tool_tip.destroy()
+
+                                    self.wg_autostart.bind('<Enter>', chk_a_enter)
+                                    self.wg_autostart.bind('<Leave>', chk_a_leave)
+                                    self.l_box.bind('<Enter>', list_info_enter)
+                                    self.l_box.bind('<Leave>', list_info_leave)
+                                    self.btn_tr.bind('<Enter>', del_enter)
+                                    self.btn_tr.bind('<Leave>', del_leave)
+                                    self.btn_exp.bind('<Enter>', exp_enter)
+                                    self.btn_exp.bind('<Leave>', exp_leave)
+                                    self.lb_rename.bind('<Enter>', rename_enter)
+                                    self.lb_rename.bind('<Leave>', rename_leave)
+                                    self.lb_rename.insert(0, 'Max. 12 characters!')
+                                    self.StrVar = tk.StringVar()
+                                    self.StrVar.set(self.a)
+                                    self.color_label()
+                                    self.stop()
+                                    wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
+                                    with open(wg_read, 'r') as file_for_key:
+                                        data = Tunnel.con_to_dict(file_for_key)
+
+                                    ''' Address Label '''
+                                    self.init_and_report(data)
+                                    self.show_data()
+                                    check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
+                                    Path.chmod(wg_read, 0o600)
+
+            if 'PrivateKey = ' and 'Endpoint = ' not in read:
+                """img_w, img_i, w_title, w_txt hand over"""
+                iw = r'/usr/share/icons/wp-icons/64/error.png'
+                ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
+                wt = 'Import Error'
+                msg_t = 'Oh... no valid Wireguard File!\nPlease select a valid Wireguard File'
+                msg_window(iw, ii, wt, msg_t)
+
+        except EOFError:
+            pass
+        except TypeError:
+            pass
+        except FileNotFoundError:
+            pass
+        except subprocess.CalledProcessError:
+
+            print('Tunnel exist!')
+
+    '''
+    This Method will display the autostart label which
+    Tunnel is automatically started regardless of the active tunnel.
+    The selected tunnel is written into a file to read it after the start of the system.
+    '''
+
+    def box_set(self):
+
+        try:
+            select_tunnel = self.l_box.curselection()
+            select_tl = self.l_box.get(select_tunnel[0])
+
+            if self.selected_option.get() == 0:
+                with open(path_to_file2, 'r') as set_file3:
+                    lines3 = set_file3.readlines()
+                    lines3[7] = 'off'
+                with open(path_to_file2, 'w') as set_file3:
+                    set_file3.writelines(lines3)
+
+                tl = Tunnel.list()
+
+                if len(tl) == 0:
+                    self.wg_autostart.configure(state='disabled')
+
+            if self.selected_option.get() >= 1:
+                with open(path_to_file2, 'r') as set_file3:
+                    lines3 = set_file3.readlines()
+                    lines3[7] = select_tl
+                with open(path_to_file2, 'w') as set_file3:
+                    set_file3.writelines(lines3)
+
+        except IndexError:
+            self.selected_option.set(1)
+
+        self.on_off()
+
+    '''
+    Here it is checked whether the path to the file is there if not it is created.
+    Set (on), the selected tunnel is displayed in the label.
+    At (off) the label is first emptied then filled with No Autoconnect
+    '''
+
+    def on_off(self):
+        with open(path_to_file2, 'r') as set_file4:
+            lines4 = set_file4.readlines()
+
+        if lines4[7] != 'off':
+            self.selected_option.set(1)
+            self.autoconnect_var.set('')
+            self.auto_con = lines4[7]
+
+        else:
+
+            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)
+
+        self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var, foreground='#0071ff')
+        self.autoconnect.config(font=('Ubuntu', 11))
+        self.autoconnect.grid(column=0, row=4, sticky='ne', pady=19)
+
+    """
+    Displays the value address, DNS and peer in the labels
+    or empty it again
+    """
+
+    def init_and_report(self, data=None):
+        """ Address Label """
+        self.add = tk.StringVar()
+        self.add.set('Address:    ' + data[0])
+        self.DNS = tk.StringVar()
+        self.DNS.set('       DNS:    ' + data[1])
+        self.enp = tk.StringVar()
+        self.enp.set('Endpoint:    ' + data[2])
+
+    def label_empty(self):
+        self.add.set('')
+        self.DNS.set('')
+        self.enp.set('')
+
+    def show_data(self):
+        """ Address Label """
+        self.address = ttk.Label(self.lb_frame, textvariable=self.add, foreground='#0071ff')
+        self.address.grid(column=0, row=5, sticky='w', padx=10, pady=6)
+        self.address.config(font=('Ubuntu', 9))
+
+        ''' DNS Label '''
+        self.dns = ttk.Label(self.lb_frame, textvariable=self.DNS, foreground='#0071ff')
+        self.dns.grid(column=0, row=7, sticky='w', padx=10, pady=6)
+        self.dns.config(font=('Ubuntu', 9))
+
+        ''' Endpoint Label '''
+        self.endpoint = ttk.Label(self.lb_frame2, textvariable=self.enp, foreground='#0071ff')
+        self.endpoint.grid(column=0, row=8, sticky='w', padx=10, pady=20)
+        self.endpoint.config(font=('Ubuntu', 9))
+
+    def stop(self):
+        self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, command=self.wg_switch, padding=0)
+        self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
+
+        def stop_enter(event):
+            """ The mouse moves into the entry widget """
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                           'Click to stop selected Wireguard Tunnel')
+
+        def stop_leave(_):
+            """ The mouse moves from the entry widget """
+            ''' Remove Tool-Tip '''
+            window.my_tool_tip.destroy()
+
+        self.btn_stst.bind('<Enter>', stop_enter)
+        self.btn_stst.bind('<Leave>', stop_leave)
+
+    def start(self):
+        self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_start, command=self.wg_switch, padding=0)
+        self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
+
+        def empty_list_start_enter(event):
+            """ The mouse moves into the entry widget """
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                           'No tunnels to start in the list')
+
+        def empty_list_start_leave(_):
+            """ The mouse moves from the entry widget """
+            ''' Remove Tool-Tip '''
+            window.my_tool_tip.destroy()
+
+        def start_enter(event):
+            """ The mouse moves into the entry widget """
+            window.my_tool_tip = MyToolTip(event.x_root, event.y_root,
+                                           'Click to start selected Wireguard Tunnel')
+
+        def start_leave(_):
+            """ The mouse moves from the entry widget """
+            ''' Remove Tool-Tip '''
+            window.my_tool_tip.destroy()
+
+        tl = Tunnel.list()
+        if len(tl) == 0:
+            self.btn_stst.bind('<Enter>', empty_list_start_enter)
+            self.btn_stst.bind('<Leave>', empty_list_start_leave)
+        else:
+            self.btn_stst.bind('<Enter>', start_enter)
+            self.btn_stst.bind('<Leave>', start_leave)
+
+    def color_label(self):
+        with open(path_to_file2, 'r') as read_file:
+            lines = read_file.readlines()
+            if 'light\n' in lines:
+                self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
+
+            else:
+                self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='yellow')
+
+        self.lb_tunnel.config(font=('Ubuntu', 11, 'bold'))
+        self.lb_tunnel.grid(column=2, padx=10, row=1)
 
     def wg_switch(self):
         self.a = Tunnel.active()
         try:
             if self.a == '':
 
-                StSt.start(self)
+                self.start()
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 check_call(['nmcli', 'connection', 'up', select_tl])
@@ -976,33 +1063,33 @@ class FrameWidgets(ttk.Frame):
                     data = Tunnel.con_to_dict(file)
 
                 ''' Address Label '''
-                Tunnel.init_and_report(self, data)
-                Tunnel.show_data(self)
+                self.init_and_report(data)
+                self.show_data()
 
                 ''' Button Start/Stop '''
-                StSt.stop(self)
+                self.stop()
                 self.a = Tunnel.active()
                 self.StrVar = tk.StringVar()
                 self.StrVar.set(self.a)
-                Tunnel.color(self)
+                self.color_label()
 
             elif self.a != '':
 
                 ''' Button Start/Stop '''
-                StSt.stop(self)
+                self.stop()
                 check_call(['nmcli', 'connection', 'down', self.a])
 
                 ''' Button Start/Stop '''
-                StSt.start(self)
+                self.start()
                 self.a = Tunnel.active()
                 self.StrVar.set('')
-                Tunnel.color(self)
+                self.color_label()
 
                 ''' Address Label '''
                 self.add.set('')
                 self.DNS.set('')
                 self.enp.set('')
-                Tunnel.show_data(self)
+                self.show_data()
 
         except IndexError:
 
-- 
2.45.2