diff --git a/README.md b/README.md index 0fde4708..da4969bb 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Interactive Commands: Ctrl-f jump to unread chat Ctrl-g toggle show help bar Ctrl-l toggle show contact list - Ctrl-n search contacts + Ctrl-n goto chat Ctrl-p toggle show top bar Ctrl-q quit Ctrl-s insert emoji @@ -63,7 +63,7 @@ Interactive Commands: KeyUp select message Alt-d delete/leave current chat Alt-e external editor compose - Alt-n goto chat + Alt-n search contacts Alt-t external telephone call Alt-/ find in chat Alt-? find next in chat @@ -676,7 +676,7 @@ This configuration file holds user interface key bindings. Default content: find_next=\33\77 forward_msg=\33\162 forward_word= - goto_chat=\33\156 + goto_chat=KEY_CTRLN home=KEY_HOME increase_list_width=\33\56 jump_quoted=\33\161 @@ -697,7 +697,7 @@ This configuration file holds user interface key bindings. Default content: react=\33\163 right=KEY_RIGHT save=KEY_CTRLR - select_contact=KEY_CTRLN + select_contact=\33\156 select_emoji=KEY_CTRLS send_msg=KEY_CTRLX spell=\33\44 diff --git a/lib/common/src/version.h b/lib/common/src/version.h index 8733ec10..e07f3e78 100644 --- a/lib/common/src/version.h +++ b/lib/common/src/version.h @@ -7,4 +7,4 @@ #pragma once -#define NCHAT_VERSION "5.5.5" +#define NCHAT_VERSION "5.5.6" diff --git a/src/main.cpp b/src/main.cpp index bfe7e2c3..70bd2f04 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -606,7 +606,7 @@ void ShowHelp() " Ctrl-f jump to unread chat\n" " Ctrl-g toggle show help bar\n" " Ctrl-l toggle show contact list\n" - " Ctrl-n search contacts\n" + " Ctrl-n goto chat\n" " Ctrl-p toggle show top bar\n" " Ctrl-q quit\n" " Ctrl-s insert emoji\n" @@ -616,7 +616,7 @@ void ShowHelp() " KeyUp select message\n" " Alt-d delete/leave current chat\n" " Alt-e external editor compose\n" - " Alt-n goto chat\n" + " Alt-n search contacts\n" " Alt-t external telephone call\n" " Alt-/ find in chat\n" " Alt-? find next in chat\n" diff --git a/src/nchat.1 b/src/nchat.1 index 9a11a3f6..3023863a 100644 --- a/src/nchat.1 +++ b/src/nchat.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man. -.TH NCHAT "1" "January 2025" "nchat 5.5.5" "User Commands" +.TH NCHAT "1" "January 2025" "nchat 5.5.6" "User Commands" .SH NAME nchat \- ncurses chat .SH SYNOPSIS @@ -62,7 +62,7 @@ Ctrl\-l toggle show contact list .TP Ctrl\-n -search contacts +goto chat .TP Ctrl\-p toggle show top bar @@ -92,7 +92,7 @@ Alt\-e external editor compose .TP Alt\-n -goto chat +search contacts .TP Alt\-t external telephone call diff --git a/src/uihelpview.cpp b/src/uihelpview.cpp index a5a346c7..a6b8a254 100644 --- a/src/uihelpview.cpp +++ b/src/uihelpview.cpp @@ -1,6 +1,6 @@ // uihelpview.cpp // -// Copyright (c) 2019-2024 Kristofer Berggren +// Copyright (c) 2019-2025 Kristofer Berggren // All rights reserved. // // nchat is distributed under the MIT license, see LICENSE for details. @@ -68,7 +68,7 @@ void UiHelpView::Draw() AppendHelpItem("quit", "Quit", helpItems); AppendHelpItem("select_emoji", "AddEmoji", helpItems); - AppendHelpItem("select_contact", "AddrBook", helpItems); + AppendHelpItem("goto_chat", "GotoChat", helpItems); AppendHelpItem("transfer", "SendFile", helpItems); return helpItems; @@ -81,7 +81,7 @@ void UiHelpView::Draw() AppendHelpItem("ext_call", "ExtCall", helpItems); AppendHelpItem("find", "Find", helpItems); AppendHelpItem("find_next", "FindNext", helpItems); - AppendHelpItem("goto_chat", "GotoChat", helpItems); + AppendHelpItem("select_contact", "AddrBook", helpItems); AppendHelpItem("spell", "ExtSpell", helpItems); AppendHelpItem("decrease_list_width", "DecListW", helpItems); AppendHelpItem("increase_list_width", "IncListW", helpItems); diff --git a/src/uikeyconfig.cpp b/src/uikeyconfig.cpp index 8587c7b3..bd6fdc77 100644 --- a/src/uikeyconfig.cpp +++ b/src/uikeyconfig.cpp @@ -1,6 +1,6 @@ // uikeyconfig.cpp // -// Copyright (c) 2019-2024 Kristofer Berggren +// Copyright (c) 2019-2025 Kristofer Berggren // All rights reserved. // // nchat is distributed under the MIT license, see LICENSE for details. @@ -244,9 +244,9 @@ void UiKeyConfig::Init(bool p_MapKeys) { "save", "KEY_CTRLR" }, { "transfer", "KEY_CTRLT" }, { "select_emoji", "KEY_CTRLS" }, - { "select_contact", "KEY_CTRLN" }, + { "select_contact", "\\33\\156" }, // alt/opt-n { "forward_msg", "\\33\\162" }, // alt/opt-r - { "goto_chat", "\\33\\156" }, // alt/opt-n + { "goto_chat", "KEY_CTRLN" }, { "other_commands_help", "KEY_CTRLO" }, { "decrease_list_width", "\\33\\54" }, // alt/opt-, { "increase_list_width", "\\33\\56" }, // alt/opt-.