mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/1.6.0

Browse Source
This commit is contained in:
Armin Schrenk
2021-10-04 13:08:27 +02:00
parent c7d8cf5465 f5822fc568
commit 2200a100e0
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/cryptomator/ui/health/CheckListCellController.java
View File

@@ -1,7 +1,6 @@
package org.cryptomator.ui.health;
import com.tobiasdiez.easybind.EasyBind;
import com.tobiasdiez.easybind.Subscription;
import org.cryptomator.ui.common.FxController;
import javax.inject.Inject;
@@ -9,8 +8,6 @@ import javafx.beans.binding.Binding;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.scene.control.CheckBox;
import java.util.ArrayList;
import java.util.List;
public class CheckListCellController implements FxController {
@@ -18,7 +15,6 @@ public class CheckListCellController implements FxController {
private final ObjectProperty<Check> check;
private final Binding<String> checkName;
private final Binding<Boolean> checkRunnable;
private final List<Subscription> subscriptions;
/* FXML */
public CheckBox forRunSelectedCheckBox;
@@ -28,16 +24,14 @@ public class CheckListCellController implements FxController {
check = new SimpleObjectProperty<>();
checkRunnable = EasyBind.wrapNullable(check).mapObservable(Check::stateProperty).map(Check.CheckState.RUNNABLE::equals).orElse(false);
checkName = EasyBind.wrapNullable(check).map(Check::getName).orElse("");
subscriptions = new ArrayList<>();
}
public void initialize() {
subscriptions.add(EasyBind.subscribe(check, c -> {
forRunSelectedCheckBox.selectedProperty().unbind();
if (c != null) {
forRunSelectedCheckBox.selectedProperty().bindBidirectional(c.chosenForExecutionProperty());
forRunSelectedCheckBox.selectedProperty().addListener((observable, wasSelected, isSelected) -> {
if (check.get() != null) {
check.get().chosenForExecutionProperty().set(isSelected);
}
}));
});
}
public ObjectProperty<Check> checkProperty() {

1
src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
View File

@@ -42,7 +42,6 @@ abstract class PreferencesModule {
static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle) {
Stage stage = factory.create();
stage.setTitle(resourceBundle.getString("preferences.title"));
stage.setResizable(false);
return stage;
}