From 6df3a9243f7c524ce862a0ce1e496256baf9e002 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 8 Dec 2023 14:36:42 +0100 Subject: [PATCH] fix: Rename scaling setting to avoid old values being interpreted wrongly --- plugins/builtin/romfs/lang/de_DE.json | 6 +----- plugins/builtin/romfs/lang/en_US.json | 2 +- plugins/builtin/romfs/lang/es_ES.json | 6 +----- plugins/builtin/romfs/lang/it_IT.json | 6 +----- plugins/builtin/romfs/lang/ja_JP.json | 6 +----- plugins/builtin/romfs/lang/ko_KR.json | 6 +----- plugins/builtin/romfs/lang/pt_BR.json | 6 +----- plugins/builtin/romfs/lang/zh_CN.json | 6 +----- plugins/builtin/romfs/lang/zh_TW.json | 6 +----- plugins/builtin/source/content/init_tasks.cpp | 2 +- plugins/builtin/source/content/settings_entries.cpp | 3 +-- 11 files changed, 11 insertions(+), 44 deletions(-) diff --git a/plugins/builtin/romfs/lang/de_DE.json b/plugins/builtin/romfs/lang/de_DE.json index 1fe4a6822..bb751dad0 100644 --- a/plugins/builtin/romfs/lang/de_DE.json +++ b/plugins/builtin/romfs/lang/de_DE.json @@ -537,12 +537,8 @@ "hex.builtin.setting.interface.fps.native": "", "hex.builtin.setting.interface.language": "Sprache", "hex.builtin.setting.interface.multi_windows": "Multi-Window-Unterstützung aktivieren", - "hex.builtin.setting.interface.scaling": "Skalierung", + "hex.builtin.setting.interface.scaling_factor": "Skalierung", "hex.builtin.setting.interface.scaling.native": "Nativ", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "Wikipedia Sprache", "hex.builtin.setting.interface.restore_window_pos": "", "hex.builtin.setting.proxy": "Proxy", diff --git a/plugins/builtin/romfs/lang/en_US.json b/plugins/builtin/romfs/lang/en_US.json index 7996319ae..cea73b987 100644 --- a/plugins/builtin/romfs/lang/en_US.json +++ b/plugins/builtin/romfs/lang/en_US.json @@ -595,7 +595,7 @@ "hex.builtin.setting.interface.fps.native": "Native", "hex.builtin.setting.interface.language": "Language", "hex.builtin.setting.interface.multi_windows": "Enable Multi Window support", - "hex.builtin.setting.interface.scaling": "Scaling", + "hex.builtin.setting.interface.scaling_factor": "Scaling", "hex.builtin.setting.interface.scaling.native": "Native", "hex.builtin.setting.interface.style": "Styling", "hex.builtin.setting.interface.window": "Window", diff --git a/plugins/builtin/romfs/lang/es_ES.json b/plugins/builtin/romfs/lang/es_ES.json index 18c8f8fea..00cf23e19 100644 --- a/plugins/builtin/romfs/lang/es_ES.json +++ b/plugins/builtin/romfs/lang/es_ES.json @@ -537,12 +537,8 @@ "hex.builtin.setting.interface.fps.native": "Nativo", "hex.builtin.setting.interface.language": "Idioma", "hex.builtin.setting.interface.multi_windows": "Activar soporte de ventanas múltiples", - "hex.builtin.setting.interface.scaling": "Escalado", + "hex.builtin.setting.interface.scaling_factor": "Escalado", "hex.builtin.setting.interface.scaling.native": "Nativo", - "hex.builtin.setting.interface.scaling.x0_5": "", - "hex.builtin.setting.interface.scaling.x1_0": "", - "hex.builtin.setting.interface.scaling.x1_5": "", - "hex.builtin.setting.interface.scaling.x2_0": "", "hex.builtin.setting.interface.wiki_explain_language": "Idioma de Wikipedia", "hex.builtin.setting.interface.restore_window_pos": "", "hex.builtin.setting.proxy": "", diff --git a/plugins/builtin/romfs/lang/it_IT.json b/plugins/builtin/romfs/lang/it_IT.json index be9507637..568bd2136 100644 --- a/plugins/builtin/romfs/lang/it_IT.json +++ b/plugins/builtin/romfs/lang/it_IT.json @@ -537,12 +537,8 @@ "hex.builtin.setting.interface.fps.native": "", "hex.builtin.setting.interface.language": "Lingua", "hex.builtin.setting.interface.multi_windows": "", - "hex.builtin.setting.interface.scaling": "Scale", + "hex.builtin.setting.interface.scaling_factor": "Scale", "hex.builtin.setting.interface.scaling.native": "Nativo", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "", "hex.builtin.setting.interface.restore_window_pos": "", "hex.builtin.setting.proxy": "", diff --git a/plugins/builtin/romfs/lang/ja_JP.json b/plugins/builtin/romfs/lang/ja_JP.json index 01e610ec0..70d4859a7 100644 --- a/plugins/builtin/romfs/lang/ja_JP.json +++ b/plugins/builtin/romfs/lang/ja_JP.json @@ -537,12 +537,8 @@ "hex.builtin.setting.interface.fps.native": "", "hex.builtin.setting.interface.language": "言語", "hex.builtin.setting.interface.multi_windows": "", - "hex.builtin.setting.interface.scaling": "スケーリング", + "hex.builtin.setting.interface.scaling_factor": "スケーリング", "hex.builtin.setting.interface.scaling.native": "ネイティブ", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "", "hex.builtin.setting.interface.restore_window_pos": "", "hex.builtin.setting.proxy": "プロキシ", diff --git a/plugins/builtin/romfs/lang/ko_KR.json b/plugins/builtin/romfs/lang/ko_KR.json index 67bf45762..a0a95fc15 100644 --- a/plugins/builtin/romfs/lang/ko_KR.json +++ b/plugins/builtin/romfs/lang/ko_KR.json @@ -551,12 +551,8 @@ "hex.builtin.setting.interface.fps.native": "기본", "hex.builtin.setting.interface.language": "언어", "hex.builtin.setting.interface.multi_windows": "다중 창 지원 사용", - "hex.builtin.setting.interface.scaling": "배율", + "hex.builtin.setting.interface.scaling_factor": "배율", "hex.builtin.setting.interface.scaling.native": "기본", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "위키백과 언어", "hex.builtin.setting.interface.restore_window_pos": "창 위치 복원", "hex.builtin.setting.proxy": "프록시", diff --git a/plugins/builtin/romfs/lang/pt_BR.json b/plugins/builtin/romfs/lang/pt_BR.json index 57707996a..7738654a3 100644 --- a/plugins/builtin/romfs/lang/pt_BR.json +++ b/plugins/builtin/romfs/lang/pt_BR.json @@ -537,12 +537,8 @@ "hex.builtin.setting.interface.fps.native": "", "hex.builtin.setting.interface.language": "Idioma", "hex.builtin.setting.interface.multi_windows": "", - "hex.builtin.setting.interface.scaling": "Scaling", + "hex.builtin.setting.interface.scaling_factor": "Scaling", "hex.builtin.setting.interface.scaling.native": "Nativo", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "Idioma do Wikipedia", "hex.builtin.setting.interface.restore_window_pos": "", "hex.builtin.setting.proxy": "", diff --git a/plugins/builtin/romfs/lang/zh_CN.json b/plugins/builtin/romfs/lang/zh_CN.json index ea3a457dd..1da8235fe 100644 --- a/plugins/builtin/romfs/lang/zh_CN.json +++ b/plugins/builtin/romfs/lang/zh_CN.json @@ -551,12 +551,8 @@ "hex.builtin.setting.interface.fps.native": "系统", "hex.builtin.setting.interface.language": "语言", "hex.builtin.setting.interface.multi_windows": "启用多窗口支持", - "hex.builtin.setting.interface.scaling": "缩放", + "hex.builtin.setting.interface.scaling_factor": "缩放", "hex.builtin.setting.interface.scaling.native": "本地默认", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "维基百科使用语言", "hex.builtin.setting.interface.restore_window_pos": "恢复窗口位置", "hex.builtin.setting.proxy": "网络代理", diff --git a/plugins/builtin/romfs/lang/zh_TW.json b/plugins/builtin/romfs/lang/zh_TW.json index cf694c542..518cb5a0e 100644 --- a/plugins/builtin/romfs/lang/zh_TW.json +++ b/plugins/builtin/romfs/lang/zh_TW.json @@ -551,12 +551,8 @@ "hex.builtin.setting.interface.fps.native": "原生", "hex.builtin.setting.interface.language": "語言", "hex.builtin.setting.interface.multi_windows": "啟用多視窗支援", - "hex.builtin.setting.interface.scaling": "縮放", + "hex.builtin.setting.interface.scaling_factor": "縮放", "hex.builtin.setting.interface.scaling.native": "原生", - "hex.builtin.setting.interface.scaling.x0_5": "x0.5", - "hex.builtin.setting.interface.scaling.x1_0": "x1.0", - "hex.builtin.setting.interface.scaling.x1_5": "x1.5", - "hex.builtin.setting.interface.scaling.x2_0": "x2.0", "hex.builtin.setting.interface.wiki_explain_language": "維基百科語言", "hex.builtin.setting.interface.restore_window_pos": "Restore window position", "hex.builtin.setting.proxy": "Proxy", diff --git a/plugins/builtin/source/content/init_tasks.cpp b/plugins/builtin/source/content/init_tasks.cpp index c826af68d..8f3443c02 100644 --- a/plugins/builtin/source/content/init_tasks.cpp +++ b/plugins/builtin/source/content/init_tasks.cpp @@ -107,7 +107,7 @@ namespace hex::plugin::builtin { } bool configureUIScale() { - int interfaceScaleSetting = int(ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.scaling", 0.0F).get() * 10.0F); + int interfaceScaleSetting = int(ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.scaling_factor", 0.0F).get() * 10.0F); float interfaceScaling; if (interfaceScaleSetting == 0) diff --git a/plugins/builtin/source/content/settings_entries.cpp b/plugins/builtin/source/content/settings_entries.cpp index c2f38c17b..eb9850709 100644 --- a/plugins/builtin/source/content/settings_entries.cpp +++ b/plugins/builtin/source/content/settings_entries.cpp @@ -367,7 +367,7 @@ namespace hex::plugin::builtin { } }); - ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.style", "hex.builtin.setting.interface.scaling").requiresRestart(); + ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.style", "hex.builtin.setting.interface.scaling_factor").requiresRestart(); ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.style", "hex.builtin.setting.interface.pattern_data_row_bg", false); @@ -392,7 +392,6 @@ namespace hex::plugin::builtin { ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.window", "hex.builtin.setting.interface.multi_windows", MultiWindowSupportEnabledDefault).requiresRestart(); ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.window", "hex.builtin.setting.interface.restore_window_pos", false); - ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.window", "hex.builtin.setting.interface.simplified_welcome_screen", false); ContentRegistry::Settings::add("hex.builtin.setting.hex_editor", "", "hex.builtin.setting.hex_editor.highlight_color", ImColor(0x80, 0x80, 0xC0, 0x60)); ContentRegistry::Settings::add("hex.builtin.setting.hex_editor", "", "hex.builtin.setting.hex_editor.sync_scrolling", false);