* Do not build here until it is merged. * WIP: Queue System. Right now crashes randomly for whatever reason.. * Animate queue spinner more slowly * Use LightLocks to prevent crashing in the queue (I hope it's fixed at least) * Build nightlies in queue-system * Use version.h for version and specify 7 digits * Remove unneeded $(CURDIR) I put that these for testing, but it's not needed * Multiple Changes, see desc for more. 1.) Theme Implementation. 2.) Show Battery + Time. 3.) Some more work on Queue-System (might still be broke). 4.) Update Copyright to 2021. 5.) Add `%FIRM%` to regex. 6.) Mass Add to Queue. 7.) Search with AND / OR filter. * Gaaah, not again... * Remove DoNothing, some LightLock changes, etc aka Further improvements to overall system stability and other minor adjustments have been made to enhance the user experience. * See desc for more. - Current Queue Entry can now be canceled. - Fix installed list. - Display Download Speed. - BYE BYE Queue LightLock! * Various adjustments to the queue menu - Make cancel button slightly smaller - Right align "Steps: ..." text - Remove "Current Operation:" text - Change KB/MB/GB to KiB/MiB/GiB - Lots of little positioning tweaks - Fix bug where you could get stuck in the prompt - Make spinny thing have a ! when action is needed - Make extracting file increment at the start instead of the end - Delete dumb VS Code file and gitignore it * Change to hollow full charge plugged in icon * Fix the settings positions a bit * Fix custom font download not having prompt Also tweak the text positions, I forgot to change them Co-authored-by: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com>
201 lines
No EOL
6 KiB
C++
201 lines
No EOL
6 KiB
C++
/*
|
|
* This file is part of Universal-Updater
|
|
* Copyright (C) 2019-2021 Universal-Team
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
|
|
* * Requiring preservation of specified reasonable legal notices or
|
|
* author attributions in that material or in the Appropriate Legal
|
|
* Notices displayed by works containing it.
|
|
* * Prohibiting misrepresentation of the origin of that material,
|
|
* or requiring that modified versions of such material be marked in
|
|
* reasonable ways as different from the original version.
|
|
*/
|
|
|
|
#include "animation.hpp"
|
|
#include "common.hpp"
|
|
#include "fileBrowse.hpp"
|
|
#include "overlay.hpp"
|
|
#include "storeUtils.hpp"
|
|
#include <unistd.h>
|
|
|
|
extern bool touching(touchPosition touch, Structs::ButtonPos button);
|
|
static const std::vector<Structs::ButtonPos> mainButtons = {
|
|
{ 10, 6, 300, 22 },
|
|
{ 10, 36, 300, 22 },
|
|
{ 10, 66, 300, 22 },
|
|
{ 10, 96, 300, 22 },
|
|
{ 10, 126, 300, 22 },
|
|
{ 10, 156, 300, 22 },
|
|
{ 10, 186, 300, 22 }
|
|
};
|
|
|
|
/* Select a Directory. */
|
|
std::string Overlays::SelectDir(const std::string &oldDir, const std::string &msg) {
|
|
std::string currentPath = oldDir;
|
|
bool dirChanged = false;
|
|
int selection = 0, sPos = 0;
|
|
|
|
std::vector<DirEntry> dirContents;
|
|
dirContents.clear();
|
|
|
|
/* Make sure. */
|
|
if (access((oldDir + std::string("/")).c_str(), F_OK) == 0) {
|
|
chdir((oldDir + std::string("/")).c_str());
|
|
|
|
} else {
|
|
currentPath = "sdmc:/";
|
|
chdir("sdmc:/");
|
|
}
|
|
|
|
std::vector<DirEntry> dirContentsTemp;
|
|
getDirectoryContents(dirContentsTemp, {"/"});
|
|
|
|
for(uint i = 0; i < dirContentsTemp.size(); i++) {
|
|
dirContents.push_back(dirContentsTemp[i]);
|
|
}
|
|
|
|
while(1) {
|
|
Gui::clearTextBufs();
|
|
C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
|
|
C2D_TargetClear(Top, TRANSPARENT);
|
|
C2D_TargetClear(Bottom, TRANSPARENT);
|
|
|
|
if (StoreUtils::store && config->usebg() && StoreUtils::store->customBG()) {
|
|
Gui::ScreenDraw(Top);
|
|
Gui::Draw_Rect(0, 0, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
|
|
Gui::Draw_Rect(0, 25, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
|
C2D_DrawImageAt(StoreUtils::store->GetStoreImg(), 0, 26, 0.5f, nullptr);
|
|
|
|
} else {
|
|
GFX::DrawTop();
|
|
}
|
|
|
|
Gui::DrawStringCentered(0, 1, 0.7f, GFX::Themes[GFX::SelectedTheme].TextColor, msg, 380, 0, font);
|
|
|
|
Gui::Draw_Rect(0, 215, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
|
|
Gui::Draw_Rect(0, 214, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
|
Gui::DrawStringCentered(0, 217, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, currentPath, 390, 0, font);
|
|
|
|
Animation::QueueEntryDone();
|
|
GFX::DrawBottom();
|
|
|
|
Gui::Draw_Rect(0, 215, 320, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
|
|
Gui::Draw_Rect(0, 214, 320, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
|
Gui::DrawStringCentered(0, 220, 0.5f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("START_SELECT"), 310, 0, font);
|
|
|
|
if (dirContents.size() > 0) {
|
|
for(int i = 0; i < 7 && i < (int)dirContents.size(); i++) {
|
|
if (sPos + i == selection) Gui::Draw_Rect(mainButtons[i].x, mainButtons[i].y, mainButtons[i].w, mainButtons[i].h, GFX::Themes[GFX::SelectedTheme].MarkSelected);
|
|
Gui::DrawStringCentered(10 - 160 + (300 / 2), mainButtons[i].y + 4, 0.45f, GFX::Themes[GFX::SelectedTheme].TextColor, dirContents[sPos + i].name, 295, 0, font);
|
|
}
|
|
}
|
|
|
|
C3D_FrameEnd(0);
|
|
|
|
if (dirChanged) {
|
|
dirChanged = false;
|
|
|
|
selection = 0;
|
|
sPos = 0;
|
|
dirContents.clear();
|
|
std::vector<DirEntry> dirContentsTemp;
|
|
getDirectoryContents(dirContentsTemp, {"/"});
|
|
|
|
for(uint i = 0; i < dirContentsTemp.size(); i++) {
|
|
dirContents.push_back(dirContentsTemp[i]);
|
|
}
|
|
}
|
|
|
|
|
|
hidScanInput();
|
|
touchPosition touch;
|
|
hidTouchRead(&touch);
|
|
u32 hRepeat = hidKeysDownRepeat();
|
|
Animation::HandleQueueEntryDone();
|
|
|
|
if (dirContents.size() > 0) {
|
|
if (hRepeat & KEY_DOWN) {
|
|
if (selection < (int)dirContents.size() - 1) selection++;
|
|
else selection = 0;
|
|
}
|
|
|
|
if (hRepeat & KEY_UP) {
|
|
if (selection > 0) selection--;
|
|
else selection = dirContents.size() - 1;
|
|
}
|
|
|
|
if (hRepeat & KEY_RIGHT) {
|
|
if (selection + 7 < (int)dirContents.size()-1) selection += 7;
|
|
else selection = dirContents.size()-1;
|
|
}
|
|
|
|
if (hRepeat & KEY_LEFT) {
|
|
if (selection - 7 > 0) selection -= 7;
|
|
else selection = 0;
|
|
}
|
|
|
|
if (hidKeysDown() & KEY_A) {
|
|
if (dirContents[selection].isDirectory) {
|
|
chdir(dirContents[selection].name.c_str());
|
|
char path[PATH_MAX];
|
|
getcwd(path, PATH_MAX);
|
|
currentPath = path;
|
|
dirChanged = true;
|
|
}
|
|
}
|
|
|
|
if (hidKeysDown() & KEY_TOUCH) {
|
|
for (int i = 0; i < 7; i++) {
|
|
if (touching(touch, mainButtons[i])) {
|
|
if (i + sPos < (int)dirContents.size()) {
|
|
if (dirContents[i + sPos].isDirectory) {
|
|
chdir(dirContents[i + sPos].name.c_str());
|
|
|
|
char path[PATH_MAX];
|
|
getcwd(path, PATH_MAX);
|
|
currentPath = path;
|
|
|
|
dirChanged = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (selection < sPos) sPos = selection;
|
|
else if (selection > sPos + 7 - 1) sPos = selection - 7 + 1;
|
|
}
|
|
|
|
if ((hidKeysDown() & KEY_X) || (hidKeysDown() & KEY_START)) {
|
|
if (currentPath.size() > 0 && currentPath.back() == '/') currentPath.pop_back(); // Pop back the "/".
|
|
return currentPath;
|
|
}
|
|
|
|
if (hidKeysDown() & KEY_B) {
|
|
char path[PATH_MAX];
|
|
getcwd(path, PATH_MAX);
|
|
|
|
if (strcmp(path, "sdmc:/") == 0 || strcmp(path, "/") == 0) return "";
|
|
else {
|
|
chdir("..");
|
|
getcwd(path, PATH_MAX);
|
|
currentPath = path;
|
|
dirChanged = true;
|
|
}
|
|
}
|
|
}
|
|
} |