kauron/jstudy
kauron/jstudy
1
0
Fork 0
mirror of https://gitlab.com/kauron/jstudy synced 2024-12-22 16:33:33 +01:00
Code Issues Releases Wiki Activity

fxml: whitespace fix

Browse source
This commit is contained in:
Carlos Galindo 2019-09-11 21:02:54 +02:00
parent 9029ae6385
commit 6b8f5ef1ee
Signed by: kauron
GPG key ID: 83E68706DEE119A3
5 changed files with 351 additions and 338 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/resources/es/kauron/jstudy/view/edit.fxml
View file

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<VBox spacing="5.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.EditController"> <VBox spacing="5.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.EditController">
<children> <children>
<HBox alignment="CENTER_LEFT" spacing="5.0"> <HBox alignment="CENTER_LEFT" spacing="5.0">

9
src/main/resources/es/kauron/jstudy/view/settings.fxml
View file

@ -3,13 +3,14 @@
<?import com.jfoenix.controls.JFXCheckBox?> <?import com.jfoenix.controls.JFXCheckBox?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<VBox alignment="CENTER_LEFT" spacing="15.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.SettingsController"> <VBox alignment="CENTER_LEFT" spacing="15.0" xmlns="http://javafx.com/javafx/8.0.76-ea"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.SettingsController">
<children> <children>
<JFXCheckBox fx:id="repeatMistakes" text="_Repeat mistakes" /> <JFXCheckBox fx:id="repeatMistakes" text="_Repeat mistakes"/>
<JFXCheckBox fx:id="repeatImmediately" text="_Always repeat immediatly"/> <JFXCheckBox fx:id="repeatImmediately" text="_Always repeat immediatly"/>
<JFXCheckBox fx:id="showFeedback" text="Show _feedback while testing" /> <JFXCheckBox fx:id="showFeedback" text="Show _feedback while testing"/>
</children> </children>
<padding> <padding>
<Insets bottom="15.0" left="15.0" right="15.0" top="15.0" /> <Insets bottom="15.0" left="15.0" right="15.0" top="15.0"/>
</padding> </padding>
</VBox> </VBox>

65
src/main/resources/es/kauron/jstudy/view/table.fxml
View file

