Skip to content

Commit

Permalink
Update to version 1.3
Browse files Browse the repository at this point in the history 
A few new features and especially: a new design!
  • Loading branch information
KingOfDog committed Jul 29, 2016
1 parent 4a921d7 commit 140b420
Show file tree
Hide file tree
Showing 58 changed files with 983 additions and 352 deletions.
Binary file added Downloads/kopfrechen-trainer-1.3.exe
View file
Binary file not shown.
13 changes: 0 additions & 13 deletions Downloads/version1-0.md
View file

This file was deleted.

3 changes: 3 additions & 0 deletions src/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@
<classpathentry kind="lib" path="C:/Users/KingOfDog/IntelliJ Workspace/Mental Arithmetic Trainer/lib/gson-2.7.jar"/>
<classpathentry kind="lib" path="C:/Users/KingOfDog/IntelliJ Workspace/Mental Arithmetic Trainer/lib/org.apache.commons.io-2.4.jar"/>
<classpathentry kind="lib" path="C:/Users/KingOfDog/IntelliJ Workspace/Mental Arithmetic Trainer/lib/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="C:/Users/KingOfDog/Downloads/jfoenix.jar"/>
<classpathentry kind="lib" path="C:/Users/KingOfDog/Downloads/fontawesomefx-commons-8.12.jar"/>
<classpathentry kind="lib" path="C:/Users/KingOfDog/Downloads/fontawesomefx-fontawesome-4.6.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file added src/bin/init/InitMain$1.class
View file
Binary file not shown.
Binary file added src/bin/init/InitMain$2.class
View file
Binary file not shown.
Binary file added src/bin/init/InitMain$3.class
View file
Binary file not shown.
Binary file added src/bin/init/InitMain.class
View file
Binary file not shown.
Binary file added src/bin/init/InitSettings$1.class
View file
Binary file not shown.
Binary file added src/bin/init/InitSettings$2.class
View file
Binary file not shown.
Binary file added src/bin/init/InitSettings.class
View file
Binary file not shown.
Binary file added src/bin/init/InitStats$1.class
View file
Binary file not shown.
Binary file added src/bin/init/InitStats.class
View file
Binary file not shown.
Binary file added src/bin/init/InitTester$1.class
View file
Binary file not shown.
Binary file added src/bin/init/InitTester$2.class
View file
Binary file not shown.
Binary file added src/bin/init/InitTester.class
View file
Binary file not shown.
Binary file modified src/bin/javafx/Switch.class
View file
Binary file not shown.
48 changes: 18 additions & 30 deletions src/bin/javafx/main.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.image.*?>
<?import com.jfoenix.controls.*?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.geometry.*?>
Expand All @@ -8,50 +10,36 @@
<?import javafx.scene.paint.*?>
<?import javafx.scene.text.*?>


<StackPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.FXMLDocumentController">
<StackPane fx:id="container" prefHeight="506.0" prefWidth="922.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.FXMLDocumentController">
<children>
<TilePane minWidth="-Infinity" orientation="VERTICAL" prefHeight="506.0" prefWidth="791.0" tileAlignment="TOP_CENTER" />
<Label id="labelTitle" alignment="BOTTOM_CENTER" contentDisplay="CENTER" prefWidth="600.0" text="%header" textAlignment="CENTER" StackPane.alignment="TOP_CENTER">
<font>
<Font size="20.0" />
</font>
<StackPane.margin>
<Insets top="50.0" />
</StackPane.margin>
</Label>
<Label id="labelSubheader" alignment="TOP_CENTER" contentDisplay="CENTER" prefWidth="600.0" text="%subheader" textAlignment="CENTER" translateY="40.0" StackPane.alignment="TOP_CENTER">
<Label id="labelSubheader" alignment="TOP_CENTER" contentDisplay="CENTER" prefHeight="24.0" prefWidth="700.0" styleClass="subtitle" text="%subheader" textAlignment="CENTER" translateY="40.0" StackPane.alignment="TOP_CENTER">
<font>
<Font size="12.0" />
</font>
<StackPane.margin>
<Insets top="50.0" />
</StackPane.margin>
</Label>
<Button id="submit" alignment="CENTER" defaultButton="true" mnemonicParsing="false" onAction="#startGame" prefHeight="42.0" prefWidth="160.0" text="%start_button" textAlignment="LEFT" StackPane.alignment="CENTER">
<font>
<Font name="System Bold" size="16.0" />
</font>
<tooltip>
<JFXButton fx:id="btnStart" text="%start_button">
<tooltip>
<Tooltip text="%start_button_hover">
<font>
<Font size="16.0" fx:id="x1" />
</font>
</Tooltip>
</tooltip>
</Button>
<Button alignment="CENTER_RIGHT" mnemonicParsing="false" onAction="#statsShow" text="%statistics" translateX="-100.0" translateY="100.0">
<tooltip>
<Tooltip text="%statistics_hover" />
</tooltip>
</Button>
<Button mnemonicParsing="false" onAction="#goToSettings" text="%settings" translateX="100.0" translateY="100.0" StackPane.alignment="CENTER">
<tooltip>
<Tooltip text="%settings_hover" />
</tooltip>
</tooltip>
<styleClass>
<String fx:value="btn-blue" />
<String fx:value="btn-start" />
</styleClass>
</JFXButton>
<Label id="labelTitle" alignment="BOTTOM_CENTER" contentDisplay="CENTER" prefHeight="34.0" prefWidth="700.0" styleClass="title" text="%header" textAlignment="CENTER" StackPane.alignment="TOP_CENTER">
<font>
<Font name="Roboto Light" size="20.0" />
</font>
<StackPane.margin>
<Insets />
<Insets top="50.0" />
</StackPane.margin>
</Button>
</Label>
</children>
</StackPane>
106 changes: 47 additions & 59 deletions src/bin/javafx/settings.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,88 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import java.lang.*?>
<?import java.util.*?>
<?import com.jfoenix.controls.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.paint.*?>
<?import javafx.scene.text.*?>

