New layout icons

Normand Briere

2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15

 GroupEditor.java
..
..
@@ -688,25 +688,25 @@
688
688
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
689
                         snapobjectButton.addActionListener(this);
690
690
                         snapobjectButton.setToolTipText("Snap Object");
691
+                        
692
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
+		fourButton.addActionListener(this);
694
+                fourButton.setToolTipText("Show control panel only");
691
695
                 }
692
696
 
693
697
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
694
698
                 
695
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696
-		fourButton.addActionListener(this);
697
-                fourButton.setToolTipText("Show left panel only");
698
-                
699
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
-                twoButton.setToolTipText("Show right view only");
699
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
+                twoButton.setToolTipText("Show 3D view only");
701
701
 		twoButton.addActionListener(this);
702
702
                 this.fullscreenLayout = twoButton;
703
703
                 
704
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705
-                sixButton.setToolTipText("Show left and right");
704
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705
+                threeButton.setToolTipText("Show controls and 3D view");
706
+		threeButton.addActionListener(this);
707
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
+                sixButton.setToolTipText("Show 3D view and controls");
706
709
 		sixButton.addActionListener(this);
707
-//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
-//                threeButton.setToolTipText("2-column layout right");
709
-//		threeButton.addActionListener(this);
710
710
 //		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711
711
 //                sevenButton.setToolTipText("3-column layout");
712
712
 //		sevenButton.addActionListener(this);
..
..
@@ -3300,8 +3300,8 @@
3300
3300
 //                    centralPanel.setVisible(true);
3301
3301
 //                    XYZPanel.setVisible(true);
3302
3302
                     bigThree.ClearUI();
3303
+                    bigThree.add(scenePanel);
3303
3304
                     bigThree.add(centralPanel);
3304
-                    bigThree.add(XYZPanel);
3305
3305
                     bigThree.FlushUI();
3306
3306
                     
3307
3307
                     cameraView.requestFocusInWindow();
..
..
@@ -3381,8 +3381,8 @@
3381
3381
 //                    centralPanel.setVisible(true);
3382
3382
 //                    XYZPanel.setVisible(false);
3383
3383
                     bigThree.ClearUI();
3384
-                    bigThree.add(scenePanel);
3385
3384
                     bigThree.add(centralPanel);
3385
+                    bigThree.add(scenePanel);
3386
3386
                     bigThree.FlushUI();
3387
3387
                     
3388
3388
                     cameraView.requestFocusInWindow();