@ -4,104 +4,113 @@
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<HBox xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.TableController"> <HBox xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="es.kauron.jstudy.controller.TableController">
<children> <children>
<TableView fx:id="table" minHeight="-Infinity" minWidth="-Infinity" prefHeight="380.0" prefWidth="400.0" HBox.hgrow="ALWAYS"> <TableView fx:id="table" minHeight="-Infinity" minWidth="-Infinity" prefHeight="380.0" prefWidth="400.0"
HBox.hgrow="ALWAYS">
<columns> <columns>
<TableColumn fx:id="questionCol" prefWidth="75.0" text="Question" /> <TableColumn fx:id="questionCol" prefWidth="75.0" text="Question"/>
<TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer" /> <TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer"/>
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
</columnResizePolicy> </columnResizePolicy>
</TableView> </TableView>
<VBox spacing="5.0"> <VBox spacing="5.0">
<children> <children>
<Button fx:id="saveButton" alignment="CENTER" contentDisplay="CENTER" layoutX="10.0" layoutY="163.0" onAction="#onSaveAction" prefWidth="105.0"> <Button fx:id="saveButton" alignment="CENTER" contentDisplay="CENTER" layoutX="10.0" layoutY="163.0"
onAction="#onSaveAction" prefWidth="105.0">
<graphic> <graphic>
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../img/Save.png" /> <Image url="@../img/Save.png"/>
</image> </image>
</ImageView> </ImageView>
</graphic> </graphic>
<VBox.margin> <VBox.margin>
<Insets /> <Insets/>
</VBox.margin> </VBox.margin>
<tooltip> <tooltip>
<Tooltip text="Save table to a file for future use" /> <Tooltip text="Save table to a file for future use"/>
</tooltip> </tooltip>
</Button> </Button>
<Button defaultButton="true" onAction="#onAddAction" prefWidth="105.0" text="_Add"> <Button defaultButton="true" onAction="#onAddAction" prefWidth="105.0" text="_Add">
<tooltip> <tooltip>
<Tooltip text="Add a new entry to the table" /> <Tooltip text="Add a new entry to the table"/>
</tooltip></Button> </tooltip>
</Button>
<Button fx:id="editButton" alignment="TOP_LEFT" onAction="#onEditAction" prefWidth="105.0" text="_Edit"> <Button fx:id="editButton" alignment="TOP_LEFT" onAction="#onEditAction" prefWidth="105.0" text="_Edit">
<graphic> <graphic>
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../img/Edit.png" /> <Image url="@../img/Edit.png"/>
</image> </image>
</ImageView> </ImageView>
</graphic> </graphic>
<tooltip> <tooltip>
<Tooltip text="Edit the selected entry" /> <Tooltip text="Edit the selected entry"/>
</tooltip> </tooltip>
</Button> </Button>
<Button fx:id="swapButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onSwapAction" prefWidth="105.0" text="S_wap"> <Button fx:id="swapButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onSwapAction"
prefWidth="105.0" text="S_wap">
<graphic> <graphic>
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../img/Replace.png" /> <Image url="@../img/Replace.png"/>
</image> </image>
</ImageView> </ImageView>
</graphic> </graphic>
<tooltip> <tooltip>
<Tooltip text="Make the answer the question and viceversa" /> <Tooltip text="Make the answer the question and viceversa"/>
</tooltip> </tooltip>
</Button> </Button>
<Button fx:id="duplicateButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onDuplicateAction" prefWidth="105.0" text="D_uplicate"> <Button fx:id="duplicateButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onDuplicateAction"
prefWidth="105.0" text="D_uplicate">
<graphic> <graphic>
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../img/Copy.png" /> <Image url="@../img/Copy.png"/>
</image> </image>
</ImageView> </ImageView>
</graphic> </graphic>
<tooltip> <tooltip>
<Tooltip text="Make a copy (may appear at the end)" /> <Tooltip text="Make a copy (may appear at the end)"/>
</tooltip> </tooltip>
</Button> </Button>
<Button fx:id="deleteButton" alignment="TOP_LEFT" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete"> <Button fx:id="deleteButton" alignment="TOP_LEFT" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete">
<graphic> <graphic>
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../img/Delete.png" /> <Image url="@../img/Delete.png"/>
</image> </image>
</ImageView> </ImageView>
</graphic> </graphic>
<tooltip> <tooltip>
<Tooltip text="Delete all selected entries FOREVER" /> <Tooltip text="Delete all selected entries FOREVER"/>
</tooltip> </tooltip>
</Button> </Button>
<VBox alignment="BOTTOM_CENTER" spacing="5.0" VBox.vgrow="ALWAYS"> <VBox alignment="BOTTOM_CENTER" spacing="5.0" VBox.vgrow="ALWAYS">
<children> <children>
<Button fx:id="testSelectionButton" onAction="#onTestSelectionAction" prefWidth="105.0" text="Test _selected"> <Button fx:id="testSelectionButton" onAction="#onTestSelectionAction" prefWidth="105.0"
text="Test _selected">
<tooltip> <tooltip>
<Tooltip text="Begin a test with the selected rows" /> <Tooltip text="Begin a test with the selected rows"/>
</tooltip></Button> </tooltip>
</Button>
<Button layoutX="10.0" layoutY="273.0" onAction="#onTestAction" prefWidth="105.0" text="_Test all"> <Button layoutX="10.0" layoutY="273.0" onAction="#onTestAction" prefWidth="105.0" text="_Test all">
<tooltip> <tooltip>
<Tooltip text="Begin a test for the whole table" /> <Tooltip text="Begin a test for the whole table"/>
</tooltip></Button> </tooltip>
</Button>
</children> </children>
<VBox.margin> <VBox.margin>
<Insets /> <Insets/>
</VBox.margin> </VBox.margin>
</VBox> </VBox>
</children> </children>
<HBox.margin> <HBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</HBox.margin> </HBox.margin>
</VBox> </VBox>
</children> </children>

55
src/main/resources/es/kauron/jstudy/view/test.fxml
View file

