Mirrors/uLaunch
2
0
Fork 0
mirror of https://github.com/XorTroll/uLaunch synced 2024-11-10 06:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Everything looking better now

Browse source
This commit is contained in:
XorTroll 2019-11-30 16:43:15 +01:00
parent 0abf9fa1fa
commit 92f7c8a264
5 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CurrentChangelog.md
View file

@ -1,5 +1,11 @@
# Changelog
- Main menu
- Added a new way to open menus without touchscreen: presenting the **quick menu**! Just hold L/R-stick, then move it while being held to select a menu, leave the stick and profit!
- Changed the web browser touchable menu item with the controller applet one, for what it's worth.
- Settings menu
- New settings were added:
@ -22,19 +28,17 @@
- Serial number
- Added **controller menu applet** support to change/manage players and controllers!
- Added **controller menu applet** (as a menu touchable icon, as mentioned above) support to change/manage players and controllers!
- Added **album applet** support to view your captures!
- Added **album applet** (as part of the aforementioned **quick menu**) support to view your captures!
- Added a **power menu** as part of the *quick menu* shown below, to quickly power off, reboot or sleep the console.
- Added a **power menu** (as part of the aforementioned **quick menu**) to quickly power off, reboot or sleep the console!
- QForegroundViewer has been refactored into a major application: **uViewer!**
- New entry creator menu (custom entry creator to be accessible from main menu), customizable with plugins!
- Custom RetroArch plugin to make ROM forwarding super easy!
- Main menu
- This includes a custom RetroArch-themed DLL plugin, easily loadable by uViewer, to make ROM forwarding really easy!
- Added a new way to open menus without touchscreen: presenting the **quick menu**! Just hold L/R-stick, then move it while being held to select a menu, leave the stick and profit!

4
LibraryAppletQMenu/Include/ui/ui_MenuLayout.hpp
View file

@ -24,7 +24,7 @@ namespace ui
void settings_Click();
void themes_Click();
void users_Click();
void web_Click();
void controller_Click();
void MoveFolder(std::string name, bool fade);
void OnInput(u64 down, u64 up, u64 held, pu::ui::Touch pos);
void SetUser(u128 user);
@ -48,7 +48,7 @@ namespace ui
pu::ui::elm::Image::Ref topMenuImage;
pu::ui::elm::Image::Ref connIcon;
ClickableImage::Ref users;
ClickableImage::Ref web;
ClickableImage::Ref controller;
ClickableImage::Ref logo;
pu::ui::elm::TextBlock::Ref timeText;
pu::ui::elm::TextBlock::Ref batteryText;

6
LibraryAppletQMenu/RomFs/LangDefault.json
View file

@ -117,9 +117,9 @@
"help_title": "uLaunch help",
"help_launch": "Press A to launch the selected entry, or to return to it if suspended.",
"help_close": "Press X to close the currently opened title.",
"help_quick": "Press L / R-stick or L / R / ZL / ZR to open the quick menu. There press A having an option focused to select it or press B to cancel.",
"help_multiselect": "Press Y to open the multiselect mode\n(with this mode open, press Y to select/deselect any title, Y to confirm the selection or B to cancel)",
"help_quick": "Press L / R-stick or L / R / ZL / ZR to open the quick menu. Then, press A having an option focused, or press B to cancel.",
"help_multiselect": "Press Y to open the multiselect mode. Then, press Y to (de)select any title, Y to confirm the selection or B to cancel.",
"help_back": "Press B or HOME on any menu (except the startup menu) to return to the main menu.",
"help_minus": "Press Minus (-) on the main menu to swap between the normal menu and the homebrew menu\n(the first swap will take longer due to homebrew scanning!)",
"help_minus": "Press Minus (-) on the main menu to swap between the normal menu and the homebrew menu.",
"help_plus": "Press Plus (+) to see uLaunch's information (project version, description...)"
}

24
LibraryAppletQMenu/Source/ui/ui_MenuLayout.cpp
View file

