dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael Natterer 2008-05-22 18:54:16 +00:00 committed by Michael Natterer
parent c03253684a
commit 791638fb15
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

29
app/tools/gimppaintoptions-gui.c
View File

@ -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",