revert b5d80cd - add back message cancel help and re-order dialog hel…

…p keys
d99kris · Dec 23, 2023 · f4e3f37 · f4e3f37
1 parent 3bbb4ad
commit f4e3f37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "4.15"
+#define NCHAT_VERSION "4.16"
diff --git 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" "December 2023" "nchat v4.15" "User Commands"
+.TH NCHAT "1" "December 2023" "nchat v4.16" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS

diff --git a/src/uihelpview.cpp b/src/uihelpview.cpp
@@ -34,8 +34,8 @@ void UiHelpView::Draw()
   static std::vector<std::wstring> listDialogHelpItems = []()
   {
     std::vector<std::wstring> helpItems;
-    AppendHelpItem(UiKeyConfig::GetKey("cancel"), "Cancel", helpItems);
     AppendHelpItem(UiKeyConfig::GetKey("return"), "Select", helpItems);
+    AppendHelpItem(UiKeyConfig::GetKey("cancel"), "Cancel", helpItems);
     AppendHelpItem('a', "AddFiltr", helpItems);
     AppendHelpItem(UiKeyConfig::GetKey("backspace"), "DelFiltr", helpItems);
     return helpItems;
@@ -45,14 +45,15 @@ void UiHelpView::Draw()
   {
     std::vector<std::wstring> helpItems;
     AppendHelpItem(UiKeyConfig::GetKey("return"), "OK", helpItems);
+    AppendHelpItem(UiKeyConfig::GetKey("cancel"), "Cancel", helpItems);
     return helpItems;
   }();
 
   static std::vector<std::wstring> editMessageHelpItems = []()
   {
     std::vector<std::wstring> helpItems;
-    AppendHelpItem(UiKeyConfig::GetKey("cancel"), "Cancel", helpItems);
     AppendHelpItem(UiKeyConfig::GetKey("send_msg"), "Save", helpItems);
+    AppendHelpItem(UiKeyConfig::GetKey("cancel"), "Cancel", helpItems);
     return helpItems;
   }();