Browse Source

reenabled the terrain paint button

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10530 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
bre..om 12 years ago
parent
commit
2ef4ce8cde

+ 2 - 2
jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties

@@ -84,8 +84,6 @@ TerrainEditorTopComponent.textureFileChooser.approveButtonText_1=Load
 TerrainEditorTopComponent.remainingTexturesLabel.text=\
 4
 TerrainEditorTopComponent.textureTable.columnModel.title4=Normal
-TerrainEditorTopComponent.eraseButton.toolTipText=Erase a texture from the terrain
-TerrainEditorTopComponent.eraseButton.text=
 TerrainEditorTopComponent.paintingPanel.border.title=Painting
 TerrainEditorTopComponent.triPlanarCheckBox.toolTipText=Enable if you have a lot of vertical surfaces. It will look nice but lower performance
 TerrainEditorTopComponent.triPlanarCheckBox.text=Tri-planar
@@ -127,3 +125,5 @@ TerrainEditorTopComponent.AbsoluteCheckbox.tooltip=Define the height to adjust t
 TerrainEditorTopComponent.slopeLockCheckbox.tooltip=Contains the slope between the two slope nodes
 TerrainEditorTopComponent.borderDistanceLabel.tooltip=Distance means how far from the terrain's edge the border will be raised (thickness of the border).
 TerrainEditorTopComponent.borderHeightLAbel.tooltip=Height means how high the border will go (also accept negative values).
+TerrainEditorTopComponent.paintButton.toolTipText=Erase a texture from the terrain
+TerrainEditorTopComponent.paintButton.text=

+ 5 - 6
jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.form

@@ -440,27 +440,26 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="removeTextureButtonActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JToggleButton" name="eraseButton">
+        <Component class="javax.swing.JToggleButton" name="paintButton">
           <Properties>
             <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
               <ComponentRef name="terrainModButtonGroup"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/com/jme3/gde/terraineditor/icon_terrain-erase-circle.png"/>
+              <Image iconType="3" name="/com/jme3/gde/terraineditor/icon_terrain-paint-circle.png"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/terraineditor/Bundle.properties" key="TerrainEditorTopComponent.eraseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/terraineditor/Bundle.properties" key="TerrainEditorTopComponent.paintButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/terraineditor/Bundle.properties" key="TerrainEditorTopComponent.eraseButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/terraineditor/Bundle.properties" key="TerrainEditorTopComponent.paintButton.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
-            <Property name="enabled" type="boolean" value="false"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
           <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="eraseButtonActionPerformed"/>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="paintButtonActionPerformed"/>
           </Events>
         </Component>
         <Component class="javax.swing.JToolBar$Separator" name="jSeparator3">

+ 15 - 16
jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java

@@ -251,7 +251,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         jSeparator2 = new javax.swing.JToolBar.Separator();
         addTextureButton = new javax.swing.JButton();
         removeTextureButton = new javax.swing.JButton();
-        eraseButton = new javax.swing.JToggleButton();
+        paintButton = new javax.swing.JToggleButton();
         jSeparator3 = new javax.swing.JToolBar.Separator();
         radiusLabel = new javax.swing.JLabel();
         radiusSlider = new javax.swing.JSlider();
@@ -498,20 +498,19 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         });
         jToolBar1.add(removeTextureButton);
 
-        terrainModButtonGroup.add(eraseButton);
-        eraseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/terraineditor/icon_terrain-erase-circle.png"))); // NOI18N
-        org.openide.awt.Mnemonics.setLocalizedText(eraseButton, org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.eraseButton.text")); // NOI18N
-        eraseButton.setToolTipText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.eraseButton.toolTipText")); // NOI18N
-        eraseButton.setEnabled(false);
-        eraseButton.setFocusable(false);
-        eraseButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        eraseButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
-        eraseButton.addActionListener(new java.awt.event.ActionListener() {
+        terrainModButtonGroup.add(paintButton);
+        paintButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/terraineditor/icon_terrain-paint-circle.png"))); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(paintButton, org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.paintButton.text")); // NOI18N
+        paintButton.setToolTipText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.paintButton.toolTipText")); // NOI18N
+        paintButton.setFocusable(false);
+        paintButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        paintButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        paintButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
-                eraseButtonActionPerformed(evt);
+                paintButtonActionPerformed(evt);
             }
         });
-        jToolBar1.add(eraseButton);
+        jToolBar1.add(paintButton);
         jToolBar1.add(jSeparator3);
 
         org.openide.awt.Mnemonics.setLocalizedText(radiusLabel, org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.radiusLabel.text")); // NOI18N
@@ -755,8 +754,8 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         editorController.enableTextureButtons();
     }//GEN-LAST:event_removeTextureButtonActionPerformed
 
-    private void eraseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_eraseButtonActionPerformed
-        if (eraseButton.isSelected()) {
+    private void paintButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_paintButtonActionPerformed
+        if (paintButton.isSelected()) {
             PaintTerrainTool tool = new PaintTerrainTool();
             toolController.setTerrainEditButtonState(tool);
             setHintText(tool);
@@ -764,7 +763,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
             toolController.setTerrainEditButtonState(null);
             setHintText((TerrainTool) null);
         }
-    }//GEN-LAST:event_eraseButtonActionPerformed
+    }//GEN-LAST:event_paintButtonActionPerformed
 
     private void triPlanarCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_triPlanarCheckBoxActionPerformed
         editorController.setTriPlanarEnabled(triPlanarCheckBox.isSelected());
@@ -902,7 +901,6 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton addTextureButton;
     private javax.swing.JButton createTerrainButton;
-    private javax.swing.JToggleButton eraseButton;
     private javax.swing.JPanel fractalBrushPanel;
     private javax.swing.JLabel heightLabel;
     private javax.swing.JSlider heightSlider;
@@ -926,6 +924,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
     private javax.swing.JCheckBox levelPrecisionCheckbox;
     private javax.swing.JToggleButton levelTerrainButton;
     private javax.swing.JTextField octavesField;
+    private javax.swing.JToggleButton paintButton;
     private javax.swing.JPanel paintingPanel;
     private javax.swing.JLabel radiusLabel;
     private javax.swing.JSlider radiusSlider;