Skip to content

fix(color): fix issues with quick menu, favorites and key shortcuts #7351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philmoz wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(color): fix issues with quick menu, favorites and key shortcuts #7351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed85b2d
Fix quick menu navigation. Fix page header text.
May 9, 2026
c0c57ff
Size quick menu buttons to fill screen.
May 17, 2026
954f908
Cleanup key shortcut handling.
May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion radio/src/edgetx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2106,7 +2106,6 @@ bool validateLSV2Range(LogicalSwitchData* cs, int16_t& v2_min, int16_t& v2_max,
v2_min = 0;
}
}
TRACE(">>>>> %d %d %d",cs->func,v2_min,v2_max);

bool rv = false;

Expand Down
59 changes: 6 additions & 53 deletions radio/src/gui/colorlcd/libui/page.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,65 +133,18 @@ NavWindow* Page::navWindow()
}

#if defined(HARDWARE_KEYS)
void Page::onPressSYS()
void Page::doKeyShortcut(event_t event)
{
QMPage pg = g_eeGeneral.getKeyShortcut(EVT_KEY_BREAK(KEY_SYS));
QMPage pg = g_eeGeneral.getKeyShortcut(event);
if (pg == QM_OPEN_QUICK_MENU) {
QuickMenu::openQuickMenu();
} else {
auto p = navWindow();
if (p) {
onCancel();
p->onPressSYS();
}
}
}

void Page::onLongPressSYS()
{
auto p = navWindow();
if (p) {
onCancel();
p->onLongPressSYS();
}
}

void Page::onPressMDL()
{
auto p = navWindow();
if (p) {
} else if (pg != QM_NONE) {
onCancel();
p->onPressMDL();
}
}

void Page::onLongPressMDL()
{
auto p = navWindow();
if (p) {
onCancel();
p->onLongPressMDL();
}
}

void Page::onPressTELE()
{
auto p = navWindow();
if (p) {
onCancel();
p->onPressTELE();
}
}

void Page::onLongPressTELE()
{
auto p = navWindow();
if (p) {
onCancel();
p->onLongPressTELE();
auto p = navWindow();
if (p)
p->doKeyShortcut(event);
}
}

void Page::onLongPressRTN() { onCancel(); }
#endif

Expand Down
7 changes: 1 addition & 6 deletions radio/src/gui/colorlcd/libui/page.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,7 @@ class Page : public NavWindow
NavWindow* navWindow();

#if defined(HARDWARE_KEYS)
void onPressSYS() override;
void onLongPressSYS() override;
void onPressMDL() override;
void onLongPressMDL() override;
void onPressTELE() override;
void onLongPressTELE() override;
void doKeyShortcut(event_t event) override;
void onLongPressRTN() override;
#endif
};
Expand Down
9 changes: 9 additions & 0 deletions radio/src/gui/colorlcd/libui/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,15 @@ NavWindow::NavWindow(Window *parent, const rect_t &rect,
setWindowFlag(OPAQUE);
}

#if defined(HARDWARE_KEYS)
void NavWindow::onPressSYS() { doKeyShortcut(EVT_KEY_BREAK(KEY_SYS)); }
void NavWindow::onLongPressSYS() { doKeyShortcut(EVT_KEY_LONG(KEY_SYS)); }
void NavWindow::onPressMDL() { doKeyShortcut(EVT_KEY_BREAK(KEY_MODEL)); }
void NavWindow::onLongPressMDL() { doKeyShortcut(EVT_KEY_LONG(KEY_MODEL)); }
void NavWindow::onPressTELE() { doKeyShortcut(EVT_KEY_BREAK(KEY_TELE)); }
void NavWindow::onLongPressTELE() { doKeyShortcut(EVT_KEY_LONG(KEY_TELE)); }
#endif

//-----------------------------------------------------------------------------

class SetupTextButton : public TextButton
Expand Down
13 changes: 7 additions & 6 deletions radio/src/gui/colorlcd/libui/window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,13 @@ class NavWindow : public Window
bool isNavWindow() override { return true; }

