From 706aa039dc209392177ab4e4184e3dae4d886650 Mon Sep 17 00:00:00 2001
From: "Natalia.Ukhorskaya" <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 17 Sep 2013 15:36:47 +0400
Subject: [PATCH] Align modules in Configure Kotlin dialog

---
 .../framework/ui/ChooseModulePanel.form       | 30 +++++++++++++------
 .../framework/ui/ChooseModulePanel.java       |  7 +++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form b/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form
index b55d7b4e9b5..0c8eb51c943 100644
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form
+++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form
@@ -8,20 +8,12 @@
     <properties/>
     <border type="none"/>
     <children>
-      <component id="6717d" class="javax.swing.JRadioButton" binding="allModulesWithKtRadioButton" default-binding="true">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="All modules containing Kotlin files: "/>
-        </properties>
-      </component>
       <component id="e348f" class="javax.swing.JRadioButton" binding="singleModuleRadioButton" default-binding="true">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Single module"/>
+          <text value="Single module:"/>
         </properties>
       </component>
       <component id="8acf5" class="javax.swing.JComboBox" binding="singleModuleComboBox">
@@ -43,6 +35,26 @@
           <grid row="3" column="0" row-span="1" col-span="3" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
+      <component id="5ca07" class="javax.swing.JTextField" binding="allModulesNames">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+            <maximum-size width="-1" height="100"/>
+          </grid>
+        </constraints>
+        <properties>
+          <editable value="false"/>
+          <enabled value="true"/>
+        </properties>
+      </component>
+      <component id="6717d" class="javax.swing.JRadioButton" binding="allModulesWithKtRadioButton" default-binding="true">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="All modules containing Kotlin files: "/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java b/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java
index f19628605ac..c3b50f6651b 100644
--- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java
+++ b/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java
@@ -24,6 +24,7 @@ import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collections;
@@ -35,6 +36,7 @@ public class ChooseModulePanel {
     private JRadioButton singleModuleRadioButton;
     private JComboBox singleModuleComboBox;
     private JSeparator separator;
+    private JTextField allModulesNames;
 
     @NotNull private final Project project;
     @NotNull private final List<Module> modules;
@@ -62,14 +64,15 @@ public class ChooseModulePanel {
                 updateComponents();
             }
         });
+
         String fullList = StringUtil.join(modules, new Function<Module, String>() {
             @Override
             public String fun(Module module) {
                 return module.getName();
             }
         }, ", ");
-
-        allModulesWithKtRadioButton.setText(allModulesWithKtRadioButton.getText() + StringUtil.shortenTextWithEllipsis(fullList, 80, 0));
+        allModulesNames.setText(fullList);
+        allModulesNames.setBorder(null);
 
         ButtonGroup modulesGroup = new ButtonGroup();
         modulesGroup.add(allModulesWithKtRadioButton);