From b5894aed65dbc8d5ced5081b73a46328e4d9f754 Mon Sep 17 00:00:00 2001 From: Normen Hansen Date: Sat, 31 Jan 2015 14:09:24 +0100 Subject: [PATCH] - remove backgroundColor directives from SceneComposerTopComponent to make it more compatible with LAFs --- .../SceneComposerTopComponent.form | 50 +------------------ .../SceneComposerTopComponent.java | 18 +------ 2 files changed, 2 insertions(+), 66 deletions(-) diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form index 485ae5b36..703128813 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form @@ -8,11 +8,6 @@ - - - - - @@ -52,9 +47,6 @@ - - - @@ -101,9 +93,6 @@ - - - @@ -283,9 +272,6 @@ - - - @@ -317,9 +303,6 @@ - - - @@ -336,9 +319,6 @@ - - - @@ -367,9 +347,6 @@ - - - @@ -432,11 +409,6 @@ - - - - - @@ -455,9 +427,6 @@ - - - @@ -483,6 +452,7 @@ + @@ -528,9 +498,6 @@ - - - @@ -539,9 +506,6 @@ - - - @@ -555,9 +519,6 @@ - - - @@ -581,9 +542,6 @@ - - - @@ -592,9 +550,6 @@ - - - @@ -605,9 +560,6 @@ - - - diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java index fbe96ddb0..79bdc9983 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java @@ -139,9 +139,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jButton2 = new javax.swing.JButton(); jButton3 = new javax.swing.JButton(); - setBackground(new java.awt.Color(204, 204, 204)); - - sceneInfoPanel.setBackground(new java.awt.Color(204, 204, 204)); sceneInfoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.sceneInfoPanel.border.title"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(sceneInfoLabel1, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.sceneInfoLabel1.text")); // NOI18N @@ -164,7 +161,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); @@ -280,7 +276,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jToolBar1.add(jToggleSelectTerrain); jToolBar1.add(jSeparator7); - moveToCursorButton.setBackground(new java.awt.Color(204, 204, 204)); moveToCursorButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/move.gif"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(moveToCursorButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.moveToCursorButton.text")); // NOI18N moveToCursorButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.moveToCursorButton.toolTipText")); // NOI18N @@ -299,7 +294,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jLabel1.text")); // NOI18N jToolBar1.add(jLabel1); - resetCursorButton.setBackground(new java.awt.Color(204, 204, 204)); org.openide.awt.Mnemonics.setLocalizedText(resetCursorButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.resetCursorButton.text")); // NOI18N resetCursorButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.resetCursorButton.toolTipText")); // NOI18N resetCursorButton.setFocusable(false); @@ -312,7 +306,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce }); jToolBar1.add(resetCursorButton); - cursorToSelectionButton.setBackground(new java.awt.Color(204, 204, 204)); org.openide.awt.Mnemonics.setLocalizedText(cursorToSelectionButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.cursorToSelectionButton.text")); // NOI18N cursorToSelectionButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.cursorToSelectionButton.toolTipText")); // NOI18N cursorToSelectionButton.setFocusable(false); @@ -330,7 +323,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jLabel2.text")); // NOI18N jToolBar1.add(jLabel2); - camToCursorSelectionButton.setBackground(new java.awt.Color(204, 204, 204)); org.openide.awt.Mnemonics.setLocalizedText(camToCursorSelectionButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.camToCursorSelectionButton.text")); // NOI18N camToCursorSelectionButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.camToCursorSelectionButton.toolTipText")); // NOI18N camToCursorSelectionButton.setFocusable(false); @@ -374,8 +366,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jToolBar1.add(showGridToggleButton); jToolBar1.add(jSeparator1); - jPanel3.setBackground(new java.awt.Color(204, 204, 204)); - javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup( @@ -389,14 +379,11 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jToolBar1.add(jPanel3); - jPanel4.setBackground(new java.awt.Color(204, 204, 204)); jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jPanel4.border.title"))); // NOI18N - jToolBar2.setBackground(new java.awt.Color(204, 204, 204)); jToolBar2.setFloatable(false); jToolBar2.setRollover(true); - createPhysicsMeshButton.setBackground(new java.awt.Color(204, 204, 204)); org.openide.awt.Mnemonics.setLocalizedText(createPhysicsMeshButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.createPhysicsMeshButton.text")); // NOI18N createPhysicsMeshButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.createPhysicsMeshButton.toolTipText")); // NOI18N createPhysicsMeshButton.addActionListener(new java.awt.event.ActionListener() { @@ -406,7 +393,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce }); jToolBar2.add(createPhysicsMeshButton); - jCheckBox1.setBackground(new java.awt.Color(204, 204, 204)); org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jCheckBox1.text")); // NOI18N jToolBar2.add(jCheckBox1); @@ -416,11 +402,9 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jLabel4.text")); // NOI18N jToolBar2.add(jLabel4); - jToolBar3.setBackground(new java.awt.Color(204, 204, 204)); jToolBar3.setFloatable(false); jToolBar3.setRollover(true); - jButton1.setBackground(new java.awt.Color(204, 204, 204)); org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jButton1.text")); // NOI18N jButton1.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -429,7 +413,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce }); jToolBar3.add(jButton1); - fixedCheckBox.setBackground(new java.awt.Color(204, 204, 204)); fixedCheckBox.setSelected(true); org.openide.awt.Mnemonics.setLocalizedText(fixedCheckBox, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.fixedCheckBox.text")); // NOI18N fixedCheckBox.setEnabled(false); @@ -494,6 +477,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce .addComponent(jLabel6) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jButton2) + .addGap(0, 0, 0) .addComponent(jButton3)) .addGroup(jPanel4Layout.createSequentialGroup() .addComponent(jLabel5)