Merge remote-tracking branch 'origin/master'
This commit is contained in:
law39
commit
4cc0451b73
6 changed files with 280 additions and 159 deletions
|
|
@ -64,7 +64,7 @@ public class DictionaryController extends SharedCodeController {
|
|||
*/
|
||||
@FXML
|
||||
private void switchLangSort() {
|
||||
if (table.getSortOrder().contains(english)) {
|
||||
if (isSortedByEnglish) {
|
||||
if (welsh.getSortType().equals(TableColumn.SortType.ASCENDING)) {
|
||||
alphaSort.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/sort-alpha-up-50.png"));
|
||||
}
|
||||
|
|
@ -73,8 +73,10 @@ public class DictionaryController extends SharedCodeController {
|
|||
}
|
||||
table.getSortOrder().clear();
|
||||
table.getSortOrder().add(welsh);
|
||||
|
||||
isSortedByEnglish = false;
|
||||
}
|
||||
else if (table.getSortOrder().contains(welsh)) {
|
||||
else {
|
||||
if (english.getSortType().equals(TableColumn.SortType.ASCENDING)) {
|
||||
alphaSort.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/sort-alpha-up-50.png"));
|
||||
}
|
||||
|
|
@ -83,8 +85,10 @@ public class DictionaryController extends SharedCodeController {
|
|||
}
|
||||
table.getSortOrder().clear();
|
||||
table.getSortOrder().add(english);
|
||||
isSortedByEnglish = true;
|
||||
}
|
||||
table.sort();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -224,7 +228,12 @@ public class DictionaryController extends SharedCodeController {
|
|||
// english.setCellValueFactory(new PropertyValueFactory<DictionaryEntry, String>("english"));
|
||||
|
||||
table.setItems(sortedList);
|
||||
table.getSortOrder().add(english);
|
||||
|
||||
if(isSortedByEnglish){
|
||||
table.getSortOrder().add(english);
|
||||
} else{
|
||||
table.getSortOrder().add(welsh);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -180,12 +180,17 @@ public class PracticeListController extends SharedCodeController{
|
|||
});
|
||||
|
||||
table.setItems(sortedList);
|
||||
table.getSortOrder().add(english);
|
||||
if(isSortedByEnglish){
|
||||
table.getSortOrder().add(english);
|
||||
} else{
|
||||
table.getSortOrder().add(welsh);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void switchLangSort() {
|
||||
if (table.getSortOrder().contains(english)) {
|
||||
if (isSortedByEnglish) {
|
||||
if (welsh.getSortType().equals(TableColumn.SortType.ASCENDING)) {
|
||||
alphaSort.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/sort-alpha-up-50.png"));
|
||||
}
|
||||
|
|
@ -194,8 +199,10 @@ public class PracticeListController extends SharedCodeController{
|
|||
}
|
||||
table.getSortOrder().clear();
|
||||
table.getSortOrder().add(welsh);
|
||||
|
||||
isSortedByEnglish = false;
|
||||
}
|
||||
else if (table.getSortOrder().contains(welsh)) {
|
||||
else {
|
||||
if (english.getSortType().equals(TableColumn.SortType.ASCENDING)) {
|
||||
alphaSort.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/sort-alpha-up-50.png"));
|
||||
}
|
||||
|
|
@ -204,6 +211,8 @@ public class PracticeListController extends SharedCodeController{
|
|||
}
|
||||
table.getSortOrder().clear();
|
||||
table.getSortOrder().add(english);
|
||||
|
||||
isSortedByEnglish = true;
|
||||
}
|
||||
table.sort();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,14 +10,34 @@ import java.util.ArrayList;
|
|||
import java.util.LinkedList;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static uk.ac.aber.cs22120.group20.json.DictionaryEntry.wordTypeEnum.verb;
|
||||
|
||||
/**
|
||||
* Class that contains methods which will be used to test the Question class, and its methods.
|
||||
* @author Brad Corbett [brc9]
|
||||
* @author Henry Dugmore [hjd3]
|
||||
* @author Kain Bryan-Jones [kab74]
|
||||
* @author Luke Wybar [law39]
|
||||
* @author Marcin Jakob [maj83]
|
||||
* @author Oscar Pocock [osp1]
|
||||
* @author Tom Perry [top1]
|
||||
* @author Waylen Watts [ncw]
|
||||
* @version 0.1 Initial development
|
||||
* @See Question
|
||||
*/
|
||||
|
||||
class QuestionTest {
|
||||
|
||||
/**
|
||||
* Tests that the correctAnswers variable increments when a user gets a right answer
|
||||
* when doing either a Translation or SixMeanings test.
|
||||
*/
|
||||
|
||||
@Test
|
||||
void testCheckRightAnswerTranslation() {
|
||||
void testCheckRightAnswerTranslationOrSixMeanings() {
|
||||
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
|
||||
ArrayList<String> correctEntryList = new ArrayList<>();
|
||||
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1","verb");
|
||||
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1",verb);
|
||||
boolean isEnglish = true;
|
||||
|
||||
correctAnswerList.add(wordToTest);
|
||||
|
|
@ -32,11 +52,16 @@ class QuestionTest {
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that the wrongAnswers variable increments when a user gets a wrong answer
|
||||
* when doing either a Translation or SixMeanings test.
|
||||
*/
|
||||
|
||||
@Test
|
||||
void testCheckWrongAnswerTranslation() {
|
||||
void testCheckWrongAnswerTranslationOrSixMeanings() {
|
||||
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
|
||||
ArrayList<String> correctEntryList = new ArrayList<>();
|
||||
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1","verb");
|
||||
DictionaryEntry wordToTest = new DictionaryEntry("english1", "welsh1",verb);
|
||||
boolean isEnglish = true;
|
||||
|
||||
correctAnswerList.add(wordToTest);
|
||||
|
|
@ -44,6 +69,8 @@ class QuestionTest {
|
|||
|
||||
Question question;
|
||||
|
||||
Question.resetScore();
|
||||
|
||||
Question.checkAnswer(correctAnswerList, correctEntryList, isEnglish);
|
||||
|
||||
assertEquals(1, Question.wrongAnswers);
|
||||
|
|
@ -51,14 +78,20 @@ class QuestionTest {
|
|||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Tests that the correctAnswers variable increments when a user gets a right answer
|
||||
* when doing either a MatchTheMeaning test.
|
||||
*/
|
||||
|
||||
@Test
|
||||
void testCheckRightAnswerMatchMeaning(){
|
||||
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
|
||||
ArrayList<String> correctEntryList = new ArrayList<>();
|
||||
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1","verb");
|
||||
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2","verb");
|
||||
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3","verb");
|
||||
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4","verb");
|
||||
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1",verb);
|
||||
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2",verb);
|
||||
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3",verb);
|
||||
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4",verb);
|
||||
boolean isEnglish = true;
|
||||
|
||||
correctAnswerList.add(wordToTest1);
|
||||
|
|
@ -72,19 +105,26 @@ class QuestionTest {
|
|||
|
||||
AssessmentGenerator.isEnglish = true;
|
||||
|
||||
Question.resetScore();
|
||||
|
||||
Question.checkAnswer(correctAnswerList, correctEntryList, isEnglish);
|
||||
|
||||
assertEquals(4, Question.correctAnswers);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests that the wrongAnswers variable increments when a user gets a wrong answer
|
||||
* when doing either a MatchTheMeaning test.
|
||||
*/
|
||||
|
||||
@Test
|
||||
void testCheckWrongAnswerMatchMeaning(){
|
||||
ArrayList<DictionaryEntry> correctAnswerList = new ArrayList<>();
|
||||
ArrayList<String> correctEntryList = new ArrayList<>();
|
||||
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1","verb");
|
||||
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2","verb");
|
||||
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3","verb");
|
||||
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4","verb");
|
||||
DictionaryEntry wordToTest1 = new DictionaryEntry("english1", "welsh1",verb);
|
||||
DictionaryEntry wordToTest2 = new DictionaryEntry("english2", "welsh2",verb);
|
||||
DictionaryEntry wordToTest3 = new DictionaryEntry("english3", "welsh3",verb);
|
||||
DictionaryEntry wordToTest4 = new DictionaryEntry("english4", "welsh4",verb);
|
||||
|
||||
|
||||
correctAnswerList.add(wordToTest1);
|
||||
|
|
@ -105,17 +145,14 @@ class QuestionTest {
|
|||
assertEquals(4, Question.wrongAnswers);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testCheckRightAnswerSixMeanings(){
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
void testCheckWrongAnswerSixMeanings(){
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
void resetScore() {
|
||||
Question.wrongAnswers = 5;
|
||||
Question.correctAnswers = 5;
|
||||
Question.resetScore();
|
||||
|
||||
assertEquals(0, Question.correctAnswers);
|
||||
assertEquals(0, Question.wrongAnswers);
|
||||
}
|
||||
}
|
||||
|
|
@ -5,78 +5,73 @@
|
|||
<?import javafx.scene.control.Button?>
|
||||
<?import javafx.scene.control.ComboBox?>
|
||||
<?import javafx.scene.control.Label?>
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
|
||||
|
||||
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<?import javafx.scene.shape.Rectangle?>
|
||||
<?import javafx.scene.image.ImageView?>
|
||||
<?import javafx.scene.text.Text?>
|
||||
<?import javafx.scene.layout.AnchorPane?>
|
||||
<?import javafx.scene.layout.BorderPane?>
|
||||
<?import javafx.scene.layout.HBox?>
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
<?import javafx.scene.layout.StackPane?>
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
<?import javafx.scene.shape.Rectangle?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="uk.ac.aber.cs22120.group20.javafx.MatchTheMeaningController"
|
||||
fx:id="container"
|
||||
minWidth="450"
|
||||
minHeight="550"
|
||||
>
|
||||
<?import javafx.scene.text.Text?>
|
||||
|
||||
<BorderPane fx:id="container" minHeight="550" minWidth="450" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.javafx.MatchTheMeaningController">
|
||||
|
||||
|
||||
<left>
|
||||
|
||||
<StackPane fx:id="outerBar">
|
||||
<Rectangle fx:id="sideBar" fill="dimgray" height="${outerBar.height}" width="50"></Rectangle>
|
||||
<Rectangle fx:id="sideBar" fill="dimgray" height="${outerBar.height}" width="50" />
|
||||
|
||||
<VBox spacing="300">
|
||||
|
||||
<VBox alignment="TOP_CENTER" maxHeight="${outerBar.height}">
|
||||
<StackPane onMouseClicked="#dictionaryIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="dictionaryText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="dictionaryIcon"></ImageView>
|
||||
<ImageView fx:id="dictionaryIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
<StackPane onMouseClicked="#practiceListIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="practiceListTest" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="practiceListIcon"></ImageView>
|
||||
<ImageView fx:id="practiceListIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
<StackPane onMouseClicked="#flashcardIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="flashcardsText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="flashcardIcon"></ImageView>
|
||||
<ImageView fx:id="flashcardIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
<StackPane onMouseClicked="#studyIconClick">
|
||||
<Rectangle fill="white" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="white" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="studyText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="studyIcon"></ImageView>
|
||||
<ImageView fx:id="studyIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
|
|
@ -85,15 +80,15 @@
|
|||
|
||||
|
||||
<StackPane alignment="BOTTOM_CENTER" onMouseClicked="#addWordIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="addDefinitionText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="addDefinitionIcon"></ImageView>
|
||||
<ImageView fx:id="addDefinitionIcon" />
|
||||
</HBox>
|
||||
|
||||
</StackPane>
|
||||
|
|
@ -105,18 +100,18 @@
|
|||
|
||||
<top>
|
||||
<StackPane fx:id="topBar">
|
||||
<Rectangle fx:id="parentRectangle" fill="dimgray" width="${topBar.width}" height="50"></Rectangle>
|
||||
<HBox alignment="CENTER_LEFT" prefWidth="${topBar.width}" spacing="7">
|
||||
<Rectangle fx:id="parentRectangle" fill="dimgray" height="50" width="${topBar.width}" />
|
||||
<HBox alignment="CENTER_LEFT" prefWidth="${topBar.width}" spacing="7">
|
||||
<StackPane onMouseClicked="#expandMenuClick">
|
||||
<Rectangle fill="dimgray" width="55" height="50"></Rectangle>
|
||||
<ImageView fx:id="expandMenuIcon"></ImageView>
|
||||
<Rectangle fill="dimgray" height="50" width="55" />
|
||||
<ImageView fx:id="expandMenuIcon" />
|
||||
</StackPane>
|
||||
|
||||
<ImageView fx:id="currentPageIcon"></ImageView>
|
||||
<ImageView fx:id="currentPageIcon" />
|
||||
|
||||
<Text fx:id="currentPageText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
</HBox>
|
||||
|
|
@ -124,10 +119,10 @@
|
|||
</StackPane>
|
||||
</top>
|
||||
<center>
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
<Button fx:id="ConfirmButton" layoutX="271.0" layoutY="321.0" mnemonicParsing="false" text="Confirm" onAction="#checkAnswers" />
|
||||
<Label layoutX="248.0" layoutY="356.0" text="Match the meaning" />
|
||||
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="400.0" prefWidth="600.0">
|
||||
<Button fx:id="ConfirmButton" layoutX="271.0" layoutY="321.0" mnemonicParsing="false" onAction="#checkAnswers" text="Confirm" />
|
||||
<ComboBox fx:id="word1" layoutX="448.0" layoutY="118.0" prefHeight="25.0" prefWidth="58.0" value="1">
|
||||
<items>
|
||||
<FXCollections fx:factory="observableArrayList">
|
||||
|
|
@ -168,27 +163,83 @@
|
|||
</FXCollections>
|
||||
</items>
|
||||
</ComboBox>
|
||||
<Label fx:id="RightWord1" layoutX="343.0" layoutY="122.0" text="Welsh word#3" />
|
||||
<Label fx:id="RightWord2" layoutX="343.0" layoutY="157.0" text="Welsh word#2" />
|
||||
<Label fx:id="RightWord3" layoutX="343.0" layoutY="192.0" text="Welsh word#1" />
|
||||
<Label fx:id="RightWord4" layoutX="343.0" layoutY="227.0" text="Welsh word#4" />
|
||||
<Label fx:id="LeftWord1" layoutX="115.0" layoutY="122.0" text="English Word #1" />
|
||||
<Label fx:id="LeftWord2" layoutX="115.0" layoutY="157.0" text="English Word #2" />
|
||||
<Label fx:id="LeftWord3" layoutX="115.0" layoutY="192.0" text="English Word #3" />
|
||||
<Label fx:id="LeftWord4" layoutX="115.0" layoutY="227.0" text="English Word #4" />
|
||||
<Label layoutX="105.0" layoutY="122.0" text="1." />
|
||||
<Label layoutX="105.0" layoutY="157.0" text="2." />
|
||||
<Label layoutX="105.0" layoutY="192.0" text="3." />
|
||||
<Label layoutX="105.0" layoutY="227.0" text="4." />
|
||||
<Label layoutX="367.0" layoutY="23.0" text="Correct answers:" />
|
||||
<Label layoutX="368.0" layoutY="53.0" text="Total answers:" />
|
||||
<Label fx:id="CorrectAnswer" layoutX="463.0" layoutY="23.0" text="0" />
|
||||
<Label fx:id="WrongAnswer" layoutX="463.0" layoutY="53.0" text="0" />
|
||||
<Label fx:id="RightWord1" layoutX="319.0" layoutY="122.0" text="Welsh word#3">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Label fx:id="RightWord2" layoutX="319.0" layoutY="157.0" text="Welsh word#2">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Label fx:id="RightWord3" layoutX="319.0" layoutY="192.0" text="Welsh word#1">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label fx:id="RightWord4" layoutX="319.0" layoutY="227.0" text="Welsh word#4">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label fx:id="LeftWord1" layoutX="122.0" layoutY="122.0" text="English Word #1">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label fx:id="LeftWord2" layoutX="122.0" layoutY="157.0" text="English Word #2">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label fx:id="LeftWord3" layoutX="122.0" layoutY="192.0" text="English Word #3">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label fx:id="LeftWord4" layoutX="122.0" layoutY="227.0" text="English Word #4">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label layoutX="105.0" layoutY="122.0" text="1.">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label layoutX="105.0" layoutY="157.0" text="2.">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label layoutX="105.0" layoutY="192.0" text="3.">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label layoutX="105.0" layoutY="227.0" text="4.">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Label>
|
||||
<Label layoutX="334.0" layoutY="19.0" text="Correct answers:">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Label layoutX="328.0" layoutY="53.0" text="Total answers:">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Label fx:id="CorrectAnswer" layoutX="472.0" layoutY="19.0" text="0">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Label fx:id="WrongAnswer" layoutX="472.0" layoutY="53.0" text="0">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Text fill="#8d8d8d" layoutX="197.0" layoutY="379.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Match The Meaning">
|
||||
<font>
|
||||
<Font name="System Italic" size="24.0" />
|
||||
</font>
|
||||
</Text>
|
||||
</AnchorPane>
|
||||
</children>
|
||||
</Pane>
|
||||
|
||||
</center>
|
||||
</BorderPane>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,73 +1,73 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.scene.layout.*?>
|
||||
<?import javafx.scene.shape.Rectangle?>
|
||||
<?import javafx.scene.image.ImageView?>
|
||||
<?import javafx.scene.text.Text?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
<?import javafx.scene.control.TitledPane?>
|
||||
<?import javafx.scene.control.Label?>
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="uk.ac.aber.cs22120.group20.javafx.SixMeaningsController"
|
||||
fx:id="container"
|
||||
minWidth="450"
|
||||
minHeight="550"
|
||||
>
|
||||
<?import javafx.scene.image.ImageView?>
|
||||
<?import javafx.scene.layout.AnchorPane?>
|
||||
<?import javafx.scene.layout.BorderPane?>
|
||||
<?import javafx.scene.layout.HBox?>
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
<?import javafx.scene.layout.StackPane?>
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
<?import javafx.scene.shape.Rectangle?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
<?import javafx.scene.text.Text?>
|
||||
|
||||
<BorderPane fx:id="container" minHeight="550" minWidth="450" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.javafx.SixMeaningsController">
|
||||
|
||||
|
||||
<left>
|
||||
|
||||
<StackPane fx:id="outerBar">
|
||||
<Rectangle fx:id="sideBar" fill="dimgray" height="${outerBar.height}" width="50"></Rectangle>
|
||||
<Rectangle fx:id="sideBar" fill="dimgray" height="${outerBar.height}" width="50" />
|
||||
|
||||
<VBox spacing="300">
|
||||
|
||||
<VBox alignment="TOP_CENTER" maxHeight="${outerBar.height}">
|
||||
<StackPane onMouseClicked="#dictionaryIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="dictionaryText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="dictionaryIcon"></ImageView>
|
||||
<ImageView fx:id="dictionaryIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
<StackPane onMouseClicked="#practiceListIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="practiceListTest" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="practiceListIcon"></ImageView>
|
||||
<ImageView fx:id="practiceListIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
<StackPane onMouseClicked="#flashcardIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="flashcardsText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="flashcardIcon"></ImageView>
|
||||
<ImageView fx:id="flashcardIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
<StackPane onMouseClicked="#studyIconClick">
|
||||
<Rectangle fill="white" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="white" height="60" width="${sideBar.width}" />
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="studyText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="studyIcon"></ImageView>
|
||||
<ImageView fx:id="studyIcon" />
|
||||
</HBox>
|
||||
</StackPane>
|
||||
|
||||
|
|
@ -76,15 +76,15 @@
|
|||
|
||||
|
||||
<StackPane alignment="BOTTOM_CENTER" onMouseClicked="#addWordIconClick">
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}"></Rectangle>
|
||||
<Rectangle fill="dimgray" height="60" width="${sideBar.width}" />
|
||||
|
||||
<HBox alignment="CENTER_RIGHT">
|
||||
<Text fx:id="addDefinitionText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
<ImageView fx:id="addDefinitionIcon"></ImageView>
|
||||
<ImageView fx:id="addDefinitionIcon" />
|
||||
</HBox>
|
||||
|
||||
</StackPane>
|
||||
|
|
@ -96,18 +96,18 @@
|
|||
|
||||
<top>
|
||||
<StackPane fx:id="topBar">
|
||||
<Rectangle fx:id="parentRectangle" fill="dimgray" width="${topBar.width}" height="50"></Rectangle>
|
||||
<HBox alignment="CENTER_LEFT" prefWidth="${topBar.width}" spacing="7">
|
||||
<Rectangle fx:id="parentRectangle" fill="dimgray" height="50" width="${topBar.width}" />
|
||||
<HBox alignment="CENTER_LEFT" prefWidth="${topBar.width}" spacing="7">
|
||||
<StackPane onMouseClicked="#expandMenuClick">
|
||||
<Rectangle fill="dimgray" width="55" height="50"></Rectangle>
|
||||
<ImageView fx:id="expandMenuIcon"></ImageView>
|
||||
<Rectangle fill="dimgray" height="50" width="55" />
|
||||
<ImageView fx:id="expandMenuIcon" />
|
||||
</StackPane>
|
||||
|
||||
<ImageView fx:id="currentPageIcon"></ImageView>
|
||||
<ImageView fx:id="currentPageIcon" />
|
||||
|
||||
<Text fx:id="currentPageText" fill="white">
|
||||
<font>
|
||||
<Font name="System Bold" size="25"></Font>
|
||||
<Font name="System Bold" size="25" />
|
||||
</font>
|
||||
</Text>
|
||||
</HBox>
|
||||
|
|
@ -116,43 +116,65 @@
|
|||
</top>
|
||||
|
||||
<center>
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
|
||||
prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1"
|
||||
>
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<TitledPane animated="false" prefHeight="400.0" prefWidth="600.0" text="Learn">
|
||||
<content>
|
||||
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0"/>
|
||||
</content>
|
||||
</TitledPane>
|
||||
<AnchorPane prefHeight="400.0" prefWidth="600.0">
|
||||
|
||||
<AnchorPane layoutX="-8.0" prefHeight="400.0" prefWidth="600.0">
|
||||
<children>
|
||||
<Label fx:id="wordToTranslate" layoutX="228.0" layoutY="73.0" text="Welsh Word">
|
||||
<Label fx:id="wordToTranslate" layoutX="228.0" layoutY="73.0" text="Welsh Word" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font name="System Bold" size="25.0"/>
|
||||
<Font name="System Bold" size="25.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Text fx:id="possibleAnswer1" layoutX="61.0" layoutY="176.0" onMouseClicked="#answer1" strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 1" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Text>
|
||||
<Text fx:id="possibleAnswer2" layoutX="260.0" layoutY="175.0" onMouseClicked="#answer2" strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 2" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Text>
|
||||
<Text fx:id="possibleAnswer3" layoutX="472.0" layoutY="175.0" onMouseClicked="#answer3" strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 3" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Text>
|
||||
<Text fx:id="possibleAnswer4" layoutX="61.0" layoutY="297.0" onMouseClicked="#answer4" strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 4" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Text>
|
||||
<Text fx:id="possibleAnswer5" layoutX="260.0" layoutY="297.0" onMouseClicked="#answer5" strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 5" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Text>
|
||||
<Text fx:id="possibleAnswer6" layoutX="472.0" layoutY="297.0" onMouseClicked="#answer6" strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 6" textAlignment="CENTER">
|
||||
<font>
|
||||
<Font size="14.0" />
|
||||
</font></Text>
|
||||
<Text fx:id="wrongAnswer" layoutX="554.0" layoutY="69.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0" wrappingWidth="22.46875">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Text>
|
||||
<Label layoutX="405.0" layoutY="50.0" text="Incorrect answers:">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Text fx:id="correctAnswer" layoutX="554.0" layoutY="43.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Text>
|
||||
<Label layoutX="411.0" layoutY="24.0" text="Correct answers:">
|
||||
<font>
|
||||
<Font size="17.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Text fx:id="possibleAnswer1" layoutX="61.0" layoutY="176.0" onMouseClicked="#answer1" strokeType="OUTSIDE"
|
||||
strokeWidth="0.0" text="English Word 1"/>
|
||||
<Text fx:id="possibleAnswer2" layoutX="260.0" layoutY="175.0" onMouseClicked="#answer2"
|
||||
strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 2"/>
|
||||
<Text fx:id="possibleAnswer3" layoutX="472.0" layoutY="175.0" onMouseClicked="#answer3"
|
||||
strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 3"/>
|
||||
<Text fx:id="possibleAnswer4" layoutX="61.0" layoutY="297.0" onMouseClicked="#answer4" strokeType="OUTSIDE"
|
||||
strokeWidth="0.0" text="English Word 4"/>
|
||||
<Text fx:id="possibleAnswer5" layoutX="260.0" layoutY="297.0" onMouseClicked="#answer5"
|
||||
strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 5"/>
|
||||
<Text fx:id="possibleAnswer6" layoutX="472.0" layoutY="297.0" onMouseClicked="#answer6"
|
||||
strokeType="OUTSIDE" strokeWidth="0.0" text="English Word 6"/>
|
||||
</children>
|
||||
</AnchorPane>
|
||||
<Text fx:id="correctAnswer" layoutX="469.0" layoutY="51.0" strokeType="OUTSIDE" strokeWidth="0.0"
|
||||
text="Correct Guesses: 0"/>
|
||||
<Text fx:id="wrongAnswer" layoutX="469.0" layoutY="68.0" strokeType="OUTSIDE" strokeWidth="0.0"
|
||||
text="Incorrect Guesses: 0"/>
|
||||
<Text fill="#8d8d8d" layoutX="238.0" layoutY="360.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Six Meanings">
|
||||
<font>
|
||||
<Font name="System Italic" size="22.0"/>
|
||||
<Font name="System Italic" size="22.0" />
|
||||
</font>
|
||||
</Text>
|
||||
</children>
|
||||
|
|
@ -160,8 +182,3 @@
|
|||
</center>
|
||||
|
||||
</BorderPane>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@
|
|||
<center>
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<TitledPane animated="false" prefHeight="400.0" prefWidth="600.0" text="Learn">
|
||||
<content>
|
||||
|
||||
|
||||
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
|
||||
<children>
|
||||
<TextField fx:id="translationBox" layoutX="205.0" layoutY="199.0" prefHeight="45.0" prefWidth="188.0" promptText="Enter translation here" />
|
||||
|
|
@ -153,8 +153,6 @@
|
|||
<ImageView fx:id="submitButton" fitHeight="46.0" fitWidth="69.0" layoutX="398.0" layoutY="199.0" onMouseClicked="#translateWord" pickOnBounds="true" preserveRatio="true" />
|
||||
</children>
|
||||
</AnchorPane>
|
||||
</content>
|
||||
</TitledPane>
|
||||
</children>
|
||||
</Pane>
|
||||
|
||||
|
|
|
|||
Reference in a new issue