Skip to content

Commit

Permalink
Minor corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
@calixtus
calixtus committed Jun 7, 2019
1 parent 86de348 commit 7f0c7a6
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 78 deletions.
159 changes: 82 additions & 77 deletions src/main/java/org/jabref/gui/preferences/FileTab.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,86 +8,91 @@
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.ToggleGroup?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<fx:root type="GridPane" xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="org.jabref.gui.preferences.FileTabView">

<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="10.0" prefWidth="250.0"/>
<ColumnConstraints hgrow="ALWAYS" maxWidth="-Infinity" minWidth="250.0"/>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="80.0"/>
<ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="30.0" minWidth="30.0" prefWidth="30.0"/>
</columnConstraints>
<rowConstraints>
<RowConstraints valignment="CENTER" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
</rowConstraints>
<children>
<Label styleClass="sectionHeader" text="%General"/>
<CheckBox text="%Open last edited libraries at startup" GridPane.columnSpan="3" GridPane.rowIndex="1"/>
<CheckBox text="%Backup old file when saving" GridPane.columnSpan="3" GridPane.rowIndex="2"/>
<Label text="%Do not wrap the following fields when saving" GridPane.rowIndex="3"/>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="3"/>
<RadioButton text="%Resolve strings for standard BibTeX fields only" GridPane.rowIndex="4">
<toggleGroup>
<ToggleGroup fx:id="stringsResolveToggleGroup"/>
</toggleGroup>
<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.FileTabView">
<children>
<Label styleClass="sectionHeader" text="%General" />
<CheckBox text="%Open last edited libraries at startup" />
<CheckBox text="%Backup old file when saving" />
<HBox spacing="8.0">
<children>
<Label text="%Do not wrap the following fields when saving" />
<TextField HBox.hgrow="ALWAYS" />
</children>
</HBox>
<RadioButton text="%Resolve strings for standard BibTeX fields only">
<toggleGroup>
<ToggleGroup fx:id="stringsResolveToggleGroup" />
</toggleGroup>
</RadioButton>
<RadioButton text="%Resolve strings for all fields except" toggleGroup="$stringsResolveToggleGroup"
GridPane.rowIndex="5"/>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="5"/>
<Label text="%Newline separator" GridPane.rowIndex="6"/>
<ComboBox prefWidth="200.0" GridPane.columnIndex="1" GridPane.hgrow="NEVER" GridPane.rowIndex="6"/>
<CheckBox text="%Always reformat BIB file on save and export" GridPane.columnSpan="3" GridPane.rowIndex="7"/>
<RadioButton alignment="TOP_LEFT" maxWidth="1.7976931348623157E308" toggleGroup="$stringsResolveToggleGroup">
<graphic>
<HBox>
<children>
<VBox maxWidth="1.7976931348623157E308" prefHeight="43.0" prefWidth="1581.0" spacing="10.0" HBox.hgrow="ALWAYS">
<children>
<Label text="\\%Resolve strings for all fields exception">
<opaqueInsets>
<Insets />
</opaqueInsets>
</Label>
<TextField />
</children>
</VBox>
</children>
<opaqueInsets>
<Insets left="4.0" />
</opaqueInsets>
</HBox>
</graphic>
</RadioButton>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<children>
<Label alignment="TOP_LEFT" text="%Newline separator" />
<ComboBox prefWidth="200.0" />
</children>
</HBox>
<CheckBox text="%Always reformat BIB file on save and export" />

<Label styleClass="sectionHeader" text="%External file links" GridPane.rowIndex="8"/>
<Label text="%Main file directory" GridPane.rowIndex="9"/>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="9"/>
<Button maxWidth="1.7976931348623157E308" text="%Browse" GridPane.columnIndex="2" GridPane.hgrow="SOMETIMES"
GridPane.rowIndex="9">
<GridPane.margin>
<Insets left="5.0" right="5.0"/>
</GridPane.margin>
</Button>
<CheckBox text="%Use the BIB file location as primary file directory" GridPane.columnSpan="3"
GridPane.rowIndex="10"/>
<Button GridPane.columnIndex="3" GridPane.rowIndex="10"/>
<RadioButton text="%Autolink files with names starting with the BibTeX key" GridPane.columnSpan="2147483647"
GridPane.rowIndex="11">
<toggleGroup>
<ToggleGroup fx:id="autolinkToggleGroup"/>
</toggleGroup>
<Label styleClass="sectionHeader" text="%External file links" />
<HBox alignment="CENTER_LEFT" spacing="10.0">
<children>
<Label text="%Main file directory" />
<TextField HBox.hgrow="ALWAYS" />
<Button maxWidth="1.7976931348623157E308" text="%Browse" />
</children>
</HBox>
<HBox alignment="CENTER_LEFT">
<children>
<CheckBox text="%Use the BIB file location as primary file directory" />
<HBox HBox.hgrow="ALWAYS" />
<Button />
</children>
</HBox>
<RadioButton text="%Autolink files with names starting with the BibTeX key">
<toggleGroup>
<ToggleGroup fx:id="autolinkToggleGroup" />
</toggleGroup>
</RadioButton>
<RadioButton text="%Autolink only files that match the BibTeX key" toggleGroup="$autolinkToggleGroup"
GridPane.columnSpan="2147483647" GridPane.rowIndex="12"/>
<RadioButton text="%Use regular expression search" toggleGroup="$autolinkToggleGroup" GridPane.rowIndex="13"/>
<TextField GridPane.columnIndex="1" GridPane.rowIndex="13"/>
<CheckBox text="%When opening file link, search for matching file if no link is defined" GridPane.columnSpan="3"
GridPane.rowIndex="14"/>
<CheckBox text="%Automatically open browse dialog when creating new file link" GridPane.columnSpan="3"
GridPane.rowIndex="15"/>
<Label styleClass="sectionHeader" text="%Autosave" GridPane.rowIndex="17"/>
<CheckBox text="%Autosave local libraries" GridPane.rowIndex="18"/>
<Button GridPane.columnIndex="3" GridPane.rowIndex="18"/>
</children>
<RadioButton text="%Autolink only files that match the BibTeX key" toggleGroup="$autolinkToggleGroup" />
<HBox alignment="CENTER_LEFT" spacing="10.0">
<children>
<RadioButton text="%Use regular expression search" toggleGroup="$autolinkToggleGroup" />
<TextField HBox.hgrow="ALWAYS" />
</children>
</HBox>
<CheckBox text="%When opening file link, search for matching file if no link is defined" />
<CheckBox text="%Automatically open browse dialog when creating new file link" />
<Label styleClass="sectionHeader" text="%Autosave" />
<HBox>
<children>
<CheckBox text="%Autosave local libraries" />
<HBox HBox.hgrow="ALWAYS" />
<Button />
</children>
</HBox>
</children>
</fx:root>
1 change: 0 additions & 1 deletion src/main/java/org/jabref/gui/preferences/GeneralTabView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ public GeneralTabView (DialogService dialogService, JabRefPreferences preference
ViewLoader.view(this)
.root(this)
.load();
// ??? Globals.getThemeLoader().installCss(this.getScene(), Globals.prefs);
}

public void initialize() {
Expand Down

0 comments on commit 7f0c7a6

Please sign in to comment.