From 4024901a6bf40192bdf097143bbff4f4a1595bb7 Mon Sep 17 00:00:00 2001 From: VoltZ <47382115+SuperSaiyajinVoltZ@users.noreply.github.com> Date: Fri, 8 Nov 2019 01:30:46 +0100 Subject: [PATCH] =?UTF-8?q?Update=20Language=20Screen=20for=20`Bruh`=20and?= =?UTF-8?q?=20`=D0=A0=D1=83=D1=81=D1=81=D0=BA=D0=B8=D0=B9`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/screens/settings.hpp | 19 ++-- source/lang/lang.cpp | 2 +- source/screens/settings.cpp | 201 ++++++++++++++++++++++------------- 3 files changed, 138 insertions(+), 84 deletions(-) diff --git a/include/screens/settings.hpp b/include/screens/settings.hpp index d3d2cbe..60252d8 100644 --- a/include/screens/settings.hpp +++ b/include/screens/settings.hpp @@ -45,15 +45,16 @@ private: void colorChanging(u32 hDown, touchPosition touch); std::vector langBlocks = { - {37, 52, 20, 20, -1}, - {37, 92, 20, 20, -1}, - {37, 132, 20, 20, -1}, - {37, 172, 20, 20, -1}, - {177, 52, 20, 20, -1}, - {177, 92, 20, 20, -1}, - {177, 132, 20, 20, -1}, - {177, 172, 20, 20, -1}, - {293, 213, 27, 27, -1}, + {37, 32, 20, 20, -1}, + {37, 72, 20, 20, -1}, + {37, 112, 20, 20, -1}, + {37, 152, 20, 20, -1}, + {37, 188, 20, 20, -1}, + {177, 32, 20, 20, -1}, + {177, 72, 20, 20, -1}, + {177, 112, 20, 20, -1}, + {177, 152, 20, 20, -1}, + {177, 188, 20, 20, -1}, }; std::vector buttons = { diff --git a/source/lang/lang.cpp b/source/lang/lang.cpp index 8606ef3..554a5be 100644 --- a/source/lang/lang.cpp +++ b/source/lang/lang.cpp @@ -11,7 +11,7 @@ std::string Lang::get(const std::string &key) { return appJson.at(key).get_ref(); } -std::string langs[] = {"de", "en", "es", "fr", "it", "jp", "lt", "pt"}; +std::string langs[] = {"br", "de", "en", "es", "fr", "it", "jp", "lt", "pt", "ru"}; void Lang::load(int lang) { FILE* values; diff --git a/source/screens/settings.cpp b/source/screens/settings.cpp index 589a256..59590ff 100644 --- a/source/screens/settings.cpp +++ b/source/screens/settings.cpp @@ -49,103 +49,145 @@ void Settings::DrawLanguageSelection(void) const { Gui::DrawBottom(); if (Config::lang == 0) { - Gui::Draw_Rect(37, 52, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } else if (Config::lang == 1) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } else if (Config::lang == 2) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } else if (Config::lang == 3) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } else if (Config::lang == 4) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } else if (Config::lang == 5) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } else if (Config::lang == 6) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::SelectedColor); } else if (Config::lang == 7) { - Gui::Draw_Rect(37, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 132, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(37, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 52, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 92, 20, 20, Config::UnselectedColor); - Gui::Draw_Rect(177, 132, 20, 20, Config::SelectedColor); - Gui::Draw_Rect(177, 172, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); + } else if (Config::lang == 8) { + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); + + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); + } else if (Config::lang == 9) { + Gui::Draw_Rect(37, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 152, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(37, 188, 20, 20, Config::UnselectedColor); + + Gui::Draw_Rect(177, 32, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 72, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 112, 20, 20, Config::UnselectedColor); + Gui::Draw_Rect(177, 152, 20, 20, Config::SelectedColor); + Gui::Draw_Rect(177, 188, 20, 20, Config::UnselectedColor); } - Gui::DrawString(langBlocks[0].x+25, langBlocks[0].y-2, 0.7f, Config::TxtColor, "Deutsch", 320); - Gui::DrawString(langBlocks[1].x+25, langBlocks[1].y-2, 0.7f, Config::TxtColor, "English", 320); - Gui::DrawString(langBlocks[2].x+25, langBlocks[2].y-2, 0.7f, Config::TxtColor, "Español", 320); - Gui::DrawString(langBlocks[3].x+25, langBlocks[3].y-2, 0.7f, Config::TxtColor, "Français", 320); + Gui::DrawString(langBlocks[0].x+25, langBlocks[0].y, 0.7f, Config::TxtColor, "Bruh", 320); + Gui::DrawString(langBlocks[1].x+25, langBlocks[1].y, 0.7f, Config::TxtColor, "Deutsch", 320); + Gui::DrawString(langBlocks[2].x+25, langBlocks[2].y, 0.7f, Config::TxtColor, "English", 320); + Gui::DrawString(langBlocks[3].x+25, langBlocks[3].y, 0.7f, Config::TxtColor, "Español", 320); + Gui::DrawString(langBlocks[4].x+25, langBlocks[4].y, 0.7f, Config::TxtColor, "Français", 320); - Gui::DrawString(langBlocks[4].x+25, langBlocks[4].y-2, 0.7f, Config::TxtColor, "Italiano", 320); - Gui::DrawString(langBlocks[5].x+25, langBlocks[5].y-2, 0.7f, Config::TxtColor, "Lietuvių", 320); - Gui::DrawString(langBlocks[6].x+25, langBlocks[6].y-2, 0.7f, Config::TxtColor, "Português", 320); - Gui::DrawString(langBlocks[7].x+25, langBlocks[7].y-2, 0.7f, Config::TxtColor, "日本語", 320); + Gui::DrawString(langBlocks[5].x+25, langBlocks[5].y, 0.7f, Config::TxtColor, "Italiano", 320); + Gui::DrawString(langBlocks[6].x+25, langBlocks[6].y, 0.7f, Config::TxtColor, "Lietuvių", 320); + Gui::DrawString(langBlocks[7].x+25, langBlocks[7].y, 0.7f, Config::TxtColor, "Português", 320); + Gui::DrawString(langBlocks[8].x+25, langBlocks[8].y, 0.7f, Config::TxtColor, "Русский", 320); + Gui::DrawString(langBlocks[9].x+25, langBlocks[9].y, 0.7f, Config::TxtColor, "日本語", 320); } void Settings::DrawColorChanging(void) const { @@ -244,8 +286,10 @@ void Settings::LanguageSelection(u32 hDown, touchPosition touch) { Lang::load(Config::lang); Config::saveConfig(); + + } else if (touching(touch, langBlocks[5])) { - Config::lang = 6; + Config::lang = 5; Lang::load(Config::lang); Config::saveConfig(); @@ -255,7 +299,16 @@ void Settings::LanguageSelection(u32 hDown, touchPosition touch) { Config::saveConfig(); } else if (touching(touch, langBlocks[7])) { - Config::lang = 5; + Config::lang = 8; + Lang::load(Config::lang); + Config::saveConfig(); + } else if (touching(touch, langBlocks[8])) { + Config::lang = 9; + Lang::load(Config::lang); + Config::saveConfig(); + + } else if (touching(touch, langBlocks[9])) { + Config::lang = 6; Lang::load(Config::lang); Config::saveConfig(); }