- Prefs UI update for new sound

- Labels and checkboxes. Added disabled+Selected 'Display Notification When Match Found' since it should always remain on.
FAForever · Jun 26, 2024 · 8de7173 · 8de7173
1 parent d622700
commit 8de7173
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/client/preferences/NotificationPrefs.java b/src/main/java/com/faforever/client/preferences/NotificationPrefs.java
@@ -293,6 +293,9 @@ public void setIsMatchFoundSoundEnabled(boolean isMatchFoundSoundEnabled) {
   public boolean isMatchFoundSoundEnabled() {
     return isMatchFoundSoundEnabled.get();
   }
+  public BooleanProperty isMatchFoundSoundEnabledProperty() {
+    return isMatchFoundSoundEnabled;
+  }
 
   public int getSilenceBetweenSounds() {
     return silenceBetweenSounds.get();

diff --git a/src/main/java/com/faforever/client/preferences/ui/SettingsController.java b/src/main/java/com/faforever/client/preferences/ui/SettingsController.java
@@ -140,7 +140,7 @@ public class SettingsController extends NodeController<Node> {
   public CheckBox playFriendJoinsGameSoundCheckBox;
   public CheckBox playFriendPlaysGameSoundCheckBox;
   public CheckBox displayPmReceivedToastCheckBox;
-  public CheckBox displayMatchFoundSoundCheckBox;
+  public CheckBox displayMatchFoundNotificationCheckBox;
   public CheckBox playMatchFoundSoundCheckBox;
   public CheckBox playPmReceivedSoundCheckBox;
   public CheckBox afterGameReviewCheckBox;
@@ -397,6 +397,9 @@ private void bindNotificationPreferences() {
         .bindBidirectional(notificationPrefs.friendPlaysGameSoundEnabledProperty());
     playPmReceivedSoundCheckBox.selectedProperty()
         .bindBidirectional(notificationPrefs.privateMessageSoundEnabledProperty());
+    displayMatchFoundNotificationCheckBox.selectedProperty().setValue(true);
+    playMatchFoundSoundCheckBox.selectedProperty()
+        .bindBidirectional(notificationPrefs.isMatchFoundSoundEnabledProperty());
     afterGameReviewCheckBox.selectedProperty().bindBidirectional(notificationPrefs.afterGameReviewEnabledProperty());
     notifyOnAtMentionOnlyToggle.selectedProperty()
         .bindBidirectional(notificationPrefs.notifyOnAtMentionOnlyEnabledProperty());

diff --git a/src/main/resources/theme/settings/settings.fxml b/src/main/resources/theme/settings/settings.fxml
@@ -598,7 +598,8 @@
                                                 <Label styleClass="setting-title"
                                                        text="%settings.notifications.matchFound"
                                                        GridPane.rowIndex="6"/>
-                                                <CheckBox fx:id="displayMatchFoundSoundCheckBox" mnemonicParsing="false"
+                                                <CheckBox fx:id="displayMatchFoundNotificationCheckBox" mnemonicParsing="false"
+                                                          disable="true"
                                                           GridPane.columnIndex="1" GridPane.halignment="CENTER"
                                                           GridPane.rowIndex="6" GridPane.valignment="CENTER"/>
                                                 <CheckBox fx:id="playMatchFoundSoundCheckBox" mnemonicParsing="false"
@@ -609,7 +610,7 @@
                                                        GridPane.rowIndex="7"/>
                                                 <CheckBox fx:id="afterGameReviewCheckBox" mnemonicParsing="false"
                                                           GridPane.columnIndex="1" GridPane.halignment="CENTER"
-                                                          GridPane.rowIndex="6" GridPane.valignment="CENTER"/>
+                                                          GridPane.rowIndex="7" GridPane.valignment="CENTER"/>
                                             </children>
                                         </GridPane>
                                     </children>