Mirror/TinWoo
1
0
Fork 0
mirror of https://github.com/hax4dazy/TinWoo.git synced 2025-02-09 19:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix theme logic in settings

Browse Source
This commit is contained in:
mrdude2478 2023-09-19 00:46:49 +01:00
parent 544313daea
commit 0a3e741092
13 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
romfs/images/flags/sys.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 13 KiB

2
romfs/lang/de.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "Design anwenden",
"desc": "Drück OK um Tinwoo zu beenden oder Abbrechen um fort zu fahren.\n\nDesigns werden das nächste Mal aktiviert wenn du Tinwoo startest."
"desc": "Themes werden aktiviert oder deaktiviert, wenn Tinwoo neu gestartet wird."
},
"hdd": {
"title": "USB HDD",

2
romfs/lang/en.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "Use Theme",
"desc": "Press OK to quit Tinwoo or Cancel to continue.\n\nThemes will activate the next time you start Tinwoo."
"desc": "Themes will activate or deactivate when Tinwoo restarts."
},
"hdd": {
"title": "USB HDD",

2
romfs/lang/es.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "Usar tema",
"desc": "Presiona OK para salir de TinWoo Installer o Cancelar para continuar.\n\nLos temas se activarán la próxima vez que inicies TinWoo Installer"
"desc": "Los temas se activarán o desactivarán cuando Tinwoo se reinicie."
},
"hdd": {
"title": "HDD USB",

2
romfs/lang/fr.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "Utiliser le thème",
"desc": "Appuyer sur Ok pour quiter Tinwoo ou Annuler pour continuer.\n\nLe thème va être appliqué la prochaine fois que vous lancerez tinwoo."
"desc": "Les thèmes s'activeront ou se désactiveront au redémarrage de Tinwoo."
},
"hdd": {
"title": "USB HDD",

2
romfs/lang/it.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "Usa tema",
"desc": "Premi OK per uscire da Tinwoo o Annulla per continuare.\n\nI temi verranno attivati ​​al successivo avvio di Tinwoo."
"desc": "I temi verranno attivati ​​o disattivati ​​al riavvio di Tinwoo."
},
"hdd": {
"title": "USB HDD",

2
romfs/lang/jp.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "使用テーマ",
"desc": "Tinwooを終了する場合はOKを、続行する場合はキャンセルを押してください。\n\nテーマは、次回Tinwooを起動したときに有効になります。"
"desc": "Tinwoo が再起動すると、テーマがアクティブ化または非アクティブ化されます。"
},
"hdd": {
"title": "USB HDD",

2
romfs/lang/ru.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "Использовать тему",
"desc": "Нажмите «ОК», чтобы выйти из Tinwoo, или «Отмена», чтобы продолжить.\n\nТемы активируются при следующем запуске Tinwoo."
"desc": "Темы активируются или деактивируются при перезапуске Tinwoo."
},
"hdd": {
"title": "USB HDD",

2
romfs/lang/tw.json
View File

@ -11,7 +11,7 @@
},
"theme": {
"title": "套用主題",
"desc": "按確定後將關閉Tinwoo，或按取消返回繼續其他操作。\n\n套用的主題將會在下次啟動Tinwoo時生效"
"desc": "當 Tinwoo 重新啟動時，主題將啟用或停用。"
},
"hdd": {
"title": "USB HDD",

2
source/ui/mainPage.cpp
View File

@ -241,7 +241,7 @@ namespace inst::ui {
}
}
if (inst::util::getUsbState() == 5) mainApp->usbinstPage->startUsb();
else mainApp->CreateShowDialog("main.usb.error.title"_lang, "main.usb.error.desc"_lang, { "common.ok"_lang }, false, "romfs:/images/icons/usb.png");
else mainApp->CreateShowDialog("main.usb.error.title"_lang, "main.usb.error.desc"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/usb.png");
}
void MainPage::HdInstallMenuItem_Click() {

27
source/ui/optionsPage.cpp
View File

@ -114,13 +114,20 @@ namespace inst::ui {
}
void thememessage() {
int ourResult = inst::ui::mainApp->CreateShowDialog("main.theme.title"_lang, "main.theme.desc"_lang, { "common.ok"_lang, "common.cancel"_lang }, true, "romfs:/images/icons/theme.png");
int ourResult = inst::ui::mainApp->CreateShowDialog("main.theme.title"_lang, "main.theme.desc"_lang, { "common.no"_lang, "common.yes"_lang }, true, "romfs:/images/icons/theme.png");
if (ourResult != 0) {
//
if (!inst::config::gayMode) {
inst::config::gayMode = true;
mainApp->FadeOut();
mainApp->Close();
}
}
else {
mainApp->FadeOut();
mainApp->Close();
if (inst::config::gayMode) {
inst::config::gayMode = false;
mainApp->FadeOut();
mainApp->Close();
}
}
}
@ -279,17 +286,15 @@ namespace inst::ui {
break;
case 5:
if (inst::config::gayMode) {
inst::config::gayMode = false;
mainApp->mainPage->awooImage->SetVisible(false);
}
else {
inst::config::gayMode = true;
mainApp->mainPage->awooImage->SetVisible(true);
}
this->setMenuText();
this->menu->SetSelectedIndex(index);
else {
mainApp->mainPage->awooImage->SetVisible(false);
}
thememessage();
inst::config::setConfig();
this->setMenuText();
this->menu->SetSelectedIndex(index);
break;
case 6:
if (inst::config::useSound) {

2
source/ui/sdInstPage.cpp
View File

@ -154,7 +154,7 @@ namespace inst::ui {
void sdInstPage::startInstall() {
int dialogResult = -1;
if (this->selectedTitles.size() == 1) {
dialogResult = mainApp->CreateShowDialog("inst.target.desc0"_lang + ":\n\n" + inst::util::shortenString(std::filesystem::path(this->selectedTitles[0]).filename().string(), 32, true) + "\n\n" + "inst.target.desc1"_lang, "\n\n\n\n\n\n\n" + "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, true, "romfs:/images/icons/install.png");
dialogResult = mainApp->CreateShowDialog("inst.target.desc0"_lang + ":\n\n" + inst::util::shortenString(std::filesystem::path(this->selectedTitles[0]).filename().string(), 32, true) + "\n\n" + "inst.target.desc1"_lang, "\n\n\n\n\n\n\n" + "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, false, "romfs:/images/icons/install.png");
}
else dialogResult = mainApp->CreateShowDialog("inst.target.desc00"_lang + std::to_string(this->selectedTitles.size()) + "inst.target.desc01"_lang, "\n" + "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, false, "romfs:/images/icons/install.png");
if (dialogResult == -1) return;

2
source/ui/usbInstPage.cpp
View File

@ -134,7 +134,7 @@ namespace inst::ui {
void usbInstPage::startInstall() {
int dialogResult = -1;
if (this->selectedTitles.size() == 1) {
dialogResult = mainApp->CreateShowDialog("inst.target.desc0"_lang + ":\n\n" + inst::util::shortenString(std::filesystem::path(this->selectedTitles[0]).filename().string(), 32, true) + "\n\n" + "inst.target.desc1"_lang, "\n\n\n\n\n\n\n" + "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, true, "romfs:/images/icons/install.png");
dialogResult = mainApp->CreateShowDialog("inst.target.desc0"_lang + ":\n\n" + inst::util::shortenString(std::filesystem::path(this->selectedTitles[0]).filename().string(), 32, true) + "\n\n" + "inst.target.desc1"_lang, "\n\n\n\n\n\n\n" + "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, false, "romfs:/images/icons/install.png");
}
//else dialogResult = mainApp->CreateShowDialog("inst.target.desc00"_lang + std::to_string(this->selectedTitles.size()) + "inst.target.desc01"_lang, "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, false);
else dialogResult = mainApp->CreateShowDialog("inst.target.desc00"_lang + std::to_string(this->selectedTitles.size()) + "inst.target.desc01"_lang, "\n" + "common.cancel_desc"_lang, { "inst.target.opt0"_lang, "inst.target.opt1"_lang }, false, "romfs:/images/icons/install.png");