Fix info panel

Normand Briere

2019-05-01 b1585b5b2b60c4165be400636c787fae24428c6a

 GroupEditor.java
..
..
@@ -434,31 +434,24 @@
434
434
         oe.radioPanel.add(dummyButton);
435
435
         oe.buttonGroup.add(dummyButton);
436
436
          */
437
-                aConstraints.gridy += 1;
438
-                
439
437
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440
438
                 
441
-		oe.aConstraints.gridwidth = 1;
442
-        	oe.aConstraints.gridx = 0;
443
-                
444
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
439
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
445
440
                 liveCB.setToolTipText("Enabled animation");
446
441
                                 liveCB.addItemListener(this);
447
442
 
448
-        	oe.aConstraints.gridx += 1;
449
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
443
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
450
444
                 trackCB.setToolTipText("Enable tracking");
451
445
                                 trackCB.addItemListener(this);
452
446
 
453
-        	oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
447
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455
448
                 screenfitButton.setToolTipText("Screen fit");
456
449
 		screenfitButton.addActionListener(this);
457
-			oe.aConstraints.gridx += 1;
450
+
458
451
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459
452
 //		screenfitpointButton.addActionListener(this);
460
453
 //			oe.aConstraints.gridx += 1;
461
-		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
454
+		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
462
455
 		snapobjectButton.addActionListener(this);
463
456
                 snapobjectButton.setToolTipText("Snap Object");
464
457
 			oe.aConstraints.gridx += 1;
..
..
@@ -468,76 +461,66 @@
468
461
 		oe.aConstraints.weighty = 0;
469
462
 		oe.aConstraints.gridwidth = 1;
470
463
 		
471
-		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
464
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472
465
                 flashSelectionButton.setToolTipText("Show selection");
473
466
 		flashSelectionButton.addActionListener(this);
474
467
                 
475
-		oe.toolbarPanel.add(new cButton("     ", false));
468
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476
469
                 
477
-		oe.aConstraints.gridx += 1;
478
-		oe.aConstraints.weighty = 0;
479
-		oe.aConstraints.gridwidth = 1;
480
-                
481
-                //
482
-		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
470
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
483
471
                 twoButton.setToolTipText("Show center view only");
484
472
 		twoButton.addActionListener(this);
485
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
473
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
486
474
 		fourButton.addActionListener(this);
487
475
                 fourButton.setToolTipText("Show left panel only");
488
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
476
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489
477
                 sixButton.setToolTipText("2-column layout left");
490
478
 		sixButton.addActionListener(this);
491
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
479
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
492
480
                 threeButton.setToolTipText("2-column layout right");
493
481
 		threeButton.addActionListener(this);
494
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
482
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
495
483
                 sevenButton.setToolTipText("3-column layout");
496
484
 		sevenButton.addActionListener(this);
497
485
                 //
498
486
 
499
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500
-                rootButton.setToolTipText("Edit object in new tab");
487
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488
+                rootButton.setToolTipText("Edit selection in new tab");
501
489
 		rootButton.addActionListener(this);
502
-			oe.aConstraints.gridx += 1;
503
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
490
+
491
+                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
492
                 closeButton.setToolTipText("Close tab");
505
493
 		closeButton.addActionListener(this);
506
494
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507
495
 		//clearButton.addActionListener(this);
508
-			oe.aConstraints.gridx += 1;
509
496
                         
510
-		oe.aConstraints.gridx = 1; //
511
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
497
+                cGridBag commandsPanel = new cGridBag();
498
+                
499
+		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500
+                editButton.setToolTipText("Edit selection");
512
501
 		editButton.addActionListener(this);
513
-		oe.aConstraints.gridx += 1;
514
-		oe.aConstraints.weighty = 0;
515
-		oe.aConstraints.gridwidth = 1;
516
502
 
517
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
503
+		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504
+                uneditButton.setToolTipText("Unedit selection");
518
505
 		uneditButton.addActionListener(this);
519
506
 
520
-		oe.aConstraints.gridx += 1;
521
-		oe.aConstraints.weighty = 0;
522
-		oe.aConstraints.gridwidth = 1;
523
-                
524
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
507
+		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508
+                clearPanelButton.setToolTipText("Clear edit panel");
525
509
 		clearPanelButton.addActionListener(this);
526
510
 
