From 21cbc8d6f807d8e85375765d4f3de2afcb073d58 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 30 Dec 2014 17:23:00 +0300 Subject: [PATCH] [git] disable "protected branches" panel if force push is disabled --- plugins/git4idea/src/git4idea/config/GitVcsPanel.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java index 781908000e7a..eab386ebc604 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java @@ -30,6 +30,7 @@ import com.intellij.ui.components.JBCheckBox; import com.intellij.ui.components.JBLabel; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.execution.ParametersListUtil; +import com.intellij.util.ui.UIUtil; import git4idea.GitVcs; import git4idea.i18n.GitBundle; import git4idea.repo.GitRepositoryManager; @@ -38,6 +39,8 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.util.List; /** @@ -84,6 +87,13 @@ public class GitVcsPanel { mySyncControl.setVisible(repositoryManager != null && repositoryManager.moreThanOneRoot()); mySyncControl.setToolTipText(DvcsBundle.message("sync.setting.description", "Git")); myProtectedBranchesLabel.setLabelFor(myProtectedBranchesButton); + myEnableForcePush.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + UIUtil.setEnabled(myProtectedBranchesButton, myEnableForcePush.isSelected(), true); + UIUtil.setEnabled(myProtectedBranchesLabel, myEnableForcePush.isSelected(), false); + } + }); } /**