瀏覽代碼

Using only extension/custom command name without any qualifiers in some contexts

Source commit: 9e77791f0402425f65b5b593223d572649434733
Martin Prikryl 6 年之前
父節點
當前提交
557b9607ed
共有 4 個文件被更改,包括 3 次插入8 次删除
  1. 1 1
      source/forms/Custom.cpp
  2. 2 3
      source/forms/NonVisual.cpp
  3. 0 2
      source/resource/TextsWin.h
  4. 0 2
      source/resource/TextsWin1.rc

+ 1 - 1
source/forms/Custom.cpp

@@ -918,7 +918,7 @@ __fastcall TCustomCommandOptionsDialog::TCustomCommandOptionsDialog(
   FFlags = Flags;
   FCustomCommandOptions = CustomCommandOptions;
   FSite = Site;
-  Caption = FMTLOAD(EXTENSION_OPTIONS_CAPTION, (StripEllipsis(StripHotkey(FCommand->Name))));
+  Caption = StripEllipsis(StripHotkey(FCommand->Name));
   Width = ScaleByTextHeight(this, 400);
 
   bool HasGroups = false;

+ 2 - 3
source/forms/NonVisual.cpp

@@ -1002,10 +1002,9 @@ UnicodeString __fastcall TNonVisualDataModule::CustomCommandCaption(const TCusto
 UnicodeString __fastcall TNonVisualDataModule::CustomCommandHint(const TCustomCommandType * Command)
 {
   UnicodeString Name = StripHotkey(Command->Name);
-  UnicodeString ShortHint = FMTLOAD(CUSTOM_COMMAND_HINT, (Name));
   UnicodeString LongHint =
     !Command->Description.IsEmpty() ? Command->Description : FMTLOAD(CUSTOM_COMMAND_HINT_LONG, (Name, Command->Command));
-  UnicodeString Result = FORMAT(L"%s|%s", (ShortHint, LongHint));
+  UnicodeString Result = FORMAT(L"%s|%s", (Name, LongHint));
   return Result;
 }
 //---------------------------------------------------------------------------
@@ -1648,7 +1647,7 @@ void __fastcall TNonVisualDataModule::CustomCommandsLastUpdate(TAction * Action)
       TitleCommand = TitleCommand.SubString(1, MaxTitleCommandLen - 3) + Ellipsis;
     }
     Action->Caption = FMTLOAD(CUSTOM_COMMAND_LAST, (EscapeHotkey(TitleCommand)));
-    Action->Hint = FMTLOAD(CUSTOM_COMMAND_HINT, (Command.Command));
+    Action->Hint = Command.Command;
     Action->Enabled = (State > 0);
   }
 }

+ 0 - 2
source/resource/TextsWin.h

@@ -349,7 +349,6 @@
 #define SAVE_SESSION_PROMPT     1683
 #define SAVE_SESSION_PASSWORD   1684
 #define PROGRESS_CUSTOM_COMAND  1686
-#define CUSTOM_COMMAND_HINT     1687
 #define EDITOR_FONT_FMT         1694
 #define PROPERTIES_UNKNOWN_SIZE 1695
 #define PROGRESS_CALCULATE_SIZE 1696
@@ -584,7 +583,6 @@
 #define CHECK_FOR_UPDATES_TITLE 1972
 #define ADD_EXTENSION_CAPTION   1973
 #define ADD_EXTENSION_PROMPT    1974
-#define EXTENSION_OPTIONS_CAPTION 1976
 #define EXTENSION_OPTIONS_BROWSE 1977
 #define EXTENSION_OPTIONS_BROWSE_TITLE 1978
 #define EXTENSION_PAUSE_CHECKBOX 1979

+ 0 - 2
source/resource/TextsWin1.rc

@@ -354,7 +354,6 @@ BEGIN
         SAVE_SESSION_PROMPT, "&Site name:"
         SAVE_SESSION_PASSWORD, "Save &password (not recommended)"
         PROGRESS_CUSTOM_COMAND, "Executing custom command"
-        CUSTOM_COMMAND_HINT, "Execute custom command '%s'"
         EDITOR_FONT_FMT, "%s, %d pt\nThe Quick Brown Fox Jumps Over The Lazy Dog"
         PROPERTIES_UNKNOWN_SIZE, "Unknown"
         PROGRESS_CALCULATE_SIZE, "Calculating directory size"
@@ -589,7 +588,6 @@ BEGIN
         CHECK_FOR_UPDATES_TITLE, "Check for Updates"
         ADD_EXTENSION_CAPTION, "Add Extension"
         ADD_EXTENSION_PROMPT, "Enter URL or path to the &extension:"
-        EXTENSION_OPTIONS_CAPTION, "Options for extension '%s'"
         EXTENSION_OPTIONS_BROWSE, "Browse..."
         EXTENSION_OPTIONS_BROWSE_TITLE, "Select '%s'"
         EXTENSION_PAUSE_CHECKBOX, "&Pause at the end"