#if defined(HARDWARE_KEYS)
virtual void onPressSYS() {}
virtual void onLongPressSYS() {}
virtual void onPressMDL() {}
virtual void onLongPressMDL() {}
virtual void onPressTELE() {}
virtual void onLongPressTELE() {}
virtual void doKeyShortcut(event_t event) {}
virtual void onPressSYS();
virtual void onLongPressSYS();
virtual void onPressMDL();
virtual void onLongPressMDL();
virtual void onPressTELE();
virtual void onLongPressTELE();
virtual void onPressPGUP() {}
virtual void onPressPGDN() {}
virtual void onLongPressPGUP() {}
Expand Down
6 changes: 0 additions & 6 deletions radio/src/gui/colorlcd/mainview/view_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,6 @@ void ViewMain::doKeyShortcut(event_t event)
QuickMenu::openPage(pg);
}
}
void ViewMain::onPressSYS() { doKeyShortcut(EVT_KEY_BREAK(KEY_SYS)); }
void ViewMain::onLongPressSYS() { doKeyShortcut(EVT_KEY_LONG(KEY_SYS)); }
void ViewMain::onPressMDL() { doKeyShortcut(EVT_KEY_BREAK(KEY_MODEL)); }
void ViewMain::onLongPressMDL() { doKeyShortcut(EVT_KEY_LONG(KEY_MODEL)); }
void ViewMain::onPressTELE() { doKeyShortcut(EVT_KEY_BREAK(KEY_TELE)); }
void ViewMain::onLongPressTELE() { doKeyShortcut(EVT_KEY_LONG(KEY_TELE)); }
void ViewMain::onPressPGUP()
{
if (!widget_select) {
Expand Down
8 changes: 1 addition & 7 deletions radio/src/gui/colorlcd/mainview/view_main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,7 @@ class ViewMain : public NavWindow
static void ws_timer(lv_timer_t* t);

#if defined(HARDWARE_KEYS)
void doKeyShortcut(event_t event);
void onPressSYS() override;
void onLongPressSYS() override;
void onPressMDL() override;
void onLongPressMDL() override;
void onPressTELE() override;
void onLongPressTELE() override;
void doKeyShortcut(event_t event) override;
void onPressPGUP() override;
void onPressPGDN() override;
#endif
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/function_switches.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void FunctionSwitchesBase::checkEvents()

//-----------------------------------------------------------------------------

ModelFunctionSwitches::ModelFunctionSwitches() : FunctionSwitchesBase(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS)
ModelFunctionSwitches::ModelFunctionSwitches() : FunctionSwitchesBase(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS)
{
for (uint8_t i = 0; i < switchGetMaxSwitches(); i += 1) {
if (switchIsCustomSwitch(i))
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/model_heli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_CONTENT,
#endif

ModelHeliPage::ModelHeliPage():
SubPage(ICON_MODEL_HELI, STR_MAIN_MENU_MODEL_SETTINGS, STR_MENUHELISETUP)
SubPage(ICON_MODEL_HELI, STR_MAIN_MODEL_SETTINGS, STR_MENUHELISETUP)
{
FlexGridLayout grid(col_dsc, row_dsc, PAD_TINY);
body->setFlexLayout();
Expand Down
23 changes: 5 additions & 18 deletions radio/src/gui/colorlcd/model/model_select.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,26 +539,13 @@ ModelLabelsWindow::ModelLabelsWindow() : Page(ICON_MODEL_SELECT, PAD_ZERO, true)
}

#if defined(HARDWARE_KEYS)
void ModelLabelsWindow::onLongPressSYS()
void ModelLabelsWindow::doKeyShortcut(event_t event)
{
onCancel();
Page::onLongPressSYS();
}
void ModelLabelsWindow::onPressMDL()
{
onCancel();
Page::onPressMDL();
}
void ModelLabelsWindow::onPressTELE()
{
onCancel();
Page::onPressTELE();
}
void ModelLabelsWindow::onLongPressTELE()
{
onCancel();
Page::onLongPressTELE();
QMPage pg = g_eeGeneral.getKeyShortcut(event);
if (pg != QM_MANAGE_MODELS)
Page::doKeyShortcut(event);
}

void ModelLabelsWindow::onPressPG(bool isNext)
{
int rowcount = lblselector->getRowCount();
Expand Down
6 changes: 1 addition & 5 deletions radio/src/gui/colorlcd/model/model_select.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ class ModelLabelsWindow : public Page
void moveLabel(int selected, int direction);

#if defined(HARDWARE_KEYS)
void onLongPressSYS() override;
void onPressMDL() override;
void onLongPressMDL() override {}
void onPressTELE() override;
void onLongPressTELE() override;
void doKeyShortcut(event_t event) override;
void onPressPG(bool isNext);
void onPressPGUP() override;
void onPressPGDN() override;
Expand Down
8 changes: 4 additions & 4 deletions radio/src/gui/colorlcd/model/model_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,16 +465,16 @@ const static PageButtonDef modelSetupButtons[] = {
{STR_DEF(STR_TIMER_3), []() { new TimerWindow(2); }, []() { return g_model.timers[2].mode > 0; }},

{STR_DEF(STR_PREFLIGHT), []() { new PreflightChecks(); }},
{STR_DEF(STR_TRIMS), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS, STR_TRIMS, trimsSetupLines); }},
{STR_DEF(STR_THROTTLE_LABEL), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS, STR_THROTTLE_LABEL, throttleParamsSetupLines); }},
{STR_DEF(STR_ENABLED_FEATURES), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS, STR_ENABLED_FEATURES, viewOptionsPageSetupLines); }},
{STR_DEF(STR_TRIMS), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS, STR_TRIMS, trimsSetupLines); }},
{STR_DEF(STR_THROTTLE_LABEL), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS, STR_THROTTLE_LABEL, throttleParamsSetupLines); }},
{STR_DEF(STR_ENABLED_FEATURES), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS, STR_ENABLED_FEATURES, viewOptionsPageSetupLines); }},
#if defined(USBJ_EX)
{STR_DEF(STR_USBJOYSTICK_LABEL), []() { new ModelUSBJoystickPage(); }},
#endif
#if defined(FUNCTION_SWITCHES)
{STR_DEF(STR_FUNCTION_SWITCHES), []() { new ModelFunctionSwitches(); }},
#endif
{STR_DEF(STR_MENU_OTHER), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS, STR_MENU_OTHER, otherPageSetupLines); }},
{STR_DEF(STR_MENU_OTHER), []() { new SubPage(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS, STR_MENU_OTHER, otherPageSetupLines); }},
#if defined(HELI)
{STR_DEF(STR_MENUHELISETUP), []() { return new ModelHeliPage(); }, nullptr, modelHeliEnabled},
#endif
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/model_usbjoystick.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ class USBChannelLineButton : public ListLineButton

