Normand Briere
2019-06-30 cfd7a643cb5a445016ddb15595158ecc59b184fd
GroupEditor.java
....@@ -220,7 +220,7 @@
220220 // toggleSwitchItem.addItemListener(this);
221221 // toggleSwitchItem.setState(CameraPane.SWITCH);
222222
223
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224224 toggleHandleItem.addItemListener(this);
225225 toggleHandleItem.setState(CameraPane.HANDLES);
226226
....@@ -582,7 +582,7 @@
582582 */
583583 cGridBag copyOptionsPanel = new cGridBag();
584584
585
- copyOptionsPanel.preferredHeight = 2;
585
+ copyOptionsPanel.preferredHeight = 1;
586586
587587 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588588
....@@ -590,9 +590,12 @@
590590 //minButton.setToolTipText("Minimize window");
591591 //minButton.addActionListener(this);
592592
593
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
- maxButton.setToolTipText("Maximize window");
595
- maxButton.addActionListener(this);
593
+ if (Globals.ADVANCED)
594
+ {
595
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+ maxButton.setToolTipText("Maximize window");
597
+ maxButton.addActionListener(this);
598
+ }
596599
597600 oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598601 fullButton.setToolTipText("Full-screen window");
....@@ -726,7 +729,7 @@
726729 compositeButton.addActionListener(this);
727730
728731 oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
- switchButton.setToolTipText("Create switch");
732
+ switchButton.setToolTipText("Create item switcher");
730733 switchButton.addActionListener(this);
731734
732735 oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -863,9 +866,13 @@
863866
864867 if (true) // Globals.ADVANCED)
865868 {
866
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867
- supportCB.setToolTipText("Enable rigging");
868
- supportCB.addItemListener(this);
869
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
870
+// supportCB.setToolTipText("Enable rigging");
871
+// supportCB.addItemListener(this);
872
+
873
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
874
+ freezeCB.setToolTipText("Fast moving camera");
875
+ freezeCB.addItemListener(this);
869876
870877 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871878 // localCB.addItemListener(this);
....@@ -929,7 +936,7 @@
929936 toggleTextureCB.addItemListener(this);
930937
931938 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932
- toggleSwitchCB.setToolTipText("Use switch");
939
+ toggleSwitchCB.setToolTipText("Choose a single item");
933940 toggleSwitchCB.addItemListener(this);
934941
935942 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
....@@ -1000,6 +1007,7 @@
10001007 cCheckBox slowCB;
10011008 cCheckBox boxCB;
10021009 cCheckBox zoomBoxCB;
1010
+ cCheckBox freezeCB;
10031011 //cToggleButton trackCB;
10041012 cCheckBox trackCB;
10051013 cCheckBox smoothfocusCB;
....@@ -1117,6 +1125,10 @@
11171125 else if(e.getSource() == shadowCB)
11181126 {
11191127 Globals.COMPUTESHADOWWHENLIVE ^= true;
1128
+ }
1129
+ else if(e.getSource() == freezeCB)
1130
+ {
1131
+ Globals.FREEZEONMOVE ^= true;
11201132 }
11211133 else if(e.getSource() == autosaveCB)
11221134 {
....@@ -2122,25 +2134,25 @@
21222134 Composite csg = new GroupLeaf();
21232135 csg.count = 5;
21242136 group(csg);
2125
- Composite child = new cGroup();
2137
+ Composite child = new cGroup("Branch");
21262138 csg.addChild(child);
21272139 child.addChild(csg);
21282140 } else
21292141 if (source == doubleItem)
21302142 {
2131
- Composite csg = new GroupLeaf();
2143
+ Composite csg = new GroupLeaf("Fork");
21322144 csg.count = 5;
21332145 group(csg);
2134
- Composite child = new cGroup();
2146
+ Composite child = new cGroup("Branch A");
21352147 csg.addChild(child);
21362148 child.addChild(csg);
2137
- child = new cGroup();
2149
+ child = new cGroup("Branch B");
21382150 csg.addChild(child);
21392151 child.addChild(csg);
21402152 } else
21412153 if (source == tripleItem)
21422154 {
2143
- Composite csg = new GroupLeaf();
2155
+ Composite csg = new GroupLeaf("Trident");
21442156 csg.count = 4;
21452157 group(csg);
21462158 Composite child = new cGroup();
....@@ -2755,15 +2767,28 @@
27552767 } else
27562768 if (source == ungroupItem || source == ungroupButton)
27572769 {
2758
- //ungroup();
2770
+ boolean hasRoot = false;
2771
+
27592772 for (int i=0; i<group.selection.size(); i++)
27602773 {
2761
- Ungroup(group.selection.get(i));
2774
+ if (group.selection.get(i) == group)
2775
+ {
2776
+ hasRoot = true;
2777
+ break;
2778
+ }
27622779 }
27632780
2764
- ClearSelection(false);
2765
-
2766
- refreshContents();
2781
+ if (!hasRoot)
2782
+ {
2783
+ for (int i=0; i<group.selection.size(); i++)
2784
+ {
2785
+ Ungroup(group.selection.get(i));
2786
+ }
2787
+
2788
+ ClearSelection(false);
2789
+
2790
+ refreshContents();
2791
+ }
27672792 } else
27682793 if (source == genUVItem)
27692794 {
....@@ -5526,9 +5551,6 @@
55265551
55275552 cButton restoreCameraButton;
55285553
5529
- cButton minButton;
5530
- cButton maxButton;
5531
- cButton fullButton;
55325554 cButton saveButton;
55335555 cButton oneStepButton;
55345556