sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sdk :

Browse Source 
- Fixed some spacing issues in material editor UI for small screens resolution

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7998 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2011-08-10 16:59:07 +00:00
parent 3081862ced
commit 19191a1598
3 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/Bundle.properties
View File

@ -46,5 +46,4 @@ ColorPanel.gLabel.text=0.2545
ColorPanel.bLabel.text=0.2545 ColorPanel.bLabel.text=0.2545
ColorPanel.aLabel.text=0.2545 ColorPanel.aLabel.text=0.2545
TexturePanel.jButton2.toolTipText=Remove this texture TexturePanel.jButton2.toolTipText=Remove this texture
TexturePanel.jLabel2.text=
TexturePanel.texturePreview.text= TexturePanel.texturePreview.text=

28
sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.form
View File

@ -29,12 +29,10 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="1" attributes="0">
<Component id="jSeparator1" alignment="1" pref="559" max="32767" attributes="0"/> <Component id="jSeparator1" alignment="1" pref="457" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<Component id="jLabel1" min="-2" pref="92" max="-2" attributes="0"/> <Component id="jLabel1" pref="184" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jLabel2" pref="192" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
<Component id="texturePreview" min="-2" pref="81" max="-2" attributes="0"/> <Component id="texturePreview" min="-2" pref="81" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/> <Component id="jButton1" min="-2" max="-2" attributes="0"/>
@ -50,9 +48,9 @@
</Group> </Group>
<Group type="103" rootIndex="1" groupAlignment="0" attributes="0"> <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace min="0" pref="280" max="32767" attributes="0"/> <EmptySpace min="0" pref="229" max="32767" attributes="0"/>
<Component id="jPanel1" min="-2" max="-2" attributes="0"/> <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="279" max="32767" attributes="0"/> <EmptySpace min="0" pref="228" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>
@ -61,10 +59,9 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel2" pref="25" max="32767" attributes="1"/> <Component id="jLabel1" pref="25" max="32767" attributes="1"/>
<Component id="jLabel1" alignment="0" pref="25" max="32767" attributes="1"/> <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
<Group type="103" alignment="1" groupAlignment="0" max="-2" attributes="0">
<Component id="jButton2" alignment="1" max="32767" attributes="1"/> <Component id="jButton2" alignment="1" max="32767" attributes="1"/>
<Component id="jCheckBox2" alignment="0" max="32767" attributes="1"/> <Component id="jCheckBox2" alignment="0" max="32767" attributes="1"/>
<Component id="jCheckBox1" alignment="0" max="32767" attributes="1"/> <Component id="jCheckBox1" alignment="0" max="32767" attributes="1"/>
@ -92,6 +89,9 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="TexturePanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/> <ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="TexturePanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property> </Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[70, 14]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 16]"/> <Dimension value="[100, 16]"/>
</Property> </Property>
@ -200,14 +200,6 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="TexturePanel.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JSeparator" name="jSeparator1"> <Component class="javax.swing.JSeparator" name="jSeparator1">
</Component> </Component>
<Component class="javax.swing.JLabel" name="texturePreview"> <Component class="javax.swing.JLabel" name="texturePreview">

42
sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/TexturePanel.java
View File

