punix/Wire-Py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wire-py-reformat-14-08-2024 #9

Merged
punix merged 4 commits from wire-py-reformat-14-08-2024 into main 2024-08-25 20:32:05 +02:00
Conversation 0 Commits 4 Files Changed 3 +52 -55
3 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4574f1416e - Show all commits

1
.idea/workspace.xml
View File

@ -5,7 +5,6 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes in Class Import"> <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="little fixes in Class Import">
<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$/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_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
</list> </list>

8
main.py
View File

@ -119,6 +119,7 @@ class FrameWidgets(ttk.Frame):
self.btn_i.grid(column=0, row=2, padx=15, pady=15) self.btn_i.grid(column=0, row=2, padx=15, pady=15)
def delete(): def delete():
try:
self.select_tunnel = self.l_box.curselection() self.select_tunnel = self.l_box.curselection()
select_tl = self.l_box.get(self.select_tunnel[0]) select_tl = self.l_box.get(self.select_tunnel[0])
os.system('nmcli connection delete ' + str(select_tl)) os.system('nmcli connection delete ' + str(select_tl))
@ -130,7 +131,9 @@ class FrameWidgets(ttk.Frame):
self.l_box.update() self.l_box.update()
# Address Label # Address Label
ShowAddress.label_empty(self) ShowAddress.label_empty(self)
ShowAddress.show_data(self) except IndexError:
pass
# Button Trash # Button Trash
self.btn_tr = tk.Button(self, image=self.tr_pic, bd=0, command=delete) self.btn_tr = tk.Button(self, image=self.tr_pic, bd=0, command=delete)
self.btn_tr.grid(column=0, row=3, padx=15, pady=15) self.btn_tr.grid(column=0, row=3, padx=15, pady=15)
@ -145,6 +148,7 @@ class FrameWidgets(ttk.Frame):
def wg_switch(self): def wg_switch(self):
self.a = TunnelActiv.active() self.a = TunnelActiv.active()
try:
if self.a == '': if self.a == '':
StartStopBTN.button_start(self) StartStopBTN.button_start(self)
self.select_tunnel = self.l_box.curselection() self.select_tunnel = self.l_box.curselection()
@ -175,6 +179,8 @@ class FrameWidgets(ttk.Frame):
# Address Label # Address Label
ShowAddress.label_empty(self) ShowAddress.label_empty(self)
ShowAddress.show_data(self) ShowAddress.show_data(self)
except IndexError:
pass
if __name__ == '__main__': if __name__ == '__main__':

10
wg_func.py
View File

@ -46,7 +46,6 @@ class GreenLabel(tk.Tk):
class StartStopBTN(tk.Tk): class StartStopBTN(tk.Tk):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.tl = None
self.wg_switch = None self.wg_switch = None
self.btn_stst = None self.btn_stst = None
self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png') self.wg_vpn_start = tk.PhotoImage(file=r'icons/wg-vpn-start-48.png')
@ -58,14 +57,6 @@ class StartStopBTN(tk.Tk):
self.rowconfigure(0, weight=1) self.rowconfigure(0, weight=1)
def button_start(self): def button_start(self):
self.tl = ListTunnels.tl_list()
print(len(self.tl))
if len(self.tl) == 0:
self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch)
self.btn_stst.config(state=tk.DISABLED)
self.btn_stst.grid(column=0, row=1, padx=15, pady=10, sticky="s")
self.rowconfigure(0, weight=1)
else:
self.btn_stst = tk.Button(self, image=self.wg_vpn_start, bd=0, command=self.wg_switch) 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=10, sticky="s") self.btn_stst.grid(column=0, row=1, padx=15, pady=10, sticky="s")
self.rowconfigure(0, weight=1) self.rowconfigure(0, weight=1)
@ -96,6 +87,7 @@ class ConToDict:
finaldict = {} finaldict = {}
for elements in newlist: for elements in newlist:
finaldict[elements[0]] = elements[1] finaldict[elements[0]] = elements[1]
# end... result a Dictionary # end... result a Dictionary
address = finaldict['Address'] address = finaldict['Address']
dns = finaldict['DNS'] dns = finaldict['DNS']