sdk :
- 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
parent
3081862ced
commit
19191a1598
@ -46,5 +46,4 @@ ColorPanel.gLabel.text=0.2545
|
||||
ColorPanel.bLabel.text=0.2545
|
||||
ColorPanel.aLabel.text=0.2545
|
||||
TexturePanel.jButton2.toolTipText=Remove this texture
|
||||
TexturePanel.jLabel2.text=
|
||||
TexturePanel.texturePreview.text=
|
||||
|
||||
@ -29,12 +29,10 @@
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="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">
|
||||
<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"/>
|
||||
<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"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
|
||||
@ -50,9 +48,9 @@
|
||||
</Group>
|
||||
<Group type="103" rootIndex="1" groupAlignment="0" 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"/>
|
||||
<EmptySpace min="0" pref="279" max="32767" attributes="0"/>
|
||||
<EmptySpace min="0" pref="228" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</Group>
|
||||
@ -61,10 +59,9 @@
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="1" attributes="0">
|
||||
<Component id="jLabel2" pref="25" max="32767" attributes="1"/>
|
||||
<Component id="jLabel1" alignment="0" pref="25" max="32767" attributes="1"/>
|
||||
<Group type="103" alignment="1" groupAlignment="0" max="-2" attributes="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="jLabel1" pref="25" max="32767" attributes="1"/>
|
||||
<Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
|
||||
<Component id="jButton2" alignment="1" max="32767" attributes="1"/>
|
||||
<Component id="jCheckBox2" 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">
|
||||
<ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="TexturePanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
|
||||
</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">
|
||||
<Dimension value="[100, 16]"/>
|
||||
</Property>
|
||||
@ -200,14 +200,6 @@
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
|
||||
</Events>
|
||||
</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, "{key}")"/>
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JSeparator" name="jSeparator1">
|
||||
</Component>
|
||||
<Component class="javax.swing.JLabel" name="texturePreview">
|
||||
|
||||
@ -67,16 +67,16 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
private void updateFlipRepeat() {
|
||||
if (flip && repeat) {
|
||||
property.setValue("Flip Repeat " + textureName);
|
||||
jLabel2.setToolTipText("Flip Repeat " + textureName);
|
||||
texturePreview.setToolTipText("Flip Repeat " + textureName);
|
||||
} else if (flip) {
|
||||
property.setValue("Flip " + textureName);
|
||||
jLabel2.setToolTipText("Flip " + textureName);
|
||||
texturePreview.setToolTipText("Flip " + textureName);
|
||||
} else if (repeat) {
|
||||
property.setValue("Repeat " + textureName);
|
||||
jLabel2.setToolTipText("Repeat " + textureName);
|
||||
texturePreview.setToolTipText("Repeat " + textureName);
|
||||
} else {
|
||||
property.setValue(textureName);
|
||||
jLabel2.setToolTipText(textureName);
|
||||
texturePreview.setToolTipText(textureName);
|
||||
}
|
||||
}
|
||||
|
||||
@ -115,7 +115,6 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
jCheckBox1 = new javax.swing.JCheckBox();
|
||||
jCheckBox2 = new javax.swing.JCheckBox();
|
||||
jButton2 = new javax.swing.JButton();
|
||||
jLabel2 = new javax.swing.JLabel();
|
||||
jSeparator1 = new javax.swing.JSeparator();
|
||||
texturePreview = new javax.swing.JLabel();
|
||||
|
||||
@ -124,6 +123,7 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
setPreferredSize(new java.awt.Dimension(467, 45));
|
||||
|
||||
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));
|
||||
|
||||
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.setVerticalAlignment(javax.swing.SwingConstants.TOP);
|
||||
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)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.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()
|
||||
.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)
|
||||
.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)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(jButton1)
|
||||
@ -224,17 +219,16 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
.addContainerGap())
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.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)
|
||||
.addGap(0, 279, Short.MAX_VALUE)))
|
||||
.addGap(0, 228, Short.MAX_VALUE)))
|
||||
);
|
||||
layout.setVerticalGroup(
|
||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(jLabel2, 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)
|
||||
.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)
|
||||
@ -258,7 +252,6 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
if (editor.getValue() != null) {
|
||||
textureName = editor.getAsText();
|
||||
displayPreview();
|
||||
jLabel2.setText(getName(textureName));
|
||||
updateFlipRepeat();
|
||||
fireChanged();
|
||||
}
|
||||
@ -267,8 +260,7 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
|
||||
textureName = "";
|
||||
texturePreview.setIcon(null);
|
||||
jLabel2.setText("");
|
||||
jLabel2.setToolTipText("");
|
||||
texturePreview.setToolTipText("");
|
||||
property.setValue("");
|
||||
fireChanged();
|
||||
}//GEN-LAST:event_jButton2ActionPerformed
|
||||
@ -312,8 +304,7 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
jLabel1.setText(property.getName());
|
||||
jLabel1.setToolTipText(property.getName());
|
||||
displayPreview();
|
||||
jLabel2.setText(getName(textureName));
|
||||
jLabel2.setToolTipText(property.getValue());
|
||||
texturePreview.setToolTipText(property.getValue());
|
||||
MaterialProperty prop = property;
|
||||
property = null;
|
||||
jCheckBox1.setSelected(flip);
|
||||
@ -328,7 +319,6 @@ public class TexturePanel extends MaterialPropertyWidget {
|
||||
private javax.swing.JCheckBox jCheckBox1;
|
||||
private javax.swing.JCheckBox jCheckBox2;
|
||||
private javax.swing.JLabel jLabel1;
|
||||
private javax.swing.JLabel jLabel2;
|
||||
private javax.swing.JPanel jPanel1;
|
||||
private javax.swing.JSeparator jSeparator1;
|
||||
private javax.swing.JLabel texturePreview;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user