From 1f80d5342c4f87d040fd328d387b0917ecefe0bc Mon Sep 17 00:00:00 2001 From: punix Date: Sun, 10 Nov 2024 14:51:50 +0100 Subject: [PATCH] - Translate file de_De complete - new FrameWidget for rename Entry and rename Button --- Changelog | 47 ++++++++++++++++++++++++++++------------------- wg_main.py | 17 +++++++++++------ 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/Changelog b/Changelog index 091c1b2..60c597a 100644 --- a/Changelog +++ b/Changelog @@ -8,61 +8,70 @@ My standard System: Linux Mint 22 Cinnamon - for loops with lists replaced by List Comprehensions - Update search after start of Wire-Py + + ### Added +10-11-2024 + + - Translate file de_De complete + - new FrameWidget for rename Entry and rename Button + + ### Added 09-11-2024 -- Move Tips Method in separate class for Tooltips in another Apps -- Move Version Variable in main script -- Edit Class GiteaUpdate for requests in api_down and download -- Description on Class GiteaUpdate -- Translate file De complete + - Move Tips Method in separate class for Tooltips in another Apps + - Move Version Variable in main script + - Edit Class GiteaUpdate for requests in api_down and download + - Description on Class GiteaUpdate ### Added 08-11-2024 -- Preparation for language translation part 1 -- separate folder for general icons -- install edit for new dir lx-icons + - Preparation for language translation part 1 + - separate folder for general icons + - install edit for new dir lx-icons + ### 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 + - 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) + - remove classes and add methods to class FrameWidgets (removed self errors) ### Added 27-10-2024 -- Add Autoconnect settings to settings.conf + - 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 + - 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 + - Optimize Class and Tooltip ### Added 21-10-2024 -- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip + - Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip ### Added diff --git a/wg_main.py b/wg_main.py index 4c0ae7c..0aa6dc8 100755 --- a/wg_main.py +++ b/wg_main.py @@ -14,7 +14,7 @@ from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, _u, wg_tips, wg_set) tcl_path = Path('/usr/share/TK-Themes') ''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year ''' -version = 'v. 1.11.0924' +version = 'v. 1.11.1024' res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version) @@ -178,7 +178,7 @@ class FrameWidgets(ttk.Frame): window.my_tool_tip.destroy() self.options_btn = ttk.Menubutton(self.menu_frame, text=_('Options')) - self.options_btn.grid(column=1, row=0) + self.options_btn.grid(column=1, columnspan=1, row=0) def sets_enter(event): """ The mouse moves into the entry widget """ @@ -205,12 +205,12 @@ class FrameWidgets(ttk.Frame): ''' About BTN Menu / Label ''' self.about_btn = ttk.Button(self.menu_frame, text=_('About'), style='Toolbutton', command=info) - self.about_btn.grid(column=2, row=0) + self.about_btn.grid(column=2, columnspan=2, row=0) self.readme = tk.Menu(self) ''' Update and Tooltip Label ''' self.updates_lb = ttk.Label(self.menu_frame) - self.updates_lb.grid(column=3, row=0, padx=10) + self.updates_lb.grid(column=3, columnspan=3, row=0, padx=10) '''View Checkbox for enable or disable Tooltip ''' if wg_tips: set_tip.set(value=False) @@ -304,6 +304,11 @@ class FrameWidgets(ttk.Frame): self.lb_frame3.configure(relief='flat') self.lb_frame3.grid(column=0, row=5, columnspan=4, sticky='snew', padx=2, pady=2) + ''' Bottom Frame 5 ''' + self.lb_frame4 = ttk.Frame(self) + self.lb_frame4.configure(relief='flat') + self.lb_frame4.grid(column=2, row=5, columnspan=3, sticky='e', padx=15) + ''' Show active Label ''' self.select_tunnel = None self.lb = ttk.Label(self, text=_('Active: ')) @@ -561,7 +566,7 @@ class FrameWidgets(ttk.Frame): self.btn_exp.bind('', exp_leave) ''' Label Entry ''' - self.lb_rename = ttk.Entry(self.lb_frame3, width=20) + self.lb_rename = ttk.Entry(self.lb_frame4, width=20) self.lb_rename.grid(column=2, row=0, padx=8, pady=10, sticky='ne') self.lb_rename.insert(0, _('Max. 12 characters!')) self.lb_rename.config(state='disable') @@ -662,7 +667,7 @@ class FrameWidgets(ttk.Frame): msg_window(iw, ii, wt, msg_t) ''' Button Rename ''' - self.btn_rename = ttk.Button(self.lb_frame3, text=_('Rename'), state='disable', command=tl_rename, padding=4, + self.btn_rename = ttk.Button(self.lb_frame4, text=_('Rename'), state='disable', command=tl_rename, padding=4, style='RnButton.TButton') self.btn_rename.grid(column=3, row=0, padx=5, pady=10, sticky='ne')