Merge pull request #357 from Cherweijie/branch-HelpCommand

Help Window resizing and change display message
AY1920S2-CS2103T-W12-1 · Apr 11, 2020 · ef5dfa3 · ef5dfa3
2 parents 91929bc + b5fb507
commit ef5dfa3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/src/main/java/seedu/delino/ui/HelpWindow.java b/src/main/java/seedu/delino/ui/HelpWindow.java
@@ -30,7 +30,7 @@ public class HelpWindow extends UiPart<Stage> {
             + "      Format: insert TRANSACTION_ID NAME ADDRESS PHONE_NUMBER DELIVERY_TIMESTAMP \n"
             + "              EMAIL WAREHOUSE_ADDRESS CASH_ON_DELIVERY\n"
             + "      Eg. insert tid/9876543210 n/John Doe a/Blk 572 Hougang st 51 #10-33 S530572"
-            + " p/98766789 \n              dts/2020-02-20 1300 e/[email protected] w/Yishun cod/$4 \n"
+            + " p/98766789 \n              dts/2020-05-20 1300 e/[email protected] w/Yishun cod/$4 \n"
 
             + "\n 2. Clear all orders/returns while orders are listed \n"
             + "      Format: clear FLAG INDEX \n"
@@ -75,10 +75,10 @@ public class HelpWindow extends UiPart<Stage> {
             + "\n 11. Create a return order and adds it into the list of returns\n"
             + "       Format: return TRANSACTION_ID NAME ADDRESS PHONE_NUMBER RETURN_TIMESTAMP WAREHOUSE_LOCATION \n"
             + "                      [COMMENTS] [ITEM_TYPE] \n"
-            + "       OR      return TRANSACTION_ID \n"
-            + "       Eg. return tid/ac17s2a n/Bobby Tan a/123 Delta Road #03-333 Singapore 123456\n"
-            + "                  p/91230456 rts/12-12-2020 1300 w/Jurong Warehouse c/NIL type/glass \n"
-            + "       OR  return tid/ac123d"
+            + "       OR      return TRANSACTION_ID RETURN_TIME_STAMP \n"
+            + "       Eg. return tid/ac17s2a n/Bobby Tan a/123 Delta Road #03-333 Singapore S123456\n"
+            + "                  p/91230456 rts/2020-12-12 1300 w/Jurong Warehouse c/NIL type/glass \n"
+            + "       OR  return tid/ac123d rts/2020-12-12 1300 \n"
 
             + "\n 12. View orders at a specified Singapore postal sector "
             + "(i.e. the first two digits of the postal code)\n"

diff --git a/src/main/resources/view/HelpWindow.fxml b/src/main/resources/view/HelpWindow.fxml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.net.URL?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.Scene?>
-<?import javafx.scene.text.Font?>
-<?import javafx.stage.Stage?>
-<fx:root resizable="true" maxHeight="700" maxWidth="700" title="Help Window for Delino" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1">
+<?import java.net.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.stage.*?>
+
+<fx:root maxHeight="600.0" maxWidth="700" maximized="true" minHeight="250.0" minWidth="350.0" resizable="true" title="Help Window for Delino" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1">
   <icons>
     <Image url="@/images/help_icon.png" />
   </icons>
   <scene>
     <Scene fill="#5e839b">
-        <ScrollPane>
+        <ScrollPane fitToWidth="true">
             <stylesheets>
-                <URL value="@Extensions.css"/>
+                <URL value="@Extensions.css" />
             </stylesheets>
          <VBox alignment="CENTER" maxHeight="Infinity" maxWidth="Infinity" style="-fx-background-color: #5e839b;" HBox.hgrow="ALWAYS">
             <children>
@@ -31,9 +29,7 @@
                         <Font name="Roboto Regular" size="12.0" />
                     </font>
                 </Label>
-               <Button fx:id="copyButton" accessibleRole="HYPERLINK" alignment="TOP_RIGHT" contentDisplay="CENTER"
-                       mnemonicParsing="false" onAction="#copyUrl" text="Copy Delino User Guide Link"
-                       textAlignment="CENTER" textFill="#4d4a4a">
+               <Button fx:id="copyButton" accessibleRole="HYPERLINK" alignment="TOP_RIGHT" contentDisplay="CENTER" mnemonicParsing="false" onAction="#copyUrl" text="Copy Delino User Guide Link" textAlignment="CENTER" textFill="#4d4a4a">
                   <HBox.margin>
                      <Insets />
                   </HBox.margin>