PinVol fixes

syd711 · Dec 22, 2024 · 49e09cd · 49e09cd
1 parent 4a1631c
commit 49e09cd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/vpin-studio-ui/src/main/java/de/mephisto/vpin/ui/tables/panels/PinVolSettingsController.java b/vpin-studio-ui/src/main/java/de/mephisto/vpin/ui/tables/panels/PinVolSettingsController.java
@@ -148,19 +148,19 @@ public void setData(Stage stage, List<GameRepresentation> games, boolean showSys
       systemVolume.setSecondaryVolume(t1);
     }, 300));
 
-    SpinnerValueFactory.IntegerSpinnerValueFactory factory3 = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100, systemVolume.getSsfBassVolume());
+    SpinnerValueFactory.IntegerSpinnerValueFactory factory3 = new SpinnerValueFactory.IntegerSpinnerValueFactory(-10, 10, systemVolume.getSsfBassVolume());
     systemVolBassSpinner.setValueFactory(factory3);
     factory3.valueProperty().addListener((observableValue, integer, t1) -> debouncer.debounce(PreferenceNames.IDLE_TIMEOUT, () -> {
       systemVolume.setSsfBassVolume(t1);
     }, 300));
 
-    SpinnerValueFactory.IntegerSpinnerValueFactory factory4 = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100, systemVolume.getSsfFrontVolume());
+    SpinnerValueFactory.IntegerSpinnerValueFactory factory4 = new SpinnerValueFactory.IntegerSpinnerValueFactory(-10, 10, systemVolume.getSsfFrontVolume());
     systemVolFrontSpinner.setValueFactory(factory4);
     factory4.valueProperty().addListener((observableValue, integer, t1) -> debouncer.debounce(PreferenceNames.IDLE_TIMEOUT, () -> {
       systemVolume.setSsfFrontVolume(t1);
     }, 300));
 
-    SpinnerValueFactory.IntegerSpinnerValueFactory factory5 = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100, systemVolume.getSsfRearVolume());
+    SpinnerValueFactory.IntegerSpinnerValueFactory factory5 = new SpinnerValueFactory.IntegerSpinnerValueFactory(10, 10, systemVolume.getSsfRearVolume());
     systemVolRearSpinner.setValueFactory(factory5);
     factory5.valueProperty().addListener((observableValue, integer, t1) -> debouncer.debounce(PreferenceNames.IDLE_TIMEOUT, () -> {
       systemVolume.setSsfRearVolume(t1);
@@ -206,19 +206,19 @@ private void setTableValues(PinVolTableEntry systemVolume) {
       entry.setSecondaryVolume(t1);
     }, 300));
 
-    SpinnerValueFactory.IntegerSpinnerValueFactory factory8 = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100, entry.getSsfBassVolume());
+    SpinnerValueFactory.IntegerSpinnerValueFactory factory8 = new SpinnerValueFactory.IntegerSpinnerValueFactory(-10, 10, entry.getSsfBassVolume());
     tableVolBassSpinner.setValueFactory(factory8);
     factory8.valueProperty().addListener((observableValue, integer, t1) -> debouncer.debounce(PreferenceNames.IDLE_TIMEOUT, () -> {
       entry.setSsfBassVolume(t1);
     }, 300));
 
-    SpinnerValueFactory.IntegerSpinnerValueFactory factory9 = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100, entry.getSsfFrontVolume());
+    SpinnerValueFactory.IntegerSpinnerValueFactory factory9 = new SpinnerValueFactory.IntegerSpinnerValueFactory(-10, 10, entry.getSsfFrontVolume());
     tableVolFrontSpinner.setValueFactory(factory9);
     factory9.valueProperty().addListener((observableValue, integer, t1) -> debouncer.debounce(PreferenceNames.IDLE_TIMEOUT, () -> {
       entry.setSsfFrontVolume(t1);
     }, 300));
 
