diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.form index 646514076..d49b2b45a 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.form @@ -18,11 +18,6 @@ - - - - - @@ -50,9 +45,6 @@ - - - @@ -65,9 +57,6 @@ - - - @@ -134,9 +123,6 @@ - - - @@ -157,11 +143,6 @@ - - - - - @@ -171,9 +152,6 @@ - - - @@ -191,11 +169,6 @@ - - - - - @@ -211,9 +184,6 @@ - - - @@ -234,11 +204,6 @@ - - - - - @@ -250,9 +215,6 @@ - - - @@ -267,11 +229,6 @@ - - - - - @@ -322,9 +279,6 @@ - - - @@ -339,11 +293,6 @@ - - - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java index 9897adeec..0ad3205e2 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java @@ -152,62 +152,49 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl .addGap(0, 100, Short.MAX_VALUE) ); - setBackground(new java.awt.Color(204, 204, 204)); - - jTabbedPane1.setBackground(new java.awt.Color(204, 204, 204)); jTabbedPane1.setMinimumSize(new java.awt.Dimension(0, 0)); jTabbedPane1.setPreferredSize(new java.awt.Dimension(0, 0)); - jPanel4.setBackground(new java.awt.Color(204, 204, 204)); jPanel4.setPreferredSize(new java.awt.Dimension(0, 0)); - jScrollPane3.setBackground(new java.awt.Color(204, 204, 204)); jScrollPane3.setBorder(null); jScrollPane3.setMinimumSize(new java.awt.Dimension(0, 0)); - texturePanel.setBackground(new java.awt.Color(204, 204, 204)); texturePanel.setLayout(new javax.swing.BoxLayout(texturePanel, javax.swing.BoxLayout.PAGE_AXIS)); jScrollPane3.setViewportView(texturePanel); jTabbedPane2.addTab(org.openide.util.NbBundle.getMessage(MaterialEditorTopComponent.class, "MaterialEditorTopComponent.jScrollPane3.TabConstraints.tabTitle"), jScrollPane3); // NOI18N - jScrollPane9.setBackground(new java.awt.Color(204, 204, 204)); jScrollPane9.setBorder(null); - statesPanel.setBackground(new java.awt.Color(204, 204, 204)); statesPanel.setLayout(new javax.swing.BoxLayout(statesPanel, javax.swing.BoxLayout.PAGE_AXIS)); jScrollPane9.setViewportView(statesPanel); jTabbedPane2.addTab(org.openide.util.NbBundle.getMessage(MaterialEditorTopComponent.class, "MaterialEditorTopComponent.jScrollPane9.TabConstraints.tabTitle"), jScrollPane9); // NOI18N - jScrollPane2.setBackground(new java.awt.Color(204, 204, 204)); jScrollPane2.setBorder(null); jScrollPane2.setMinimumSize(new java.awt.Dimension(220, 0)); - optionsPanel.setBackground(new java.awt.Color(204, 204, 204)); optionsPanel.setLayout(new javax.swing.BoxLayout(optionsPanel, javax.swing.BoxLayout.PAGE_AXIS)); jScrollPane2.setViewportView(optionsPanel); jTabbedPane3.addTab(org.openide.util.NbBundle.getMessage(MaterialEditorTopComponent.class, "MaterialEditorTopComponent.jScrollPane2.TabConstraints.tabTitle_1"), jScrollPane2); // NOI18N - jToolBar2.setBackground(new java.awt.Color(204, 204, 204)); jToolBar2.setFloatable(false); jToolBar2.setRollover(true); org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(MaterialEditorTopComponent.class, "MaterialEditorTopComponent.jLabel1.text")); // NOI18N jToolBar2.add(jLabel1); - jPanel3.setBackground(new java.awt.Color(204, 204, 204)); - javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 276, Short.MAX_VALUE) + .addGap(0, 131, Short.MAX_VALUE) ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 23, Short.MAX_VALUE) + .addGap(0, 21, Short.MAX_VALUE) ); jToolBar2.add(jPanel3); @@ -222,15 +209,12 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl }); jToolBar2.add(jComboBox1); - jToolBar3.setBackground(new java.awt.Color(204, 204, 204)); jToolBar3.setFloatable(false); jToolBar3.setRollover(true); org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(MaterialEditorTopComponent.class, "MaterialEditorTopComponent.jLabel3.text")); // NOI18N jToolBar3.add(jLabel3); - jPanel1.setBackground(new java.awt.Color(204, 204, 204)); - javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( @@ -239,7 +223,7 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 23, Short.MAX_VALUE) + .addGap(0, 21, Short.MAX_VALUE) ); jToolBar3.add(jPanel1); @@ -268,15 +252,15 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl .addComponent(materialPreviewWidget1, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(32, 32, 32) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jToolBar3, javax.swing.GroupLayout.DEFAULT_SIZE, 612, Short.MAX_VALUE) - .addComponent(jToolBar2, javax.swing.GroupLayout.DEFAULT_SIZE, 612, Short.MAX_VALUE) + .addComponent(jToolBar3, javax.swing.GroupLayout.DEFAULT_SIZE, 596, Short.MAX_VALUE) + .addComponent(jToolBar2, javax.swing.GroupLayout.DEFAULT_SIZE, 596, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel4Layout.createSequentialGroup() .addComponent(jCheckBox1) .addContainerGap()))) .addGroup(jPanel4Layout.createSequentialGroup() .addComponent(jTabbedPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 223, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jTabbedPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 535, Short.MAX_VALUE)) + .addComponent(jTabbedPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 525, Short.MAX_VALUE)) ); jPanel4Layout.setVerticalGroup( jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -292,8 +276,8 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl .addComponent(materialPreviewWidget1, javax.swing.GroupLayout.PREFERRED_SIZE, 152, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jTabbedPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE) - .addComponent(jTabbedPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE))) + .addComponent(jTabbedPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 320, Short.MAX_VALUE) + .addComponent(jTabbedPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 326, Short.MAX_VALUE))) ); jTabbedPane1.addTab(org.openide.util.NbBundle.getMessage(MaterialEditorTopComponent.class, "MaterialEditorTopComponent.jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.form index 9e91c7f80..c1c9469f5 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.form @@ -1,11 +1,6 @@ - +
- - - - - @@ -33,9 +28,6 @@ - - - @@ -57,18 +49,13 @@ - - - + - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.java index 3754221ea..5e050c2c4 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.java @@ -37,9 +37,6 @@ public class BooleanPanel extends MaterialPropertyWidget { jPanel1 = new javax.swing.JPanel(); jCheckBox1 = new javax.swing.JCheckBox(); - setBackground(new java.awt.Color(204, 204, 204)); - - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); jToolBar1.setPreferredSize(new java.awt.Dimension(81, 27)); @@ -48,10 +45,9 @@ public class BooleanPanel extends MaterialPropertyWidget { jLabel1.setPreferredSize(new java.awt.Dimension(100, 25)); jToolBar1.add(jLabel1); - jPanel1.setBackground(new java.awt.Color(204, 204, 204)); jPanel1.setMinimumSize(new java.awt.Dimension(0, 0)); + jPanel1.setOpaque(false); jPanel1.setPreferredSize(new java.awt.Dimension(32767, 23)); - jPanel1.setSize(new java.awt.Dimension(10, 0)); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.form index 28b1cc5c6..78b00f1c9 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.form @@ -1,10 +1,7 @@ - + - - - @@ -68,11 +65,6 @@ - - - - - @@ -255,9 +247,6 @@ - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java index 4bed7ae4d..f8e13b562 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.java @@ -48,15 +48,12 @@ public class ColorPanel extends MaterialPropertyWidget { jButton1 = new javax.swing.JButton(); jSeparator1 = new javax.swing.JSeparator(); - setBackground(new java.awt.Color(204, 204, 204)); setMaximumSize(new java.awt.Dimension(32767, 35)); setPreferredSize(new java.awt.Dimension(430, 35)); jLabel1.setText(org.openide.util.NbBundle.getMessage(ColorPanel.class, "ColorPanel.jLabel1.text")); // NOI18N jLabel1.setPreferredSize(new java.awt.Dimension(100, 16)); - jPanel2.setBackground(new java.awt.Color(204, 204, 204)); - rLabel.setText(org.openide.util.NbBundle.getMessage(ColorPanel.class, "ColorPanel.rLabel.text")); // NOI18N rLabel.setMaximumSize(new java.awt.Dimension(110, 2147483647)); rLabel.setNextFocusableComponent(gLabel); @@ -183,7 +180,6 @@ public class ColorPanel extends MaterialPropertyWidget { .addComponent(aLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 20, Short.MAX_VALUE) ); - jButton1.setBackground(new java.awt.Color(204, 204, 204)); jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/materials/multiview/widgets/icons/color_wheel.png"))); // NOI18N jButton1.setText(org.openide.util.NbBundle.getMessage(ColorPanel.class, "ColorPanel.jButton1.text")); // NOI18N jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form index e5331bfd4..110fce821 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form @@ -1,11 +1,6 @@ - + - - - - - @@ -33,9 +28,6 @@ - - - @@ -55,11 +47,32 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java index a8ea621b2..893ec12f0 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java @@ -35,11 +35,9 @@ public class FloatPanel extends MaterialPropertyWidget { jToolBar1 = new javax.swing.JToolBar(); jLabel1 = new javax.swing.JLabel(); + jPanel1 = new javax.swing.JPanel(); jSpinner1 = new javax.swing.JSpinner(); - setBackground(new java.awt.Color(204, 204, 204)); - - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); @@ -48,7 +46,23 @@ public class FloatPanel extends MaterialPropertyWidget { jLabel1.setPreferredSize(new java.awt.Dimension(100, 16)); jToolBar1.add(jLabel1); + jPanel1.setOpaque(false); + + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); + jPanel1.setLayout(jPanel1Layout); + jPanel1Layout.setHorizontalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 23, Short.MAX_VALUE) + ); + jPanel1Layout.setVerticalGroup( + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 24, Short.MAX_VALUE) + ); + + jToolBar1.add(jPanel1); + jSpinner1.setModel(new javax.swing.SpinnerNumberModel(Float.valueOf(0.0f), null, null, Float.valueOf(1.0f))); + jSpinner1.setPreferredSize(new java.awt.Dimension(70, 20)); jSpinner1.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { valueChanged(evt); @@ -96,6 +110,7 @@ public class FloatPanel extends MaterialPropertyWidget { } // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JLabel jLabel1; + private javax.swing.JPanel jPanel1; private javax.swing.JSpinner jSpinner1; private javax.swing.JToolBar jToolBar1; // End of variables declaration//GEN-END:variables diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form index ba961b7cd..45fc686d4 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form @@ -1,11 +1,6 @@ - + - - - - - @@ -33,9 +28,6 @@ - - - @@ -60,6 +52,7 @@ + @@ -68,7 +61,7 @@ - + @@ -83,6 +76,9 @@ + + + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java index 78793bf9c..30442030d 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java @@ -37,9 +37,6 @@ public class IntPanel extends MaterialPropertyWidget { jPanel1 = new javax.swing.JPanel(); jSpinner1 = new javax.swing.JSpinner(); - setBackground(new java.awt.Color(204, 204, 204)); - - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); @@ -49,13 +46,14 @@ public class IntPanel extends MaterialPropertyWidget { jToolBar1.add(jLabel1); jPanel1.setBackground(new java.awt.Color(204, 204, 204)); + jPanel1.setOpaque(false); jPanel1.setPreferredSize(new java.awt.Dimension(100, 0)); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 25, Short.MAX_VALUE) + .addGap(0, 34, Short.MAX_VALUE) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -65,6 +63,7 @@ public class IntPanel extends MaterialPropertyWidget { jToolBar1.add(jPanel1); jSpinner1.setModel(new javax.swing.SpinnerNumberModel()); + jSpinner1.setMinimumSize(new java.awt.Dimension(70, 20)); jSpinner1.addChangeListener(new javax.swing.event.ChangeListener() { public void stateChanged(javax.swing.event.ChangeEvent evt) { valueChanged(evt); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.form index 8a65705ea..96c5c8374 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.form @@ -1,4 +1,4 @@ - + @@ -41,6 +41,12 @@ + + + + + + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.java index 6b0d6bca5..26ad2dc53 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/MaterialPreviewWidget.java @@ -93,6 +93,8 @@ public class MaterialPreviewWidget extends javax.swing.JPanel { previewLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); previewLabel.setText(org.openide.util.NbBundle.getMessage(MaterialPreviewWidget.class, "MaterialPreviewWidget.previewLabel.text")); // NOI18N + previewLabel.setMaximumSize(new java.awt.Dimension(120, 120)); + previewLabel.setMinimumSize(new java.awt.Dimension(120, 120)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.form index da43ab76a..825fbf296 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.form @@ -1,11 +1,6 @@ - + - - - - - @@ -33,9 +28,6 @@ - - - @@ -57,18 +49,13 @@ - - - + - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.java index 31998b5c9..fe510023f 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/OnOffPanel.java @@ -37,9 +37,6 @@ public class OnOffPanel extends MaterialPropertyWidget { jPanel1 = new javax.swing.JPanel(); jCheckBox1 = new javax.swing.JCheckBox(); - setBackground(new java.awt.Color(204, 204, 204)); - - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); jToolBar1.setPreferredSize(new java.awt.Dimension(81, 27)); @@ -48,10 +45,9 @@ public class OnOffPanel extends MaterialPropertyWidget { jLabel1.setPreferredSize(new java.awt.Dimension(100, 25)); jToolBar1.add(jLabel1); - jPanel1.setBackground(new java.awt.Color(204, 204, 204)); jPanel1.setMinimumSize(new java.awt.Dimension(0, 0)); + jPanel1.setOpaque(false); jPanel1.setPreferredSize(new java.awt.Dimension(32767, 23)); - jPanel1.setSize(new java.awt.Dimension(10, 0)); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.form index 88a405ad2..a1ed94755 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.form @@ -1,11 +1,6 @@ - + - - - - - @@ -33,9 +28,6 @@ - - - @@ -60,15 +52,10 @@ - - - + - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.java index 25c046e1c..c213fb3c3 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/SelectionPanel.java @@ -55,9 +55,6 @@ public class SelectionPanel extends MaterialPropertyWidget { jPanel1 = new javax.swing.JPanel(); jComboBox1 = new javax.swing.JComboBox(); - setBackground(new java.awt.Color(204, 204, 204)); - - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); jToolBar1.setMinimumSize(new java.awt.Dimension(212, 32)); @@ -67,9 +64,8 @@ public class SelectionPanel extends MaterialPropertyWidget { jLabel1.setPreferredSize(new java.awt.Dimension(100, 16)); jToolBar1.add(jLabel1); - jPanel1.setBackground(new java.awt.Color(204, 204, 204)); + jPanel1.setOpaque(false); jPanel1.setPreferredSize(new java.awt.Dimension(10, 0)); - jPanel1.setSize(new java.awt.Dimension(0, 0)); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); jPanel1.setLayout(jPanel1Layout); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.form index 6afc388f5..f9c16c01a 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.form @@ -1,11 +1,6 @@ - + - - - - - @@ -33,9 +28,6 @@ - - - @@ -54,9 +46,7 @@ - - - + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java index 91f0bd668..fa9c86eeb 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TextPanel.java @@ -39,9 +39,6 @@ public class TextPanel extends MaterialPropertyWidget { jPanel1 = new javax.swing.JPanel(); jTextField1 = new javax.swing.JTextField(); - setBackground(new java.awt.Color(204, 204, 204)); - - jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); jToolBar1.setFloatable(false); jToolBar1.setRollover(true); @@ -49,7 +46,7 @@ public class TextPanel extends MaterialPropertyWidget { jLabel1.setPreferredSize(new java.awt.Dimension(100, 16)); jToolBar1.add(jLabel1); - jPanel1.setBackground(new java.awt.Color(204, 204, 204)); + jPanel1.setOpaque(false); jPanel1.setPreferredSize(new java.awt.Dimension(10, 0)); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.form index ad636bd27..1bdd921ff 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.form @@ -1,10 +1,7 @@ - + - - - @@ -29,9 +26,9 @@ - + - + @@ -48,9 +45,9 @@ - + - + @@ -61,23 +58,20 @@ - - - - - - - + + + + + - - + - + - + @@ -99,9 +93,6 @@ - - - @@ -122,9 +113,6 @@ - - - @@ -144,9 +132,6 @@ - - - @@ -162,9 +147,6 @@ - - - @@ -180,9 +162,6 @@ - - - @@ -223,9 +202,6 @@ - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java index 9066cf5cf..346a68345 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java @@ -121,7 +121,6 @@ public class TexturePanel extends MaterialPropertyWidget { jSeparator1 = new javax.swing.JSeparator(); texturePreview = new javax.swing.JLabel(); - setBackground(new java.awt.Color(204, 204, 204)); setMaximumSize(new java.awt.Dimension(32767, 45)); setPreferredSize(new java.awt.Dimension(467, 45)); @@ -129,7 +128,6 @@ public class TexturePanel extends MaterialPropertyWidget { jLabel1.setMinimumSize(new java.awt.Dimension(70, 14)); jLabel1.setPreferredSize(new java.awt.Dimension(100, 16)); - jPanel1.setBackground(new java.awt.Color(204, 204, 204)); jPanel1.setPreferredSize(new java.awt.Dimension(10, 0)); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); @@ -143,7 +141,6 @@ public class TexturePanel extends MaterialPropertyWidget { .addGap(0, 0, Short.MAX_VALUE) ); - jButton1.setBackground(new java.awt.Color(204, 204, 204)); jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/materials/multiview/widgets/icons/picture_add.png"))); // NOI18N jButton1.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jButton1.text")); // NOI18N jButton1.setFocusable(false); @@ -156,8 +153,7 @@ public class TexturePanel extends MaterialPropertyWidget { } }); - jCheckBox1.setBackground(new java.awt.Color(204, 204, 204)); - jCheckBox1.setFont(new java.awt.Font("Lucida Grande", 0, 10)); + jCheckBox1.setFont(new java.awt.Font("Lucida Grande", 0, 10)); // NOI18N jCheckBox1.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jCheckBox1.text")); // NOI18N jCheckBox1.setFocusable(false); jCheckBox1.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); @@ -167,8 +163,7 @@ public class TexturePanel extends MaterialPropertyWidget { } }); - jCheckBox2.setBackground(new java.awt.Color(204, 204, 204)); - jCheckBox2.setFont(new java.awt.Font("Lucida Grande", 0, 10)); + jCheckBox2.setFont(new java.awt.Font("Lucida Grande", 0, 10)); // NOI18N jCheckBox2.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jCheckBox2.text")); // NOI18N jCheckBox2.setFocusable(false); jCheckBox2.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); @@ -178,7 +173,6 @@ public class TexturePanel extends MaterialPropertyWidget { } }); - jButton2.setBackground(new java.awt.Color(204, 204, 204)); jButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/materials/multiview/widgets/icons/picture_delete.png"))); // NOI18N jButton2.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jButton2.text")); // NOI18N jButton2.setToolTipText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jButton2.toolTipText")); // NOI18N @@ -198,7 +192,6 @@ public class TexturePanel extends MaterialPropertyWidget { texturePreview.setIconTextGap(0); texturePreview.setMaximumSize(new java.awt.Dimension(75, 25)); texturePreview.setMinimumSize(new java.awt.Dimension(75, 25)); - texturePreview.setPreferredSize(new java.awt.Dimension(75, 25)); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -206,9 +199,9 @@ public class TexturePanel extends MaterialPropertyWidget { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 457, Short.MAX_VALUE) + .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 474, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() - .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 184, Short.MAX_VALUE) + .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 211, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(texturePreview, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -222,9 +215,9 @@ public class TexturePanel extends MaterialPropertyWidget { .addContainerGap()) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(0, 229, Short.MAX_VALUE) + .addGap(0, 238, Short.MAX_VALUE) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 228, Short.MAX_VALUE))) + .addGap(0, 238, Short.MAX_VALUE))) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -232,20 +225,18 @@ public class TexturePanel extends MaterialPropertyWidget { .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 25, Short.MAX_VALUE) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jButton2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jCheckBox2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jCheckBox1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(texturePreview, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addComponent(jButton2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 25, Short.MAX_VALUE) + .addComponent(jCheckBox2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jCheckBox1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(texturePreview, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 12, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(85, 85, 85)) + .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addGap(0, 41, Short.MAX_VALUE) + .addGap(0, 30, Short.MAX_VALUE) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 24, Short.MAX_VALUE))) + .addGap(0, 15, Short.MAX_VALUE))) ); }// //GEN-END:initComponents