From ff34ec33cc8c88489f694ccfdfc45b48f383c9ce Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 11 Dec 2017 18:52:01 +0100 Subject: [PATCH] Bug 791455 - Please add support for barrel rotation in brush tools. It turns out we already have the support since it uses the same axis as the "wheel", used by other devices (for instance the Airbrush pen of Wacom has a wheel reporting on this same axis). We can't do any fancy support for this right now, but at least we can clarify a bit the dynamics naming so that people understands it can be used for both wheel and rotation input. Fix the various "Wheel" dynamics strings into "Wheel/Rotation". --- app/widgets/gimpdeviceinfoeditor.c | 7 +++++-- app/widgets/gimpdynamicseditor.c | 2 +- app/widgets/gimpdynamicsoutputeditor.c | 14 +++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/widgets/gimpdeviceinfoeditor.c b/app/widgets/gimpdeviceinfoeditor.c index c56a73855c..92e1cd1dcf 100644 --- a/app/widgets/gimpdeviceinfoeditor.c +++ b/app/widgets/gimpdeviceinfoeditor.c @@ -141,8 +141,11 @@ static const gchar *const axis_use_strings[] = N_("Pressure"), N_("X tilt"), N_("Y tilt"), - /* Wheel as in mouse or input device wheel */ - N_("Wheel") + /* Wheel as in mouse or input device wheel. + * Some pens use the same axis for their rotation feature. + * See bug 791455. + */ + N_("Wheel/Rotation") }; diff --git a/app/widgets/gimpdynamicseditor.c b/app/widgets/gimpdynamicseditor.c index 0cf04acce2..3d5e60237f 100644 --- a/app/widgets/gimpdynamicseditor.c +++ b/app/widgets/gimpdynamicseditor.c @@ -162,7 +162,7 @@ gimp_dynamics_editor_constructed (GObject *object) input_labels[1] = gtk_label_new (_("Velocity")); input_labels[2] = gtk_label_new (_("Direction")); input_labels[3] = gtk_label_new (_("Tilt")); - input_labels[4] = gtk_label_new (_("Wheel")); + input_labels[4] = gtk_label_new (_("Wheel/Rotation")); input_labels[5] = gtk_label_new (_("Random")); input_labels[6] = gtk_label_new (_("Fade")); diff --git a/app/widgets/gimpdynamicsoutputeditor.c b/app/widgets/gimpdynamicsoutputeditor.c index a8eb53c98c..c5ac0ac371 100644 --- a/app/widgets/gimpdynamicsoutputeditor.c +++ b/app/widgets/gimpdynamicsoutputeditor.c @@ -67,13 +67,13 @@ struct } inputs[] = { - { "use-pressure", "pressure-curve", N_("Pressure"), { 1.0, 0.0, 0.0, 1.0 } }, - { "use-velocity", "velocity-curve", N_("Velocity"), { 0.0, 1.0, 0.0, 1.0 } }, - { "use-direction", "direction-curve", N_("Direction"), { 0.0, 0.0, 1.0, 1.0 } }, - { "use-tilt", "tilt-curve", N_("Tilt"), { 1.0, 0.5, 0.0, 1.0 } }, - { "use-wheel", "wheel-curve", N_("Wheel"), { 1.0, 0.0, 1.0, 1.0 } }, - { "use-random", "random-curve", N_("Random"), { 0.0, 1.0, 1.0, 1.0 } }, - { "use-fade", "fade-curve", N_("Fade"), { 0.2, 0.2, 0.2, 1.0 } } + { "use-pressure", "pressure-curve", N_("Pressure"), { 1.0, 0.0, 0.0, 1.0 } }, + { "use-velocity", "velocity-curve", N_("Velocity"), { 0.0, 1.0, 0.0, 1.0 } }, + { "use-direction", "direction-curve", N_("Direction"), { 0.0, 0.0, 1.0, 1.0 } }, + { "use-tilt", "tilt-curve", N_("Tilt"), { 1.0, 0.5, 0.0, 1.0 } }, + { "use-wheel", "wheel-curve", N_("Wheel / Rotation"), { 1.0, 0.0, 1.0, 1.0 } }, + { "use-random", "random-curve", N_("Random"), { 0.0, 1.0, 1.0, 1.0 } }, + { "use-fade", "fade-curve", N_("Fade"), { 0.2, 0.2, 0.2, 1.0 } } };