Material icons

Normand Briere

2019-08-04 0c85af6e46f48b7425d59fc776b193c06a4a1f52

 GroupEditor.java
..
..
@@ -356,9 +356,9 @@
356
356
 		this.copy = this.group = group;
357
357
 		//selectees = this.group.selectees;
358
358
 		
359
-        if (copy.versions == null)
359
+        if (copy.versionlist == null)
360
360
         {
361
-            copy.versions = new Object3D[100];
361
+            copy.versionlist = new Object3D[100];
362
362
             copy.versionindex = -1;
363
363
         }
364
364
         
..
..
@@ -383,9 +383,9 @@
383
383
                 
384
384
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385
385
                 
386
-        if (copy.versions == null)
386
+        if (copy.versionlist == null)
387
387
         {
388
-            copy.versions = new Object3D[100];
388
+            copy.versionlist = new Object3D[100];
389
389
             copy.versionindex = -1;
390
390
             
391
391
             Save(true);
..
..
@@ -942,12 +942,12 @@
942
942
                 
943
943
                 cGridBag updown = new cGridBag().setVertical(true);
944
944
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
-                restoreButton.setToolTipText("Restore current version (undo latest change)");
945
+                restoreButton.setToolTipText("Undo (restore current version)");
946
946
 		restoreButton.addActionListener(this);
947
947
                 restoreButton.setEnabled(false);
948
948
                 
949
949
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
-                replaceButton.setToolTipText("Replace current version (save latest change)");
950
+                replaceButton.setToolTipText("Save (replace current version)");
951
951
 		replaceButton.addActionListener(this);
952
952
                 replaceButton.setEnabled(false);
953
953
                 
..
..
@@ -1110,14 +1110,14 @@
1110
1110
 		editButton.addActionListener(this);
1111
1111
 
1112
1112
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
-                uneditButton.setToolTipText("Remove selection controls");
1113
+                uneditButton.setToolTipText("Unpin and remove selection controls");
1114
1114
 		uneditButton.addActionListener(this);
1115
1115
 
1116
1116
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117
1117
                 allParamsButton.setToolTipText("Show all controle");
1118
1118
 		allParamsButton.addActionListener(this);
1119
1119
 
1120
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1120
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121
1121
                 clearPanelButton.setToolTipText("Clear edit panel");
1122
1122
 		clearPanelButton.addActionListener(this);
1123
1123
 
..
..
@@ -2613,11 +2613,13 @@
2613
2613
 		{
2614
2614
                         // Restore current version
2615
2615
 			Restore();
2616
+        restoreButton.setEnabled(false);
2616
2617
 		} else
2617
2618
 		if (source == replaceButton)
2618
2619
 		{
2619
2620
                         // Overwrite current version
2620
2621
 			Replace();
2622
+        replaceButton.setEnabled(false);
2621
2623
 		} else
2622
2624
 		if (source == redoButton)
2623
2625
 		{
..
..
@@ -3820,10 +3822,10 @@
3820
3822
 			{
3821
3823
 				Object3D child = (Object3D)e.nextElement();
3822
3824
                                 if(child.editWindow != null)
3823
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3824
3825
                                 child.pinned = false;
3825
3826
 				child.CloseUI();
3826
3827
                                 listUI.remove(child);
3828
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3827
3829
                                 
3828
3830
                                 //child.editWindow = null; // ???????????
3829
3831
 			}
..
..
@@ -3842,6 +3844,7 @@
3842
3844
                         obj.CloseUI();
3843
3845
                     }
3844
3846
                     listUI.clear();
3847
+                    SetPinStates(group.selection.size() > 0);
3845
3848
                     refreshContents(true);
3846
3849
 		} else
3847
3850
 		if (source == allParamsButton)
..
..
@@ -3928,6 +3931,7 @@
3928
3931
                     radio.layout.doClick();
3929
3932
                     
3930
3933
                     ClearUnpinned();
3934
+                    
3931
3935
                     //Grafreed.Assert(group != null);
3932
3936
                     //Grafreed.Assert(group.selection != null);
3933
3937
                     SetPinStates(group.selection == null || group.selection.size() > 0);
..
..
@@ -5083,9 +5087,7 @@
5083
5087
 		
5084
5088
 		freezemodel = false;
5085
5089
 	}
5086
-	
5087
-        boolean flashIt = true;
5088
-        
5090
+	        
5089
5091
 	public void valueChanged(TreeSelectionEvent e)
5090
5092
 	//public boolean handleEvent(Event event)
5091
5093
 	{
..
..
@@ -5160,6 +5162,8 @@
5160
5162
             uneditButton.setEnabled(enabled);
5161
5163
             unselectButton.setEnabled(enabled);
5162
5164
             flashSelectionButton.setEnabled(enabled);
5165
+            
5166
+            clearPanelButton.setEnabled(!listUI.isEmpty());
5163
5167
         }
5164
5168
 
5165
5169
         void refreshContents(boolean cp)