527
-		oe.aConstraints.gridx += 1;
528
-		oe.aConstraints.weighty = 0;
529
-		oe.aConstraints.gridwidth = 1;
530
-                
531
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
511
+		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
512
+                allParamsButton.setToolTipText("All params??");
532
513
 		allParamsButton.addActionListener(this);
533
514
 
534
-		oe.aConstraints.gridx += 1;
535
-		oe.aConstraints.weighty = 0;
536
-		oe.aConstraints.gridwidth = 1;
537
-                
538
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
515
+		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
+                unselectButton.setToolTipText("Unselect");
539
517
 		unselectButton.addActionListener(this);
540
518
 
519
+                commandsPanel.preferredHeight = 1;
520
+                
521
+                oe.treePanel.add(commandsPanel);
522
+                oe.treePanel.Return();
523
+                
541
524
 //		oe.aConstraints.gridx += 1;
542
525
 //		oe.aConstraints.weighty = 0;
543
526
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -549,40 +532,37 @@
549
532
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550
533
 //		gcButton.addActionListener(this);
551
534
                 
552
-                oe.aConstraints.gridx = 0;
553
-		oe.aConstraints.gridy += 1;
554
-                
555
-		//ctrlPanel.add(objList = new List(5, true));
556
-		oe.aConstraints.gridwidth = 100;
557
-	//	oe.aConstraints.gridheight = 100;
558
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559
-		oe.aConstraints.gridheight = 1;
560
-		oe.aConstraints.weighty = 0.5;
561
-		oe.aConstraints.gridx = 0;
562
-		JScrollPane jSP;
535
+                cGridBag jSPPanel = new cGridBag();
536
+
537
+                JScrollPane jSP;
563
538
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
539
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565
540
                 ResetModel();
566
-		oe.aConstraints.weighty = 0.5;
567
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568
-		oe.aConstraints.gridy += 1;
569
-		oe.aConstraints.gridwidth = 1;
541
+                
542
+                oe.treePanel.add(jSPPanel);
543
+                oe.treePanel.Return();
570
544
 
571
-		oe.aConstraints.weighty = 0;
572
-		oe.aConstraints.gridwidth = 2;
573
-
574
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
545
+                cGridBag copyOptionsPanel = new cGridBag();
546
+                
547
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
548
+                colorCB.setToolTipText("Copy color when dropped");
575
549
                 colorCB.addItemListener(this);
576
-                oe.aConstraints.gridx += 2;
577
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
550
+
551
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
552
+                materialCB.setToolTipText("Copy material when dropped");
578
553
                 materialCB.addItemListener(this);
579
-                oe.aConstraints.gridx += 2;
580
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
554
+
555
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
556
+                textureCB.setToolTipText("Copy texture when dropped");
581
557
                 textureCB.addItemListener(this);
582
558
                         
583
-                oe.aConstraints.gridx = 0;
584
-		oe.aConstraints.gridy += 1;
559
+                copyOptionsPanel.preferredHeight = 1;
560
+                oe.treePanel.add(copyOptionsPanel);
561
+                oe.treePanel.Return();
585
562
                 
563
+//        mainPanel.setDividerLocation(0.5); //1.0);
564
+//        mainPanel.setResizeWeight(0.5);
565
+        
586
566
 		//jList.addListSelectionListener(this);
587
567
 		oe.jTree.addTreeSelectionListener(this);
588
568
 		//jTree.setRootVisible(false);
..
..
@@ -676,6 +656,12 @@
676
656
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677
657
                 lookAtCB.setToolTipText("Look-at target");
678
658
                                 lookAtCB.addItemListener(this);
659
+                                
660
+                cGridBag fill = new cGridBag();
661
+                                
662
+                fill.preferredHeight = 200;
663
+                
664
+                panel.add(fill);
679
665
 
680
666
         }
681
667
 	
..
..
@@ -4125,12 +4111,12 @@
4125
4111
             System.err.println("info : " + child.GetPath());
4126
4112
 				}
4127
4113
 			}
4128
-			else
4129
-                        {
4130
-				objEditor.SetMaterial(group); // .GetMaterial());
4131
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4132
-            System.err.println("info : " + group.GetPath());
4133
-                        }
4114
+//			else
4115
+//                        {
4116
+//				objEditor.SetMaterial(group); // .GetMaterial());
4117
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4118
+//            System.err.println("info : " + group.GetPath());
4119
+//                        }
4134
4120
 			
4135
4121
                         objEditor.SetText(); // jan 2014
4136
4122