Fix multiple selection

Normand Briere

2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b

 GroupEditor.java
..
..
@@ -758,16 +758,16 @@
758
758
                 }
759
759
                 
760
760
                 // EDIT panel
761
-		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762
-                editButton.setToolTipText("Edit selection");
761
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762
+                editButton.setToolTipText("Pin selection controls");
763
763
 		editButton.addActionListener(this);
764
764
 
765
-		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
-                uneditButton.setToolTipText("Unedit selection");
765
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
+                uneditButton.setToolTipText("Remove selection controls");
767
767
 		uneditButton.addActionListener(this);
768
768
 
769
769
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770
-                allParamsButton.setToolTipText("Edit all params");
770
+                allParamsButton.setToolTipText("Show all controle");
771
771
 		allParamsButton.addActionListener(this);
772
772
 
773
773
 		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -784,6 +784,7 @@
784
784
                 
785
785
                 editCommandsPanel.preferredHeight = 1;
786
786
                 
787
+                SetPinStates(false);
787
788
 //                oe.treePanel.add(commandsPanel);
788
789
 //                oe.treePanel.Return();
789
790
                 
..
..
@@ -857,7 +858,7 @@
857
858
                                 boxCB.addItemListener(this);
858
859
                                 
859
860
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
861
+                zoomBoxCB.setToolTipText("Display only for wheel");
861
862
                                 zoomBoxCB.addItemListener(this);
862
863
 
863
864
         if (true) // Globals.ADVANCED)
..
..
@@ -919,7 +920,7 @@
919
920
                                 oeilCB.addItemListener(this);
920
921
 
921
922
                 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922
-                shadowCB.setToolTipText("Compute shadows when live");
923
+                shadowCB.setToolTipText("When live compute shadows");
923
924
                                 shadowCB.addItemListener(this);
924
925
 
925
926
                 panel.Return();
..
..
@@ -932,7 +933,7 @@
932
933
                                 toggleSwitchCB.addItemListener(this);
933
934
                                 
934
935
                 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935
-                autosaveCB.setToolTipText("Auto-save on structure change");
936
+                autosaveCB.setToolTipText("On structure change");
936
937
                                 autosaveCB.addItemListener(this);
937
938
 
938
939
                 panel.Return();
..
..
@@ -1628,6 +1629,20 @@
1628
1629
             
1629
1630
             makeSomething(shadow);
1630
1631
         }
1632
+
1633
+    private void ClearUnpinned()
1634
+    {
1635
+        //for (Object3D obj : listUI)
1636
+        for (int i=listUI.size(); --i>=0;)
1637
+        {
1638
+            Object3D obj = listUI.elementAt(i);
1639
+            if (!obj.pinned)
1640
+            {
1641
+                obj.CloseUI();
1642
+                listUI.remove(i);
1643
+            }
1644
+        }
1645
+    }
1631
1646
         
1632
1647
     /**
1633
1648
      * applyExample
..
..
@@ -3372,7 +3387,7 @@
3372
3387
                     //copy.ClearUI();
3373
3388
                     for (Object3D obj : listUI)
3374
3389
                     {
3375
-                        obj.pinned = true;
3390
+                        obj.pinned = false;
3376
3391
                         obj.CloseUI();
3377
3392
                     }
3378
3393
                     listUI.clear();
..
..
@@ -3457,6 +3472,11 @@
3457
3472
                         currentLayout = sevenButton;
3458
3473
                      */
3459
3474
                     radio.layout.doClick();
3475
+                    
3476
+                    ClearUnpinned();
3477
+                    SetPinStates(group.selection.size() > 0);
3478
+                    if (group.selection.size() == 1)
3479
+                        EditSelection(false);
3460
3480
                     keepparent = group.parent;
3461
3481
                     // PARENT = NULL or not???
3462
3482
                     //group.parent = null; // ROOT
..
..
@@ -4616,17 +4636,7 @@
4616
4636
 		//new Exception().printStackTrace();
4617
4637
 
4618
4638
 		freezemodel = true;
4619
-		
4620
-                //for (Object3D obj : listUI)
4621
-                for (int i=listUI.size(); --i>=0;)
4622
-                {
4623
-                    Object3D obj = listUI.elementAt(i);
4624
-                    if (!obj.pinned)
4625
-                    {
4626
-                        obj.CloseUI();
4627
-                        listUI.remove(i);
4628
-                    }
4629
-                }
4639
+        ClearUnpinned();
4630
4640
                     
4631
4641
 		/**/
4632
4642
 		//switch (event.id)
..
..
@@ -4689,6 +4699,8 @@
4689
4699
         {
4690
4700
             editButton.setEnabled(enabled);
4691
4701
             uneditButton.setEnabled(enabled);
4702
+            unselectButton.setEnabled(enabled);
4703
+            flashSelectionButton.setEnabled(enabled);
4692
4704
         }
4693
4705
 
4694
4706
         void refreshContents(boolean cp)