Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge V0.5rc ruiwen for integration #129

Merged
merged 8 commits into from
Nov 7, 2016
Prev Previous commit
Next Next commit
Edit UI: remove overdue panel and adjust weekly view panel
ruiwen905 committed Nov 6, 2016
commit 7e5043fe985e0cc124a42af5a5929dcdac95db7c
25 changes: 5 additions & 20 deletions src/main/java/seedu/savvytasker/ui/MainWindow.java
Original file line number Diff line number Diff line change
@@ -104,13 +104,9 @@ public class MainWindow extends UiPart {
@FXML
private VBox listPanel;


@FXML
private AnchorPane floatingPanelPlaceholder;

@FXML
private AnchorPane overduePanelPlaceholder;

@FXML
private AnchorPane day1PanelPlaceholder;
@FXML
@@ -123,8 +119,7 @@ public class MainWindow extends UiPart {
private AnchorPane day5PanelPlaceholder;
@FXML
private AnchorPane day6PanelPlaceholder;
@FXML
private AnchorPane day7PanelPlaceholder;


@FXML
private AnchorPane upcomingPanelPlaceholder;
@@ -181,7 +176,6 @@ void fillInnerParts() {
commandBox = CommandBox.load(primaryStage, getCommandBoxPlaceholder(), resultDisplay, logic);
commandBox.getCommandTextField().requestFocus();
floatingPanel = FloatingPanel.load(primaryStage, getFloatingPanelPlaceholder(), logic.getFilteredFloatingTasks());
overduePanel = OverduePanel.load(primaryStage, getOverduePanelPlaceholder(), logic.getFilteredOverdueTasks());
loadDailyPanel();
upcomingPanel = UpcomingPanel.load(primaryStage, getUpcomingPanelPlaceholder(), logic.getFilteredUpcomingTasks(firstDayOfSelectedWeek));
}
@@ -248,10 +242,6 @@ private AnchorPane getFloatingPanelPlaceholder() {
return floatingPanelPlaceholder;
}

private AnchorPane getOverduePanelPlaceholder() {
return overduePanelPlaceholder;
}

private AnchorPane getDailyPanelPlaceholder(int index) {

switch(index) {
@@ -277,16 +267,10 @@ private AnchorPane getDailyPanelPlaceholder(int index) {
return day5PanelPlaceholder;

case 5:
default:

return day6PanelPlaceholder;

case 6:

return day7PanelPlaceholder;

default:

return day1PanelPlaceholder;
}

}
@@ -373,13 +357,14 @@ public TaskListPanel getTaskListPanel() {
return this.taskListPanel;
}


public void loadPersonPage(ReadOnlyTask task) {
//feature removed
//browserPanel.loadPersonPage(task);
}

public void releaseResources() {
//browserPanel.freeResources();
//feature removed
//browserPanel.freeResources();
}

@Subscribe
19 changes: 4 additions & 15 deletions src/main/resources/view/MainWindow.fxml
Original file line number Diff line number Diff line change
@@ -37,20 +37,20 @@
</padding>
<children>
<AnchorPane fx:id="taskListPanelPlaceholder" VBox.vgrow="ALWAYS" />
<AnchorPane fx:id="aliasSymbolListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
<AnchorPane fx:id="aliasSymbolListPanelPlaceholder" VBox.vgrow="ALWAYS" />
</children>
</VBox>
<GridPane hgap="12.0" prefWidth="860.0" styleClass="anchor-pane-with-border" vgap="12.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -61,11 +61,10 @@
<AnchorPane fx:id="floatingPanelPlaceholder" prefHeight="359.0" prefWidth="257.0" />
</children>
</VBox>
<GridPane hgap="12.0" prefHeight="570.0" vgap="12.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowSpan="3">
<GridPane hgap="12.0" prefHeight="570.0" vgap="12.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowSpan="4">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -106,19 +105,9 @@
<AnchorPane fx:id="day6PanelPlaceholder" prefHeight="359.0" prefWidth="257.0" />
</children>
</VBox>
<VBox fx:id="vboxSeven" prefHeight="200.0" prefWidth="100.0" spacing="8.0" styleClass="daily-panel" GridPane.columnIndex="2">
<children>
<AnchorPane fx:id="day7PanelPlaceholder" prefHeight="359.0" prefWidth="257.0" />
</children>
</VBox>
</children>
</GridPane>
<VBox fx:id="overdueList" prefHeight="200.0" prefWidth="100.0" styleClass="overdue-panel" GridPane.rowIndex="2">
<children>
<AnchorPane fx:id="overduePanelPlaceholder" prefHeight="359.0" prefWidth="257.0" />
</children>
</VBox>
<VBox fx:id="vboxComing" prefHeight="200.0" prefWidth="100.0" styleClass="upcoming-panel" GridPane.columnIndex="3" GridPane.rowIndex="1" GridPane.rowSpan="2">
<VBox fx:id="vboxComing" prefHeight="200.0" prefWidth="100.0" styleClass="upcoming-panel" GridPane.rowIndex="2" GridPane.rowSpan="2">
<children>
<AnchorPane fx:id="upcomingPanelPlaceholder" prefHeight="359.0" prefWidth="257.0" />
</children>