parent: bc829f47 | patch | commit
Normand Briere
2019-07-17 a5580a47d246c1272b10adba68070f6e13da5e41 
Replace/restore buttons.
7 files modified
3 files added
281 ■■■■■ changed files
CameraPane.java 3 ●●●●● patch | view | raw | blame | history
Globals.java 2 ●●●●● patch | view | raw | blame | history
GroupEditor.java 100 ●●●●● patch | view | raw | blame | history
ObjEditor.java 159 ●●●●● patch | view | raw | blame | history
Object3D.java 6 ●●●●● patch | view | raw | blame | history
cRadio.java 4 ●●●●● patch | view | raw | blame | history
cToggleButton.java 7 ●●●●● patch | view | raw | blame | history
icons/arrow-down-01-512.png patch | view | raw | blame | history
icons/replace.png patch | view | raw | blame | history
icons/restore.png patch | view | raw | blame | history 
 CameraPane.java
....@@ -15708,6 +15708,7 @@
1570815708                     info.bounds.y += (height - desired) / 2;
1570915709                 }
1571015710             }
15711
+            
1571115712             info.g = gr;
1571215713             info.camera = renderCamera;
1571315714             /* 
....@@ -15717,6 +15718,8 @@
1571715718              */
1571815719             if (!isRenderer)
1571915720             {
15721
+                Grafreed.Assert(object != null);
15722
+                Grafreed.Assert(object.selection != null);
1572015723                 if (object.selection.Size() > 0)
1572115724                 {
1572215725                     int hitSomething = object.selection.get(0).hitSomething;


 Globals.java
....@@ -10,7 +10,7 @@
1010         public static boolean COMPUTESHADOWWHENLIVE = true;
1111         public static boolean RENDERSHADOW = true;
1212         
13
-        public static boolean SAVEONMAKE = true; // problems when auto-save (works with manual save)
13
+        public static boolean REPLACEONMAKE = true; // problems when auto-save (works with manual save)
1414         
1515         public static boolean MOUSEDRAGGED = false;
1616         public static boolean TIMERRUNNING = false;


 GroupEditor.java
....@@ -84,10 +84,10 @@
8484 
8585     void CloneSelection(boolean supports)
8686     {
87
-        if (Globals.SAVEONMAKE)
87
+        if (Globals.REPLACEONMAKE)
8888             Save();
89
-        boolean keep = Globals.SAVEONMAKE;
90
-        Globals.SAVEONMAKE = false;
89
+        boolean keep = Globals.REPLACEONMAKE;
90
+        Globals.REPLACEONMAKE = false;
9191         //   Object3D keep = GrafreeD.clipboard;
9292            //Object3D obj;
9393            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -98,7 +98,7 @@
9898                
9999                makeSomething(clone, i==group.selection.size()-1);
100100            }
101
-        Globals.SAVEONMAKE = keep;
101
+        Globals.REPLACEONMAKE = keep;
102102     }
103103 
104104     void CloneClipboard(boolean supports)
....@@ -544,6 +544,7 @@
544544 		buildToolsMenu(menu);
545545 	}
546546 	
547
+        
547548 	void SetupUI2(ObjEditor oe)
548549 	{
549550             // June 2019
....@@ -615,29 +616,42 @@
615616                 restoreCameraButton.setToolTipText("Restore viewpoint");
616617 		restoreCameraButton.addActionListener(this);
617618                 
619
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
+                saveButton.setToolTipText("New version");
621
+		saveButton.addActionListener(this);
622
+                                                
618623 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
-                undoButton.setToolTipText("Undo changes");
624
+                undoButton.setToolTipText("Previous version");
620625 		undoButton.addActionListener(this);
621626                 undoButton.setEnabled(false);
622627                 
628
+                cGridBag updown = new cGridBag().setVertical(true);
629
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630
+                restoreButton.setToolTipText("Restore current");
631
+		restoreButton.addActionListener(this);
632
+                restoreButton.setEnabled(false);
633
+                
634
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635
+                replaceButton.setToolTipText("Replace current");
636
+		replaceButton.addActionListener(this);
637
+                replaceButton.setEnabled(false);
638
+                
639
+                copyOptionsPanel.add(updown);
640
+                
623641 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
-                redoButton.setToolTipText("Redo changes");
642
+                redoButton.setToolTipText("Next version");
625643 		redoButton.addActionListener(this);
626644                 redoButton.setEnabled(false);
627645                 
628
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629
-                saveButton.setToolTipText("Save changes");
630
-		saveButton.addActionListener(this);
631
-                
632
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
646
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633647                 liveCB.setToolTipText("Enable animation");
634648                                 liveCB.addItemListener(this);
635649 
636
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637651                 oneStepButton.setToolTipText("Animate one step forward");
638652 		oneStepButton.addActionListener(this);
639653                 
640
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
654
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641655                 fastCB.setToolTipText("Fast mode");
642656                                 fastCB.addItemListener(this);
643657                                 
....@@ -820,6 +834,9 @@
820834 
821835                 oe.treePanel.add(copyOptionsPanel);
822836                 oe.treePanel.Return();
837
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838
+            versionField = (cNumberSlider)sliderPane.getComponent(1);
839
+            sliderPane.preferredHeight = 1;
823840                 
824841 //        mainPanel.setDividerLocation(0.5); //1.0);
825842 //        mainPanel.setResizeWeight(0.5);
....@@ -945,9 +962,9 @@
945962                 toggleSwitchCB.setToolTipText("Choose a single item");
946963                                 toggleSwitchCB.addItemListener(this);
947964                                 
948
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949
-                autosaveCB.setToolTipText("On structure change");
950
-                                autosaveCB.addItemListener(this);
965
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
966
+                autokeepCB.setToolTipText("On structure change");
967
+                                autokeepCB.addItemListener(this);
951968 
952969                 panel.Return();
953970             if (Globals.ADVANCED)
....@@ -1024,7 +1041,7 @@
10241041         
10251042         cCheckBox oeilCB;
10261043         cCheckBox shadowCB;
1027
-        cCheckBox autosaveCB;
1044
+        cCheckBox autokeepCB;
10281045         cCheckBox lookAtCB;
10291046         
10301047 //        static int COLOR = 1;
....@@ -1136,9 +1153,9 @@
11361153             {
11371154                 Globals.FREEZEONMOVE ^= true;
11381155             }
1139
-            else if(e.getSource() == autosaveCB)
1156
+            else if(e.getSource() == autokeepCB)
11401157             {
1141
-                Globals.SAVEONMAKE ^= true;
1158
+                Globals.REPLACEONMAKE ^= true;
11421159             }
11431160             else if(e.getSource() == lookAtCB)
11441161             {
....@@ -2225,15 +2242,29 @@
22252242 		} else
22262243 		if (source == undoButton)
22272244 		{
2228
-			if (!Undo())
2229
-                            java.awt.Toolkit.getDefaultToolkit().beep();
2245
+                        // Go to previous version
2246
+			//if (!Undo())
2247
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2248
+			Undo();
2249
+		} else
2250
+		if (source == restoreButton)
2251
+		{
2252
+                        // Restore current version
2253
+			Restore();
2254
+		} else
2255
+		if (source == replaceButton)
2256
+		{
2257
+                        // Overwrite current version
2258
+			Replace();
22302259 		} else
22312260 		if (source == redoButton)
22322261 		{
2262
+                        // Go to next version
22332263 			Redo();
22342264 		} else
22352265 		if (source == saveButton)
22362266 		{
2267
+                        // Save a new version
22372268 			if (!Save(true))
22382269                             java.awt.Toolkit.getDefaultToolkit().beep();
22392270 		} else
....@@ -3479,6 +3510,9 @@
34793510                     }
34803511                     
34813512                     copy = group;
3513
+                    
3514
+                    SetUndoStates();
3515
+
34823516                     //Globals.theRenderer.object = group;
34833517                     if(!useclient)
34843518                     {
....@@ -4942,10 +4976,10 @@
49424976 	
49434977 	void paste(boolean expand)
49444978 	{
4945
-        if (Globals.SAVEONMAKE)
4979
+        if (Globals.REPLACEONMAKE)
49464980             Save();
4947
-        boolean keep = Globals.SAVEONMAKE;
4948
-        Globals.SAVEONMAKE = false;
4981
+        boolean keep = Globals.REPLACEONMAKE;
4982
+        Globals.REPLACEONMAKE = false;
49494983 	//	if (GrafreeD.clipboard == null)
49504984 	//		return;
49514985 		boolean first = true;
....@@ -5005,7 +5039,7 @@
50055039                         Grafreed.clipboard.get(0).parent = keepparent;
50065040 		}
50075041 		
5008
-        Globals.SAVEONMAKE = keep;
5042
+        Globals.REPLACEONMAKE = keep;
50095043 		ResetModel();
50105044 		refreshContents();
50115045 	}
....@@ -5141,10 +5175,10 @@
51415175         
51425176 	void group(Object3D csg, boolean grab)
51435177 	{
5144
-        if (Globals.SAVEONMAKE)
5178
+        if (Globals.REPLACEONMAKE)
51455179             Save();
5146
-        boolean keep = Globals.SAVEONMAKE;
5147
-        Globals.SAVEONMAKE = false;
5180
+        boolean keep = Globals.REPLACEONMAKE;
5181
+        Globals.REPLACEONMAKE = false;
51485182 		if (//false) // why??
51495183                     !group.selection.isEmpty())
51505184                 {
....@@ -5258,15 +5292,15 @@
52585292                 //node.add(csg);
52595293 		//makeSomething(node);
52605294 		makeSomething(csg);
5261
-        Globals.SAVEONMAKE = keep;
5295
+        Globals.REPLACEONMAKE = keep;
52625296 	}
52635297 	
52645298         void Ungroup(Object3D g)
52655299         {
5266
-        if (Globals.SAVEONMAKE)
5300
+        if (Globals.REPLACEONMAKE)
52675301             Save();
5268
-        boolean keep = Globals.SAVEONMAKE;
5269
-        Globals.SAVEONMAKE = false;
5302
+        boolean keep = Globals.REPLACEONMAKE;
5303
+        Globals.REPLACEONMAKE = false;
52705304             if (g instanceof HiddenObject)
52715305             {
52725306                 HiddenObject h = (HiddenObject) g;
....@@ -5283,7 +5317,7 @@
52835317                     objEditor.makeSomething(g.get(i), false);
52845318                 }
52855319             }
5286
-        Globals.SAVEONMAKE = keep;
5320
+        Globals.REPLACEONMAKE = keep;
52875321         }
52885322         
52895323 	void ungroup()


 ObjEditor.java