ModelUSBJoystickPage::ModelUSBJoystickPage() : Page(ICON_MODEL_USB, PAD_BORDER)
{
header->setTitle(STR_MAIN_MENU_MODEL_SETTINGS);
header->setTitle(STR_MAIN_MODEL_SETTINGS);
header->setTitle2(STR_USBJOYSTICK_LABEL);

body->setFlexLayout();
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/preflight_checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class PotWarnMatrix : public ButtonMatrix
uint8_t pot_idx[MAX_POTS];
};

PreflightChecks::PreflightChecks() : SubPage(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS, STR_PREFLIGHT)
PreflightChecks::PreflightChecks() : SubPage(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS, STR_PREFLIGHT)
{
body->setFlexLayout();

Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/throttle_params.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ static SetupLineDef setupLines[] = {
},
};

ThrottleParams::ThrottleParams() : SubPage(ICON_MODEL_SETUP, STR_MAIN_MENU_MODEL_SETTINGS, STR_THROTTLE_LABEL, setupLines, DIM(setupLines))
ThrottleParams::ThrottleParams() : SubPage(ICON_MODEL_SETUP, STR_MAIN_MODEL_SETTINGS, STR_THROTTLE_LABEL, setupLines, DIM(setupLines))
{
}
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/timer_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define SET_DIRTY() storageDirty(EE_MODEL)

