From 85622fa67a6a68686f9cf7fda9c765ceaf8bef7e Mon Sep 17 00:00:00 2001 From: Pit64 Date: Wed, 3 Dec 2025 12:39:28 +0100 Subject: [PATCH] fix(frontend): fix swapped a/b buttons --- .../es-app/src/guis/GuiThemeManager.cpp | 8 +++--- .../es-app/src/guis/menus/base/ItemSelector.h | 28 +++++++++---------- .../es-app/src/guis/menus/base/ItemSubMenu.h | 4 +-- .../es-app/src/guis/menus/base/ItemSwitch.h | 4 +-- .../es-app/src/guis/menus/base/Menu.h | 14 +++++----- .../src/guis/ItemTracker/GuiQuickJump.cpp | 4 +-- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/projects/frontend/es-app/src/guis/GuiThemeManager.cpp b/projects/frontend/es-app/src/guis/GuiThemeManager.cpp index cc74966bc4..ef9900b16e 100644 --- a/projects/frontend/es-app/src/guis/GuiThemeManager.cpp +++ b/projects/frontend/es-app/src/guis/GuiThemeManager.cpp @@ -519,15 +519,15 @@ bool GuiThemeManager::CollectHelpItems(Help& help) help.Set(HelpType::UpDown, _("BROWSE PREVIEWS")) .Set(HelpType::LeftRight, _("BROWSE THEMES")) - .Set(HelpType::A, _("CLOSE")); - if (installed == nullptr) help.Set(HelpType::B, _("INSTALL")); + .Set(Help::Cancel(), _("CLOSE")); + if (installed == nullptr) help.Set(Help::Valid(), _("INSTALL")); else { if (!local) help.Set(HelpType::X, _("DELETE")); if (installed->InstalledIn() == ThemeManager::Instance().CurrentThemePath()) help.Set(HelpType::Y, _("OPTIONS")); - if (updateAvailable) help.Set(HelpType::B, _("UPDATE")); - else help.Set(HelpType::B, _("SWITCH TO")); + if (updateAvailable) help.Set(Help::Valid(), _("UPDATE")); + else help.Set(Help::Valid(), _("SWITCH TO")); } return true; } diff --git a/projects/frontend/es-app/src/guis/menus/base/ItemSelector.h b/projects/frontend/es-app/src/guis/menus/base/ItemSelector.h index a0f6acb733..6e9d4321d9 100644 --- a/projects/frontend/es-app/src/guis/menus/base/ItemSelector.h +++ b/projects/frontend/es-app/src/guis/menus/base/ItemSelector.h @@ -33,8 +33,8 @@ templateclass ISelectorGUIInterface virtual void ItemChanged(const T& value, bool selected) = 0; /*! - * @brief Select all/Unsellect all has been selected, select or unselect all - * @param selected Tru to select all, false to unselec all + * @brief Select all/Unselect all has been selected, select or unselect all + * @param selected Tru to select all, false to unselect all */ virtual void ItemChangedAll(bool selected) = 0; }; @@ -292,7 +292,7 @@ template class ItemSelectorBase : public ItemBase } /*! - * @brief Check if the initialy selected item/items has/have changed since the initialisation + * @brief Check if the initially selected item/items has/have changed since the initialisation * @return True if something changed since the initialisation */ bool HasChanged() final @@ -325,7 +325,7 @@ template class ItemSelectorBase : public ItemBase /*! * @brief Called once per frame - * @param elapsed elaspsed time from last update call + * @param elapsed elapsed time from last update call */ void Update(int elapsed) final { @@ -343,7 +343,7 @@ template class ItemSelectorBase : public ItemBase */ void CollectHelpItems(Help& help) override { - help.Set(HelpType::B, _("SELECT")); + help.Set(Help::Valid(), _("SELECT")); if (!mMulti) help.Set(HelpType::LeftRight, _("CHANGE")); } @@ -558,11 +558,11 @@ template class ItemSelectorBase : public ItemBase bool CollectHelpItems(Help& help) override { if (mMulti) - help.Set(HelpType::B, _("TOGGLE")) - .Set(HelpType::A, _("BACK")); + help.Set(Help::Valid(), _("TOGGLE")) + .Set(Help::Cancel(), _("BACK")); else - help.Set(HelpType::B, _("SELECT")) - .Set(HelpType::A, _("BACK")); + help.Set(Help::Valid(), _("SELECT")) + .Set(Help::Cancel(), _("BACK")); return true; } @@ -699,7 +699,7 @@ template class ItemSelectorBase : public ItemBase //! Left arrow resource Texture mArrow; - //! Niepatch empty button + //! Ninepatch empty button NinePatchImage mButton; //! Single interface @@ -853,7 +853,7 @@ template class ItemSelectorBase : public ItemBase /*! * @brief Callback from the GUI when a change occured * @param value Value selected - * @param selected Selected state in multu mode, otherwise always true + * @param selected Selected state in multi mode, otherwise always true */ void ItemChanged(const T& value, bool selected) final { @@ -875,8 +875,8 @@ template class ItemSelectorBase : public ItemBase } /*! - * @brief Select all/Unsellect all has been selected, select or unselect all - * @param selected Tru to select all, false to unselec all + * @brief Select all/Unselect all has been selected, select or unselect all + * @param selected Tru to select all, false to unselect all */ void ItemChangedAll(bool selected) final { @@ -924,7 +924,7 @@ template ItemSelectorBase::Selector::Selector(WindowManager& wind mItemList->setSelectedColor(0); // If defined, it's given priority on color shift mItemList->setSelectorColor(mTheme.Text().selectorColor); mItemList->setColorAt(MenuColors::sSelectableColor, mTheme.Text().color); // Text color - mItemList->setColorAt(MenuColors::sSelectableSelectedColor, mTheme.Text().selectedColor); // selected text coplor + mItemList->setColorAt(MenuColors::sSelectableSelectedColor, mTheme.Text().selectedColor); // selected text color mItemList->setColorAt(MenuColors::sUnselectableColor, MenuColors::Alpha25Percent(mTheme.Text().color)); // Grayed color mItemList->setColorAt(MenuColors::sUnselectableSelectedColor, MenuColors::Alpha25Percent(mTheme.Text().selectedColor)); // Grayed selected color mItemList->setColorAt(MenuColors::sHeaderColor, mTheme.Section().color); // Header color diff --git a/projects/frontend/es-app/src/guis/menus/base/ItemSubMenu.h b/projects/frontend/es-app/src/guis/menus/base/ItemSubMenu.h index e92b4bfe1a..e90e9d65c4 100644 --- a/projects/frontend/es-app/src/guis/menus/base/ItemSubMenu.h +++ b/projects/frontend/es-app/src/guis/menus/base/ItemSubMenu.h @@ -72,7 +72,7 @@ class ItemSubMenu : public ItemBase /*! * @brief Called once per frame - * @param elapsed elaspsed time from last update call + * @param elapsed elapsed time from last update call */ void Update(int elapsed) final { (void)elapsed; }; @@ -82,7 +82,7 @@ class ItemSubMenu : public ItemBase */ void CollectHelpItems(Help& help) override { - help.Set(HelpType::B, _("OPEN")); + help.Set(Help::Valid(), _("OPEN")); } /*! diff --git a/projects/frontend/es-app/src/guis/menus/base/ItemSwitch.h b/projects/frontend/es-app/src/guis/menus/base/ItemSwitch.h index ed7040cc9b..9aa8aea367 100644 --- a/projects/frontend/es-app/src/guis/menus/base/ItemSwitch.h +++ b/projects/frontend/es-app/src/guis/menus/base/ItemSwitch.h @@ -124,7 +124,7 @@ class ItemSwitch : public ItemBase /*! * @brief Called once per frame - * @param elapsed elaspsed time from last update call + * @param elapsed elapsed time from last update call */ void Update(int elapsed) final { (void)elapsed; } @@ -134,7 +134,7 @@ class ItemSwitch : public ItemBase */ void CollectHelpItems(Help& help) override { - help.Set(HelpType::B, _("TOGGLE")); + help.Set(Help::Valid(), _("TOGGLE")); } /* diff --git a/projects/frontend/es-app/src/guis/menus/base/Menu.h b/projects/frontend/es-app/src/guis/menus/base/Menu.h index 12eb8c7f8c..9cc0a10f7f 100644 --- a/projects/frontend/es-app/src/guis/menus/base/Menu.h +++ b/projects/frontend/es-app/src/guis/menus/base/Menu.h @@ -319,7 +319,7 @@ class Menu : public Gui /*! * @brief Add a rating menu entry - * @param labal Menu text + * @param label Menu text * @param value Initial value * @param callback Callback when entry changes * @return rating component @@ -397,7 +397,7 @@ class Menu : public Gui /*! * @brief Add editable text - * @param edittitle Edit title in vitytual keyboard + * @param edittitle Edit title in virtual keyboard * @param label Caption text * @param value Initial value * @param interface Callback when entry changes @@ -410,7 +410,7 @@ class Menu : public Gui /*! * @brief Add editable text - * @param edittitle Edit title in vitytual keyboard + * @param edittitle Edit title in virtual keyboard * @param label Caption text * @param value Initial value * @param interface Callback when entry changes @@ -581,7 +581,7 @@ class Menu : public Gui /*! * @brief Proces input - * @param event Inpuit event + * @param event Input event * @return True if the input has been processed */ bool ProcessInput(const InputCompactEvent& event) override; @@ -619,7 +619,7 @@ class Menu : public Gui std::shared_ptr> mList; //! Title scroll component std::shared_ptr mTitleScroll; - //! Footer scoll component + //! Footer scroll component std::shared_ptr mFooterScroll; //! Title String mTitle; @@ -649,7 +649,7 @@ class Menu : public Gui help.Clear(); mList->getSelected()->CollectHelpItems(help); help.Set(HelpType::AllDirections, _("CHOOSE")) - .Set(HelpType::A, _("BACK")) + .Set(Help::Cancel(), _("BACK")) .Set(HelpType::Y, _("HELP")) .Set(HelpType::Start, _("CLOSE")); return true; @@ -692,7 +692,7 @@ class Menu : public Gui //! Resize inner components when this component is resized void onSizeChanged() override; - //! Check th eitem at the given index and check if it's displayable or not + //! Check the item at the given index and check if it's displayable or not [[nodiscard]] bool IsDisplayable(int index) const; /* diff --git a/projects/frontend/es-core/src/guis/ItemTracker/GuiQuickJump.cpp b/projects/frontend/es-core/src/guis/ItemTracker/GuiQuickJump.cpp index 009dbd0f33..d2a89b1821 100644 --- a/projects/frontend/es-core/src/guis/ItemTracker/GuiQuickJump.cpp +++ b/projects/frontend/es-core/src/guis/ItemTracker/GuiQuickJump.cpp @@ -222,7 +222,7 @@ bool GuiQuickJump::ProcessInput(const InputCompactEvent& event) bool GuiQuickJump::CollectHelpItems(Help& help) { - help.Set(HelpType::A, _("BACK")) + help.Set(Help::Cancel(), _("BACK")) .Set(HelpType::LeftRight, _("FOLD/UNFOLD")) .Set(HelpType::LR, _("FAST MOVE")) .Set(HelpType::Y, _("BOTTOM")) @@ -230,7 +230,7 @@ bool GuiQuickJump::CollectHelpItems(Help& help) if (!mList->isEmpty()) if (!mList->getSelected()->Children().empty()) - help.Set(HelpType::B, _("UNFOLD")); + help.Set(Help::Valid(), _("UNFOLD")); return true; } -- GitLab