~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -334,13 +336,21 @@
334	336	frontItem.addActionListener(this);
335	337	compositeItem = menu.add(new MenuItem("Composite"));
336	338	compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
337	342	hideItem = menu.add(new MenuItem("Hidden Group"));
338	343	hideItem.addActionListener(this);
	344	+ }
339	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	346	ungroupItem.addActionListener(this);
	347	+
341	348	menu.add("-");
	349	+
342	350	randomItem = menu.add(new MenuItem("Switch node"));
343	351	randomItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
344	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	355	switchGeoItem.addActionListener(this);
346	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +358,6 @@
348	358	morphItem = menu.add(new MenuItem("Morph Group"));
349	359	morphItem.addActionListener(this);
350	360
351		- if (Globals.ADVANCED)
352		- {
353	361	menu.add("-");
354	362	physicsItem = menu.add(new MenuItem("Physics"));
355	363	physicsItem.addActionListener(this);
..	..	@@ -580,43 +588,45 @@
580	588	//minButton.setToolTipText("Minimize window");
581	589	//minButton.addActionListener(this);
582	590
583		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584	592	maxButton.setToolTipText("Maximize window");
585	593	maxButton.addActionListener(this);
586	594
587		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	595	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	596	fullButton.setToolTipText("Full-screen window");
589	597	fullButton.addActionListener(this);
590	598
591		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	599	+ oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592	600	undoButton.setToolTipText("Undo changes");
593	601	undoButton.addActionListener(this);
594	602
595		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	604	redoButton.setToolTipText("Redo changes");
597	605	redoButton.addActionListener(this);
598	606
599		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	608	saveButton.setToolTipText("Save changes");
601	609	saveButton.addActionListener(this);
602	610
603		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	611	+ oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604	612	liveCB.setToolTipText("Enable animation");
605	613	liveCB.addItemListener(this);
606	614
607		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	616	oneStepButton.setToolTipText("Animate one step forward");
609	617	oneStepButton.addActionListener(this);
610	618
611		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	619	+ oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
612	620	fastCB.setToolTipText("Fast mode");
613	621	fastCB.addItemListener(this);
614	622
615		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	623	+ oe.toolboxPanel.Return();
	624	+
	625	+ oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616	626	trackCB.setToolTipText("Enable tracking");
617	627	trackCB.addItemListener(this);
618	628
619		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	630	screenfitButton.setToolTipText("Screen fit");
621	631	screenfitButton.addActionListener(this);
622	632
..	..	@@ -630,15 +640,17 @@
630	640	snapobjectButton.setToolTipText("Snap Object");
631	641	}
632	642
633		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- flashSelectionButton.setToolTipText("Show selection");
	643	+ oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ flashSelectionButton.setToolTipText("Highlight selection");
635	645	flashSelectionButton.addActionListener(this);
636	646
637		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	647	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638	648
639	649	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640	650	twoButton.setToolTipText("Show center view only");
641	651	twoButton.addActionListener(this);
	652	+ this.fullscreenLayout = twoButton;
	653	+
642	654	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643	655	fourButton.addActionListener(this);
644	656	fourButton.setToolTipText("Show left panel only");
..	..	@@ -653,16 +665,63 @@
653	665	sevenButton.addActionListener(this);
654	666	//
655	667
656		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657	669	rootButton.setToolTipText("Edit selection in new tab");
658	670	rootButton.addActionListener(this);
659	671
660		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661	673	closeButton.setToolTipText("Close tab");
662	674	closeButton.addActionListener(this);
663	675	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664	676	//clearButton.addActionListener(this);
665		-
	677	+
	678	+ // INSERT
	679	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ gridButton.setToolTipText("Create grid");
	681	+ gridButton.addActionListener(this);
	682	+
	683	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ boxButton.setToolTipText("Create box");
	685	+ boxButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ sphereButton.setToolTipText("Create sphere");
	689	+ sphereButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.Return();
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	717	+ overlayButton.setToolTipText("Create overlay");
	718	+ overlayButton.addActionListener(this);
	719	+
	720	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ lightButton.setToolTipText("Create light");
	722	+ lightButton.addActionListener(this);
	723	+
	724	+ // EDIT panel
