From 7b8ec10e6cd719355eebd65102070da1f12c2171 Mon Sep 17 00:00:00 2001
From: punix <polunga40@unity-mail.de>
Date: Wed, 2 Jul 2025 23:25:57 +0200
Subject: [PATCH] updater replace Downloadbutton with Lx Tools installer

---
 Changelog                |  14 +++++++++++++-
 lx-icons/16/settings.png | Bin 0 -> 575 bytes
 wirepy.py                |  38 ++++++++++++++++++++++----------------
 wp_app_config.py         |  10 +++++-----
 4 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 lx-icons/16/settings.png

diff --git a/Changelog b/Changelog
index 5ea5338..70328fe 100644
--- a/Changelog
+++ b/Changelog
@@ -9,7 +9,19 @@ My standard System: Linux Mint 22 Cinnamon
  - Replace Download Button with Lx Tools installer
 
    ### Added
-23-06-2025
+02-07-2025
+
+- Complete code for faulty f" string configuration dur addicted and fixed
+
+- updater replace Downloadbutton with Lx Tools installer
+
+- remove logviewer icon 
+
+- add settings.png icon for update button
+
+
+   ### Added
+27-06-2025
   
  - Header added for more modern desing
 
diff --git a/lx-icons/16/settings.png b/lx-icons/16/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a09d743e5384996a1199ac0d9a8f46523a8d570
GIT binary patch
literal 575
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;x#X;^)
zj5kl})B`yR$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG
z?d}4kf#9d}Zjf%y0*}aI1_nK45N51cYF`EvWH0gbb!C6aCd;d%yJVJK1JK51PZ!4!
zi_>c-@AYDK6lvXmcTLBpYym|!Clwan4l}b`O9kW|#p<~(-#EjZD=3}I-1LK?>qcj*
zW{A)QHxc2;;G7F8yCS*MQ%nQ{_uQ3vx3l=&Ok=kDAtyh}D5&>`hIcH8pMSA^2E(ia
zwhufk7$!Bm<qCXnz2HeD^8v99j4@1?<I}Wr*l(1yRxobZ!shBWQCYcazpBv%wpH^E
zwKHk%UZ!RmWS4&V_>YIO44m3$V=ViF`(Jk*i&cE(<rwUlv!tfa=r@n3dgt|Hj1}if
zEF$iv8b%$fln8un!pQUT+ghVH1)2SRg*=<nYK;`mY?F+wOnq3udG^K>&H1MSt$#m^
z<(E__vpvBpDqGYr=VZRtwYQBv3$&glxUg|*`<h>VnaQ*KmQRbZl?X#<u$qo$Z{oT+
z%ePj!&d9A-+I~&z%(UlUeN<u<nYON3d++AT<B>hnc1Bn}Y%A_4oyn0t!!|bk$3?f(
zoxC<LJ?~s|`V{<jhm*(@_El!7K2u$Oxk!pW{r}&m{_nZ`%H5r(cI_7X2aF*GPgg&e
IbxsLQ0KnMTd;kCd

literal 0
HcmV?d00001

diff --git a/wirepy.py b/wirepy.py
index 2a82723..84e21a0 100755
--- a/wirepy.py
+++ b/wirepy.py
@@ -6,6 +6,8 @@ import logging
 import getpass
 import shutil
 import sys
+import os
+import subprocess
 import tkinter as tk
 import webbrowser
 from functools import partial
@@ -192,7 +194,7 @@ class FrameWidgets(ttk.Frame):
 
         self.version_label = tk.Label(
             self.header_frame,
-            text=f"{AppConfig.VERSION} • {Msg.STR["header_left_bottom"]}",
+            text=f"{AppConfig.VERSION} • {Msg.STR['header_left_bottom']}",
             font=("Helvetica", 9),
             fg="#bdc3c7",
             bg="#2c3e50",
@@ -481,6 +483,15 @@ class FrameWidgets(ttk.Frame):
         else:
             self.updates_lb.grid_remove()
 
+    def updater(self):
+        """Start the lxtools_installer"""
+        tmp_dir = Path("/tmp/lxtools")
+        Path.mkdir(tmp_dir, exist_ok=True)
+        os.chdir(tmp_dir)
+        result = subprocess.run(["/usr/local/bin/lxtools_installer"], check=False)
+        if result.returncode != 0:
+            MessageDialog("error", result.stderr)
+
     # Update the labels based on the result
     def update_ui_for_update(self, res):
         """Update UI elements based on an update check result"""
@@ -517,25 +528,20 @@ class FrameWidgets(ttk.Frame):
 
         else:
             self.set_update.set(value=0)
-            update_text = f"Update {res} {_('available!')}"
 
             # Clear the label text since we'll show the button instead
             self.update_label.set("")
 
             # Create the update button
-            self.update_btn = ttk.Menubutton(self.menu_frame, text=update_text)
-            self.update_btn.grid(column=4, columnspan=3, row=0, padx=0)
-            Tooltip(
-                self.update_btn, _("Click to download new version"), self.tooltip_state
+            self.update_btn = ttk.Button(
+                self.menu_frame,
+                image=self.image_manager.load_image("update"),
+                style="Toolbutton",
+                command=self.updater,
             )
-
-            self.download = tk.Menu(self, relief="flat")
-            self.update_btn.configure(menu=self.download, style="Toolbutton")
-            self.download.add_command(
-                label=_("Download"),
-                command=lambda: GiteaUpdate.download(
-                    f"{AppConfig.DOWNLOAD_URL}/{res}.zip", res
-                ),
+            self.update_btn.grid(column=5, row=0, padx=0)
+            Tooltip(
+                self.update_btn, _("Click to install new version"), self.tooltip_state
             )
 
     @staticmethod
@@ -723,11 +729,11 @@ class FrameWidgets(ttk.Frame):
             )
             data_import, key_name = Tunnel.parse_files_to_dictionary(filepath=filepath)
 
-            if CryptoUtil.find_key(f"{data_import[key_name]["PrivateKey"]}="):
+            if CryptoUtil.find_key(f"{data_import[key_name]['PrivateKey']}="):
                 MessageDialog("error", Msg.STR["tl_exist"], title=Msg.STR["imp_err"])
 
             elif not CryptoUtil.is_valid_base64(
-                f"{data_import[key_name]["PrivateKey"]}="
+                f"{data_import[key_name]['PrivateKey']}="
             ):  # 2. Second check: Is it valid Base64?
                 MessageDialog(
                     "error",
diff --git a/wp_app_config.py b/wp_app_config.py
index 5cbd337..ad0787b 100755
--- a/wp_app_config.py
+++ b/wp_app_config.py
@@ -59,7 +59,7 @@ class AppConfig:
 
     # Updates
     # 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year
-    VERSION: str = "v. 2.06.2625"
+    VERSION: str = "v. 2.07.0225"
     UPDATE_URL: str = "https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases"
     DOWNLOAD_URL: str = "https://git.ilunix.de/punix/Wire-Py/archive"
 
@@ -187,12 +187,12 @@ class Image:
             "icon_export": [
                 "/usr/share/icons/lx-icons/48/wg_export.png",
             ],
-            "icon_log": [
-                "/usr/share/icons/lx-icons/48/log.png",
-            ],
             "icon_trash": [
                 "/usr/share/icons/lx-icons/48/wg_trash.png",
             ],
+            "update": [
+                "/usr/share/icons/lx-icons/16/settings.png",
+            ],
         }
 
         # Get paths to try
@@ -210,7 +210,7 @@ class Image:
                     self.images[image_key] = photo
                     return photo
             except tk.TclError as e:
-                # print(f"{LocaleStrings.MSGP["fail_load_image"]}{path}: {e}")
+                print(f"{LocaleStrings.MSGP['fail_load_image']}{path}: {e}")
                 continue
 
         # Return None if no image found