Switch System_GetName to System_GetProperty

Common/KeyMap.cpp

@@ -676,7 +676,7 @@ void RestoreDefault() {
 	SetDefaultKeyMap(DEFAULT_MAPPING_PAD, false);
 #elif defined(ANDROID)
 	// Autodetect a few common devices
-	std::string name = System_GetName();
+	std::string name = System_GetProperty(SYSPROP_NAME);
 	if (name == "NVIDIA:SHIELD") {
 		SetDefaultKeyMap(DEFAULT_MAPPING_SHIELD, true);
 	} else if (name == "OUYA:OUYA Console") {  // TODO: check!

Core/Config.cpp

@@ -166,7 +166,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
 #ifdef BLACKBERRY
 	control->Get("ShowTouchControls", &bShowTouchControls, pixel_xres != pixel_yres);
 #elif defined(USING_GLES2)
-	std::string name = System_GetName();
+	std::string name = System_GetProperty(SYSPROP_NAME);
 	if (name == "NVIDIA:SHIELD" || name == "Sony Ericsson:R800i" || name == "Sony Ericsson:zeus") {
 		control->Get("ShowTouchControls", &bShowTouchControls, false);
 	} else {

UI/MiscScreens.cpp

@@ -329,7 +329,8 @@ void SystemInfoScreen::CreateViews() {
 	root_->Add(scroll);
 
 	scroll->Add(new ItemHeader("System Information"));
-	scroll->Add(new InfoItem("System Name", System_GetName()));
+	scroll->Add(new InfoItem("System Name", System_GetProperty(SYSPROP_NAME)));
+	scroll->Add(new InfoItem("System Lang/Region", System_GetProperty(SYSPROP_LANGREGION)));
 	scroll->Add(new InfoItem("GPU Vendor", (char *)glGetString(GL_VENDOR)));
 	scroll->Add(new InfoItem("GPU Model", (char *)glGetString(GL_RENDERER)));
 	scroll->Add(new InfoItem("OpenGL Version Supported", (char *)glGetString(GL_VERSION)));

Windows/PPSSPP.vcxproj.filters

@@ -20,12 +20,12 @@
     <Filter Include="Windows\System">
       <UniqueIdentifier>{45e2a327-0a36-4292-ab24-a297639b797e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Android">
-      <UniqueIdentifier>{d53d0871-8572-4393-822e-d14db0a88dab}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Windows\Input">
       <UniqueIdentifier>{a1963305-bf88-43ef-8ba2-bb3933584b38}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Other Platforms">
+      <UniqueIdentifier>{d53d0871-8572-4393-822e-d14db0a88dab}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Debugger\CtrlDisAsmView.cpp">
@@ -90,10 +90,10 @@
     <ClCompile Include="main.cpp" />
     <ClCompile Include="stdafx.cpp" />
     <ClCompile Include="..\android\jni\ArmEmitterTest.cpp">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </ClCompile>
     <ClCompile Include="..\android\jni\TestRunner.cpp">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </ClCompile>
     <ClCompile Include="DinputDevice.cpp">
       <Filter>Windows\Input</Filter>
@@ -177,10 +177,10 @@
     </ClInclude>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="..\android\jni\ARMEmitterTest.h">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </ClInclude>
     <ClInclude Include="..\android\jni\TestRunner.h">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </ClInclude>
     <ClInclude Include="DinputDevice.h">
       <Filter>Windows\Input</Filter>
@@ -209,17 +209,17 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="..\android\jni\Android.mk">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </None>
     <None Include="ppsspp.ico">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="..\README.md" />
     <None Include="..\android\atlasscript.txt">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </None>
     <None Include="..\android\jni\Application.mk">
-      <Filter>Android</Filter>
+      <Filter>Other Platforms</Filter>
     </None>
     <None Include="..\CMakeLists.txt">
       <Filter>Windows</Filter>

Windows/main.cpp

@@ -19,6 +19,7 @@
 
 #include "file/vfs.h"
 #include "file/zip_read.h"
+#include "base/NativeApp.h"
 #include "util/text/utf8.h"
 
 #include "Core/Config.h"
@@ -54,8 +55,15 @@ void LaunchBrowser(const char *url) {
 	ShellExecute(NULL, L"open", ConvertUTF8ToWString(url).c_str(), NULL, NULL, SW_SHOWNORMAL);
 }
 
-std::string System_GetName() {
+std::string System_GetProperty(SystemProperty prop) {
-	return "PC:Windows";
+	switch (prop) {
+	case SYSPROP_NAME:
+		return "PC:Windows";
+	case SYSPROP_LANGREGION:
+		return "en_US";
+	default:
+		return "";
+	}
 }
 
 int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLine, int iCmdShow)

ios/main.mm

@@ -5,10 +5,15 @@
 
 #import "AppDelegate.h"
 
-std::string System_GetName()
+std::string System_GetProperty(SystemProperty prop) {
-{
+	switch (prop) {
-	// TODO: iPad/etc.?
+	case SYSPROP_NAME:
-	return "iOS:";
+		return "iOS:";
+	case SYSPROP_LANGREGION:
+		return "en_US";
+	default:
+		return "";
+	}
 }
 
 int main(int argc, char *argv[])

native

@@ -1 +1 @@
-Subproject commit 0d2699614691d71db6bfd8bbf5e46973d343c05e
+Subproject commit 1790bd8b7ef1318abccc4d92ad5b89464d42fd0e