mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Show vWii System Menu version in Menu Bar
This commit is contained in:
@ -161,9 +161,12 @@ public final class MainActivity extends AppCompatActivity
|
||||
|
||||
if (WiiUtils.isSystemMenuInstalled())
|
||||
{
|
||||
int resId = WiiUtils.isSystemMenuvWii() ?
|
||||
R.string.grid_menu_load_vwii_system_menu_installed :
|
||||
R.string.grid_menu_load_wii_system_menu_installed;
|
||||
|
||||
menu.findItem(R.id.menu_load_wii_system_menu).setTitle(
|
||||
getString(R.string.grid_menu_load_wii_system_menu_installed,
|
||||
WiiUtils.getSystemMenuVersion()));
|
||||
getString(resId, WiiUtils.getSystemMenuVersion()));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -32,6 +32,8 @@ public final class WiiUtils
|
||||
|
||||
public static native boolean isSystemMenuInstalled();
|
||||
|
||||
public static native boolean isSystemMenuvWii();
|
||||
|
||||
public static native String getSystemMenuVersion();
|
||||
|
||||
public static native boolean syncSdFolderToSdImage();
|
||||
|
@ -441,6 +441,7 @@
|
||||
<string name="grid_menu_online_system_update">Perform Online System Update</string>
|
||||
<string name="grid_menu_load_wii_system_menu">Load Wii System Menu</string>
|
||||
<string name="grid_menu_load_wii_system_menu_installed">Load Wii System Menu (%s)</string>
|
||||
<string name="grid_menu_load_vwii_system_menu_installed">Load vWii System Menu (%s)</string>
|
||||
<string name="import_in_progress">Importing...</string>
|
||||
<string name="export_in_progress">Exporting...</string>
|
||||
<string name="do_not_close_app">Do not close the app!</string>
|
||||
|
@ -165,6 +165,15 @@ Java_org_dolphinemu_dolphinemu_utils_WiiUtils_isSystemMenuInstalled(JNIEnv* env,
|
||||
return tmd.IsValid();
|
||||
}
|
||||
|
||||
JNIEXPORT jboolean JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_utils_WiiUtils_isSystemMenuvWii(JNIEnv* env, jclass)
|
||||
{
|
||||
IOS::HLE::Kernel ios;
|
||||
const auto tmd = ios.GetES()->FindInstalledTMD(Titles::SYSTEM_MENU);
|
||||
|
||||
return tmd.IsvWii();
|
||||
}
|
||||
|
||||
JNIEXPORT jstring JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_utils_WiiUtils_getSystemMenuVersion(JNIEnv* env, jclass)
|
||||
{
|
||||
@ -176,7 +185,7 @@ Java_org_dolphinemu_dolphinemu_utils_WiiUtils_getSystemMenuVersion(JNIEnv* env,
|
||||
return ToJString(env, "");
|
||||
}
|
||||
|
||||
return ToJString(env, DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion()));
|
||||
return ToJString(env, DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion(), tmd.IsvWii()));
|
||||
}
|
||||
|
||||
JNIEXPORT jboolean JNICALL
|
||||
|
Reference in New Issue
Block a user