bene
/
Fotoverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfixes

This commit is contained in:
bene.rr41 2024-06-04 14:54:32 +02:00
parent aeeff3b116
commit 7085d8abfb
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/emmerts/fotoverwaltung/FileTreeComponent.java
View File

@ -31,7 +31,10 @@ public class FileTreeComponent extends VBox {
controller.id = getId(); controller.id = getId();
String defaultDirectory = MainApplication.config.getString("directories."+id); String defaultDirectory = MainApplication.config.getString("directories."+id);
if(defaultDirectory != null) { if(defaultDirectory != null) {
openDirectory(new File(defaultDirectory)); File directory = new File(defaultDirectory);
if(!directory.exists())
directory = new File(System.getProperty("user.dir"));
openDirectory(directory);
} }
if(id.equals("fileTreeCR2")) if(id.equals("fileTreeCR2"))
controller.treeView.setDisable(true); controller.treeView.setDisable(true);

8
src/main/java/de/emmerts/fotoverwaltung/FileTreeController.java
View File

@ -104,7 +104,7 @@ public class FileTreeController{
if(allowAllFileExtensions.isSelected()) if(allowAllFileExtensions.isSelected())
allFiles = root.listFiles(); allFiles = root.listFiles();
else else
allFiles = root.listFiles(ff); allFiles = root.listFiles(fileFilterImages);
for (File file : allFiles) { for (File file : allFiles) {
if(file.isDirectory()) if(file.isDirectory())
directories.add(getFileList(file, false)); directories.add(getFileList(file, false));
@ -118,11 +118,14 @@ public class FileTreeController{
return temp; return temp;
} }
FileFilter ff = fileForFilter -> { FileFilter fileFilterImages = fileForFilter -> {
if(fileForFilter.isDirectory()) if(fileForFilter.isDirectory())
return true; return true;
ArrayList<String> allowedExtensions = new ArrayList<>(); ArrayList<String> allowedExtensions = new ArrayList<>();
if(!id.equals("fileTreeJPG")) {
allowedExtensions.add(".cr2"); allowedExtensions.add(".cr2");
}
allowedExtensions.add(".jpg"); allowedExtensions.add(".jpg");
allowedExtensions.add(".jpeg"); allowedExtensions.add(".jpeg");
allowedExtensions.add(".gif"); allowedExtensions.add(".gif");
@ -134,6 +137,7 @@ public class FileTreeController{
return false; return false;
}; };
public void displayTreeMap(TreeMap<String, File> files) { public void displayTreeMap(TreeMap<String, File> files) {
FileTreeItemComponent temp = new FileTreeItemComponent(files.firstEntry().getValue().getParentFile().getParentFile()); FileTreeItemComponent temp = new FileTreeItemComponent(files.firstEntry().getValue().getParentFile().getParentFile());
treeView.setRoot(temp); treeView.setRoot(temp);

6
src/main/java/de/emmerts/fotoverwaltung/MainApplication.java
View File

@ -7,6 +7,7 @@ import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue; import javafx.beans.value.ObservableValue;
import javafx.event.EventHandler; import javafx.event.EventHandler;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType; import javafx.scene.control.ButtonType;
@ -39,13 +40,16 @@ public class MainApplication extends Application {
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("MainApplication.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("MainApplication.fxml"));
try { try {
File ini = new File(iniFilename);
if(ini.exists())
config.read(new FileReader(iniFilename)); config.read(new FileReader(iniFilename));
} catch (ConfigurationException e) { } catch (ConfigurationException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
int lastWidth = Integer.parseInt(config.getString("window.lastWidth")); int lastWidth = Integer.parseInt(config.getString("window.lastWidth"));
int lastHeight = Integer.parseInt(config.getString("window.lastHeight")); int lastHeight = Integer.parseInt(config.getString("window.lastHeight"));
Scene scene = new Scene(fxmlLoader.load(), lastWidth, lastHeight); Parent parent = fxmlLoader.load();
Scene scene = new Scene(parent, lastWidth, lastHeight);
scene.widthProperty().addListener(new ChangeListener<Number>() { scene.widthProperty().addListener(new ChangeListener<Number>() {
@Override @Override
public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) { public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {

4
src/main/java/de/emmerts/fotoverwaltung/MainController.java
View File

@ -39,8 +39,8 @@ public class MainController {
{ {
fileTreeCR2.initialize("fileTreeCR2"); fileTreeCR2.initialize("fileTreeCR2");
fileTreeJPG.initialize("fileTreeJPG"); fileTreeJPG.initialize("fileTreeJPG");
File f = new File("C:\\Users\\Bene\\IdeaProjects\\Fotoverwaltung\\src\\main\\resources\\de\\emmerts\\fotoverwaltung\\image.png"); //File f = new File("C:\\Users\\Bene\\IdeaProjects\\Fotoverwaltung\\src\\main\\resources\\de\\emmerts\\fotoverwaltung\\image.png");
displayImageFile(f); //displayImageFile(f);
//todo Image aus Ressource auslesen: //todo Image aus Ressource auslesen:
//Image img= new Image(getClass().getResource("/path/in/your/package/structure/icon.png").toString()); //Image img= new Image(getClass().getResource("/path/in/your/package/structure/icon.png").toString());
} }