From a2186b63cbed8f4c88af8384445c2ec3fd93623d Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Tue, 2 Sep 2025 09:25:01 +0600 Subject: [PATCH 1/6] renaming Proton/Wine Lg buttons to LG --- winehelper_gui.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/winehelper_gui.py b/winehelper_gui.py index 81a3526..7015fe2 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -1158,6 +1158,9 @@ class WineVersionSelectionDialog(QDialog): continue pretty_key = key.replace('_', ' ').title() + if key.endswith('_LG'): + pretty_key = pretty_key.replace(' Lg', ' LG') + self._create_version_tab(pretty_key, filtered_versions) self.filter_versions() From eeb94523b3d7a081b7e1628b9b6c13810310680c Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Tue, 2 Sep 2025 09:33:35 +0600 Subject: [PATCH 2/6] the refresh list button has been removed --- winehelper_gui.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/winehelper_gui.py b/winehelper_gui.py index 7015fe2..14a5c82 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -1035,13 +1035,6 @@ class WineVersionSelectionDialog(QDialog): self.version_tabs = QTabWidget() main_layout.addWidget(self.version_tabs) - button_layout = QHBoxLayout() - self.refresh_button = QPushButton("Обновить список") - self.refresh_button.setIcon(QIcon.fromTheme("view-refresh")) - self.refresh_button.clicked.connect(self.load_versions) - button_layout.addStretch() - button_layout.addWidget(self.refresh_button) - main_layout.addLayout(button_layout) self.load_versions() @@ -1055,14 +1048,12 @@ class WineVersionSelectionDialog(QDialog): loading_layout.addWidget(status_label) self.version_tabs.addTab(loading_widget, "Загрузка...") self.version_tabs.setEnabled(False) - self.refresh_button.setEnabled(False) QApplication.processEvents() self._parse_sha256_list() self.populate_ui() - self.refresh_button.setEnabled(True) self.version_tabs.setEnabled(True) def _parse_sha256_list(self): From aeae544640dabdb47247b0a80d9e360f7f73107c Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Tue, 2 Sep 2025 09:50:27 +0600 Subject: [PATCH 3/6] added 64bit versions of wine/proton to the 32bit prefix --- winehelper | 4 +--- winehelper_gui.py | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/winehelper b/winehelper index 81e8f80..6fc4da4 100755 --- a/winehelper +++ b/winehelper @@ -1535,9 +1535,7 @@ select_wine_version() { group_versions+=("$version_name") fi else # win32 - if [[ "$version_name" =~ i[3-6]86 ]]; then - group_versions+=("$version_name") - fi + group_versions+=("$version_name") fi fi done < "$sha256_file" diff --git a/winehelper_gui.py b/winehelper_gui.py index 14a5c82..1f95a13 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -1141,9 +1141,8 @@ class WineVersionSelectionDialog(QDialog): if is_win64: if re_64bit.search(name) or not re_32bit.search(name): filtered_versions.append(name) - else: # win32 - if re_32bit.search(name): - filtered_versions.append(name) + else: + filtered_versions.append(name) if not filtered_versions: continue From 76b7d4f046f3d543b0c96762356c40938e248db4 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Tue, 2 Sep 2025 10:11:47 +0600 Subject: [PATCH 4/6] removed the dependency installation success window --- winehelper_gui.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/winehelper_gui.py b/winehelper_gui.py index 1f95a13..62e8535 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -340,12 +340,6 @@ class DependencyManager: still_missing = missing_packages if not still_missing: - info_box = QMessageBox(dialog) - info_box.setWindowIcon(self.app_icon) - info_box.setIcon(QMessageBox.Information) - info_box.setWindowTitle("Успех") - info_box.setText("Все необходимые зависимости были успешно установлены.") - info_box.exec_() installation_successful = True else: warn_box = QMessageBox(dialog) From 3381054c21ad40a22fbb417eeef5b09b36fd0e25 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Tue, 2 Sep 2025 10:23:44 +0600 Subject: [PATCH 5/6] added a winehelper launch button when dependencies are successfully installed --- winehelper_gui.py | 1 + 1 file changed, 1 insertion(+) diff --git a/winehelper_gui.py b/winehelper_gui.py index 62e8535..769afed 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -341,6 +341,7 @@ class DependencyManager: if not still_missing: installation_successful = True + close_button.setText("Запустить WineHelper") else: warn_box = QMessageBox(dialog) warn_box.setWindowIcon(self.app_icon) From 92a682ba8abf9425b2d26933896a4391d8933875 Mon Sep 17 00:00:00 2001 From: Sergey Palcheh Date: Tue, 2 Sep 2025 10:44:37 +0600 Subject: [PATCH 6/6] added a more explicit error message when installing dependencies --- winehelper_gui.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/winehelper_gui.py b/winehelper_gui.py index 769afed..e9cec37 100644 --- a/winehelper_gui.py +++ b/winehelper_gui.py @@ -354,8 +354,16 @@ class DependencyManager: ) warn_box.exec_() else: - log_tag = "ПРЕРВАНО" if exit_status == QProcess.CrashExit else "ОШИБКА" - log_output.append(f"\n=== {log_tag} (код: {exit_code}) ===") + if exit_code == 127: # pkexec: пользователь отменил аутентификацию + log_output.append("\n=== УСТАНОВКА ОТМЕНЕНА ПОЛЬЗОВАТЕЛЕМ ===") + log_output.append("Вы отменили ввод пароля. Установка зависимостей не была выполнена.") + elif exit_code == 126: # pkexec: у пользователя нет прав + log_output.append("\n=== ОШИБКА: НЕДОСТАТОЧНО ПРАВ ===") + log_output.append("У вашего пользователя нет прав для выполнения этой операции.") + else: + log_tag = "ПРЕРВАНО" if exit_status == QProcess.CrashExit else "ОШИБКА" + log_output.append(f"\n=== {log_tag} (код: {exit_code}) ===") + log_output.append("Произошла непредвиденная ошибка во время установки.") log_output.ensureCursorVisible() close_button.setEnabled(True)