[gtk+/composite-templates-new: 27/30] GtkColorEditor: Define children with a GtkBuilder template
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/composite-templates-new: 27/30] GtkColorEditor: Define children with a GtkBuilder template
- Date: Sat, 30 Mar 2013 08:46:33 +0000 (UTC)
commit d8588351eaf0938c75012615785596b35014329c
Author: Tristan Van Berkom <tristanvb openismus com>
Date: Fri Mar 29 21:47:38 2013 +0900
GtkColorEditor: Define children with a GtkBuilder template
gtk/Makefile.am | 1 +
gtk/gtk.gresource.xml | 1 +
gtk/gtkcoloreditor.c | 224 ++++++++-----------------------
gtk/gtkcoloreditor.ui | 356 +++++++++++++++++++++++++++++++++++++++++++++++++
gtk/tests/templates.c | 1 +
po/POTFILES.in | 1 +
6 files changed, 420 insertions(+), 164 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f92cddf..5565693 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1100,6 +1100,7 @@ COMPOSITE_TEMPLATES = \
gtkappchooserwidget.ui \
gtkassistant.ui \
gtkcolorchooserdialog.ui \
+ gtkcoloreditor.ui \
gtkdialog.ui \
gtkfilechooserdefault.ui \
gtkfilechooserdialog.ui \
diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml
index df69ba7..d2f26ea 100644
--- a/gtk/gtk.gresource.xml
+++ b/gtk/gtk.gresource.xml
@@ -16,6 +16,7 @@
<file>gtkappchooserwidget.ui</file>
<file>gtkassistant.ui</file>
<file>gtkcolorchooserdialog.ui</file>
+ <file>gtkcoloreditor.ui</file>
<file>gtkdialog.ui</file>
<file>gtkfilechooserdefault.ui</file>
<file>gtkfilechooserdialog.ui</file>
diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c
index de522c6..d3925c5 100644
--- a/gtk/gtkcoloreditor.c
+++ b/gtk/gtkcoloreditor.c
@@ -339,39 +339,9 @@ popup_draw (GtkWidget *popup,
return FALSE;
}
-static GtkWidget *
-create_popup (GtkColorEditor *editor,
- GtkWidget *attach,
- GtkWidget *contents)
-{
- GtkWidget *popup;
-
- g_object_set (contents, "margin", 12, NULL);
-
- popup = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_style_context_add_class (gtk_widget_get_style_context (popup), GTK_STYLE_CLASS_TOOLTIP);
- gtk_container_add (GTK_CONTAINER (popup), contents);
-
- gtk_widget_show_all (contents);
- gtk_widget_set_no_show_all (popup, TRUE);
-
- g_signal_connect (popup, "draw", G_CALLBACK (popup_draw), editor);
-
- gtk_overlay_add_overlay (GTK_OVERLAY (editor->priv->overlay), popup);
- g_signal_connect (attach, "popup-menu", G_CALLBACK (popup_edit), editor);
-
- return popup;
-}
-
static void
gtk_color_editor_init (GtkColorEditor *editor)
{
- GtkWidget *grid;
- GtkWidget *slider;
- GtkWidget *entry;
- GtkWidget *swatch;
- GtkAdjustment *h_adj, *s_adj, *v_adj, *a_adj;
- AtkObject *atk_obj;
GdkRGBA transparent = { 0, 0, 0, 0 };
editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor,
@@ -379,136 +349,41 @@ gtk_color_editor_init (GtkColorEditor *editor)
GtkColorEditorPrivate);
editor->priv->use_alpha = TRUE;
- editor->priv->h_adj = h_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0);
- editor->priv->s_adj = s_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0);
- editor->priv->v_adj = v_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0);
- editor->priv->a_adj = a_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0);
-
- g_object_ref_sink (h_adj);
- g_object_ref_sink (s_adj);
- g_object_ref_sink (v_adj);
- g_object_ref_sink (a_adj);
-
- g_signal_connect_swapped (h_adj, "value-changed", G_CALLBACK (hsv_changed), editor);
- g_signal_connect_swapped (s_adj, "value-changed", G_CALLBACK (hsv_changed), editor);
- g_signal_connect_swapped (v_adj, "value-changed", G_CALLBACK (hsv_changed), editor);
- g_signal_connect_swapped (a_adj, "value-changed", G_CALLBACK (hsv_changed), editor);
-
- /* Construct the main UI */
- editor->priv->swatch = swatch = gtk_color_swatch_new ();
- gtk_color_swatch_set_selectable (GTK_COLOR_SWATCH (editor->priv->swatch), FALSE);
- gtk_widget_set_events (swatch, gtk_widget_get_events (swatch)
+ g_type_ensure (GTK_TYPE_COLOR_SCALE);
+ g_type_ensure (GTK_TYPE_COLOR_PLANE);
+ g_type_ensure (GTK_TYPE_COLOR_SWATCH);
+ gtk_widget_init_template (GTK_WIDGET (editor));
+
+ /* Some post processing is needed in code to set this up */
+ gtk_widget_set_events (editor->priv->swatch,
+ gtk_widget_get_events (editor->priv->swatch)
& ~(GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK
| GDK_KEY_PRESS_MASK
| GDK_KEY_RELEASE_MASK));
- gtk_widget_set_can_focus (swatch, FALSE);
-
- editor->priv->entry = entry = gtk_entry_new ();
- atk_obj = gtk_widget_get_accessible (entry);
- atk_object_set_role (atk_obj, ATK_ROLE_ENTRY);
- atk_object_set_name (atk_obj, _("Color Name"));
- g_signal_connect (entry, "activate", G_CALLBACK (entry_apply), editor);
- g_signal_connect (entry, "notify::text", G_CALLBACK (entry_text_changed), editor);
- g_signal_connect (entry, "focus-out-event", G_CALLBACK (entry_focus_out), editor);
-
- editor->priv->h_slider = slider = gtk_color_scale_new (h_adj, GTK_COLOR_SCALE_HUE);
- gtk_orientable_set_orientation (GTK_ORIENTABLE (slider), GTK_ORIENTATION_VERTICAL);
- if (gtk_widget_get_direction (slider) == GTK_TEXT_DIR_RTL)
- gtk_style_context_add_class (gtk_widget_get_style_context (slider),
+
+ if (gtk_widget_get_direction (editor->priv->h_slider) == GTK_TEXT_DIR_RTL)
+ gtk_style_context_add_class (gtk_widget_get_style_context (editor->priv->h_slider),
GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE);
else
- gtk_style_context_add_class (gtk_widget_get_style_context (slider),
+ gtk_style_context_add_class (gtk_widget_get_style_context (editor->priv->h_slider),
GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW);
- editor->priv->sv_plane = gtk_color_plane_new (h_adj, s_adj, v_adj);
- gtk_widget_set_size_request (editor->priv->sv_plane, 300, 300);
-
- editor->priv->a_slider = slider = gtk_color_scale_new (a_adj, GTK_COLOR_SCALE_ALPHA);
- gtk_orientable_set_orientation (GTK_ORIENTABLE (slider), GTK_ORIENTATION_HORIZONTAL);
- gtk_style_context_add_class (gtk_widget_get_style_context (slider),
- GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE);
-
- editor->priv->grid = grid = gtk_grid_new ();
- gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
- gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-
- gtk_grid_attach (GTK_GRID (grid), editor->priv->swatch, 1, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->entry, 2, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->h_slider, 0, 1, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->sv_plane, 1, 1, 2, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->a_slider, 1, 2, 2, 1);
-
- /* This extra margin is necessary so we have room to the sides
- * to place the popups as desired
- */
- gtk_widget_set_margin_left (grid, 30);
- gtk_widget_set_margin_right (grid, 30);
-
- editor->priv->overlay = gtk_overlay_new ();
gtk_widget_override_background_color (editor->priv->overlay, 0, &transparent);
- gtk_container_add (GTK_CONTAINER (editor->priv->overlay), grid);
-
- /* Construct the sv popup */
- editor->priv->s_entry = entry = gtk_spin_button_new (scaled_adjustment (s_adj, 100), 1, 0);
- atk_obj = gtk_widget_get_accessible (entry);
- atk_object_set_name (atk_obj, C_("Color channel", "Saturation"));
- atk_object_set_role (atk_obj, ATK_ROLE_ENTRY);
- g_signal_connect (entry, "key-press-event", G_CALLBACK (popup_key_press), editor);
-
- editor->priv->v_entry = entry = gtk_spin_button_new (scaled_adjustment (v_adj, 100), 1, 0);
- atk_obj = gtk_widget_get_accessible (entry);
- atk_object_set_name (atk_obj, C_("Color channel", "Value"));
- atk_object_set_role (atk_obj, ATK_ROLE_ENTRY);
- g_signal_connect (entry, "key-press-event", G_CALLBACK (popup_key_press), editor);
- grid = gtk_grid_new ();
- gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
- gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-
- gtk_grid_attach (GTK_GRID (grid), gtk_label_new (C_("Color channel", "S")), 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->s_entry, 1, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), gtk_label_new (C_("Color channel", "V")), 0, 1, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->v_entry, 1, 1, 1, 1);
-
- editor->priv->sv_popup = create_popup (editor, editor->priv->sv_plane, grid);
-
- /* Construct the h popup */
- editor->priv->h_entry = entry = gtk_spin_button_new (scaled_adjustment (h_adj, 100), 1, 0);
- atk_obj = gtk_widget_get_accessible (entry);
- atk_object_set_name (atk_obj, C_("Color channel", "Hue"));
- atk_object_set_role (atk_obj, ATK_ROLE_ENTRY);
- g_signal_connect (entry, "key-press-event", G_CALLBACK (popup_key_press), editor);
-
- grid = gtk_grid_new ();
- gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-
- gtk_grid_attach (GTK_GRID (grid), gtk_label_new (C_("Color channel", "H")), 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->h_entry, 1, 0, 1, 1);
-
- editor->priv->h_popup = create_popup (editor, editor->priv->h_slider, grid);
-
- /* Construct the a popup */
- editor->priv->a_entry = entry = gtk_spin_button_new (scaled_adjustment (a_adj, 100), 1, 0);
- atk_obj = gtk_widget_get_accessible (entry);
- atk_object_set_name (atk_obj, C_("Color channel", "Alpha"));
- atk_object_set_role (atk_obj, ATK_ROLE_ENTRY);
- g_signal_connect (entry, "key-press-event", G_CALLBACK (popup_key_press), editor);
-
- grid = gtk_grid_new ();
- gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-
- gtk_grid_attach (GTK_GRID (grid), gtk_label_new (C_("Color channel", "A")), 0, 0, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), editor->priv->a_entry, 1, 0, 1, 1);
-
- editor->priv->a_popup = create_popup (editor, editor->priv->a_slider, grid);
-
- /* Hook up popup positioning */
- g_signal_connect (editor->priv->overlay, "get-child-position", G_CALLBACK (get_child_position), editor);
- g_signal_connect (editor, "notify::visible", G_CALLBACK (dismiss_current_popup), NULL);
-
- gtk_widget_show_all (editor->priv->overlay);
- gtk_container_add (GTK_CONTAINER (editor), editor->priv->overlay);
+ /* Create the scaled popup adjustments manually here because connecting user data is not
+ * supported by template GtkBuilder xml (it would be possible to set this up in the xml
+ * but require 4 separate callbacks and would be rather ugly).
+ */
+ gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (editor->priv->h_entry), scaled_adjustment
(editor->priv->h_adj, 100));
+ gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (editor->priv->s_entry), scaled_adjustment
(editor->priv->s_adj, 100));
+ gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (editor->priv->v_entry), scaled_adjustment
(editor->priv->v_adj, 100));
+ gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (editor->priv->a_entry), scaled_adjustment
(editor->priv->a_adj, 100));
+
+ /* This can be setup in the .ui file, but requires work in Glade otherwise it cannot be edited there */
+ gtk_overlay_add_overlay (GTK_OVERLAY (editor->priv->overlay), editor->priv->sv_popup);
+ gtk_overlay_add_overlay (GTK_OVERLAY (editor->priv->overlay), editor->priv->h_popup);
+ gtk_overlay_add_overlay (GTK_OVERLAY (editor->priv->overlay), editor->priv->a_popup);
}
static void
@@ -574,30 +449,51 @@ gtk_color_editor_set_property (GObject *object,
}
static void
-gtk_color_editor_finalize (GObject *object)
-{
- GtkColorEditor *editor = GTK_COLOR_EDITOR (object);
-
- g_clear_object (&editor->priv->h_adj);
- g_clear_object (&editor->priv->s_adj);
- g_clear_object (&editor->priv->v_adj);
- g_clear_object (&editor->priv->a_adj);
-
- G_OBJECT_CLASS (gtk_color_editor_parent_class)->finalize (object);
-}
-
-static void
gtk_color_editor_class_init (GtkColorEditorClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- object_class->finalize = gtk_color_editor_finalize;
object_class->get_property = gtk_color_editor_get_property;
object_class->set_property = gtk_color_editor_set_property;
g_object_class_override_property (object_class, PROP_RGBA, "rgba");
g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha");
+ /* Bind class to template
+ */
+ gtk_widget_class_set_template_from_resource (widget_class,
+ "/org/gtk/libgtk/gtkcoloreditor.ui");
+
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, overlay);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, grid);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, swatch);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, entry);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, h_slider);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, h_popup);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, h_entry);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, a_slider);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, a_popup);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, a_entry);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, sv_plane);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, sv_popup);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, s_entry);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, v_entry);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, h_adj);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, s_adj);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, v_adj);
+ gtk_widget_class_bind_child (widget_class, GtkColorEditorPrivate, a_adj);
+
+ gtk_widget_class_bind_callback (widget_class, hsv_changed);
+ gtk_widget_class_bind_callback (widget_class, popup_draw);
+ gtk_widget_class_bind_callback (widget_class, popup_key_press);
+ gtk_widget_class_bind_callback (widget_class, dismiss_current_popup);
+ gtk_widget_class_bind_callback (widget_class, get_child_position);
+ gtk_widget_class_bind_callback (widget_class, entry_text_changed);
+ gtk_widget_class_bind_callback (widget_class, entry_apply);
+ gtk_widget_class_bind_callback (widget_class, entry_focus_out);
+ gtk_widget_class_bind_callback (widget_class, popup_edit);
+
g_type_class_add_private (class, sizeof (GtkColorEditorPrivate));
}
diff --git a/gtk/gtkcoloreditor.ui b/gtk/gtkcoloreditor.ui
new file mode 100644
index 0000000..3f8ebe4
--- /dev/null
+++ b/gtk/gtkcoloreditor.ui
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="gtk30">
+ <!-- interface-requires gtk+ 3.10 -->
+ <!-- interface-requires gtkprivate 3.10 -->
+ <object class="GtkAdjustment" id="a_adj">
+ <property name="upper">1</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ <signal name="value-changed" handler="hsv_changed" swapped="yes"/>
+ </object>
+ <object class="GtkAdjustment" id="h_adj">
+ <property name="upper">1</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ <signal name="value-changed" handler="hsv_changed" swapped="yes"/>
+ </object>
+ <object class="GtkAdjustment" id="s_adj">
+ <property name="upper">1</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ <signal name="value-changed" handler="hsv_changed" swapped="yes"/>
+ </object>
+ <object class="GtkAdjustment" id="v_adj">
+ <property name="upper">1</property>
+ <property name="step_increment">0.01</property>
+ <property name="page_increment">0.10000000000000001</property>
+ <signal name="value-changed" handler="hsv_changed" swapped="yes"/>
+ </object>
+ <template class="GtkColorEditor" parent="GtkBox">
+ <signal name="notify::visible" handler="dismiss_current_popup" swapped="no"/>
+ <child>
+ <object class="GtkOverlay" id="overlay">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="get-child-position" handler="get_child_position" swapped="no"/>
+ <child>
+ <object class="GtkGrid" id="grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">30</property>
+ <property name="margin_right">30</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkColorSwatch" id="swatch">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="rgba">rgb(255,255,255)</property>
+ <property name="selectable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="entry-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
+ </object>
+ </child>
+ <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
+ <signal name="activate" handler="entry_apply" swapped="no"/>
+ <signal name="focus-out-event" handler="entry_focus_out" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorScale" id="h_slider">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
+ <property name="adjustment">h_adj</property>
+ <property name="draw_value">False</property>
+ <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorScale" id="a_slider">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">a_adj</property>
+ <property name="draw_value">False</property>
+ <property name="scale_type">1</property>
+ <style>
+ <class name="scale-has-marks-above"/>
+ </style>
+ <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkColorPlane" id="sv_plane">
+ <property name="width_request">300</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="h_adjustment">h_adj</property>
+ <property name="s_adjustment">s_adj</property>
+ <property name="v_adjustment">v_adj</property>
+ <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </template>
+ <object class="GtkBox" id="a_popup">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <style>
+ <class name="tooltip"/>
+ </style>
+ <signal name="draw" handler="popup_draw" swapped="no"/>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="Color channel">A</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="a_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="climb_rate">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a_entry-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
+ </object>
+ </child>
+ <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkBox" id="h_popup">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <style>
+ <class name="tooltip"/>
+ </style>
+ <signal name="draw" handler="popup_draw" swapped="no"/>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="Color channel">H</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="h_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="climb_rate">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="h_entry-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
+ </object>
+ </child>
+ <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkBox" id="sv_popup">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <style>
+ <class name="tooltip"/>
+ </style>
+ <signal name="draw" handler="popup_draw" swapped="no"/>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="Color Channel">S</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="Color Channel">V</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="s_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="climb_rate">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="s_entry-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
+ </object>
+ </child>
+ <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="v_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="climb_rate">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="v_entry-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Value</property>
+ </object>
+ </child>
+ <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/gtk/tests/templates.c b/gtk/tests/templates.c
index 6d6d6ef..e7adca3 100644
--- a/gtk/tests/templates.c
+++ b/gtk/tests/templates.c
@@ -166,6 +166,7 @@ test_color_chooser_dialog_basic (void)
{
GtkWidget *widget;
+ /* This test also tests the internal GtkColorEditor widget */
widget = gtk_color_chooser_dialog_new (NULL, NULL);
g_assert (GTK_IS_COLOR_CHOOSER_DIALOG (widget));
gtk_widget_destroy (widget);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 69b42cb..dee2a83 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -279,6 +279,7 @@ modules/printbackends/test/gtkprintbackendtest.c
[type: gettext/glade]gtk/gtkappchooserwidget.ui
[type: gettext/glade]gtk/gtkassistant.ui
[type: gettext/glade]gtk/gtkcolorchooserdialog.ui
+[type: gettext/glade]gtk/gtkcoloreditor.ui
[type: gettext/glade]gtk/gtkdialog.ui
[type: gettext/glade]gtk/gtkfilechooserdedault.ui
[type: gettext/glade]gtk/gtkfilechooserdialog.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
