diff --git a/GitCommands/Settings/AppSettings.cs b/GitCommands/Settings/AppSettings.cs index eac0398e09f..7031548d70f 100644 --- 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); } /// Gets or sets the path to the git application executable. diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs index c44bb714d70..79b402dfa04 100644 --- 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 index f3ce3c56764..376789b6ce6 100644 --- a/GitUI/Translation/English.xlf +++ b/GitUI/Translation/English.xlf @@ -8867,6 +8867,10 @@ See the changes in the commit form. Show build status text + + Show commit message body + + Show date column @@ -8899,10 +8903,6 @@ See the changes in the commit form. Show tags - - Show multi-line commit messages - - diff --git a/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs b/GitUI/UserControls/RevisionGrid/Columns/MessageColumnProvider.cs index 88bb5d75e49..14b8d9b9123 100644 --- 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 index 47d0804e11a..3384f8b99b9 100644 --- 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 index d1551721d6b..d69e5931aad 100644 --- a/GitUI/UserControls/RevisionGrid/RevisionGridMenuCommands.cs +++ b/GitUI/UserControls/RevisionGrid/RevisionGridMenuCommands.cs @@ -356,10 +356,10 @@ private IReadOnlyList 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(),