[gimp] app, libgimpwidgets: all GimpColorHexEntries should have the same tooltip



commit 2b8b780b6a6c43e882f8375fc4090887d914a547
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jun 24 14:19:25 2018 +0200

    app, libgimpwidgets: all GimpColorHexEntries should have the same tooltip
    
    Set the tooltip in GimpColorHexEntry itself and remove all other
    tooltip setting. This just moves the translatable string sround in
    libgimpwidgets/, and even removes it from app/.

 app/widgets/gimpcoloreditor.c       | 4 ----
 app/widgets/gimpcolormapeditor.c    | 1 -
 libgimpwidgets/gimpcolorhexentry.c  | 8 ++++++++
 libgimpwidgets/gimpcolorselection.c | 4 ----
 po-libgimp/POTFILES.in              | 1 +
 5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c
index cfe3121d32..fbcda7e3b2 100644
--- a/app/widgets/gimpcoloreditor.c
+++ b/app/widgets/gimpcoloreditor.c
@@ -263,10 +263,6 @@ gimp_color_editor_init (GimpColorEditor *editor)
 
   /*  The hex triplet entry  */
   editor->hex_entry = gimp_color_hex_entry_new ();
-  gimp_help_set_help_data (editor->hex_entry,
-                           _("Hexadecimal color notation as used in HTML and "
-                             "CSS.  This entry also accepts CSS color names."),
-                           NULL);
   gtk_box_pack_end (GTK_BOX (vbox), editor->hex_entry, FALSE, FALSE, 0);
   gtk_widget_show (editor->hex_entry);
 
diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c
index c405f5183b..a8c818ebf2 100644
--- a/app/widgets/gimpcolormapeditor.c
+++ b/app/widgets/gimpcolormapeditor.c
@@ -216,7 +216,6 @@ gimp_colormap_editor_init (GimpColormapEditor *editor)
 
   editor->color_entry = gimp_color_hex_entry_new ();
   gtk_widget_set_halign (editor->color_entry, GTK_ALIGN_START);
-  gtk_entry_set_width_chars (GTK_ENTRY (editor->color_entry), 12);
   gimp_grid_attach_aligned (GTK_GRID (grid), 0, 1,
                             _("HTML notation:"), 0.0, 0.5,
                             editor->color_entry, 1);
diff --git a/libgimpwidgets/gimpcolorhexentry.c b/libgimpwidgets/gimpcolorhexentry.c
index 25a8ffb5d4..1fff8a8ea7 100644
--- a/libgimpwidgets/gimpcolorhexentry.c
+++ b/libgimpwidgets/gimpcolorhexentry.c
@@ -33,6 +33,9 @@
 
 #include "gimpcellrenderercolor.h"
 #include "gimpcolorhexentry.h"
+#include "gimphelpui.h"
+
+#include "libgimp/libgimp-intl.h"
 
 
 /**
@@ -131,6 +134,11 @@ gimp_color_hex_entry_init (GimpColorHexEntry *entry)
    */
   gtk_entry_set_width_chars (GTK_ENTRY (entry), 8);
 
+  gimp_help_set_help_data (GTK_WIDGET (entry),
+                           _("Hexadecimal color notation as used in HTML and "
+                             "CSS.  This entry also accepts CSS color names."),
+                           NULL);
+
   gimp_rgba_set (&private->color, 0.0, 0.0, 0.0, 1.0);
 
   store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, GIMP_TYPE_RGB);
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index 685bad38a1..293d324567 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -341,10 +341,6 @@ gimp_color_selection_init (GimpColorSelection *selection)
 
   /* The hex triplet entry */
   entry = gimp_color_hex_entry_new ();
-  gimp_help_set_help_data (entry,
-                           _("Hexadecimal color notation as used in HTML and "
-                             "CSS.  This entry also accepts CSS color names."),
-                           NULL);
   gtk_box_pack_end (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
   gtk_widget_show (entry);
 
diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in
index dc9313441d..f145393259 100644
--- a/po-libgimp/POTFILES.in
+++ b/po-libgimp/POTFILES.in
@@ -38,6 +38,7 @@ libgimpthumb/gimpthumbnail.c
 
 libgimpwidgets/gimpbrowser.c
 libgimpwidgets/gimpcolorbutton.c
+libgimpwidgets/gimpcolorhexentry.c
 libgimpwidgets/gimpcolorprofilechooserdialog.c
 libgimpwidgets/gimpcolorprofilestore.c
 libgimpwidgets/gimpcolorprofileview.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]