kauron/jstudy
kauron/jstudy
1
0
Fork 0
mirror of https://gitlab.com/kauron/jstudy synced 2024-11-13 15:43:44 +01:00
Code Issues Releases Wiki Activity

Table: added unsaved indicator

Browse source
This commit is contained in:
Carlos Galindo 2019-09-11 19:52:59 +02:00
parent b08e5aa1dc
commit ce4b58aa4f
Signed by: kauron
GPG key ID: 83E68706DEE119A3
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/es/kauron/jstudy/controller/Controller.java
View file

@ -4,6 +4,7 @@ import es.kauron.jstudy.Main;
import es.kauron.jstudy.model.AppPrefs; import es.kauron.jstudy.model.AppPrefs;
import es.kauron.jstudy.model.TestItem; import es.kauron.jstudy.model.TestItem;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
@ -163,7 +164,11 @@ public class Controller implements Initializable {
FXMLLoader loader = new FXMLLoader(Main.class.getResource("view/table.fxml")); FXMLLoader loader = new FXMLLoader(Main.class.getResource("view/table.fxml"));
Parent tableRoot = loader.load(); Parent tableRoot = loader.load();
((TableController) loader.getController()).setData(name, list, this, file); TableController tController = loader.getController();
tController.setData(name, list, this, file);
tab.textProperty().bind(Bindings.format("%s%s",
Bindings.when(tController.saved).then("").otherwise("*"),
tController.name));
tabMap.put(tab, loader.getController()); tabMap.put(tab, loader.getController());
MenuItem duplicate = new MenuItem("Duplicate table"); MenuItem duplicate = new MenuItem("Duplicate table");

11
src/main/java/es/kauron/jstudy/controller/TableController.java
View file

@ -5,6 +5,8 @@ import es.kauron.jstudy.model.AppPrefs;
import es.kauron.jstudy.model.TestItem; import es.kauron.jstudy.model.TestItem;
import javafx.beans.property.BooleanProperty; import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener; import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
@ -40,7 +42,7 @@ public class TableController implements Initializable {
private ObservableList<TestItem> data; private ObservableList<TestItem> data;
private Controller parent; private Controller parent;
private File file; private File file;
private String name; StringProperty name;
BooleanProperty saved = new SimpleBooleanProperty(); BooleanProperty saved = new SimpleBooleanProperty();
@Override @Override
@ -59,7 +61,7 @@ public class TableController implements Initializable {
} }
void setData(String name, List<TestItem> list, Controller controller, File file) { void setData(String name, List<TestItem> list, Controller controller, File file) {
this.name = name; this.name = new SimpleStringProperty(name);
this.data = FXCollections.observableArrayList(list); this.data = FXCollections.observableArrayList(list);
this.parent = controller; this.parent = controller;
table.setItems(data); table.setItems(data);
@ -68,7 +70,7 @@ public class TableController implements Initializable {
} }
List<TestItem> getData() {return new ArrayList<>(data);} List<TestItem> getData() {return new ArrayList<>(data);}
String getName() {return file == null ? name : file.getName().substring(0, file.getName().lastIndexOf('.'));} String getName() {return name.get();}
@FXML @FXML
protected void onSaveAction(ActionEvent event) { protected void onSaveAction(ActionEvent event) {
@ -76,12 +78,13 @@ public class TableController implements Initializable {
FileChooser chooser = new FileChooser(); FileChooser chooser = new FileChooser();
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("JStudy file", "*.jsdb")); chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("JStudy file", "*.jsdb"));
if (AppPrefs.lastDir != null) chooser.setInitialDirectory(AppPrefs.lastDir); if (AppPrefs.lastDir != null) chooser.setInitialDirectory(AppPrefs.lastDir);
chooser.setInitialFileName(name); chooser.setInitialFileName(name.get());
file = chooser.showSaveDialog(table.getScene().getWindow()); file = chooser.showSaveDialog(table.getScene().getWindow());
if (!file.getName().endsWith(".jsdb")) if (!file.getName().endsWith(".jsdb"))
file = new File(file.getPath() + ".jsdb"); file = new File(file.getPath() + ".jsdb");
if (file != null) if (file != null)
AppPrefs.lastDir = file.getParentFile(); AppPrefs.lastDir = file.getParentFile();
name.set(file.getName().substring(0, file.getName().lastIndexOf('.')));
} }
if (file == null) return; if (file == null) return;
TestItem.saveTo(file, data); TestItem.saveTo(file, data);