Merge pull request #19882 from hrydgard/minor-ui-features

In the game tab options, add a setting for "Default tab".
hrydgard · Jan 17, 2025 · 720324b · 720324b
2 parents 8679bdd + f37c74c
commit 720324b
Show file tree

Hide file tree

Showing 48 changed files with 71 additions and 15 deletions.
diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -230,6 +230,7 @@ static const ConfigSetting generalSettings[] = {
 	ConfigSetting("CwCheatScrollPosition", &g_Config.fCwCheatScrollPosition, 0.0f, CfgFlag::PER_GAME),
 	ConfigSetting("GameListScrollPosition", &g_Config.fGameListScrollPosition, 0.0f, CfgFlag::DEFAULT),
 	ConfigSetting("DebugOverlay", &g_Config.iDebugOverlay, 0, CfgFlag::DONT_SAVE),
+	ConfigSetting("DefaultTab", &g_Config.iDefaultTab, 0, CfgFlag::DEFAULT),
 
 	ConfigSetting("ScreenshotsAsPNG", &g_Config.bScreenshotsAsPNG, false, CfgFlag::PER_GAME),
 	ConfigSetting("UseFFV1", &g_Config.bUseFFV1, false, CfgFlag::DEFAULT),

diff --git a/Core/Config.h b/Core/Config.h
@@ -256,6 +256,7 @@ struct Config {
 	bool bShaderCache;  // Hidden ini-only setting, useful for debugging shader compile times.
 	bool bUberShaderVertex;
 	bool bUberShaderFragment;
+	int iDefaultTab;
 
 	std::vector<std::string> vPostShaderNames; // Off for chain end (only Off for no shader)
 	std::map<std::string, float> mPostShaderSetting;

diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
@@ -1198,7 +1198,7 @@ void MainScreen::CreateViews() {
 		}
 
 		if (g_Config.HasRecentIsos()) {
-			tabHolder_->SetCurrentTab(0, true);
+			tabHolder_->SetCurrentTab(std::clamp(g_Config.iDefaultTab, 0, g_Config.bRemoteTab ? 3 : 2), true);
 		} else if (g_Config.iMaxRecent > 0) {
 			tabHolder_->SetCurrentTab(1, true);	
 		}
@@ -1728,13 +1728,16 @@ void GridSettingsPopupScreen::CreatePopupContents(UI::ViewGroup *parent) {
 
 	auto di = GetI18NCategory(I18NCat::DIALOG);
 	auto sy = GetI18NCategory(I18NCat::SYSTEM);
+	auto mm = GetI18NCategory(I18NCat::MAINMENU);
 
 	ScrollView *scroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 1.0f));
 	LinearLayout *items = new LinearLayoutList(ORIENT_VERTICAL);
 
 	items->Add(new CheckBox(&g_Config.bGridView1, sy->T("Display Recent on a grid")));
 	items->Add(new CheckBox(&g_Config.bGridView2, sy->T("Display Games on a grid")));
 	items->Add(new CheckBox(&g_Config.bGridView3, sy->T("Display Homebrew on a grid")));
+	static const char *defaultTabs[] = { "Recent", "Games", "Homebrew & Demos" };
+	PopupMultiChoice *beziersChoice = items->Add(new PopupMultiChoice(&g_Config.iDefaultTab, sy->T("Default tab"), defaultTabs, 0, ARRAY_SIZE(defaultTabs), I18NCat::MAINMENU, screenManager()));
 
 	items->Add(new ItemHeader(sy->T("Grid icon size")))->SetPopupStyle(true);
 	items->Add(new Choice(sy->T("Increase size")))->OnClick.Handle(this, &GridSettingsPopupScreen::GridPlusClick);

diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini
@@ -1297,6 +1297,7 @@ Change CPU Clock = Change emulated PSP's CPU clock (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = ‎أنوية المعالج
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (مُستَحسَن)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Change emulated PSP's CPU clock (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (tövsiyə)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Промени емулираната процесорна ч
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (препоръчително)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Change emulated PSP's CPU clock (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = Nucli de CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recomanat)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Změnit hodiny emulovaného procesoru PSP (nestabilní)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Ændre emulerede PSPs CPU clock (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (anbefalede)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = CPU-Takt ändern (instabil)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU Kern
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Sullei lassinna to CPU (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
@@ -1303,6 +1303,7 @@ AVI Dump stopped. = AVI dump stopped
 Cache ISO in RAM = Cache full ISO in RAM
 Change CPU Clock = Change emulated PSP's CPU clock (unstable)
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 JIT using IR = JIT using IR
 Loaded plugin: %1 = Loaded plugin: %1

diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini
@@ -1290,6 +1290,7 @@ Change CPU Clock = Velocidad CPU PSP (inestable)
 Color Saturation = Saturación de color
 Color Tint = Matiz de color
 CPU Core = Núcleo de CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recomendada)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: el estado es de otro juego.

diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini
@@ -1291,6 +1291,7 @@ Change CPU Clock = Cambiar velocidad de CPU de PSP (inestable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = Núcleo de CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recomendado)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: el estado es de otro juego.

diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = ‎(ناپایدار) CPU تغییر سرعت
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = ‎CPU هسته
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Muuta emuloidun PSP:n näytönohjaimen kelloa (epävakaa)
 Color Saturation = Värisaturaatio
 Color Tint = Värin sävy
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Virhe: "kumoa tilatallennuksen" tila on eri pelistä

diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini
@@ -1280,6 +1280,7 @@ Change CPU Clock = Fréquence du CPU de la PSP émulé (instable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = Méthode CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Velocidade CPU PSP (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recomendado)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Αλλαγή συχνότητας CPU (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = Πυρήνες CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Δυναμικός Αναμεταγλωττιστής/JIT (συνιστάται)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = שנה קצב מעבד (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = דבעמ בצק הנש (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Promijeni emulaciju PSP-ovog CPU sata (nestabilno)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU jezgra
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (preporučeno)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Emulált CPU órajel változtatása (instabil)
 Color Saturation = Színtelítettség
 Color Tint = Színárnyalat
 CPU Core = CPU mag
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (ajánlott)
 Enable plugins = Bővítmények engedélyezése
 Error: load undo state is from a different game = Hiba: a visszavonandó betöltött állapotmentés egy másik játékból való.

diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Ubah pewaktu CPU PSP yang ditiru (tidak stabil)
 Color Saturation = Saturasi warna
 Color Tint = Pewarnaan
 CPU Core = Inti CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (direkomendasikan)
 Enable plugins = Aktifkan plugin
 Error: load undo state is from a different game = Kesalahan: memuat status yang berasal dari permainan yang berbeda

diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini
@@ -1290,6 +1290,7 @@ Change CPU Clock = Cambia la frequenza della CPU (instabile)
 Color Saturation = Saturazione colore
 Color Tint = Tonalità colore
 CPU Core = Core CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (consigliato)
 Enable plugins = Abilita plugin
 Error: load undo state is from a different game = Errore: lo stato annullato proviene da un gioco diverso.

diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini
@@ -1287,6 +1287,7 @@ AVI Dump stopped. = AVIダンプを停止しました
 Cache ISO in RAM = ISO全体をキャッシュする
 Change CPU Clock = CPUクロックを変更する (不安定)
 CPU Core = CPUコア
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (推奨)
 Enable plugins = プラグインを有効化
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Ganti CPU Clock (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini
@@ -1279,6 +1279,7 @@ AVI Dump stopped. = AVI 덤프가 중지됨
 Cache ISO in RAM = RAM에 전체 ISO 캐시
 Change CPU Clock = 에뮬레이트된 PSP의 CPU 클럭 변경 (불안정)
 CPU Core = CPU 코어
+Default tab = Default tab
 Dynarec/JIT (recommended) = 동적 재컴파일/JIT (추천)
 JIT using IR = IR을 이용한 JIT
 Loaded plugin: %1 = 로드된 플러그인: %1

diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini
@@ -1293,6 +1293,7 @@ AVI Dump stopped. = AVI dump stopped
 Cache ISO in RAM = Cache full ISO in RAM
 Change CPU Clock = Change emulated PSP's CPU clock (unstable)
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 JIT using IR = JIT using IR

diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = "ປ່ຽນຄ່າຈຳລອງຄວາມຖີ່ຂ
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Pakeisti emuliuojamo PSP pagrindinio procesoriaus greitį (un
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (ieteicams)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Tukar pemasa CPU (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = CPU-kloksnelheid aanpassen (instabiel)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU-core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recommended)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini
@@ -1289,6 +1289,7 @@ Change CPU Clock = Change emulated PSP's CPU clock (unstable)
 Color Saturation = Color Saturation
 Color Tint = Color Tint
 CPU Core = CPU core
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (anbefales)
 Enable plugins = Enable plugins
 Error: load undo state is from a different game = Error: load undo state is from a different game

diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini
@@ -1294,6 +1294,7 @@ Change CPU Clock = Zmień częstotliwość zegara CPU (niestabilnie)
 Color Saturation = Saturacja
 Color Tint = Odcień
 CPU Core = Rdzeń procesora
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (zalecana)
 Enable plugins = Włącz pluginy
 Error: load undo state is from a different game = Błąd: ładowany stan pochodzi z innej gry

diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini
@@ -1303,6 +1303,7 @@ AVI Dump stopped. = Dump do AVI parado
 Cache ISO in RAM = Pôr a ISO inteira na RAM
 Change CPU Clock = Mudar o clock da CPU do PSP emulado (instável)
 CPU Core = Núcleo da CPU
+Default tab = Default tab
 Dynarec/JIT (recommended) = Dynarec/JIT (recomendado)
 JIT using IR = JIT usando o IR
 Loaded plugin: %1 = Plugin carregado: %1