TimerWindow::TimerWindow(uint8_t timer) :
SubPage(ICON_STATS_TIMERS, STR_MAIN_MENU_MODEL_SETTINGS, (std::string(STR_TIMER) + std::to_string(timer + 1)).c_str())
SubPage(ICON_STATS_TIMERS, STR_MAIN_MODEL_SETTINGS, (std::string(STR_TIMER) + std::to_string(timer + 1)).c_str())
{
body->setFlexLayout();

Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/model/trainer_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void TrainerModuleWindow::update()

TrainerPage::TrainerPage() : Page(ICON_MODEL_SETUP)
{
header->setTitle(STR_MAIN_MENU_MODEL_SETTINGS);
header->setTitle(STR_MAIN_MODEL_SETTINGS);
header->setTitle2(STR_TRAINER);

body->setFlexLayout();
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/module/module_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ ModulePage::ModulePage(uint8_t moduleIdx) : Page(ICON_MODEL_SETUP)
{
const char* title2 =
moduleIdx == INTERNAL_MODULE ? STR_INTERNALRF : STR_EXTERNALRF;
header->setTitle(STR_MAIN_MENU_MODEL_SETTINGS);
header->setTitle(STR_MAIN_MODEL_SETTINGS);
header->setTitle2(title2);

body->setFlexLayout();
Expand Down
13 changes: 7 additions & 6 deletions radio/src/gui/colorlcd/radio/preview_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include "edgetx.h"
#include "etx_lv_theme.h"
#include "quick_menu.h"
#include "quick_menu_group.h"
#include "sliders.h"
#include "textedit.h"
Expand Down Expand Up @@ -163,22 +164,22 @@ PreviewWindow::PreviewWindow(Window *window, rect_t rect,
auto mask = getBuiltinIcon(ICON_TOP_LOGO);
new StaticIcon(qm, (QM_W - mask->width) / 2, 0, ICON_TOP_LOGO, COLOR_THEME_QM_FG_INDEX);

auto qmb = new Window(qm, {PAD_SMALL, mask->height + PAD_SMALL, QuickMenuGroup::QM_BUTTON_WIDTH, QuickMenuGroup::QM_BUTTON_HEIGHT});
auto qmb = new Window(qm, {PAD_SMALL, mask->height + PAD_SMALL, QuickMenu::QM_BUTTON_WIDTH, QuickMenu::QM_BUTTON_HEIGHT});
etx_obj_add_style(qmb->getLvObj(), styles->rounded, LV_PART_MAIN);
etx_txt_color(qmb->getLvObj(), COLOR_THEME_QM_FG_INDEX, LV_PART_MAIN);
etx_solid_bg(qmb->getLvObj(), COLOR_THEME_QM_BG_INDEX, LV_PART_MAIN);
new StaticIcon(qmb, (QuickMenuGroup::QM_BUTTON_WIDTH - QuickMenuGroup::QM_ICON_SIZE) / 2, PAD_SMALL,
new StaticIcon(qmb, (QuickMenu::QM_BUTTON_WIDTH - QuickMenuGroup::QM_ICON_SIZE) / 2, PAD_SMALL,
ICON_MODEL_SELECT, COLOR_THEME_QM_FG_INDEX);
new StaticText(qmb, {0, QuickMenuGroup::QM_ICON_SIZE + PAD_TINY * 2, QuickMenuGroup::QM_BUTTON_WIDTH - 1, 0},
new StaticText(qmb, {0, QuickMenuGroup::QM_ICON_SIZE + PAD_TINY * 2, QuickMenu::QM_BUTTON_WIDTH - 1, 0},
STR_QM_MANAGE_MODELS, COLOR_THEME_QM_FG_INDEX, CENTERED | FONT(XS));

qmb = new Window(qm, {QuickMenuGroup::QM_BUTTON_WIDTH + PAD_SMALL * 2, mask->height + PAD_SMALL, QuickMenuGroup::QM_BUTTON_WIDTH, QuickMenuGroup::QM_BUTTON_HEIGHT});
qmb = new Window(qm, {QuickMenu::QM_BUTTON_WIDTH + PAD_SMALL * 2, mask->height + PAD_SMALL, QuickMenu::QM_BUTTON_WIDTH, QuickMenu::QM_BUTTON_HEIGHT});
etx_obj_add_style(qmb->getLvObj(), styles->rounded, LV_PART_MAIN);
etx_txt_color(qmb->getLvObj(), COLOR_THEME_QM_BG_INDEX, LV_PART_MAIN);
etx_solid_bg(qmb->getLvObj(), COLOR_THEME_QM_FG_INDEX, LV_PART_MAIN);
new StaticIcon(qmb, (QuickMenuGroup::QM_BUTTON_WIDTH - QuickMenuGroup::QM_ICON_SIZE) / 2, PAD_SMALL,
new StaticIcon(qmb, (QuickMenu::QM_BUTTON_WIDTH - QuickMenuGroup::QM_ICON_SIZE) / 2, PAD_SMALL,
ICON_MODEL, COLOR_THEME_QM_BG_INDEX);
new StaticText(qmb, {0, QuickMenuGroup::QM_ICON_SIZE + PAD_TINY * 2, QuickMenuGroup::QM_BUTTON_WIDTH - 1, 0},
new StaticText(qmb, {0, QuickMenuGroup::QM_ICON_SIZE + PAD_TINY * 2, QuickMenu::QM_BUTTON_WIDTH - 1, 0},
STR_QM_MODEL_SETUP, COLOR_THEME_QM_BG_INDEX, CENTERED | FONT(XS));

lv_group_set_default(def_group);
Expand Down
16 changes: 8 additions & 8 deletions radio/src/gui/colorlcd/radio/radio_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,19 +1046,19 @@ static bool hasShortcutKeys()

const static PageButtonDef radioSetupButtons[] = {
#if defined(AUDIO)
{STR_DEF(STR_SOUND_LABEL), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_SOUND_LABEL, soundPageSetupLines); }},
{STR_DEF(STR_SOUND_LABEL), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_SOUND_LABEL, soundPageSetupLines); }},
#endif
#if defined(VARIO)
{STR_DEF(STR_VARIO), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_VARIO, varioPageSetupLines); }},
{STR_DEF(STR_VARIO), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_VARIO, varioPageSetupLines); }},
#endif
#if defined(HAPTIC)
{STR_DEF(STR_HAPTIC_LABEL), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_HAPTIC_LABEL, hapticPageSetupLines); }},
{STR_DEF(STR_HAPTIC_LABEL), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_HAPTIC_LABEL, hapticPageSetupLines); }},
#endif
{STR_DEF(STR_ALARMS_LABEL), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_ALARMS_LABEL, alarmsPageSetupLines); }},
{STR_DEF(STR_BACKLIGHT_LABEL), []() { (new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_BACKLIGHT_LABEL, backlightSetupLines))->useFlexLayout(); }},
{STR_DEF(STR_GPS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_GPS, gpsPageSetupLines); }},
{STR_DEF(STR_ENABLED_FEATURES), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_ENABLED_FEATURES, viewOptionsPageSetupLines); }},
{STR_DEF(STR_MAIN_MENU_MANAGE_MODELS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_MAIN_MENU_MANAGE_MODELS, manageModelsSetupLines); }},
{STR_DEF(STR_ALARMS_LABEL), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_ALARMS_LABEL, alarmsPageSetupLines); }},
{STR_DEF(STR_BACKLIGHT_LABEL), []() { (new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_BACKLIGHT_LABEL, backlightSetupLines))->useFlexLayout(); }},
{STR_DEF(STR_GPS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_GPS, gpsPageSetupLines); }},
{STR_DEF(STR_ENABLED_FEATURES), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_ENABLED_FEATURES, viewOptionsPageSetupLines); }},
{STR_DEF(STR_MAIN_MENU_MANAGE_MODELS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_RADIO_SETTINGS, STR_MAIN_MENU_MANAGE_MODELS, manageModelsSetupLines); }},
#if VERSION_MAJOR > 2
{STR_DEF(STR_KEY_SHORTCUTS), []() { new QMKeyShortcutsPage(); }, nullptr, []() { return hasShortcutKeys(); }},
{STR_DEF(STR_QUICK_MENU_FAVORITES), []() { new QMFavoritesPage(); }, nullptr},
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/setup_menus/key_shortcuts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void QMKeyShortcutsPage::addKey(event_t event, std::vector<std::string> qmPages,
}

