Skip to content

Commit f00f317

Browse files
author
IMS
authored
Merge pull request IrisShaders#29 from JosueGalRe/fix/smol-window
smol window and fixed font to arial
2 parents 5c54967 + 1a17908 commit f00f317

2 files changed

Lines changed: 93 additions & 65 deletions

File tree

‎src/main/java/net/hypercubemc/iris_installer/NewInstaller.form‎

Lines changed: 67 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@
1111
<Connection code="new ImageIcon(Objects.requireNonNull(Utils.class.getClassLoader().getResource(&quot;iris_profile_icon.png&quot;))).getImage()" type="code"/>
1212
</Property>
1313
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
14-
<Dimension value="[480, 640]"/>
14+
<Dimension value="[480, 550]"/>
1515
</Property>
1616
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
17-
<Dimension value="[480, 640]"/>
17+
<Dimension value="[480, 550]"/>
1818
</Property>
19+
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
20+
<Dimension value="[480, 550]"/>
21+
</Property>
22+
<Property name="resizable" type="boolean" value="false"/>
1923
</Properties>
2024
<SyntheticProperties>
2125
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -31,15 +35,17 @@
3135
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
3236
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
3337
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
34-
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,-103,0,0,1,-32"/>
38+
<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,38,0,0,1,-32"/>
3539
</AuxValues>
3640

