Skip to content

[WIP] Design ideas for group dialog #2643

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

Closed
wants to merge 1 commit into from
Closed

[WIP] Design ideas for group dialog #2643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 83 additions & 0 deletions src/main/java/org/jabref/gui/groups/addDialog/CreateGroups.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.Group?>
<?import javafx.scene.control.ButtonType?>
<?import javafx.scene.control.ColorPicker?>
<?import javafx.scene.control.DialogPane?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.TitledPane?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>


<DialogPane xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<buttonTypes>
<ButtonType fx:constant="APPLY" />
<ButtonType fx:constant="CANCEL" />
</buttonTypes>
<header>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="728.0" prefWidth="600.0">
<children>
<Group layoutX="3.0" layoutY="-17.0">
<children>
<Label layoutX="11.0" layoutY="31.0" text="General" />
<GridPane layoutX="11.0" layoutY="48.0" prefHeight="144.0" prefWidth="554.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="493.0" minWidth="317.0" prefWidth="472.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="60.0" minHeight="0.0" prefHeight="60.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="60.0" minHeight="0.0" prefHeight="0.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="Name" />
<TextField GridPane.columnIndex="1" />
<Label text="Description" GridPane.rowIndex="1" />
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
<ColorPicker GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="Color" GridPane.rowIndex="2" />
<Label text="Icon" GridPane.rowIndex="3" />
<TextField GridPane.columnIndex="1" GridPane.rowIndex="3" />
</children>
</GridPane>
</children>
</Group>
<TitledPane layoutX="14.0" layoutY="198.0" prefHeight="116.0" prefWidth="349.0" text="Group Definition">
<content>
<Group>
<children>
<RadioButton layoutX="-7.0" layoutY="77.0" mnemonicParsing="false" text="Dynamically group entries by searching for a keyword" />
<RadioButton layoutX="-7.0" layoutY="54.0" mnemonicParsing="false" prefHeight="17.0" prefWidth="292.0" text="Statically group entries by manual assignment" />
<RadioButton layoutX="-7.0" layoutY="102.0" mnemonicParsing="false" text="Dynamically group entries by a free forn search expression" />
<RadioButton layoutX="-7.0" layoutY="121.0" mnemonicParsing="false" prefHeight="23.0" prefWidth="172.0" text="Automatically create groups" />
</children>
</Group>
</content>
</TitledPane>
<TitledPane animated="false" layoutX="14.0" layoutY="329.0" text="Options">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children>
<Label layoutX="14.0" layoutY="22.0" text="Label" />
</children>
</AnchorPane>
</content>
</TitledPane>
<TitledPane collapsible="false" layoutX="14.0" layoutY="551.0" text="Description">
<content>
<TextArea prefHeight="128.0" prefWidth="528.0" />
</content>
</TitledPane>
</children>
</Pane>
</header>
</DialogPane>
19 changes: 19 additions & 0 deletions src/main/java/org/jabref/gui/groups/addDialog/actionbar.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.paint.*?>

<HBox alignment="CENTER_RIGHT" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="-1.0" prefWidth="-1.0" spacing="12.0" style="-fx-background-color: darkgray;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Button fx:id="backButton" mnemonicParsing="false" text="Back" />
<Button fx:id="nextButton" mnemonicParsing="false" text="Next" />
<Button fx:id="finishButton" mnemonicParsing="false" text="Finish" />
</children>
<padding>
<Insets bottom="12.0" left="12.0" right="12.0" top="12.0" />
</padding>
</HBox>
53 changes: 53 additions & 0 deletions src/main/java/org/jabref/gui/groups/addDialog/groupNameDefintionPage.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.gluonhq.charm.glisten.control.AutoCompleteTextField?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ColorPicker?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>

<BorderPane prefHeight="200.0" prefWidth="589.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<bottom>
<fx:include source="actionbar.fxml" />
</bottom>
<center>
<VBox prefHeight="131.0" prefWidth="591.0" BorderPane.alignment="CENTER">
<children>
<Label text="Enter group details" />
<GridPane prefHeight="114.0" prefWidth="532.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="70.0" minWidth="-Infinity" prefWidth="70.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="493.0" minWidth="317.0" prefWidth="368.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="-Infinity" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="60.0" minHeight="0.0" prefHeight="41.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="60.0" minHeight="0.0" prefHeight="43.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label text="Name" />
<TextField GridPane.columnIndex="1" />
<Label text="Description" GridPane.rowIndex="1" />
<TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Icon" GridPane.rowIndex="2" />
<AutoCompleteTextField maxHeight="-Infinity" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<ColorPicker GridPane.columnIndex="2" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="10.0" />
</GridPane.margin>
</ColorPicker>
</children>
</GridPane>
</children>
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
</VBox>
</center>
</BorderPane>
43 changes: 43 additions & 0 deletions src/main/java/org/jabref/gui/groups/addDialog/groupStartPage.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.TitledPane?>
<?import javafx.scene.control.ToggleGroup?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.VBox?>

<BorderPane prefHeight="409.0" prefWidth="399.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<bottom>
<fx:include source="actionbar.fxml" />
</bottom>
<center>
<VBox prefHeight="191.0" prefWidth="399.0" spacing="10.0" BorderPane.alignment="CENTER">
<children>
<Label text="Select Group Type" />
<RadioButton mnemonicParsing="false" prefHeight="17.0" prefWidth="292.0" text="Statically group entries by manual assignment">
<toggleGroup>
<ToggleGroup fx:id="groupsType" />
</toggleGroup>
</RadioButton>
<RadioButton mnemonicParsing="false" text="Dynamically group entries by searching for a keyword" toggleGroup="$groupsType" />
<RadioButton mnemonicParsing="false" text="Dynamically group entries by a free forn search expression" toggleGroup="$groupsType" />
<RadioButton mnemonicParsing="false" prefHeight="23.0" prefWidth="172.0" text="Automatically create groups" toggleGroup="$groupsType" />
<TitledPane animated="false" text="Options">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
<children>
<Label layoutX="23.0" layoutY="14.0" text="Sample Label" />
</children>
</AnchorPane>
</content>
</TitledPane>
</children>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</VBox>
</center>
</BorderPane>