From 791638fb15dc6490179af0d9d6d7027084b9c199 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Thu, 22 May 2008 18:54:16 +0000
Subject: [PATCH] revert accidential change of all occurences of "hardness" to
 "pressure" in

2008-05-22  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppaintoptions-gui.c: revert accidential change of
	all occurences of "hardness" to "pressure" in strings and function
	names.


svn path=/trunk/; revision=25764
---
 ChangeLog                        |  6 ++++++
 app/tools/gimppaintoptions-gui.c | 29 +++++++----------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ac9c3d9a46..83d099d658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-22  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimppaintoptions-gui.c: revert accidential change of
+	all occurences of "hardness" to "pressure" in strings and function
+	names.
+
 2008-05-22  Michael Natterer  <mitch@gimp.org>
 
 	* app/tools/gimppaintoptions-gui.c: factor out a utility function
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 4a594eb1f0..08bef13874 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -52,7 +52,7 @@
 
 
 static gboolean    tool_has_opacity_dynamics  (GType          tool_type);
-static gboolean    tool_has_pressure_dynamics (GType          tool_type);
+static gboolean    tool_has_hardness_dynamics (GType          tool_type);
 static gboolean    tool_has_rate_dynamics     (GType          tool_type);
 static gboolean    tool_has_size_dynamics     (GType          tool_type);
 static gboolean    tool_has_color_dynamics    (GType          tool_type);
@@ -186,9 +186,9 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
       n_dynamics++;
     }
 
-  if (tool_has_pressure_dynamics (tool_type))
+  if (tool_has_hardness_dynamics (tool_type))
     {
-      dynamics_labels[n_dynamics] = gtk_label_new (_("Pressure"));
+      dynamics_labels[n_dynamics] = gtk_label_new (_("Hardness"));
       n_dynamics++;
     }
 
@@ -337,7 +337,7 @@ tool_has_opacity_dynamics (GType tool_type)
 }
 
 static gboolean
-tool_has_pressure_dynamics (GType tool_type)
+tool_has_hardness_dynamics (GType tool_type)
 {
   return (tool_type == GIMP_TYPE_AIRBRUSH_TOOL          ||
           tool_type == GIMP_TYPE_CLONE_TOOL             ||
@@ -406,7 +406,6 @@ pressure_options_gui (GimpPressureOptions *pressure,
   GtkWidget *button;
   gint       column = 1;
 
-  /*  the opacity toggle  */
   if (tool_has_opacity_dynamics (tool_type))
     {
       button = dynamics_check_button_new (config, "pressure-opacity",
@@ -417,8 +416,7 @@ pressure_options_gui (GimpPressureOptions *pressure,
       column++;
     }
 
-  /*  the pressure toggle  */
-  if (tool_has_pressure_dynamics (tool_type))
+  if (tool_has_hardness_dynamics (tool_type))
     {
       button = dynamics_check_button_new (config, "pressure-hardness",
                                           table, column, row);
@@ -428,7 +426,6 @@ pressure_options_gui (GimpPressureOptions *pressure,
       column++;
     }
 
-  /*  the rate toggle */
   if (tool_has_rate_dynamics (tool_type))
     {
       button = dynamics_check_button_new (config, "pressure-rate",
@@ -439,7 +436,6 @@ pressure_options_gui (GimpPressureOptions *pressure,
       column++;
     }
 
-  /*  the size toggle  */
   if (tool_has_size_dynamics (tool_type))
     {
       if (tool_type != GIMP_TYPE_AIRBRUSH_TOOL)
@@ -455,7 +451,6 @@ pressure_options_gui (GimpPressureOptions *pressure,
       column++;
     }
 
-  /*  the color toggle  */
   if (tool_has_color_dynamics (tool_type))
     {
       button = dynamics_check_button_new (config, "pressure-color",
@@ -477,35 +472,30 @@ velocity_options_gui (GimpVelocityOptions *velocity,
   GObject *config = G_OBJECT (paint_options);
   gint     column = 1;
 
-  /*  the opacity toggle  */
   if (tool_has_opacity_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "velocity-opacity",
                                  table, column++, row);
     }
 
-  /*  the pressure toggle  */
-  if (tool_has_pressure_dynamics (tool_type))
+  if (tool_has_hardness_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "velocity-hardness",
                                  table, column++, row);
     }
 
-  /*  the rate toggle */
   if (tool_has_rate_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "velocity-rate",
                                  table, column++, row);
     }
 
-  /*  the size toggle  */
   if (tool_has_size_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "velocity-size",
                                  table, column++, row);
     }
 
-  /*  the color toggle  */
   if (tool_has_color_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "velocity-color",
@@ -523,35 +513,30 @@ random_options_gui (GimpRandomOptions *random,
   GObject*config = G_OBJECT (paint_options);
   gint    column = 1;
 
-  /*  the opacity toggle  */
   if (tool_has_opacity_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "random-opacity",
                                  table, column++, row);
     }
 
-  /*  the pressure toggle  */
-  if (tool_has_pressure_dynamics (tool_type))
+  if (tool_has_hardness_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "random-hardness",
                                  table, column++, row);
     }
 
-  /*  the rate toggle */
   if (tool_has_rate_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "random-rate",
                                  table, column++, row);
     }
 
-  /*  the size toggle  */
   if (tool_has_size_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "random-size",
                                  table, column++, row);
     }
 
-  /*  the color toggle  */
   if (tool_has_color_dynamics (tool_type))
     {
       dynamics_check_button_new (config, "random-color",