60e29ddb90* 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>
106 lines
No EOL
3.4 KiB
C++
106 lines
No EOL
3.4 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 "storeUtils.hpp"
|
|
#include "structs.hpp"
|
|
|
|
extern bool touching(touchPosition touch, Structs::ButtonPos button);
|
|
static const std::vector<Structs::ButtonPos> sidePos = {
|
|
{ 0, 0, 40, 40 },
|
|
{ 0, 40, 40, 40 },
|
|
{ 0, 80, 40, 40 },
|
|
{ 0, 120, 40, 40 },
|
|
{ 0, 160, 40, 40 },
|
|
{ 0, 200, 40, 40 }
|
|
};
|
|
|
|
/*
|
|
Draw the Side Menu part.
|
|
|
|
int currentMenu: The current store Mode / Menu.
|
|
*/
|
|
void StoreUtils::DrawSideMenu(int currentMenu) {
|
|
for (int i = 0; i < 6; i++) {
|
|
if (i == currentMenu) {
|
|
Gui::Draw_Rect(sidePos[i].x, sidePos[i].y, sidePos[i].w, sidePos[i].h, GFX::Themes[GFX::SelectedTheme].SideBarSelected);
|
|
|
|
} else {
|
|
Gui::Draw_Rect(sidePos[i].x, sidePos[i].y, sidePos[i].w, sidePos[i].h, GFX::Themes[GFX::SelectedTheme].SideBarUnselected);
|
|
}
|
|
}
|
|
|
|
GFX::DrawSprite(sprites_info_idx, sidePos[0].x, sidePos[0].y);
|
|
GFX::DrawSprite(sprites_download_idx, sidePos[1].x, sidePos[1].y);
|
|
Animation::DrawQueue(sidePos[2].x, sidePos[2].y);
|
|
GFX::DrawSprite(sprites_search_idx, sidePos[3].x, sidePos[3].y);
|
|
GFX::DrawSprite(sprites_sort_idx, sidePos[4].x, sidePos[4].y);
|
|
GFX::DrawSprite(sprites_settings_idx, sidePos[5].x, sidePos[5].y);
|
|
|
|
Gui::Draw_Rect(40, 0, 1, 240, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
|
}
|
|
|
|
/*
|
|
Side Menu Handle.
|
|
Here you can..
|
|
|
|
- Switch between the Menus through the sidebar.
|
|
|
|
int ¤tMenu: Reference to the store Mode / Menu.
|
|
bool &fetch: Reference of the download fetch variable.. so we know, if we need to fetch the download entries.
|
|
int &lastMenu: Reference to the last menu.
|
|
*/
|
|
void StoreUtils::SideMenuHandle(int ¤tMenu, bool &fetch, int &lastMenu) {
|
|
Animation::QueueAnimHandle();
|
|
|
|
if (hDown & KEY_TOUCH) {
|
|
for (int i = 0; i < 6; i++) {
|
|
if (touching(touch, sidePos[i])) {
|
|
lastMenu = currentMenu;
|
|
if (i == 1) fetch = true; // Fetch download list, if 1.
|
|
currentMenu = i;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (hRepeat & KEY_R) {
|
|
if (currentMenu < 5) {
|
|
lastMenu = currentMenu;
|
|
if (currentMenu + 1 == 1) fetch = true; // Fetch download list, if 1.
|
|
currentMenu++;
|
|
}
|
|
}
|
|
|
|
if (hRepeat & KEY_L) {
|
|
if (currentMenu > 0) {
|
|
lastMenu = currentMenu;
|
|
if (currentMenu - 1 == 1) fetch = true; // Fetch download list, if 1.
|
|
currentMenu--;
|
|
}
|
|
}
|
|
} |