666	725	editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667	726	editButton.setToolTipText("Edit selection");
668	727	editButton.addActionListener(this);
..	..	@@ -703,7 +762,7 @@
703	762
704	763	JScrollPane jSP;
705	764	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	765	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707	766	ResetModel();
708	767
709	768	oe.treePanel.add(jSPPanel);
..	..	@@ -808,11 +867,23 @@
808	867	// debugCB.addItemListener(this);
809	868
810	869	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	870	+ oeilCB.setToolTipText("Move camera when tracking target");
811	871	oeilCB.addItemListener(this);
812	872
	873	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	874	+ shadowCB.setToolTipText("Compute shadows when live");
	875	+ shadowCB.addItemListener(this);
	876	+
	877	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	878	+ autosaveCB.setToolTipText("Auto-save on structure change");
	879	+ autosaveCB.addItemListener(this);
	880	+
	881	+ if (Globals.ADVANCED)
	882	+ {
813	883	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
814	884	lookAtCB.setToolTipText("Look-at target");
815	885	lookAtCB.addItemListener(this);
	886	+ }
816	887
817	888	}
818	889
..	..	@@ -827,6 +898,14 @@
827	898	void EditObject(Object3D obj)
828	899	{
829	900	cRadio radioButton = new cRadio(obj.name);
	901	+
	902	+ // Patch to avoid bug with transparency.
	903	+ radioButton.hadMaterial = obj.material != null;
	904	+ if (!radioButton.hadMaterial)
	905	+ {
	906	+ obj.material = new cMaterial();
	907	+ }
	908	+
830	909	radioButton.SetObject(obj);
831	910	radioButton.layout = sevenButton;
832	911	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -848,23 +927,26 @@
848	927	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
849	928	}
850	929
851		- JCheckBox liveCB;
852		- JCheckBox supportCB;
853		- JCheckBox localCB;
854		- JCheckBox crowdCB;
855		- JCheckBox smoothCB;
856		- JCheckBox fastCB;
857		- JCheckBox slowCB;
858		- JCheckBox boxCB;
859		- JCheckBox zoomBoxCB;
860		- JCheckBox trackCB;
861		- JCheckBox smoothfocusCB;
	930	+ cToggleButton liveCB;
	931	+ cCheckBox supportCB;
	932	+ cCheckBox localCB;
	933	+ cCheckBox crowdCB;
	934	+ cCheckBox smoothCB;
	935	+ cToggleButton fastCB;
	936	+ cCheckBox slowCB;
	937	+ cCheckBox boxCB;
	938	+ cCheckBox zoomBoxCB;
	939	+ cToggleButton trackCB;
	940	+ cCheckBox smoothfocusCB;
862	941	// JCheckBox speakerMocapCB;
863		- JCheckBox speakerCameraCB;
864		- JCheckBox speakerFocusCB;
865		- JCheckBox debugCB;
866		- JCheckBox oeilCB;
867		- JCheckBox lookAtCB;
	942	+ cCheckBox speakerCameraCB;
	943	+ cCheckBox speakerFocusCB;
	944	+ cCheckBox debugCB;
	945	+
	946	+ cCheckBox oeilCB;
	947	+ cCheckBox shadowCB;
	948	+ cCheckBox autosaveCB;
	949	+ cCheckBox lookAtCB;
868	950
869	951	// static int COLOR = 1;
870	952	// static int MATERIAL = 2;
..	..	@@ -872,9 +954,9 @@
872	954
873	955	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
874	956
875		- JCheckBox colorCB;
876		- JCheckBox materialCB;
877		- JCheckBox textureCB;
	957	+ cCheckBox colorCB;
	958	+ cCheckBox materialCB;
	959	+ cCheckBox textureCB;
