From 986b0cbec946dd755e797a9252dd631b2e4650e2 Mon Sep 17 00:00:00 2001
From: olebeck <31539311+olebeck@users.noreply.github.com>
Date: Sat, 6 Sep 2025 13:46:55 +0200
Subject: [PATCH] add missing strings

---
 CONFIG/vita/cxml/locale/en.xml |   4 +-
 CONFIG/vita/cxml/settings.xml  |   5 +-
 CONFIG/vita/src/app.cpp        | 124 +++++++++++++++++----------------
 ISLE/vita/config.cpp           |   4 +-
 4 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/CONFIG/vita/cxml/locale/en.xml b/CONFIG/vita/cxml/locale/en.xml
index c1a52a65..22435a39 100644
--- a/CONFIG/vita/cxml/locale/en.xml
+++ b/CONFIG/vita/cxml/locale/en.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <stringset>
     <!-- Main Page -->
-     <string id="msg_unfinished" src="the config app does not save the config yet!"/>
     <string id="msg_lego_island_config" src="Lego Island Config"/>
     <string id="msg_page_game" src="Game" />
     <string id="msg_page_graphics" src="Graphics" />
@@ -9,7 +8,8 @@
     <string id="msg_page_extensions" src="Extensions" />
 
     <!-- Game Page -->
-    <string id="msg_data_path" src="Data Path" />
+    <string id="msg_disk_path" src="Disk Path" />
+    <string id="msg_cd_path" src="CD Path" />
     <string id="msg_save_path" src="Save Path" />
     <string id="msg_3d_sound" src="3D Sound" />
     <string id="msg_music" src="Music" />
diff --git a/CONFIG/vita/cxml/settings.xml b/CONFIG/vita/cxml/settings.xml
index b26ae2cb..e9dad3fb 100644
--- a/CONFIG/vita/cxml/settings.xml
+++ b/CONFIG/vita/cxml/settings.xml
@@ -2,10 +2,9 @@
 
 <application_settings version="1.0" bg_color="4.0, 21.0, 105.0, 255.0">
     <setting_list id="lego_island_config" title="msg_lego_island_config">
-         <label id="unfinished_label" title="msg_unfinished" style="heading"/>
-
         <setting_list id="page_game" title="msg_page_game" style="edit" icon="tex_spanner">
-            <text_field id="data_path" title="msg_data_path" max_length="255" min_length="0" keyboard_type="alphabet" key="data_path" default_value=""/>
+            <text_field id="disk_path" title="msg_disk_path" max_length="255" min_length="0" keyboard_type="alphabet" key="disk_path" default_value=""/>
+            <text_field id="cd_path" title="msg_cd_path" max_length="255" min_length="0" keyboard_type="alphabet" key="cd_path" default_value=""/>
             <text_field id="save_path" title="msg_save_path" max_length="255" min_length="0" keyboard_type="alphabet" key="save_path" default_value=""/>
             <list id="transition_type" title="msg_transition_type" key="transition_type" default_value="0">
                 <list_item id="transition_none" title="msg_transition_none" value="0" />
diff --git a/CONFIG/vita/src/app.cpp b/CONFIG/vita/src/app.cpp
index 172309c4..ec5947df 100644
--- a/CONFIG/vita/src/app.cpp
+++ b/CONFIG/vita/src/app.cpp
@@ -17,8 +17,9 @@ paf::Plugin* g_configPlugin;
 sce::AppSettings* g_appSettings;
 sce::AppSettings::Interface* g_appSetIf;
 
