From 9faa03642a503db52cadb19ac0a39826ebf0db07 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Thu, 27 Jun 2013 16:54:37 +0400
Subject: [PATCH] Hg NewBookmark dialog changed without using ui designer form.

---
 .../org/zmlx/hg4idea/ui/HgBookmarkDialog.form | 54 -------------------
 .../org/zmlx/hg4idea/ui/HgBookmarkDialog.java | 38 +++++++++++--
 2 files changed, 34 insertions(+), 58 deletions(-)
 delete mode 100644 plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form
deleted file mode 100644
index 158977c74d68..000000000000
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.form
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.zmlx.hg4idea.ui.HgBookmarkDialog">
-  <grid id="27dc6" binding="myContentPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="0" left="0" bottom="0" right="0"/>
-    <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <vspacer id="29d26">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </vspacer>
-      <grid id="2f1ad" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="697c2" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="  Bookmark name:"/>
-            </properties>
-          </component>
-          <component id="f1186" class="javax.swing.JTextField" binding="myBookmarkName">
-            <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"/>
-              </grid>
-            </constraints>
-            <properties/>
-          </component>
-          <component id="70819" class="javax.swing.JCheckBox" binding="myActiveCheckbox">
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <horizontalAlignment value="10"/>
-              <horizontalTextPosition value="11"/>
-              <text value="Inactive"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-    </children>
-  </grid>
-</form>
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java
index 2340d875ee7d..0e64f6cd9168 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgBookmarkDialog.java
@@ -4,22 +4,31 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.components.JBCheckBox;
+import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.components.JBTextField;
+import com.intellij.util.ui.GridBag;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.awt.*;
+
+import static com.intellij.util.ui.UIUtil.DEFAULT_HGAP;
+import static com.intellij.util.ui.UIUtil.DEFAULT_VGAP;
 
 /**
  * @author Nadya Zabrodina
  */
 public class HgBookmarkDialog extends DialogWrapper {
-  @NotNull private JPanel myContentPanel;
-  @NotNull private JTextField myBookmarkName;
-  @NotNull private JCheckBox myActiveCheckbox;
+  @NotNull private JBTextField myBookmarkName;
+  @NotNull private JBCheckBox myActiveCheckbox;
 
   public HgBookmarkDialog(@Nullable Project project) {
     super(project, false);
     setTitle("Create Bookmark");
+    setResizable(false);
     init();
   }
 
@@ -41,9 +50,30 @@ public class HgBookmarkDialog extends DialogWrapper {
     return HgBookmarkDialog.class.getName();
   }
 
+  @Override
   @NotNull
   protected JComponent createCenterPanel() {
-    return myContentPanel;
+
+    JPanel contentPanel = new JPanel(new GridBagLayout());
+    GridBag g = new GridBag()
+      .setDefaultInsets(new Insets(0, 0, DEFAULT_VGAP, DEFAULT_HGAP))
+      .setDefaultAnchor(GridBagConstraints.LINE_START)
+      .setDefaultFill(GridBagConstraints.HORIZONTAL);
+
+    JLabel icon = new JLabel(UIUtil.getQuestionIcon(), SwingConstants.LEFT);
+    myBookmarkName = new JBTextField(13);
+
+
+    JBLabel bookmarkLabel = new JBLabel("Bookmark name:");
+    bookmarkLabel.setLabelFor(myBookmarkName);
+
+    myActiveCheckbox = new JBCheckBox("Inactive", false);
+
+    contentPanel.add(icon, g.nextLine().next().coverColumn(3).pady(DEFAULT_HGAP));
+    contentPanel.add(bookmarkLabel, g.next().fillCellNone().insets(new Insets(0, 6, DEFAULT_VGAP, DEFAULT_HGAP)));
+    contentPanel.add(myBookmarkName, g.next().coverLine().setDefaultWeightX(1));
+    contentPanel.add(myActiveCheckbox, g.nextLine().next().next().coverLine(2));
+    return contentPanel;
   }
 
   public boolean isActive() {