Materials working.

Normand Briere

2019-08-06 4ec7130da08861dc4aff0232dbce38f3471696a4

 GroupEditor.java
..
..
@@ -931,32 +931,36 @@
931
931
                 restoreCameraButton.setToolTipText("Restore viewpoint");
932
932
 		restoreCameraButton.addActionListener(this);
933
933
                 
934
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
-                saveButton.setToolTipText("Duplicate current version");
936
-		saveButton.addActionListener(this);
934
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
+                saveVersionButton.setToolTipText("Duplicate current version");
936
+		saveVersionButton.addActionListener(this);
937
937
                                                 
938
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
-                undoButton.setToolTipText("Previous version");
940
-		undoButton.addActionListener(this);
941
-                undoButton.setEnabled(false);
938
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+                deleteVersionButton.setToolTipText("Delete current version");
940
+		deleteVersionButton.addActionListener(this);
941
+                                                
942
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
943
+                previousVersionButton.setToolTipText("Previous version");
944
+		previousVersionButton.addActionListener(this);
945
+                previousVersionButton.setEnabled(false);
942
946
                 
943
947
                 cGridBag updown = new cGridBag().setVertical(true);
944
948
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
949
                 restoreButton.setToolTipText("Undo (restore current version)");
946
950
 		restoreButton.addActionListener(this);
947
-                restoreButton.setEnabled(false);
951
+                //restoreButton.setEnabled(false);
948
952
                 
949
953
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
954
                 replaceButton.setToolTipText("Save (replace current version)");
951
955
 		replaceButton.addActionListener(this);
952
-                replaceButton.setEnabled(false);
956
+                //replaceButton.setEnabled(false);
953
957
                 
954
958
                 copyOptionsPanel.add(updown);
955
959
                 
956
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
957
-                redoButton.setToolTipText("Next version");
958
-		redoButton.addActionListener(this);
959
-                redoButton.setEnabled(false);
960
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
961
+                nextVersionButton.setToolTipText("Next version");
962
+		nextVersionButton.addActionListener(this);
963
+                nextVersionButton.setEnabled(false);
960
964
                 
961
965
                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962
966
                 liveCB.setToolTipText("Enable animation");
..
..
@@ -2571,7 +2575,7 @@
2571
2575
 		if (source == invariantsItem)
2572
2576
 		{
2573
2577
                     System.out.println("Invariants:");
2574
-                    Grafreed.grafreeD.universe.invariants();
2578
+                    Grafreed.grafreed.universe.invariants();
2575
2579
 		} else
2576
2580
 		if (source == memoryItem)
2577
2581
 		{
..
..
@@ -2602,35 +2606,40 @@
2602
2606
 		{
2603
2607
 			ToggleFullScreen();
2604
2608
 		} else
2605
-		if (source == undoButton)
2609
+		if (source == previousVersionButton)
2606
2610
 		{
2607
2611
                         // Go to previous version
2608
2612
 			//if (!Undo())
2609
2613
                             //java.awt.Toolkit.getDefaultToolkit().beep();
2610
-			Undo();
2614
+			PreviousVersion();
2611
2615
 		} else
2612
2616
 		if (source == restoreButton)
2613
2617
 		{
2614
2618
                         // Restore current version
2615
2619
 			Restore();
2616
-        restoreButton.setEnabled(false);
2620
+        //restoreButton.setEnabled(false);
2617
2621
 		} else
2618
2622
 		if (source == replaceButton)
2619
2623
 		{
2620
2624
                         // Overwrite current version
2621
2625
 			Replace();
2622
-        replaceButton.setEnabled(false);
2626
+        //replaceButton.setEnabled(false);
2623
2627
 		} else
2624
-		if (source == redoButton)
2628
+		if (source == nextVersionButton)
2625
2629
 		{
2626
2630
                         // Go to next version
2627
-			Redo();
2631
+			NextVersion();
2628
2632
 		} else
2629
-		if (source == saveButton)
2633
+		if (source == saveVersionButton)
2630
2634
 		{
2631
2635
                         // Save a new version
2632
2636
 			if (!Save(true))
2633
2637
                             java.awt.Toolkit.getDefaultToolkit().beep();
2638
+		} else
2639
+		if (source == deleteVersionButton)
2640
+		{
2641
+                        // Delete a new version
2642
+                        DeleteVersion();
2634
2643
 		} else
2635
2644
 		if (source == oneStepButton)
2636
2645
 		{
..
..
@@ -2685,11 +2694,11 @@
2685
2694
 		} else
2686
2695
 		if (source == undoItem)
2687
2696
 		{
2688
-			Undo();
2697
+			PreviousVersion();
2689
2698
 		} else
2690
2699
 		if (source == redoItem)
2691
2700
 		{
2692
-			Redo();
2701
+			NextVersion();
2693
2702
 		} else
2694
2703
 		if (source == duplicateItem)
2695
2704
 		{
..
..
@@ -6004,7 +6013,6 @@
6004
6013
 	
6005
6014
 	cButton restoreCameraButton;
6006
6015
         
6007
-	cButton saveButton;
6008
6016
 	cButton oneStepButton;
6009
6017
         
6010
6018
         cButton groupButton;