[gimp] app: set tooltips on the tool options' brush, gradient etc edit buttons
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: set tooltips on the tool options' brush, gradient etc edit buttons
- Date: Sat, 17 Sep 2016 15:11:29 +0000 (UTC)
commit 9bb33914bf447b22a0fae7e126ed8bdfc2453765
Author: Michael Natterer <mitch gimp org>
Date: Sat Sep 17 17:10:20 2016 +0200
app: set tooltips on the tool options' brush, gradient etc edit buttons
Also make the tooltips of the edit buttons of the brush, gradient etc
dialogs consistent.
app/actions/dynamics-actions.c | 2 +-
app/actions/gradients-actions.c | 2 +-
app/actions/palettes-actions.c | 2 +-
app/tools/gimpblendoptions.c | 3 +-
app/tools/gimppaintoptions-gui.c | 9 +++--
app/widgets/gimpviewablebox.c | 63 +++++++++++++++++++++++---------------
app/widgets/gimpviewablebox.h | 12 +++++--
7 files changed, 57 insertions(+), 36 deletions(-)
---
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 7b4c7d2..7c47b0d 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -84,7 +84,7 @@ static const GimpStringActionEntry dynamics_edit_actions[] =
{
{ "dynamics-edit", "gtk-edit",
NC_("dynamics-action", "_Edit Dynamics..."), NULL,
- NC_("dynamics-action", "Edit dynamics"),
+ NC_("dynamics-action", "Edit this dynamics"),
"gimp-dynamics-editor",
GIMP_HELP_DYNAMICS_EDIT }
};
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index f13323b..7879588 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -91,7 +91,7 @@ static const GimpStringActionEntry gradients_edit_actions[] =
{
{ "gradients-edit", "gtk-edit",
NC_("gradients-action", "_Edit Gradient..."), NULL,
- NC_("gradients-action", "Edit gradient"),
+ NC_("gradients-action", "Edit this gradient"),
"gimp-gradient-editor",
GIMP_HELP_GRADIENT_EDIT }
};
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index ebc0f35..6983d5a 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -97,7 +97,7 @@ static const GimpStringActionEntry palettes_edit_actions[] =
{
{ "palettes-edit", "gtk-edit",
NC_("palettes-action", "_Edit Palette..."), NULL,
- NC_("palettes-action", "Edit palette"),
+ NC_("palettes-action", "Edit this palette"),
"gimp-palette-editor",
GIMP_HELP_PALETTE_EDIT }
};
diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c
index 5f2b528..7b23856 100644
--- a/app/tools/gimpblendoptions.c
+++ b/app/tools/gimpblendoptions.c
@@ -226,7 +226,8 @@ gimp_blend_options_gui (GimpToolOptions *tool_options)
"gradient-view-type",
"gradient-view-size",
"gradient-reverse",
- "gimp-gradient-editor");
+ "gimp-gradient-editor",
+ _("Edit this gradient"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 57dab81..88cc975 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -154,7 +154,8 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
button = gimp_prop_brush_box_new (NULL, GIMP_CONTEXT (tool_options),
_("Brush"), 2,
"brush-view-type", "brush-view-size",
- "gimp-brush-editor");
+ "gimp-brush-editor",
+ _("Edit this brush"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
@@ -214,7 +215,8 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
_("Dynamics"), 2,
"dynamics-view-type",
"dynamics-view-size",
- "gimp-dynamics-editor");
+ "gimp-dynamics-editor",
+ _("Edit this dynamics"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
@@ -363,7 +365,8 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
"gradient-view-type",
"gradient-view-size",
"gradient-reverse",
- "gimp-gradient-editor");
+ "gimp-gradient-editor",
+ _("Edit this gradient"));
gtk_container_add (GTK_CONTAINER (inner_frame), box);
gtk_widget_show (box);
}
diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c
index cb87066..22c53fb 100644
--- a/app/widgets/gimpviewablebox.c
+++ b/app/widgets/gimpviewablebox.c
@@ -56,7 +56,8 @@ static GtkWidget * gimp_viewable_box_new (GimpContainer *container,
const gchar *dialog_identifier,
const gchar *dialog_icon_name,
const gchar *dialog_tooltip,
- const gchar *editor_id);
+ const gchar *editor_id,
+ const gchar *editor_tooltip);
static GtkWidget * view_props_connect (GtkWidget *box,
GimpContext *context,
const gchar *view_type_prop,
@@ -77,7 +78,8 @@ brush_box_new (GimpContainer *container,
gint spacing,
GimpViewType view_type,
GimpViewSize view_size,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
if (! container)
container = gimp_data_factory_get_container (context->gimp->brush_factory);
@@ -87,7 +89,7 @@ brush_box_new (GimpContainer *container,
"gimp-brush-grid|gimp-brush-list",
GIMP_STOCK_BRUSH,
_("Open the brush selection dialog"),
- editor_id);
+ editor_id, editor_tooltip);
}
GtkWidget *
@@ -102,7 +104,7 @@ gimp_brush_box_new (GimpContainer *container,
return brush_box_new (container, context, label, spacing,
GIMP_VIEW_TYPE_GRID, GIMP_VIEW_SIZE_SMALL,
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -112,7 +114,8 @@ gimp_prop_brush_box_new (GimpContainer *container,
gint spacing,
const gchar *view_type_prop,
const gchar *view_size_prop,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
GimpViewType view_type;
GimpViewSize view_size;
@@ -128,7 +131,7 @@ gimp_prop_brush_box_new (GimpContainer *container,
return view_props_connect (brush_box_new (container, context, label, spacing,
view_type, view_size,
- editor_id),
+ editor_id, editor_tooltip),
context,
view_type_prop, view_size_prop);
}
@@ -142,7 +145,8 @@ dynamics_box_new (GimpContainer *container,
const gchar *label,
gint spacing,
GimpViewSize view_size,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
if (! container)
container = gimp_data_factory_get_container (context->gimp->dynamics_factory);
@@ -152,7 +156,7 @@ dynamics_box_new (GimpContainer *container,
"gimp-dynamics-list",
GIMP_STOCK_DYNAMICS,
_("Open the dynamics selection dialog"),
- editor_id);
+ editor_id, editor_tooltip);
}
GtkWidget *
@@ -167,7 +171,7 @@ gimp_dynamics_box_new (GimpContainer *container,
return dynamics_box_new (container, context, label, spacing,
GIMP_VIEW_SIZE_SMALL,
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -177,7 +181,8 @@ gimp_prop_dynamics_box_new (GimpContainer *container,
gint spacing,
const gchar *view_type_prop,
const gchar *view_size_prop,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
GimpViewType view_type;
GimpViewSize view_size;
@@ -193,7 +198,7 @@ gimp_prop_dynamics_box_new (GimpContainer *container,
return view_props_connect (dynamics_box_new (container, context, label,
spacing, view_size,
- editor_id),
+ editor_id, editor_tooltip),
context,
view_type_prop, view_size_prop);
}
@@ -217,7 +222,7 @@ mybrush_box_new (GimpContainer *container,
"gimp-mypaint-brush-grid|gimp-mypaint-brush-list",
GIMP_STOCK_BRUSH,
_("Open the MyPaint brush selection dialog"),
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -280,7 +285,7 @@ pattern_box_new (GimpContainer *container,
"gimp-pattern-grid|gimp-pattern-list",
GIMP_STOCK_PATTERN,
_("Open the pattern selection dialog"),
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -334,7 +339,8 @@ gradient_box_new (GimpContainer *container,
GimpViewType view_type,
GimpViewSize view_size,
const gchar *reverse_prop,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
GtkWidget *hbox;
GtkWidget *button;
@@ -348,7 +354,7 @@ gradient_box_new (GimpContainer *container,
"gimp-gradient-list|gimp-gradient-grid",
GIMP_STOCK_GRADIENT,
_("Open the gradient selection dialog"),
- editor_id);
+ editor_id, editor_tooltip);
children = gtk_container_get_children (GTK_CONTAINER (hbox));
button = children->data;
@@ -411,7 +417,7 @@ gimp_gradient_box_new (GimpContainer *container,
return gradient_box_new (container, context, label, spacing,
GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_LARGE,
reverse_prop,
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -422,7 +428,8 @@ gimp_prop_gradient_box_new (GimpContainer *container,
const gchar *view_type_prop,
const gchar *view_size_prop,
const gchar *reverse_prop,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
GimpViewType view_type;
GimpViewSize view_size;
@@ -439,7 +446,7 @@ gimp_prop_gradient_box_new (GimpContainer *container,
return view_props_connect (gradient_box_new (container, context, label, spacing,
view_type, view_size,
reverse_prop,
- editor_id),
+ editor_id, editor_tooltip),
context,
view_type_prop, view_size_prop);
}
@@ -454,7 +461,8 @@ palette_box_new (GimpContainer *container,
gint spacing,
GimpViewType view_type,
GimpViewSize view_size,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
if (! container)
container = gimp_data_factory_get_container (context->gimp->palette_factory);
@@ -464,7 +472,7 @@ palette_box_new (GimpContainer *container,
"gimp-palette-list|gimp-palette-grid",
GIMP_STOCK_PALETTE,
_("Open the palette selection dialog"),
- editor_id);
+ editor_id, editor_tooltip);
}
GtkWidget *
@@ -479,7 +487,7 @@ gimp_palette_box_new (GimpContainer *container,
return palette_box_new (container, context, label, spacing,
GIMP_VIEW_TYPE_LIST, GIMP_VIEW_SIZE_MEDIUM,
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -489,7 +497,8 @@ gimp_prop_palette_box_new (GimpContainer *container,
gint spacing,
const gchar *view_type_prop,
const gchar *view_size_prop,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
GimpViewType view_type;
GimpViewSize view_size;
@@ -505,7 +514,7 @@ gimp_prop_palette_box_new (GimpContainer *container,
return view_props_connect (palette_box_new (container, context, label, spacing,
view_type, view_size,
- editor_id),
+ editor_id, editor_tooltip),
context,
view_type_prop, view_size_prop);
}
@@ -529,7 +538,7 @@ font_box_new (GimpContainer *container,
"gimp-font-list|gimp-font-grid",
"gtk-select-font",
_("Open the font selection dialog"),
- NULL);
+ NULL, NULL);
}
GtkWidget *
@@ -586,7 +595,8 @@ gimp_viewable_box_new (GimpContainer *container,
const gchar *dialog_identifier,
const gchar *dialog_icon_name,
const gchar *dialog_tooltip,
- const gchar *editor_id)
+ const gchar *editor_id,
+ const gchar *editor_tooltip)
{
GtkWidget *hbox;
GtkWidget *button;
@@ -655,6 +665,9 @@ gimp_viewable_box_new (GimpContainer *container,
gtk_box_pack_end (GTK_BOX (entry_hbox), edit_button, FALSE, FALSE, 0);
gtk_widget_show (edit_button);
+ if (editor_tooltip)
+ gimp_help_set_help_data (edit_button, editor_tooltip, NULL);
+
image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT,
GTK_ICON_SIZE_BUTTON);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 1.0);
diff --git a/app/widgets/gimpviewablebox.h b/app/widgets/gimpviewablebox.h
index f434d73..8ac22be 100644
--- a/app/widgets/gimpviewablebox.h
+++ b/app/widgets/gimpviewablebox.h
@@ -29,7 +29,8 @@ GtkWidget * gimp_prop_brush_box_new (GimpContainer *container,
gint spacing,
const gchar *view_type_prop,
const gchar *view_size_prop,
- const gchar *editor_id);
+ const gchar *editor_id,
+ const gchar *editor_tooltip);
GtkWidget * gimp_dynamics_box_new (GimpContainer *container,
GimpContext *context,
const gchar *label,
@@ -40,7 +41,8 @@ GtkWidget * gimp_prop_dynamics_box_new (GimpContainer *container,
gint spacing,
const gchar *view_type_prop,
const gchar *view_size_prop,
- const gchar *editor_id);
+ const gchar *editor_id,
+ const gchar *editor_tooltip);
GtkWidget * gimp_mybrush_box_new (GimpContainer *container,
GimpContext *context,
@@ -76,7 +78,8 @@ GtkWidget * gimp_prop_gradient_box_new (GimpContainer *container,
const gchar *view_type_prop,
const gchar *view_size_prop,
const gchar *reverse_prop,
- const gchar *editor_id);
+ const gchar *editor_id,
+ const gchar *editor_tooltip);
GtkWidget * gimp_palette_box_new (GimpContainer *container,
GimpContext *context,
@@ -88,7 +91,8 @@ GtkWidget * gimp_prop_palette_box_new (GimpContainer *container,
gint spacing,
const gchar *view_type_prop,
const gchar *view_size_prop,
- const gchar *editor_id);
+ const gchar *editor_id,
+ const gchar *editor_tooltip);
GtkWidget * gimp_font_box_new (GimpContainer *container,
GimpContext *context,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
