-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Convert PreferenceDialog to MVVM #5033
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
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
427f74a
Refactor PreferenceDialog to MVVM with a split-pane
calixtus 8462cc7
Fixed wrong logging class
calixtus 106aea4
Fixed unused import
calixtus dbfb3d6
Added visual improvements
calixtus e8ce43a
Convertet GeneralTab to MVVM
calixtus 4e64bde
Removed old GeneralTab
calixtus 0aad34f
Removed old GeneralTab
calixtus e51571e
Added tooltip, fixed travis
calixtus 86de348
Added initial FileTab-MVVM
calixtus 7f0c7a6
Minor corrections
calixtus 968f028
Added FileTab, Reworked with VBox, comments and minor changes
calixtus 083fb55
Removed unused imports
calixtus a225444
Added FileTab and some minor corrections
calixtus 64d6712
Removed old FileTab
calixtus c91af3a
Fixed checkstyle
calixtus 414f00f
Added Validators and some clean-ups
calixtus a12a7c7
Refactor minor corrections
calixtus a1db40a
Merge remote-tracking branch 'upstream/master' into preferences_mvvm
calixtus ee1387d
Refactor final
calixtus 3570c9e
Refactor
calixtus 4fd959d
Added Injection of dialogService
calixtus 6e2e445
Fixed two glitches
calixtus 9776df2
Removed unused import
calixtus 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <?import javafx.scene.control.Button?> | ||
| <?import javafx.scene.control.CheckBox?> | ||
| <?import javafx.scene.control.ComboBox?> | ||
| <?import javafx.scene.control.Label?> | ||
| <?import javafx.scene.control.RadioButton?> | ||
| <?import javafx.scene.control.TextField?> | ||
| <?import javafx.scene.control.ToggleGroup?> | ||
| <?import javafx.scene.control.Tooltip?> | ||
| <?import javafx.scene.layout.HBox?> | ||
| <?import javafx.scene.layout.VBox?> | ||
|
|
||
| <fx:root prefWidth="650.0" spacing="10.0" type="VBox" | ||
| xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1" | ||
| fx:controller="org.jabref.gui.preferences.FileTabView"> | ||
| <fx:define> | ||
| <ToggleGroup fx:id="stringsResolveToggleGroup"/> | ||
| <ToggleGroup fx:id="autolinkToggleGroup"/> | ||
| </fx:define> | ||
| <children> | ||
| <Label styleClass="sectionHeader" text="%General"/> | ||
| <CheckBox fx:id="openLastStartup" text="%Open last edited libraries at startup"/> | ||
| <CheckBox fx:id="backupOldFile" text="%Backup old file when saving"/> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <children> | ||
| <Label text="%Do not wrap the following fields when saving"/> | ||
| <TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/> | ||
| </children> | ||
| </HBox> | ||
| <RadioButton fx:id="resolveStringsBibTex" text="%Resolve strings for standard BibTeX fields only" | ||
| toggleGroup="$stringsResolveToggleGroup"/> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <children> | ||
| <RadioButton fx:id="resolveStringsAll" alignment="TOP_LEFT" maxWidth="Infinity" | ||
| text="%Resolve strings for all fields except" toggleGroup="$stringsResolveToggleGroup"/> | ||
| <TextField fx:id="resolveStringsExcept" disable="${!resolveStringsAll.selected}" HBox.hgrow="ALWAYS"/> | ||
| </children> | ||
| </HBox> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <children> | ||
| <Label alignment="TOP_LEFT" text="%Newline separator"/> | ||
| <ComboBox fx:id="newLineSeparator" prefWidth="120.0"/> | ||
| </children> | ||
| </HBox> | ||
| <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/> | ||
| <Label styleClass="sectionHeader" text="%External file links"/> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <children> | ||
| <Label text="%Main file directory"/> | ||
| <TextField fx:id="mainFileDir" HBox.hgrow="ALWAYS"/> | ||
| <Button onAction="#mainFileDirBrowse" text="%Browse"/> | ||
| </children> | ||
| </HBox> | ||
| <CheckBox fx:id="useBibLocationAsPrimary" text="%Use the BIB file location as primary file directory"> | ||
| <tooltip> | ||
| <Tooltip | ||
| text="%When downloading files, or moving linked files to the file directory, prefer the BIB file location rather than the file directory set above"/> | ||
| </tooltip> | ||
| </CheckBox> | ||
| <RadioButton fx:id="autolinkFileStartsBibtex" text="%Autolink files with names starting with the BibTeX key" | ||
| toggleGroup="$autolinkToggleGroup"/> | ||
| <RadioButton fx:id="autolinkFileExactBibtex" text="%Autolink only files that match the BibTeX key" | ||
| toggleGroup="$autolinkToggleGroup"/> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <children> | ||
| <RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search" | ||
| toggleGroup="$autolinkToggleGroup"/> | ||
| <TextField fx:id="autolinkRegexKey" disable="${!autolinkUseRegex.selected}" HBox.hgrow="ALWAYS"/> | ||
| <Button fx:id="autolinkRegexHelp"/> | ||
| </children> | ||
| </HBox> | ||
| <CheckBox fx:id="searchFilesOnOpen" | ||
| text="%When opening file link, search for matching file if no link is defined"/> | ||
| <CheckBox fx:id="openBrowseOnCreate" text="%Automatically open browse dialog when creating new file link"/> | ||
| <Label styleClass="sectionHeader" text="%Autosave"/> | ||
| <HBox alignment="CENTER_LEFT" spacing="10.0"> | ||
| <children> | ||
| <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/> | ||
| <Button fx:id="autosaveLocalLibrariesHelp"/> | ||
| </children> | ||
| </HBox> | ||
| </children> | ||
| </fx:root> | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.