hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

Rewrite missing keys dialog to be more descriptive 

Closes #30
This commit is contained in:
suyudontsueme 2024-03-24 21:12:15 +01:00 committed by Fijxu
parent a9312c837e
commit 907f9aa6f2
No known key found for this signature in database
GPG Key ID: 32C1DDF333EDA6A4
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
.forgejo/workflows/verify.yml
View File

@ -14,6 +14,7 @@ on:
- 'CMakeModules/**' - 'CMakeModules/**'
- 'dist/**' - 'dist/**'
- 'externals/**' - 'externals/**'
- 'CMakeLists.txt'
- 'vcpkg.json' - 'vcpkg.json'
paths-ignore: paths-ignore:
- 'src/android/**' - 'src/android/**'
@ -24,6 +25,7 @@ on:
- 'CMakeModules/**' - 'CMakeModules/**'
- 'dist/**' - 'dist/**'
- 'externals/**' - 'externals/**'
- 'CMakeLists.txt'
- 'vcpkg.json' - 'vcpkg.json'
paths-ignore: paths-ignore:
- 'src/android/**' - 'src/android/**'
@ -171,47 +173,47 @@ jobs:
# with: # with:
# name: ${{ env.INDIVIDUAL_EXE }} # name: ${{ env.INDIVIDUAL_EXE }}
# path: ${{ env.INDIVIDUAL_EXE }} # path: ${{ env.INDIVIDUAL_EXE }}
android: # android:
runs-on: ubuntu-latest # runs-on: ubuntu-latest
needs: format # needs: format
steps: # steps:
- uses: https://code.forgejo.org/actions/checkout@v3 # - uses: https://code.forgejo.org/actions/checkout@v3
with: # with:
submodules: recursive # submodules: recursive
fetch-depth: 0 # fetch-depth: 0
- name: set up JDK 17 # - name: set up JDK 17
uses: https://github.com/actions/setup-java@v3 # uses: https://github.com/actions/setup-java@v3
with: # with:
java-version: '17' # java-version: '17'
distribution: 'temurin' # distribution: 'temurin'
- name: Set up cache # - name: Set up cache
uses: https://code.forgejo.org/actions/cache@v3 # uses: https://code.forgejo.org/actions/cache@v3
with: # with:
path: | # path: |
~/.gradle/caches # ~/.gradle/caches
~/.gradle/wrapper # ~/.gradle/wrapper
.ccache # .ccache
key: ${{ runner.os }}-android-${{ github.sha }} # key: ${{ runner.os }}-android-${{ github.sha }}
restore-keys: | # restore-keys: |
${{ runner.os }}-android- # ${{ runner.os }}-android-
- name: Query tag name # - name: Query tag name
uses: https://github.com/olegtarasov/get-tag@v2.1.2 # uses: https://github.com/olegtarasov/get-tag@v2.1.2
id: tagName # id: tagName
- name: Install dependencies # - name: Install dependencies
run: | # run: |
sudo apt-get update # sudo apt-get update
sudo apt-get install -y ccache apksigner glslang-dev glslang-tools # sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
- name: Build # - name: Build
run: ./.ci/scripts/android/build.sh # run: ./.ci/scripts/android/build.sh
- name: Copy and sign artifacts # - name: Copy and sign artifacts
env: # env:
ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }} # ANDROID_KEYSTORE_B64: ${{ secrets.ANDROID_KEYSTORE_B64 }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} # ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }} # ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
run: ./.ci/scripts/android/upload.sh # run: ./.ci/scripts/android/upload.sh
- name: Upload # - name: Upload
uses: https://code.forgejo.org/actions/upload-artifact@v3 # uses: https://code.forgejo.org/actions/upload-artifact@v3
with: # with:
name: android # name: android
path: artifacts/ # path: artifacts/

9
src/suyu/main.cpp
View File

@ -1756,11 +1756,10 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa
} }
if (!ContentManager::AreKeysPresent()) { if (!ContentManager::AreKeysPresent()) {
QMessageBox::warning(this, tr("Derivation Components Missing"), QMessageBox::warning(
tr("Encryption keys are missing. " this, tr("Encryption Keys Missing"),
"In order to use this emulator, " tr("In order to use suyu you need to provide your own encryption keys. "
"you need to provide your own encryption keys " "You can install them by going to Tools -> Install encryption keys."));
"in order to play them."));
return false; return false;
} }
} }