@ -4,71 +4,78 @@
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<BorderPane xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.TestController" stylesheets="@../css/test.css"> <BorderPane xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="es.kauron.jstudy.controller.TestController" stylesheets="@../css/test.css">
<center> <center>
<VBox minHeight="280.0" minWidth="360.0" spacing="10.0"> <VBox minHeight="280.0" minWidth="360.0" spacing="10.0">
<children> <children>
<Label fx:id="question" text="Question" textOverrun="CLIP" wrapText="true" VBox.vgrow="ALWAYS"> <Label fx:id="question" text="Question" textOverrun="CLIP" wrapText="true" VBox.vgrow="ALWAYS">
<font> <font>
<Font size="30.0" /> <Font size="30.0"/>
</font> </font>
</Label> </Label>
<TextField fx:id="answer"> <TextField fx:id="answer">
<VBox.margin> <VBox.margin>
<Insets top="5.0" /> <Insets top="5.0"/>
</VBox.margin> </VBox.margin>
</TextField> </TextField>
<Separator /> <Separator/>
<HBox fx:id="feedback" alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS"> <HBox fx:id="feedback" alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
<children> <children>
<GridPane hgap="10.0" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS"> <GridPane hgap="10.0" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
<columnConstraints> <columnConstraints>
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" /> <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER"/>
<ColumnConstraints fillWidth="false" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" /> <ColumnConstraints fillWidth="false" hgrow="ALWAYS" maxWidth="1.7976931348623157E308"/>
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<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> </rowConstraints>
<children> <children>
<Label text="Previous question" wrapText="true" /> <Label text="Previous question" wrapText="true"/>
<Label fx:id="prevQuestion" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true" GridPane.columnIndex="1" /> <Label fx:id="prevQuestion" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true"
<Label text="Previous answer" wrapText="true" GridPane.rowIndex="1" /> GridPane.columnIndex="1"/>
<Label fx:id="prevAnswer" maxWidth="1.7976931348623157E308" styleClass="answer, feedbackText" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="1" /> <Label text="Previous answer" wrapText="true" GridPane.rowIndex="1"/>
<Label fx:id="correctLabel" text="Correct answer" wrapText="true" GridPane.rowIndex="2" /> <Label fx:id="prevAnswer" maxWidth="1.7976931348623157E308" styleClass="answer, feedbackText"
<Label fx:id="correctAnswer" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="2" /> wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
<Label fx:id="correctLabel" text="Correct answer" wrapText="true" GridPane.rowIndex="2"/>
<Label fx:id="correctAnswer" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true"
GridPane.columnIndex="1" GridPane.rowIndex="2"/>
</children> </children>
</GridPane> </GridPane>
</children> </children>
</HBox> </HBox>
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</BorderPane.margin> </BorderPane.margin>
</VBox> </VBox>
</center> </center>
<bottom> <bottom>
<VBox alignment="CENTER" BorderPane.alignment="CENTER"> <VBox alignment="CENTER" BorderPane.alignment="CENTER">
<children> <children>
<Separator prefWidth="200.0" /> <Separator prefWidth="200.0"/>
<Label fx:id="progressLabel" alignment="CENTER" contentDisplay="TOP" maxWidth="1.7976931348623157E308" text="1/40" /> <Label fx:id="progressLabel" alignment="CENTER" contentDisplay="TOP" maxWidth="1.7976931348623157E308"
<ProgressBar fx:id="progress" maxWidth="1.7976931348623157E308" progress="0.0" /> text="1/40"/>
<ProgressBar fx:id="progress" maxWidth="1.7976931348623157E308" progress="0.0"/>
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</BorderPane.margin> </BorderPane.margin>
</VBox> </VBox>
</bottom> </bottom>
<right> <right>
<VBox alignment="TOP_RIGHT" spacing="10.0" BorderPane.alignment="CENTER"> <VBox alignment="TOP_RIGHT" spacing="10.0" BorderPane.alignment="CENTER">
<children> <children>
<Button defaultButton="true" focusTraversable="false" onAction="#onNextAction" prefWidth="110.0" text="_Next" /> <Button defaultButton="true" focusTraversable="false" onAction="#onNextAction" prefWidth="110.0" text="_Next"/>
<Button fx:id="skipButton" cancelButton="true" focusTraversable="false" onAction="#onSkipAction" prefWidth="110.0" text="_Skip question" /> <Button fx:id="skipButton" cancelButton="true" focusTraversable="false" onAction="#onSkipAction"
<Button cancelButton="true" focusTraversable="false" layoutX="10.0" layoutY="48.0" onAction="#onEndAction" prefWidth="110.0" text="_End test" /> prefWidth="110.0" text="_Skip question"/>
<Button cancelButton="true" focusTraversable="false" layoutX="10.0" layoutY="48.0" onAction="#onEndAction"
prefWidth="110.0" text="_End test"/>
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</BorderPane.margin> </BorderPane.margin>
</VBox> </VBox>
</right> </right>