[gtk+] color chooser: Move buttons to template
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] color chooser: Move buttons to template
- Date: Wed, 9 Jul 2014 23:49:23 +0000 (UTC)
commit ee06083c6bde9e9b73054d98838feed6b9a244fc
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jul 9 19:39:19 2014 -0400
color chooser: Move buttons to template
We can now use the new builder action support.
gtk/gtkcolorchooserdialog.c | 8 ++------
gtk/resources/ui/gtkcolorchooserdialog.ui | 19 +++++++++++++++++++
gtk/resources/ui/gtkcolorchooserdialog.ui.h | 2 ++
3 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c
index ce09783..176f939 100644
--- a/gtk/gtkcolorchooserdialog.c
+++ b/gtk/gtkcolorchooserdialog.c
@@ -106,11 +106,6 @@ gtk_color_chooser_dialog_init (GtkColorChooserDialog *cc)
gtk_widget_init_template (GTK_WIDGET (cc));
gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (cc));
- gtk_dialog_add_buttons (GTK_DIALOG (cc),
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_Select"), GTK_RESPONSE_OK,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (cc), GTK_RESPONSE_OK);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_dialog_set_alternative_button_order (GTK_DIALOG (cc),
@@ -130,7 +125,8 @@ gtk_color_chooser_dialog_map (GtkWidget *widget)
* even if it was showing the editor the last time it was used.
*/
g_object_set (GTK_COLOR_CHOOSER_DIALOG (widget)->priv->chooser,
- "show-editor", FALSE, NULL);
+ "show-editor", FALSE,
+ NULL);
GTK_WIDGET_CLASS (gtk_color_chooser_dialog_parent_class)->map (widget);
}
diff --git a/gtk/resources/ui/gtkcolorchooserdialog.ui b/gtk/resources/ui/gtkcolorchooserdialog.ui
index 1d83b26..1ad6d49 100644
--- a/gtk/resources/ui/gtkcolorchooserdialog.ui
+++ b/gtk/resources/ui/gtkcolorchooserdialog.ui
@@ -31,5 +31,24 @@
</child>
</object>
</child>
+ <child type="action">
+ <object class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="use_underline">True</property>
+ <property name="label" translatable="yes">_Cancel</property>
+ </object>
+ </child>
+ <child type="action">
+ <object class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Select</property>
+ <property name="use_underline">True</property>
+ <property name="can_default">True</property>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="cancel">cancel_button</action-widget>
+ <action-widget response="ok" default="true">ok_button</action-widget>
+ </action-widgets>
</template>
</interface>
diff --git a/gtk/resources/ui/gtkcolorchooserdialog.ui.h b/gtk/resources/ui/gtkcolorchooserdialog.ui.h
index bc17571..af0ef00 100644
--- a/gtk/resources/ui/gtkcolorchooserdialog.ui.h
+++ b/gtk/resources/ui/gtkcolorchooserdialog.ui.h
@@ -1 +1,3 @@
N_("Select a Color");
+N_("_Cancel");
+N_("_Select");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]