pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-28 23:34:03 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Reorder Favorite Action Menu with simple word modifications

Browse Source
This commit is contained in:
Jason P 2025-10-09 17:35:34 -05:00
parent 7970a32074
commit e93b65706b
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/graphics/draw/MenuHandler.cpp
View File

@ -864,19 +864,11 @@ void menuHandler::systemBaseMenu()
void menuHandler::favoriteBaseMenu() void menuHandler::favoriteBaseMenu()
{ {
enum optionsNumbers { Back, Preset, Freetext, ViewConversation, Remove, TraceRoute, enumEnd }; enum optionsNumbers { Back, Preset, Freetext, GoToThread, Remove, TraceRoute, enumEnd };
#if defined(M5STACK_UNITC6L)
static const char *optionsArray[enumEnd] = {"Back", "New Preset"};
#else
static const char *optionsArray[enumEnd] = {"Back", "New Preset Msg"};
#endif
static int optionsEnumArray[enumEnd] = {Back, Preset};
int options = 2;
if (kb_found) { static const char *optionsArray[enumEnd] = {"Back"};
optionsArray[options] = "New Freetext Msg"; static int optionsEnumArray[enumEnd] = {Back};
optionsEnumArray[options++] = Freetext; int options = 1;
}
// Only show "View Conversation" if a message exists with this node // Only show "View Conversation" if a message exists with this node
uint32_t peer = graphics::UIRenderer::currentFavoriteNodeNum; uint32_t peer = graphics::UIRenderer::currentFavoriteNodeNum;
@ -888,8 +880,19 @@ void menuHandler::favoriteBaseMenu()
} }
} }
if (hasConversation) { if (hasConversation) {
optionsArray[options] = "View Conversation"; optionsArray[options] = "Go To Thread";
optionsEnumArray[options++] = ViewConversation; optionsEnumArray[options++] = GoToThread;
}
#if defined(M5STACK_UNITC6L)
optionsArray[options] = "New Preset";
#else
optionsArray[options] = "New Preset Msg";
#endif
optionsEnumArray[options++] = Preset;
if (kb_found) {
optionsArray[options] = "New Freetext Msg";
optionsEnumArray[options++] = Freetext;
} }
#if !defined(M5STACK_UNITC6L) #if !defined(M5STACK_UNITC6L)
@ -913,15 +916,12 @@ void menuHandler::favoriteBaseMenu()
cannedMessageModule->LaunchWithDestination(graphics::UIRenderer::currentFavoriteNodeNum); cannedMessageModule->LaunchWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
} else if (selected == Freetext) { } else if (selected == Freetext) {
cannedMessageModule->LaunchFreetextWithDestination(graphics::UIRenderer::currentFavoriteNodeNum); cannedMessageModule->LaunchFreetextWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
} }
// Handle new View Conversation action // Handle new Go To Thread action
else if (selected == ViewConversation) { else if (selected == GoToThread) {
// Switch thread to direct conversation with this node // Switch thread to direct conversation with this node
graphics::MessageRenderer::setThreadMode( graphics::MessageRenderer::setThreadMode(graphics::MessageRenderer::ThreadMode::DIRECT, -1,
graphics::MessageRenderer::ThreadMode::DIRECT, graphics::UIRenderer::currentFavoriteNodeNum);
-1,
graphics::UIRenderer::currentFavoriteNodeNum
);
// Reset scroll state for a fresh view // Reset scroll state for a fresh view
graphics::MessageRenderer::resetScrollState(); graphics::MessageRenderer::resetScrollState();
@ -930,8 +930,7 @@ void menuHandler::favoriteBaseMenu()
UIFrameEvent evt; UIFrameEvent evt;
evt.action = UIFrameEvent::Action::SWITCH_TO_TEXTMESSAGE; evt.action = UIFrameEvent::Action::SWITCH_TO_TEXTMESSAGE;
screen->handleUIFrameEvent(&evt); screen->handleUIFrameEvent(&evt);
} } else if (selected == Remove) {
else if (selected == Remove) {
menuHandler::menuQueue = menuHandler::remove_favorite; menuHandler::menuQueue = menuHandler::remove_favorite;
screen->runNow(); screen->runNow();
} else if (selected == TraceRoute) { } else if (selected == TraceRoute) {