From a3ff20a5f93d8ab6b246de9fde011fabd1d15e5c Mon Sep 17 00:00:00 2001 From: Ryan Meredith Date: Tue, 31 Mar 2020 14:58:00 -0400 Subject: [PATCH] Android: Add Insert SD Card and update description --- .../features/settings/ui/SettingsFragmentPresenter.java | 4 ++++ .../dolphinemu/features/settings/utils/SettingsFile.java | 1 + Source/Android/app/src/main/res/values/strings.xml | 2 ++ Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp | 2 +- Source/Core/DolphinQt/Settings/WiiPane.cpp | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index d0db5c8a1c..b0f37299f5 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -378,13 +378,17 @@ public final class SettingsFragmentPresenter private void addWiiSettings(ArrayList sl) { + Setting wiiSDCard = null; Setting continuousScan = null; Setting wiimoteSpeaker = null; SettingSection coreSection = mSettings.getSection(Settings.SECTION_INI_CORE); + wiiSDCard = coreSection.getSetting(SettingsFile.KEY_WII_SD_CARD); continuousScan = coreSection.getSetting(SettingsFile.KEY_WIIMOTE_SCAN); wiimoteSpeaker = coreSection.getSetting(SettingsFile.KEY_WIIMOTE_SPEAKER); + sl.add(new CheckBoxSetting(SettingsFile.KEY_WII_SD_CARD, Settings.SECTION_INI_CORE, + R.string.insert_sd_card, R.string.insert_sd_card_description, false, wiiSDCard)); sl.add(new CheckBoxSetting(SettingsFile.KEY_WIIMOTE_SCAN, Settings.SECTION_INI_CORE, R.string.wiimote_scanning, R.string.wiimote_scanning_description, true, continuousScan)); 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 629dc53be9..77c38b9f38 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 @@ -273,6 +273,7 @@ public final class SettingsFile public static final String KEY_WIIBIND_TURNTABLE_CROSSFADE_LEFT = "TurntableCrossLeft_"; public static final String KEY_WIIBIND_TURNTABLE_CROSSFADE_RIGHT = "TurntableCrossRight_"; + public static final String KEY_WII_SD_CARD = "WiiSDCard"; public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning"; public static final String KEY_WIIMOTE_SPEAKER = "WiimoteEnableSpeaker"; diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index df006410f1..74a6399d27 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -138,6 +138,8 @@ GameCube Slot A Device GameCube Slot B Device Wii + Insert SD Card + Supports SD and SDHC. Default size is 128 MB. Wii Remote Continuous Scanning Leave this on if you are using a DolphinBar for real Wiimote support. Wii Remote Speaker diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index 26861eee65..78ec7a0ce3 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -62,7 +62,7 @@ void SDIOSlot0::OpenInternal() m_card.Open(filename, "r+b"); if (!m_card) { - WARN_LOG(IOS_SD, "Failed to open SD Card image, trying to create a new 128MB image..."); + WARN_LOG(IOS_SD, "Failed to open SD Card image, trying to create a new 128 MB image..."); if (Common::SDCardCreate(128, filename)) { INFO_LOG(IOS_SD, "Successfully created %s", filename.c_str()); diff --git a/Source/Core/DolphinQt/Settings/WiiPane.cpp b/Source/Core/DolphinQt/Settings/WiiPane.cpp index 35f9af561a..2a4771292a 100644 --- a/Source/Core/DolphinQt/Settings/WiiPane.cpp +++ b/Source/Core/DolphinQt/Settings/WiiPane.cpp @@ -130,7 +130,7 @@ void WiiPane::CreateMisc() "(576i) for PAL games.\nMay not work for all games.")); m_screensaver_checkbox->setToolTip(tr("Dims the screen after five minutes of inactivity.")); m_system_language_choice->setToolTip(tr("Sets the Wii system language.")); - m_sd_card_checkbox->setToolTip(tr("Saved to /Wii/sd.raw (default size is 128mb).")); + m_sd_card_checkbox->setToolTip(tr("Supports SD and SDHC. Default size is 128 MB.")); m_connect_keyboard_checkbox->setToolTip(tr("May cause slow down in Wii Menu and some games.")); misc_settings_group_layout->addWidget(m_pal60_mode_checkbox, 0, 0, 1, 1);