Improve project/environment/git branch selection design #5879

- add bottom toolbar to HopGui
- add a way to rename git branch
- add icon to the project and environment dialog
- avoid selecting an environment linked to another project

Author: nadment

plugins/misc/git/src/main/java/org/apache/hop/git/GitGuiPlugin.java

@@ -837,6 +837,17 @@ public boolean createBranch(String value) {
     }
   }
 
+  public boolean renameBranch(String oldName, String newName) {
+    try {
+      git.branchRename().setOldName(oldName).setNewName(newName).call();
+      checkoutBranch(getExpandedName(newName, VCS.TYPE_BRANCH));
+      return true;
+    } catch (Exception e) {
+      showMessageBox(BaseMessages.getString(PKG, CONST_DIALOG_ERROR), e.getMessage());
+      return false;
+    }
+  }
+
   public boolean deleteBranch(String name, boolean force) {
     try {
       git.branchDelete()

plugins/misc/git/src/main/java/org/apache/hop/git/model/UIGit.java

@@ -23,19 +23,18 @@ GitGuiPlugin.Dialog.AddError.Message=There was an error doing a git add
 GitGuiPlugin.Dialog.Branch.BranchName=Branch: {0}
 GitGuiPlugin.Dialog.Branch.CreateBranch.Header=Create a Branch
 GitGuiPlugin.Dialog.Branch.CreateBranch.Message=Branch name
-GitGuiPlugin.Dialog.Branch.CreateBranch=Create Branch
 GitGuiPlugin.Dialog.Branch.CreateBranchSuccessFul.Header=Branch Created
 GitGuiPlugin.Dialog.Branch.CreateBranchSuccessFul.Message=Branch created Successfully
-GitGuiPlugin.Dialog.Branch.DeleteBranch.Header=Create a Branch
-GitGuiPlugin.Dialog.Branch.DeleteBranch.Message=Branch name
-GitGuiPlugin.Dialog.Branch.DeleteBranch=Delete Branch
+GitGuiPlugin.Dialog.Branch.DeleteBranch.Header=Delete a Branch
+GitGuiPlugin.Dialog.Branch.DeleteBranch.Message=Select the branch you want to delete
 GitGuiPlugin.Dialog.Branch.DeleteBranchSuccessFul.Header=Branch Deleted
 GitGuiPlugin.Dialog.Branch.DeleteBranchSuccessFul.Message=Branch deleted Successfully
 GitGuiPlugin.Dialog.Branch.MergeBranch.Header=Merge Branch
 GitGuiPlugin.Dialog.Branch.MergeBranch.Message=Select the branch you want to merge
-GitGuiPlugin.Dialog.Branch.MergeBranch=Merge Branch
 GitGuiPlugin.Dialog.Branch.MergeBranchSuccessFul.Header=Merge successful
 GitGuiPlugin.Dialog.Branch.MergeBranchSuccessFul.Message=Successful merge
+GitGuiPlugin.Dialog.Branch.RenameBranch.Header=Rename a Branch
+GitGuiPlugin.Dialog.Branch.RenameBranch.Message=New branch name
 GitGuiPlugin.Dialog.CommitError.Header=Commit Error
 GitGuiPlugin.Dialog.CommitError.Message=There was an error doing a git commit
 GitGuiPlugin.Dialog.FilesReverted.Header=Files Reverted
@@ -64,6 +63,12 @@ GitGuiPlugin.Dialog.StageFiles.Header=Select files to commit
 GitGuiPlugin.Dialog.StageFiles.Message=Please select the files to commit. They'll be staged (add) for the commit to git
 GitGuiPlugin.Info.Label=Git Info: {0}
 GitGuiPlugin.Menu.Add.Text=Git Add
+GitGuiPlugin.Menu.Branch.Create.Text=Create Branch...
+GitGuiPlugin.Menu.Branch.Delete.Text=Delete Branch...
+GitGuiPlugin.Menu.Branch.Merge.Text=Merge Branch...
+GitGuiPlugin.Menu.Branch.Pull.Text=Pull...
+GitGuiPlugin.Menu.Branch.Push.Text=Push...
+GitGuiPlugin.Menu.Branch.Rename.Text=Rename Branch...
 GitGuiPlugin.Menu.Commit.Text=Git Commit
 GitGuiPlugin.Menu.Info.Text=Git Info
 GitGuiPlugin.Menu.Revert.Text=Git Revert