Removing trailing numbers from command names when preserving toolbar buttons setup for forward compatibility, when commands are renamed (typically only to tweak a command hint)

Source commit: eadb403aeee62e6a338188e5e1faa25054e667bf

source/core/Common.cpp

@@ -269,12 +269,20 @@ UnicodeString CopyToChar(const UnicodeString & Str, wchar_t Ch, bool Trim)
   return CopyToChars(Str, From, UnicodeString(Ch), Trim);
 }
 //---------------------------------------------------------------------------
-UnicodeString RemoveSuffix(const UnicodeString & Str, const UnicodeString & Suffix)
+UnicodeString RemoveSuffix(const UnicodeString & Str, const UnicodeString & Suffix, bool RemoveNumbersAfterSuffix)
 {
   UnicodeString Result = Str;
-  if (EndsStr(Suffix, Result))
+  UnicodeString Buf = Str;
+  if (RemoveNumbersAfterSuffix)
   {
-    Result.SetLength(Result.Length() - Suffix.Length());
+    while (!Buf.IsEmpty() && IsDigit(Buf[Buf.Length()]))
+    {
+      Buf.SetLength(Buf.Length() - 1);
+    }
+  }
+  if (EndsStr(Suffix, Buf))
+  {
+    Result.SetLength(Buf.Length() - Suffix.Length());
   }
   return Result;
 }

source/core/Common.h

@@ -54,7 +54,7 @@ UnicodeString CutToChar(UnicodeString &Str, wchar_t Ch, bool Trim);
 UnicodeString CopyToChars(const UnicodeString & Str, int & From, UnicodeString Chs, bool Trim,
   wchar_t * Delimiter = NULL, bool DoubleDelimiterEscapes = false);
 UnicodeString CopyToChar(const UnicodeString & Str, wchar_t Ch, bool Trim);
-UnicodeString RemoveSuffix(const UnicodeString & Str, const UnicodeString & Suffix);
+UnicodeString RemoveSuffix(const UnicodeString & Str, const UnicodeString & Suffix, bool RemoveNumbersAfterSuffix = false);
 UnicodeString DelimitStr(UnicodeString Str, UnicodeString Chars);
 UnicodeString ShellDelimitStr(UnicodeString Str, wchar_t Quote);
 UnicodeString ExceptionLogString(Exception *E);

source/forms/CustomScpExplorer.cpp

@@ -1383,13 +1383,13 @@ UnicodeString __fastcall TCustomScpExplorerForm::GetToolbarItemName(TTBCustomIte
   if (Item->Action != NULL)
   {
     Result = Item->Action->Name;
-    Result = RemoveSuffix(Result, L"Action");
+    Result = RemoveSuffix(Result, L"Action", true);
   }
   else
   {
     Result = Item->Name;
-    Result = RemoveSuffix(Result, L"SubmenuItem");
-    Result = RemoveSuffix(Result, L"Item");
+    Result = RemoveSuffix(Result, L"SubmenuItem", true);
+    Result = RemoveSuffix(Result, L"Item", true);
   }
   return Result;
 }