diff options
| author | Ryan Meredith <rwm@udel.edu> | 2020-01-05 17:13:32 -0500 |
|---|---|---|
| committer | Ryan Meredith <rwm@udel.edu> | 2020-03-11 01:06:32 -0400 |
| commit | 38fa38d424cb35d0bf76435281b28a07a87e9738 (patch) | |
| tree | 130d20845e1c0db1eb98a6569bbff7f0c74e49c5 /Source/Android/app/src/main/java | |
| parent | bb7623e3ba4c5ed1d7089e6c9be388d0f0272c2e (diff) | |
Android: Add Set as Default ISO to UI
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 14 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java index f5f6ea5eae..aa6fc806d9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java @@ -10,9 +10,12 @@ import androidx.fragment.app.FragmentActivity; import android.widget.Toast; +import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; +import org.dolphinemu.dolphinemu.features.settings.model.Settings; import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; +import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile; import org.dolphinemu.dolphinemu.ui.platform.Platform; import org.dolphinemu.dolphinemu.utils.DirectoryInitialization; @@ -61,22 +64,28 @@ public class GamePropertiesDialog extends DialogFragment .getSupportFragmentManager(), "game_details"); break; case 1: - SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId); + NativeLibrary.SetConfig(SettingsFile.FILE_NAME_DOLPHIN + ".ini", + Settings.SECTION_INI_CORE, SettingsFile.KEY_DEFAULT_ISO, path); + NativeLibrary.ReloadConfig(); + Toast.makeText(getContext(), "Default ISO set", Toast.LENGTH_SHORT).show(); break; case 2: - SettingsActivity.launch(getContext(), MenuTag.GRAPHICS, gameId); + SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId); break; case 3: - SettingsActivity.launch(getContext(), MenuTag.GCPAD_TYPE, gameId); + SettingsActivity.launch(getContext(), MenuTag.GRAPHICS, gameId); break; case 4: + SettingsActivity.launch(getContext(), MenuTag.GCPAD_TYPE, gameId); + break; + case 5: // Clear option for GC, Wii controls for else if (platform == Platform.GAMECUBE.toInt()) clearGameSettings(gameId); else SettingsActivity.launch(getActivity(), MenuTag.WIIMOTE, gameId); break; - case 5: + case 6: clearGameSettings(gameId); break; } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java index 2650efa788..1431c31825 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java @@ -54,6 +54,7 @@ public final class SettingsFile public static final String KEY_SLOT_A_DEVICE = "SlotA"; public static final String KEY_SLOT_B_DEVICE = "SlotB"; public static final String KEY_ENABLE_SAVE_STATES = "EnableSaveStates"; + public static final String KEY_DEFAULT_ISO = "DefaultISO"; public static final String KEY_ANALYTICS_ENABLED = "Enabled"; public static final String KEY_ANALYTICS_PERMISSION_ASKED = "PermissionAsked"; |