Merge branch 'v0.4'

Ready for v0.4 beta release.
CS2103AUG2016-F11-C2 · Oct 27, 2016 · a42ab48 · a42ab48
2 parents dfe556b + a2142cd
commit a42ab48
Show file tree

Hide file tree

Showing 120 changed files with 7,987 additions and 548 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ preferences.json
 ./screenshot*.png
 classes/
 /data/
-/bin/
 /target/
 target/
+bin/data
+Collate-TUI.jar
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/CS2103AUG2016-F11-C2/main.svg?branch=master)](https://travis-ci.org/CS2103AUG2016-F11-C2/main)
 [![Coverage Status](https://coveralls.io/repos/github/CS2103AUG2016-F11-C2/main/badge.svg?branch=master)](https://coveralls.io/github/CS2103AUG2016-F11-C2/main?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/411e48d9591e4bcd8ff9c27be86db219)](https://www.codacy.com/app/njyjustin/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2103AUG2016-F11-C2/main&amp;utm_campaign=Badge_Grade)
 
 # CMDo
 

diff --git a/bin/CMDo-0.4.jar b/bin/CMDo-0.4.jar
diff --git a/bin/CSS/DarkTheme.css b/bin/CSS/DarkTheme.css
@@ -0,0 +1,288 @@
+.background {
+    -fx-background-color: derive(#1d1d1d, 20%);
+}
+
+.label {
+    -fx-font-size: 11pt;
+    -fx-font-family: "Segoe UI Semibold";
+    -fx-text-fill: #555555;
+    -fx-opacity: 0.9;
+}
+
+.label-bright {
+    -fx-font-size: 11pt;
+    -fx-font-family: "Segoe UI Semibold";
+    -fx-text-fill: white;
+    -fx-opacity: 1;
+}
+
+.label-header {
+    -fx-font-size: 32pt;
+    -fx-font-family: "Segoe UI Light";
+    -fx-text-fill: white;
+    -fx-opacity: 1;
+}
+
+.text-field {
+    -fx-font-size: 12pt;
+    -fx-font-family: "Segoe UI Semibold";
+}
+
+.tab-pane {
+    -fx-padding: 0 0 0 1;
+}
+
+.tab-pane .tab-header-area {
+    -fx-padding: 0 0 0 0;
+    -fx-min-height: 0;
+    -fx-max-height: 0;
+}
+
+.table-view {
+    -fx-base: #1d1d1d;
+    -fx-control-inner-background: #1d1d1d;
+    -fx-background-color: #1d1d1d;
+    -fx-table-cell-border-color: transparent;
+    -fx-table-header-border-color: transparent;
+    -fx-padding: 5;
+}
+
+.table-view .column-header-background {
+    -fx-background-color: transparent;
+}
+
+.table-view .column-header, .table-view .filler {
+    -fx-size: 35;
+    -fx-border-width: 0 0 1 0;
+    -fx-background-color: transparent;
+    -fx-border-color:
+        transparent
+        transparent
+        derive(-fx-base, 80%)
+        transparent;
+    -fx-border-insets: 0 10 1 0;
+}
+
+.table-view .column-header .label {
+    -fx-font-size: 20pt;
+    -fx-font-family: "Segoe UI Light";
+    -fx-text-fill: white;
+    -fx-alignment: center-left;
+    -fx-opacity: 1;
+}
+
+.table-view:focused .table-row-cell:filled:focused:selected {
+    -fx-background-color: -fx-focus-color;
+}
+
+.split-pane:horizontal .split-pane-divider {
+    -fx-border-color: transparent #1d1d1d transparent #1d1d1d;
+    -fx-background-color: transparent, derive(#1d1d1d, 10%);
+}
+
+.split-pane {
+    -fx-border-radius: 1;
+    -fx-border-width: 1;
+    -fx-background-color: derive(#1d1d1d, 20%);
+}
+
+.list-cell {
+    -fx-label-padding: 0 0 0 0;
+    -fx-graphic-text-gap : 0;
+    -fx-padding: 0 0 0 0;
+}
+
+.list-cell .label {
+    -fx-text-fill: #010504;
+}
+
+.cell_big_label {
+    -fx-font-size: 16px;
+    -fx-text-fill: #010504;
+}
+
+.cell_small_label {
+    -fx-font-size: 11px;
+    -fx-text-fill: #010504;
+}
+
+.anchor-pane {
+     -fx-background-color: derive(#1d1d1d, 20%);
+}
+
+.anchor-pane-with-border {
+     -fx-background-color: derive(#1d1d1d, 20%);
+     -fx-border-color: derive(#1d1d1d, 10%);
+     -fx-border-top-width: 1px;
+}
+
+.status-bar {
+    -fx-background-color: derive(#1d1d1d, 20%);
+    -fx-text-fill: black;
+}
+
+.result-display {
+    -fx-background-color: #ffffff;
+}
+
+.result-display .label {
+    -fx-text-fill: black !important;
+}
+
+.status-bar .label {
+    -fx-text-fill: white;
+}
+
+.status-bar-with-border {
+    -fx-background-color: derive(#1d1d1d, 30%);
+    -fx-border-color: derive(#1d1d1d, 25%);
+    -fx-border-width: 1px;
+}
+
+.status-bar-with-border .label {
+    -fx-text-fill: white;
+}
+
+.grid-pane {
+    -fx-background-color: derive(#1d1d1d, 30%);
+    -fx-border-color: derive(#1d1d1d, 30%);
+    -fx-border-width: 1px;
+}
+
+.grid-pane .anchor-pane {
+    -fx-background-color: derive(#1d1d1d, 30%);
+}
+
+.context-menu {
+    -fx-background-color: derive(#1d1d1d, 50%);
+}
+
+.context-menu .label {
+    -fx-text-fill: white;
+}
+
+.menu-bar {
+    -fx-background-color: derive(#1d1d1d, 20%);
+}
+
+.menu-bar .label {
+    -fx-font-size: 14pt;
+    -fx-font-family: "Segoe UI Light";
+    -fx-text-fill: white;
+    -fx-opacity: 0.9;
+}
+
+.menu .left-container {
+    -fx-background-color: black;
+}
+
+/*
+ * Metro style Push Button
+ * Author: Pedro Duque Vieira
+ * http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/
+ */
+.button {
+    -fx-padding: 5 22 5 22;
+    -fx-border-color: #e2e2e2;
+    -fx-border-width: 2;
+    -fx-background-radius: 0;
+    -fx-background-color: #1d1d1d;
+    -fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
+    -fx-font-size: 11pt;
+    -fx-text-fill: #d8d8d8;
+    -fx-background-insets: 0 0 0 0, 0, 1, 2;
+}
+
+.button:hover {
+    -fx-background-color: #3a3a3a;
+}
+
+.button:pressed, .button:default:hover:pressed {
+  -fx-background-color: white;
+  -fx-text-fill: #1d1d1d;
+}
+
+.button:focused {
+    -fx-border-color: white, white;
+    -fx-border-width: 1, 1;
+    -fx-border-style: solid, segments(1, 1);
+    -fx-border-radius: 0, 0;
+    -fx-border-insets: 1 1 1 1, 0;
+}
+
+.button:disabled, .button:default:disabled {
+    -fx-opacity: 0.4;
+    -fx-background-color: #1d1d1d;
+    -fx-text-fill: white;
+}
+
+.button:default {
+    -fx-background-color: -fx-focus-color;
+    -fx-text-fill: #ffffff;
+}
+
+.button:default:hover {
+    -fx-background-color: derive(-fx-focus-color, 30%);
+}
+
+.dialog-pane {
+    -fx-background-color: #1d1d1d;
+}
+
+.dialog-pane > *.button-bar > *.container {
+    -fx-background-color: #1d1d1d;
+}
+
+.dialog-pane > *.label.content {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: white;
+}
+
+.dialog-pane:header *.header-panel {
+    -fx-background-color: derive(#1d1d1d, 25%);
+}
+
+.dialog-pane:header *.header-panel *.label {
+    -fx-font-size: 18px;
+    -fx-font-style: italic;
+    -fx-fill: white;
+    -fx-text-fill: white;
+}
+
+.scroll-bar .thumb {
+    -fx-background-color: derive(#1d1d1d, 50%);
+    -fx-background-insets: 3;
+}
+
+.scroll-bar .increment-button, .scroll-bar .decrement-button {
+    -fx-background-color: transparent;
+    -fx-padding: 0 0 0 0;
+}
+
+.scroll-bar .increment-arrow, .scroll-bar .decrement-arrow {
+    -fx-shape: " ";
+}
+
+.scroll-bar:vertical .increment-arrow, .scroll-bar:vertical .decrement-arrow {
+    -fx-padding: 1 8 1 8;
+}
+
+.scroll-bar:horizontal .increment-arrow, .scroll-bar:horizontal .decrement-arrow {
+    -fx-padding: 8 1 8 1;
+}
+
+#cardPane {
+    -fx-background-color: transparent;
+    -fx-border-color: #d6d6d6;
+    -fx-border-width: 1 1 1 1;
+}
+
+#commandTypeLabel {
+    -fx-font-size: 11px;
+    -fx-text-fill: #F70D1A;
+}
+
+#filterField, #personListPanel, #personWebpage {
+    -fx-effect: innershadow(gaussian, black, 10, 0, 0, 0);
+}
diff --git a/bin/CSS/Extensions.css b/bin/CSS/Extensions.css
@@ -0,0 +1,16 @@
+
+.error {
+    -fx-background-color: red;
+}
+
+
+.tag-selector {
+    -fx-border-width: 1;
+    -fx-border-color: white;
+    -fx-border-radius: 3;
+    -fx-background-radius: 3;
+}
+
+.tooltip-text {
+    -fx-text-fill: white;
+}
diff --git a/bin/CSS/Labels.css b/bin/CSS/Labels.css
@@ -0,0 +1,7 @@
+.root {
+	-fx-background-image: url("Welcome.png");
+}
+
+.label .text{
+	-fx-strikethrough: false ;
+}
diff --git a/bin/images/Logo.png b/bin/images/Logo.png
diff --git a/bin/images/Welcome.png b/bin/images/Welcome.png
diff --git a/bin/images/address_book_32.png b/bin/images/address_book_32.png
diff --git a/bin/images/calendar.png b/bin/images/calendar.png
diff --git a/bin/images/chillzone.png b/bin/images/chillzone.png
diff --git a/bin/images/clock.png b/bin/images/clock.png
diff --git a/bin/images/deadlinesoon.png b/bin/images/deadlinesoon.png
diff --git a/bin/images/fail.png b/bin/images/fail.png
diff --git a/bin/images/help_icon.png b/bin/images/help_icon.png
diff --git a/bin/images/info_icon.png b/bin/images/info_icon.png
diff --git a/bin/images/overdue.png b/bin/images/overdue.png
diff --git a/bin/images/overduestatus.png b/bin/images/overduestatus.png
diff --git a/bin/images/someday.png b/bin/images/someday.png
diff --git a/bin/images/thismonth.png b/bin/images/thismonth.png
diff --git a/bin/images/thisweek.png b/bin/images/thisweek.png
diff --git a/bin/images/today.png b/bin/images/today.png
diff --git a/bin/images/totaltask.png b/bin/images/totaltask.png
diff --git a/bin/view/CommandBox.fxml b/bin/view/CommandBox.fxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+
+
+<AnchorPane styleClass="anchor-pane" stylesheets="@DarkTheme.css" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seedu.cmdo.ui.CommandBox">
+   <TextField fx:id="commandTextField" onAction="#handleCommandInputChanged" promptText="Enter command here..." />
+</AnchorPane>