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

Some changes.

Browse Source
This commit is contained in:
StackZ
2020-03-21 05:02:16 +01:00
parent 73c495db4f
commit 37748b8e22
10 changed files with 320 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -76,9 +76,9 @@ endif
TARGET := Universal-Updater TARGET := Universal-Updater
BUILD := build BUILD := build
UNIVCORE := Universal-Core UNIVCORE := Universal-Core
SOURCES := $(UNIVCORE) source source/download source/lang source/screens source/utils SOURCES := $(UNIVCORE) source source/download source/gui source/lang source/screens source/utils
DATA := data DATA := data
INCLUDES := $(UNIVCORE) include include/download include/lang include/screens include/utils INCLUDES := $(UNIVCORE) include include/download include/gui include/lang include/screens include/utils
GRAPHICS := assets/gfx GRAPHICS := assets/gfx
#GFXBUILD := $(BUILD) #GFXBUILD := $(BUILD)
ROMFS := romfs ROMFS := romfs
include/gfx.hpp → include/gui/gfx.hpp
View File
include/keyboard.hpp → include/gui/keyboard.hpp
View File
include/msg.hpp → include/gui/msg.hpp
View File
include/colorHelper.hpp → include/utils/colorHelper.hpp
View File
source/download/download.cpp
+15 -18
View File
@@ -633,31 +633,19 @@ bool checkWifiStatus(void) {
} }
void downloadFailed(void) { void downloadFailed(void) {
Msg::DisplayMsg(Lang::get("DOWNLOAD_FAILED")); Msg::DisplayWarnMsg(Lang::get("DOWNLOAD_FAILED"));
for (int i = 0; i < 60*2; i++) {
gspWaitForVBlank();
}
} }
void notImplemented(void) { void notImplemented(void) {
Msg::DisplayMsg(Lang::get("NOT_IMPLEMENTED")); Msg::DisplayWarnMsg(Lang::get("NOT_IMPLEMENTED"));
for (int i = 0; i < 60*2; i++) {
gspWaitForVBlank();
}
} }
void doneMsg(void) { void doneMsg(void) {
Msg::DisplayMsg(Lang::get("DONE")); Msg::DisplayWarnMsg(Lang::get("DONE"));
for (int i = 0; i < 60*2; i++) {
gspWaitForVBlank();
}
} }
void notConnectedMsg(void) { void notConnectedMsg(void) {
Msg::DisplayMsg(Lang::get("CONNECT_WIFI")); Msg::DisplayWarnMsg(Lang::get("CONNECT_WIFI"));
for (int i = 0; i < 60*2; i++) {
gspWaitForVBlank();
}
} }
std::string getLatestRelease(std::string repo, std::string item) std::string getLatestRelease(std::string repo, std::string item)
@@ -880,7 +868,11 @@ void displayProgressBar() {
C2D_TargetClear(Top, BLACK); C2D_TargetClear(Top, BLACK);
C2D_TargetClear(Bottom, BLACK); C2D_TargetClear(Bottom, BLACK);
GFX::DrawTop(); GFX::DrawTop();
Gui::DrawStringCentered(0, 1, 0.7f, TextColor, progressBarMsg, 400); if (isScriptSelected == true) {
Gui::DrawStringCentered(0, 1, 0.7f, TextColor, progressBarMsg, 400);
} else {
Gui::DrawStringCentered(0, 1, 0.7f, Config::TxtColor, progressBarMsg, 400);
}
// Display 'Currently Extracting: <Filename>'. // Display 'Currently Extracting: <Filename>'.
if (progressBarType == 1) { if (progressBarType == 1) {
@@ -890,7 +882,12 @@ void displayProgressBar() {
// Only display this by downloading. // Only display this by downloading.
if (progressBarType == 0) { if (progressBarType == 0) {
Gui::DrawStringCentered(0, 80, 0.6f, TextColor, str, 400); if (isScriptSelected == true) {
Gui::DrawStringCentered(0, 80, 0.6f, TextColor, str, 400);
} else {
Gui::DrawStringCentered(0, 80, 0.6f, Config::TxtColor, str, 400);
}
Gui::Draw_Rect(30, 120, 340, 30, BLACK); Gui::Draw_Rect(30, 120, 340, 30, BLACK);
if (isScriptSelected == true) { if (isScriptSelected == true) {
Animation::DrawProgressBar(downloadNow, downloadTotal, 1); Animation::DrawProgressBar(downloadNow, downloadTotal, 1);
source/gfx.cpp → source/gui/gfx.cpp
View File
source/keyboard.cpp → source/gui/keyboard.cpp
View File
source/msg.cpp → source/gui/msg.cpp
+6 -6
View File
@@ -57,9 +57,9 @@ void Msg::DisplayMsg(std::string text) {
C2D_TargetClear(Bottom, BLACK); C2D_TargetClear(Bottom, BLACK);
GFX::DrawTop(); GFX::DrawTop();
if (isScriptSelected == false) { if (isScriptSelected == false) {
Gui::DrawString(10, 40, 0.45f, Config::TxtColor, text, 380); Gui::DrawStringCentered(0, (240-Gui::GetStringHeight(0.6f, text))/2, 0.6f, Config::TxtColor, text, 395, 70);
} else if (isScriptSelected == true) { } else if (isScriptSelected == true) {
Gui::DrawString(10, 40, 0.45f, TextColor, text, 380); Gui::DrawStringCentered(0, (240-Gui::GetStringHeight(0.6f, text))/2, 0.6f, TextColor, text, 395, 70);
} }
GFX::DrawBottom(); GFX::DrawBottom();
C3D_FrameEnd(0); C3D_FrameEnd(0);
@@ -102,11 +102,11 @@ bool Msg::promptMsg(std::string promptMsg)
C2D_TargetClear(Bottom, BLACK); C2D_TargetClear(Bottom, BLACK);
GFX::DrawTop(); GFX::DrawTop();
if (isScriptSelected == false) { if (isScriptSelected == false) {
Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, Config::TxtColor, promptMsg.c_str(), 400); Gui::DrawStringCentered(0, (240-Gui::GetStringHeight(0.6f, promptMsg))/2, 0.6f, Config::TxtColor, promptMsg, 395, 70);
Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 217, 0.72f, Config::TxtColor, Lang::get("CONFIRM_OR_CANCEL"), 400); Gui::DrawStringCentered(0, 217, 0.72f, Config::TxtColor, Lang::get("CONFIRM_OR_CANCEL"), 400);
} else if (isScriptSelected == true) { } else if (isScriptSelected == true) {
Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, TextColor, promptMsg.c_str(), 400); Gui::DrawStringCentered(0, (240-Gui::GetStringHeight(0.6f, promptMsg))/2, 0.6f, TextColor, promptMsg, 395, 70);
Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 217, 0.72f, TextColor, Lang::get("CONFIRM_OR_CANCEL"), 400); Gui::DrawStringCentered(0, 217, 0.72f, TextColor, Lang::get("CONFIRM_OR_CANCEL"), 400);
} }
GFX::DrawBottom(); GFX::DrawBottom();
if (isScriptSelected == false) { if (isScriptSelected == false) {
source/colorHelper.cpp → source/utils/colorHelper.cpp
View File