3741
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
3842
<SubComponents>
3943
<Component class="javax.swing.JLabel" name="irisInstallerLabel">
4044
<Properties>
41-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
42-
<Font name="sansserif" size="36" style="0"/>
45+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
46+
<FontInfo relative="true">
47+
<Font component="irisInstallerLabel" property="font" relativeSize="false" size="36"/>
48+
</FontInfo>
4349
</Property>
4450
<Property name="horizontalAlignment" type="int" value="0"/>
4551
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
@@ -52,14 +58,16 @@
5258
</Properties>
5359
<Constraints>
5460
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
55-
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="80" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
61+
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="30" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
5662
</Constraint>
5763
</Constraints>
5864
</Component>
5965
<Component class="javax.swing.JLabel" name="gameVersionLabel">
6066
<Properties>
61-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
62-
<Font name="sansserif" size="18" style="0"/>
67+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
68+
<FontInfo relative="true">
69+
<Font bold="true" component="gameVersionLabel" property="font" relativeSize="false" size="16"/>
70+
</FontInfo>
6371
</Property>
6472
<Property name="horizontalAlignment" type="int" value="0"/>
6573
<Property name="text" type="java.lang.String" value="Select game version:"/>
@@ -84,8 +92,10 @@
8492
</Component>
8593
<Component class="javax.swing.JLabel" name="outdatedText1">
8694
<Properties>
87-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
88-
<Font name="sansserif" size="16" style="0"/>
95+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
96+
<FontInfo relative="true">
97+
<Font component="outdatedText1" property="font" relativeSize="false" size="16"/>
98+
</FontInfo>
8999
</Property>
90100
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
91101
<Color blue="0" green="cc" red="ff" type="rgb"/>
@@ -111,9 +121,6 @@
111121
</Component>
112122
<Component class="javax.swing.JLabel" name="outdatedText2">
113123
<Properties>
114-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
115-
<Font name="sansserif" size="16" style="0"/>
116-
</Property>
117124
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
118125
<Color blue="0" green="cc" red="ff" type="rgb"/>
119126
</Property>
@@ -123,23 +130,19 @@
123130
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
124131
<Dimension value="[450, 21]"/>
125132
</Property>
126-
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
127-
<Dimension value="[350, 21]"/>
128-
</Property>
129-
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
130-
<Dimension value="[350, 21]"/>
131-
</Property>
132133
</Properties>
133134
<Constraints>
134135
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
135-
<GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
136+
<GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
136137
</Constraint>
137138
</Constraints>
138139
</Component>
139140
<Component class="javax.swing.JLabel" name="installationType">
140141
<Properties>
141-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
142-
<Font name="sansserif" size="18" style="0"/>
142+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
143+
<FontInfo relative="true">
144+
<Font bold="true" component="installationType" property="font" relativeSize="false" size="16"/>
145+
</FontInfo>
143146
</Property>
144147
<Property name="horizontalAlignment" type="int" value="0"/>
145148
<Property name="text" type="java.lang.String" value=" Installation type:"/>
@@ -150,14 +153,16 @@
150153
</Properties>
151154
<Constraints>
152155
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
153-
<GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
156+
<GridBagConstraints gridX="1" gridY="6" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
154157
</Constraint>
155158
</Constraints>
156159
</Component>
157160
<Component class="javax.swing.JLabel" name="installationDirectory">
158161
<Properties>
159-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
160-
<Font name="sansserif" size="18" style="0"/>
162+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
163+
<FontInfo relative="true">
164+
<Font bold="true" component="installationDirectory" property="font" relativeSize="false" size="16"/>
165+
</FontInfo>
161166
</Property>
162167
<Property name="horizontalAlignment" type="int" value="0"/>
163168
<Property name="text" type="java.lang.String" value="Installation directory:"/>
@@ -168,13 +173,10 @@
168173
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
169174
<Dimension value="[165, 24]"/>
170175
</Property>
171-
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
172-
<Dimension value="[164, 24]"/>
173-
</Property>
174176
</Properties>
175177
<Constraints>
176178
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
177-
<GridBagConstraints gridX="1" gridY="8" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
179+
<GridBagConstraints gridX="1" gridY="8" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
178180
</Constraint>
179181
</Constraints>
180182
</Component>
@@ -194,8 +196,10 @@
194196
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
195197
<ComponentRef name="installType"/>
196198
</Property>
197-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
198-
<Font name="sansserif" size="16" style="0"/>
199+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
200+
<FontInfo relative="true">
201+
<Font component="standaloneType" property="font" relativeSize="false" size="16"/>
202+
</FontInfo>
199203
</Property>
200204
<Property name="selected" type="boolean" value="true"/>
201205
<Property name="text" type="java.lang.String" value="Iris Install"/>
@@ -215,8 +219,10 @@
215219
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
216220
<ComponentRef name="installType"/>
217221
</Property>
218-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
219-
<Font name="sansserif" size="16" style="0"/>
222+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
223+
<FontInfo relative="true">
224+
<Font component="fabricType" property="font" relativeSize="false" size="16"/>
225+
</FontInfo>
220226
</Property>
221227
<Property name="text" type="java.lang.String" value="Fabric Install"/>
222228
<Property name="toolTipText" type="java.lang.String" value="This installs Iris and Sodium alongside an installation of Fabric."/>
@@ -234,6 +240,9 @@
234240
</Container>
235241
<Component class="javax.swing.JComboBox" name="gameVersionList">
236242
<Properties>
243+
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
244+
<Font name="Arial" size="14" style="0"/>
245+
</Property>
237246
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
238247
<StringArray count="4">
239248
<StringItem index="0" value="1.19"/>
@@ -266,8 +275,10 @@
266275
</Component>
267276
<Component class="javax.swing.JCheckBox" name="betaSelection">
268277
<Properties>
269-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
270-
<Font name="sansserif" size="16" style="0"/>
278+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
279+
<FontInfo relative="true">
280+
<Font component="betaSelection" property="font" relativeSize="false" size="16"/>
281+
</FontInfo>
271282
</Property>
272283
<Property name="text" type="java.lang.String" value="Use beta version (not recommended)"/>
273284
</Properties>
@@ -279,6 +290,11 @@
279290
</Component>
280291
<Component class="javax.swing.JButton" name="directoryName">
281292
<Properties>
293+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
294+
<FontInfo relative="true">
295+
<Font component="directoryName" property="font" relativeSize="false" size="16"/>
296+
</FontInfo>
297+
</Property>
282298
<Property name="label" type="java.lang.String" value="Directory Name"/>
283299
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
284300
<Dimension value="[300, 36]"/>
@@ -301,6 +317,11 @@
301317
</Component>
302318
<Component class="javax.swing.JProgressBar" name="progressBar">
303319
<Properties>
320+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
321+
<FontInfo relative="true">
322+
<Font component="progressBar" property="font" relativeSize="false" size="16"/>
323+
</FontInfo>
324+
</Property>
304325
<Property name="alignmentX" type="float" value="0.0"/>
305326
<Property name="alignmentY" type="float" value="0.0"/>
306327
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -315,25 +336,28 @@
315336
</Properties>
316337
<Constraints>
317338
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
318-
<GridBagConstraints gridX="1" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="79" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
339+
<GridBagConstraints gridX="1" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="40" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
319340
</Constraint>
320341
</Constraints>
321342
</Component>
322343
<Component class="javax.swing.JButton" name="installButton">
323344
<Properties>
324-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
325-
<Font name="sansserif" size="18" style="0"/>
345+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
346+
<FontInfo relative="true">
347+
<Font component="installButton" property="font" relativeSize="false" size="16"/>
348+
</FontInfo>
326349
</Property>
327350
<Property name="text" type="java.lang.String" value="Install"/>
351+
<Property name="toolTipText" type="java.lang.String" value=""/>
352+
<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
353+
<Insets value="[15, 60, 15, 60]"/>
354+
</Property>
328355
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
329-
<Dimension value="[170, 45]"/>
356+
<Dimension value="[300, 45]"/>
330357
</Property>
331358
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
332359
<Dimension value="[170, 45]"/>
333360
</Property>
334-
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
335-
<Dimension value="[170, 45]"/>
336-
</Property>
337361
</Properties>
338362
<Events>
339363
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="installButtonMouseClicked"/>
@@ -343,7 +367,7 @@
343367
</AuxValues>
344368
<Constraints>
345369
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
346-
<GridBagConstraints gridX="1" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="38" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
370+
<GridBagConstraints gridX="1" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="30" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
347371
</Constraint>
348372
</Constraints>
349373
</Component>

0 commit comments

Comments
 (0)