diff --git a/__pycache__/cls_mth_fc.cpython-312.pyc b/__pycache__/cls_mth_fc.cpython-312.pyc index 94b15d7..f9e636e 100644 Binary files a/__pycache__/cls_mth_fc.cpython-312.pyc and b/__pycache__/cls_mth_fc.cpython-312.pyc differ diff --git a/wirepy.py b/wirepy.py index 2332f53..ca3e663 100755 --- a/wirepy.py +++ b/wirepy.py @@ -235,11 +235,6 @@ class FrameWidgets(ttk.Frame): self.menu_frame.configure(relief="flat") self.menu_frame.grid(column=0, row=0, columnspan=4, sticky="w") - # App Menu - self.version_lb = ttk.Label(self.menu_frame, text=VERSION) - self.version_lb.config(font=("Ubuntu", 11), foreground="#00c4ff") - self.version_lb.grid(column=0, row=0, rowspan=4, padx=10) - def version_enter(event): """ The mouse moves into the Version widget @@ -253,7 +248,12 @@ class FrameWidgets(ttk.Frame): The mouse moves from the entry widget Remove Tool-Tip """ - window.my_tool_tip.destroy() + window.my_tool_tip.destroy() + # App Menu + self.version_lb = ttk.Label(self.menu_frame, text=VERSION) + self.version_lb.config(font=("Ubuntu", 11), foreground="#00c4ff") + self.version_lb.grid(column=0, row=0, rowspan=4, padx=10) + self.options_btn = ttk.Menubutton(self.menu_frame, text=_("Options")) self.options_btn.grid(column=1, columnspan=1, row=0) @@ -385,9 +385,9 @@ class FrameWidgets(ttk.Frame): self.download.add_command( label=_("Download"), command=lambda: GiteaUpdate.download( - f"https://git.ilunix.de/punix" f"/Wire-Py/archive/" f"{res}.zip", - r"/usr/" r"share/icons/lx-icons" r"/48/wg_vpn.png", - r"/usr/share/icons/lx-icons" r"/48/wg_msg.png", + f"https://git.ilunix.de/punix/Wire-Py/archive/{res}.zip", + r"/usr/share/icons/lx-icons/48/wg_vpn.png", + r"/usr/share/icons/lx-icons/48/wg_msg.png", res, ), ) @@ -429,7 +429,7 @@ class FrameWidgets(ttk.Frame): self.lb.grid(column=2, row=1, padx=15, pady=4, sticky="w") # Label to Show active Tunnel - self.StrVar = tk.StringVar(value=self.a) + self.str_var = tk.StringVar(value=self.a) self.color_label() # Interface Label @@ -639,7 +639,7 @@ class FrameWidgets(ttk.Frame): self.lb_rename.insert(0, _("Max. 12 characters!")) if self.a != "" and self.a == select_tl: - self.StrVar.set(value="") + self.str_var.set(value="") self.start() self.l_box.update() @@ -868,7 +868,7 @@ class FrameWidgets(ttk.Frame): self.lb_rename.delete(0, tk.END) if self.a != "" and self.a == select_tl: self.a = Tunnel.active() - self.StrVar.set(value=self.a) + self.str_var.set(value=self.a) with open(wg_set, "r", encoding="utf-8") as set_file5: lines5 = set_file5.readlines() if ( @@ -1117,7 +1117,7 @@ class FrameWidgets(ttk.Frame): Create.encrypt() - self.StrVar.set("") + self.str_var.set("") self.a = Tunnel.active() self.l_box.insert(0, self.a) self.wg_autostart.configure(state="normal") @@ -1229,8 +1229,8 @@ class FrameWidgets(ttk.Frame): self.lb_rename.bind("", rename_enter) self.lb_rename.bind("", rename_leave) self.lb_rename.insert(0, "Max. 12 characters!") - self.StrVar = tk.StringVar() - self.StrVar.set(self.a) + self.str_var = tk.StringVar() + self.str_var.set(self.a) self.color_label() self.stop() wg_read = "/tmp/tlecdcwg/" + str(self.a + ".conf") @@ -1476,12 +1476,12 @@ class FrameWidgets(ttk.Frame): lines = read_file.readlines() if "light\n" in lines: self.lb_tunnel = ttk.Label( - self, textvariable=self.StrVar, foreground="green" + self, textvariable=self.str_var, foreground="green" ) else: self.lb_tunnel = ttk.Label( - self, textvariable=self.StrVar, foreground="yellow" + self, textvariable=self.str_var, foreground="yellow" ) self.lb_tunnel.config(font=("Ubuntu", 11, "bold")) @@ -1510,8 +1510,8 @@ class FrameWidgets(ttk.Frame): # Button Start/Stop self.stop() self.a = Tunnel.active() - self.StrVar = tk.StringVar() - self.StrVar.set(self.a) + self.str_var = tk.StringVar() + self.str_var.set(self.a) self.color_label() elif self.a != "": @@ -1523,7 +1523,7 @@ class FrameWidgets(ttk.Frame): # Button Start/Stop self.start() self.a = Tunnel.active() - self.StrVar.set("") + self.str_var.set("") self.color_label() # Address Label