Merge branch 'master' of https://github.uconn.edu/joh13010/2102-Group…

…-Project-Spring-2017.git
joh13010 · Apr 21, 2017 · da734c8 · da734c8
2 parents 2b7a5f9 + 40306a9
commit da734c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class
diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class
diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java
@@ -102,7 +102,6 @@ public class FSWindow {
 		tabbedPane.addTab("Income", incomeTable);
 		tabbedPane.setMnemonicAt(1, KeyEvent.VK_2);
 
-
 		String[] expenseColumns = {"Description", "CashFlow"};
 		Object[][] expense = {
 				{"Description", "CashFlow"},
@@ -122,8 +121,6 @@ public class FSWindow {
 		tabbedPane.addTab("Expenses", expenseTable);
 		tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
 
-
-
 		String[] assetColumns = {"Description", "CashFlow"};
 		Object[][] asset = {
 				{"Description", "CashFlow"},
@@ -188,18 +185,18 @@ public class FSWindow {
 		expenseTable.setPreferredSize(new Dimension(410, 250));
 		assetTable.setPreferredSize(new Dimension(410, 250));
 		assetTable2.setPreferredSize(new Dimension(410, 250));
+
 		mainFrame = new JFrame("CashFlow");
-		mainFrame.getContentPane().setBackground(new Color(149, 32, 216));
-		mainFrame.setSize(1000,750);
-		//need to set this to null and position everything manually
-		mainFrame.setLayout(new FlowLayout());
+		mainFrame.getContentPane().setBackground(new Color(49, 32, 216));
 
 		mainFrame.addWindowListener(new WindowAdapter() {
 			public void windowClosing(WindowEvent windowEvent){
 				System.exit(0);
 			}        
 		});    
 
+		tabbedPane.setPreferredSize(new Dimension(500, 750));
+
 		headerLabel = new JLabel("", JLabel.CENTER);       
 		headerLabel.setFont(headerLabel.getFont().deriveFont(Font.BOLD, 16f));
 		statusLabel = new JLabel("",JLabel.CENTER);    
@@ -208,20 +205,20 @@ public class FSWindow {
 
 		controlPanel = new JPanel();
 		controlPanel.setLayout(new FlowLayout());
-		controlPanel.setBackground(new Color(149, 32, 216));
+		controlPanel.setBackground(new Color(49, 32, 216));
 
+		mainFrame.setLayout(new FlowLayout());
 		mainFrame.add(headerLabel);
 		mainFrame.add(controlPanel);
 		mainFrame.add(statusLabel);
-		mainFrame.setVisible(true);  
+		mainFrame.setVisible(true);
+		mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);
 		mainFrame.add(splitPane);
+		//add game window like so
+	//  splitPane.add(gamewindow);
 		splitPane.add(tabbedPane);
-
-	}
-	private ImageIcon createImageIcon(String string) {
-		// TODO Auto-generated method stub
-		return null;
 	}
+
 	protected Component makeTextPanel(String text) {
 	    JPanel panel = new JPanel(false);
 	    JLabel filler = new JLabel(text);