-void merge_dicts(dictionary* dst, dictionary* src) {
-	for(int i = 0; i < src->n; i++) {
+void merge_dicts(dictionary* dst, dictionary* src)
+{
+	for (int i = 0; i < src->n; i++) {
 		dictionary_set(dst, src->key[i], src->val[i]);
 	}
 }
@@ -62,36 +63,37 @@ struct Config {
 
 #define GetDictInt(x, name) x = iniparser_getint(this->dict, name, x)
 #define GetDictFloat(x, name) x = iniparser_getdouble(this->dict, name, x)
-#define GetDictString(x, name) { \
-		const char* val = iniparser_getstring(this->dict, name, nullptr); \
-		if (val != nullptr) { \
-			x = val; \
-		} \
+#define GetDictString(x, name)                                                                                         \
+	{                                                                                                                  \
+		const char* val = iniparser_getstring(this->dict, name, nullptr);                                              \
+		if (val != nullptr) {                                                                                          \
+			x = val;                                                                                                   \
+		}                                                                                                              \
 	}
 #define GetDictBool(x, name) x = iniparser_getboolean(this->dict, name, x)
 
-#define SetDictBool(NAME, VALUE)                                                                                        \
+#define SetDictBool(NAME, VALUE)                                                                                       \
 	{                                                                                                                  \
 		const char* v = VALUE ? "true" : "false";                                                                      \
 		sceClibPrintf("SetIniBool(%s, %s)\n", NAME, v);                                                                \
-		iniparser_set(this->dict, NAME, v);                                                                                  \
+		iniparser_set(this->dict, NAME, v);                                                                            \
 	}
-#define SetDictInt(NAME, VALUE)                                                                                         \
+#define SetDictInt(NAME, VALUE)                                                                                        \
 	{                                                                                                                  \
 		sceClibSnprintf(buffer, sizeof(buffer), "%d", VALUE);                                                          \
 		sceClibPrintf("SetIniInt(%s, %d)\n", NAME, VALUE);                                                             \
-		iniparser_set(this->dict, NAME, buffer);                                                                             \
+		iniparser_set(this->dict, NAME, buffer);                                                                       \
 	}
-#define SetDictFloat(NAME, VALUE)                                                                                       \
+#define SetDictFloat(NAME, VALUE)                                                                                      \
 	{                                                                                                                  \
 		sceClibSnprintf(buffer, sizeof(buffer), "%f", VALUE);                                                          \
 		sceClibPrintf("SetIniFloat(%s, %f)\n", NAME, VALUE);                                                           \
-		iniparser_set(this->dict, NAME, buffer);                                                                             \
+		iniparser_set(this->dict, NAME, buffer);                                                                       \
 	}
-#define SetDictString(NAME, VALUE)                                                                                         \
+#define SetDictString(NAME, VALUE)                                                                                     \
 	{                                                                                                                  \
 		sceClibPrintf("SetString(%s, %s)\n", NAME, VALUE);                                                             \
-		iniparser_set(this->dict, NAME, VALUE);                                                                              \
+		iniparser_set(this->dict, NAME, VALUE);                                                                        \
 	}
 
 	void Init(sce::AppSettings* settings)
@@ -138,7 +140,7 @@ struct Config {
 	void LoadIni()
 	{
 		dictionary* ini = iniparser_load(g_iniPath);
-		if(ini) {
+		if (ini) {
 			merge_dicts(this->dict, ini);
 			iniparser_freedict(ini);
 		}
@@ -159,28 +161,28 @@ struct Config {
 	void ToSettings()
 	{
 		const int len = sizeof(key_map) / sizeof(key_map[0]);
-		for(int i = 0; i < len; i++) {
+		for (int i = 0; i < len; i++) {
 			const setting_map m = key_map[i];
-			switch(m.type) {
-				case 'f': // float, AppSettings doesnt have float so just use string
-				case 's': {
-					const char* value = dictionary_get(this->dict, m.key_ini, "");
-					this->settings->SetString(m.key_app, value);
-					break;
-				}
-				case 'i': {
-					int32_t value = iniparser_getint(this->dict, m.key_ini, 0);
-					this->settings->SetInt(m.key_app, value);
-					break;
-				}
-				case 'b': {
-					bool value = iniparser_getboolean(this->dict, m.key_ini, 0) == 1;
-					this->settings->SetBool(m.key_app, value);
-					break;
-				}
-				default: {
-					sceClibPrintf("invalid setting map entry %s %s %c\n", m.key_app, m.key_ini, m.type);
-				}
+			switch (m.type) {
+			case 'f': // float, AppSettings doesnt have float so just use string
+			case 's': {
+				const char* value = dictionary_get(this->dict, m.key_ini, "");
+				this->settings->SetString(m.key_app, value);
+				break;
+			}
+			case 'i': {
+				int32_t value = iniparser_getint(this->dict, m.key_ini, 0);
+				this->settings->SetInt(m.key_app, value);
+				break;
+			}
+			case 'b': {
+				bool value = iniparser_getboolean(this->dict, m.key_ini, 0) == 1;
+				this->settings->SetBool(m.key_app, value);
+				break;
+			}
+			default: {
+				sceClibPrintf("invalid setting map entry %s %s %c\n", m.key_app, m.key_ini, m.type);
+			}
 			}
 		}
 	}
@@ -188,31 +190,31 @@ struct Config {
 	void FromSettings()
 	{
 		const int len = sizeof(key_map) / sizeof(key_map[0]);
-		for(int i = 0; i < len; i++) {
+		for (int i = 0; i < len; i++) {
 			const setting_map m = key_map[i];
-			switch(m.type) {
-				case 'f': // float, AppSettings doesnt have float so just use string
-				case 's': {
-					const char* def = dictionary_get(this->dict, m.key_ini, "");
-					this->settings->GetString(m.key_app, this->buffer, sizeof(this->buffer), def);
-					dictionary_set(this->dict, m.key_ini, buffer);
-					break;
-				}
-				case 'i': {
-					int32_t value = iniparser_getint(this->dict, m.key_ini, 0);
-					this->settings->GetInt(m.key_app, &value, value);
-					SetDictInt(m.key_ini, value);
-					break;
-				}
-				case 'b': {
-					bool value = iniparser_getboolean(this->dict, m.key_ini, 0) == 1;
-					this->settings->GetBool(m.key_app, &value, value);
-					SetDictBool(m.key_ini, value);
-					break;
-				}
-				default: {
-					sceClibPrintf("invalid setting map entry %s %s %c\n", m.key_app, m.key_ini, m.type);
-				}
+			switch (m.type) {
+			case 'f': // float, AppSettings doesnt have float so just use string
+			case 's': {
+				const char* def = dictionary_get(this->dict, m.key_ini, "");
+				this->settings->GetString(m.key_app, this->buffer, sizeof(this->buffer), def);
+				dictionary_set(this->dict, m.key_ini, buffer);
+				break;
+			}
+			case 'i': {
+				int32_t value = iniparser_getint(this->dict, m.key_ini, 0);
+				this->settings->GetInt(m.key_app, &value, value);
+				SetDictInt(m.key_ini, value);
+				break;
+			}
+			case 'b': {
+				bool value = iniparser_getboolean(this->dict, m.key_ini, 0) == 1;
+				this->settings->GetBool(m.key_app, &value, value);
+				SetDictBool(m.key_ini, value);
+				break;
+			}
+			default: {
+				sceClibPrintf("invalid setting map entry %s %s %c\n", m.key_app, m.key_ini, m.type);
+			}
 			}
 		}
 	}
diff --git a/ISLE/vita/config.cpp b/ISLE/vita/config.cpp
index 412b4a53..8ebb3b3e 100644
--- a/ISLE/vita/config.cpp
+++ b/ISLE/vita/config.cpp
@@ -7,7 +7,7 @@ void VITA_SetupDefaultConfigOverrides(dictionary* p_dictionary)
 {
 	SDL_Log("Overriding default config for VITA");
 
-	iniparser_set(p_dictionary, "isle:diskpath", "ux0:data/isledecomp/DATA/disk");
-	iniparser_set(p_dictionary, "isle:cdpath", "ux0:data/isledecomp/");
+	iniparser_set(p_dictionary, "isle:diskpath", "ux0:data/isledecomp/isle/DATA/disk");
+	iniparser_set(p_dictionary, "isle:cdpath", "ux0:data/isledecomp/isle");
 	iniparser_set(p_dictionary, "isle:MSAA", "4");
 }