Skip to content

Commit 1338574

Browse files
committed
Remove chat format settings
1 parent 5832805 commit 1338574

File tree

4 files changed

+0
-60
lines changed

4 files changed

+0
-60
lines changed

src/main/java/com/faforever/client/chat/ChatFormat.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/main/java/com/faforever/client/preferences/ChatPrefs.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.faforever.client.preferences;
22

33
import com.faforever.client.chat.ChatColorMode;
4-
import com.faforever.client.chat.ChatFormat;
54
import com.faforever.client.chat.ChatUserCategory;
65
import com.google.common.annotations.VisibleForTesting;
76
import javafx.beans.property.BooleanProperty;
@@ -48,7 +47,6 @@ public class ChatPrefs {
4847
private final BooleanProperty hideFoeMessages = new SimpleBooleanProperty(true);
4948
private final BooleanProperty playerListShown = new SimpleBooleanProperty(true);
5049
private final ObjectProperty<TimeInfo> timeFormat = new SimpleObjectProperty<>(TimeInfo.AUTO);
51-
private final ObjectProperty<ChatFormat> chatFormat = new SimpleObjectProperty<>(ChatFormat.COMPACT);
5250
private final ObservableList<String> autoJoinChannels = FXCollections.observableArrayList();
5351
private final BooleanProperty showMapName = new SimpleBooleanProperty(false);
5452
private final BooleanProperty showMapPreview = new SimpleBooleanProperty(false);
@@ -80,18 +78,6 @@ public ObjectProperty<TimeInfo> timeFormatProperty() {
8078
return timeFormat;
8179
}
8280

83-
public ChatFormat getChatFormat() {
84-
return this.chatFormat.get();
85-
}
86-
87-
public void setChatFormat(ChatFormat chatFormat) {
88-
this.chatFormat.setValue(chatFormat);
89-
}
90-
91-
public ObjectProperty<ChatFormat> chatFormatProperty() {
92-
return chatFormat;
93-
}
94-
9581
public ObjectProperty<ChatColorMode> chatColorModeProperty() {
9682
return chatColorMode;
9783
}

src/main/java/com/faforever/client/preferences/ui/SettingsController.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import ch.qos.logback.classic.Level;
44
import com.faforever.client.api.IceServer;
55
import com.faforever.client.chat.ChatColorMode;
6-
import com.faforever.client.chat.ChatFormat;
76
import com.faforever.client.config.ClientProperties;
87
import com.faforever.client.fa.debugger.DownloadFAFDebuggerTask;
98
import com.faforever.client.fa.relay.ice.CoturnService;
@@ -154,7 +153,6 @@ public class SettingsController extends NodeController<Node> {
154153
public ToggleButton bottomRightToastButton;
155154
public ComboBox<TimeInfo> timeComboBox;
156155
public ComboBox<DateInfo> dateComboBox;
157-
public ComboBox<ChatFormat> chatComboBox;
158156
public ComboBox<UnitDataBaseType> unitDatabaseComboBox;
159157
public CheckBox notifyOnAtMentionOnlyToggle;
160158
public Pane languagesContainer;
@@ -223,7 +221,6 @@ protected void onInitialize() {
223221

224222
configureTimeSetting();
225223
configureDateSetting();
226-
configureChatSetting();
227224
configureLanguageSelection();
228225
configureThemeSelection();
229226
configureToastScreen();
@@ -482,19 +479,6 @@ public void onDateFormatSelected() {
482479
preferences.getLocalization().setDateFormat(dateComboBox.getValue());
483480
}
484481

485-
private void configureChatSetting() {
486-
ChatPrefs chatPrefs = preferences.getChat();
487-
chatComboBox.setButtonCell(new StringListCell<>(chatFormat -> i18n.get(chatFormat.getI18nKey()), fxApplicationThreadExecutor));
488-
chatComboBox.setCellFactory(param -> new StringListCell<>(chatFormat -> i18n.get(chatFormat.getI18nKey()), fxApplicationThreadExecutor));
489-
chatComboBox.setItems(FXCollections.observableArrayList(ChatFormat.values()));
490-
chatComboBox.getSelectionModel().select(chatPrefs.getChatFormat());
491-
}
492-
493-
public void onChatFormatSelected() {
494-
log.trace("A new chat format was selected: `{}`", chatComboBox.getValue());
495-
preferences.getChat().setChatFormat(chatComboBox.getValue());
496-
}
497-
498482
private StringListCell<Screen> screenListCell() {
499483
return new StringListCell<>(screen -> i18n.get("settings.screenFormat", Screen.getScreens()
500484
.indexOf(screen) + 1), fxApplicationThreadExecutor);

src/main/resources/theme/settings/settings.fxml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -297,21 +297,6 @@
297297
onAction="#onTimeFormatSelected" GridPane.columnIndex="1"/>
298298
</children>
299299
</GridPane>
300-
<GridPane styleClass="setting-container">
301-
<columnConstraints>
302-
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>
303-
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
304-
</columnConstraints>
305-
<rowConstraints>
306-
<RowConstraints minHeight="10.0" valignment="TOP" vgrow="SOMETIMES"/>
307-
<RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
308-
</rowConstraints>
309-
<children>
310-
<Label styleClass="setting-title" text="%settings.chat.chatFormat"/>
311-
<ComboBox fx:id="chatComboBox" maxWidth="1.7976931348623157E308"
312-
onAction="#onChatFormatSelected" GridPane.columnIndex="1"/>
313-
</children>
314-
</GridPane>
315300
<GridPane styleClass="setting-container">
316301
<columnConstraints>
317302
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0"/>

0 commit comments

Comments
 (0)