@ -64,10 +64,10 @@ namespace ui
this->users->SetOnClick(std::bind(&MenuLayout::users_Click, this));
qapp->ApplyConfigForElement("main_menu", "user_icon", this->users);
this->Add(this->users);
this->web = ClickableImage::New(340, 53, cfg::GetAssetByTheme(theme, "ui/WebIcon.png"));
this->web->SetOnClick(std::bind(&MenuLayout::web_Click, this));
qapp->ApplyConfigForElement("main_menu", "web_icon", this->web);
this->Add(this->web);
this->controller = ClickableImage::New(340, 53, cfg::GetAssetByTheme(theme, "ui/ControllerIcon.png"));
this->controller->SetOnClick(std::bind(&MenuLayout::controller_Click, this));
qapp->ApplyConfigForElement("main_menu", "controller_icon", this->controller);
this->Add(this->controller);
auto curtime = util::GetCurrentTime();
this->timeText = pu::ui::elm::TextBlock::New(515, 68, curtime);
@ -126,13 +126,13 @@ namespace ui
this->quickMenu = QuickMenu::New(cfg::GetAssetByTheme(theme, "ui/QuickMenuMain.png"));
this->quickMenu->SetEntry(QuickMenuDirection::Up, cfg::GetAssetByTheme(theme, "ui/UserIcon.png"), std::bind(&MenuLayout::users_Click, this));
this->quickMenu->SetEntry(QuickMenuDirection::Down, cfg::GetAssetByTheme(theme, "ui/SettingsIcon.png"), std::bind(&MenuLayout::settings_Click, this));
this->quickMenu->SetEntry(QuickMenuDirection::Left, cfg::GetAssetByTheme(theme, "ui/WebIcon.png"), std::bind(&MenuLayout::web_Click, this));
this->quickMenu->SetEntry(QuickMenuDirection::UpLeft, cfg::GetAssetByTheme(theme, "ui/PowerIcon.png"), std::bind(&MenuLayout::HandlePowerDialog, this));
this->quickMenu->SetEntry(QuickMenuDirection::UpRight, cfg::GetAssetByTheme(theme, "ui/SettingsIcon.png"), std::bind(&MenuLayout::settings_Click, this));
this->quickMenu->SetEntry(QuickMenuDirection::Left, cfg::GetAssetByTheme(theme, "ui/ControllerIcon.png"), std::bind(&MenuLayout::controller_Click, this));
this->quickMenu->SetEntry(QuickMenuDirection::Right, cfg::GetAssetByTheme(theme, "ui/ThemesIcon.png"), std::bind(&MenuLayout::themes_Click, this));
this->quickMenu->SetEntry(QuickMenuDirection::UpLeft, cfg::GetAssetByTheme(theme, "ui/ControllerIcon.png"), std::bind(&MenuLayout::HandleControllerAppletOpen, this));
this->quickMenu->SetEntry(QuickMenuDirection::UpRight, cfg::GetAssetByTheme(theme, "ui/AlbumIcon.png"), std::bind(&MenuLayout::HandleOpenAlbum, this));
this->quickMenu->SetEntry(QuickMenuDirection::DownLeft, cfg::GetAssetByTheme(theme, "ui/PowerIcon.png"), std::bind(&MenuLayout::HandlePowerDialog, this));
this->quickMenu->SetEntry(QuickMenuDirection::DownRight, cfg::GetAssetByTheme(theme, "ui/HelpIcon.png"), std::bind(&MenuLayout::HandleShowHelp, this));
this->quickMenu->SetEntry(QuickMenuDirection::DownLeft, cfg::GetAssetByTheme(theme, "ui/WebIcon.png"), std::bind(&MenuLayout::HandleWebPageOpen, this));
this->quickMenu->SetEntry(QuickMenuDirection::DownRight, cfg::GetAssetByTheme(theme, "ui/AlbumIcon.png"), std::bind(&MenuLayout::HandleOpenAlbum, this));
this->quickMenu->SetEntry(QuickMenuDirection::Down, cfg::GetAssetByTheme(theme, "ui/HelpIcon.png"), std::bind(&MenuLayout::HandleShowHelp, this));
this->Add(this->quickMenu);
@ -768,9 +768,9 @@ namespace ui
this->HandleUserMenu();
}
void MenuLayout::web_Click()
void MenuLayout::controller_Click()
{
this->HandleWebPageOpen();
this->HandleControllerAppletOpen();
}
void MenuLayout::HandleCloseSuspended()

11
LibraryAppletQMenu/Source/ui/ui_QuickMenu.cpp
View file

@ -135,11 +135,14 @@ namespace ui
}
else
{
if(Down & KEY_A) this->Toggle();
else if(Down & KEY_B)
if(this->on)
{
prevheld = 0;
this->Toggle();
if(Down & KEY_A) this->Toggle();
else if(Down & KEY_B)
{
prevheld = 0;
this->Toggle();
}
}
if(!this->on && (this->bgalpha > 0) && (this->fgalpha > 0)) this->off_wait = prevheld;