From 858e9f07fed24135fc63809c4d423b6d1b6d11a3 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Fri, 6 Sep 2024 18:20:29 +0200
Subject: [PATCH 1/5] little fixes

---
 .idea/workspace.xml |  6 +++++-
 main.py             | 32 +++++++++++++++++++-------------
 wg_func.py          | 10 +++-------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cdeab28..2e7a420 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="add Options in">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/main.py b/main.py
index 618518c..4f9e64f 100755
--- a/main.py
+++ b/main.py
@@ -47,6 +47,7 @@ class FrameWidgets(ttk.Frame):
     def __init__(self, container, **kwargs):
         super().__init__(container, **kwargs)
 
+        self.auto_con = None
         self.enp = None
         self.DNS = None
         self.add = None
@@ -64,23 +65,24 @@ class FrameWidgets(ttk.Frame):
         # Show active Tunnel
         self.a = TunnelActiv.active()
         # Label Frame 1
+        self.lb_frame_btn_lbox = ttk.Frame(self)
+        self.lb_frame_btn_lbox.configure(relief='flat')
+        self.lb_frame_btn_lbox.grid(column=0, rowspan=4, row=0)
+        self.columnconfigure(0, weight=1)
+        self.rowconfigure(0, weight=1)
+        # Label Frame 2
         self.lb_frame = ttk.Frame(self)
         self.lb_frame.configure(relief='solid')
         self.lb_frame.grid(column=2, row=1, sticky='snew', padx=20, pady=5)
         self.columnconfigure(2, weight=1)
         self.rowconfigure(1, weight=1)
-        # Label Frame 2
+        # Label Frame 3
         self.lb_frame2 = ttk.Frame(self)
         self.lb_frame2.configure(relief='solid')
         self.lb_frame2.grid(column=2, row=2, sticky='snew', padx=20, pady=5)
         self.columnconfigure(2, weight=1)
         self.rowconfigure(2, weight=1)
-        # Label Frame 3
-        self.lb_frame_buttons = ttk.Frame(self)
-        self.lb_frame_buttons.configure(relief='flat')
-        self.lb_frame_buttons.grid(column=0, rowspan=4, row=0)
-        self.columnconfigure(0, weight=1)
-        self.rowconfigure(0, weight=1)
+
         # Show active Label
         self.select_tunnel = None
         self.lb = tk.Label(self, text='Active: ')
@@ -108,13 +110,13 @@ class FrameWidgets(ttk.Frame):
             if len(tl) != 0:
                 self.wg_autostart.configure(state='normal')
 
-        self.l_box = tk.Listbox(self.lb_frame_buttons, fg='#606060', selectmode='single')
+        self.l_box = tk.Listbox(self.lb_frame_btn_lbox, fg='#606060', selectmode='single')
         self.l_box.config(highlightthickness=0, relief='ridge')
         self.l_box.config(font=('Ubuntu', 12, 'bold'))
         self.l_box.grid(column=1, rowspan=4, row=0, sticky='ns')
         self.l_box.event_add('<<ClickEvent>>', '<Button-1>')
         self.l_box.bind('<<ClickEvent>>', enable_check_box)
-        self.scrollbar = ttk.Scrollbar(self.lb_frame_buttons, orient='vertical', command=self.l_box.yview)
+        self.scrollbar = ttk.Scrollbar(self.lb_frame_btn_lbox, orient='vertical', command=self.l_box.yview)
         self.scrollbar.grid(column=1, rowspan=4, row=0, sticky='nse')
         self.l_box.configure(yscrollcommand=self.scrollbar.set)
         self.rowconfigure(0, weight=1)
@@ -143,7 +145,7 @@ class FrameWidgets(ttk.Frame):
             ShowAddress.label_empty(self)
             ShowAddress.show_data(self)
         # Button Import
