Skip to content

Commit 5fb78cf

Browse files
SummerEskibear
Summer
authored and
Eskibear
committed
Slot UI update: always show but disable the slot panel (#2195)
* Slot UI update: always show but diable the slot panel * Make pnlSlot inside pnlExist and better naming
1 parent e5e66a0 commit 5fb78cf

File tree

2 files changed

+115
-135
lines changed

2 files changed

+115
-135
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/runner/webapp/webappconfig/ui/WebAppSettingPanel.form‎

Lines changed: 85 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.microsoft.intellij.runner.webapp.webappconfig.ui.WebAppSettingPanel">
3-
<grid id="27dc6" binding="pnlRoot" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
3+
<grid id="27dc6" binding="pnlRoot" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="0" left="0" bottom="0" right="0"/>
55
<constraints>
66
<xy x="20" y="20" width="626" height="1016"/>
@@ -40,7 +40,7 @@
4040
</component>
4141
</children>
4242
</grid>
43-
<grid id="42cc5" binding="pnlExist" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
43+
<grid id="42cc5" binding="pnlExist" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
4444
<margin top="0" left="0" bottom="0" right="0"/>
4545
<constraints>
4646
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -81,12 +81,90 @@
8181
</component>
8282
</children>
8383
</grid>
84+
<component id="6d576" class="javax.swing.JCheckBox" binding="cbDeployToSlot" default-binding="true">
85+
<constraints>
86+
<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"/>
87+
</constraints>
88+
<properties>
89+
<alignmentX value="0.5"/>
90+
<enabled value="false"/>
91+
<iconTextGap value="4"/>
92+
<inheritsPopupMenu value="true"/>
93+
<margin top="2" left="2" bottom="2" right="2"/>
94+
<text value="Deploy To Slot"/>
95+
</properties>
96+
</component>
97+
<grid id="bd6e" binding="pnlSlot" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
98+
<margin top="0" left="0" bottom="0" right="0"/>
99+
<constraints>
100+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
101+
</constraints>
102+
<properties>
103+
<enabled value="true"/>
104+
</properties>
105+
<border type="none" title="Deployment Slot">
106+
<font/>
107+
</border>
108+
<children>
109+
<component id="63f74" class="javax.swing.JTextField" binding="txtNewSlotName">
110+
<constraints>
111+
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
112+
<preferred-size width="150" height="-1"/>
113+
</grid>
114+
</constraints>
115+
<properties>
116+
<enabled value="false"/>
117+
</properties>
118+
</component>
119+
<component id="a5887" class="javax.swing.JComboBox" binding="cbSlotConfigurationSource">
120+
<constraints>
121+
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
122+
</constraints>
123+
<properties>
124+
<enabled value="false"/>
125+
</properties>
126+
</component>
127+
<component id="32459" class="javax.swing.JLabel">
128+
<constraints>
129+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
130+
</constraints>
131+
<properties>
132+
<text value="New Slot Configuration Source"/>
133+
</properties>
134+
</component>
135+
<component id="99ea9" class="javax.swing.JLabel">
136+
<constraints>
137+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
138+
</constraints>
139+
<properties>
140+
<text value="New SLot Name"/>
141+
</properties>
142+
</component>
143+
<component id="27c60" class="javax.swing.JComboBox" binding="cbDeploymentSlots">
144+
<constraints>
145+
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="4" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
146+
</constraints>
147+
<properties>
148+
<enabled value="false"/>
149+
<visible value="true"/>
150+
</properties>
151+
</component>
152+
<component id="af0bc" class="javax.swing.JLabel">
153+
<constraints>
154+
<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"/>
155+
</constraints>
156+
<properties>
157+
<text value="Existing Slot Name"/>
158+
</properties>
159+
</component>
160+
</children>
161+
</grid>
84162
</children>
85163
</grid>
86164
<grid id="a855" binding="pnlCreate" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
87165
<margin top="0" left="0" bottom="0" right="0"/>
88166
<constraints>
89-
<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"/>
167+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
90168
</constraints>
91169
<properties/>
92170
<border type="none"/>
@@ -395,7 +473,7 @@
395473
<grid id="1bc4d" binding="pnlArtifact" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
396474
<margin top="0" left="0" bottom="0" right="0"/>
397475
<constraints>
398-
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
476+
<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"/>
399477
</constraints>
400478
<properties/>
401479
<border type="none"/>
@@ -421,7 +499,7 @@
421499
</grid>
422500
<component id="731cc" class="javax.swing.JCheckBox" binding="chkToRoot">
423501
<constraints>
424-
<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"/>
502+
<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"/>
425503
</constraints>
426504
<properties>
427505
<selected value="true"/>
@@ -430,14 +508,14 @@
430508
</component>
431509
<component id="80481" class="com.intellij.ui.HyperlinkLabel" binding="lblJarDeployHint">
432510
<constraints>
433-
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
511+
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
434512
</constraints>
435513
<properties/>
436514
</component>
437515
<grid id="4987c" binding="pnlMavenProject" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
438516
<margin top="0" left="0" bottom="0" right="0"/>
439517
<constraints>
440-
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
518+
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
441519
</constraints>
442520
<properties>
443521
<visible value="true"/>
@@ -463,100 +541,6 @@
463541
</component>
464542
</children>
465543
</grid>
466-
<grid id="2cf71" binding="pnlDeploySlot" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
467-
<margin top="0" left="0" bottom="0" right="0"/>
468-
<constraints>
469-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
470-
</constraints>
471-
<properties/>
472-
<border type="none"/>
473-
<children>
474-
<component id="27c60" class="javax.swing.JComboBox" binding="cbDeploymentSlots">
475-
<constraints>
476-
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="4" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
477-
</constraints>
478-
<properties>
479-
<enabled value="true"/>
480-
<visible value="false"/>
481-
</properties>
482-
</component>
483-
<grid id="bd6e" binding="newSlotPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
484-
<margin top="0" left="0" bottom="0" right="0"/>
485-
<constraints>
486-
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
487-
</constraints>
488-
<properties/>
489-
<border type="none"/>
490-
<children>
491-
<component id="63f74" class="javax.swing.JTextField" binding="txtNewSlotName">
492-
<constraints>
493-
<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">
494-
<preferred-size width="150" height="-1"/>
495-
</grid>
496-
</constraints>
497-
<properties/>
498-
</component>
499-
<component id="a5887" class="javax.swing.JComboBox" binding="slotConfigurationSourceComboBox">
500-
<constraints>
501-
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
502-
</constraints>
503-
<properties/>
504-
</component>
505-
<component id="32459" class="javax.swing.JLabel">
506-
<constraints>
507-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
508-
</constraints>
509-
<properties>
510-
<text value="Configuration Source"/>
511-
</properties>
512-
</component>
513-
<component id="99ea9" class="javax.swing.JLabel">
514-
<constraints>
515-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
516-
</constraints>
517-
<properties>
518-
<text value="Name"/>
519-
</properties>
520-
</component>
521-
</children>
522-
</grid>
523-
<component id="6d576" class="javax.swing.JCheckBox" binding="deployToSlotCheckBox" default-binding="true">
524-
<constraints>
525-
<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"/>
526-
</constraints>
527-
<properties>
528-
<enabled value="false"/>
529-
<text value="Deploy To Slot"/>
530-
</properties>
531-
</component>
532-
<grid id="822e8" binding="loadingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
533-
<margin top="0" left="0" bottom="0" right="0"/>
534-
<constraints>
535-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
536-
</constraints>
537-
<properties>
538-
<visible value="false"/>
539-
</properties>
540-
<border type="none"/>
541-
<children>
542-
<component id="4bbe2" class="javax.swing.JLabel" binding="loadingLabel">
543-
<constraints>
544-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
545-
</constraints>
546-
<properties>
547-
<text value="Loading ..."/>
548-
<visible value="true"/>
549-
</properties>
550-
</component>
551-
<hspacer id="c1d92">
552-
<constraints>
553-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
554-
</constraints>
555-
</hspacer>
556-
</children>
557-
</grid>
558-
</children>
559-
</grid>
560544
</children>
561545
</grid>
562546
<buttonGroups>

0 commit comments

Comments
 (0)