Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

javafx replacement for file dialog #3005

Merged
merged 55 commits into from
Mar 26, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
67ed3aa
javafx replacement for file dialog
Siedlerchr Jul 6, 2017
f4a58c3
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jul 15, 2017
136a844
Add some core structure for selectFilesDialog
Siedlerchr Jul 15, 2017
b6d43dc
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jul 31, 2017
b3d7641
Add Properties for binding
Siedlerchr Jul 31, 2017
24c35c5
add getters
Siedlerchr Jul 31, 2017
8dca324
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Aug 6, 2017
dfde523
Renaming, use properties in controller
Siedlerchr Aug 6, 2017
6633d61
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Sep 23, 2017
e099c2a
port some more code
Siedlerchr Sep 23, 2017
2296ea5
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Nov 1, 2017
982b475
Asssign combobox selected value property
Siedlerchr Nov 1, 2017
3b7e52d
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Nov 3, 2017
dbca24f
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Nov 19, 2017
9f5036d
fix some formatting
Siedlerchr Nov 19, 2017
5b797d4
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Dec 29, 2017
81c25ec
make getController public to get viewModel
Siedlerchr Dec 29, 2017
d4aed9b
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jan 2, 2018
e71181a
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jan 2, 2018
d3daaa6
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jan 2, 2018
e326bcf
add enum with config values instead of booleans
Siedlerchr Jan 3, 2018
e64b406
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jan 14, 2018
32c3db2
Fix depdendency injection
Siedlerchr Jan 14, 2018
3f85f65
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr Jan 24, 2018
34d4251
Merge remote-tracking branch 'origin/master' into selectFilesDlg
tobiasdiez Feb 6, 2018
514cd49
Rework
tobiasdiez Feb 6, 2018
5305d43
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr Mar 17, 2018
cb7096c
Merge remote-tracking branch 'upstream/master' into maintable-beta
Siedlerchr Mar 17, 2018
fbf8fdb
Create Wrapper to pass LinkedFile around
Siedlerchr Mar 17, 2018
cc6f3b9
fix some indentations
Siedlerchr Mar 17, 2018
ae7af40
remove open unknown external file type dialog
Siedlerchr Mar 17, 2018
16f0b11
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr Mar 18, 2018
3f7c282
fix indentation
Siedlerchr Mar 18, 2018
9d2df14
convert attachFileDialog to javafx
Siedlerchr Mar 18, 2018
38e087e
reformat
Siedlerchr Mar 18, 2018
298a28f
Mark old filelist as deprecated
Siedlerchr Mar 19, 2018
773d4cc
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr Mar 19, 2018
39a1092
fix checkstyle
Siedlerchr Mar 19, 2018
058aaf6
fix checkstyle again
Siedlerchr Mar 19, 2018
210d645
add changelog
Siedlerchr Mar 19, 2018
ce8b9c2
adjust indentation
Siedlerchr Mar 20, 2018
3450c8d
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr Mar 24, 2018
b5816bc
convert to new FXML dialog model funcionality
Siedlerchr Mar 24, 2018
e1f85fd
fix empty lines
Siedlerchr Mar 24, 2018
8cb812d
fix checkstyle
Siedlerchr Mar 24, 2018
0be175c
Fix viewModel NPE in copyFiles Action and linkedfilesEditDialog
Siedlerchr Mar 24, 2018
45697c4
Add close button in copy linked files
Siedlerchr Mar 24, 2018
7d627ff
fix checkstyle
Siedlerchr Mar 24, 2018
3189b33
Rename and reformat
Siedlerchr Mar 25, 2018
f579772
remove changelog
Siedlerchr Mar 25, 2018
95fdd2d
remove close method
Siedlerchr Mar 25, 2018
bb22a5e
change some odd looking assigments
Siedlerchr Mar 25, 2018
035d9e2
renaming
Siedlerchr Mar 25, 2018
ce3d5e6
forgotten rename
Siedlerchr Mar 25, 2018
c27c4d2
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr Mar 26, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ public LinkedFileEditDialogView(LinkedFilesWrapper wrapper) {
private void initialize() {

viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences);
fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
description.textProperty().bindBidirectional(viewModel.descriptionProperty());
link.textProperty().bindBidirectional(viewModel.linkProperty());
fileType.valueProperty().bindBidirectional(viewModel.getSelectedExternalFileType());
fileType.itemsProperty().bindBidirectional(viewModel.externalFileType());
description.textProperty().bindBidirectional(viewModel.description());
link.textProperty().bindBidirectional(viewModel.link());
fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileType());
}

@FXML
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ private void checkExtension() {
}

public void openBrowseDialog() {
String fileText = linkProperty().get();
String fileText = link().get();

Optional<Path> file = FileHelper.expandFilename(database, fileText, preferences.getFileDirectoryPreferences());

Path workingDir = file.orElse(Paths.get(preferences.get(JabRefPreferences.WORKING_DIRECTORY)));
String fileName = Paths.get(fileText).getFileName().toString();

FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
.withInitialDirectory(workingDir)
.withInitialFileName(fileName)
.build();
.withInitialDirectory(workingDir)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tobiasdiez this is how the indentation at column level works: As I said before it's not possible to align it at the dot position. So when I use indencation on column all things are then wrapped after Builder (Github doesn't show it that wide).

.withInitialFileName(fileName)
.build();

dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> {
// Store the directory for next time:
Expand All @@ -81,7 +81,7 @@ public void openBrowseDialog() {
List<Path> fileDirectories = database.getFileDirectoriesAsPaths(preferences.getFileDirectoryPreferences());
path = FileUtil.shortenFileName(path, fileDirectories);

linkProperty().set(path.toString());
link().set(path.toString());
checkExtension();
});
}
Expand All @@ -102,19 +102,19 @@ public void setValues(LinkedFile entry) {
}
}

public StringProperty linkProperty() {
public StringProperty link() {
return linkProperty;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I wasn't clear enough. The private field should be called link with public methods linkProperty() and get/setLink, with the latter optional.

}

public StringProperty descriptionProperty() {
public StringProperty description() {
return descriptionProperty;
}

public ListProperty<ExternalFileType> externalFileTypeProperty() {
public ListProperty<ExternalFileType> externalFileType() {
return externalfilesTypes;
}

public ObjectProperty<ExternalFileType> getSelectedExternalFileType() {
public ObjectProperty<ExternalFileType> selectedExternalFileType() {
return selectedExternalFileType;
}

Expand Down