-    SpinnerValueFactory.IntegerSpinnerValueFactory factory10 = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100, entry.getSsfRearVolume());
+    SpinnerValueFactory.IntegerSpinnerValueFactory factory10 = new SpinnerValueFactory.IntegerSpinnerValueFactory(-10, 10, entry.getSsfRearVolume());
     tableVolRearSpinner.setValueFactory(factory10);
     factory10.valueProperty().addListener((observableValue, integer, t1) -> debouncer.debounce(PreferenceNames.IDLE_TIMEOUT, () -> {
       entry.setSsfRearVolume(t1);

diff --git a/vpin-studio-ui/src/main/resources/de/mephisto/vpin/ui/stylesheet.css b/vpin-studio-ui/src/main/resources/de/mephisto/vpin/ui/stylesheet.css
@@ -44,6 +44,12 @@
 /**
  * Main
  */
+.root {
+    -fx-border-style: solid;
+    -fx-border-color: #605E5E;
+    -fx-border-width: 1;
+}
+
 .main, .root {
     -fx-background-color: -fx-base-6;
 }

diff --git a/vpin-studio-ui/src/main/resources/de/mephisto/vpin/ui/tables/panels/pinvol-settings.fxml b/vpin-studio-ui/src/main/resources/de/mephisto/vpin/ui/tables/panels/pinvol-settings.fxml
@@ -38,13 +38,13 @@
                   <Spinner fx:id="systemVolPrimarySpinner" prefWidth="80.0" GridPane.columnIndex="1" />
                   <Spinner fx:id="systemVolSecondarySpinner" layoutX="110.0" layoutY="12.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   <Spinner fx:id="systemVolBassSpinner" layoutX="110.0" layoutY="43.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                  <Spinner fx:id="systemVolFrontSpinner" layoutX="110.0" layoutY="73.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <Spinner fx:id="systemVolFrontSpinner" layoutX="110.0" layoutY="73.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                   <Label styleClass="default-text" text="Primary Volume:" />
                   <Label layoutX="10.0" layoutY="15.0" styleClass="default-text" text="Secondary Volume:" GridPane.rowIndex="1" />
-                  <Label layoutX="10.0" layoutY="49.0" styleClass="default-text" text="SSF Bass Volume:" GridPane.rowIndex="2" />
-                  <Label layoutX="10.0" layoutY="83.0" styleClass="default-text" text="SSF Front Volume:" GridPane.rowIndex="4" />
-                  <Label layoutX="10.0" layoutY="116.0" styleClass="default-text" text="SSF Rear Volume:" GridPane.rowIndex="3" />
-                  <Spinner fx:id="systemVolRearSpinner" layoutX="164.0" layoutY="180.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                  <Label layoutX="10.0" layoutY="49.0" styleClass="default-text" text="Back Glass Gain:" GridPane.rowIndex="2" />
+                  <Label layoutX="10.0" layoutY="83.0" styleClass="default-text" text="Rear Exciters Gain:" GridPane.rowIndex="3" />
+                  <Label layoutX="10.0" layoutY="116.0" styleClass="default-text" text="Front Exciters Gain:" GridPane.rowIndex="4" />
+                  <Spinner fx:id="systemVolRearSpinner" layoutX="164.0" layoutY="180.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                </children>
                <VBox.margin>
                   <Insets />
@@ -87,9 +87,9 @@
                   <Spinner fx:id="tableVolFrontSpinner" layoutX="110.0" layoutY="73.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                   <Label styleClass="default-text" text="Primary Volume:" />
                   <Label layoutX="10.0" layoutY="15.0" styleClass="default-text" text="Secondary Volume:" GridPane.rowIndex="1" />
-                  <Label layoutX="10.0" layoutY="49.0" styleClass="default-text" text="SSF Bass Volume:" GridPane.rowIndex="2" />
-                  <Label layoutX="10.0" layoutY="83.0" styleClass="default-text" text="SSF Front Volume:" GridPane.rowIndex="4" />
-                  <Label layoutX="10.0" layoutY="116.0" styleClass="default-text" text="SSF Rear Volume:" GridPane.rowIndex="3" />
+                  <Label layoutX="10.0" layoutY="49.0" styleClass="default-text" text="Back Glass Gain:" GridPane.rowIndex="2" />
+                  <Label layoutX="10.0" layoutY="83.0" styleClass="default-text" text="Front Exciters Gain:" GridPane.rowIndex="4" />
+                  <Label layoutX="10.0" layoutY="116.0" styleClass="default-text" text="Rear Exciters Gain:" GridPane.rowIndex="3" />
                   <Spinner fx:id="tableVolRearSpinner" layoutX="164.0" layoutY="180.0" prefWidth="80.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
                   <HBox alignment="CENTER_LEFT" spacing="6.0" GridPane.columnIndex="1" GridPane.rowIndex="6">
                      <children>

diff --git a/vpin-studio-ui/src/main/resources/de/mephisto/vpin/ui/tables/scene-tables-overview.fxml b/vpin-studio-ui/src/main/resources/de/mephisto/vpin/ui/tables/scene-tables-overview.fxml
@@ -46,7 +46,7 @@
                                  <TableColumn fx:id="columnRom" minWidth="10.4000244140625" prefWidth="140.0" style="-fx-alignment: BASELINE_LEFT;" text="ROM" />
                                  <TableColumn fx:id="columnHSType" minWidth="10.4000244140625" prefWidth="115.0" style="-fx-alignment: BASELINE_LEFT;" text="Highscore Type" />
                                  <TableColumn fx:id="columnEmulator" minWidth="10.4000244140625" prefWidth="130.0" style="-fx-alignment: BASELINE_LEFT;" text="Emulator" />
-                                 <TableColumn fx:id="columnPinVol" minWidth="120" prefWidth="120.0" style="-fx-alignment: BASELINE_CENTER;" text="PinVOL" />
+                                 <TableColumn fx:id="columnPinVol" minWidth="130" prefWidth="120.0" style="-fx-alignment: BASELINE_CENTER;" text="PinVOL" />
                         <TableColumn fx:id="columnLauncher" minWidth="10.4000244140625" prefWidth="160.0" style="-fx-alignment: BASELINE_LEFT;" text="Launcher" />
                                  <TableColumn fx:id="columnDateAdded" minWidth="10.4000244140625" prefWidth="140.2000732421875" style="-fx-alignment: CENTER;" text="Date Added" />
                                  <TableColumn fx:id="columnDateModified" minWidth="10.4000244140625" prefWidth="140.2000732421875" style="-fx-alignment: CENTER;" text="Last Update" />