-        self.btn_i = tk.Button(self.lb_frame_buttons,
+        self.btn_i = tk.Button(self.lb_frame_btn_lbox,
                                image=self.imp_pic, bd=0,
                                command=lambda: ImportTunnel.wg_import_select(self))
         self.btn_i.grid(column=0, row=1, padx=15, pady=8)
@@ -190,11 +192,11 @@ class FrameWidgets(ttk.Frame):
                 pass
 
         # Button Trash
-        self.btn_tr = tk.Button(self.lb_frame_buttons, image=self.tr_pic, bd=0, command=delete)
+        self.btn_tr = tk.Button(self.lb_frame_btn_lbox, image=self.tr_pic, bd=0, command=delete)
         self.btn_tr.grid(column=0, row=2, padx=15, pady=8)
 
         # Button Export
-        self.btn_exp = tk.Button(self.lb_frame_buttons, image=self.exp_pic, bd=0, command=ExportTunnels.wg_export)
+        self.btn_exp = tk.Button(self.lb_frame_btn_lbox, image=self.exp_pic, bd=0, command=ExportTunnels.wg_export)
         self.btn_exp.grid(column=0, row=3, padx=15, pady=8)
 
         # Button Rename
@@ -203,7 +205,11 @@ class FrameWidgets(ttk.Frame):
 
         # Check Buttons
         self.selected_option = tk.IntVar()
-
+        self.autoconnect_var = tk.StringVar()
+        self.autoconnect_var.set(self.auto_con)
+        self.autoconnect = tk.Label(self, textvariable=self.autoconnect_var, fg='blue', padx=5)
+        self.autoconnect.config(font=('Ubuntu', 11))
+        self.autoconnect.grid(column=0, row=4, sticky='ne', pady=20)
         self.wg_autostart = tk.Checkbutton(self,
                                            text='Autoconnect on:',
                                            variable=self.selected_option,
diff --git a/wg_func.py b/wg_func.py
index 2a0fe3b..2473572 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -49,23 +49,19 @@ class GreenLabel(tk.Tk):
 class StartStopBTN(tk.Tk):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.lb_frame_buttons = None
+        self.lb_frame_btn_lbox = None
         self.wg_switch = None
         self.btn_stst = None
         self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png')
         self.wg_vpn_stop = tk.PhotoImage(file=r'icons/wg-vpn-stop-48.png')
 
     def button_stop(self):
-        self.btn_stst = tk.Button(self.lb_frame_buttons, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
+        self.btn_stst = tk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
         self.btn_stst.grid(column=0, row=0, padx=15, pady=8)
-        #self.columnconfigure(0, weight=1)
-        #self.rowconfigure(0, weight=1)
 
     def button_start(self):
-        self.btn_stst = tk.Button(self.lb_frame_buttons, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
+        self.btn_stst = tk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
         self.btn_stst.grid(column=0, row=0, padx=15, pady=8)
-        #self.columnconfigure(0, weight=1)
-        #self.rowconfigure(0, weight=1)
 
 
 class ConToDict:

From 607589d44a376af7c2e7063a9e5e88a4320bfa8d Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Sat, 7 Sep 2024 23:52:16 +0200
Subject: [PATCH 2/5] little fixes

---
 .idea/workspace.xml | 49 +++++++++++++++++++++++++++++++++++++++++----
 main.py             | 22 +-------------------
 start_wg.py         | 12 +++++++++++
 wg_func.py          | 28 +++++---------------------
 wg_py               |  0
 wg_py.xml           |  2 --
 6 files changed, 63 insertions(+), 50 deletions(-)
 create mode 100755 start_wg.py
 create mode 100644 wg_py
 delete mode 100644 wg_py.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e7a420..fab43ca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="add Options in">
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes">
+      <change afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/wg_py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wg_py.xml" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,13 +48,15 @@
   &quot;keyToString&quot;: {
     &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
     &quot;Python.main.executor&quot;: &quot;Run&quot;,
+    &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
+    &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&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;preferences.lookFeel&quot;
   }
 }</component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Python.main">
     <configuration name="main" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="wire-py" />
       <option name="ENV_FILES" value="" />
@@ -74,6 +79,33 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="start_wg" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="wire-py" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/start_wg.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.start_wg" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
@@ -291,7 +323,15 @@
       <option name="project" value="LOCAL" />
       <updated>1725567453540</updated>
     </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="little fixes">
+      <option name="closed" value="true" />
+      <created>1725639633873</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1725639633873</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -343,6 +383,7 @@
     <MESSAGE value="add if question and add autoconnect, autoconnect_var to class Filehandle in box_set no finish!" />
     <MESSAGE value="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write" />
     <MESSAGE value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
-    <option name="LAST_COMMIT_MESSAGE" value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
+    <MESSAGE value="little fixes" />
+    <option name="LAST_COMMIT_MESSAGE" value="little fixes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/main.py b/main.py
index 4f9e64f..6479b92 100755
--- a/main.py
+++ b/main.py
@@ -7,7 +7,6 @@ from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLab
                      FileHandle, ExportTunnels, OnOff)
 
 font_color = '#4011a7'
-replacement = ''
 
 
 class MainWindow(tk.Tk):
@@ -35,8 +34,7 @@ class MainWindow(tk.Tk):
 
         # App Menu
         self.app_menu = tk.Menu(self, borderwidth=0)
-        for item in self.app_menu.keys():
-            print(item, ': ', self.app_menu[item])
+
         self.configure(menu=self.app_menu)
         self.app_menu.add_cascade(label='?')
 
@@ -106,7 +104,6 @@ class FrameWidgets(ttk.Frame):
         # Listbox with Scrollbar
         def enable_check_box(event):
             tl = ListTunnels.tl_list()
-            print(len(tl))
             if len(tl) != 0:
                 self.wg_autostart.configure(state='normal')
 
@@ -158,23 +155,6 @@ class FrameWidgets(ttk.Frame):
                 self.l_box.delete(self.select_tunnel[0])
                 os.remove(os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf')
 
-                del_tl_read = open('wg_py.xml', 'r')
-                if 'false ' in del_tl_read:
-                    first_word = 'false '
-                else:
-                    first_word = 'true '
-
-                word_replace = ''
-                # using the for loop
-                for line in del_tl_read:
-                    line = line.strip()
-                    changes = line.replace(first_word + select_tl, '')
-                    word_replace = word_replace + changes + "\n"
-
-                del_tl_read.close()
-                del_tl = open('wg_py.xml', 'w')
-                del_tl.write(word_replace)
-                del_tl.close()
                 # for disable checkbox when Listbox empty
                 tl = ListTunnels.tl_list()
                 if len(tl) == 0:
diff --git a/start_wg.py b/start_wg.py
new file mode 100755
index 0000000..af53a1c
--- /dev/null
+++ b/start_wg.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python3
+from subprocess import check_call
+from pathlib import Path
+
+home = Path.home()
+path_to_file = home / 'Pyapps/wire-py/wg_py'
+
+with open(path_to_file, 'r') as file:
+    for line in file.readlines():
+        a_con = line[5:]
+check_call(['nmcli', 'connection', 'up', a_con])
+
diff --git a/wg_func.py b/wg_func.py
index 2473572..c714be5 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -213,9 +213,6 @@ class ImportTunnel:
                 ShowAddress.show_data(self)
                 file.close()
                 os.system('nmcli con mod ' + str(self.a) + ' connection.autoconnect no')
-                new_tl = open('wg_py.xml', 'a')
-                new_tl.write('false ' + str(self.a) + '\n')
-                new_tl.close()
             if 'PrivateKey = ' not in read:
                 Message()
         except EOFError:
@@ -240,31 +237,16 @@ class FileHandle:
         self.select_tunnel = None
 
     def box_set(self):
-        word_replace = ''
         try:
             self.select_tunnel = self.l_box.curselection()
             select_tl = self.l_box.get(self.select_tunnel[0])
             if self.selected_option.get() == 0:
-                set_on = open('wg_py.xml', 'r')
-                # using the for loop
-                for line in set_on:
-                    line = line.strip()
-                    changes = line.replace('true ' + select_tl, 'false ' + select_tl)
-                    os.system('nmcli con mod ' + str(self.auto_con) + ' connection.autoconnect no')
-                    word_replace = word_replace + changes + "\n"
-                set_on.close()
+                off = open('wg_py', 'w')
+                off.close()
             if self.selected_option.get() >= 1:
-                set_on = open('wg_py.xml', 'r')
-                # using the for loop
-                for line in set_on:
-                    line = line.strip()
-                    changes = line.replace('false ' + select_tl, 'true ' + select_tl)
-                    os.system('nmcli con mod ' + str(select_tl) + ' connection.autoconnect yes')
-                    word_replace = word_replace + changes + "\n"
+                set_on = open('wg_py', 'w')
+                set_on.write(select_tl)
                 set_on.close()
-            set_off = open('wg_py.xml', 'w')
-            set_off.write(word_replace)
-            set_off.close()
 
         except IndexError:
             self.selected_option.set(1)
@@ -279,7 +261,7 @@ class OnOff(tk.Tk, FileHandle):
 
     def on_off(self):
         a_connect = {}
-        on_or_off = open('wg_py.xml', 'r')
+        on_or_off = open('wg_py', 'r')
         for line in on_or_off.readlines():
             line_splitted = line.split()
             a_connect[line_splitted[0]] = line_splitted[1]
diff --git a/wg_py b/wg_py
new file mode 100644
index 0000000..e69de29
diff --git a/wg_py.xml b/wg_py.xml
deleted file mode 100644
index 2d98c87..0000000
--- a/wg_py.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-false peer_iasus
-false rverEppingen

From 35406026f0b54c32d4787eda82a8a3518e7652e3 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Sun, 8 Sep 2024 20:31:46 +0200
Subject: [PATCH 3/5] little fixes replace os.system with check_call first
 steps in install Script add wg_start.service file

---
 .idea/workspace.xml | 19 ++++++++---
 install.py          | 17 ++++++++++
 main.py             | 35 +++++++++++++-------
 start_wg.py         |  4 +--
 wg_func.py          | 80 +++++++++++++++++++++++----------------------
 wg_start.service    | 10 ++++++
 6 files changed, 109 insertions(+), 56 deletions(-)
 create mode 100755 install.py
 create mode 100644 wg_start.service

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fab43ca..65f8540 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes">
-      <change afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wg_py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/home/punix/.config/wire_py/wg_py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/punix/.config/wire_py/wg_py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wg_py.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wg_py" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -47,6 +49,7 @@
   <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.main.executor&quot;: &quot;Run&quot;,
     &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
     &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
@@ -331,7 +334,15 @@
       <option name="project" value="LOCAL" />
       <updated>1725639633873</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="little fixes">
+      <option name="closed" value="true" />
+      <created>1725746027132</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1725746027132</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/install.py b/install.py
new file mode 100755
index 0000000..1b55074
--- /dev/null
+++ b/install.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python3
+import os
+from pathlib import Path
+
+home = Path.home()
+# for services file in /lib/systemd/system/
+path_for_a_con = home / '.config/wire_py/wg_py'
+# create dir in home
+mkdir = home / '.config/wire_py'
+os.makedirs(mkdir, exist_ok=True)
+
+with open(mkdir / 'wg_py', 'w+') as file:
+    if 'true' not in file:
+        file.write('false')
+
+file.close()
+
diff --git a/main.py b/main.py
index 6479b92..e3374dc 100755
--- a/main.py
+++ b/main.py
@@ -1,12 +1,14 @@
 #!/usr/bin/python3
 import os
 import tkinter as tk
+from subprocess import check_call
 from tkinter import ttk
-
+from pathlib import Path
 from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLabel, StartStopBTN, ShowAddress,
                      FileHandle, ExportTunnels, OnOff)
 
 font_color = '#4011a7'
+home = Path.home()
 
 
 class MainWindow(tk.Tk):
@@ -126,9 +128,9 @@ class FrameWidgets(ttk.Frame):
         # Button Vpn
         if self.a != '':
             StartStopBTN.button_stop(self)
-            wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf'
-            file = open(wg_read, 'r')
-            data = ConToDict.covert_to_dict(file)
+            wg_read = home / 'tester/' / str(self.a + '.conf')
+            with open(wg_read, 'r') as file:
+                data = ConToDict.covert_to_dict(file)
             # Address Label
             ShowAddress.init_and_report(self, data)
             ShowAddress.show_data(self)
@@ -151,9 +153,20 @@ class FrameWidgets(ttk.Frame):
             try:
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
-                os.system('nmcli connection delete ' + str(select_tl))
+                check_call(['nmcli', 'connection', 'delete', select_tl])
                 self.l_box.delete(self.select_tunnel[0])
-                os.remove(os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf')
+                os.remove(home / 'tester/' / str(select_tl + '.conf'))
+
+                path_to_file = home / '.config/wire_py/wg_py'
+                with open(path_to_file, 'r') as file2:
+                    for line in file2.readlines():
+                        a_con = line[5:]
+                if select_tl == a_con:
+                    self.selected_option.set(0)
+                    self.auto_con = 'no Autoconnect'
+                    with open(path_to_file, 'w') as file2:
+                        file2.write('false')
+                        file2.close()
 
                 # for disable checkbox when Listbox empty
                 tl = ListTunnels.tl_list()
@@ -209,10 +222,10 @@ class FrameWidgets(ttk.Frame):
                 StartStopBTN.button_start(self)
                 self.select_tunnel = self.l_box.curselection()
                 select_tl = self.l_box.get(self.select_tunnel[0])
-                os.system('nmcli connection up ' + str(select_tl))
-                wg_read = os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf'
-                file = open(wg_read, 'r')
-                data = ConToDict.covert_to_dict(file)
+                check_call(['nmcli', 'connection', 'up', select_tl])
+                wg_read = home / 'tester/' / str(select_tl + '.conf')
+                with open(wg_read, 'r') as file:
+                    data = ConToDict.covert_to_dict(file)
                 # Address Label
                 ShowAddress.init_and_report(self, data)
                 ShowAddress.show_data(self)
@@ -226,7 +239,7 @@ class FrameWidgets(ttk.Frame):
             elif self.a != '':
                 # Button Start/Stop
                 StartStopBTN.button_stop(self)
-                os.system('nmcli connection down ' + str(self.a))
+                check_call(['nmcli', 'connection', 'down', self.a])
                 # Button Start/Stop
                 StartStopBTN.button_start(self)
                 self.a = TunnelActiv.active()
diff --git a/start_wg.py b/start_wg.py
index af53a1c..d10eee5 100755
--- a/start_wg.py
+++ b/start_wg.py
@@ -3,10 +3,10 @@ from subprocess import check_call
 from pathlib import Path
 
 home = Path.home()
-path_to_file = home / 'Pyapps/wire-py/wg_py'
+path_to_file = home / '.config/wire_py/wg_py'
 
 with open(path_to_file, 'r') as file:
     for line in file.readlines():
         a_con = line[5:]
 check_call(['nmcli', 'connection', 'up', a_con])
-
+file.close()
diff --git a/wg_func.py b/wg_func.py
index c714be5..71f608b 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -4,8 +4,12 @@ import shutil
 from datetime import datetime
 from tkinter import filedialog, ttk
 import tkinter as tk
+from pathlib import Path
+from subprocess import check_call
 
+home = Path.home()
 font_color = '#4011a7'
+path_to_file = home / '.config/wire_py/wg_py'
 
 
 class Message(tk.Tk):
@@ -23,7 +27,8 @@ class Message(tk.Tk):
         self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
         self.columnconfigure(0, weight=1)
 
-        self.label = tk.Label(self, image=self.warning_pic,
+        self.label = tk.Label(self,
+                              image=self.warning_pic,
                               text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
         self.label.config(font=('Ubuntu', 11), padx=15, pady=15)
         self.label.grid(column=0, row=0)
@@ -160,11 +165,10 @@ class ListTunnels:
         return tl
 
 
-class ImportTunnel:
-    def __init__(self):
-        self.enp = None
-        self.DNS = None
-        self.add = None
+class ImportTunnel(tk.Tk):
+    def __init__(self, container, **kwargs):
+        super().__init__(container, **kwargs)
+
         self.select_tunnel = None
         self.wg_switch = None
         self.btn_stst = None
@@ -175,7 +179,7 @@ class ImportTunnel:
 
     def wg_import_select(self):
         try:
-            filepath = filedialog.askopenfilename(initialdir=os.environ['HOME'], title='Select Wireguard config File',
+            filepath = filedialog.askopenfilename(initialdir=home, title='Select Wireguard config File',
                                                   filetypes=[('WG config files', '*.conf')])
             file = open(filepath, 'r')
             read = file.read()
@@ -184,18 +188,18 @@ class ImportTunnel:
             path_split1 = path_split[-1]
             if 'PrivateKey = ' in read and 'PublicKey = ' in read:
                 if len(path_split1) > 17:
-                    p1 = shutil.copy(filepath, os.environ['HOME'] + '/tester/')
+                    p1 = shutil.copy(filepath, home / 'tester/')
                     path_split = path_split1[len(path_split1) - 17:]
-                    os.rename(p1, os.environ['HOME'] + '/tester/' + str(path_split))
+                    os.rename(p1, home / 'tester/' / str(path_split))
                     if self.a != '':
-                        os.system('nmcli connection down ' + str(TunnelActiv.active()))
-                    os.system('nmcli connection import type wireguard file ' + os.environ['HOME'] + '/tester/' +
-                              str(path_split))
+                        check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
+                    check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', home / 'tester' /
+                                path_split])
                 else:
-                    shutil.copy(filepath, os.environ['HOME'] + '/tester/')
+                    shutil.copy(filepath, home / 'tester/')
                     if self.a != '':
-                        os.system('nmcli connection down ' + str(TunnelActiv.active()))
-                    os.system('nmcli connection import type wireguard file ' + str(filepath))
+                        check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
+                    check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', filepath])
 
                 self.StrVar.set('')
                 self.a = TunnelActiv.active()
@@ -205,14 +209,14 @@ class ImportTunnel:
                 self.StrVar.set(self.a)
                 GreenLabel.green_show_label(self)
                 StartStopBTN.button_stop(self)
-                wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf'
-                file = open(wg_read, 'r')
-                data = ConToDict.covert_to_dict(file)
+                wg_read = home / 'tester/' / str(self.a + '.conf')
+                with open(wg_read, 'r') as file:
+                    data = ConToDict.covert_to_dict(file)
                 # Address Label
                 ShowAddress.init_and_report(self, data)
                 ShowAddress.show_data(self)
                 file.close()
-                os.system('nmcli con mod ' + str(self.a) + ' connection.autoconnect no')
+                check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
             if 'PrivateKey = ' not in read:
                 Message()
         except EOFError:
@@ -241,11 +245,12 @@ class FileHandle:
             self.select_tunnel = self.l_box.curselection()
             select_tl = self.l_box.get(self.select_tunnel[0])
             if self.selected_option.get() == 0:
-                off = open('wg_py', 'w')
+                off = open(path_to_file, 'w')
+                off.write('false ' + '\n')
                 off.close()
             if self.selected_option.get() >= 1:
-                set_on = open('wg_py', 'w')
-                set_on.write(select_tl)
+                set_on = open(path_to_file, 'w')
+                set_on.write('true ' + select_tl)
                 set_on.close()
 
         except IndexError:
@@ -260,20 +265,17 @@ class OnOff(tk.Tk, FileHandle):
         self.lb_frame_buttons = None
 
     def on_off(self):
-        a_connect = {}
-        on_or_off = open('wg_py', 'r')
-        for line in on_or_off.readlines():
-            line_splitted = line.split()
-            a_connect[line_splitted[0]] = line_splitted[1]
-        if 'true' in a_connect:
-            self.selected_option.set(1)
-            self.autoconnect_var.set('')
-            self.auto_con = a_connect['true']
-
-        else:
-            self.wg_autostart.configure(state='disabled')
-            self.auto_con = 'no Autoconnect'
-        on_or_off.close()
+        with open(path_to_file, 'r') as file:
+            for line in file.readlines():
+                a_connect = line
+            if 'true' in a_connect:
+                self.selected_option.set(1)
+                self.autoconnect_var.set('')
+                self.auto_con = a_connect[5:]
+            else:
+                self.wg_autostart.configure(state='disabled')
+                self.auto_con = 'no Autoconnect'
+        file.close()
 
         self.autoconnect_var = tk.StringVar()
         self.autoconnect_var.set(self.auto_con)
@@ -286,12 +288,12 @@ class ExportTunnels:
     @staticmethod
     def wg_export():
         now_time = datetime.now()
-        now_datetime = now_time.strftime('/wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
+        now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
         tl = ListTunnels.tl_list()
         try:
             if len(tl) != 0:
-                wg_tar = os.environ['HOME'] + now_datetime
-                p_to_conf = os.environ['HOME'] + '/tester'
+                wg_tar = home / now_datetime
+                p_to_conf = home / 'tester/'
                 shutil.make_archive(wg_tar, 'zip', p_to_conf)
                 #if zip_full != 0:
                 #print('Export erfolgraeich')
diff --git a/wg_start.service b/wg_start.service
new file mode 100644
index 0000000..6d86638
--- /dev/null
+++ b/wg_start.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Automatic Tunnel Start
+After=network-online.target 
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/sleep 3
+ExecStart=/bin/start_wg.py
+[Install]
+WantedBy=multi-user.target

From 8fa6e6374f4adaec61761b0baf54ff984e7380a2 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Tue, 10 Sep 2024 20:06:33 +0200
Subject: [PATCH 4/5] little fixes a labels when stop and start, installer
 first functions works

---
 .idea/workspace.xml | 20 +++++++++++++-------
 install.py          | 31 ++++++++++++++++++++++++++++++-
 main.py             | 17 ++++++++++-------
 start_wg.py         | 12 ++++++------
 wg_func.py          |  7 +++++++
 5 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 65f8540..3d2ae66 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes">
-      <change afterPath="$PROJECT_DIR$/home/punix/.config/wire_py/wg_py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/punix/.config/wire_py/wg_py" afterDir="false" />
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/install.py" beforeDir="false" afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
@@ -342,7 +340,15 @@
       <option name="project" value="LOCAL" />
       <updated>1725746027132</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file">
+      <option name="closed" value="true" />
+      <created>1725820337669</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1725820337669</updated>
+    </task>
+    <option name="localTasksCounter" value="29" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -370,7 +376,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Tunnel Start and Stop Work" />
     <MESSAGE value="wg_import_select in wg_func.py extended" />
     <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window" />
     <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic" />
@@ -395,6 +400,7 @@
     <MESSAGE value="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write" />
     <MESSAGE value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
     <MESSAGE value="little fixes" />
-    <option name="LAST_COMMIT_MESSAGE" value="little fixes" />
+    <MESSAGE value="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file" />
+    <option name="LAST_COMMIT_MESSAGE" value="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file" />
   </component>
 </project>
\ No newline at end of file
diff --git a/install.py b/install.py
index 1b55074..6b80cb8 100755
--- a/install.py
+++ b/install.py
@@ -1,10 +1,30 @@
 #!/usr/bin/python3
 import os
 from pathlib import Path
+import subprocess
+from getpass import getpass
 
+startfile = ['#!/usr/bin/python3',
+             'from subprocess import check_call', '\n',
+
+             'path_to_file = ', '\n',
+
+             'with open(path_to_file, 'r') as file:',
+             '    for line in file.readlines():    ',
+             '        a_con = line[5:]             ',
+             "check_call(['nmcli', 'connection', 'up', a_con])",
+             'file.close()']
 home = Path.home()
 # for services file in /lib/systemd/system/
 path_for_a_con = home / '.config/wire_py/wg_py'
+# replace in startfile
+startfile[3] = 'path_to_file = ' "'" + str(path_for_a_con) + "'"
+
+with open('start_wg.py', 'w') as file_for_a_con:
+    for line in startfile:
+        file_for_a_con.write(line + '\n')
+file_for_a_con.close()
+
 # create dir in home
 mkdir = home / '.config/wire_py'
 os.makedirs(mkdir, exist_ok=True)
@@ -12,6 +32,15 @@ os.makedirs(mkdir, exist_ok=True)
 with open(mkdir / 'wg_py', 'w+') as file:
     if 'true' not in file:
         file.write('false')
-
 file.close()
 
+# Prompt the user for the sudo password
+sudo_password = getpass('Enter sudo password: ')
+#def cp_files():
+
+# Define the command to run the Python script with sudo
+#command = ['sudo', '-S', 'python3', 'script.py']
+
+# Run the command as a subprocess, passing the sudo password
+#subprocess.run(command, input=sudo_password.encode(), check=True)
+
diff --git a/main.py b/main.py
index e3374dc..48f56ea 100755
--- a/main.py
+++ b/main.py
@@ -163,22 +163,23 @@ class FrameWidgets(ttk.Frame):
                         a_con = line[5:]
                 if select_tl == a_con:
                     self.selected_option.set(0)
-                    self.auto_con = 'no Autoconnect'
-                    with open(path_to_file, 'w') as file2:
-                        file2.write('false')
-                        file2.close()
-
+                    self.autoconnect_var.set('no Autoconnect')
                 # for disable checkbox when Listbox empty
                 tl = ListTunnels.tl_list()
                 if len(tl) == 0:
                     self.wg_autostart.configure(state='disabled')
+                    with open(path_to_file, 'w') as file2:
+                        file2.write('false')
+                        file2.close()
 
                 if self.a != '' and self.a == select_tl:
                     self.StrVar.set(value='')
                     StartStopBTN.button_start(self)
                     self.l_box.update()
                     # Address Label
-                    ShowAddress.label_empty(self)
+                    self.add.set('')
+                    self.DNS.set('')
+                    self.enp.set('')
 
                 return select_tl
             except IndexError:
@@ -246,7 +247,9 @@ class FrameWidgets(ttk.Frame):
                 self.StrVar.set('')
                 GreenLabel.green_show_label(self)
                 # Address Label
-                ShowAddress.label_empty(self)
+                self.add.set('')
+                self.DNS.set('')
+                self.enp.set('')
                 ShowAddress.show_data(self)
         except IndexError:
             pass
diff --git a/start_wg.py b/start_wg.py
index d10eee5..dee75fd 100755
--- a/start_wg.py
+++ b/start_wg.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python3
 from subprocess import check_call
-from pathlib import Path
 
-home = Path.home()
-path_to_file = home / '.config/wire_py/wg_py'
 
-with open(path_to_file, 'r') as file:
-    for line in file.readlines():
-        a_con = line[5:]
+path_to_file = '/home/punix/.config/wire_py/wg_py'
+
+
+with open(path_to_file, ) as file:
+    for line in file.readlines():    
+        a_con = line[5:]             
 check_call(['nmcli', 'connection', 'up', a_con])
 file.close()
diff --git a/wg_func.py b/wg_func.py
index 71f608b..af4e224 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -186,19 +186,23 @@ class ImportTunnel(tk.Tk):
             file.close()
             path_split = filepath.split('/')
             path_split1 = path_split[-1]
+            self.a = TunnelActiv.active()
             if 'PrivateKey = ' in read and 'PublicKey = ' in read:
                 if len(path_split1) > 17:
                     p1 = shutil.copy(filepath, home / 'tester/')
                     path_split = path_split1[len(path_split1) - 17:]
                     os.rename(p1, home / 'tester/' / str(path_split))
+
                     if self.a != '':
                         check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
+                        ShowAddress.label_empty(self)
                     check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', home / 'tester' /
                                 path_split])
                 else:
                     shutil.copy(filepath, home / 'tester/')
                     if self.a != '':
                         check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
+                        ShowAddress.label_empty(self)
                     check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', filepath])
 
                 self.StrVar.set('')
@@ -248,6 +252,9 @@ class FileHandle:
                 off = open(path_to_file, 'w')
                 off.write('false ' + '\n')
                 off.close()
+                tl = ListTunnels.tl_list()
+                if len(tl) == 0:
+                    self.wg_autostart.configure(state='disabled')
             if self.selected_option.get() >= 1:
                 set_on = open(path_to_file, 'w')
                 set_on.write('true ' + select_tl)

From d1a822fff0ed7625b8cb7f3e0daf3171d4a10223 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Sat, 14 Sep 2024 23:25:48 +0200
Subject: [PATCH 5/5] little fixes, add msg_window() function for Messagebox to
 show a tk.Toplevel() replace var = open() with: with open() as var: and
 remove by classes (tk.tk) and super()

---
 .idea/workspace.xml |  31 +++++++++--
 install.py          |  46 ++++++----------
 main.py             |  12 ++---
 start_wg.py         |   9 ++--
 wg_func.py          | 128 ++++++++++++++++++++++----------------------
 5 files changed, 115 insertions(+), 111 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3d2ae66..153e2ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file">
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes a labels when stop and start, installer first functions works">
+      <change afterPath="$PROJECT_DIR$/message.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test2.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/install.py" beforeDir="false" afterPath="$PROJECT_DIR$/install.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
@@ -47,8 +50,10 @@
   <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.wg_func.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
@@ -348,10 +353,23 @@
       <option name="project" value="LOCAL" />
       <updated>1725820337669</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
+      <option name="closed" value="true" />
+      <created>1725991610908</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1725991610908</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
+    <option name="OPEN_GENERIC_TABS">
+      <map>
+        <entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4" value="TOOL_WINDOW" />
+      </map>
+    </option>
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
@@ -371,12 +389,16 @@
             </State>
           </value>
         </entry>
+        <entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4">
+          <value>
+            <State />
+          </value>
+        </entry>
       </map>
     </option>
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="wg_import_select in wg_func.py extended" />
     <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window" />
     <MESSAGE value="add class Frame and class Massage, delete funktion go 100%, add resize window, add warning pic" />
     <MESSAGE value="add class ListTunnels and class ImportTunnel, and add class ExportTunnels (ExportTunnels no finish)" />
@@ -401,6 +423,7 @@
     <MESSAGE value="add Frame widget 3&#10;for Buttons and Listbox with Scrollbar.&#10;all Widgets new format&#10;delete works now of disable checkbox when Listbox empty (part two)" />
     <MESSAGE value="little fixes" />
     <MESSAGE value="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file" />
-    <option name="LAST_COMMIT_MESSAGE" value="little fixes replace os.system with check_call&#10;first steps in install Script add wg_start.service file" />
+    <MESSAGE value="little fixes a labels when stop and start, installer first functions works" />
+    <option name="LAST_COMMIT_MESSAGE" value="little fixes a labels when stop and start, installer first functions works" />
   </component>
 </project>
\ No newline at end of file
diff --git a/install.py b/install.py
index 6b80cb8..0ed4497 100755
--- a/install.py
+++ b/install.py
@@ -1,41 +1,30 @@
 #!/usr/bin/python3
-import os
 from pathlib import Path
-import subprocess
 from getpass import getpass
 
-startfile = ['#!/usr/bin/python3',
-             'from subprocess import check_call', '\n',
-
-             'path_to_file = ', '\n',
-
-             'with open(path_to_file, 'r') as file:',
-             '    for line in file.readlines():    ',
-             '        a_con = line[5:]             ',
-             "check_call(['nmcli', 'connection', 'up', a_con])",
-             'file.close()']
-home = Path.home()
 # for services file in /lib/systemd/system/
-path_for_a_con = home / '.config/wire_py/wg_py'
-# replace in startfile
-startfile[3] = 'path_to_file = ' "'" + str(path_for_a_con) + "'"
+config_path = Path.home() / ".config" / "wire_py" / "wg_py"
 
-with open('start_wg.py', 'w') as file_for_a_con:
-    for line in startfile:
-        file_for_a_con.write(line + '\n')
-file_for_a_con.close()
+start_file = f'''\
+#!/usr/bin/python3
+from subprocess import check_call
 
-# create dir in home
-mkdir = home / '.config/wire_py'
-os.makedirs(mkdir, exist_ok=True)
+path_to_file = {str(config_path)!r}
 
-with open(mkdir / 'wg_py', 'w+') as file:
-    if 'true' not in file:
-        file.write('false')
-file.close()
+with open(path_to_file, 'r') as file:
+    *_, line = file
+a_con = line[5:]
+check_call(['nmcli', 'connection', 'up', a_con])
+'''
+
+Path("start_wg.py").write_text(start_file)
+
+config_path.parent.mkdir(exist_ok=True)
+if not Path.exists(config_path):
+    config_path.write_text("false")
 
 # Prompt the user for the sudo password
-sudo_password = getpass('Enter sudo password: ')
+#sudo_password = getpass('Enter sudo password: ')
 #def cp_files():
 
 # Define the command to run the Python script with sudo
@@ -43,4 +32,3 @@ sudo_password = getpass('Enter sudo password: ')
 
 # Run the command as a subprocess, passing the sudo password
 #subprocess.run(command, input=sudo_password.encode(), check=True)
-
diff --git a/main.py b/main.py
index 48f56ea..99d97c8 100755
--- a/main.py
+++ b/main.py
@@ -8,7 +8,6 @@ from wg_func import (TunnelActiv, ListTunnels, ImportTunnel, ConToDict, GreenLab
                      FileHandle, ExportTunnels, OnOff)
 
 font_color = '#4011a7'
-home = Path.home()
 
 
 class MainWindow(tk.Tk):
@@ -128,13 +127,12 @@ class FrameWidgets(ttk.Frame):
         # Button Vpn
         if self.a != '':
             StartStopBTN.button_stop(self)
-            wg_read = home / 'tester/' / str(self.a + '.conf')
+            wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
             with open(wg_read, 'r') as file:
                 data = ConToDict.covert_to_dict(file)
             # Address Label
             ShowAddress.init_and_report(self, data)
             ShowAddress.show_data(self)
-            file.close()
         else:
             StartStopBTN.button_start(self)
             # Address Label
@@ -155,9 +153,9 @@ class FrameWidgets(ttk.Frame):
                 select_tl = self.l_box.get(self.select_tunnel[0])
                 check_call(['nmcli', 'connection', 'delete', select_tl])
                 self.l_box.delete(self.select_tunnel[0])
-                os.remove(home / 'tester/' / str(select_tl + '.conf'))
+                os.remove(Path.home() / 'tester/' / str(select_tl + '.conf'))
 
-                path_to_file = home / '.config/wire_py/wg_py'
+                path_to_file = Path.home() / '.config/wire_py/wg_py'
                 with open(path_to_file, 'r') as file2:
                     for line in file2.readlines():
                         a_con = line[5:]
@@ -170,7 +168,6 @@ class FrameWidgets(ttk.Frame):
                     self.wg_autostart.configure(state='disabled')
                     with open(path_to_file, 'w') as file2:
                         file2.write('false')
-                        file2.close()
 
                 if self.a != '' and self.a == select_tl:
                     self.StrVar.set(value='')
@@ -224,13 +221,12 @@ class FrameWidgets(ttk.Frame):
                 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 = home / 'tester/' / str(select_tl + '.conf')
+                wg_read = Path.home() / 'tester/' / str(select_tl + '.conf')
                 with open(wg_read, 'r') as file:
                     data = ConToDict.covert_to_dict(file)
                 # Address Label
                 ShowAddress.init_and_report(self, data)
                 ShowAddress.show_data(self)
-                file.close()
                 # Button Start/Stop
                 StartStopBTN.button_stop(self)
                 self.a = TunnelActiv.active()
diff --git a/start_wg.py b/start_wg.py
index dee75fd..8c13876 100755
--- a/start_wg.py
+++ b/start_wg.py
@@ -1,12 +1,9 @@
 #!/usr/bin/python3
 from subprocess import check_call
 
-
 path_to_file = '/home/punix/.config/wire_py/wg_py'
 
-
-with open(path_to_file, ) as file:
-    for line in file.readlines():    
-        a_con = line[5:]             
+with open(path_to_file, 'r') as file:
+    *_, line = file
+a_con = line[5:]
 check_call(['nmcli', 'connection', 'up', a_con])
-file.close()
diff --git a/wg_func.py b/wg_func.py
index af4e224..34a91d7 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -7,39 +7,37 @@ import tkinter as tk
 from pathlib import Path
 from subprocess import check_call
 
-home = Path.home()
 font_color = '#4011a7'
-path_to_file = home / '.config/wire_py/wg_py'
+path_to_file = Path.home() / '.config/wire_py/wg_py'
 
 
-class Message(tk.Tk):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.warning_pic = None
-        self.x_width = 300
-        self.y_height = 120
-        self.monitor_center_x = self.winfo_screenwidth() / 2 - (self.x_width / 2)
-        self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 2)
-        self.resizable(width=False, height=False)
-        self.title('Import error!')
-        self.configure()
-        self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
-        self.columnconfigure(0, weight=1)
-
-        self.label = tk.Label(self,
-                              image=self.warning_pic,
-                              text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
-        self.label.config(font=('Ubuntu', 11), padx=15, pady=15)
-        self.label.grid(column=0, row=0)
-        self.button = tk.Button(self, text='OK', command=self.destroy)
-        self.button.config(padx=15, pady=5)
-        self.button.grid(column=0, row=1)
+def msg_window():
+    msg = tk.Toplevel()
+    msg.resizable(width=False, height=False)
+    msg.x_width = 340
+    msg.y_height = 140
+    msg.title('Import error!')
+    msg.monitor_center_x = msg.winfo_screenwidth() / 2 - (msg.x_width / 2)
+    msg.monitor_center_y = msg.winfo_screenheight() / 2 - (msg.y_height / 2)
+    msg.geometry('%dx%d+%d+%d' % (msg.x_width, msg.y_height, msg.monitor_center_x, msg.monitor_center_y))
+    msg.columnconfigure(0, weight=1)
+    msg.configure(pady=20)
+    msg.warning = tk.PhotoImage(file=r'icons/warning_64.png')
+    msg.i_warning = tk.Label(msg, image=msg.warning)
+    msg.i_warning.grid(column=0, row=0)
+    label = tk.Label(msg, text='Oh... no valid Wireguard File!\nPlease select a valid Wireguard File')
+    label.config(font=('Ubuntu', 11), padx=15, pady=15)
+    label.grid(column=1, row=0)
+    button = tk.Button(msg, text='OK', command=msg.destroy)
+    button.config(padx=15, pady=5)
+    button.grid(column=0, columnspan=2, row=1)
+    wg_icon_2 = tk.PhotoImage(file=r'icons/wg-stop.png')
+    msg.iconphoto(True, wg_icon_2)
+    msg.winfo_toplevel()
 
 
-class GreenLabel(tk.Tk):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class GreenLabel:
+    def __init__(self):
         self.StrVar = None
         self.lb_tunnel = None
 
@@ -50,10 +48,15 @@ class GreenLabel(tk.Tk):
         self.columnconfigure(2, weight=1)
         self.rowconfigure(0, weight=1)
 
+    def columnconfigure(self, param, weight):
+        pass
 
-class StartStopBTN(tk.Tk):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def rowconfigure(self, param, weight):
+        pass
+
+
+class StartStopBTN:
+    def __init__(self):
         self.lb_frame_btn_lbox = None
         self.wg_switch = None
         self.btn_stst = None
@@ -116,9 +119,8 @@ class TunnelActiv:
         return active
 
 
-class ShowAddress(tk.Tk):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class ShowAddress:
+    def __init__(self):
         self.lb_frame2 = None
         self.lb_frame = None
         self.endpoint = None
@@ -165,9 +167,9 @@ class ListTunnels:
         return tl
 
 
-class ImportTunnel(tk.Tk):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class ImportTunnel:
+
+    def __init__(self):
 
         self.select_tunnel = None
         self.wg_switch = None
@@ -179,27 +181,26 @@ class ImportTunnel(tk.Tk):
 
     def wg_import_select(self):
         try:
-            filepath = filedialog.askopenfilename(initialdir=home, title='Select Wireguard config File',
-                                                  filetypes=[('WG config files', '*.conf')])
-            file = open(filepath, 'r')
-            read = file.read()
-            file.close()
+            filepath = filedialog.askopenfilename(initialdir=Path.home(), 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 = TunnelActiv.active()
             if 'PrivateKey = ' in read and 'PublicKey = ' in read:
                 if len(path_split1) > 17:
-                    p1 = shutil.copy(filepath, home / 'tester/')
+                    p1 = shutil.copy(filepath, Path.home() / 'tester/')
                     path_split = path_split1[len(path_split1) - 17:]
-                    os.rename(p1, home / 'tester/' / str(path_split))
+                    os.rename(p1, Path.home() / 'tester/' / str(path_split))
 
                     if self.a != '':
                         check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
                         ShowAddress.label_empty(self)
-                    check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', home / 'tester' /
+                    check_call(['nmcli', 'connection', 'import', 'type', 'wireguard', 'file', Path.home() / 'tester' /
                                 path_split])
                 else:
-                    shutil.copy(filepath, home / 'tester/')
+                    shutil.copy(filepath, Path.home() / 'tester/')
                     if self.a != '':
                         check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
                         ShowAddress.label_empty(self)
@@ -213,16 +214,15 @@ class ImportTunnel(tk.Tk):
                 self.StrVar.set(self.a)
                 GreenLabel.green_show_label(self)
                 StartStopBTN.button_stop(self)
-                wg_read = home / 'tester/' / str(self.a + '.conf')
+                wg_read = Path.home() / 'tester/' / str(self.a + '.conf')
                 with open(wg_read, 'r') as file:
                     data = ConToDict.covert_to_dict(file)
                 # Address Label
                 ShowAddress.init_and_report(self, data)
                 ShowAddress.show_data(self)
-                file.close()
                 check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
             if 'PrivateKey = ' not in read:
-                Message()
+                msg_window()
         except EOFError:
             pass
         except TypeError:
@@ -242,23 +242,20 @@ class FileHandle:
         self.tl = None
         self.selected_option = None
         self.l_box = None
-        self.select_tunnel = None
 
     def box_set(self):
         try:
-            self.select_tunnel = self.l_box.curselection()
-            select_tl = self.l_box.get(self.select_tunnel[0])
+            select_tunnel = self.l_box.curselection()
+            select_tl = self.l_box.get(select_tunnel[0])
             if self.selected_option.get() == 0:
-                off = open(path_to_file, 'w')
-                off.write('false ' + '\n')
-                off.close()
+                with open(path_to_file, 'w') as off:
+                    off.write('false ' + '\n')
                 tl = ListTunnels.tl_list()
                 if len(tl) == 0:
                     self.wg_autostart.configure(state='disabled')
             if self.selected_option.get() >= 1:
-                set_on = open(path_to_file, 'w')
-                set_on.write('true ' + select_tl)
-                set_on.close()
+                with open(path_to_file, 'w') as set_on:
+                    set_on.write('true ' + select_tl)
 
         except IndexError:
             self.selected_option.set(1)
@@ -266,9 +263,13 @@ class FileHandle:
         OnOff.on_off(self)
 
 
-class OnOff(tk.Tk, FileHandle):
-    def __init__(self, container, **kwargs):
-        super().__init__(container, **kwargs)
+class OnOff:
+    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):
@@ -282,7 +283,6 @@ class OnOff(tk.Tk, FileHandle):
             else:
                 self.wg_autostart.configure(state='disabled')
                 self.auto_con = 'no Autoconnect'
-        file.close()
 
         self.autoconnect_var = tk.StringVar()
         self.autoconnect_var.set(self.auto_con)
@@ -299,8 +299,8 @@ class ExportTunnels:
         tl = ListTunnels.tl_list()
         try:
             if len(tl) != 0:
-                wg_tar = home / now_datetime
-                p_to_conf = home / 'tester/'
+                wg_tar = Path.home() / now_datetime
+                p_to_conf = Path.home() / 'tester/'
                 shutil.make_archive(wg_tar, 'zip', p_to_conf)
                 #if zip_full != 0:
                 #print('Export erfolgraeich')