noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed the placeholder screenswitching buttons.

Browse source
This commit is contained in:
top19 2020-04-30 09:20:33 +01:00
parent 2f3cf1100e
commit 832c90f81c
8 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/AddWordController.java
View file

@ -126,11 +126,6 @@ public class AddWordController extends SharedCodeController {
// }
@FXML
private void switchToPrimary() throws IOException {
Application.setRoot("Primary");
}
// add character methods for characters ch, dd, ff, ng, ll, ph, rh, th
public void addCharch(ActionEvent actionEvent) {
welsh.appendText("ch");

9
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/DictionaryController.java
View file

@ -116,15 +116,6 @@ public class DictionaryController extends SharedCodeController {
}
}
/**
* Switches to the primary scene.
*
* @throws IOException
*/
@FXML
private void switchToPracticeList() throws IOException {
ScreenSwitch.swap(ScreenSwitch.SceneEnum.practiceListScene);
}
/**
* Initializes the table of dictionary entries.

4
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/FlashcardController.java
View file

@ -170,9 +170,5 @@ public class FlashcardController extends SharedCodeController {
}
@FXML
private void switchToAddWord() throws IOException {
AssessmentGenerator.generateAssessment(Application.practiseList);
}
}

10
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/javafx/PracticeListController.java
View file

@ -233,15 +233,7 @@ public class PracticeListController extends SharedCodeController{
}
}
/**
* Switches to the primary scene.
*
* @throws IOException
*/
@FXML
private void switchToFlashCard() throws IOException {
ScreenSwitch.swap(ScreenSwitch.SceneEnum.flashcardScene);
}
}

1
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/addword.fxml
View file

@ -149,7 +149,6 @@
<Button mnemonicParsing="false" onAction="#addButtonClick" prefHeight="25.0" prefWidth="274.0" text="Add Word" GridPane.columnIndex="3" GridPane.rowIndex="4" />
<TextField fx:id="english" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<TextField fx:id="welsh" GridPane.columnIndex="5" GridPane.rowIndex="3" />
<Button mnemonicParsing="false" onAction="#switchToPrimary" prefHeight="25.0" prefWidth="107.0" text="Switch Scene" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<GridPane prefHeight="55.0" prefWidth="258.0" GridPane.columnIndex="3" GridPane.rowIndex="5">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />

1
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/dictionary.fxml
View file

@ -185,7 +185,6 @@
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy>
</TableView>
<Button fx:id="primaryButton" onAction="#switchToPracticeList" text="Switch to Practice List" />
</children>
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />

1
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/flashcard.fxml
View file

@ -151,7 +151,6 @@
</children>
</HBox>
</children>
<Button mnemonicParsing="false" onAction="#switchToAddWord" text="Add Word Screen" />
</VBox>

1
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/practicelist.fxml
View file

@ -180,7 +180,6 @@
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy>
</TableView>
<Button fx:id="primaryButton" onAction="#switchToFlashCard" text="Switch to FlashCard View" />
</children>
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />