From 907f9aa6f2a011431d105de9e43887727c8b10d8 Mon Sep 17 00:00:00 2001
From: suyudontsueme <suyudontsueme@noreply.localhost>
Date: Sun, 24 Mar 2024 21:12:15 +0100
Subject: [PATCH] Rewrite missing keys dialog to be more descriptive

Closes #30
---
 .forgejo/workflows/verify.yml | 88 ++++++++++++++++++-----------------
 src/suyu/main.cpp             |  9 ++--
 2 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/.forgejo/workflows/verify.yml b/.forgejo/workflows/verify.yml
index 0e9263fbb4..46fa5f958b 100644
--- a/.forgejo/workflows/verify.yml
+++ b/.forgejo/workflows/verify.yml
@@ -14,6 +14,7 @@ on:
       - 'CMakeModules/**'
       - 'dist/**'
       - 'externals/**'
+      - 'CMakeLists.txt'
       - 'vcpkg.json'
     paths-ignore:
       - 'src/android/**'
@@ -24,6 +25,7 @@ on:
       - 'CMakeModules/**'
       - 'dist/**'
       - 'externals/**'
+      - 'CMakeLists.txt'
       - 'vcpkg.json'
     paths-ignore:
       - 'src/android/**'
@@ -171,47 +173,47 @@ jobs:
   #       with:
   #         name: ${{ env.INDIVIDUAL_EXE }}
   #         path: ${{ env.INDIVIDUAL_EXE }}
-  android:
-    runs-on: ubuntu-latest
-    needs: format
-    steps:
-      - uses: https://code.forgejo.org/actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: set up JDK 17
-        uses: https://github.com/actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Set up cache
-        uses: https://code.forgejo.org/actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            .ccache
-          key: ${{ runner.os }}-android-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-android-
-      - name: Query tag name
-        uses: https://github.com/olegtarasov/get-tag@v2.1.2
-        id: tagName
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
-      - name: Build
-        run: ./.ci/scripts/android/build.sh
-      - name: Copy and sign artifacts
-        env:
-          ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
-          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
-          ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
-        run: ./.ci/scripts/android/upload.sh
-      - name: Upload
-        uses: https://code.forgejo.org/actions/upload-artifact@v3
-        with:
-          name: android
-          path: artifacts/
+  # android:
+  #   runs-on: ubuntu-latest
+  #   needs: format
+  #   steps:
+  #     - uses: https://code.forgejo.org/actions/checkout@v3
+  #       with:
+  #         submodules: recursive
+  #         fetch-depth: 0
+  #     - name: set up JDK 17
+  #       uses: https://github.com/actions/setup-java@v3
+  #       with:
+  #         java-version: '17'
+  #         distribution: 'temurin'
+  #     - name: Set up cache
+  #       uses: https://code.forgejo.org/actions/cache@v3
+  #       with:
+  #         path: |
+  #           ~/.gradle/caches
+  #           ~/.gradle/wrapper
+  #           .ccache
+  #         key: ${{ runner.os }}-android-${{ github.sha }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-android-
+  #     - name: Query tag name
+  #       uses: https://github.com/olegtarasov/get-tag@v2.1.2
+  #       id: tagName
+  #     - name: Install dependencies
+  #       run: |
+  #         sudo apt-get update
+  #         sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
+  #     - name: Build
+  #       run: ./.ci/scripts/android/build.sh
+  #     - name: Copy and sign artifacts
+  #       env:
+  #         ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
+  #         ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
+  #         ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+  #       run: ./.ci/scripts/android/upload.sh
+  #     - name: Upload
+  #       uses: https://code.forgejo.org/actions/upload-artifact@v3
+  #       with:
+  #         name: android
+  #         path: artifacts/
 
diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp
index fc0028b45d..9a3ee7f662 100644
--- a/src/suyu/main.cpp
+++ b/src/suyu/main.cpp
@@ -1756,11 +1756,10 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
         }
 
         if (!ContentManager::AreKeysPresent()) {
-            QMessageBox::warning(this, tr("Derivation Components Missing"),
-                                 tr("Encryption keys are missing. "
-                                    "In order to use this emulator, "
-                                    "you need to provide your own encryption keys "
-                                    "in order to play them."));
+            QMessageBox::warning(
+                this, tr("Encryption Keys Missing"),
+                tr("In order to use suyu you need to provide your own encryption keys. "
+                   "You can install them by going to Tools -> Install encryption keys."));
             return false;
         }
     }