Merge pull request #1031 from zhouer/hide_start_hidden

Hide startHidden setting when system tray is not supported
This commit is contained in:
Sebastian Stenzel
2019-12-29 14:18:35 +01:00
committed by GitHub
2 changed files with 9 additions and 2 deletions

View File

@@ -15,6 +15,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
@PreferencesScoped
public class GeneralPreferencesController implements FxController {
@@ -22,6 +23,7 @@ public class GeneralPreferencesController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(GeneralPreferencesController.class);
private final Settings settings;
private final boolean trayMenuSupported;
public ChoiceBox<UiTheme> themeChoiceBox;
public CheckBox startHiddenCheckbox;
public CheckBox debugModeCheckbox;
@@ -30,8 +32,9 @@ public class GeneralPreferencesController implements FxController {
public RadioButton nodeOrientationRtl;
@Inject
GeneralPreferencesController(Settings settings) {
GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported) {
this.settings = settings;
this.trayMenuSupported = trayMenuSupported;
}
public void initialize() {
@@ -48,6 +51,10 @@ public class GeneralPreferencesController implements FxController {
nodeOrientationRtl.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.RIGHT_TO_LEFT);
}
public boolean isTrayMenuSupported() {
return this.trayMenuSupported;
}
private void toggleNodeOrientation(@SuppressWarnings("unused") ObservableValue<? extends Toggle> observable, @SuppressWarnings("unused") Toggle oldValue, Toggle newValue) {
if (nodeOrientationLtr.equals(newValue)) {
settings.userInterfaceOrientation().set(NodeOrientation.LEFT_TO_RIGHT);

View File

@@ -30,7 +30,7 @@
<RadioButton fx:id="nodeOrientationRtl" text="Right to Left" alignment="CENTER_RIGHT" toggleGroup="${nodeOrientation}"/>
</HBox>
<CheckBox fx:id="startHiddenCheckbox" text="%preferences.general.startHidden"/>
<CheckBox fx:id="startHiddenCheckbox" text="%preferences.general.startHidden" visible="${controller.trayMenuSupported}" managed="${controller.trayMenuSupported}"/>
<CheckBox fx:id="debugModeCheckbox" text="%preferences.general.debugLogging"/>
</children>