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
+17 -17
View File
@@ -1,18 +1,18 @@
#ifndef KEYBOARD_HPP #ifndef KEYBOARD_HPP
#define KEYBOARD_HPP #define KEYBOARD_HPP
#include <string> #include <string>
namespace Input { namespace Input {
void DrawNumpad(); void DrawNumpad();
void drawKeyboard(); void drawKeyboard();
std::string Numpad(std::string Text); std::string Numpad(std::string Text);
std::string Numpad(uint maxLength, std::string Text); std::string Numpad(uint maxLength, std::string Text);
// -1 if invaild text entered // -1 if invaild text entered
int getUint(int max, std::string Text); int getUint(int max, std::string Text);
std::string getString(std::string Text); std::string getString(std::string Text);
std::string getStringLong(std::string Text); // For longer text. std::string getStringLong(std::string Text); // For longer text.
std::string getString(uint maxLength, std::string Text, float inputTextSize = 0.6f); std::string getString(uint maxLength, std::string Text, float inputTextSize = 0.6f);
} }
#endif #endif
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
+280 -280
View File
@@ -1,281 +1,281 @@
#include "config.hpp" #include "config.hpp"
#include "gfx.hpp" #include "gfx.hpp"
#include "gui.hpp" #include "gui.hpp"
#include "keyboard.hpp" #include "keyboard.hpp"
#include "structs.hpp" #include "structs.hpp"
#include <string> #include <string>
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
extern C3D_RenderTarget* Top; extern C3D_RenderTarget* Top;
extern C3D_RenderTarget* Bottom; extern C3D_RenderTarget* Bottom;
bool caps = false, enter = false; bool caps = false, enter = false;
int shift = 0; int shift = 0;
Structs::Key keysQWERTY[] = { Structs::Key keysQWERTY[] = {
{"1", 0, 0}, {"2", 25, 0}, {"3", 50, 0}, {"4", 75, 0}, {"5", 100, 0}, {"6", 125, 0}, {"7", 150, 0}, {"8", 175, 0}, {"9", 200, 0}, {"0", 225, 0}, {"-", 250, 0}, {"=", 275, 0}, {"1", 0, 0}, {"2", 25, 0}, {"3", 50, 0}, {"4", 75, 0}, {"5", 100, 0}, {"6", 125, 0}, {"7", 150, 0}, {"8", 175, 0}, {"9", 200, 0}, {"0", 225, 0}, {"-", 250, 0}, {"=", 275, 0},
{"q", 12, 22}, {"w", 37, 22}, {"e", 62, 22}, {"r", 87, 22}, {"t", 112, 22}, {"y", 137, 22}, {"u", 162, 22}, {"i", 187, 22}, {"o", 212, 22}, {"p", 237, 22}, {"[", 262, 22}, {"]", 287, 22}, {"q", 12, 22}, {"w", 37, 22}, {"e", 62, 22}, {"r", 87, 22}, {"t", 112, 22}, {"y", 137, 22}, {"u", 162, 22}, {"i", 187, 22}, {"o", 212, 22}, {"p", 237, 22}, {"[", 262, 22}, {"]", 287, 22},
{"a", 25, 45}, {"s", 50, 45}, {"d", 75, 45}, {"f", 100, 45}, {"g", 125, 45}, {"h", 150, 45}, {"j", 175, 45}, {"k", 200, 45}, {"l", 225, 45}, {";", 250, 45}, {"'", 275, 45}, {"a", 25, 45}, {"s", 50, 45}, {"d", 75, 45}, {"f", 100, 45}, {"g", 125, 45}, {"h", 150, 45}, {"j", 175, 45}, {"k", 200, 45}, {"l", 225, 45}, {";", 250, 45}, {"'", 275, 45},
{"z", 35, 67}, {"x", 60, 67}, {"c", 85, 67}, {"v", 110, 67}, {"b", 135, 67}, {"n", 160, 67}, {"m", 185, 67}, {",", 210, 67}, {".", 235, 67}, {"/", 260, 67}, {"\\", 210, 90}, {"z", 35, 67}, {"x", 60, 67}, {"c", 85, 67}, {"v", 110, 67}, {"b", 135, 67}, {"n", 160, 67}, {"m", 185, 67}, {",", 210, 67}, {".", 235, 67}, {"/", 260, 67}, {"\\", 210, 90},
}; };
Structs::Key keysQWERTYShift[] = { Structs::Key keysQWERTYShift[] = {
{"!", 0, 0}, {"@", 25, 0}, {"#", 50, 0}, {"$", 75, 0}, {"%", 100, 0}, {"^", 125, 0}, {"&", 150, 0}, {"*", 175, 0}, {"(", 200, 0}, {")", 225, 0}, {"_", 250, 0}, {"+", 275, 0}, {"!", 0, 0}, {"@", 25, 0}, {"#", 50, 0}, {"$", 75, 0}, {"%", 100, 0}, {"^", 125, 0}, {"&", 150, 0}, {"*", 175, 0}, {"(", 200, 0}, {")", 225, 0}, {"_", 250, 0}, {"+", 275, 0},
{"Q", 12, 22}, {"W", 37, 22}, {"E", 62, 22}, {"R", 87, 22}, {"T", 112, 22}, {"Y", 137, 22}, {"U", 162, 22}, {"I", 187, 22}, {"O", 212, 22}, {"P", 237, 22}, {"{", 262, 22}, {"}", 287, 22}, {"Q", 12, 22}, {"W", 37, 22}, {"E", 62, 22}, {"R", 87, 22}, {"T", 112, 22}, {"Y", 137, 22}, {"U", 162, 22}, {"I", 187, 22}, {"O", 212, 22}, {"P", 237, 22}, {"{", 262, 22}, {"}", 287, 22},
{"A", 25, 45}, {"S", 50, 45}, {"D", 75, 45}, {"F", 100, 45}, {"G", 125, 45}, {"H", 150, 45}, {"J", 175, 45}, {"K", 200, 45}, {"L", 225, 45}, {":", 250, 45}, {"\"", 275, 45}, {"A", 25, 45}, {"S", 50, 45}, {"D", 75, 45}, {"F", 100, 45}, {"G", 125, 45}, {"H", 150, 45}, {"J", 175, 45}, {"K", 200, 45}, {"L", 225, 45}, {":", 250, 45}, {"\"", 275, 45},
{"Z", 35, 67}, {"X", 60, 67}, {"C", 85, 67}, {"V", 110, 67}, {"B", 135, 67}, {"N", 160, 67}, {"M", 185, 67}, {"<,", 210, 67}, {">", 235, 67}, {"?", 260, 67}, {"\\", 210, 90}, {"Z", 35, 67}, {"X", 60, 67}, {"C", 85, 67}, {"V", 110, 67}, {"B", 135, 67}, {"N", 160, 67}, {"M", 185, 67}, {"<,", 210, 67}, {">", 235, 67}, {"?", 260, 67}, {"\\", 210, 90},
}; };
Structs::Key modifierKeys[] = { Structs::Key modifierKeys[] = {
{"\uE071", 300, 0, 20}, // Backspace {"\uE071", 300, 0, 20}, // Backspace
{"\uE01D", 0, 45, 20}, // Caps Lock {"\uE01D", 0, 45, 20}, // Caps Lock
{"\uE056", 300, 45, 20}, // Enter {"\uE056", 300, 45, 20}, // Enter
{"\uE01B", 0, 67, 30}, // Left Shift {"\uE01B", 0, 67, 30}, // Left Shift
{"\uE01B", 285, 67, 35}, // Right Shift {"\uE01B", 285, 67, 35}, // Right Shift
{" ", 85, 90, 120}, // Space {" ", 85, 90, 120}, // Space
}; };
Structs::Key NumpadStruct[] = { Structs::Key NumpadStruct[] = {
{"1", 10, 30}, {"1", 10, 30},
{"2", 90, 30}, {"2", 90, 30},
{"3", 170, 30}, {"3", 170, 30},
{"4", 10, 100}, {"4", 10, 100},
{"5", 90, 100}, {"5", 90, 100},
{"6", 170, 100}, {"6", 170, 100},
{"7", 10, 170}, {"7", 10, 170},
{"8", 90, 170}, {"8", 90, 170},
{"9", 170, 170}, {"9", 170, 170},
{"0", 250, 100}, {"0", 250, 100},
{"Enter", 250, 170}, {"Enter", 250, 170},
{"Backspace", 250, 30}, {"Backspace", 250, 30},
}; };
Structs::ButtonPos Numbers [] = { Structs::ButtonPos Numbers [] = {
{10, 30, 60, 50}, // 1 {10, 30, 60, 50}, // 1
{90, 30, 60, 50}, // 2 {90, 30, 60, 50}, // 2
{170, 30, 60, 50}, // 3 {170, 30, 60, 50}, // 3
{10, 100, 60, 50}, {10, 100, 60, 50},
{90, 100, 60, 50}, {90, 100, 60, 50},
{170, 100, 60, 50}, {170, 100, 60, 50},
{10, 170, 60, 50}, {10, 170, 60, 50},
{90, 170, 60, 50}, {90, 170, 60, 50},
{170, 170, 60, 50}, {170, 170, 60, 50},
{250, 100, 60, 50}, // 0. {250, 100, 60, 50}, // 0.
{250, 170, 60, 50}, // Enter. {250, 170, 60, 50}, // Enter.
{250, 30, 60, 50}, // Backspace. {250, 30, 60, 50}, // Backspace.
}; };
extern bool touching(touchPosition touch, Structs::ButtonPos button); extern bool touching(touchPosition touch, Structs::ButtonPos button);
void Input::DrawNumpad() void Input::DrawNumpad()
{ {
for(uint i=0;i<(sizeof(NumpadStruct)/sizeof(NumpadStruct[0]));i++) { for(uint i=0;i<(sizeof(NumpadStruct)/sizeof(NumpadStruct[0]));i++) {
Gui::Draw_Rect(NumpadStruct[i].x, NumpadStruct[i].y, 60, 50, Config::Color1); Gui::Draw_Rect(NumpadStruct[i].x, NumpadStruct[i].y, 60, 50, Config::Color1);
char c[2] = {NumpadStruct[i].character[0]}; char c[2] = {NumpadStruct[i].character[0]};
Gui::DrawString(NumpadStruct[i].x+25, NumpadStruct[i].y+15, 0.72f, Config::TxtColor, c, 50); Gui::DrawString(NumpadStruct[i].x+25, NumpadStruct[i].y+15, 0.72f, Config::TxtColor, c, 50);
} }
} }
void Input::drawKeyboard() { void Input::drawKeyboard() {
for(uint i=0;i<(sizeof(keysQWERTY)/sizeof(keysQWERTY[0]));i++) { for(uint i=0;i<(sizeof(keysQWERTY)/sizeof(keysQWERTY[0]));i++) {
C2D_DrawRectSolid(keysQWERTY[i].x, keysQWERTY[i].y+103, 0.5f, 20, 20, Config::Color1 & C2D_Color32(255, 255, 255, 200)); C2D_DrawRectSolid(keysQWERTY[i].x, keysQWERTY[i].y+103, 0.5f, 20, 20, Config::Color1 & C2D_Color32(255, 255, 255, 200));
if(shift) { if(shift) {
char c[2] = {caps ? (char)toupper(keysQWERTYShift[i].character[0]) : keysQWERTYShift[i].character[0]}; char c[2] = {caps ? (char)toupper(keysQWERTYShift[i].character[0]) : keysQWERTYShift[i].character[0]};
Gui::DrawString(keysQWERTYShift[i].x+(10-(Gui::GetStringWidth(0.50, c)/2)), keysQWERTYShift[i].y+103+(10-(Gui::GetStringHeight(0.50, c)/2)), 0.50, Config::TxtColor, c); Gui::DrawString(keysQWERTYShift[i].x+(10-(Gui::GetStringWidth(0.50, c)/2)), keysQWERTYShift[i].y+103+(10-(Gui::GetStringHeight(0.50, c)/2)), 0.50, Config::TxtColor, c);
} else { } else {
char c[2] = {caps ? (char)toupper(keysQWERTY[i].character[0]) : keysQWERTY[i].character[0]}; char c[2] = {caps ? (char)toupper(keysQWERTY[i].character[0]) : keysQWERTY[i].character[0]};
Gui::DrawString(keysQWERTY[i].x+(10-(Gui::GetStringWidth(0.50, c)/2)), keysQWERTY[i].y+103+(10-(Gui::GetStringHeight(0.50, c)/2)), 0.50, Config::TxtColor, c); Gui::DrawString(keysQWERTY[i].x+(10-(Gui::GetStringWidth(0.50, c)/2)), keysQWERTY[i].y+103+(10-(Gui::GetStringHeight(0.50, c)/2)), 0.50, Config::TxtColor, c);
} }
} }
for(uint i=0;i<(sizeof(modifierKeys)/sizeof(modifierKeys[0]));i++) { for(uint i=0;i<(sizeof(modifierKeys)/sizeof(modifierKeys[0]));i++) {
std::string enter = modifierKeys[2].character; std::string enter = modifierKeys[2].character;
std::string arrowUp = modifierKeys[3].character; std::string arrowUp = modifierKeys[3].character;
std::string backSpace = modifierKeys[0].character; std::string backSpace = modifierKeys[0].character;
std::string caps = modifierKeys[1].character; std::string caps = modifierKeys[1].character;
C2D_DrawRectSolid(modifierKeys[i].x, modifierKeys[i].y+103, 0.5f, modifierKeys[i].w, 20, Config::Color1 & C2D_Color32(255, 255, 255, 200)); C2D_DrawRectSolid(modifierKeys[i].x, modifierKeys[i].y+103, 0.5f, modifierKeys[i].w, 20, Config::Color1 & C2D_Color32(255, 255, 255, 200));
Gui::DrawString(modifierKeys[2].x+5, modifierKeys[2].y+105, 0.50, Config::TxtColor, enter); Gui::DrawString(modifierKeys[2].x+5, modifierKeys[2].y+105, 0.50, Config::TxtColor, enter);
Gui::DrawString(modifierKeys[3].x+7, modifierKeys[3].y+105, 0.45, Config::TxtColor, arrowUp); Gui::DrawString(modifierKeys[3].x+7, modifierKeys[3].y+105, 0.45, Config::TxtColor, arrowUp);
Gui::DrawString(modifierKeys[4].x+10, modifierKeys[4].y+105, 0.45, Config::TxtColor, arrowUp); Gui::DrawString(modifierKeys[4].x+10, modifierKeys[4].y+105, 0.45, Config::TxtColor, arrowUp);
Gui::DrawString(modifierKeys[0].x+5, modifierKeys[0].y+105, 0.45, Config::TxtColor, backSpace); Gui::DrawString(modifierKeys[0].x+5, modifierKeys[0].y+105, 0.45, Config::TxtColor, backSpace);
Gui::DrawString(modifierKeys[1].x+5, modifierKeys[1].y+105, 0.45, Config::TxtColor, caps); Gui::DrawString(modifierKeys[1].x+5, modifierKeys[1].y+105, 0.45, Config::TxtColor, caps);
} }
} }
std::string Input::Numpad(std::string Text) { return Input::Numpad(-1, Text); } std::string Input::Numpad(std::string Text) { return Input::Numpad(-1, Text); }
std::string Input::Numpad(uint maxLength, std::string Text) std::string Input::Numpad(uint maxLength, std::string Text)
{ {
int hDown; int hDown;
touchPosition touch; touchPosition touch;
std::string string; std::string string;
int keyDownDelay = 10, cursorBlink = 20; int keyDownDelay = 10, cursorBlink = 20;
enter = false; enter = false;
while(1) { while(1) {
do { do {
C3D_FrameEnd(0); C3D_FrameEnd(0);
Gui::clearTextBufs(); Gui::clearTextBufs();
C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
C2D_TargetClear(Top, BLACK); C2D_TargetClear(Top, BLACK);
C2D_TargetClear(Bottom, BLACK); C2D_TargetClear(Bottom, BLACK);
GFX::DrawTop(); GFX::DrawTop();
Gui::DrawString((400-Gui::GetStringWidth(0.55f, Text))/2, 2, 0.55f, Config::TxtColor, Text, 400); Gui::DrawString((400-Gui::GetStringWidth(0.55f, Text))/2, 2, 0.55f, Config::TxtColor, Text, 400);
Gui::DrawString(180, 217, 0.8, Config::TxtColor, (string+(cursorBlink-- > 0 ? "_" : "")).c_str(), 400); Gui::DrawString(180, 217, 0.8, Config::TxtColor, (string+(cursorBlink-- > 0 ? "_" : "")).c_str(), 400);
if(cursorBlink < -20) cursorBlink = 20; if(cursorBlink < -20) cursorBlink = 20;
Gui::ScreenDraw(Bottom); Gui::ScreenDraw(Bottom);
Gui::Draw_Rect(0, 0, 320, 240, Config::Color3); Gui::Draw_Rect(0, 0, 320, 240, Config::Color3);
DrawNumpad(); DrawNumpad();
scanKeys(); scanKeys();
hDown = keysDown(); hDown = keysDown();
if(keyDownDelay > 0) { if(keyDownDelay > 0) {
keyDownDelay--; keyDownDelay--;
} else if(keyDownDelay == 0) { } else if(keyDownDelay == 0) {
keyDownDelay--; keyDownDelay--;
} }
} while(!hDown); } while(!hDown);
if(keyDownDelay > 0) { if(keyDownDelay > 0) {
} }
keyDownDelay = 10; keyDownDelay = 10;
if(hDown & KEY_TOUCH) { if(hDown & KEY_TOUCH) {
touchRead(&touch); touchRead(&touch);
if(string.length() < maxLength) { if(string.length() < maxLength) {
if (touching(touch, Numbers[0])) { if (touching(touch, Numbers[0])) {
string += "1"; string += "1";
} else if (touching(touch, Numbers[1])) { } else if (touching(touch, Numbers[1])) {
string += "2"; string += "2";
} else if (touching(touch, Numbers[2])) { } else if (touching(touch, Numbers[2])) {
string += "3"; string += "3";
} else if (touching(touch, Numbers[3])) { } else if (touching(touch, Numbers[3])) {
string += "4"; string += "4";
} else if (touching(touch, Numbers[4])) { } else if (touching(touch, Numbers[4])) {
string += "5"; string += "5";
} else if (touching(touch, Numbers[5])) { } else if (touching(touch, Numbers[5])) {
string += "6"; string += "6";
} else if (touching(touch, Numbers[6])) { } else if (touching(touch, Numbers[6])) {
string += "7"; string += "7";
} else if (touching(touch, Numbers[7])) { } else if (touching(touch, Numbers[7])) {
string += "8"; string += "8";
} else if (touching(touch, Numbers[8])) { } else if (touching(touch, Numbers[8])) {
string += "9"; string += "9";
} else if (touching(touch, Numbers[9])) { } else if (touching(touch, Numbers[9])) {
string += "0"; string += "0";
} }
} }
} }
if(hDown & KEY_B || touching(touch, Numbers[11])) { if(hDown & KEY_B || touching(touch, Numbers[11])) {
string = string.substr(0, string.length()-1); string = string.substr(0, string.length()-1);
} }
if(hDown & KEY_START || touching(touch, Numbers[10]) || enter) { if(hDown & KEY_START || touching(touch, Numbers[10]) || enter) {
break; break;
} }
} }
return string; return string;
enter = false; enter = false;
} }
int Input::getUint(int max, std::string Text) { int Input::getUint(int max, std::string Text) {
std::string s = Input::Numpad(3, Text); std::string s = Input::Numpad(3, Text);
if(s == "" || (atoi(s.c_str()) == 0 && s[0] != '0')) return -1; if(s == "" || (atoi(s.c_str()) == 0 && s[0] != '0')) return -1;
int i = atoi(s.c_str()); int i = atoi(s.c_str());
if(i>max) return 255; if(i>max) return 255;
return i; return i;
} }
std::string Input::getString(std::string Text) { return Input::getString(-1, Text); } std::string Input::getString(std::string Text) { return Input::getString(-1, Text); }
std::string Input::getStringLong(std::string Text) { return Input::getString(-1, Text, 0.5f); } // For Long text. std::string Input::getStringLong(std::string Text) { return Input::getString(-1, Text, 0.5f); } // For Long text.
std::string Input::getString(uint maxLength, std::string Text, float inputTextSize) { std::string Input::getString(uint maxLength, std::string Text, float inputTextSize) {
int hDown; int hDown;
touchPosition touch; touchPosition touch;
std::string string; std::string string;
int keyDownDelay = 10, cursorBlink = 20; int keyDownDelay = 10, cursorBlink = 20;
caps = false, shift = 0, enter = false; caps = false, shift = 0, enter = false;
while(1) { while(1) {
do { do {
C3D_FrameEnd(0); C3D_FrameEnd(0);
Gui::clearTextBufs(); Gui::clearTextBufs();
C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
GFX::DrawTop(); GFX::DrawTop();
Gui::DrawString((400-Gui::GetStringWidth(0.55f, Text))/2, 2, 0.55f, Config::TxtColor, Text, 400); Gui::DrawString((400-Gui::GetStringWidth(0.55f, Text))/2, 2, 0.55f, Config::TxtColor, Text, 400);
GFX::DrawBottom(); GFX::DrawBottom();
drawKeyboard(); drawKeyboard();
C2D_DrawRectSolid(0, 81, 0.5f, 320, 20, Config::Color1 & C2D_Color32(200, 200, 200, 200)); C2D_DrawRectSolid(0, 81, 0.5f, 320, 20, Config::Color1 & C2D_Color32(200, 200, 200, 200));
Gui::DrawString(2, 82, inputTextSize, Config::TxtColor, (string+(cursorBlink-- > 0 ? "_" : "")).c_str(), 316); Gui::DrawString(2, 82, inputTextSize, Config::TxtColor, (string+(cursorBlink-- > 0 ? "_" : "")).c_str(), 316);
if(cursorBlink < -20) cursorBlink = 20; if(cursorBlink < -20) cursorBlink = 20;
scanKeys(); scanKeys();
hDown = keysDown(); hDown = keysDown();
if(keyDownDelay > 0) { if(keyDownDelay > 0) {
keyDownDelay--; keyDownDelay--;
} else if(keyDownDelay == 0) { } else if(keyDownDelay == 0) {
keyDownDelay--; keyDownDelay--;
} }
} while(!hDown); } while(!hDown);
if(keyDownDelay > 0) { if(keyDownDelay > 0) {
} }
keyDownDelay = 10; keyDownDelay = 10;
if(hDown & KEY_TOUCH) { if(hDown & KEY_TOUCH) {
touchRead(&touch); touchRead(&touch);
if(string.length() < maxLength) { if(string.length() < maxLength) {
// Check if a regular key was pressed // Check if a regular key was pressed
for(uint i=0;i<(sizeof(keysQWERTY)/sizeof(keysQWERTY[0]));i++) { for(uint i=0;i<(sizeof(keysQWERTY)/sizeof(keysQWERTY[0]));i++) {
if((touch.px > keysQWERTY[i].x-2 && touch.px < keysQWERTY[i].x+18) && (touch.py > keysQWERTY[i].y+(103)-2 && touch.py < keysQWERTY[i].y+18+(103))) { if((touch.px > keysQWERTY[i].x-2 && touch.px < keysQWERTY[i].x+18) && (touch.py > keysQWERTY[i].y+(103)-2 && touch.py < keysQWERTY[i].y+18+(103))) {
char c = (shift ? keysQWERTYShift[i] : keysQWERTY[i]).character[0]; char c = (shift ? keysQWERTYShift[i] : keysQWERTY[i]).character[0];
string += (shift || caps ? toupper(c) : c); string += (shift || caps ? toupper(c) : c);
shift = 0; shift = 0;
break; break;
} }
} }
} }
// Check if a modifier key was pressed // Check if a modifier key was pressed
for(uint i=0;i<(sizeof(modifierKeys)/sizeof(modifierKeys[0]));i++) { for(uint i=0;i<(sizeof(modifierKeys)/sizeof(modifierKeys[0]));i++) {
if((touch.px > modifierKeys[i].x-2 && touch.px < modifierKeys[i].x+modifierKeys[i].w+2) && (touch.py > modifierKeys[i].y+(103)-2 && touch.py < modifierKeys[i].y+18+(103))) { if((touch.px > modifierKeys[i].x-2 && touch.px < modifierKeys[i].x+modifierKeys[i].w+2) && (touch.py > modifierKeys[i].y+(103)-2 && touch.py < modifierKeys[i].y+18+(103))) {
if(modifierKeys[i].character == "\uE071") { if(modifierKeys[i].character == "\uE071") {
string = string.substr(0, string.length()-1); string = string.substr(0, string.length()-1);
} else if(modifierKeys[i].character == "\uE01D") { } else if(modifierKeys[i].character == "\uE01D") {
caps = !caps; caps = !caps;
} else if(modifierKeys[i].character == "\uE056") { } else if(modifierKeys[i].character == "\uE056") {
enter = true; enter = true;
} else if(modifierKeys[i].character == "\uE01B") { } else if(modifierKeys[i].character == "\uE01B") {
if(shift) shift = 0; if(shift) shift = 0;
else shift = 1; else shift = 1;
if(shift) { if(shift) {
keyDownDelay = -1; keyDownDelay = -1;
} else { } else {
keyDownDelay = 0; keyDownDelay = 0;
} }
} else if(modifierKeys[i].character == " ") { } else if(modifierKeys[i].character == " ") {
if(string.length() < maxLength) { if(string.length() < maxLength) {
shift = 0; shift = 0;
string += modifierKeys[5].character[0]; string += modifierKeys[5].character[0];
} }
} }
break; break;
} }
} }
} else if(hDown & KEY_B) { } else if(hDown & KEY_B) {
string = string.substr(0, string.length()-1); string = string.substr(0, string.length()-1);
} }
if(hDown & KEY_START || enter) { if(hDown & KEY_START || enter) {
break; break;
} }
} }
return string; return string;
} }
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