mirror of
https://gitlab.com/kauron/jstudy
synced 2024-12-22 08:23:33 +01:00
fxml: whitespace fix
This commit is contained in:
Carlos Galindo
parent
9029ae6385
commit
6b8f5ef1ee
GPG key ID:
83E68706DEE119A3
5 changed files with 351 additions and 338 deletions
|
|
@ -1,12 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.geometry.Insets?>
|
||||
<?import javafx.scene.control.Button?>
|
||||
<?import javafx.scene.control.Label?>
|
||||
<?import javafx.scene.control.TextField?>
|
||||
<?import javafx.scene.layout.HBox?>
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
<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>
|
||||
<HBox alignment="CENTER_LEFT" spacing="5.0">
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
<?import com.jfoenix.controls.JFXCheckBox?>
|
||||
<?import javafx.geometry.Insets?>
|
||||
<?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>
|
||||
<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="showFeedback" text="Show _feedback while testing" />
|
||||
<JFXCheckBox fx:id="showFeedback" text="Show _feedback while testing"/>
|
||||
</children>
|
||||
<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>
|
||||
</VBox>
|
||||
|
|
|
|||
|
|
@ -4,104 +4,113 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.image.*?>
|
||||
<?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>
|
||||
<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>
|
||||
<TableColumn fx:id="questionCol" prefWidth="75.0" text="Question" />
|
||||
<TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer" />
|
||||
<TableColumn fx:id="questionCol" prefWidth="75.0" text="Question"/>
|
||||
<TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer"/>
|
||||
</columns>
|
||||
<columnResizePolicy>
|
||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
|
||||
</columnResizePolicy>
|
||||
</TableView>
|
||||
<VBox spacing="5.0">
|
||||
<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>
|
||||
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
||||
<image>
|
||||
<Image url="@../img/Save.png" />
|
||||
<Image url="@../img/Save.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
<VBox.margin>
|
||||
<Insets />
|
||||
<Insets/>
|
||||
</VBox.margin>
|
||||
<tooltip>
|
||||
<Tooltip text="Save table to a file for future use" />
|
||||
<Tooltip text="Save table to a file for future use"/>
|
||||
</tooltip>
|
||||
</Button>
|
||||
<Button defaultButton="true" onAction="#onAddAction" prefWidth="105.0" text="_Add">
|
||||
<tooltip>
|
||||
<Tooltip text="Add a new entry to the table" />
|
||||
</tooltip></Button>
|
||||
<Tooltip text="Add a new entry to the table"/>
|
||||
</tooltip>
|
||||
</Button>
|
||||
<Button fx:id="editButton" alignment="TOP_LEFT" onAction="#onEditAction" prefWidth="105.0" text="_Edit">
|
||||
<graphic>
|
||||
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
|
||||
<image>
|
||||
<Image url="@../img/Edit.png" />
|
||||
<Image url="@../img/Edit.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
<tooltip>
|
||||
<Tooltip text="Edit the selected entry" />
|
||||
<Tooltip text="Edit the selected entry"/>
|
||||
</tooltip>
|
||||
</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>
|
||||
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
|
||||
<image>
|
||||
<Image url="@../img/Replace.png" />
|
||||
<Image url="@../img/Replace.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
<tooltip>
|
||||
<Tooltip text="Make the answer the question and viceversa" />
|
||||
<Tooltip text="Make the answer the question and viceversa"/>
|
||||
</tooltip>
|
||||
</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>
|
||||
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
|
||||
<image>
|
||||
<Image url="@../img/Copy.png" />
|
||||
<Image url="@../img/Copy.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
<tooltip>
|
||||
<Tooltip text="Make a copy (may appear at the end)" />
|
||||
<Tooltip text="Make a copy (may appear at the end)"/>
|
||||
</tooltip>
|
||||
</Button>
|
||||
<Button fx:id="deleteButton" alignment="TOP_LEFT" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete">
|
||||
<graphic>
|
||||
<ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
|
||||
<image>
|
||||
<Image url="@../img/Delete.png" />
|
||||
<Image url="@../img/Delete.png"/>
|
||||
</image>
|
||||
</ImageView>
|
||||
</graphic>
|
||||
<tooltip>
|
||||
<Tooltip text="Delete all selected entries FOREVER" />
|
||||
<Tooltip text="Delete all selected entries FOREVER"/>
|
||||
</tooltip>
|
||||
</Button>
|
||||
<VBox alignment="BOTTOM_CENTER" spacing="5.0" VBox.vgrow="ALWAYS">
|
||||
<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 text="Begin a test with the selected rows" />
|
||||
</tooltip></Button>
|
||||
<Tooltip text="Begin a test with the selected rows"/>
|
||||
</tooltip>
|
||||
</Button>
|
||||
<Button layoutX="10.0" layoutY="273.0" onAction="#onTestAction" prefWidth="105.0" text="_Test all">
|
||||
<tooltip>
|
||||
<Tooltip text="Begin a test for the whole table" />
|
||||
</tooltip></Button>
|
||||
<Tooltip text="Begin a test for the whole table"/>
|
||||
</tooltip>
|
||||
</Button>
|
||||
</children>
|
||||
<VBox.margin>
|
||||
<Insets />
|
||||
<Insets/>
|
||||
</VBox.margin>
|
||||
</VBox>
|
||||
</children>
|
||||
<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>
|
||||
</VBox>
|
||||
</children>
|
||||
|
|
|
|||
|
|
@ -4,71 +4,78 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
<?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>
|
||||
<VBox minHeight="280.0" minWidth="360.0" spacing="10.0">
|
||||
<children>
|
||||
<Label fx:id="question" text="Question" textOverrun="CLIP" wrapText="true" VBox.vgrow="ALWAYS">
|
||||
<font>
|
||||
<Font size="30.0" />
|
||||
<Font size="30.0"/>
|
||||
</font>
|
||||
</Label>
|
||||
<TextField fx:id="answer">
|
||||
<VBox.margin>
|
||||
<Insets top="5.0" />
|
||||
<Insets top="5.0"/>
|
||||
</VBox.margin>
|
||||
</TextField>
|
||||
<Separator />
|
||||
<Separator/>
|
||||
<HBox fx:id="feedback" alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
|
||||
<children>
|
||||
<GridPane hgap="10.0" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
|
||||
<columnConstraints>
|
||||
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" />
|
||||
<ColumnConstraints fillWidth="false" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" />
|
||||
<ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER"/>
|
||||
<ColumnConstraints fillWidth="false" hgrow="ALWAYS" maxWidth="1.7976931348623157E308"/>
|
||||
</columnConstraints>
|
||||
<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>
|
||||
<children>
|
||||
<Label text="Previous question" wrapText="true" />
|
||||
<Label fx:id="prevQuestion" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true" GridPane.columnIndex="1" />
|
||||
<Label text="Previous answer" wrapText="true" GridPane.rowIndex="1" />
|
||||
<Label fx:id="prevAnswer" maxWidth="1.7976931348623157E308" styleClass="answer, feedbackText" 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" />
|
||||
<Label text="Previous question" wrapText="true"/>
|
||||
<Label fx:id="prevQuestion" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true"
|
||||
GridPane.columnIndex="1"/>
|
||||
<Label text="Previous answer" wrapText="true" GridPane.rowIndex="1"/>
|
||||
<Label fx:id="prevAnswer" maxWidth="1.7976931348623157E308" styleClass="answer, feedbackText"
|
||||
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>
|
||||
</GridPane>
|
||||
</children>
|
||||
</HBox>
|
||||
</children>
|
||||
<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>
|
||||
</VBox>
|
||||
</center>
|
||||
<bottom>
|
||||
<VBox alignment="CENTER" BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
<Separator prefWidth="200.0" />
|
||||
<Label fx:id="progressLabel" alignment="CENTER" contentDisplay="TOP" maxWidth="1.7976931348623157E308" text="1/40" />
|
||||
<ProgressBar fx:id="progress" maxWidth="1.7976931348623157E308" progress="0.0" />
|
||||
<Separator prefWidth="200.0"/>
|
||||
<Label fx:id="progressLabel" alignment="CENTER" contentDisplay="TOP" maxWidth="1.7976931348623157E308"
|
||||
text="1/40"/>
|
||||
<ProgressBar fx:id="progress" maxWidth="1.7976931348623157E308" progress="0.0"/>
|
||||
</children>
|
||||
<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>
|
||||
</VBox>
|
||||
</bottom>
|
||||
<right>
|
||||
<VBox alignment="TOP_RIGHT" spacing="10.0" BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
<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 cancelButton="true" focusTraversable="false" layoutX="10.0" layoutY="48.0" onAction="#onEndAction" prefWidth="110.0" text="_End test" />
|
||||
<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 cancelButton="true" focusTraversable="false" layoutX="10.0" layoutY="48.0" onAction="#onEndAction"
|
||||
prefWidth="110.0" text="_End test"/>
|
||||
</children>
|
||||
<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>
|
||||
</VBox>
|
||||
</right>
|
||||
|
|
|
|||
Loading…
Reference in a new issue