Browse Source

tabbed pane

Kevin Trometer 7 years ago
parent
commit
26d933c431
2 changed files with 10 additions and 4 deletions
  1. 10 2
      src/ui/view/GUI.java
  2. 0 2
      src/ui/view/Main.java

+ 10 - 2
src/ui/view/GUI.java

@@ -105,6 +105,7 @@ public class GUI<E> implements CategoryListener {
 	private final JScrollPane canvasSP = new JScrollPane();
 	private final JScrollPane scrollPane1 = new JScrollPane();
 	private final JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+	private final JPanel panelTapped_SimMenu = new JPanel();
 	private JPopupMenu popmenuEdit = new JPopupMenu();
 	private JMenuItem editItem = new JMenuItem("Edit Object");
 	private String catOfObjToBeEdited;
@@ -1571,7 +1572,10 @@ public class GUI<E> implements CategoryListener {
 		splitPaneCanvasConsole.setDividerLocation(500);
 
 		splitPane.setLeftComponent(scrollPane1);
-		splitPaneCanvasConsole.setLeftComponent(canvasSP);
+		splitPaneCanvasConsole.setLeftComponent(panelTapped_SimMenu);
+		tabbedPane.addTab("View", canvasSP);
+		tabbedPane.addTab("test", new JPanel());
+		//splitPaneCanvasConsole.setLeftComponent(canvasSP);
 		splitPaneCanvasConsole.setRightComponent(console);
 		splitPane1.setLeftComponent(splitPaneCanvasConsole);
 		splitPane1.setRightComponent(splitHolonElPro);
@@ -1585,9 +1589,12 @@ public class GUI<E> implements CategoryListener {
 		splitGraphHolonEl.setTopComponent(scrollGraph);
 		splitGraphHolonEl.setBottomComponent(scrollElements);
 		canvasSP.setViewportView(canvas);
-		canvasSP.setColumnHeaderView(simMenu);
+		panelTapped_SimMenu.setLayout(new BorderLayout());
+		panelTapped_SimMenu.add(simMenu, BorderLayout.NORTH);
+		panelTapped_SimMenu.add(tabbedPane);
 		simMenu.setBackground(new Color(240, 240, 240));
 
+		panelTapped_SimMenu.setBorder(null);
 		tabbedPane.setBorder(null);
 		scrollProperties.setBorder(null);
 		scrollGraph.setBorder(null);
@@ -1598,6 +1605,7 @@ public class GUI<E> implements CategoryListener {
 		splitHolonElPro.setBorder(null);
 		splitGraphHolonEl.setBorder(null);
 		panelHolonEl.setBorder(null);
+		canvasSP.setBorder(null);
 
 		tableHolonElementScrollPane.setBorder(null);
 

+ 0 - 2
src/ui/view/Main.java

@@ -1,8 +1,6 @@
 package ui.view;
 
 import java.awt.EventQueue;
-import java.util.ArrayList;
-
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;