diff --git a/data/conf/app-config.xml b/data/conf/app-config.xml index 78e949d..48d29ac 100644 --- a/data/conf/app-config.xml +++ b/data/conf/app-config.xml @@ -17,7 +17,7 @@ 900 0 #FFFFFF -#000000 +#0066FF #000000 #000000 diff --git a/src/com/graphi/display/ViewPort.java b/src/com/graphi/display/ViewPort.java index 82ad09a..ae53a82 100644 --- a/src/com/graphi/display/ViewPort.java +++ b/src/com/graphi/display/ViewPort.java @@ -45,13 +45,12 @@ private ViewPort() setLayout(new CardLayout()); setPreferredSize(new Dimension(Consts.WINDOW_WIDTH, Consts.WINDOW_HEIGHT)); - initMainScene(); + initTitlePanel(); initSettingsPanel(); initPluginPanel(); - initTitlePanel(); - initTitlePanel(); initAboutPanel(); initTransitionPanel(); + initMainScene(); } public void attachMainPanel(MainPanel mainPanel) diff --git a/src/com/graphi/display/layout/controls/TaskControlPanel.java b/src/com/graphi/display/layout/controls/TaskControlPanel.java index 23b5c1d..ae11a59 100644 --- a/src/com/graphi/display/layout/controls/TaskControlPanel.java +++ b/src/com/graphi/display/layout/controls/TaskControlPanel.java @@ -61,13 +61,14 @@ public TaskControlPanel() taskPopupPanel = new TaskPopupPanel(); taskButton = new JButton("Tasks"); executePopupMenu = new JPopupMenu(); - runButton = ComponentUtils.generateDropdownButton(executePopupMenu, "Run", null); + runButton = ComponentUtils.generateDropdownButton(executePopupMenu, null, null); repeatManyPanel = new JPanel(new MigLayout("fillx")); repeatBox = new JComboBox(); execSetupBtn = new JMenuItem("Setup tasks"); execRepeatBtn = new JMenuItem("Repeatable tasks"); repeatCountSpinner = new JSpinner(new SpinnerNumberModel(1, 1, 100, 1)); + runButton.setText("Run"); executePopupMenu.add(execSetupBtn); executePopupMenu.add(execRepeatBtn); diff --git a/src/com/graphi/display/menu/MainMenu.java b/src/com/graphi/display/menu/MainMenu.java index c8b2027..7288975 100644 --- a/src/com/graphi/display/menu/MainMenu.java +++ b/src/com/graphi/display/menu/MainMenu.java @@ -115,9 +115,9 @@ private MainMenu() //About menu items addMenuItem("aboutItem", new JMenuItem("Author"), aboutMenu); - addMenuItem("documentationItem", new JMenuItem("Documentation"), aboutMenu); - addMenuItem("licenseItem", new JMenuItem("License"), aboutMenu); - addMenuItem("repositoryItem", new JMenuItem("Repository"), aboutMenu); + // addMenuItem("documentationItem", new JMenuItem("Documentation"), aboutMenu); + // addMenuItem("licenseItem", new JMenuItem("License"), aboutMenu); + //addMenuItem("repositoryItem", new JMenuItem("Repository"), aboutMenu); //---------------------------------------------------------------------- diff --git a/src/com/graphi/display/menu/MenuActionListener.java b/src/com/graphi/display/menu/MenuActionListener.java index 4cecb77..90fcc9f 100644 --- a/src/com/graphi/display/menu/MenuActionListener.java +++ b/src/com/graphi/display/menu/MenuActionListener.java @@ -43,7 +43,7 @@ public void actionPerformed(ActionEvent e) JFrame frame = Window.getInstance().getFrame(); if(src == menu.getMenuItem("aboutItem")) - menu.showAbout(); + ViewPort.getInstance().transitionScene(ViewPort.ABOUT_SCENE); else if(src == menu.getMenuItem("exitItem")) System.exit(0);