Updated display

kyleruss · May 3, 2018 · 95bd197 · 95bd197
1 parent cac5e57
commit 95bd197
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/data/conf/app-config.xml b/data/conf/app-config.xml
@@ -17,7 +17,7 @@
 <custom-height>900</custom-height>
 <theme-type>0</theme-type>
 <display-background>#FFFFFF</display-background>
-<node-background>#000000</node-background>
+<node-background>#0066FF</node-background>
 <edge-background>#000000</edge-background>
 <selected-background>#000000</selected-background>
 <edge-type/>

diff --git 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
@@ -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
@@ -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
@@ -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);