878	960
879	961	public void itemStateChanged(ItemEvent e)
880	962	{
..	..	@@ -967,6 +1049,14 @@
967	1049	{
968	1050	cameraView.ToggleOeil();
969	1051	}
	1052	+ else if(e.getSource() == shadowCB)
	1053	+ {
	1054	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1055	+ }
	1056	+ else if(e.getSource() == autosaveCB)
	1057	+ {
	1058	+ Globals.SAVEONMAKE ^= true;
	1059	+ }
970	1060	else if(e.getSource() == lookAtCB)
971	1061	{
972	1062	cameraView.ToggleLookAt();
..	..	@@ -983,7 +1073,8 @@
983	1073
984	1074	/**/
985	1075	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
986		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1076	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1077	+ TreePath path = objEditor.jTree.getSelectionPath();
987	1078	if ((path == null) \|\| (path.getPathCount() <= 1)) {
988	1079	// We can't move the root node or an empty selection
989	1080	return;
..	..	@@ -1107,16 +1198,16 @@
1107	1198	return;
1108	1199	}
1109	1200
1110		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1111		- {
	1201	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1202	+// {
1112	1203	loadClipboard(true);
1113	1204	objEditor.jTree.setSelectionPath(destinationPath);
1114	1205	pasteInto(false, false);
1115		- } else {
1116		- loadClipboard(false);
1117		- objEditor.jTree.setSelectionPath(destinationPath);
1118		- pasteInto(false, false); // true); // ???
1119		- }
	1206	+// } else {
	1207	+// loadClipboard(false);
	1208	+// objEditor.jTree.setSelectionPath(destinationPath);
	1209	+// pasteInto(false, false); // true); // ???
	1210	+// }
1120	1211	}
1121	1212	public void dropActionChanged(DropTargetDragEvent dtde)
1122	1213	// Called if the user has modified the current drop gesture
..	..	@@ -1708,11 +1799,11 @@
1708	1799	objEditor.cameraView.renderCamera.setAim(v2, v1);
1709	1800	objEditor.cameraView.repaint();
1710	1801	} else
1711		- if (source == rectoidItem)
	1802	+ if (source == rectoidItem \|\| source == boxButton)
1712	1803	{
1713	1804	makeSomething(new Box());
1714	1805	} else
1715		- if (source == particleItem)
	1806	+ if (source == particleItem \|\| source == particlesButton)
1716	1807	{
1717	1808	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1718	1809	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1791,27 +1882,27 @@
1791	1882
1792	1883	makeSomething(obj);
1793	1884	} else
1794		- if (source == gridItem)
	1885	+ if (source == gridItem \|\| source == gridButton)
1795	1886	{
1796	1887	makeSomething(new Grid());
1797	1888	} else
1798		- if (source == ellipsoidItem)
	1889	+ if (source == ellipsoidItem \|\| source == sphereButton)
1799	1890	{
1800	1891	makeSomething(new Sphere());
1801	1892	} else
1802		- if (source == coneItem)
	1893	+ if (source == coneItem \|\| source == coneButton)
1803	1894	{
1804	1895	makeSomething(new Cone());
1805	1896	} else
1806		- if (source == torusItem)
	1897	+ if (source == torusItem \|\| source == torusButton)
1807	1898	{
1808	1899	makeSomething(new Torus());
1809	1900	} else
1810		- if (source == superItem)
	1901	+ if (source == superItem \|\| source == superButton)
1811	1902	{
1812	1903	makeSomething(new Superellipsoid());
1813	1904	} else
1814		- if (source == kleinItem)
	1905	+ if (source == kleinItem \|\| source == kleinButton)
1815	1906	{
1816	1907	makeSomething(new Klein());
1817	1908	} else
..	..	@@ -1831,7 +1922,7 @@
1831	1922	{
1832	1923	makeSomething(new BezierSurface());
1833	1924	} else
1834		- if (source == overlayItem)
	1925	+ if (source == overlayItem \|\| source == overlayButton)
