Browse Source

Get rid of some weird labels

Toni Helenius 2 years ago
parent
commit
ac4506661d

+ 3 - 16
jme3-angelfont/src/com/jme3/gde/angelfont/AngelFontVisualPanel1.form

@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
   <AuxValues>
@@ -66,20 +66,14 @@
       <Layout>
       <Layout>
         <DimensionLayout dim="0">
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Component id="jLabel1" alignment="0" pref="341" max="32767" attributes="0"/>
-              <Group type="102" alignment="0" attributes="0">
-                  <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
-                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="279" max="32767" attributes="0"/>
-              </Group>
+              <Component id="jLabel1" alignment="0" pref="344" max="32767" attributes="0"/>
           </Group>
           </Group>
         </DimensionLayout>
         </DimensionLayout>
         <DimensionLayout dim="1">
         <DimensionLayout dim="1">
           <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">
                   <Component id="jLabel1" min="-2" pref="313" max="-2" attributes="0"/>
                   <Component id="jLabel1" min="-2" pref="313" max="-2" attributes="0"/>
-                  <EmptySpace pref="11" max="32767" attributes="0"/>
-                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace pref="27" max="32767" attributes="0"/>
               </Group>
               </Group>
           </Group>
           </Group>
         </DimensionLayout>
         </DimensionLayout>
@@ -98,13 +92,6 @@
             </Property>
             </Property>
           </Properties>
           </Properties>
         </Component>
         </Component>
-        <Component class="javax.swing.JLabel" name="jLabel2">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/angelfont/Bundle.properties" key="AngelFontVisualPanel1.jLabel2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </Component>
       </SubComponents>
       </SubComponents>
     </Container>
     </Container>
   </SubComponents>
   </SubComponents>

+ 2 - 11
jme3-angelfont/src/com/jme3/gde/angelfont/AngelFontVisualPanel1.java

@@ -42,7 +42,6 @@ public final class AngelFontVisualPanel1 extends JPanel {
         jList1 = new javax.swing.JList();
         jList1 = new javax.swing.JList();
         jPanel1 = new javax.swing.JPanel();
         jPanel1 = new javax.swing.JPanel();
         jLabel1 = new javax.swing.JLabel();
         jLabel1 = new javax.swing.JLabel();
-        jLabel2 = new javax.swing.JLabel();
 
 
         jList1.setModel(new javax.swing.AbstractListModel() {
         jList1.setModel(new javax.swing.AbstractListModel() {
             String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
             String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
@@ -62,24 +61,17 @@ public final class AngelFontVisualPanel1 extends JPanel {
         jLabel1.setForeground(new java.awt.Color(255, 255, 255));
         jLabel1.setForeground(new java.awt.Color(255, 255, 255));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel1.class, "AngelFontVisualPanel1.jLabel1.text")); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel1.class, "AngelFontVisualPanel1.jLabel1.text")); // NOI18N
 
 
-        org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel1.class, "AngelFontVisualPanel1.jLabel2.text")); // NOI18N
-
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
         jPanel1Layout.setHorizontalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE)
-            .addGroup(jPanel1Layout.createSequentialGroup()
-                .addGap(28, 28, 28)
-                .addComponent(jLabel2)
-                .addContainerGap(279, Short.MAX_VALUE))
+            .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 344, Short.MAX_VALUE)
         );
         );
         jPanel1Layout.setVerticalGroup(
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 313, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 313, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 11, Short.MAX_VALUE)
-                .addComponent(jLabel2))
+                .addContainerGap(27, Short.MAX_VALUE))
         );
         );
 
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -104,7 +96,6 @@ public final class AngelFontVisualPanel1 extends JPanel {
     }//GEN-LAST:event_updateFont
     }//GEN-LAST:event_updateFont
     // Variables declaration - do not modify//GEN-BEGIN:variables
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel1;
-    private javax.swing.JLabel jLabel2;
     private javax.swing.JList jList1;
     private javax.swing.JList jList1;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JScrollPane jScrollPane1;

+ 2 - 2
jme3-angelfont/src/com/jme3/gde/angelfont/AngelFontVisualPanel2.java

@@ -112,7 +112,7 @@ public final class AngelFontVisualPanel2 extends JPanel {
 
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jLabel2.text")); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jLabel2.text")); // NOI18N
 
 
-        jSpinner2.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(256), Integer.valueOf(64), null, Integer.valueOf(1)));
+        jSpinner2.setModel(new javax.swing.SpinnerNumberModel(256, 64, null, 1));
         jSpinner2.setToolTipText(org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jSpinner2.toolTipText")); // NOI18N
         jSpinner2.setToolTipText(org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jSpinner2.toolTipText")); // NOI18N
         jSpinner2.addChangeListener(new javax.swing.event.ChangeListener() {
         jSpinner2.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
@@ -186,7 +186,7 @@ public final class AngelFontVisualPanel2 extends JPanel {
 
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jLabel1.text")); // NOI18N
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jLabel1.text")); // NOI18N
 
 
-        jSpinner1.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(16), Integer.valueOf(1), null, Integer.valueOf(1)));
+        jSpinner1.setModel(new javax.swing.SpinnerNumberModel(16, 1, null, 1));
         jSpinner1.setToolTipText(org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jSpinner1.toolTipText")); // NOI18N
         jSpinner1.setToolTipText(org.openide.util.NbBundle.getMessage(AngelFontVisualPanel2.class, "AngelFontVisualPanel2.jSpinner1.toolTipText")); // NOI18N
         jSpinner1.addChangeListener(new javax.swing.event.ChangeListener() {
         jSpinner1.addChangeListener(new javax.swing.event.ChangeListener() {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {
             public void stateChanged(javax.swing.event.ChangeEvent evt) {

+ 1 - 2
jme3-angelfont/src/com/jme3/gde/angelfont/Bundle.properties

@@ -7,10 +7,9 @@ Templates/GUI/angelFont=Font
 AngelFontVisualPanel1.jLabel1.text=
 AngelFontVisualPanel1.jLabel1.text=
 AngelFontVisualPanel2.jLabel1.text=Font Size:
 AngelFontVisualPanel2.jLabel1.text=Font Size:
 AngelFontVisualPanel2.jLabel2.text=Image Size:
 AngelFontVisualPanel2.jLabel2.text=Image Size:
-AngelFontVisualPanel2.jLabel3.text=jLabel3
+AngelFontVisualPanel2.jLabel3.text=
 AngelFontVisualPanel2.jLabel4.text=Padding-x:
 AngelFontVisualPanel2.jLabel4.text=Padding-x:
 AngelFontVisualPanel2.jLabel5.text=Padding-y:
 AngelFontVisualPanel2.jLabel5.text=Padding-y:
-AngelFontVisualPanel1.jLabel2.text=jLabel2
 AngelFontVisualPanel2.jPanel3.border.title=Font
 AngelFontVisualPanel2.jPanel3.border.title=Font
 AngelFontVisualPanel2.jButton1.text=jButton1
 AngelFontVisualPanel2.jButton1.text=jButton1
 AngelFontVisualPanel2.jLabel6.text=Font style:
 AngelFontVisualPanel2.jLabel6.text=Font style: