Nimbus L&F

Normand Briere

2019-05-01 25cef97465f0bfa8959663754e9243006324c81c

 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
-                
441
-		oe.aConstraints.gridwidth = 1;
442
-        	oe.aConstraints.gridx = 0;
443
438
                 
444
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
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,39 +461,34 @@
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);
487
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
500
488
                 rootButton.setToolTipText("Edit object in new tab");
501
489
 		rootButton.addActionListener(this);
502
490
 			oe.aConstraints.gridx += 1;
503
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
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);