<StackPane prefHeight="506.0" prefWidth="785.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.FXMLDocumentController">
<StackPane fx:id="container" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Button mnemonicParsing="false" onAction="#backHome" text="%back" StackPane.alignment="TOP_LEFT">
<tooltip>
<Tooltip text="%back_hover" />
</tooltip>
<StackPane.margin>
<Insets left="25.0" top="20.0" />
</StackPane.margin>
</Button>
<Label id="labelTitle" alignment="BOTTOM_CENTER" contentDisplay="CENTER" mouseTransparent="true" prefWidth="600.0" text="%settings" textAlignment="CENTER" StackPane.alignment="TOP_CENTER">
<font>
<Font size="20.0" />
</font>
<Label alignment="CENTER" mouseTransparent="true" prefHeight="34.0" prefWidth="227.0" styleClass="title" text="%settings" StackPane.alignment="TOP_CENTER">
<StackPane.margin>
<Insets top="20.0" />
<Insets top="15.0" />
</StackPane.margin>
</Label>
<StackPane StackPane.alignment="CENTER">
</Label>
<StackPane prefHeight="150.0" prefWidth="200.0">
<children>
<StackPane>
<StackPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="200.0" translateX="-50.0" translateY="-150.0">
<children>
<JFXCheckBox fx:id="addition" text="%addition" translateX="-224.0" />
<JFXTextField fx:id="addMin" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%addition_min" translateX="-25.0" />
<JFXTextField fx:id="addMax" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%addition_max" translateX="225.0" />
</children>
</StackPane>
<StackPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="200.0" translateX="-50.0" translateY="-110.0">
<children>
<CheckBox fx:id="addition" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%addition" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="addMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%addition_min" StackPane.alignment="TOP_CENTER">
<StackPane.margin>
<Insets />
</StackPane.margin>
</TextField>
<TextField fx:id="addMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%addition_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
<JFXCheckBox fx:id="subtraction" text="%subtraction" translateX="-215.0" />
<JFXTextField fx:id="subMin" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%subtraction_min" translateX="-25.0" />
<JFXTextField fx:id="subMax" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%subtraction_max" translateX="225.0" />
</children>
</StackPane>
<StackPane translateY="35.0" StackPane.alignment="TOP_CENTER">
<StackPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="200.0" translateX="-50.0" translateY="-70.0">
<children>
<CheckBox fx:id="subtraktion" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%subtraction" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="subMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%subtraction_min" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="subMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%subtraction_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
<JFXCheckBox fx:id="multiplication" text="%multiplication" translateX="-210.0" />
<JFXTextField fx:id="mulMin" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%multiplication_min" translateX="-25.0" />
<JFXTextField fx:id="mulMax" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%multiplication_max" translateX="225.0" />
</children>
</StackPane>
<StackPane translateY="70.0" StackPane.alignment="TOP_CENTER">
<StackPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="200.0" translateX="-50.0" translateY="-30.0">
<children>
<CheckBox fx:id="multiplikation" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%multiplication" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="mulMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%multiplication_min" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="mulMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%multiplication_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
<JFXCheckBox fx:id="division" text="%division" translateX="-225.0" />
<JFXTextField fx:id="divMin" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%division_min" translateX="-25.0" />
<JFXTextField fx:id="divMax" labelFloat="true" maxWidth="-Infinity" prefWidth="250.0" promptText="%division_max" translateX="225.0" />
</children>
</StackPane>
<StackPane translateY="105.0" StackPane.alignment="TOP_CENTER">
<StackPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="200.0" translateX="-50.0" translateY="10.0">
<children>
<CheckBox fx:id="division" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%division" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="divMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%division_min" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="divMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%division_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
<JFXCheckBox fx:id="subNeg" prefHeight="15.0" prefWidth="317.0" text="%sub_neg" translateX="-111.0" />
<JFXCheckBox fx:id="divComma" prefHeight="15.0" prefWidth="374.0" text="%div_comma" translateX="150.0" />
</children>
</StackPane>
<StackPane translateY="140.0" StackPane.alignment="TOP_CENTER">
<StackPane maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="40.0" prefWidth="200.0" translateY="50.0">
<children>
<CheckBox fx:id="subNeg" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="200.0" selected="true" text="%sub_neg" translateX="-134.0" StackPane.alignment="TOP_CENTER" />
<CheckBox fx:id="divComma" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="280.0" text="%div_comma" translateX="110.0" StackPane.alignment="TOP_CENTER" />
<Label text="%language" translateX="-250.0" />
<JFXComboBox fx:id="language" promptText="%language" translateX="-170.0" />
</children>
</StackPane>
<Label prefHeight="29.0" prefWidth="154.0" styleClass="label-light" text="%difficulty" translateX="-235.0" StackPane.alignment="BOTTOM_CENTER">
<StackPane.margin>
<Insets bottom="100.0" />
</StackPane.margin>
</Label>
<Label fx:id="difficulty" prefHeight="29.0" prefWidth="105.0" styleClass="label-light" translateX="-100.0" StackPane.alignment="BOTTOM_CENTER">
<StackPane.margin>
<Insets bottom="100.0" />
</StackPane.margin>
</Label>
<JFXButton fx:id="save" styleClass="btn-blue" text="%save" StackPane.alignment="BOTTOM_CENTER">
<StackPane.margin>
<Insets bottom="100.0" />
</StackPane.margin>
</JFXButton>
</children>
<StackPane.margin>
<Insets top="125.0" />
</StackPane.margin>
</StackPane>
<Label text="%language" translateX="-100.0" translateY="75.0" />
<ChoiceBox fx:id="language" prefWidth="150.0" translateY="75.0" />
<Label text="%difficulty" translateX="-200.0" translateY="150.0">
<font>
<Font size="16.0" />
</font>
</Label>
<Label fx:id="difficulty" prefWidth="75.0" translateX="-90.0" translateY="150.0">
<font>
<Font size="16.0" />
</font>
</Label>
<Button defaultButton="true" mnemonicParsing="false" onAction="#saveSettings" text="%save" translateY="150.0" StackPane.alignment="CENTER" />
</children>
</StackPane>
88 changes: 88 additions & 0 deletions src/bin/javafx/settings_alt.fxml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?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.*?>
<?import javafx.scene.text.*?>

