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.

Sign up for GitHub

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

Convert PreferenceDialog to MVVM #5033

Merged
merged 23 commits into from
Jun 14, 2019
Merged

Convert PreferenceDialog to MVVM #5033

Changes from 1 commit
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 Jun 5, 2019
8462cc7
Fixed wrong logging class
calixtus Jun 5, 2019
106aea4
Fixed unused import
calixtus Jun 5, 2019
dbfb3d6
Added visual improvements
calixtus Jun 6, 2019
e8ce43a
Convertet GeneralTab to MVVM
calixtus Jun 6, 2019
4e64bde
Removed old GeneralTab
calixtus Jun 6, 2019
0aad34f
Removed old GeneralTab
calixtus Jun 6, 2019
e51571e
Added tooltip, fixed travis
calixtus Jun 6, 2019
86de348
Added initial FileTab-MVVM
calixtus Jun 7, 2019
7f0c7a6
Minor corrections
calixtus Jun 7, 2019
968f028
Added FileTab, Reworked with VBox, comments and minor changes
calixtus Jun 8, 2019
083fb55
Removed unused imports
calixtus Jun 8, 2019
a225444
Added FileTab and some minor corrections
calixtus Jun 8, 2019
64d6712
Removed old FileTab
calixtus Jun 8, 2019
c91af3a
Fixed checkstyle
calixtus Jun 8, 2019
414f00f
Added Validators and some clean-ups
calixtus Jun 9, 2019
a12a7c7
Refactor minor corrections
calixtus Jun 9, 2019
a1db40a
Merge remote-tracking branch 'upstream/master' into preferences_mvvm
calixtus Jun 9, 2019
ee1387d
Refactor final
calixtus Jun 9, 2019
3570c9e
Refactor
calixtus Jun 12, 2019
4fd959d
Added Injection of dialogService
calixtus Jun 14, 2019
6e2e445
Fixed two glitches
calixtus Jun 14, 2019
9776df2
Removed unused import
calixtus Jun 14, 2019
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
9 changes: 7 additions & 2 deletions src/main/java/org/jabref/gui/preferences/FileTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<?import javafx.scene.control.Tooltip?>
<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>
Expand All @@ -31,7 +32,7 @@
<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"/>
text="%Resolve strings for all fields except" toggleGroup="$stringsResolveToggleGroup"/>
calixtus marked this conversation as resolved.
Show resolved Hide resolved
<TextField fx:id="resolveStringsExcept" disable="${!resolveStringsAll.selected}" HBox.hgrow="ALWAYS"/>
</children>
</HBox>
Expand All @@ -51,7 +52,11 @@
<Button onAction="#mainFileDirBrowse" text="%Browse"/>
</children>
</HBox>
<CheckBox fx:id="useBibLocationAsPrimary" text="%Use the BIB file location as primary file directory"/>
<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"
Expand Down