Merge pull request #41 from blaqkrow/v1.2-Implementing-Google-maps-+-…

…extra-UI-elements fixed merge conflict
CS2103AUG2017-W15-B3 · Oct 20, 2017 · 54f7672 · 54f7672
2 parents 049b207 + 4cf84c8
commit 54f7672
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
@@ -49,9 +49,6 @@ public class MainWindow extends UiPart<Region> {
     private DeleteButton deleteButton;
     private EmailButton emailButton;
 
-    @FXML
-    private VBox vBox;
-
     @FXML
     private StackPane browserPlaceholder;
 
@@ -84,7 +81,8 @@ public class MainWindow extends UiPart<Region> {
 
     @FXML
     private StackPane emailButtonPlaceholder;
-
+    @FXML
+    private VBox vBox;
     public MainWindow(Stage primaryStage, Config config, UserPrefs prefs, Logic logic) {
         super(FXML);
 
@@ -222,7 +220,6 @@ public void handleHelp() {
         HelpWindow helpWindow = new HelpWindow();
         helpWindow.show();
     }
-
     void show() {
         primaryStage.show();
     }

diff --git a/src/main/resources/view/GreenTheme.css b/src/main/resources/view/GreenTheme.css
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -10,18 +10,18 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+<VBox fx:id="vBox" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
   <stylesheets>
     <URL value="@DarkTheme.css" />
     <URL value="@Extensions.css" />
   </stylesheets>
 
   <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
     <Menu mnemonicParsing="false" text="File">
-      <MenuItem mnemonicParsing="false" onAction="#handleBlackTheme" text="Black Theme"/>
-            <MenuItem mnemonicParsing="false" onAction="#handleWhiteTheme" text="White Theme"/>
-            <MenuItem mnemonicParsing="false" onAction="#handleGreenTheme" text="Green Theme"/>
-            <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
+      <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
+         <MenuItem mnemonicParsing="false" onAction="#handleBlackTheme" text="Black Theme" />
+         <MenuItem mnemonicParsing="false" onAction="#handleWhiteTheme" text="White Theme" />
+         <MenuItem mnemonicParsing="false" onAction="#handleGreenTheme" text="Green Theme" />
     </Menu>
     <Menu mnemonicParsing="false" text="Help">
       <MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
@@ -60,29 +60,7 @@
         <Insets bottom="10" left="10" right="10" top="10" />
       </padding>
     </StackPane>
+  </SplitPane>
 
-    <StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="100" prefHeight="100"
-               styleClass="pane-with-border" VBox.vgrow="NEVER">
-        <padding>
-            <Insets bottom="5" left="10" right="10" top="5"/>
-        </padding>
-    </StackPane>
-
-    <SplitPane id="splitPane" fx:id="splitPane" dividerPositions="0.4" VBox.vgrow="ALWAYS">
-        <VBox fx:id="personList" minWidth="340" prefWidth="340" SplitPane.resizableWithParent="false">
-            <padding>
-                <Insets bottom="10" left="10" right="10" top="10"/>
-            </padding>
-            <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
-            <StackPane fx:id="deleteButtonPlaceholder" prefHeight="48.0" prefWidth="322.0"/>
-        </VBox>
-
-        <StackPane fx:id="browserPlaceholder" prefWidth="340">
-            <padding>
-                <Insets bottom="10" left="10" right="10" top="10"/>
-            </padding>
-        </StackPane>
-    </SplitPane>
-
-    <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER"/>
+  <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
 </VBox>
diff --git a/src/main/resources/view/WhiteTheme.css b/src/main/resources/view/WhiteTheme.css