Merge branch 'master' of https://github.com/CS2103AUG2016-W13-C2/main …

…into ZhenDongBranch * 'master' of https://github.com/CS2103AUG2016-W13-C2/main: adding listing header
CS2103AUG2016-W13-C2 · Oct 26, 2016 · 147c9cd · 147c9cd
2 parents d626baa + 4acd0cf
commit 147c9cd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.classpath b/.classpath
@@ -15,7 +15,8 @@
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="lib" path="C:/Users/Leah/Downloads/prettytime-nlp-4.0.1.Final.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/main/java/seedu/ggist/ui/MainWindow.java b/src/main/java/seedu/ggist/ui/MainWindow.java
@@ -30,7 +30,6 @@ public class MainWindow extends UiPart {
     private Logic logic;
 
     // Independent Ui parts residing in this Ui container
-    //private BrowserPanel browserPanel;
     private TaskListPanel taskListPanel;
     private ResultDisplay resultDisplay;
     private StatusBarFooter statusBarFooter;
@@ -45,9 +44,6 @@ public class MainWindow extends UiPart {
 
     private String taskManagerName;
 
-    //@FXML
-    //private AnchorPane browserPlaceholder;
-
     @FXML
     private AnchorPane commandBoxPlaceholder;
 
@@ -195,12 +191,4 @@ private void handleExit() {
     public TaskListPanel getTaskListPanel() {
         return this.taskListPanel;
     }
-
-    //public void loadTaskPage(ReadOnlyTask task) {
-    //    browserPanel.loadTaskPage(task);
-    //}
-
-    //public void releaseResources() {
-    //    browserPanel.freeResources();
-    //}
 }
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -3,12 +3,24 @@
 }
 
 .label {
-    fx-font-size: 35pt;
+    -fx-font-size: 35pt;
 	-fx-font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
     -fx-text-fill: #008080;
     -fx-opacity: 1;
 }
 
+.label-date {
+	-fx-font-size: 42pt;
+	-fx-font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+	-fx-text-fill: #649fbc;
+	-fx-opacity: 0.6;
+}
+
+.label-date:hover {
+	-fx-text-fill: #f4a9a9;
+	-fx-opacity: 1;
+}
+
 .label-bright {
     -fx-font-size: 11pt;
     -fx-font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;

diff --git a/src/main/resources/view/ListingHeader.fxml b/src/main/resources/view/ListingHeader.fxml
@@ -5,11 +5,11 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seedu.ggist.ui.ListingHeader">
+<VBox xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seedu.ggist.ui.ListingHeader">
    <children>
-      <AnchorPane fx:id="listHeader">
+      <AnchorPane fx:id="listHeader" styleClass="anchor-pane" stylesheets="@DarkTheme.css">
          <children>
-            <Label fx:id="listing" alignment="CENTER_RIGHT" contentDisplay="TEXT_ONLY" layoutX="-56.0" layoutY="5.0" prefHeight="24.0" prefWidth="241.0" stylesheets="@DarkTheme.css" text="Label" textAlignment="RIGHT" textFill="#6088b5" wrapText="true" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="-56.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">
+            <Label fx:id="listing" alignment="CENTER_RIGHT" contentDisplay="TEXT_ONLY" layoutX="-56.0" layoutY="5.0" prefHeight="24.0" prefWidth="241.0" styleClass="label-date" stylesheets="@DarkTheme.css" text="Label" textAlignment="RIGHT" textFill="#6088b5" wrapText="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="-56.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="5.0">
                <font>
                   <Font name="Helvetica Neue Condensed Black" size="63.0" />
                </font>