From 138b5cae46d5bf3cf4b98e6a079de35cc932598b Mon Sep 17 00:00:00 2001 From: Sunguin Date: Fri, 30 Sep 2016 14:19:54 +1300 Subject: [PATCH] Improved the help menu item. --- .../seng202/group9/GUI/HelpController.java | 31 ++++++++++++------- src/main/resources/help.fxml | 12 +++---- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/main/java/seng202/group9/GUI/HelpController.java b/src/main/java/seng202/group9/GUI/HelpController.java index 3d2744b..226eff6 100644 --- a/src/main/java/seng202/group9/GUI/HelpController.java +++ b/src/main/java/seng202/group9/GUI/HelpController.java @@ -5,6 +5,7 @@ import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.ListView; import javafx.scene.control.TextArea; +import javafx.scene.layout.Pane; import javafx.scene.text.Text; import javafx.scene.text.TextFlow; @@ -15,35 +16,41 @@ public class HelpController extends Controller { @FXML private ListView listView; @FXML - private TextArea textArea; + private TextFlow textArea; public static final ObservableList menu = FXCollections.observableArrayList(); + Text text = new Text(); public void load() { menu.addAll("Importing Data", "Viewing Data", "Manipulating Data", "Analysis"); - textArea.setStyle("-fx-text-alignment: justify"); + text = new Text("Please select an option on the left side menu to display its contents."); + textArea.getChildren().add(text); + listView.setItems(menu); } public void sss() { String menuValue = listView.getSelectionModel().getSelectedItem().toString(); + textArea.getChildren().clear(); if (menuValue == "Importing Data") { - textArea.setText("You can import data from the first start up of the application and " + - "from the 'File' menu on the top of the screen. \nTo import data, select the type " + + text = new Text("You can import data from the first start up of the application and " + + "from the 'File' menu on the top of the screen.\nTo import data, select the type " + "of data you wish to import. Then select the file (.csv and .txt file) from the " + "file selector. The data will be loaded into the program and taken to the " + "corresponding summary page."); + textArea.getChildren().add(text); } else if (menuValue == "Viewing Data") { - textArea.setText("There are two types of views available: Summary view and Raw Data view. " + + text = new Text("There are two types of views available: Summary view and Raw Data view. " + "These are accessable from the menu on the top of the screen under the " + "'View' tab. You first choose which set of data you want to view and then you can select" + " either 'Summary' or 'Raw Data'.\n" + - " The summary view does not have every column but provides a map of where the " + - "place is. \nThe raw data view allows the user to view the full data table."); + "The summary view does not have every column but provides a map of where the " + + "place is.\nThe raw data view allows the user to view the full data table."); + textArea.getChildren().add(text); } else if (menuValue == "Manipulating Data") { - textArea.setText("Data manipulation is all available in the Raw Data views. There are four " + - "ways to manipulate data: 'Add', 'Filter', 'Edit' and 'Delete'. \n" + + text = new Text("Data manipulation is all available in the Raw Data views. There are four " + + "ways to manipulate data: 'Add', 'Filter', 'Edit' and 'Delete'.\n" + "Add: To add a new entry, first go to the raw data view for that data type. Then click " + "on the add button located on the bottom of the page. Then fill out the entries in the " + "pop-up box and click add at the bottom of the screen. If there is an error with your entry, " + @@ -58,11 +65,13 @@ public class HelpController extends Controller { "Delete: The delete function is also accessed by right clicking an entry and pressing the delete field. " + "This will come up with a pop up to confirm your delete. When you press ok, the entry will be deleted " + "from the program. The program also allows multiple deletes."); + textArea.getChildren().add(text); } else if (menuValue == "Analysis") { - textArea.setText("There are two ways to do analysis. \nThe first method is to go to the raw data page and " + - "press analyse. This will come up with specific graphs that are related to the set of data. " + + text = new Text("There are two ways to do analysis.\nThe first method is to go to the raw data page and " + + "press analyse. This will come up with specific graphs that are related to the set of data." + "\nThe second method is by accessing the 'Analysis' button on the menu on the top of the page. " + "You can select which type of analysis you want from here."); + textArea.getChildren().add(text); } } diff --git a/src/main/resources/help.fxml b/src/main/resources/help.fxml index 9c5a970..6f1d0bd 100644 --- a/src/main/resources/help.fxml +++ b/src/main/resources/help.fxml @@ -7,7 +7,7 @@ - + @@ -28,14 +28,14 @@ - + + + +