DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Implement Custom Colors for Scripts.

Browse Source
This commit is contained in:
VoltZ
2019-11-03 06:48:32 +01:00
committed by GitHub
parent 7b16ed5c77
commit 382352776a
3 changed files with 766 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui.cpp
+40 -10
View File
@@ -43,6 +43,11 @@ C3D_RenderTarget* bottom;
C2D_TextBuf sizeBuf;
std::stack<std::unique_ptr<Screen>> screens;
bool currentScreen = false;
extern bool isScriptSelected;
extern u32 barColor;
extern u32 bgColor;
extern u32 TextColor;
// Clear Text.
void Gui::clearTextBufs(void)
@@ -76,7 +81,11 @@ void DisplayMsg(std::string text) {
C2D_TargetClear(top, BLACK);
C2D_TargetClear(bottom, BLACK);
Gui::DrawTop();
Gui::DrawString(10, 40, 0.45f, Config::TxtColor, text, 380);
if (isScriptSelected == false) {
Gui::DrawString(10, 40, 0.45f, Config::TxtColor, text, 380);
} else if (isScriptSelected == true) {
Gui::DrawString(10, 40, 0.45f, TextColor, text, 380);
}
Gui::DrawBottom();
C3D_FrameEnd(0);
}
@@ -88,7 +97,11 @@ void Gui::DisplayWarnMsg(std::string Text)
C2D_TargetClear(top, BLACK);
C2D_TargetClear(bottom, BLACK);
Gui::DrawTop();
Gui::DrawStringCentered(0, 2, 0.6f, Config::TxtColor, Text.c_str(), 400);
if (isScriptSelected == false) {
Gui::DrawStringCentered(0, 2, 0.6f, Config::TxtColor, Text, 400);
} else if (isScriptSelected == true) {
Gui::DrawStringCentered(0, 2, 0.6f, TextColor, Text, 400);
}
Gui::DrawBottom();
C3D_FrameEnd(0);
for (int i = 0; i < 60*3; i++) {
@@ -163,16 +176,28 @@ void Gui::ScreenDraw(C3D_RenderTarget * screen)
void Gui::DrawTop(void) {
Gui::ScreenDraw(top);
Gui::Draw_Rect(0, 0, 400, 30, Config::Color1);
Gui::Draw_Rect(0, 30, 400, 180, Config::Color2);
Gui::Draw_Rect(0, 210, 400, 30, Config::Color1);
if (isScriptSelected == false) {
Gui::Draw_Rect(0, 0, 400, 30, Config::Color1);
Gui::Draw_Rect(0, 30, 400, 180, Config::Color2);
Gui::Draw_Rect(0, 210, 400, 30, Config::Color1);
} else if (isScriptSelected == true) {
Gui::Draw_Rect(0, 0, 400, 30, barColor);
Gui::Draw_Rect(0, 30, 400, 180, bgColor);
Gui::Draw_Rect(0, 210, 400, 30, barColor);
}
}
void Gui::DrawBottom(void) {
Gui::ScreenDraw(bottom);
Gui::Draw_Rect(0, 0, 320, 30, Config::Color1);
Gui::Draw_Rect(0, 30, 320, 180, Config::Color3);
Gui::Draw_Rect(0, 210, 320, 30, Config::Color1);
if (isScriptSelected == false) {
Gui::Draw_Rect(0, 0, 400, 30, Config::Color1);
Gui::Draw_Rect(0, 30, 400, 180, Config::Color3);
Gui::Draw_Rect(0, 210, 400, 30, Config::Color1);
} else if (isScriptSelected == true) {
Gui::Draw_Rect(0, 0, 400, 30, barColor);
Gui::Draw_Rect(0, 30, 400, 180, bgColor);
Gui::Draw_Rect(0, 210, 400, 30, barColor);
}
}
// Display a Message, which needs to be confirmed with A/B.
@@ -183,8 +208,13 @@ bool Gui::promptMsg(std::string promptMsg)
C2D_TargetClear(top, BLACK);
C2D_TargetClear(bottom, BLACK);
Gui::DrawTop();
Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, Config::TxtColor, promptMsg.c_str(), 400);
Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 214, 0.72f, Config::TxtColor, Lang::get("CONFIRM_OR_CANCEL"), 400);
if (isScriptSelected == false) {
Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, Config::TxtColor, promptMsg.c_str(), 400);
Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 214, 0.72f, Config::TxtColor, Lang::get("CONFIRM_OR_CANCEL"), 400);
} else if (isScriptSelected == true) {
Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, TextColor, promptMsg.c_str(), 400);
Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 214, 0.72f, TextColor, Lang::get("CONFIRM_OR_CANCEL"), 400);
}
Gui::DrawBottom();
C3D_FrameEnd(0);
while(1)
source/screens/scriptlist.cpp
+92 -5
View File
@@ -34,18 +34,23 @@
#include <algorithm>
#include <fstream>
#include <regex>
#include <unistd.h>
#define ENTRIES_PER_SCREEN 3
bool isScriptSelected = false;
// Information like Title and Description.
struct Info {
std::string title;
std::string description;
};
std::string choice;
std::string currentFile;
std::string selectedTitle;
std::string longDesc = "";
Info parseInfo(std::string fileName) {
FILE* file = fopen(fileName.c_str(), "rt");
@@ -96,6 +101,25 @@ std::vector<std::string> parseObjects(std::string fileName) {
return objs;
}
std::string longDescription() {
std::string out;
FILE* file = fopen(currentFile.c_str(), "rt");
if(!file) {
printf("File not found\n");
fclose(file);
return "";
}
nlohmann::json json = nlohmann::json::parse(file, nullptr, false);
fclose(file);
if (json.at("info").contains("longDescription")) out = json.at("info").at("longDescription");
else if (json.at("info").contains("description")) out = json.at("info").at("description");
else out = "";
return out;
}
// Because we need `#include <fstream>`.
Result createFile(const char * path) {
std::ofstream ofstream;
@@ -194,6 +218,53 @@ void runFunctions(void) {
std::vector<Info> fileInfo;
std::vector<std::string> fileInfo2;
std::vector<std::string> lines;
u32 getColor(std::string colorString) {
if(colorString.length() < 7 || std::regex_search(colorString.substr(1), std::regex("[^0-9a-f]"))) { // invalid color
return 0;
}
int r = std::stoi(colorString.substr(1, 2), nullptr, 16);
int g = std::stoi(colorString.substr(3, 2), nullptr, 16);
int b = std::stoi(colorString.substr(5, 2), nullptr, 16);
return RGBA8(r, g, b, 0xFF);
}
// Color listing!
u32 barColor;
u32 bgColor;
u32 TextColor;
u32 selected;
u32 unselected;
void loadColors() {
FILE* file = fopen(currentFile.c_str(), "rt");
if(!file) {
printf("File not found\n");
fclose(file);
return;
}
nlohmann::json json = nlohmann::json::parse(file, nullptr, false);
fclose(file);
u32 colorTemp;
colorTemp = getColor(get(json, "info", "barColor"));
barColor = colorTemp == 0 ? Config::Color2 : colorTemp;
colorTemp = getColor(get(json, "info", "bgColor"));
bgColor = colorTemp == 0 ? Config::Color3 : colorTemp;
colorTemp = getColor(get(json, "info", "textColor"));
TextColor = colorTemp == 0 ? Config::TxtColor : colorTemp;
colorTemp = getColor(get(json, "info", "selectedColor"));
selected = colorTemp == 0 ? Config::SelectedColor : colorTemp;
colorTemp = getColor(get(json, "info", "unselectedColor"));
unselected = colorTemp == 0 ? Config::UnselectedColor : colorTemp;
}
ScriptList::ScriptList() {
dirContents.clear();
@@ -232,20 +303,31 @@ void ScriptList::Draw(void) const {
}
}
void loadLongDesc(void) {
lines.clear();
while(longDesc.find('\n') != longDesc.npos) {
lines.push_back(longDesc.substr(0, longDesc.find('\n')));
longDesc = longDesc.substr(longDesc.find('\n')+1);
}
lines.push_back(longDesc.substr(0, longDesc.find('\n')));
}
void ScriptList::DrawSingleObject(void) const {
std::string info;
Gui::DrawTop();
Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, "Universal-Updater", 400);
Gui::DrawStringCentered(0, 214, 0.7f, Config::TxtColor, selectedTitle, 400);
Gui::DrawStringCentered(0, 2, 0.8f, TextColor, selectedTitle, 400);
for(uint i=0;i<lines.size();i++) {
Gui::DrawStringCentered(0, 120-((lines.size()*20)/2)+i*20, 0.6f, TextColor, lines[i], 400);
}
Gui::DrawBottom();
for(int i=0;i<ENTRIES_PER_SCREEN && i<(int)fileInfo2.size();i++) {
info = fileInfo2[screenPos2 + i];
if(screenPos2 + i == selection2) {
Gui::Draw_Rect(0, 40+(i*57), 320, 45, Config::SelectedColor);
Gui::Draw_Rect(0, 40+(i*57), 320, 45, selected);
} else {
Gui::Draw_Rect(0, 40+(i*57), 320, 45, Config::UnselectedColor);
Gui::Draw_Rect(0, 40+(i*57), 320, 45, unselected);
}
Gui::DrawStringCentered(0, 50+(i*57), 0.7f, Config::TxtColor, info, 320);
Gui::DrawStringCentered(0, 50+(i*57), 0.7f, TextColor, info, 320);
}
}
@@ -287,8 +369,12 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld) {
if (fileInfo.size() != 0) {
currentFile = dirContents[selection].name;
selectedTitle = fileInfo[selection].title;
longDesc = longDescription();
checkForValidate();
fileInfo2 = parseObjects(currentFile);
loadColors();
loadLongDesc();
isScriptSelected = true;
selection = 0;
mode = 1;
}
@@ -337,6 +423,7 @@ void ScriptList::SelectFunction(u32 hDown, u32 hHeld) {
if (hDown & KEY_B) {
selection2 = 0;
fileInfo2.clear();
isScriptSelected = false;
mode = 0;
}