<StackPane fx:id="container" prefHeight="506.0" prefWidth="785.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.FXMLDocumentController">
<children>
<Button fx:id="backhome" mnemonicParsing="false" onAction="#backHome" text="%back" StackPane.alignment="TOP_LEFT">
<tooltip>
<Tooltip text="%back_hover" />
</tooltip>
<StackPane.margin>
<Insets left="25.0" top="20.0" />
</StackPane.margin>
</Button>
<Label id="labelTitle" alignment="BOTTOM_CENTER" contentDisplay="CENTER" mouseTransparent="true" prefWidth="600.0" text="%settings" textAlignment="CENTER" StackPane.alignment="TOP_CENTER">
<font>
<Font size="20.0" />
</font>
<StackPane.margin>
<Insets top="20.0" />
</StackPane.margin>
</Label>
<StackPane StackPane.alignment="CENTER">
<children>
<StackPane>
<children>
<CheckBox fx:id="addition" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%addition" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="addMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%addition_min" StackPane.alignment="TOP_CENTER">
<StackPane.margin>
<Insets />
</StackPane.margin>
</TextField>
<TextField fx:id="addMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%addition_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
</children>
</StackPane>
<StackPane translateY="35.0" StackPane.alignment="TOP_CENTER">
<children>
<CheckBox fx:id="subtraktion" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%subtraction" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="subMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%subtraction_min" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="subMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%subtraction_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
</children>
</StackPane>
<StackPane translateY="70.0" StackPane.alignment="TOP_CENTER">
<children>
<CheckBox fx:id="multiplikation" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%multiplication" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="mulMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%multiplication_min" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="mulMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%multiplication_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
</children>
</StackPane>
<StackPane translateY="105.0" StackPane.alignment="TOP_CENTER">
<children>
<CheckBox fx:id="division" alignment="CENTER_LEFT" indeterminate="false" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="128.0" selected="true" text="%division" translateX="-170.0" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="divMin" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%division_min" StackPane.alignment="TOP_CENTER" />
<TextField fx:id="divMax" maxWidth="-Infinity" onAction="#newDifficulty" prefWidth="200.0" promptText="%division_max" translateX="210.0" StackPane.alignment="TOP_CENTER" />
</children>
</StackPane>
<StackPane translateY="140.0" StackPane.alignment="TOP_CENTER">
<children>
<CheckBox fx:id="subNeg" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="200.0" selected="true" text="%sub_neg" translateX="-134.0" StackPane.alignment="TOP_CENTER" />
<CheckBox fx:id="divComma" mnemonicParsing="false" onAction="#newDifficulty" prefHeight="27.0" prefWidth="280.0" text="%div_comma" translateX="110.0" StackPane.alignment="TOP_CENTER" />
</children>
</StackPane>
</children>
<StackPane.margin>
<Insets top="125.0" />
</StackPane.margin>
</StackPane>
<Label text="%language" translateX="-100.0" translateY="75.0" />
<ChoiceBox fx:id="language" prefWidth="150.0" translateY="75.0" />
<Label text="%difficulty" translateX="-200.0" translateY="150.0">
<font>
<Font size="16.0" />
</font>
</Label>
<Label fx:id="difficulty" prefWidth="75.0" translateX="-90.0" translateY="150.0">
<font>
<Font size="16.0" />
</font>
</Label>
<Button defaultButton="true" mnemonicParsing="false" onAction="#saveSettings" text="%save" translateY="150.0" StackPane.alignment="CENTER" />
</children>
</StackPane>
Loading

0 comments on commit 140b420

Please sign in to comment.