Skip to content

Commit bb1cd06

Browse files
committed
Refactor plugin settings dialog
1 parent e11d5e9 commit bb1cd06

File tree

2 files changed

+84
-101
lines changed

2 files changed

+84
-101
lines changed

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/SwanLauncherDialog.form renamed to swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/PluginSettingsDialog.form

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.fraunhofer.iem.swan.assist.ui.dialog.SwanLauncherDialog">
3-
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
2+
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.fraunhofer.iem.swan.assist.ui.dialog.PluginSettingsDialog">
3+
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
44
<margin top="10" left="10" bottom="10" right="10"/>
55
<constraints>
66
<xy x="48" y="141" width="537" height="300"/>
@@ -11,7 +11,7 @@
1111
</properties>
1212
<border type="none"/>
1313
<children>
14-
<grid id="e3588" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
14+
<grid id="e3588" layout-manager="GridLayoutManager" row-count="4" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
1515
<margin top="0" left="0" bottom="0" right="0"/>
1616
<constraints>
1717
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -30,56 +30,45 @@
3030
</component>
3131
<component id="2160e" class="javax.swing.JTextField" binding="sourceDirTextbox">
3232
<constraints>
33-
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
33+
<grid row="1" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
3434
<preferred-size width="150" height="-1"/>
3535
</grid>
3636
</constraints>
3737
<properties>
38-
<editable value="false"/>
38+
<editable value="true"/>
3939
<enabled value="true"/>
4040
<toolTipText value="Location of project classes or external jar files"/>
4141
</properties>
4242
</component>
4343
<component id="a713" class="javax.swing.JButton" binding="sourceBtn">
4444
<constraints>
45-
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
45+
<grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
4646
</constraints>
4747
<properties>
48-
<enabled value="false"/>
48+
<enabled value="true"/>
4949
<text value="..."/>
5050
</properties>
5151
</component>
52-
<component id="b736b" class="javax.swing.JCheckBox" binding="sourceCheckBox">
52+
<component id="b3a63" class="javax.swing.JLabel" binding="sourceCheckBox">
5353
<constraints>
5454
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
5555
</constraints>
5656
<properties>
5757
<horizontalAlignment value="2"/>
5858
<horizontalTextPosition value="11"/>
59-
<selected value="true"/>
6059
<text resource-bundle="dialog_messages" key="Launcher.ProjectCheckBox"/>
61-
<toolTipText value="Use current project or select external jars"/>
60+
<toolTipText value="Set path for project jars and output path for SWAN files"/>
6261
</properties>
6362
</component>
6463
<component id="f8ebf" class="javax.swing.JSeparator">
6564
<constraints>
66-
<grid row="0" column="2" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
65+
<grid row="0" column="3" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
6766
</constraints>
6867
<properties/>
6968
</component>
70-
</children>
71-
</grid>
72-
<grid id="1ffb" binding="advancedPanel" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
73-
<margin top="0" left="0" bottom="0" right="0"/>
74-
<constraints>
75-
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
76-
</constraints>
77-
<properties/>
78-
<border type="none"/>
79-
<children>
8069
<component id="9cbe2" class="javax.swing.JLabel">
8170
<constraints>
82-
<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"/>
71+
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
8372
</constraints>
8473
<properties>
8574
<text resource-bundle="dialog_messages" key="Launcher.Output"/>
@@ -88,7 +77,7 @@
8877
</component>
8978
<component id="cabf2" class="javax.swing.JTextField" binding="outputDir">
9079
<constraints>
91-
<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">
80+
<grid row="2" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
9281
<preferred-size width="150" height="-1"/>
9382
</grid>
9483
</constraints>
@@ -97,64 +86,56 @@
9786
<toolTipText value="The location where the new configuration file will be saved"/>
9887
</properties>
9988
</component>
100-
<component id="74ea5" class="javax.swing.JLabel">
101-
<constraints>
102-
<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"/>
103-
</constraints>
104-
<properties>
105-
<text resource-bundle="dialog_messages" key="Launcher.TrainingJars"/>
106-
</properties>
107-
</component>
10889
<component id="28d69" class="javax.swing.JButton" binding="outputBtn">
10990
<constraints>
110-
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
91+
<grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
11192
</constraints>
11293
<properties>
11394
<text resource-bundle="dialog_messages" key="FileChooser.SelectDirectory"/>
11495
</properties>
11596
</component>
116-
<component id="4adc1" class="javax.swing.JTextField" binding="trainingTextbox">
97+
<component id="b260" class="javax.swing.JCheckBox" binding="trainingPathCheckbox">
11798
<constraints>
118-
<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">
119-
<preferred-size width="150" height="-1"/>
120-
</grid>
121-
</constraints>
122-
<properties/>
123-
</component>
124-
<component id="abc52" class="javax.swing.JButton" binding="trainButton">
125-
<constraints>
126-
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
99+
<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"/>
127100
</constraints>
128101
<properties>
129-
<text resource-bundle="dialog_messages" key="FileChooser.SelectDirectory"/>
102+
<text resource-bundle="dialog_messages" key="Launcher.DefaultPath"/>
130103
</properties>
131104
</component>
132105
</children>
133106
</grid>
134-
<grid id="f60a5" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
107+
<grid id="1ffb" binding="trainingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
135108
<margin top="0" left="0" bottom="0" right="0"/>
136109
<constraints>
137-
<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"/>
110+
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
138111
</constraints>
139112
<properties/>
140113
<border type="none"/>
141114
<children>
142-
<component id="aae5d" class="javax.swing.JCheckBox" binding="advancedCheckbox">
115+
<component id="74ea5" class="javax.swing.JLabel">
143116
<constraints>
144-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
117+
<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"/>
145118
</constraints>
146119
<properties>
147-
<inheritsPopupMenu value="false"/>
148-
<label value="Advanced Options"/>
149-
<text resource-bundle="dialog_messages" key="Launcher.AdvancedOptionsCheckBox"/>
120+
<text resource-bundle="dialog_messages" key="Launcher.TrainingJars"/>
150121
</properties>
151122
</component>
152-
<component id="c786e" class="javax.swing.JSeparator">
123+
<component id="4adc1" class="javax.swing.JTextField" binding="trainingTextbox">
153124
<constraints>
154-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
125+
<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">
126+
<preferred-size width="150" height="-1"/>
127+
</grid>
155128
</constraints>
156129
<properties/>
157130
</component>
131+
<component id="abc52" class="javax.swing.JButton" binding="trainButton">
132+
<constraints>
133+
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
134+
</constraints>
135+
<properties>
136+
<text resource-bundle="dialog_messages" key="FileChooser.SelectDirectory"/>
137+
</properties>
138+
</component>
158139
</children>
159140
</grid>
160141
</children>

0 commit comments

Comments
 (0)