QMKeyShortcutsPage::QMKeyShortcutsPage():
SubPage(ICON_RADIO, STR_MAIN_MENU_RADIO_SETTINGS, STR_KEY_SHORTCUTS, true)
SubPage(ICON_RADIO, STR_MAIN_RADIO_SETTINGS, STR_KEY_SHORTCUTS, true)
{
auto qmPages = QuickMenu::menuPageNames(false);

Expand Down
6 changes: 0 additions & 6 deletions radio/src/gui/colorlcd/setup_menus/pagegroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,6 @@ void PageGroupBase::doKeyShortcut(event_t event)
}
}
}
void PageGroupBase::onPressSYS() { doKeyShortcut(EVT_KEY_BREAK(KEY_SYS)); }
void PageGroupBase::onLongPressSYS() { doKeyShortcut(EVT_KEY_LONG(KEY_SYS)); }
void PageGroupBase::onPressMDL() { doKeyShortcut(EVT_KEY_BREAK(KEY_MODEL)); }
void PageGroupBase::onLongPressMDL() { doKeyShortcut(EVT_KEY_LONG(KEY_MODEL)); }
void PageGroupBase::onPressTELE() { doKeyShortcut(EVT_KEY_BREAK(KEY_TELE)); }
void PageGroupBase::onLongPressTELE() { doKeyShortcut(EVT_KEY_LONG(KEY_TELE)); }

void PageGroupBase::onPressPGUP() { header->prevTab(); }
void PageGroupBase::onPressPGDN() { header->nextTab(); }
Expand Down
8 changes: 1 addition & 7 deletions radio/src/gui/colorlcd/setup_menus/pagegroup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,7 @@ class PageGroupBase : public NavWindow
void checkEvents() override;

#if defined(HARDWARE_KEYS)
void doKeyShortcut(event_t event);
void onPressSYS() override;
void onLongPressSYS() override;
void onPressMDL() override;
void onLongPressMDL() override;
void onPressTELE() override;
void onLongPressTELE() override;
void doKeyShortcut(event_t event) override;
void onPressPGUP() override;
void onPressPGDN() override;
void onLongPressPGUP() override;
Expand Down
Loading