mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-28 15:22:55 +00:00
Consolidate wording on "Chats"
This commit is contained in:
parent
e93b65706b
commit
334089aa97
@ -434,7 +434,7 @@ void menuHandler::messageResponseMenu()
|
|||||||
optionsEnumArray[options++] = Freetext;
|
optionsEnumArray[options++] = Freetext;
|
||||||
}
|
}
|
||||||
|
|
||||||
optionsArray[options] = "Conversations";
|
optionsArray[options] = "View Chats";
|
||||||
optionsEnumArray[options++] = ViewMode;
|
optionsEnumArray[options++] = ViewMode;
|
||||||
|
|
||||||
// Only show Dismiss All in View All mode
|
// Only show Dismiss All in View All mode
|
||||||
@ -554,7 +554,7 @@ void menuHandler::messageViewModeMenu()
|
|||||||
|
|
||||||
labels.push_back("Back");
|
labels.push_back("Back");
|
||||||
ids.push_back(-1);
|
ids.push_back(-1);
|
||||||
labels.push_back("View All");
|
labels.push_back("View All Chats");
|
||||||
ids.push_back(-2);
|
ids.push_back(-2);
|
||||||
|
|
||||||
// Channels with messages
|
// Channels with messages
|
||||||
@ -864,7 +864,7 @@ void menuHandler::systemBaseMenu()
|
|||||||
|
|
||||||
void menuHandler::favoriteBaseMenu()
|
void menuHandler::favoriteBaseMenu()
|
||||||
{
|
{
|
||||||
enum optionsNumbers { Back, Preset, Freetext, GoToThread, Remove, TraceRoute, enumEnd };
|
enum optionsNumbers { Back, Preset, Freetext, GoToChat, Remove, TraceRoute, enumEnd };
|
||||||
|
|
||||||
static const char *optionsArray[enumEnd] = {"Back"};
|
static const char *optionsArray[enumEnd] = {"Back"};
|
||||||
static int optionsEnumArray[enumEnd] = {Back};
|
static int optionsEnumArray[enumEnd] = {Back};
|
||||||
@ -880,8 +880,8 @@ void menuHandler::favoriteBaseMenu()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (hasConversation) {
|
if (hasConversation) {
|
||||||
optionsArray[options] = "Go To Thread";
|
optionsArray[options] = "Go To Chat";
|
||||||
optionsEnumArray[options++] = GoToThread;
|
optionsEnumArray[options++] = GoToChat;
|
||||||
}
|
}
|
||||||
#if defined(M5STACK_UNITC6L)
|
#if defined(M5STACK_UNITC6L)
|
||||||
optionsArray[options] = "New Preset";
|
optionsArray[options] = "New Preset";
|
||||||
@ -918,7 +918,7 @@ void menuHandler::favoriteBaseMenu()
|
|||||||
cannedMessageModule->LaunchFreetextWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
|
cannedMessageModule->LaunchFreetextWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
|
||||||
}
|
}
|
||||||
// Handle new Go To Thread action
|
// Handle new Go To Thread action
|
||||||
else if (selected == GoToThread) {
|
else if (selected == GoToChat) {
|
||||||
// Switch thread to direct conversation with this node
|
// Switch thread to direct conversation with this node
|
||||||
graphics::MessageRenderer::setThreadMode(graphics::MessageRenderer::ThreadMode::DIRECT, -1,
|
graphics::MessageRenderer::setThreadMode(graphics::MessageRenderer::ThreadMode::DIRECT, -1,
|
||||||
graphics::UIRenderer::currentFavoriteNodeNum);
|
graphics::UIRenderer::currentFavoriteNodeNum);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user