Class LxTools expands wg_set to set_file renamed
This commit is contained in:
41
wirepy.py
41
wirepy.py
@ -14,8 +14,7 @@ from pathlib import Path
|
||||
from subprocess import check_call
|
||||
from tkinter import TclError, filedialog, ttk
|
||||
|
||||
from cls_mth_fc import (Create, GiteaUpdate, Tooltip, Tunnel, if_tip,
|
||||
LxTools, msg_window, sigi)
|
||||
from cls_mth_fc import (Create, GiteaUpdate, Tooltip, Tunnel, LxTools)
|
||||
|
||||
LxTools.uos()
|
||||
Create.dir_and_files()
|
||||
@ -23,15 +22,16 @@ Create.make_dir()
|
||||
Create.decrypt()
|
||||
|
||||
tcl_path = Path("/usr/share/TK-Themes")
|
||||
wg_set = Path(Path.home() / ".config/wire_py/settings")
|
||||
tips = if_tip(wg_set)
|
||||
set_file = Path(Path.home() / ".config/wire_py/settings")
|
||||
tips = LxTools.if_tip(set_file)
|
||||
dirname = Path("/tmp/tlecdcwg/")
|
||||
userfile = Path("/tmp/.loguser")
|
||||
|
||||
# 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year
|
||||
VERSION = "v. 2.04.1725"
|
||||
|
||||
res = GiteaUpdate.api_down(
|
||||
"https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases", VERSION
|
||||
"https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases", VERSION, set_file
|
||||
)
|
||||
|
||||
# Translate
|
||||
@ -42,7 +42,7 @@ gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||
gettext.textdomain(APP)
|
||||
_ = gettext.gettext
|
||||
|
||||
sigi(dirname)
|
||||
LxTools.sigi(dirname, userfile)
|
||||
|
||||
|
||||
class Wirepy(tk.Tk):
|
||||
@ -168,7 +168,7 @@ class FrameWidgets(ttk.Frame):
|
||||
txt2 = _("Go to Wire-Py git")
|
||||
com = link_btn
|
||||
|
||||
msg_window(iw, ii, wt, msg_t, txt2, com)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t, txt2, com)
|
||||
|
||||
# Frame for Menu
|
||||
self.menu_frame = ttk.Frame(self)
|
||||
@ -197,8 +197,8 @@ class FrameWidgets(ttk.Frame):
|
||||
self.settings.add_checkbutton(
|
||||
label=_("Disable Tooltips"), command=tooltip, variable=set_tip
|
||||
)
|
||||
self.settings.add_command(label=_("Light"), command=lambda: LxTools.theme_change_light(self))
|
||||
self.settings.add_command(label=_("Dark"), command=lambda: LxTools.theme_change_dark(self))
|
||||
self.settings.add_command(label=_("Light"), command=lambda: LxTools.theme_change_light(self, set_file))
|
||||
self.settings.add_command(label=_("Dark"), command=lambda: LxTools.theme_change_dark(self, set_file))
|
||||
|
||||
# About BTN Menu / Label
|
||||
self.about_btn = ttk.Button(
|
||||
@ -427,7 +427,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Select tunnel")
|
||||
msg_t = _("Please select a tunnel from the list")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
@ -436,7 +436,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Select tunnel")
|
||||
msg_t = _("Please first import tunnel")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
# Button Trash
|
||||
self.btn_tr = ttk.Button(
|
||||
@ -500,7 +500,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Renaming not possible")
|
||||
msg_t = _("The new name may contain only 12 characters")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
elif len(self.lb_rename.get()) == 0:
|
||||
|
||||
@ -509,7 +509,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Renaming not possible")
|
||||
msg_t = _("At least one character must be entered")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
elif any(ch in special_characters for ch in self.lb_rename.get()):
|
||||
|
||||
@ -520,7 +520,7 @@ class FrameWidgets(ttk.Frame):
|
||||
msg_t = _(
|
||||
"No valid sign. These must not be used.\nBlank, Slash, Backslash and { }\n"
|
||||
)
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
@ -572,7 +572,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Renaming not possible")
|
||||
msg_t = _("Please select a tunnel from the list")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
# Button Rename
|
||||
self.btn_rename = ttk.Button(
|
||||
@ -678,7 +678,7 @@ class FrameWidgets(ttk.Frame):
|
||||
msg_t = _(
|
||||
"Tunnel already available!\nPlease use another file for import"
|
||||
)
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
@ -827,7 +827,7 @@ class FrameWidgets(ttk.Frame):
|
||||
msg_t = _(
|
||||
"Oh... no valid Wireguard File!\nPlease select a valid Wireguard File"
|
||||
)
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
except EOFError as e:
|
||||
print(e)
|
||||
@ -1056,7 +1056,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Select tunnel")
|
||||
msg_t = _("Please select a tunnel from the list")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
@ -1065,7 +1065,7 @@ class FrameWidgets(ttk.Frame):
|
||||
ii = r"/usr/share/icons/lx-icons/48/wg_msg.png"
|
||||
wt = _("Select tunnel")
|
||||
msg_t = _("Please first import tunnel")
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
LxTools.msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
@ -1081,6 +1081,5 @@ if __name__ == "__main__":
|
||||
window.tk.call("set", "::tk::dialog::file::showHiddenVar", "0")
|
||||
window.mainloop()
|
||||
|
||||
shutil.rmtree(dirname)
|
||||
Path.unlink("/tmp/.loguser")
|
||||
LxTools.clean_files(dirname, userfile)
|
||||
sys.exit(0)
|
||||
|
Reference in New Issue
Block a user