From 3cb130dfe4fc51f41b81c50b113b2921bfcd6b10 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Mon, 28 Oct 2019 16:33:09 +0300
Subject: [PATCH] IDEA-178054: update after designer's review (IDEA-CR-54237)

GitOrigin-RevId: 6a9188f65e9a011fbc1b492c5748b8bb3119502c
---
 .../com/intellij/ide/ui/AppearancePanel.form  | 57 +++++++------------
 .../src/messages/IdeBundle.properties         |  2 +-
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form b/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form
index d16dd175f666..8c4963301d0c 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form
+++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form
@@ -3,7 +3,7 @@
   <grid id="41bd3" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="81" y="44" width="833" height="961"/>
+      <xy x="81" y="44" width="833" height="986"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -16,7 +16,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="d992b" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="d992b" layout-manager="GridLayoutManager" row-count="9" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
@@ -29,7 +29,7 @@
             <children>
               <component id="33d7c" class="javax.swing.JCheckBox" binding="myMoveMouseOnDefaultButtonCheckBox">
                 <constraints>
-                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="5" 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>
                   <margin top="2" left="0" bottom="2" right="2"/>
@@ -55,41 +55,26 @@
                   <text resource-bundle="messages/IdeBundle" key="checkbox.show.icons.in.quick.navigation"/>
                 </properties>
               </component>
-              <grid id="956b1" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                <margin top="0" left="0" bottom="0" right="0"/>
+              <component id="4017c" class="javax.swing.JCheckBox" binding="myShowTreeIndentGuides">
                 <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                  <grid row="3" 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/>
-                <border type="none"/>
-                <children>
-                  <component id="4017c" class="javax.swing.JCheckBox" binding="myShowTreeIndentGuides">
-                    <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>
-                      <margin top="2" left="0" bottom="2" right="2"/>
-                      <text resource-bundle="messages/IdeBundle" key="checkbox.show.tree.indent.guides"/>
-                    </properties>
-                  </component>
-                  <component id="91831" class="javax.swing.JCheckBox" binding="myCompactTreeIndents" default-binding="true">
-                    <constraints>
-                      <grid row="0" column="1" 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 resource-bundle="messages/IdeBundle" key="checkbox.compact.tree.indents"/>
-                    </properties>
-                  </component>
-                  <hspacer id="b2d5">
-                    <constraints>
-                      <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                    </constraints>
-                  </hspacer>
-                </children>
-              </grid>
+                <properties>
+                  <margin top="2" left="0" bottom="2" right="2"/>
+                  <text resource-bundle="messages/IdeBundle" key="checkbox.show.tree.indent.guides"/>
+                </properties>
+              </component>
+              <component id="91831" class="javax.swing.JCheckBox" binding="myCompactTreeIndents" default-binding="true">
+                <constraints>
+                  <grid row="4" 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 resource-bundle="messages/IdeBundle" key="checkbox.compact.tree.indents"/>
+                </properties>
+              </component>
               <component id="9327f" class="javax.swing.JCheckBox" binding="myHideNavigationPopupsCheckBox">
                 <constraints>
-                  <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="6" 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>
                   <margin top="2" left="0" bottom="2" right="2"/>
@@ -99,7 +84,7 @@
               <grid id="372a6" layout-manager="GridLayoutManager" row-count="1" 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="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                  <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
                 <border type="none"/>
@@ -125,7 +110,7 @@
               </grid>
               <component id="2124a" class="javax.swing.JCheckBox" binding="myAltDNDCheckBox">
                 <constraints>
-                  <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="7" 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="Drag-n-Drop with ALT pressed only"/>
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 4b2735200599..137c8b8982c5 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -727,7 +727,7 @@ label.transparency.delay.ms=Delay (ms):
 group.ui.options=UI Options
 checkbox.show.icons.in.quick.navigation=Show icons in quick navigation
 checkbox.show.tree.indent.guides=Show tree indent guides
-checkbox.compact.tree.indents=Compact tree indents
+checkbox.compact.tree.indents=Use compact tree indents
 checkbox.override.default.laf.fonts=Use custom font:
 label.override.laf.font=Font:
 label.font.name=Name: