Skip to content

Commit 1a17908

Browse files
committed
remove arial and use default font
1 parent 379b2fa commit 1a17908

2 files changed

Lines changed: 56 additions & 37 deletions

File tree

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

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@
4242
<SubComponents>
4343
<Component class="javax.swing.JLabel" name="irisInstallerLabel">
4444
<Properties>
45-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
46-
<Font name="Arial" 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>
4749
</Property>
4850
<Property name="horizontalAlignment" type="int" value="0"/>
4951
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
@@ -62,8 +64,10 @@
6264
</Component>
6365
<Component class="javax.swing.JLabel" name="gameVersionLabel">
6466
<Properties>
65-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
66-
<Font name="Arial" size="16" 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>
6771
</Property>
6872
<Property name="horizontalAlignment" type="int" value="0"/>
6973
<Property name="text" type="java.lang.String" value="Select game version:"/>
@@ -88,8 +92,10 @@
8892
</Component>
8993
<Component class="javax.swing.JLabel" name="outdatedText1">
9094
<Properties>
91-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
92-
<Font name="Arial" 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>
9399
</Property>
94100
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
95101
<Color blue="0" green="cc" red="ff" type="rgb"/>
@@ -115,9 +121,6 @@
115121
</Component>
116122
<Component class="javax.swing.JLabel" name="outdatedText2">
117123
<Properties>
118-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
119-
<Font name="Arial" size="16" style="0"/>
120-
</Property>
121124
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
122125
<Color blue="0" green="cc" red="ff" type="rgb"/>
123126
</Property>
@@ -136,8 +139,10 @@
136139
</Component>
137140
<Component class="javax.swing.JLabel" name="installationType">
138141
<Properties>
139-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
140-
<Font name="Arial" size="16" 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>
141146
</Property>
142147
<Property name="horizontalAlignment" type="int" value="0"/>
143148
<Property name="text" type="java.lang.String" value=" Installation type:"/>
@@ -154,8 +159,10 @@
154159
</Component>
155160
<Component class="javax.swing.JLabel" name="installationDirectory">
156161
<Properties>
157-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
158-
<Font name="Arial" size="16" 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>
159166
</Property>
160167
<Property name="horizontalAlignment" type="int" value="0"/>
161168
<Property name="text" type="java.lang.String" value="Installation directory:"/>
@@ -189,8 +196,10 @@
189196
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
190197
<ComponentRef name="installType"/>
191198
</Property>
192-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
193-
<Font name="Arial" 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>
194203
</Property>
195204
<Property name="selected" type="boolean" value="true"/>
196205
<Property name="text" type="java.lang.String" value="Iris Install"/>
@@ -210,8 +219,10 @@
210219
<Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
211220
<ComponentRef name="installType"/>
212221
</Property>
213-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
214-
<Font name="Arial" 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>
215226
</Property>
216227
<Property name="text" type="java.lang.String" value="Fabric Install"/>
217228
<Property name="toolTipText" type="java.lang.String" value="This installs Iris and Sodium alongside an installation of Fabric."/>
@@ -264,8 +275,10 @@
264275
</Component>
265276
<Component class="javax.swing.JCheckBox" name="betaSelection">
266277
<Properties>
267-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
268-
<Font name="Arial" 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>
269282
</Property>
270283
<Property name="text" type="java.lang.String" value="Use beta version (not recommended)"/>
271284
</Properties>
@@ -277,8 +290,10 @@
277290
</Component>
278291
<Component class="javax.swing.JButton" name="directoryName">
279292
<Properties>
280-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
281-
<Font name="Arial" size="16" style="0"/>
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>
282297
</Property>
283298
<Property name="label" type="java.lang.String" value="Directory Name"/>
284299
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -302,8 +317,10 @@
302317
</Component>
303318
<Component class="javax.swing.JProgressBar" name="progressBar">
304319
<Properties>
305-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
306-
<Font name="Arial" size="16" style="0"/>
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>
307324
</Property>
308325
<Property name="alignmentX" type="float" value="0.0"/>
309326
<Property name="alignmentY" type="float" value="0.0"/>
@@ -325,8 +342,10 @@
325342
</Component>
326343
<Component class="javax.swing.JButton" name="installButton">
327344
<Properties>
328-
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
329-
<Font name="Arial" size="16" 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>
330349
</Property>
331350
<Property name="text" type="java.lang.String" value="Install"/>
332351
<Property name="toolTipText" type="java.lang.String" value=""/>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private void initComponents() {
237237
setResizable(false);
238238
getContentPane().setLayout(new java.awt.GridBagLayout());
239239

240-
irisInstallerLabel.setFont(new java.awt.Font("Arial", 0, 36)); // NOI18N
240+
irisInstallerLabel.setFont(irisInstallerLabel.getFont().deriveFont((float)36));
241241
irisInstallerLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
242242
irisInstallerLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/iris_profile_icon.png"))); // NOI18N
243243
irisInstallerLabel.setText(" Iris & Sodium");
@@ -248,7 +248,7 @@ private void initComponents() {
248248
gridBagConstraints.insets = new java.awt.Insets(30, 0, 0, 0);
249249
getContentPane().add(irisInstallerLabel, gridBagConstraints);
250250

251-
gameVersionLabel.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
251+
gameVersionLabel.setFont(gameVersionLabel.getFont().deriveFont(gameVersionLabel.getFont().getStyle() | java.awt.Font.BOLD, 16));
252252
gameVersionLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
253253
gameVersionLabel.setText("Select game version:");
254254
gameVersionLabel.setToolTipText("");
@@ -264,7 +264,7 @@ private void initComponents() {
264264
gridBagConstraints.insets = new java.awt.Insets(20, 0, 0, 0);
265265
getContentPane().add(gameVersionLabel, gridBagConstraints);
266266

267-
outdatedText1.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
267+
outdatedText1.setFont(outdatedText1.getFont().deriveFont((float)16));
268268
outdatedText1.setForeground(new java.awt.Color(255, 204, 0));
269269
outdatedText1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
270270
outdatedText1.setText("Warning: We have ended support for <version>.");
@@ -279,7 +279,7 @@ private void initComponents() {
279279
gridBagConstraints.insets = new java.awt.Insets(6, 0, 0, 0);
280280
getContentPane().add(outdatedText1, gridBagConstraints);
281281

282-
outdatedText2.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
282+
outdatedText2.setFont(outdatedText2.getFont().deriveFont((float)16));
283283
outdatedText2.setForeground(new java.awt.Color(255, 204, 0));
284284
outdatedText2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
285285
outdatedText2.setText("The Iris version you get will most likely be outdated.");
@@ -292,7 +292,7 @@ private void initComponents() {
292292
gridBagConstraints.weightx = 1.0;
293293
getContentPane().add(outdatedText2, gridBagConstraints);
294294

295-
installationType.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
295+
installationType.setFont(installationType.getFont().deriveFont(installationType.getFont().getStyle() | java.awt.Font.BOLD, 16));
296296
installationType.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
297297
installationType.setText(" Installation type:");
298298
installationType.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -304,7 +304,7 @@ private void initComponents() {
304304
gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 0);
305305
getContentPane().add(installationType, gridBagConstraints);
306306

307-
installationDirectory.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
307+
installationDirectory.setFont(installationDirectory.getFont().deriveFont(installationDirectory.getFont().getStyle() | java.awt.Font.BOLD, 16));
308308
installationDirectory.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
309309
installationDirectory.setText("Installation directory:");
310310
installationDirectory.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
@@ -320,7 +320,7 @@ private void initComponents() {
320320
installationTypesContainer.setLayout(new java.awt.BorderLayout(10, 0));
321321

322322
installType.add(standaloneType);
323-
standaloneType.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
323+
standaloneType.setFont(standaloneType.getFont().deriveFont((float)16));
324324
standaloneType.setSelected(true);
325325
standaloneType.setText("Iris Install");
326326
standaloneType.setToolTipText("This installs Iris and Sodium by itself, without any mods.");
@@ -332,7 +332,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
332332
installationTypesContainer.add(standaloneType, java.awt.BorderLayout.LINE_START);
333333

334334
installType.add(fabricType);
335-
fabricType.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
335+
fabricType.setFont(fabricType.getFont().deriveFont((float)16));
336336
fabricType.setText("Fabric Install");
337337
fabricType.setToolTipText("This installs Iris and Sodium alongside an installation of Fabric.");
338338
fabricType.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -364,15 +364,15 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) {
364364
gridBagConstraints.insets = new java.awt.Insets(6, 0, 0, 0);
365365
getContentPane().add(gameVersionList, gridBagConstraints);
366366

367-
betaSelection.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
367+
betaSelection.setFont(betaSelection.getFont().deriveFont((float)16));
368368
betaSelection.setText("Use beta version (not recommended)");
369369
gridBagConstraints = new java.awt.GridBagConstraints();
370370
gridBagConstraints.gridx = 1;
371371
gridBagConstraints.gridy = 3;
372372
gridBagConstraints.insets = new java.awt.Insets(6, 0, 0, 0);
373373
getContentPane().add(betaSelection, gridBagConstraints);
374374

375-
directoryName.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
375+
directoryName.setFont(directoryName.getFont().deriveFont((float)16));
376376
directoryName.setLabel("Directory Name");
377377
directoryName.setMaximumSize(new java.awt.Dimension(300, 36));
378378
directoryName.setMinimumSize(new java.awt.Dimension(300, 36));
@@ -388,7 +388,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
388388
gridBagConstraints.insets = new java.awt.Insets(6, 0, 0, 0);
389389
getContentPane().add(directoryName, gridBagConstraints);
390390

391-
progressBar.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
391+
progressBar.setFont(progressBar.getFont().deriveFont((float)16));
392392
progressBar.setAlignmentX(0.0F);
393393
progressBar.setAlignmentY(0.0F);
394394
progressBar.setMaximumSize(new java.awt.Dimension(380, 25));
@@ -400,7 +400,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
400400
gridBagConstraints.insets = new java.awt.Insets(40, 0, 0, 0);
401401
getContentPane().add(progressBar, gridBagConstraints);
402402

403-
installButton.setFont(new java.awt.Font("Arial", 0, 16)); // NOI18N
403+
installButton.setFont(installButton.getFont().deriveFont((float)16));
404404
installButton.setText("Install");
405405
installButton.setToolTipText("");
406406
installButton.setMargin(new java.awt.Insets(15, 60, 15, 60));

0 commit comments

Comments
 (0)