[gtk+] font chooser: Move buttons to template
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] font chooser: Move buttons to template
- Date: Wed, 9 Jul 2014 23:49:33 +0000 (UTC)
commit 9aad874fadd2486ed96a8b69038ac5b6ddfc15c1
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jul 9 19:43:20 2014 -0400
font chooser: Move buttons to template
Use the new builder dialog action support.
gtk/gtkfontchooserdialog.c | 6 +-----
gtk/resources/ui/gtkfontchooserdialog.ui | 19 +++++++++++++++++++
gtk/resources/ui/gtkfontchooserdialog.ui.h | 2 ++
3 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
index 2b82640..1931a86 100644
--- a/gtk/gtkfontchooserdialog.c
+++ b/gtk/gtkfontchooserdialog.c
@@ -151,11 +151,7 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *fontchooserdiag)
gtk_widget_init_template (GTK_WIDGET (fontchooserdiag));
gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (fontchooserdiag));
- gtk_dialog_add_buttons (GTK_DIALOG (fontchooserdiag),
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_Select"), GTK_RESPONSE_OK,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (fontchooserdiag), GTK_RESPONSE_OK);
+
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_dialog_set_alternative_button_order (GTK_DIALOG (fontchooserdiag),
GTK_RESPONSE_OK,
diff --git a/gtk/resources/ui/gtkfontchooserdialog.ui b/gtk/resources/ui/gtkfontchooserdialog.ui
index a1dea23..61e6ea5 100644
--- a/gtk/resources/ui/gtkfontchooserdialog.ui
+++ b/gtk/resources/ui/gtkfontchooserdialog.ui
@@ -28,5 +28,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/gtkfontchooserdialog.ui.h b/gtk/resources/ui/gtkfontchooserdialog.ui.h
index 3078a6d..2996d84 100644
--- a/gtk/resources/ui/gtkfontchooserdialog.ui.h
+++ b/gtk/resources/ui/gtkfontchooserdialog.ui.h
@@ -1 +1,3 @@
N_("Select Font");
+N_("_Cancel");
+N_("_Select");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]