diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d5d1042..8d5ac6e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -40,15 +40,16 @@
- {
- "keyToString": {
- "ASKED_ADD_EXTERNAL_FILES": "true",
- "Python.main.executor": "Run",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "git-widget-placeholder": "wire-py-reformat-14-08-2024",
- "last_opened_file_path": "/home/punix/Downloads/tkinter-bitcoin_price_converter_objectoriented(1).py"
+
+}]]>
@@ -129,7 +130,15 @@
1724013251954
-
+
+
+ 1724048994613
+
+
+
+ 1724048994613
+
+
@@ -161,6 +170,7 @@
-
+
+
\ No newline at end of file
diff --git a/main.py b/main.py
index 05c1588..d1aa9d9 100644
--- a/main.py
+++ b/main.py
@@ -33,6 +33,7 @@ class FrameWidgets(ttk.Frame):
def __init__(self, container, **kwargs):
super().__init__(container, **kwargs)
+ self.wg_read = 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')
self.wgi_on = tk.PhotoImage(file=r'icons/wire-switch-on-48.png')
@@ -41,23 +42,34 @@ class FrameWidgets(ttk.Frame):
self.tr_pic = tk.PhotoImage(file=r'icons/wg-trash-48.png')
self.exp_pic = tk.PhotoImage(file=r'icons/wg-export-48.png')
self.warning_pic = tk.PhotoImage(file=r'icons/warning_64.png')
-
# Show active Tunnel
self.a = TunnelActiv.active()
-
+ # Label 2
+ self.lb_frame = ttk.Frame(self)
+ self.lb_frame.configure(relief='solid')
+ self.lb_frame.grid(column=2, row=2, sticky='n', padx=10)
+ self.lb_frame2 = ttk.Frame(self)
+ self.lb_frame2.configure(relief='solid')
+ self.lb_frame2.grid(column=2, row=3, sticky='nw', padx=10)
# Show active Label
self.select_tunnel = None
self.lb = tk.Label(self, text='Active:')
self.lb.config(font=("Ubuntu", 11, "bold"))
- self.lb.grid(column=2, row=1, padx=10, pady=5, sticky="e")
+ self.lb.grid(column=2, row=1, padx=5, sticky="we")
# Label to Show active Tunnel
self.StrVar = tk.StringVar(value=self.a)
self.lb_tunnel = tk.Label(self, textvariable=self.StrVar, fg='green')
-
self.lb_tunnel.config(font=("Ubuntu", 11, "bold"))
self.lb_tunnel.grid(column=3, row=1, sticky="w")
+ # Label Interface and Peers
+ self.interface = tk.Label(self.lb_frame, text='Interface')
+ self.interface.grid(column=0, row=4, sticky="n", padx=10)
+ self.interface.config(font=("Ubuntu", 9))
+ self.peer = tk.Label(self.lb_frame2, text='Peer')
+ self.peer.config(font=("Ubuntu", 9))
+ self.peer.grid(column=0, row=5, sticky="n", padx=10)
self.scrollbar = tk.Scrollbar(self)
self.l_box = tk.Listbox(self, fg='#606060', selectmode='single')
self.l_box.config(highlightthickness=0, relief='flat')
@@ -69,11 +81,16 @@ class FrameWidgets(ttk.Frame):
for tunnels in self.tl:
self.l_box.insert("end", tunnels)
self.l_box.update()
- self.l_box.select_set(0) # Later add, for first Item Auto select
+
# Button Vpn
if self.a != '':
self.btn_stst = tk.Button(self, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
+ wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf'
+ file = open(wg_read, 'r')
+ read = file.read()
+ file.close()
+ print(read)
else:
self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
@@ -86,12 +103,12 @@ class FrameWidgets(ttk.Frame):
select_tl = self.l_box.get(self.select_tunnel[0])
os.system('nmcli connection delete ' + str(select_tl))
self.l_box.delete(self.select_tunnel[0])
+ os.remove(os.environ['HOME'] + '/tester/' + str(select_tl) + '.conf')
if self.a != '':
self.StrVar.set(value='')
self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
self.l_box.update()
- self.l_box.select_set(0)
# Button Trash
self.btn_tr = tk.Button(self, image=self.tr_pic, bd=0, command=delete)
@@ -113,6 +130,12 @@ class FrameWidgets(ttk.Frame):
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')
+ read = file.read()
+ file.close()
+ print(read)
+
# Button Start/Stop
self.btn_stst = tk.Button(self, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
diff --git a/wg_func.py b/wg_func.py
index a1f5cf0..8de1cbb 100644
--- a/wg_func.py
+++ b/wg_func.py
@@ -20,8 +20,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, text='Oh... no valid Wireguard File!\nPlease select a '
- 'valid Wireguard File')
+ 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)
@@ -51,6 +51,7 @@ class ListTunnels:
class ImportTunnel:
def __init__(self):
+ self.select_tunnel = None
self.wg_switch = None
self.btn_stst = None
self.lb_tunnel = None
@@ -91,6 +92,11 @@ class ImportTunnel:
self.lb_tunnel.grid(column=3, row=1, sticky="w")
self.btn_stst = tk.Button(self, image=self.wg_vpn_stop, bd=0, command=self.wg_switch)
self.btn_stst.grid(column=0, row=1, padx=15, pady=15, sticky="s")
+ wg_read = os.environ['HOME'] + '/tester/' + str(self.a) + '.conf'
+ file = open(wg_read, 'r')
+ read = file.read()
+ file.close()
+ print(read)
if "PrivateKey = " not in read:
Message()
except EOFError: