Merge pull request '1.10.1924' (#18) from 1.10.1924 into main

Reviewed-on: #18

.idea/workspace.xml

@@ -4,14 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- Optimize Class and Tooltip">
-      <change afterPath="$PROJECT_DIR$/run_as" afterDir="false" />
+    <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Theme modify to water-theme&#10; - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu">
       <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$/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>
@@ -36,10 +30,6 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="UPDATE_TYPE" value="REBASE" />
   </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/wg_func.py" root0="SKIP_INSPECTION" />
-    <setting file="file://$PROJECT_DIR$/wg_main.py" root0="FORCE_HIGHLIGHTING" />
-  </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 3
 }</component>
@@ -64,10 +54,9 @@
     &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;
+    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.editor&quot;
   }
 }</component>
   <component name="RecentsManager">
@@ -148,6 +137,46 @@
       <option name="presentableId" value="Default" />
       <updated>1723279982210</updated>
     </task>
+    <task id="LOCAL-00012" summary="fixed error when active tunnel is deleted,&#10;now also the Address Label is emptied">
+      <option name="closed" value="true" />
+      <created>1724400463791</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1724400463791</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>
+      <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>
@@ -500,47 +529,7 @@
       <option name="project" value="LOCAL" />
       <updated>1729283719951</updated>
     </task>
-    <task id="LOCAL-00061" summary=" - Add Options, Help, Update Label and Update Menubutton &#10; - Theme now separate Light and Dark">
-      <option name="closed" value="true" />
-      <created>1729353898829</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1729353898830</updated>
-    </task>
-    <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>
-    <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" />
+    <option name="localTasksCounter" value="61" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -581,6 +570,9 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="fix rename in Messagebox warning to error" />
+    <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" />
     <MESSAGE value="fix install and .desktop File Tar works now for user home and filebrowser.askfilebrowser start now in user home" />
@@ -603,18 +595,15 @@
     <MESSAGE value="Fix msg_window and remove x , y argument&#10;Install further adapted and with colored&#10;text if user is not in group sudo or wheel.&#10;Added to install Opensuse for installation" />
     <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" />
-    <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" />
+    <option name="LAST_COMMIT_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" />
   </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" />
+          <url>file://$PROJECT_DIR$/wg_main.py</url>
+          <line>185</line>
+          <option name="timeStamp" value="1" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

Changelog

@@ -4,57 +4,18 @@ 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
- - Update search after start of Wire-Py
-
-
-  ### Added
-08-11-2024
-
-- methods from class MainWindow move to class FrameWidgets for active color_label when theme change
-- optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets
-- add new Frame for Widgets on Bottom
-- optimize from tkinter * to from tkinter import filedialog, ttk, TclError
-
-  ### Added
-07-11-2024
-
-- remove classes and add methods to class FrameWidgets (removed self errors)
-
-
-  ### 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
-25-10-2024
-
-- Optimize Class and Tooltip
-
-
-  ### Added
-21-10-2024
-
-- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip
-
+ - Keeping Classes Together
 
  ### Added
 19-10-2024
 
  - Add Options, Help, Update Label and Update Menubutton
  - Theme now separate Light and Dark
