-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored subtile changes to optics of library properties (#5969)
- Loading branch information
Showing
5 changed files
with
101 additions
and
80 deletions.
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
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
130 changes: 72 additions & 58 deletions
130
src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
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 |
|---|---|---|
| @@ -1,69 +1,83 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <?import javafx.scene.control.*?> | ||
| <?import javafx.scene.layout.*?> | ||
| <?import javafx.geometry.Insets?> | ||
|
|
||
| <DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView"> | ||
| <?import javafx.scene.control.Button ?> | ||
| <?import javafx.scene.control.ButtonType?> | ||
| <?import javafx.scene.control.CheckBox?> | ||
| <?import javafx.scene.control.ComboBox?> | ||
| <?import javafx.scene.control.DialogPane?> | ||
| <?import javafx.scene.control.Label?> | ||
| <?import javafx.scene.control.ScrollPane?> | ||
| <?import javafx.scene.control.TextField?> | ||
|
|
||
| <?import javafx.scene.layout.ColumnConstraints?> | ||
| <?import javafx.scene.layout.GridPane?> | ||
| <?import javafx.scene.layout.RowConstraints?> | ||
| <?import javafx.scene.layout.VBox?> | ||
|
|
||
| <DialogPane minHeight="-Infinity" prefHeight="700.0" prefWidth="800.0" | ||
| xmlns="http://javafx.com/javafx/10.0.2-internal" | ||
| xmlns:fx="http://javafx.com/fxml/1" | ||
| fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView"> | ||
| <content> | ||
| <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0"> | ||
| <children> | ||
| <GridPane minHeight="-Infinity"> | ||
| <ScrollPane fitToHeight="true" fitToWidth="true"> | ||
| <VBox fx:id="contentVbox" minWidth="-Infinity" spacing="10.0"> | ||
| <padding> | ||
| <Insets bottom="4.0" left="4.0" right="4.0" top="4.0"/> | ||
| </padding> | ||
| <GridPane hgap="10.0" vgap="4.0"> | ||
| <columnConstraints> | ||
| <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" /> | ||
| <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" /> | ||
| <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" /> | ||
| <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/> | ||
| <ColumnConstraints hgrow="SOMETIMES"/> | ||
| <ColumnConstraints hgrow="SOMETIMES"/> | ||
| </columnConstraints> | ||
| <rowConstraints> | ||
| <RowConstraints minHeight="25.0" prefHeight="65.0" vgrow="SOMETIMES" /> | ||
| <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" /> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" /> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" /> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> | ||
| <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="ALWAYS" /> | ||
| <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" /> | ||
| <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" /> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/> | ||
| </rowConstraints> | ||
| <children> | ||
| <GridPane vgap="5.0" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS"> | ||
| <columnConstraints> | ||
| <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" /> | ||
| <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" /> | ||
| <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" /> | ||
| </columnConstraints> | ||
| <Label text="%Library encoding" /> | ||
| <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" /> | ||
| <Label text="%Library mode" GridPane.rowIndex="2" /> | ||
| <ComboBox fx:id="databaseMode" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" /> | ||
| <columnConstraints> | ||
| <ColumnConstraints /> | ||
| <ColumnConstraints /> | ||
| </columnConstraints> | ||
| <rowConstraints> | ||
| <RowConstraints /> | ||
| <RowConstraints /> | ||
| <RowConstraints /> | ||
| </rowConstraints> | ||
| </GridPane> | ||
| <Label text="%General file directory" GridPane.rowIndex="2" /> | ||
| <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" /> | ||
| <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" /> | ||
| <Label text="%User-specific file directory" GridPane.rowIndex="3" /> | ||
| <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="3" /> | ||
| <Button fx:id="browseUserSpefiicFileDir" mnemonicParsing="false" onAction="#browseUserSpecificFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="3" /> | ||
| <Label text="%LaTex file directory" GridPane.rowIndex="4" /> | ||
| <TextField fx:id="laTexFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="4" /> | ||
| <Button fx:id="browseLatexFileDir" mnemonicParsing="false" onAction="#browseLaTexFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="4" /> | ||
| <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="1" /> | ||
| <Label alignment="TOP_LEFT" styleClass="sectionHeader" text="%Library protection" GridPane.columnSpan="3" GridPane.rowIndex="5" /> | ||
| <CheckBox fx:id="protect" mnemonicParsing="false" text="%Refuse to save the library before external changes have been reviewed." GridPane.columnSpan="3" GridPane.rowIndex="6" /> | ||
| <Label styleClass="sectionHeader" text="%Export sort order" GridPane.rowIndex="7" /> | ||
| </children> | ||
|
|
||
| <Label text="%General" GridPane.columnSpan="3" GridPane.rowIndex="0" styleClass="sectionHeader"/> | ||
|
|
||
| <Label text="%Library encoding" GridPane.columnIndex="0" GridPane.rowIndex="1"/> | ||
| <ComboBox fx:id="encoding" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" | ||
| prefWidth="150.0"/> | ||
|
|
||
| <Label text="%Library mode" GridPane.columnIndex="0" GridPane.rowIndex="2"/> | ||
| <ComboBox fx:id="databaseMode" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" | ||
| GridPane.rowIndex="2" prefWidth="150.0"/> | ||
|
|
||
| <Label text="%Override default file directories" GridPane.columnSpan="3" GridPane.rowIndex="3" | ||
| styleClass="sectionHeader"/> | ||
|
|
||
| <Label text="%General file directory" GridPane.columnIndex="0" GridPane.rowIndex="4"/> | ||
| <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="4"/> | ||
| <Button text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="4" | ||
| onAction="#browseGeneralFileDirectory"/> | ||
|
|
||
| <Label text="%User-specific file directory" GridPane.columnIndex="0" GridPane.rowIndex="5"/> | ||
| <TextField fx:id="userSpecificFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="5"/> | ||
| <Button text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="5" | ||
| onAction="#browseUserSpecificFileDirectory"/> | ||
|
|
||
| <Label text="%LaTex file directory" GridPane.columnIndex="0" GridPane.rowIndex="6"/> | ||
| <TextField fx:id="laTexFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="6"/> | ||
| <Button text="%Browse" onAction="#browseLaTexFileDirectory" GridPane.columnIndex="2" | ||
| GridPane.rowIndex="6"/> | ||
| </GridPane> | ||
| </children> | ||
| </VBox> | ||
|
|
||
| <Label text="%Library protection" styleClass="sectionHeader"/> | ||
| <CheckBox fx:id="protect" | ||
| text="%Refuse to save the library before external changes have been reviewed."/> | ||
| <Label styleClass="sectionHeader" text="%Export sort order"/> | ||
| </VBox> | ||
| </ScrollPane> | ||
| </content> | ||
| <buttonTypes> | ||
| <ButtonType fx:constant="CANCEL" /> | ||
| <ButtonType fx:constant="OK" /> | ||
| </buttonTypes> | ||
| <ButtonType fx:constant="CANCEL"/> | ||
| <ButtonType fx:constant="OK"/> | ||
| </DialogPane> |
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