pupgui2: remove references to compat tools on Flathub (#343)

* i18n: remove mention of Proton-GE on Flathub * refactor: remove buttons navigating to ProtonGE flatpak in the UI * misc: fix missing space in ctools_clicked comment * i18n: fully remove note about compat tools on flathub * Make FlatpakCtools button a oneliner --------- Co-authored-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com>
DavidoTek · Jan 11, 2024 · 82f8a64 · 82f8a64
1 parent efb14eb
commit 82f8a64
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 87 deletions.
diff --git a/i18n/pupgui2_de.ts b/i18n/pupgui2_de.ts
@@ -114,11 +114,6 @@ Abbrechen und beenden?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Installationsort zu {install_dir} geändert.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Info: GE-Proton / Boxtron ist direkt auf Flathub verfügbar!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_es.ts b/i18n/pupgui2_es.ts
@@ -114,11 +114,6 @@ Cancel and exit anyway?</source>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Cambiado el directorio de instalación a {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Información: ¡Puede obtener GE-Proton / Boxtron directamente de Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_fi.ts b/i18n/pupgui2_fi.ts
@@ -114,11 +114,6 @@ Keskeytetäänkö ja poistutaan silti?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Asennuskansio vaihdettiin kohteeseen {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Tiedote: voit noutaa GE-Proton:n / Boxtron:in suoraan Flathub.ista!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_fr.ts b/i18n/pupgui2_fr.ts
@@ -114,11 +114,6 @@ Annuler et quitter&#x202f;?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Emplacement d&apos;installation remplacé par {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Info&#x202f;: Vous pouvez récupérer GE-Proton / Boxtron directement depuis Flathub&#x202f;!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_it.ts b/i18n/pupgui2_it.ts
@@ -111,11 +111,6 @@ Annullare e uscire comunque?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Percorso d&apos;installazione cambiato in {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Info: Puoi ottenere GE-Proton / Boxtron direttamente da Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_nb_NO.ts b/i18n/pupgui2_nb_NO.ts
@@ -110,11 +110,6 @@ Cancel and exit anyway?</source>
         <source>Changed install directory to {install_dir}.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_nl.ts b/i18n/pupgui2_nl.ts
@@ -111,11 +111,6 @@ Weet je zeker dat je wilt annuleren en afsluiten?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>De installatiemap is ingesteld op {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Informatie: je kunt GE-Proton/Boxtron direct van Flathub downloaden!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_pl.ts b/i18n/pupgui2_pl.ts
@@ -114,11 +114,6 @@ Anulować i wyjść mimo to?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Zmieniono katalog instalacji na {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Info: Możesz pobrać GE-Proton / Boxtron bezpośrednio z Flathuba!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_pt.ts b/i18n/pupgui2_pt.ts
@@ -114,11 +114,6 @@ Cancelar e sair mesmo assim?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Mudou o diretório de instalação para {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Nota: Pode obter GE-Proton / Boxtron diretamente do Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_pt_BR.ts b/i18n/pupgui2_pt_BR.ts
@@ -114,11 +114,6 @@ Cancelar e sair mesmo assim?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Mudou o diretório de instalação para {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Nota: Você pode obter GE-Proton / Boxtron diretamente do Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_ru.ts b/i18n/pupgui2_ru.ts
@@ -115,11 +115,6 @@ Cancel and exit anyway?</source>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Изменён каталог установки на {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Информация: Вы можете получить GE-Proton / Boxtron непосредственно с Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_sv.ts b/i18n/pupgui2_sv.ts
@@ -114,11 +114,6 @@ Avbryt och avsluta ändå?</translation>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Ändrade installationskatalog till {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Info: Du kan hämta GE-Proton / Boxtron direkt från Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_tr.ts b/i18n/pupgui2_tr.ts
@@ -114,11 +114,6 @@ Cancel and exit anyway?</source>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Kurulum dizini {install_dir} olarak değiştirildi.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Bilgi: GE-Proton ve Boxtron&apos;u doğrudan Flathub&apos;dan indirebilirsiniz!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_uk.ts b/i18n/pupgui2_uk.ts
@@ -114,11 +114,6 @@ Cancel and exit anyway?</source>
         <source>Changed install directory to {install_dir}.</source>
         <translation>Змінено каталог встановлення на {install_dir}.</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>Інформація: Ви можете отримати GE-Proton / Boxtron безпосередньо з Flathub!</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/i18n/pupgui2_zh_TW.ts b/i18n/pupgui2_zh_TW.ts
@@ -114,11 +114,6 @@ Cancel and exit anyway?</source>
         <source>Changed install directory to {install_dir}.</source>
         <translation>將安裝資料夾改為 {install_dir}。</translation>
     </message>
-    <message>
-        <location filename="../pupgui2/pupgui2.py" line="388"/>
-        <source>Info: You can get GE-Proton / Boxtron directly from Flathub!</source>
-        <translation>資訊：您可以直接從 Flathub 取得 GE-Proton / Boxtron！</translation>
-    </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="428"/>
         <source>Install tool from Flathub</source>

diff --git a/pupgui2/constants.py b/pupgui2/constants.py
@@ -78,7 +78,6 @@ def PALETTE_DARK():
 PROTONDB_APP_PAGE_URL = 'https://protondb.com/app/'
 
 STEAM_BOXTRON_FLATPAK_APPSTREAM = 'appstream://com.valvesoftware.Steam.CompatibilityTool.Boxtron'
-STEAM_PROTONGE_FLATPAK_APPSTREAM = 'appstream://com.valvesoftware.Steam.CompatibilityTool.Proton-GE'
 STEAM_STL_FLATPAK_APPSTREAM = 'appstream://com.valvesoftware.Steam.Utility.steamtinkerlaunch'
 
 STEAM_STL_INSTALL_PATH = os.path.join(HOME_DIR, 'stl')

diff --git a/pupgui2/pupgui2.py b/pupgui2/pupgui2.py
@@ -12,7 +12,7 @@
 from PySide6.QtUiTools import QUiLoader
 
 from pupgui2.constants import APP_NAME, APP_VERSION, BUILD_INFO, TEMP_DIR, STEAM_STL_INSTALL_PATH
-from pupgui2.constants import STEAM_PROTONGE_FLATPAK_APPSTREAM, STEAM_BOXTRON_FLATPAK_APPSTREAM, STEAM_STL_FLATPAK_APPSTREAM
+from pupgui2.constants import STEAM_BOXTRON_FLATPAK_APPSTREAM, STEAM_STL_FLATPAK_APPSTREAM
 from pupgui2 import ctloader
 from pupgui2.datastructures import CTType, MsgBoxType, MsgBoxResult
 from pupgui2.gamepadinputworker import GamepadInputWorker
@@ -386,12 +386,9 @@ def btn_manage_install_locations_clicked(self):
 
     def show_launcher_specific_information(self):
         install_loc = get_install_location_from_directory_name(install_directory())
-        # For Steam Flatpak only: Show that GE-Proton and Boxtron are available directly from Flathub.
-        if 'steam' in install_loc.get('launcher', '') and 'Flatpak' in install_loc.get('display_name', ''):
-            self.ui.statusBar().showMessage(self.tr('Info: You can get GE-Proton / Boxtron directly from Flathub!'))
-            self.ui.btnSteamFlatpakCtools.setVisible(True)
-        else:
-            self.ui.btnSteamFlatpakCtools.setVisible(False)
+        self.ui.btnSteamFlatpakCtools.setVisible(
+            'steam' in install_loc.get('launcher', '') and 'Flatpak' in install_loc.get('display_name', '')
+            )
 
     def list_installed_versions_item_double_clicked(self, item):
         """ Show info about compatibility tool when double clicked in list """
@@ -426,22 +423,19 @@ def btn_show_ct_info_clicked(self):
             cti_dialog.batch_update_complete.connect(self.update_ui)
 
     def btn_steam_flatpak_ctools_clicked(self):
-        """ Open dialog to open the appstore(appstream) to install Proton-GE/Boxtron from Flathub"""
+        """ Open dialog to open the appstore(appstream) to install Boxtron from Flathub"""
         iftdialog = QDialog(parent=self.ui)
         iftdialog.setWindowTitle(self.tr('Install tool from Flathub'))
         iftdialog.setFixedSize(250, 100)
         iftdialog.setModal(True)
         lbl_description = QLabel(self.tr('Click to open your app store'))
-        btn_dl_protonge = QPushButton('Proton-GE')
         btn_dl_boxtron = QPushButton('Boxtron')
         btn_dl_stl = QPushButton('Steam Tinker Launch')
         layout1 = QVBoxLayout()
         layout1.addWidget(lbl_description)
-        layout1.addWidget(btn_dl_protonge)
         layout1.addWidget(btn_dl_boxtron)
         layout1.addWidget(btn_dl_stl)
         iftdialog.setLayout(layout1)
-        btn_dl_protonge.clicked.connect(lambda: os.system(f'xdg-open {STEAM_PROTONGE_FLATPAK_APPSTREAM}'))
         btn_dl_boxtron.clicked.connect(lambda: os.system(f'xdg-open {STEAM_BOXTRON_FLATPAK_APPSTREAM}'))
         btn_dl_stl.clicked.connect(lambda: os.system(f'xdg-open {STEAM_STL_FLATPAK_APPSTREAM}'))
         iftdialog.show()