diff --git a/CHANGELOG.md b/CHANGELOG.md index 8df0f618..c38a6e85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ## Bugs fixed - Editor: wrong position indicated in the call tips when starting to type an array literal, a slice or any other expression involving the square brackets. (#51) +- Project Menu, Git: active branch was not updated when after an external checkout. # v3.9.5 diff --git a/src/u_main.lfm b/src/u_main.lfm index 974c02f2..b025e119 100644 --- a/src/u_main.lfm +++ b/src/u_main.lfm @@ -11,7 +11,6 @@ object MainForm: TMainForm OnDropFiles = FormDropFiles OnResize = FormResize ShowHint = True - LCLVersion = '2.0.8.0' object mainMenu: TMainMenu top = 1 object MenuItem1: TMenuItem @@ -260,6 +259,7 @@ object MainForm: TMainForm end object mnuGitBranch: TMenuItem Caption = 'Git branch...' + OnClick = mnuGitBranchClick end object MenuItem116: TMenuItem Action = actProjGitPull diff --git a/src/u_main.pas b/src/u_main.pas index d4889164..f115f913 100644 --- a/src/u_main.pas +++ b/src/u_main.pas @@ -331,6 +331,7 @@ type procedure ApplicationProperties1Activate(Sender: TObject); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormResize(Sender: TObject); + procedure mnuGitBranchClick(Sender: TObject); procedure mnuItemAboutClick(Sender: TObject); procedure mnuItemCheckUpdClick(Sender: TObject); procedure mnuItemManualClick(Sender: TObject); @@ -2118,6 +2119,11 @@ begin snapTopSplitterToMenu; end; +procedure TMainForm.mnuGitBranchClick(Sender: TObject); +begin + actProjGitBranchesUpd.Execute; +end; + procedure TMainForm.mnuItemAboutClick(Sender: TObject); begin fInfoWidg.showWidget;