From 371b2b7484f1ffb92f2b9edf569268184d911dc9 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Thu, 4 Dec 2025 09:55:38 +0600
Subject: [PATCH 1/4] the prefix name was added to the list immediately after
 it was restored

---
 winehelper_gui.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/winehelper_gui.py b/winehelper_gui.py
index abc00a63..b2adb155 100644
--- a/winehelper_gui.py
+++ b/winehelper_gui.py
@@ -5117,6 +5117,7 @@ class WineHelperGUI(QMainWindow):
         if exit_code == 0:
             self.command_log_output.append(f"\n=== Восстановление успешно завершено ===")
             self.update_installed_apps()
+            self._load_created_prefixes()
             self.filter_installed_buttons()
         else:
             self.command_log_output.append(f"\n=== Ошибка выполнения (код: {exit_code}) ===")

From eca1905c62e864375cc67f5d353ae982897140e1 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Thu, 4 Dec 2025 12:49:03 +0600
Subject: [PATCH 2/4] added a default icon for files.exe without an icon

---
 image/wh_default.png | Bin 0 -> 2255 bytes
 winehelper           |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 image/wh_default.png

diff --git a/image/wh_default.png b/image/wh_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..9db8200beb09cf364bbb75a06dd2aa19cd82d365
GIT binary patch
literal 2255
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
BAVdHF

literal 0
HcmV?d00001

diff --git a/winehelper b/winehelper
index e3f706a6..b7256907 100755
--- a/winehelper
+++ b/winehelper
@@ -610,7 +610,7 @@ create_desktop () {
                 print_ok "Иконка успешно извлечена и сохранена: $icon_file"
             else
                 print_warning "Не удалось извлечь иконку из $exe_file. Используется иконка по умолчанию."
-                icon_file="wine" # Запасной вариант
+                icon_file="$WH_IMAGE_PATH/wh_default.png" # Запасной вариант
             fi
             try_remove_dir "$tmp_ico_dir"
         fi
@@ -620,7 +620,7 @@ create_desktop () {
     # Случай 4: Запасной вариант по умолчанию
     else
         print_info "Иконка '$icon_arg' не найдена. Используется иконка по умолчанию."
-        icon_file="wine"
+        icon_file="$WH_IMAGE_PATH/wh_default.png"
     fi
     # --- Конец логики обработки иконки ---
 

From dc7a99606025c995f864550f300413d6b3516a56 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Thu, 4 Dec 2025 13:59:54 +0600
Subject: [PATCH 3/4] added ICONS_BUTTON_GUI variable for GUI

---
 winehelper_gui.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/winehelper_gui.py b/winehelper_gui.py
index b2adb155..03fcefe5 100644
--- a/winehelper_gui.py
+++ b/winehelper_gui.py
@@ -1034,14 +1034,21 @@ class ScriptParser:
             with open(script_path, 'r', encoding='utf-8') as f:
                 lines = f.readlines()
 
-            # 1. Приоритет у PROG_ICON
+            # 1. Приоритет у переменной ICONS_BUTTON_GUI для GUI
+            for line in lines:
+                if line.strip().startswith('export ICONS_BUTTON_GUI='):
+                    icon_names_str = line.split('=', 1)[1].strip().strip('"\'')
+                    if icon_names_str:
+                        return icon_names_str.split()
+
+            # 2. Если ICONS_BUTTON_GUI не найдена, ищем PROG_ICON (для обратной совместимости)
             for line in lines:
                 if line.strip().startswith('export PROG_ICON='):
-                    icon_name = line.split('=', 1)[1].strip().strip('"\'')
-                    if icon_name:
-                        return [icon_name]
+                    icon_names_str = line.split('=', 1)[1].strip().strip('"\'')
+                    if icon_names_str:
+                        return icon_names_str.split()
 
-            # 2. Если PROG_ICON не найден, ищем все вызовы create_desktop
+            # 3. Если ничего не найдено, ищем все вызовы create_desktop
             icon_names = []
             for line in lines:
                 line = line.strip()

From e3adf19624c4aa2391c078914b0618a597000580 Mon Sep 17 00:00:00 2001
From: Sergey Palcheh <minergenon@altlinux.org>
Date: Thu, 4 Dec 2025 14:03:33 +0600
Subject: [PATCH 4/4] fixed the display of icons for t-flex* in the manual
 installation tab

---
 manualinstall/t-flex-cad-manual  | 2 +-
 manualinstall/t-flex-docs-manual | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manualinstall/t-flex-cad-manual b/manualinstall/t-flex-cad-manual
index 29941c6f..371a40a8 100644
--- a/manualinstall/t-flex-cad-manual
+++ b/manualinstall/t-flex-cad-manual
@@ -2,7 +2,7 @@
 # info_ru: Ручная установка дополнений для T-FLEX CAD 17 или 18
 ########################################################################
 export PROG_NAME="T-FLEX CAD 17/18"
-export PROG_ICON="tflexcad"
+export ICONS_BUTTON_GUI="tflexcad17 tflexcad18"
 export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"
diff --git a/manualinstall/t-flex-docs-manual b/manualinstall/t-flex-docs-manual
index ce1f8d76..041f30ba 100644
--- a/manualinstall/t-flex-docs-manual
+++ b/manualinstall/t-flex-docs-manual
@@ -2,7 +2,7 @@
 # info_ru: Ручная установка дополнений для T-FLEX DOCS 17 или 18
 ########################################################################
 export PROG_NAME="T-FLEX DOCS 17/18"
-export PROG_ICON="tflexcad"
+export PROG_ICON="tflexdoc17"
 export WH_WINE_USE="wine-10.18.1-tflex-alt2-wow64"
 export BASE_PFX="tflex_pfx_x64_v03"
 export WINEARCH="win64"