-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
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 f4a58c3
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr 136a844
Add some core structure for selectFilesDialog
Siedlerchr b6d43dc
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr b3d7641
Add Properties for binding
Siedlerchr 24c35c5
add getters
Siedlerchr 8dca324
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr dfde523
Renaming, use properties in controller
Siedlerchr 6633d61
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr e099c2a
port some more code
Siedlerchr 2296ea5
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr 982b475
Asssign combobox selected value property
Siedlerchr 3b7e52d
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr dbca24f
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr 9f5036d
fix some formatting
Siedlerchr 5b797d4
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr 81c25ec
make getController public to get viewModel
Siedlerchr d4aed9b
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr e71181a
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr d3daaa6
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr e326bcf
add enum with config values instead of booleans
Siedlerchr e64b406
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr 32c3db2
Fix depdendency injection
Siedlerchr 3f85f65
Merge remote-tracking branch 'upstream/master' into selectFilesDlg
Siedlerchr 34d4251
Merge remote-tracking branch 'origin/master' into selectFilesDlg
tobiasdiez 514cd49
Rework
tobiasdiez 5305d43
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr cb7096c
Merge remote-tracking branch 'upstream/master' into maintable-beta
Siedlerchr fbf8fdb
Create Wrapper to pass LinkedFile around
Siedlerchr cc6f3b9
fix some indentations
Siedlerchr ae7af40
remove open unknown external file type dialog
Siedlerchr 16f0b11
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr 3f7c282
fix indentation
Siedlerchr 9d2df14
convert attachFileDialog to javafx
Siedlerchr 38e087e
reformat
Siedlerchr 298a28f
Mark old filelist as deprecated
Siedlerchr 773d4cc
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr 39a1092
fix checkstyle
Siedlerchr 058aaf6
fix checkstyle again
Siedlerchr 210d645
add changelog
Siedlerchr ce8b9c2
adjust indentation
Siedlerchr 3450c8d
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr b5816bc
convert to new FXML dialog model funcionality
Siedlerchr e1f85fd
fix empty lines
Siedlerchr 8cb812d
fix checkstyle
Siedlerchr 0be175c
Fix viewModel NPE in copyFiles Action and linkedfilesEditDialog
Siedlerchr 45697c4
Add close button in copy linked files
Siedlerchr 7d627ff
fix checkstyle
Siedlerchr 3189b33
Rename and reformat
Siedlerchr f579772
remove changelog
Siedlerchr 95fdd2d
remove close method
Siedlerchr bb22a5e
change some odd looking assigments
Siedlerchr 035d9e2
renaming
Siedlerchr ce3d5e6
forgotten rename
Siedlerchr c27c4d2
Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…
Siedlerchr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
.withInitialFileName(fileName) | ||
.build(); | ||
|
||
dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(path -> { | ||
// Store the directory for next time: | ||
|
@@ -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(); | ||
}); | ||
} | ||
|
@@ -102,19 +102,19 @@ public void setValues(LinkedFile entry) { | |
} | ||
} | ||
|
||
public StringProperty linkProperty() { | ||
public StringProperty link() { | ||
return linkProperty; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry, I wasn't clear enough. The private field should be called |
||
} | ||
|
||
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; | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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).