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>
69 lines
No EOL
2.6 KiB
C++
69 lines
No EOL
2.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 "gfx.hpp"
|
|
#include "keyboard.hpp"
|
|
#include "screenCommon.hpp"
|
|
|
|
static std::vector<SwkbdDictWord> words;
|
|
|
|
/*
|
|
Return a string of the keyboard.
|
|
|
|
uint maxLength: The max length.
|
|
const std::string &Text: Const Reference to the Text.
|
|
const std::vector<std::unique_ptr<StoreEntry>> &entries: Const Reference of all entries for the words to suggest.
|
|
*/
|
|
std::string Input::setkbdString(uint maxLength, const std::string &Text, const std::vector<std::unique_ptr<StoreEntry>> &entries) {
|
|
C3D_FrameEnd(0); // Needed, so the system will not freeze.
|
|
|
|
SwkbdState state;
|
|
swkbdInit(&state, SWKBD_TYPE_NORMAL, 2, maxLength);
|
|
char temp[maxLength + 1] = { 0 };
|
|
swkbdSetHintText(&state, Text.c_str());
|
|
swkbdSetValidation(&state, SWKBD_NOTBLANK_NOTEMPTY, SWKBD_FILTER_PROFANITY, 0);
|
|
|
|
if (entries.size()) {
|
|
words.clear();
|
|
words.resize(entries.size());
|
|
|
|
for (uint i = 0; i < entries.size(); i++) {
|
|
/* Checking for not nullptr. */
|
|
if (entries[i]) swkbdSetDictWord(&words[i], StringUtils::lower_case(entries[i]->GetTitle()).c_str(), entries[i]->GetTitle().c_str());
|
|
else swkbdSetDictWord(&words[i], "", "");
|
|
}
|
|
|
|
if (words.size() > 0) {
|
|
swkbdSetDictionary(&state, words.data(), entries.size());
|
|
swkbdSetFeatures(&state, SWKBD_PREDICTIVE_INPUT);
|
|
}
|
|
}
|
|
|
|
SwkbdButton ret = swkbdInputText(&state, temp, sizeof(temp));
|
|
temp[maxLength] = '\0';
|
|
|
|
return (ret == SWKBD_BUTTON_CONFIRM ? temp : "");
|
|
} |