Removed the placeholder screenswitching buttons.
This commit is contained in:
parent
2f3cf1100e
commit
832c90f81c
8 changed files with 1 additions and 31 deletions
|
@ -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
|
// add character methods for characters ch, dd, ff, ng, ll, ph, rh, th
|
||||||
public void addCharch(ActionEvent actionEvent) {
|
public void addCharch(ActionEvent actionEvent) {
|
||||||
welsh.appendText("ch");
|
welsh.appendText("ch");
|
||||||
|
|
|
@ -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.
|
* Initializes the table of dictionary entries.
|
||||||
|
|
|
@ -170,9 +170,5 @@ public class FlashcardController extends SharedCodeController {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
|
||||||
private void switchToAddWord() throws IOException {
|
|
||||||
AssessmentGenerator.generateAssessment(Application.practiseList);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -149,7 +149,6 @@
|
||||||
<Button mnemonicParsing="false" onAction="#addButtonClick" prefHeight="25.0" prefWidth="274.0" text="Add Word" GridPane.columnIndex="3" GridPane.rowIndex="4" />
|
<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="english" GridPane.columnIndex="1" GridPane.rowIndex="3" />
|
||||||
<TextField fx:id="welsh" GridPane.columnIndex="5" 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">
|
<GridPane prefHeight="55.0" prefWidth="258.0" GridPane.columnIndex="3" GridPane.rowIndex="5">
|
||||||
<columnConstraints>
|
<columnConstraints>
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
||||||
|
|
|
@ -185,7 +185,6 @@
|
||||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
||||||
</columnResizePolicy>
|
</columnResizePolicy>
|
||||||
</TableView>
|
</TableView>
|
||||||
<Button fx:id="primaryButton" onAction="#switchToPracticeList" text="Switch to Practice List" />
|
|
||||||
</children>
|
</children>
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||||
|
|
|
@ -151,7 +151,6 @@
|
||||||
</children>
|
</children>
|
||||||
</HBox>
|
</HBox>
|
||||||
</children>
|
</children>
|
||||||
<Button mnemonicParsing="false" onAction="#switchToAddWord" text="Add Word Screen" />
|
|
||||||
|
|
||||||
</VBox>
|
</VBox>
|
||||||
|
|
||||||
|
|
|
@ -180,7 +180,6 @@
|
||||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
||||||
</columnResizePolicy>
|
</columnResizePolicy>
|
||||||
</TableView>
|
</TableView>
|
||||||
<Button fx:id="primaryButton" onAction="#switchToFlashCard" text="Switch to FlashCard View" />
|
|
||||||
</children>
|
</children>
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||||
|
|
Reference in a new issue