1835	1926	{
1836	1927	/*
1837	1928	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1879,7 +1970,7 @@
1879	1970	s.setup();
1880	1971	makeSomething(s);
1881	1972	} else
1882		- if (source == lightItem)
	1973	+ if (source == lightItem \|\| source == lightButton)
1883	1974	{
1884	1975	makeSomething(new Light());
1885	1976	} else
..	..	@@ -2565,7 +2656,7 @@
2565	2656	{
2566	2657	CastShadow(2);
2567	2658	} else
2568		- if (source == ungroupItem)
	2659	+ if (source == ungroupItem \|\| source == ungroupButton)
2569	2660	{
2570	2661	//ungroup();
2571	2662	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2903,6 +2994,10 @@
2903	2994	if (source == twoButton)
2904	2995	{
2905	2996	radio.layout = twoButton;
	2997	+
	2998	+ if (CameraPane.FULLSCREEN)
	2999	+ fullscreenLayout = radio.layout;
	3000	+
2906	3001	// bug
2907	3002	//gridPanel.setDividerLocation(1.0);
2908	3003	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2958,6 +3053,9 @@
2958	3053	{
2959	3054	radio.layout = threeButton;
2960	3055
	3056	+ if (CameraPane.FULLSCREEN)
	3057	+ fullscreenLayout = radio.layout;
	3058	+
2961	3059	// bigThree.remove(scenePanel);
2962	3060	// bigThree.remove(centralPanel);
2963	3061	// bigThree.remove(XYZPanel);
..	..	@@ -2996,6 +3094,9 @@
2996	3094	{
2997	3095	radio.layout = fourButton;
2998	3096
	3097	+ if (CameraPane.FULLSCREEN)
	3098	+ fullscreenLayout = radio.layout;
	3099	+
2999	3100	// bigThree.remove(scenePanel);
3000	3101	// bigThree.remove(centralPanel);
3001	3102	// bigThree.remove(XYZPanel);
..	..	@@ -3032,6 +3133,9 @@
3032	3133	if (source == sixButton)
3033	3134	{
3034	3135	radio.layout = sixButton;
	3136	+
	3137	+ if (CameraPane.FULLSCREEN)
	3138	+ fullscreenLayout = radio.layout;
3035	3139
3036	3140	// bigThree.remove(scenePanel);
3037	3141	// bigThree.remove(centralPanel);
..	..	@@ -3070,6 +3174,9 @@
3070	3174	if (source == sevenButton)
3071	3175	{
3072	3176	radio.layout = sevenButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
3073	3180
3074	3181	// bigThree.remove(scenePanel);
3075	3182	// bigThree.remove(centralPanel);
..	..	@@ -3126,12 +3233,19 @@
3126	3233	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3127	3234	{
3128	3235	ab = (cRadio)e.nextElement();
3129		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3236	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3130	3237	{
	3238	+ // Patch to avoid bug with transparency.
	3239	+ if (!ab.hadMaterial)
	3240	+ {
	3241	+ ab.object.material = null;
	3242	+ }
	3243	+
3131	3244	buttonGroup.remove(ab);
3132	3245	radioPanel.remove(ab);
3133	3246
3134		- ab.GetObject().editWindow = null;
	3247	+ //ab.GetObject().editWindow = null;
	3248	+ ab.GetObject().manipWindow = null;
3135	3249	// ab.GetObject().objectUI = null; // ?????????
3136	3250
3137	3251	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3245,6 +3359,7 @@
3245	3359
3246	3360	// fix "+" issue
3247	3361	//group.editWindow = this;
	3362	+ group.manipWindow = this;
3248	3363
3249	3364	/*
3250	3365	currentLayout = radio.layout;
..	..	@@ -4330,7 +4445,7 @@
4330	4445	{
4331	4446	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4332	4447	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4333		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4448	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4334	4449
4335	4450	Object3D elem = (Object3D)group.selection.elementAt(i);
4336	4451	if(elem != group \|\| !newWindow)
..	..	@@ -4567,6 +4682,7 @@
4567	4682
4568	4683	if (cut)
4569	4684	{
	4685	+ if (Globals.SAVEONMAKE)
4570	4686	Save();
4571	4687	//int indices[] = jList.getSelectedIndices();
4572	4688	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5293,6 +5409,21 @@
5293	5409	cButton saveButton;
5294	5410	cButton oneStepButton;
5295	5411
	5412	+ cButton groupButton;
	5413	+ cButton ungroupButton;
	5414	+ cButton compositeButton;
	5415	+
	5416	+ cButton gridButton;
	5417	+ cButton boxButton;
	5418	+ cButton sphereButton;
	5419	+ cButton coneButton;
	5420	+ cButton torusButton;
	5421	+ cButton superButton;
	5422	+ cButton kleinButton;
	5423	+ cButton particlesButton;
	5424	+ cButton overlayButton;
	5425	+ cButton lightButton;
	5426	+
5296	5427	cButton screenfitButton;
5297	5428	cButton screenfitpointButton;
5298	5429	cButton snapobjectButton;
..	..	@@ -5317,7 +5448,7 @@
5317	5448	private MenuItem cutItem;
5318	5449	private MenuItem undoItem;
5319	5450	private MenuItem redoItem;
5320		- private MenuItem duplicateItem;
	5451	+ private JMenuItem duplicateItem;
5321	5452	private MenuItem cloneItem;
5322	5453	private MenuItem cloneSupportItem;
5323	5454	private MenuItem overwriteGeoItem;