Skip to content

Commit

Permalink
module update + icon + UI element adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
CaiMiao committed Aug 20, 2022
1 parent 2a941e7 commit 59ddade
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ TARGET := tencent-switcher-gui
BUILD := build.nx
SOURCES := source
DATA := data
#ICON := resources/icon/borealis.jpg
ICON := resources/icon/rip.jpg
INCLUDES := include
APP_TITLE := Tencent switcher GUI
APP_AUTHOR := CaiMiao
APP_VERSION := 0.1.1
APP_VERSION := 0.1.2

ROMFS := resources
BOREALIS_PATH := lib/borealis
Expand Down
2 changes: 1 addition & 1 deletion lib/borealis
7 changes: 4 additions & 3 deletions resources/i18n/en-US/main.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"test_msg": "简体繁體日本語한국어\n妳你她牠*战斗、戰鬥,戦闘ばとるフィールド。\n",
"test_msg": "简体 繁體 日本語 한국어\n妳你她牠 * あいうえお フィールド *\n战斗 戰鬥 戦闘 户戶戸 关门甩复归\n \ue0e0 \ue0e1\n",
"name": "Tencent switcher GUI",
"common": {
"disc_msg": "DISCLAIMER: The author does not take any responsibility regarding potential BRICKs & BANs.\nBe wise and use at your own risk.\n\nYou have been warned.",
"disc_dlg_msg": "DISCLAIMER: The author does not take any responsibility regarding potential BRICKs & BANs. Be wise and use at your own risk.\n\nYou have been warned.",
"disc_msg": "DISCLAIMER: The author does not take any responsibility regarding\npotential BRICKs & BANs.\nBe wise and use at your own risk.\n ** You have been warned. **",
"disc_dlg_msg": "DISCLAIMER: The author does not take any responsibility regarding potential BRICKs & BANs. Be wise and use at your own risk.\n ** You have been warned. **",
"btn_idk": "I've read & agreed, let me in",
"btn_continue": "Continue",
"btn_cancel": "Cancel",
Expand Down Expand Up @@ -58,6 +58,7 @@
"locale": {
"ja": "Japanese",
"en-US": "English (US)",
"ko": "Korean",
"zh-Hans": "Chinese (Simplified)",
"zh-Hant": "Chinese (Traditional)",
"EOL": ""
Expand Down
9 changes: 5 additions & 4 deletions resources/i18n/zh-Hans/main.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"test_msg": "简体繁體日本語한국어\n妳你她牠*战斗、戰鬥,戦闘ばとるフィールド。\n",
"test_msg": "简体 繁體 日本語 한국어\n妳你她牠 * あいうえお フィールド *\n战斗 戰鬥 戦闘 户戶戸 关门甩复归\n \ue0e0 \ue0e1\n",
"name": "Tencent switcher GUI by CaiMiao 国行/国际版系统切换工具",
"common": {
"disc_msg": "DISCLAIMER: The author does not take any responsibility regarding potential BRICKs & BANs.\nBe wise and use at your own risk.\n\nYou have been warned.",
"disc_msg": "DISCLAIMER: The author does not take any responsibility regarding\npotential BRICKs & BANs.\nBe wise and use at your own risk.\n ** You have been warned. **",
"disc_dlg_msg": "免责声明: 若使用出现砖/BAN,此软件作者概不负责,一切后果请自行承担。\n\n(Please read the DISCLAIMER text above,\nor later in English)",
"btn_idk": "我已知悉上述风险,继续",
"btn_continue": "继续",
Expand Down Expand Up @@ -46,10 +46,10 @@
"terms": {
"LanguageCode": "语言代码",
"RegionCode": "地区代码",
"IsT": "IsT (是否腾任国行系统)",
"IsT": "IsT是否腾任国行系统",
"Language": "语言",
"Region": "地区",
"PlatformRegion": "PlatformRegion (平台区域)",
"PlatformRegion": "PlatformRegion(平台区域)",
"global": "全球",
"tencent": "腾讯",
"EOL": ""
Expand All @@ -58,6 +58,7 @@
"locale": {
"ja": "日语",
"en-US": "英语(美国)",
"ko": "韩语 / 朝鲜语",
"zh-Hans": "简体中文",
"zh-Hant": "繁体中文",
"EOL": ""
Expand Down
Binary file added resources/icon/rip.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 11 additions & 4 deletions source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@ int langItemSel(int i)
case SetLanguage_ENUS :
return 1;
break;
case SetLanguage_ZHHANS :
case SetLanguage_KO :
return 2;
break;
case SetLanguage_ZHHANT :
case SetLanguage_ZHHANS :
return 3;
break;
case SetLanguage_ZHHANT :
return 4;
break;
default:
break;
}
Expand Down Expand Up @@ -100,7 +103,7 @@ void mainForm()
// Create a sample view
brls::TabFrame* rootFrame = new brls::TabFrame();
rootFrame->setTitle("main/name"_i18n);
//rootFrame->setIcon(BOREALIS_ASSET("icon/borealis.jpg"));
//rootFrame->setIcon(BOREALIS_ASSET("icon/rip.jpg"));

// tab lists
brls::List* mainTabList = new brls::List();
Expand Down Expand Up @@ -222,6 +225,7 @@ void mainForm()
{
"main/locale/ja"_i18n,
"main/locale/en-US"_i18n,
"main/locale/ko"_i18n,
"main/locale/zh-Hans"_i18n,
"main/locale/zh-Hant"_i18n,
}, langItemSel(1));
Expand All @@ -237,9 +241,12 @@ void mainForm()
i = SetLanguage_ENUS;
break;
case 2:
i = SetLanguage_ZHHANS;
i = SetLanguage_KO;
break;
case 3:
i = SetLanguage_ZHHANS;
break;
case 4:
i = SetLanguage_ZHHANT;
break;
}
Expand Down

0 comments on commit 59ddade

Please sign in to comment.