- - Add Own Tooltip (Class and def's) Part One
 
  ### Added
 16-10-2024

README.md

@@ -1,25 +1,2 @@
 # Wire-Py
 
-Wire-Py is an easy-to-use Gui for nmcli.
-
-Before the first use of Wire-Py, all previous tunnels with "nmcli connection delete example" should be removed.
-
-Wire-Py can easily be imported, exported, started, popped as well as renamed and deleted.
-
-Wire-Py runs on many distros.
-Tested on Arch Linux, OpenSuse Tumbleweed,
-Fedora, Debian12, Linux Mint 22 Cinnamon
-
-With the desktops:
-Xfce4, Cinnamon, Kde, and Mate, LXDE, LXQT
-
-
-# Screenshots
-[![wire-py.png](https://fb.ilunix.de/api/public/dl/0cx7pPYK?inline=true)](https://fb.ilunix.de/share/0cx7pPYK)
-
-# Instruction
-
-[![Import.png](https://fb.ilunix.de/api/public/dl/VpYEn3Gz?inline=true)](https://fb.ilunix.de/share/VpYEn3Gz)
-[![Stop.png](https://fb.ilunix.de/api/public/dl/zBnbIiyD?inline=true)](https://fb.ilunix.de/share/zBnbIiyD)
-[![export.png](https://fb.ilunix.de/api/public/dl/gMc4-NAj?inline=true)](https://fb.ilunix.de/share/gMc4-NAj)
-[![rename.png](https://fb.ilunix.de/api/public/dl/v0y_WiqV?inline=true)](https://fb.ilunix.de/share/v0y_WiqV)

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 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 -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 -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 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 -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 -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 run_as open_gitea.py /usr/bin/ && \
+                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.conf /etc/wire_py/ && \
+                sudo cp -u settings theme /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 run_as open_gitea.py /usr/bin/ && \
+                 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.conf /etc/wire_py/ && \
+                 sudo cp -u settings theme /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 && \

open_gitea.py

@@ -1,5 +0,0 @@
-#!/usr/bin/python3
-
-import webbrowser
-
-webbrowser.open('https://git.ilunix.de/punix/Wire-Py')

run_as

@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/bin/./open_gitea.py

settings

@@ -0,0 +1 @@
+Update on

settings.conf

@@ -1,8 +0,0 @@
-[UPDATES]
-on
-[THEME]
-light
-[TOOLTIP]
-True
-[AUTOSTART ON]
-off

start_wg.py

@@ -2,13 +2,11 @@
 from subprocess import check_call
 from pathlib import Path
 
-path_to_file = Path('/etc/wire_py/settings.conf')
+path_to_file = Path('/etc/wire_py/wg_py')
 
-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
+if Path.exists(path_to_file):
+    a_con = Path.read_text(path_to_file)
+    check_call(['nmcli', 'connection', 'up', a_con])
+else:
+    pass
 

testtheme.py

@@ -0,0 +1,27 @@
+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()

theme

@@ -0,0 +1 @@
+light

wg_func.py

@@ -3,20 +3,20 @@
 import os
 import shutil
 import subprocess
-import time
 import tkinter as tk
 import zipfile
 from datetime import datetime
 from pathlib import Path
 from subprocess import check_call
-from tkinter import ttk
+from tkinter import filedialog, ttk
 import requests
 
-
 ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
-version = 'v. 1.11.0824'
+version = 'v. 1.10.1924'
 
-path_to_file2 = Path('/etc/wire_py/settings.conf')
+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')
 _u = Path.read_text(Path('/tmp/_u'))
 
 UPDATE_API_URL = 'https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases'
@@ -31,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 'on\n' in set_file:
+                if 'Update on' in set_file:
                     if version[3:] != response_dict['tag_name']:
                         return response_dict['tag_name']
                     else:
@@ -74,9 +74,7 @@ class WirePyUpdate:
 
 res = WirePyUpdate.api_down()
 
-
-
-def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
+def msg_window(img_w, img_i, w_title, w_txt):
     """
     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.
@@ -93,25 +91,13 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
     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)
-
-    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)
-
+    button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
+    button.config()
+    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)
@@ -119,19 +105,64 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
     msg.winfo_toplevel()
 
 
-class Tunnel:
-
+class GreenLabel:
     """
-    Class of Methods for Wire-Py
+    Show the active tunnel in green in the label
     """
 
+    def __init__(self):
+        self.StrVar = None
+        self.lb_tunnel = None
+
+    def green_show_label(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')
+
+            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)
+        self.columnconfigure(2, weight=1)
+        self.rowconfigure(0, weight=1)
+
+    def columnconfigure(self, param, weight):
+        pass
+
+    def rowconfigure(self, param, weight):
+        pass
+
+
+class StartStopBTN:
+    """
+    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 button_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 button_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)
+
+
+class ConToDict:
     """
     The config file is packed into a dictionary,
     to display the values Address , DNS and Peer in the labels
     """
 
     @classmethod
-    def con_to_dict(cls, file):
+    def covert_to_dict(cls, file):
 
         dictlist = []
         for lines in file.readlines():
@@ -172,6 +203,7 @@ class Tunnel:
         return address, dns, endpoint, pre_key
 
 
+class TunnelActiv:
     """
     Shows the Active Tunnel
     """
@@ -187,12 +219,61 @@ class Tunnel:
 
         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 """
+        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))
+
+
+class ListTunnels:
     """
     Shows all existing Wireguard tunnels
     """
 
     @staticmethod
-    def list():
+    def tl_list():
         wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
 
         ''' tl = Tunnel list # Show of 4.Element in list '''
@@ -200,6 +281,195 @@ class Tunnel:
         return tl
 
 
+class ImportTunnel:
+    """
+    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.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 wg_import_select(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 = TunnelActiv.active()
+
+            if 'PrivateKey = ' in read and 'PublicKey = ' in read:
+                with open(filepath, 'r') as file:
+                    key = ConToDict.covert_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', TunnelActiv.active()])
+                                            ShowAddress.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', TunnelActiv.active()])
+                                            ShowAddress.label_empty(self)
+
+                                        subprocess.check_output(['nmcli', 'connection', 'import', 'type',
+                                                                 'wireguard', 'file', filepath], text=True)
+
+                                    self.StrVar.set('')
+                                    self.a = TunnelActiv.active()
+                                    self.l_box.insert(0, self.a)
+                                    self.l_box.update()
+                                    self.StrVar = tk.StringVar()
+                                    self.StrVar.set(self.a)
+                                    GreenLabel.green_show_label(self)
+                                    StartStopBTN.button_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)
+
+                                    ''' Address Label '''
+                                    ShowAddress.init_and_report(self, data)
+                                    ShowAddress.show_data(self)
+                                    check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
+                                    Path.chmod(wg_read, 0o600)
+
+            if 'PrivateKey = ' 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 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:
+                Path.unlink(path_to_file)
+                tl = ListTunnels.tl_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)
+
+        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):
+
+        if Path.exists(path_to_file):
+            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)
+
+        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)
+
+
+class ExportTunnels:
     """
     This will export the tunnels.
     A zipfile with current date and time is created
@@ -207,11 +477,11 @@ class Tunnel:
     """
 
     @staticmethod
-    def export():
+    def wg_export():
         _u1 = str(_u[6:])
         now_time = datetime.now()
         now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
-        tl = Tunnel.list()
+        tl = ListTunnels.tl_list()
 
         try:
             if len(tl) != 0:
@@ -220,7 +490,8 @@ 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.conf', 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)
@@ -254,14 +525,3 @@ 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()