....@@ -816,6 +816,28 @@
816816             frame.validate();
817817         }
818818 
819
+    private byte[] CompressCopy()
820
+    {
821
+        boolean temp = CameraPane.SWITCH;
822
+        CameraPane.SWITCH = false;
823
+        
824
+        copy.ExtractBigData(versiontable);
825
+        // if (copy == client)
826
+        
827
+        byte[] versions[] = copy.versions;
828
+        copy.versions = null;
829
+        
830
+        byte[] compress = Compress(copy);
831
+        
832
+        copy.versions = versions;
833
+        
834
+        copy.RestoreBigData(versiontable);
835
+        
836
+        CameraPane.SWITCH = temp;
837
+        
838
+        return compress;
839
+    }
840
+
819841     private JTextPane createTextPane()
820842     {
821843 // TEXTAREA       String[] initString =
....@@ -3574,11 +3596,11 @@
35743596         return null;
35753597     }
35763598     
3577
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35783599     
35793600     public void Save()
35803601     {
3581
-        Save(true);
3602
+        //Save(true);
3603
+        Replace();
35823604     }
35833605     
35843606     private boolean Equal(byte[] compress, byte[] name)
....@@ -3597,25 +3619,20 @@
35973619         return true;
35983620     }
35993621 
3622
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3623
+    
36003624     public boolean Save(boolean user)
36013625     {
36023626         System.err.println("Save");
36033627         
36043628         cRadio tab = GetCurrentTab();
36053629         
3606
-        boolean temp = CameraPane.SWITCH;
3607
-        CameraPane.SWITCH = false;
3608
-        
3609
-        copy.ExtractBigData(hashtable);
3610
-        
3611
-        byte[] compress = Compress(copy);
3612
-
3613
-        CameraPane.SWITCH = temp;
3630
+        byte[] compress = CompressCopy();
36143631         
36153632         boolean thesame = false;
36163633         
36173634         // Quick heuristic using length. Works only when stream is compressed.
3618
-        if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3635
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
36193636         {
36203637             thesame = true;
36213638         }
....@@ -3623,23 +3640,23 @@
36233640         //EditorFrame.m_MainFrame.requestFocusInWindow();
36243641         if (!thesame)
36253642         {
3626
-            //tab.user[tab.undoindex] = user;
3627
-            boolean increment = tab.graphs[tab.undoindex] == null;
3643
+            //tab.user[tab.versionindex] = user;
3644
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36283645             
3629
-            tab.graphs[tab.undoindex] = compress;
3646
+            copy.versions[++copy.versionindex] = compress;
36303647             
3631
-            if (increment)
3632
-                tab.undoindex++;
3648
+            // if (increment)
3649
+            //     tab.versionindex++;
36333650         }
36343651 
3635
-        copy.RestoreBigData(hashtable);
3652
+        //copy.RestoreBigData(versiontable);
36363653 
36373654         //assert(hashtable.isEmpty());
36383655         
3639
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3656
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
36403657         {
36413658             //tab.user[i] = false;
3642
-        //    tab.graphs[i] = null;
3659
+            copy.versions[i] = null;
36433660         }
36443661 
36453662         SetUndoStates();
....@@ -3649,7 +3666,7 @@
36493666         {
36503667             try
36513668             {
3652
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3669
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36533670                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36543671 
36553672                 p.writeObject(copy);
....@@ -3673,7 +3690,7 @@
36733690         boolean temp = CameraPane.SWITCH;
36743691         CameraPane.SWITCH = false;
36753692         
3676
-        copy.ExtractBigData(hashtable);
3693
+        copy.ExtractBigData(versiontable);
36773694         
36783695         copy.clear();
36793696         
....@@ -3682,7 +3699,7 @@
36823699             copy.add(obj.get(i));
36833700         }
36843701         
3685
-        copy.RestoreBigData(hashtable);
3702
+        copy.RestoreBigData(versiontable);
36863703         
36873704         CameraPane.SWITCH = temp;
36883705         
....@@ -3710,14 +3727,18 @@
37103727     }
37113728     
37123729     cButton undoButton;
3730
+    cButton restoreButton;
3731
+    cButton replaceButton;
37133732     cButton redoButton;
37143733         
37153734     void SetUndoStates()
37163735     {
37173736         cRadio tab = GetCurrentTab();
37183737         
3719
-        undoButton.setEnabled(tab.undoindex > 0);
3720
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3738
+        restoreButton.setEnabled(copy.versionindex != -1);
3739
+        replaceButton.setEnabled(copy.versionindex != -1);
3740
+        undoButton.setEnabled(copy.versionindex > 0);
3741
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
37213742     }
37223743     
37233744     public boolean Undo()
....@@ -3726,28 +3747,62 @@
37263747         
37273748         cRadio tab = GetCurrentTab();
37283749         
3729
-        if (tab.undoindex == 0)
3750
+        if (copy.versionindex == 0)
37303751         {
37313752             java.awt.Toolkit.getDefaultToolkit().beep();
37323753             return false;
37333754         }
37343755 
3735
-        if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
3756
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3757
+//        {
3758
+//            if (Save(false))
3759
+//                tab.versionindex -= 1;
3760
+//            else
3761
+//            {
3762
+//                if (tab.versionindex <= 0)
3763
+//                    return false;
3764
+//                else
3765
+//                    tab.versionindex -= 1;
3766
+//            }
3767
+//        }
3768
+
3769
+        copy.versionindex -= 1;
3770
+
3771
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3772
+        
3773
+        return true;
3774
+    }
3775
+
3776
+    public boolean Restore()
3777
+    {
3778
+        System.err.println("Restore");
3779
+        
3780
+        cRadio tab = GetCurrentTab();
3781
+        
3782
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
37363783         {
3737
-            if (Save(false))
3738
-                tab.undoindex -= 1;
3739
-            else
3740
-            {
3741
-                if (tab.undoindex <= 0)
3742
-                    return false;
3743
-                else
3744
-                    tab.undoindex -= 1;
3745
-            }
3784
+            java.awt.Toolkit.getDefaultToolkit().beep();
3785
+            return false;
37463786         }
37473787 
3748
-        tab.undoindex -= 1;
3788
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3789
+        
3790
+        return true;
3791
+    }
37493792 
3750
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3793
+    public boolean Replace()
3794
+    {
3795
+        System.err.println("Replace");
3796
+        
3797
+        cRadio tab = GetCurrentTab();
3798
+        
3799
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3800
+        {
3801
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3802
+            return false;
3803
+        }
3804
+
3805
+        copy.versions[copy.versionindex] = CompressCopy();
37513806         
37523807         return true;
37533808     }
....@@ -3756,18 +3811,18 @@
37563811     {
37573812         cRadio tab = GetCurrentTab();
37583813         
3759
-        if (tab.graphs[tab.undoindex + 1] == null)
3814
+        if (copy.versions[copy.versionindex + 1] == null)
37603815         {
37613816             java.awt.Toolkit.getDefaultToolkit().beep();
37623817             return;
37633818         }
37643819 
3765
-        tab.undoindex += 1;
3820
+        copy.versionindex += 1;
37663821 
3767
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3822
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
37683823         
3769
-        //if (!tab.user[tab.undoindex])
3770
-        //    tab.graphs[tab.undoindex] = null;
3824
+        //if (!tab.user[tab.versionindex])
3825
+        //    tab.graphs[tab.versionindex] = null;
37713826     }
37723827 
37733828         void ImportGFD()
....@@ -4063,9 +4118,22 @@
40634118         //copy.Touch();
40644119     }
40654120 
4121
+    cNumberSlider versionField;
4122
+    
40664123     public void stateChanged(ChangeEvent e)
40674124     {
40684125         //    assert(false);
4126
+        if (e.getSource() == versionField)
4127
+        {
4128
+            int version = versionField.getInteger();
4129
+            
4130
+            if (copy.versions[version] != null)
4131
+            {
4132
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4133
+            }
4134
+            
4135
+            return;
4136
+        }
40694137 
40704138         if (freezematerial)
40714139         {
....@@ -4414,7 +4482,7 @@
44144482 
44154483     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
44164484     {
4417
-        if (Globals.SAVEONMAKE) // && resetmodel)
4485
+        if (Globals.REPLACEONMAKE) // && resetmodel)
44184486             Save();
44194487         //Tween.set(thing, 0).target(1).start(tweenManager);
44204488         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4786,6 +4854,11 @@
47864854                 c.addChild(csg);
47874855             }
47884856 
4857
+            copy.versions = readobj.versions;
4858
+            copy.versionindex = readobj.versionindex;
4859
+            
4860
+            SetUndoStates();
4861
+            
47894862             ResetModel();
47904863             copy.HardTouch(); // recompile?
47914864             refreshContents();


 Object3D.java
....@@ -29,6 +29,9 @@
2929     Object3D saveskeleton;
3030     //
3131     
32
+    byte[] versions[] = new byte[100][];
33
+    int versionindex = -1;    
34
+        
3235     ScriptNode scriptnode;
3336 
3437         void InitOthers()
....@@ -215,6 +218,7 @@
215218 //            o.transientrep = this.bRep.support;
216219 //            o.bRep.support = null;
217220 //        }
221
+        o.selection = this.selection;
218222         
219223         if (this.support != null)
220224         {
....@@ -268,6 +272,8 @@
268272         {
269273             this.support.bRep = o.transientrep;
270274         }
275
+        
276
+        this.selection = o.selection;
271277 // July 2019        if (this.bRep != null)
272278 //            this.bRep.support = o.transientrep;
273279     //    this.support = o.support;


 cRadio.java
....@@ -35,10 +35,10 @@
3535             camera = (Camera)Grafreed.clone(c);
3636     }
3737     
38
-    byte[] graphs[] = new byte[100][];
38
+    //byte[] versions[] = new byte[100][];
3939     //boolean[] user = new boolean[100];
4040     
41
-    int undoindex = 0;
41
+    //int versionindex = -1;
4242     
4343     // Patch to avoid bug with transparency.
4444     boolean hadMaterial;


 cToggleButton.java
....@@ -19,8 +19,10 @@
1919         this.image = icon.getImage();
2020         iconWidth = icon.getIconWidth();
2121 
22
-        //setBorder(new javax.swing.border.EmptyBorder(8, 0, 8, 24)); // top, left, bottom, right
23
-        setBorder(new javax.swing.border.EtchedBorder(EtchedBorder.RAISED, Color.BLACK, Color.BLACK));
22
+        setMargin(new java.awt.Insets(11, 11, 11, 11));
23
+        //setBorder(javax.swing.BorderFactory.createLineBorder(Color.BLACK));
24
+        // setBorder(new javax.swing.border.EmptyBorder(8, 0, 8, 24)); // top, left, bottom, right
25
+        // setBorder(new javax.swing.border.EtchedBorder(EtchedBorder.RAISED, Color.BLACK, Color.BLACK));
2426     }
2527     
2628     private java.awt.Image image;
....@@ -35,6 +37,7 @@
3537             //if (getWidth() > image.getWidth(null) + 8)
3638             {
3739                 g.drawImage(image, this.getWidth()/2 - 12, this.getHeight()/2 - 12, this);
40
+                g.drawRect(0, 0, this.getWidth()-1, this.getHeight()-1);
3841             }
3942         }
4043     }


 icons/arrow-down-01-512.png
Binary files differ


 icons/replace.png
Binary files differ


 icons/restore.png
Binary files differ