From 6a696ee8d028c0086ea616c6b1bc7a30041c5752 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 20 Feb 2014 11:22:01 +0400 Subject: [PATCH] create project from template: radio button replaced with checkbox --- .../ide/projectWizard/ChooseTemplateStep.form | 25 ++++++------------- .../ide/projectWizard/ChooseTemplateStep.java | 24 ++++++++---------- .../projectWizard/ProjectTemplateList.java | 4 +++ 3 files changed, 22 insertions(+), 31 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.form b/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.form index 10c9cc5bb1c6..c171b88f03c0 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.form +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.form @@ -1,6 +1,6 @@
- + @@ -8,33 +8,24 @@ - - - - - - - - - - + - + + + + + + - - - - - diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java index db2b79e604cf..8532bfdd9c26 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ChooseTemplateStep.java @@ -18,7 +18,7 @@ package com.intellij.ide.projectWizard; import com.intellij.ide.util.projectWizard.ModuleWizardStep; import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.platform.ProjectTemplate; -import com.intellij.ui.components.JBRadioButton; +import com.intellij.ui.components.JBCheckBox; import javax.swing.*; import java.awt.event.ActionEvent; @@ -34,26 +34,22 @@ public class ChooseTemplateStep extends ModuleWizardStep { private final ProjectTypeStep myProjectTypeStep; private JPanel myPanel; - private JBRadioButton myEmptyProjectButton; - private JBRadioButton myFromTemplateButton; private ProjectTemplateList myTemplateList; + private JBCheckBox myCreateFromTemplateCheckBox; public ChooseTemplateStep(WizardContext wizardContext, ProjectTypeStep projectTypeStep) { myWizardContext = wizardContext; myProjectTypeStep = projectTypeStep; - ActionListener listener = new ActionListener() { + myCreateFromTemplateCheckBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - updateSelection(); + myTemplateList.setEnabled(myCreateFromTemplateCheckBox.isSelected()); + if (myCreateFromTemplateCheckBox.isSelected()) { + myTemplateList.getList().requestFocus(); + } } - }; - myEmptyProjectButton.addActionListener(listener); - myFromTemplateButton.addActionListener(listener); - updateSelection(); - } - - private void updateSelection() { - myTemplateList.setEnabled(myFromTemplateButton.isSelected()); + }); + myTemplateList.setEnabled(false); } @Override @@ -73,7 +69,7 @@ public class ChooseTemplateStep extends ModuleWizardStep { @Override public void updateDataModel() { - if (myFromTemplateButton.isSelected()) { + if (myCreateFromTemplateCheckBox.isSelected()) { myWizardContext.setProjectTemplate(myTemplateList.getSelectedTemplate()); } } diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java index 51e429447104..91620549cb7a 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java @@ -177,6 +177,10 @@ public class ProjectTemplateList extends JPanel { }); } + public JBList getList() { + return myList; + } + public void addListSelectionListener(ListSelectionListener listener) { myList.addListSelectionListener(listener); }