Update naming of menu item and related variables and methods accordin…

…g to feedback
gitextensions · Jun 20, 2021 · 56c86b8 · 56c86b8
1 parent f448590
commit 56c86b8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/GitCommands/Settings/AppSettings.cs b/GitCommands/Settings/AppSettings.cs
@@ -1259,10 +1259,10 @@ public static int RevisionGridQuickSearchTimeout
             set => SetInt("revisiongridquicksearchtimeout", value);
         }
 
-        public static bool ShowMultiLineCommitMessages
+        public static bool ShowCommitBodyInRevisionGrid
         {
-            get => GetBool("showmultilinecommitmessages", true);
-            set => SetBool("showmultilinecommitmessages", value);
+            get => GetBool("showcommitbodyinrevisiongrid", true);
+            set => SetBool("showcommitbodyinrevisiongrid", value);
         }
 
         /// <summary>Gets or sets the path to the git application executable.</summary>

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -849,7 +849,7 @@ private void RefreshSelection()
             FillCommitInfo(selectedRevision);
 
             // If the revision's body has been updated then the grid needs to be refreshed to display it
-            if (AppSettings.ShowMultiLineCommitMessages && selectedRevision is not null && selectedRevision.HasMultiLineMessage && oldBody != selectedRevision.Body)
+            if (AppSettings.ShowCommitBodyInRevisionGrid && selectedRevision is not null && selectedRevision.HasMultiLineMessage && oldBody != selectedRevision.Body)
             {
                 RevisionGrid.Refresh();
             }

diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -8867,6 +8867,10 @@ See the changes in the commit form.</source>
         <source>Show build status text</source>
         <target />
       </trans-unit>
+      <trans-unit id="showCommitMessageBodyToolStripMenuItem.Text">
+        <source>Show commit message body</source>
+        <target />
+      </trans-unit>
       <trans-unit id="showDateColumnToolStripMenuItem.Text">
         <source>Show date column</source>
         <target />
@@ -8899,10 +8903,6 @@ See the changes in the commit form.</source>
         <source>Show tags</source>
         <target />
       </trans-unit>
-      <trans-unit id="showMultiLineCommitMessagesToolStripMenuItem.Text">
-        <source>Show multi-line commit messages</source>
-        <target />
-      </trans-unit>
     </body>
   </file>
   <file datatype="plaintext" original="RevisionGridControl" source-language="en">

diff --git a/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs
@@ -410,7 +410,7 @@ void DrawSuperProjectRef(string label, ref int currentOffset)
                 return;
             }
 
-            if (AppSettings.ShowMultiLineCommitMessages)
+            if (AppSettings.ShowCommitBodyInRevisionGrid)
             {
                 var commitBody = string.Concat(lines.Skip(1).Select(_ => " " + _));
                 var bodyBounds = messageBounds.ReduceLeft(offset);

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -2185,9 +2185,9 @@ internal void ToggleShowMergeCommits()
             ForceRefreshRevisions();
         }
 
-        internal void ToggleShowMultiLineCommit()
+        internal void ShowCommitBodyInRevisionGrid()
         {
-            AppSettings.ShowMultiLineCommitMessages = !AppSettings.ShowMultiLineCommitMessages;
+            AppSettings.ShowCommitBodyInRevisionGrid = !AppSettings.ShowCommitBodyInRevisionGrid;
             MenuCommands.TriggerMenuChanged();
             Refresh();
         }

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridMenuCommands.cs b/GitUI/UserControls/RevisionGrid/RevisionGridMenuCommands.cs
@@ -356,10 +356,10 @@ private IReadOnlyList<MenuCommand> CreateViewMenuCommands()
                 },
                 new MenuCommand
                 {
-                    Name = "showMultiLineCommitMessagesToolStripMenuItem",
-                    Text = "Show multi-line commit messages",
-                    ExecuteAction = () => _revisionGrid.ToggleShowMultiLineCommit(),
-                    IsCheckedFunc = () => AppSettings.ShowMultiLineCommitMessages
+                    Name = "showCommitMessageBodyToolStripMenuItem",
+                    Text = "Show commit message body",
+                    ExecuteAction = () => _revisionGrid.ShowCommitBodyInRevisionGrid(),
+                    IsCheckedFunc = () => AppSettings.ShowCommitBodyInRevisionGrid
                 },
 
                 MenuCommand.CreateSeparator(),