@ -67,16 +67,16 @@ public class TexturePanel extends MaterialPropertyWidget {
private void updateFlipRepeat() { private void updateFlipRepeat() {
if (flip && repeat) { if (flip && repeat) {
property.setValue("Flip Repeat " + textureName); property.setValue("Flip Repeat " + textureName);
jLabel2.setToolTipText("Flip Repeat " + textureName); texturePreview.setToolTipText("Flip Repeat " + textureName);
} else if (flip) { } else if (flip) {
property.setValue("Flip " + textureName); property.setValue("Flip " + textureName);
jLabel2.setToolTipText("Flip " + textureName); texturePreview.setToolTipText("Flip " + textureName);
} else if (repeat) { } else if (repeat) {
property.setValue("Repeat " + textureName); property.setValue("Repeat " + textureName);
jLabel2.setToolTipText("Repeat " + textureName); texturePreview.setToolTipText("Repeat " + textureName);
} else { } else {
property.setValue(textureName); property.setValue(textureName);
jLabel2.setToolTipText(textureName); texturePreview.setToolTipText(textureName);
} }
} }
@ -115,7 +115,6 @@ public class TexturePanel extends MaterialPropertyWidget {
jCheckBox1 = new javax.swing.JCheckBox(); jCheckBox1 = new javax.swing.JCheckBox();
jCheckBox2 = new javax.swing.JCheckBox(); jCheckBox2 = new javax.swing.JCheckBox();
jButton2 = new javax.swing.JButton(); jButton2 = new javax.swing.JButton();
jLabel2 = new javax.swing.JLabel();
jSeparator1 = new javax.swing.JSeparator(); jSeparator1 = new javax.swing.JSeparator();
texturePreview = new javax.swing.JLabel(); texturePreview = new javax.swing.JLabel();
@ -124,6 +123,7 @@ public class TexturePanel extends MaterialPropertyWidget {
setPreferredSize(new java.awt.Dimension(467, 45)); setPreferredSize(new java.awt.Dimension(467, 45));
jLabel1.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jLabel1.text")); // NOI18N jLabel1.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jLabel1.text")); // NOI18N
jLabel1.setMinimumSize(new java.awt.Dimension(70, 14));
jLabel1.setPreferredSize(new java.awt.Dimension(100, 16)); jLabel1.setPreferredSize(new java.awt.Dimension(100, 16));
jPanel1.setBackground(new java.awt.Color(204, 204, 204)); jPanel1.setBackground(new java.awt.Color(204, 204, 204));
@ -188,9 +188,6 @@ public class TexturePanel extends MaterialPropertyWidget {
} }
}); });
jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel2.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.jLabel2.text")); // NOI18N
texturePreview.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.texturePreview.text")); // NOI18N texturePreview.setText(org.openide.util.NbBundle.getMessage(TexturePanel.class, "TexturePanel.texturePreview.text")); // NOI18N
texturePreview.setVerticalAlignment(javax.swing.SwingConstants.TOP); texturePreview.setVerticalAlignment(javax.swing.SwingConstants.TOP);
texturePreview.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153))); texturePreview.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153)));
@ -206,12 +203,10 @@ public class TexturePanel extends MaterialPropertyWidget {
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 559, Short.MAX_VALUE) .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 457, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 184, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 192, Short.MAX_VALUE)
.addGap(2, 2, 2)
.addComponent(texturePreview, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(texturePreview, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jButton1) .addComponent(jButton1)
@ -224,17 +219,16 @@ public class TexturePanel extends MaterialPropertyWidget {
.addContainerGap()) .addContainerGap())
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGap(0, 280, Short.MAX_VALUE) .addGap(0, 229, Short.MAX_VALUE)
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 279, Short.MAX_VALUE))) .addGap(0, 228, Short.MAX_VALUE)))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 25, Short.MAX_VALUE) .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 25, Short.MAX_VALUE)
.addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 25, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .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(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(jCheckBox2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@ -257,8 +251,7 @@ public class TexturePanel extends MaterialPropertyWidget {
view.setVisible(true); view.setVisible(true);
if (editor.getValue() != null) { if (editor.getValue() != null) {
textureName = editor.getAsText(); textureName = editor.getAsText();
displayPreview(); displayPreview();
jLabel2.setText(getName(textureName));
updateFlipRepeat(); updateFlipRepeat();
fireChanged(); fireChanged();
} }
@ -266,9 +259,8 @@ public class TexturePanel extends MaterialPropertyWidget {
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
textureName = ""; textureName = "";
texturePreview.setIcon(null); texturePreview.setIcon(null);
jLabel2.setText(""); texturePreview.setToolTipText("");
jLabel2.setToolTipText("");
property.setValue(""); property.setValue("");
fireChanged(); fireChanged();
}//GEN-LAST:event_jButton2ActionPerformed }//GEN-LAST:event_jButton2ActionPerformed
@ -311,9 +303,8 @@ public class TexturePanel extends MaterialPropertyWidget {
} }
jLabel1.setText(property.getName()); jLabel1.setText(property.getName());
jLabel1.setToolTipText(property.getName()); jLabel1.setToolTipText(property.getName());
displayPreview(); displayPreview();
jLabel2.setText(getName(textureName)); texturePreview.setToolTipText(property.getValue());
jLabel2.setToolTipText(property.getValue());
MaterialProperty prop = property; MaterialProperty prop = property;
property = null; property = null;
jCheckBox1.setSelected(flip); jCheckBox1.setSelected(flip);
@ -328,7 +319,6 @@ public class TexturePanel extends MaterialPropertyWidget {
private javax.swing.JCheckBox jCheckBox1; private javax.swing.JCheckBox jCheckBox1;
private javax.swing.JCheckBox jCheckBox2; private javax.swing.JCheckBox jCheckBox2;
private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel1;
private javax.swing.JSeparator jSeparator1; private javax.swing.JSeparator jSeparator1;
private javax.swing.JLabel texturePreview; private javax.swing.JLabel texturePreview;