mirror of
https://github.com/badvision/jace.git
synced 2024-12-21 10:30:08 +00:00
Remove lawless music selection, add additional default cards
This commit is contained in:
parent
d0a77855cd
commit
6b1d75be15
1
.java-version
Normal file
1
.java-version
Normal file
@ -0,0 +1 @@
|
||||
graalvm64-17.0.3
|
@ -21,7 +21,6 @@ import jace.core.Card;
|
||||
import jace.core.Motherboard;
|
||||
import jace.core.Utility;
|
||||
import jace.core.Video;
|
||||
import jace.apple2e.Apple2e;
|
||||
import jace.library.MediaCache;
|
||||
import jace.library.MediaConsumer;
|
||||
import jace.library.MediaConsumerParent;
|
||||
@ -40,7 +39,6 @@ import javafx.geometry.Insets;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.ComboBox;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.Slider;
|
||||
import javafx.scene.effect.DropShadow;
|
||||
|
@ -65,13 +65,13 @@ public class Apple2e extends Computer {
|
||||
@ConfigurableField(name = "Slot 1", shortName = "s1card")
|
||||
public DeviceSelection<Cards> card1 = new DeviceSelection<>(Cards.class, null);
|
||||
@ConfigurableField(name = "Slot 2", shortName = "s2card")
|
||||
public DeviceSelection<Cards> card2 = new DeviceSelection<>(Cards.class, null);
|
||||
public DeviceSelection<Cards> card2 = new DeviceSelection<>(Cards.class, Cards.AppleMouse, true);
|
||||
@ConfigurableField(name = "Slot 3", shortName = "s3card")
|
||||
public DeviceSelection<Cards> card3 = new DeviceSelection<>(Cards.class, null);
|
||||
@ConfigurableField(name = "Slot 4", shortName = "s4card")
|
||||
public DeviceSelection<Cards> card4 = new DeviceSelection<>(Cards.class, null);
|
||||
public DeviceSelection<Cards> card4 = new DeviceSelection<>(Cards.class, Cards.Mockingboard, true);
|
||||
@ConfigurableField(name = "Slot 5", shortName = "s5card")
|
||||
public DeviceSelection<Cards> card5 = new DeviceSelection<>(Cards.class, null);
|
||||
public DeviceSelection<Cards> card5 = new DeviceSelection<>(Cards.class, Cards.RamFactor, true);
|
||||
@ConfigurableField(name = "Slot 6", shortName = "s6card")
|
||||
public DeviceSelection<Cards> card6 = new DeviceSelection<>(Cards.class, Cards.DiskIIDrive, true);
|
||||
@ConfigurableField(name = "Slot 7", shortName = "s7card")
|
||||
|
@ -100,19 +100,6 @@
|
||||
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
||||
</rowConstraints>
|
||||
<children>
|
||||
<Label alignment="CENTER_RIGHT" styleClass="musicLabel" textAlignment="RIGHT">Music:</Label>
|
||||
<ComboBox fx:id="musicSelection" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
|
||||
<items>
|
||||
<FXCollections fx:factory="observableArrayList">
|
||||
<String fx:value="8-bit Chipmusic" />
|
||||
<String fx:value="8-bit Orchestral samples" />
|
||||
<String fx:value="None" />
|
||||
</FXCollections>
|
||||
</items>
|
||||
<value>
|
||||
<String fx:value="8-bit Chipmusic" />
|
||||
</value>
|
||||
</ComboBox>
|
||||
<Label alignment="CENTER_RIGHT" prefHeight="53.0" prefWidth="201.0" styleClass="musicLabel" text="Speaker:" textAlignment="RIGHT" GridPane.rowIndex="1" />
|
||||
<Slider fx:id="speakerToggle" blockIncrement="1.0" majorTickUnit="1.0" max="1.0" maxWidth="32.0" minWidth="32.0" minorTickCount="0" prefWidth="32.0" snapToTicks="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
|
||||
</children>
|
||||
|
BIN
src/main/windows/assets/icon.ico
Normal file
BIN
src/main/windows/assets/icon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 83 KiB |
Loading…
Reference in New Issue
Block a user