Merge branch 'main' into load-theme

DavidoTek · Jul 27, 2024 · c8e60f8 · c8e60f8
2 parents a5b7386 + bb18211
commit c8e60f8
Show file tree

Hide file tree

Showing 76 changed files with 3,915 additions and 998 deletions.
diff --git a/.github/workflows/appimage-ci.yml b/.github/workflows/appimage-ci.yml
@@ -7,25 +7,21 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v1
 
     - name: Install required dependencies
-      run: sudo apt install -y gtk-update-icon-cache python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse
+      run: sudo apt install -y binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync
 
     - name: Download AppImageBuilder etc.
       run: |
-        mkdir -p ~/.local/bin
-        wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O ~/.local/bin/appimagetool
-        chmod +x ~/.local/bin/appimagetool
         pip3 install appimage-builder
     
     - name: Build AppImage
       run: |
         sed -i "s/BUILD_INFO = .*/BUILD_INFO = 'Official AppImage by DavidoTek'/" pupgui2/constants.py
-        sed -i "s/PySide6.*/PySide6==6.2.4/" requirements.txt
         appimage-builder
 
     - name: Upload AppImage

diff --git a/.github/workflows/testing-ci.yml b/.github/workflows/testing-ci.yml
@@ -0,0 +1,44 @@
+name: Test using Pytest
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  tests:
+    name: "Run PyTest"
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        python-version: ["3.10"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: "${{ matrix.python-version }}"
+        cache: "pip"
+
+    - name: Install dependencies
+      run: |
+        sudo apt install -y libegl1 libxkbcommon0
+        pip install pytest pytest-md pytest-emoji
+
+    - name: Install ProtonUp-Qt
+      run: pip install -e .
+
+    - name: Run pytest
+      uses: pavelzw/pytest-action@v2
+      env:
+        QT_QPA_PLATFORM: "offscreen"
+      with:
+        verbose: true
+        emoji: true
+        job-summary: true
+        custom-arguments: '-q'
+        click-to-expand: true
+        report-title: 'ProtonUp-Qt Test Report'
diff --git a/.gitignore b/.gitignore
@@ -131,3 +131,4 @@ dmypy.json
 *.AppImage.zsync
 AppDir/
 appimage-builder-cache/
+appimage-build/
diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml
@@ -1,18 +1,15 @@
 version: 1
 script:
   - rm -rf AppDir  | true
-  - mkdir -p AppDir/usr/lib/python3.8/site-packages
-  - cp pupgui2 AppDir/usr/lib/python3.8/site-packages -r
+  - mkdir -p AppDir/usr/lib/python3.10/site-packages
+  - cp pupgui2 AppDir/usr/lib/python3.10/site-packages -r
   - cp share AppDir/usr -r
   - python3 -m pip install --ignore-installed --prefix=/usr --no-cache-dir --root=AppDir -r ./requirements.txt
-  - rm -rf AppDir/usr/lib/python3.8/site-packages/PySide6/Qt/qml/
-  - rm -rf AppDir/usr/lib/python3.8/site-packages/PySide6/examples/
-  - rm -rf AppDir/usr/lib/python3.8/site-packages/PySide6/Qt/resources/
-  - rm -rf AppDir/usr/lib/python3.8/site-packages/PySide6/Qt/translations/qtwebengine_locales/
-  - rm -f AppDir/usr/lib/python3.8/site-packages/PySide6/{assistant,designer,linguist,lrelease,lupdate}
-  - rm -f AppDir/usr/lib/python3.8/site-packages/PySide6/{Qt3D*,QtBluetooth*,QtCharts*,QtConcurrent*,QtDataVisualization*,QtDBus*,QtDesigner*,QtHelp*,QtMultimedia*,QtNetwork*,QtOpenGL*,QtPositioning*,QtPrintSupport*,QtQml*,QtQuick*,QtRemoteObjects*,QtScxml*,QtSensors*,QtSerialPort*,QtSql*,QtStateMachine*,QtSvg*,QtTest*,QtWeb*,QtXml*}
+  - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/qml/
+  - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{assistant,designer,linguist,lrelease,lupdate}
+  - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{Qt3D*,QtBluetooth*,QtCharts*,QtConcurrent*,QtDataVisualization*,QtDBus*,QtDesigner*,QtHelp*,QtMultimedia*,QtNetwork*,QtOpenGL*,QtPositioning*,QtPrintSupport*,QtQml*,QtQuick*,QtRemoteObjects*,QtScxml*,QtSensors*,QtSerialPort*,QtSql*,QtStateMachine*,QtSvg*,QtTest*,QtWeb*,QtXml*}
   - shopt -s extglob
-  - rm -rf AppDir/usr/lib/python3.8/site-packages/PySide6/Qt/lib/!(libQt6OpenGL*|libQt6XcbQpa*|libQt6Wayland*|libQt6Egl*|libicudata*|libicuuc*|libicui18n*|libQt6DBus*|libQt6Network*|libQt6Qml*|libQt6Core*|libQt6Gui*|libQt6Widgets*|libQt6Svg*|libQt6UiTools*)
+  - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/lib/!(libQt6OpenGL*|libQt6XcbQpa*|libQt6Wayland*|libQt6Egl*|libicudata*|libicuuc*|libicui18n*|libQt6DBus*|libQt6Network*|libQt6Qml*|libQt6Core*|libQt6Gui*|libQt6Widgets*|libQt6Svg*|libQt6UiTools*)
 
 
 AppDir:
@@ -22,30 +19,30 @@ AppDir:
     id: net.davidotek.pupgui2
     name: ProtonUp-Qt
     icon: net.davidotek.pupgui2
-    version: 2.9.1
+    version: 2.9.2
     exec: usr/bin/python3
     exec_args: "-m pupgui2 $@"
 
   apt:
     arch: amd64
     sources:
-      - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse'
-        key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32'
+      - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
+        key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
 
     include:
       - python3
       - python3-pkg-resources
       - libopengl0
-      - libssl1.1
       - libk5crypto3
       - libkrb5-3
       - libgssapi-krb5-2
+      - libxcb-cursor0
     exclude: []
 
   runtime:
     env:
       PYTHONHOME: '${APPDIR}/usr'
-      PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages'
+      PYTHONPATH: '${APPDIR}/usr/local/lib/python3.10/dist-packages'
 
 
 AppImage:

diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ Install and manage [GE-Proton](https://github.com/GloriousEggroll/proton-ge-cust
 
 ![ProtonUp-Qt Screenshot](.github/images/pupgui2-screenshot2.png)
 
+## Disclaimer
+[**Affiliation Note**](https://github.com/DavidoTek/ProtonUp-Qt/pull/413): ProtonUp-Qt is an independent tool for managing gaming compatibility tools. It is neither directly affiliated with the compatibility tool creators nor with the providers of the individual game launchers. However, we try to work with them where possible.
+
+The official development takes place on GitHub at [DavidoTek/ProtonUp-Qt](https://github.com/DavidoTek/ProtonUp-Qt), and the official website is https://davidotek.github.io/protonup-qt. We distribute ProtonUp-Qt as a Flatpak on [Flathub](https://flathub.org/apps/net.davidotek.pupgui2) and as an AppImage in the [releases section](https://github.com/DavidoTek/ProtonUp-Qt/releases) of the GitHub repository. Additionally, we check the integrity of the AUR ([`protonup-qt`](https://aur.archlinux.org/packages/protonup-qt) and [`protonup-qt-bin`](https://aur.archlinux.org/packages/protonup-qt-bin)) and [Pacstall](https://pacstall.dev/packages/protonup-qt-app) distribution on an irregular basis.
+
 ## Download from Flathub or as AppImage (portable):
 [<img height="56px" src="https://flathub.org/assets/badges/flathub-badge-en.png" alt="Download from Flathub" />](https://flathub.org/apps/details/net.davidotek.pupgui2) [<img height="56px" src="https://raw.githubusercontent.com/srevinsaju/get-appimage/master/static/badges/get-appimage-branding-dark.png" alt="Download AppImage" />](https://github.com/DavidoTek/ProtonUp-Qt/releases) 
 
@@ -45,6 +50,9 @@ https://aur.archlinux.org/packages/protonup-qt-bin (Maintained by R1yuu)
    a) Create a Pull Request with the translation  
    b) Simple method: Alternatively, upload the **.ts** file/texts [here](https://gist.github.com/) and [create a new issue](https://github.com/DavidoTek/ProtonUp-Qt/issues/new?labels=translation&title=Translation:%20language) with a link to your translation.  
 
+## Credits
+Special thanks to the authors of all services that ProtonUp-Qt uses, including **[AreWeAntiCheatYet](https://areweanticheatyet.com/)** and **[ProtonDB](https://www.protondb.com/)**.
+
 ## Licensing
 Project|License
 -------|--------
@@ -53,6 +61,7 @@ ProtonUp-Qt|GPL-3.0
 [PySide6](https://pypi.org/project/PySide6/)|LGPL-3.0/GPL-2.0
 [inputs](https://pypi.org/project/inputs/)|BSD
 [pyxdg](https://pypi.org/project/pyxdg/)|LGPLv2
-[vdf](https://pypi.org/project/vdf/)|MIT
+[vdf@solstice](https://github.com/solsticegamestudios/vdf/)|MIT
+[steam@solstice](https://github.com/solsticegamestudios/steam/)|MIT
 [requests](https://pypi.org/project/requests/)|Apache 2.0
 [PyYAML](https://pypi.org/project/PyYAML/)|MIT
diff --git a/i18n/pupgui2_de.ts b/i18n/pupgui2_de.ts
@@ -6,7 +6,7 @@
     <message>
         <location filename="../pupgui2/resources/ctmods/ctmod_luxtorpeda.py" line="108"/>
         <source>Missing dependencies!</source>
-        <translation type="unfinished">Fehlende Abhängigkeiten!</translation>
+        <translation>Fehlende Abhängigkeiten!</translation>
     </message>
 </context>
 <context>
@@ -38,7 +38,7 @@ Sollte dies ein Fehler sein, bitte einen GitHub Issue erstellen!</translation>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="253"/>
         <source>global</source>
-        <translation type="unfinished"></translation>
+        <translation>global</translation>
     </message>
     <message>
         <location filename="../pupgui2/pupgui2.py" line="274"/>
@@ -236,12 +236,12 @@ Abbrechen und beenden?</translation>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctbatchupdatedialog.ui" line="56"/>
         <source>New Version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Version:</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctbatchupdatedialog.ui" line="73"/>
         <source>Old Version:</source>
-        <translation type="unfinished"></translation>
+        <translation>Alte Version:</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctbatchupdatedialog.ui" line="114"/>
@@ -368,7 +368,7 @@ Die Verknüpfung kann unter Steam entfernt werden: &quot;Steam-fremdes Spiel ent
     <message>
         <location filename="../pupgui2/pupgui2ctbatchupdatedialog.py" line="47"/>
         <source>No supported compatibility tools found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine unterstützten Kompatibilitätswerkzeuge gefunden.</translation>
     </message>
     <message>
         <location filename="../pupgui2/pupgui2ctbatchupdatedialog.py" line="49"/>
@@ -420,7 +420,7 @@ Die Verknüpfung kann unter Steam entfernt werden: &quot;Steam-fremdes Spiel ent
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctinfodialog.ui" line="248"/>
         <source>No games</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Spiele</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctinfodialog.ui" line="264"/>
@@ -439,7 +439,7 @@ Die Verknüpfung kann unter Steam entfernt werden: &quot;Steam-fremdes Spiel ent
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctinfodialog.ui" line="274"/>
         <source>Search for a game...</source>
-        <translation>Suche nach einem Spiel...</translation>
+        <translation>Nach einem Spiel suchen ...</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_ctinfodialog.ui" line="297"/>
@@ -475,12 +475,12 @@ Die Verknüpfung kann unter Steam entfernt werden: &quot;Steam-fremdes Spiel ent
     <message>
         <location filename="../pupgui2/pupgui2ctinfodialog.py" line="128"/>
         <source>Tool is Global</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeug ist global</translation>
     </message>
     <message>
         <location filename="../pupgui2/pupgui2ctinfodialog.py" line="153"/>
         <source>e.g. {GAME_NAME}</source>
-        <translation type="unfinished"></translation>
+        <translation>z. B. {GAME_NAME}</translation>
     </message>
 </context>
 <context>
@@ -529,7 +529,7 @@ Die Verknüpfung kann unter Steam entfernt werden: &quot;Steam-fremdes Spiel ent
     </message>
     <message>
         <location filename="../pupgui2/pupgui2gamelistdialog.py" line="81"/>
-        <source>Deck compatibility</source>
+        <source>Deck Compatibility</source>
         <translation>Steam Deck kompatibel</translation>
     </message>
     <message>
@@ -687,7 +687,7 @@ Typ: {wine_type}</translation>
     <message>
         <location filename="../pupgui2/pupgui2gamelistdialog.py" line="305"/>
         <source>e.g. {GAME_NAME}</source>
-        <translation type="unfinished"></translation>
+        <translation>z. B. {GAME_NAME}</translation>
     </message>
     <message>
         <location filename="../pupgui2/pupgui2gamelistdialog.py" line="398"/>
@@ -741,7 +741,7 @@ Entwicklung: {trending}</translation>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_gamelistdialog.ui" line="71"/>
         <source>Search for a game...</source>
-        <translation>Suche nach Spiel...</translation>
+        <translation>Nach einem Spiel suchen ...</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_gamelistdialog.ui" line="91"/>
@@ -853,12 +853,12 @@ Entwicklung: {trending}</translation>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_shortcutdialog.ui" line="74"/>
         <source>e.g. ProtonUp-Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>z. B. ProtonUp-Qt</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_shortcutdialog.ui" line="77"/>
         <source>Search for a game...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach einem Spiel suchen ...</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_shortcutdialog.ui" line="84"/>
@@ -868,7 +868,7 @@ Entwicklung: {trending}</translation>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_shortcutdialog.ui" line="87"/>
         <source>Save</source>
-        <translation type="unfinished">Speichern</translation>
+        <translation>Speichern</translation>
     </message>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_shortcutdialog.ui" line="94"/>
@@ -878,7 +878,7 @@ Entwicklung: {trending}</translation>
     <message>
         <location filename="../pupgui2/resources/ui/pupgui2_shortcutdialog.ui" line="97"/>
         <source>Close</source>
-        <translation type="unfinished">Schließen</translation>
+        <translation>Schließen</translation>
     </message>
 </context>
 <context>
@@ -1325,12 +1325,12 @@ Siehe https://github.com/DavidoTek/ProtonUp-Qt/issues/161#issuecomment-135820008
     <message>
         <location filename="../pupgui2/util.py" line="848"/>
         <source>missing</source>
-        <translation type="unfinished">fehlt</translation>
+        <translation>fehlt</translation>
     </message>
     <message>
         <location filename="../pupgui2/util.py" line="849"/>
         <source>found</source>
-        <translation type="unfinished">gefunden</translation>
+        <translation>gefunden</translation>
     </message>
     <message>
         <location filename="../pupgui2/util.py" line="851"/>