diff --git a/bin/view/FSWindow$1.class b/bin/view/FSWindow$1.class index a359fb7..6869d3a 100644 Binary files a/bin/view/FSWindow$1.class and b/bin/view/FSWindow$1.class differ diff --git a/bin/view/FSWindow.class b/bin/view/FSWindow.class index 82fe970..3967feb 100644 Binary files a/bin/view/FSWindow.class and b/bin/view/FSWindow.class differ diff --git a/src/view/FSWindow.java b/src/view/FSWindow.java index d4b9212..788d617 100644 --- 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,11 +185,9 @@ 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){ @@ -200,6 +195,8 @@ public class FSWindow { } }); + 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);