wilkins UI adjustments
This commit is contained in:
parent
0699bc3644
commit
ba7af2e90b
|
@ -35,7 +35,7 @@
|
||||||
<background color="-16777216"/>
|
<background color="-16777216"/>
|
||||||
<editable value="false"/>
|
<editable value="false"/>
|
||||||
<focusable value="false"/>
|
<focusable value="false"/>
|
||||||
<font name="Fusion" size="10"/>
|
<font name="Luxi Mono" size="10"/>
|
||||||
<foreground color="-5180417"/>
|
<foreground color="-5180417"/>
|
||||||
<horizontalAlignment value="0"/>
|
<horizontalAlignment value="0"/>
|
||||||
<text value="Do you think we should appeal to the alien authorities?"/>
|
<text value="Do you think we should appeal to the alien authorities?"/>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
<grid id="27dc6" binding="frameContainer" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||||
<margin top="10" left="10" bottom="10" right="10"/>
|
<margin top="10" left="10" bottom="10" right="10"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<xy x="20" y="20" width="416" height="455"/>
|
<xy x="20" y="20" width="416" height="479"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
<background color="-15128227"/>
|
<background color="-15128227"/>
|
||||||
|
@ -12,9 +12,9 @@
|
||||||
<children>
|
<children>
|
||||||
<component id="a7e40" class="javax.swing.JLabel" binding="picLabel">
|
<component id="a7e40" class="javax.swing.JLabel" binding="picLabel">
|
||||||
<constraints>
|
<constraints>
|
||||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false">
|
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="1" anchor="1" fill="1" indent="0" use-parent-layout="false">
|
||||||
<preferred-size width="76" height="76"/>
|
<preferred-size width="76" height="76"/>
|
||||||
<maximum-size width="76" height="76"/>
|
<maximum-size width="96" height="96"/>
|
||||||
</grid>
|
</grid>
|
||||||
</constraints>
|
</constraints>
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -82,7 +82,7 @@ public class WilkinsCoffee implements ActionListener {
|
||||||
System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
|
System.out.println("ERROR: Failed to find /resources/titleIcon.png. Window will not have an icon.");
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
logo = ImageIO.read(Main.class.getResourceAsStream("/programIcon.png")).getScaledInstance(76, 76, Image.SCALE_SMOOTH);
|
logo = ImageIO.read(Main.class.getResourceAsStream("/programIcon.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
|
||||||
picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
|
picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
|
System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
|
||||||
|
@ -158,6 +158,13 @@ public class WilkinsCoffee implements ActionListener {
|
||||||
switch (page) {
|
switch (page) {
|
||||||
case INTRO:
|
case INTRO:
|
||||||
page = Pages.PSARC;
|
page = Pages.PSARC;
|
||||||
|
try {
|
||||||
|
logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconPSARC.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
|
||||||
|
picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
|
||||||
|
picLabel.setText("");
|
||||||
|
}
|
||||||
|
|
||||||
if (!new File(Main.inpath + "psp2psarc.exe").exists()) { // we may have been here before // nag
|
if (!new File(Main.inpath + "psp2psarc.exe").exists()) { // we may have been here before // nag
|
||||||
frame.setEnabled(false);
|
frame.setEnabled(false);
|
||||||
|
@ -204,6 +211,13 @@ public class WilkinsCoffee implements ActionListener {
|
||||||
break;
|
break;
|
||||||
case PSARC:
|
case PSARC:
|
||||||
page = Pages.EXPORT_LOCATION;
|
page = Pages.EXPORT_LOCATION;
|
||||||
|
try {
|
||||||
|
logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconEXPORT.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
|
||||||
|
picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
|
||||||
|
picLabel.setText("");
|
||||||
|
}
|
||||||
contBtn.setEnabled(true);
|
contBtn.setEnabled(true);
|
||||||
contBtn.setBackground(new Color(221, 88, 11)); //orange
|
contBtn.setBackground(new Color(221, 88, 11)); //orange
|
||||||
inputContainer.setVisible(false);
|
inputContainer.setVisible(false);
|
||||||
|
@ -228,6 +242,13 @@ public class WilkinsCoffee implements ActionListener {
|
||||||
break;
|
break;
|
||||||
case EXPORT_LOCATION:
|
case EXPORT_LOCATION:
|
||||||
page = Pages.DONE;
|
page = Pages.DONE;
|
||||||
|
try {
|
||||||
|
logo = ImageIO.read(Main.class.getResourceAsStream("/setupIconDONE.png")).getScaledInstance(96, 96, Image.SCALE_SMOOTH);
|
||||||
|
picLabel.setIcon(new ImageIcon(logo));picLabel.setText("");
|
||||||
|
} catch (IOException e) {
|
||||||
|
System.out.println("ERROR: Missing resource in Wilkins. Page will be without images.");
|
||||||
|
picLabel.setText("");
|
||||||
|
}
|
||||||
inputContainer2.setVisible(false);
|
inputContainer2.setVisible(false);
|
||||||
Main.outpath = outPathTemp + "/";
|
Main.outpath = outPathTemp + "/";
|
||||||
Main.repatch = true;
|
Main.repatch = true;
|
||||||
|
|
BIN
firestar/src/main/resources/setupIconDONE.png
Normal file
BIN
firestar/src/main/resources/setupIconDONE.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
BIN
firestar/src/main/resources/setupIconEXPORT.png
Normal file
BIN
firestar/src/main/resources/setupIconEXPORT.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 77 KiB |
BIN
firestar/src/main/resources/setupIconPSARC.png
Normal file
BIN
firestar/src/main/resources/setupIconPSARC.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 326 KiB |
Loading…
Reference in New Issue
Block a user