[gtk+/composite-templates-new: 21/26] GtkFontChooserWidget: 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: 21/26] GtkFontChooserWidget: Define children with a GtkBuilder template
- Date: Thu, 28 Mar 2013 08:34:15 +0000 (UTC)
commit 0c89076b0c6166842aa9fef86b07606c5c3892a8
Author: Tristan Van Berkom <tristanvb openismus com>
Date: Tue Mar 26 18:50:01 2013 +0900
GtkFontChooserWidget: Define children with a GtkBuilder template
gtk/Makefile.am | 1 +
gtk/gtk.gresource.xml | 1 +
gtk/gtkfontchooserwidget.c | 249 +++++++++++++------------------------------
gtk/gtkfontchooserwidget.ui | 189 ++++++++++++++++++++++++++++++++
gtk/tests/templates.c | 11 ++
po/POTFILES.in | 1 +
6 files changed, 278 insertions(+), 174 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 00a7d89..7fea3c6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1103,6 +1103,7 @@ COMPOSITE_TEMPLATES = \
gtkdialog.ui \
gtkfilechooserdefault.ui \
gtkfilechooserdialog.ui \
+ gtkfontchooserwidget.ui \
gtkinfobar.ui \
gtklockbutton.ui \
gtkmessagedialog.ui \
diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml
index ace43a7..94333c7 100644
--- a/gtk/gtk.gresource.xml
+++ b/gtk/gtk.gresource.xml
@@ -19,6 +19,7 @@
<file>gtkdialog.ui</file>
<file>gtkfilechooserdefault.ui</file>
<file>gtkfilechooserdialog.ui</file>
+ <file>gtkfontchooserwidget.ui</file>
<file>gtkinfobar.ui</file>
<file>gtklockbutton.ui</file>
<file>gtkmessagedialog.ui</file>
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 7454a35..28fcd44 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -75,9 +75,9 @@ struct _GtkFontChooserWidgetPrivate
{
GtkWidget *search_entry;
GtkWidget *family_face_list;
+ GtkTreeViewColumn *family_face_column;
GtkCellRenderer *family_face_cell;
GtkWidget *list_scrolled_window;
- GtkWidget *empty_list;
GtkWidget *list_notebook;
GtkTreeModel *model;
GtkTreeModel *filter_model;
@@ -107,8 +107,7 @@ struct _GtkFontChooserWidgetPrivate
#define FONT_STYLE_LIST_WIDTH 170
#define FONT_SIZE_LIST_WIDTH 60
-#define NO_FONT_MATCHED_SEARCH N_("No fonts matched your search. You can revise your search and try again.")
-
+/* Keep in line with GtkTreeStore defined in gtkfontchooserwidget.ui */
enum {
FAMILY_COLUMN,
FACE_COLUMN,
@@ -129,8 +128,6 @@ static void gtk_font_chooser_widget_finalize (GObject *objec
static void gtk_font_chooser_widget_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen);
-static void gtk_font_chooser_widget_bootstrap_fontlist (GtkFontChooserWidget *fontchooser);
-
static gboolean gtk_font_chooser_widget_find_font (GtkFontChooserWidget *fontchooser,
const PangoFontDescription *font_desc,
GtkTreeIter *iter);
@@ -156,6 +153,17 @@ static gboolean gtk_font_chooser_widget_get_show_preview_entry (GtkFontChooserWi
static void gtk_font_chooser_widget_set_show_preview_entry (GtkFontChooserWidget *fontchooser,
gboolean show_preview_entry);
+static void gtk_font_chooser_widget_set_cell_size (GtkFontChooserWidget *fontchooser);
+static void gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser);
+static gboolean visible_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data);
+static void gtk_font_chooser_widget_cell_data_func (GtkTreeViewColumn *column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer user_data);
+
static void gtk_font_chooser_widget_iface_init (GtkFontChooserIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkFontChooserWidget, gtk_font_chooser_widget, GTK_TYPE_BOX,
@@ -163,23 +171,6 @@ G_DEFINE_TYPE_WITH_CODE (GtkFontChooserWidget, gtk_font_chooser_widget, GTK_TYPE
gtk_font_chooser_widget_iface_init))
static void
-gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
- widget_class->screen_changed = gtk_font_chooser_widget_screen_changed;
-
- gobject_class->finalize = gtk_font_chooser_widget_finalize;
- gobject_class->set_property = gtk_font_chooser_widget_set_property;
- gobject_class->get_property = gtk_font_chooser_widget_get_property;
-
- _gtk_font_chooser_install_properties (gobject_class);
-
- g_type_class_add_private (klass, sizeof (GtkFontChooserWidgetPrivate));
-}
-
-static void
gtk_font_chooser_widget_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -464,11 +455,53 @@ row_deleted_cb (GtkTreeModel *model,
}
static void
+gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ widget_class->screen_changed = gtk_font_chooser_widget_screen_changed;
+
+ gobject_class->finalize = gtk_font_chooser_widget_finalize;
+ gobject_class->set_property = gtk_font_chooser_widget_set_property;
+ gobject_class->get_property = gtk_font_chooser_widget_get_property;
+
+ _gtk_font_chooser_install_properties (gobject_class);
+
+ /* Bind class to template
+ */
+ gtk_widget_class_set_template_from_resource (widget_class,
+ "/org/gtk/libgtk/gtkfontchooserwidget.ui");
+
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, search_entry);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, family_face_list);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, family_face_column);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, family_face_cell);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, list_scrolled_window);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, list_notebook);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, model);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, filter_model);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, preview);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, size_spin);
+ gtk_widget_class_bind_child (widget_class, GtkFontChooserWidgetPrivate, size_slider);
+
+ gtk_widget_class_bind_callback (widget_class, text_changed_cb);
+ gtk_widget_class_bind_callback (widget_class, cursor_changed_cb);
+ gtk_widget_class_bind_callback (widget_class, row_activated_cb);
+ gtk_widget_class_bind_callback (widget_class, gtk_font_chooser_widget_set_cell_size);
+ gtk_widget_class_bind_callback (widget_class, zoom_preview_cb);
+ gtk_widget_class_bind_callback (widget_class, row_deleted_cb);
+ gtk_widget_class_bind_callback (widget_class, row_inserted_cb);
+ gtk_widget_class_bind_callback (widget_class, row_deleted_cb);
+ gtk_widget_class_bind_callback (widget_class, size_change_cb);
+
+ g_type_class_add_private (klass, sizeof (GtkFontChooserWidgetPrivate));
+}
+
+static void
gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser)
{
GtkFontChooserWidgetPrivate *priv;
- GtkWidget *scrolled_win;
- GtkWidget *grid;
fontchooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (fontchooser,
GTK_TYPE_FONT_CHOOSER_WIDGET,
@@ -476,115 +509,36 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser)
priv = fontchooser->priv;
+ gtk_widget_init_template (GTK_WIDGET (fontchooser));
+
/* Default preview string */
priv->preview_text = g_strdup (pango_language_get_sample_string (NULL));
priv->show_preview_entry = TRUE;
priv->font_desc = pango_font_description_new ();
- gtk_widget_push_composite_child ();
-
- /* Creating fundamental widgets for the private struct */
- priv->search_entry = gtk_search_entry_new ();
- priv->family_face_list = gtk_tree_view_new ();
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->family_face_list), FALSE);
- priv->preview = gtk_entry_new ();
- priv->size_slider = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
- 0.0,
- (gdouble)(G_MAXINT / PANGO_SCALE),
- 1.0);
-
- priv->size_spin = gtk_spin_button_new_with_range (0.0, (gdouble)(G_MAXINT / PANGO_SCALE), 1.0);
-
- /** Bootstrapping widget layout **/
- gtk_box_set_spacing (GTK_BOX (fontchooser), 6);
-
- /* Main font family/face view */
- priv->list_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- scrolled_win = priv->list_scrolled_window;
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win),
- GTK_SHADOW_ETCHED_IN);
- gtk_widget_set_size_request (scrolled_win, 400, 300);
- gtk_container_add (GTK_CONTAINER (scrolled_win), priv->family_face_list);
-
- /* Text to display when list is empty */
- priv->empty_list = gtk_label_new (_(NO_FONT_MATCHED_SEARCH));
- gtk_widget_set_margin_top (priv->empty_list, 12);
- gtk_widget_set_margin_left (priv->empty_list, 12);
- gtk_widget_set_margin_right (priv->empty_list, 12);
- gtk_widget_set_margin_bottom (priv->empty_list, 12);
- gtk_widget_set_halign (priv->empty_list, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (priv->empty_list, GTK_ALIGN_START);
-
- priv->list_notebook = gtk_notebook_new ();
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->list_notebook), FALSE);
- gtk_notebook_append_page (GTK_NOTEBOOK (priv->list_notebook), scrolled_win, NULL);
- gtk_notebook_append_page (GTK_NOTEBOOK (priv->list_notebook), priv->empty_list, NULL);
-
- /* Basic layout */
- grid = gtk_grid_new ();
-
- gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
- gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-
- gtk_grid_attach (GTK_GRID (grid), priv->search_entry, 0, 0, 2, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->list_notebook, 0, 1, 2, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->preview, 0, 2, 2, 1);
-
- gtk_grid_attach (GTK_GRID (grid), priv->size_slider, 0, 3, 1, 1);
- gtk_grid_attach (GTK_GRID (grid), priv->size_spin, 1, 3, 1, 1);
-
- gtk_widget_set_hexpand (GTK_WIDGET (scrolled_win), TRUE);
- gtk_widget_set_vexpand (GTK_WIDGET (scrolled_win), TRUE);
- gtk_widget_set_hexpand (GTK_WIDGET (priv->search_entry), TRUE);
-
- gtk_widget_set_hexpand (GTK_WIDGET (priv->size_slider), TRUE);
- gtk_widget_set_hexpand (GTK_WIDGET (priv->size_spin), FALSE);
-
- gtk_box_pack_start (GTK_BOX (fontchooser), grid, TRUE, TRUE, 0);
-
- gtk_widget_show_all (GTK_WIDGET (fontchooser));
- gtk_widget_hide (GTK_WIDGET (fontchooser));
-
- /* Treeview column and model bootstrapping */
- gtk_font_chooser_widget_bootstrap_fontlist (fontchooser);
-
/* Set default preview text */
gtk_entry_set_text (GTK_ENTRY (priv->preview),
pango_language_get_sample_string (NULL));
- gtk_entry_set_placeholder_text (GTK_ENTRY (priv->search_entry), _("Search font name"));
-
- /* Callback connections */
- g_signal_connect (priv->search_entry, "notify::text",
- G_CALLBACK (text_changed_cb), fontchooser);
-
- g_signal_connect (gtk_range_get_adjustment (GTK_RANGE (priv->size_slider)),
- "value-changed", G_CALLBACK (size_change_cb), fontchooser);
- g_signal_connect (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->size_spin)),
- "value-changed", G_CALLBACK (size_change_cb), fontchooser);
-
- g_signal_connect (priv->family_face_list, "cursor-changed",
- G_CALLBACK (cursor_changed_cb), fontchooser);
- g_signal_connect (priv->family_face_list, "row-activated",
- G_CALLBACK (row_activated_cb), fontchooser);
+ /* Set the upper values of the spin/scale with G_MAXINT / PANGO_SCALE */
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (priv->size_spin),
+ 0.0, (gdouble)(G_MAXINT / PANGO_SCALE));
+ gtk_adjustment_set_upper (gtk_range_get_adjustment (GTK_RANGE (priv->size_slider)),
+ (gdouble)(G_MAXINT / PANGO_SCALE));
- /* Zoom on preview scroll */
- g_signal_connect (priv->preview, "scroll-event",
- G_CALLBACK (zoom_preview_cb), fontchooser);
-
- g_signal_connect (priv->size_slider, "scroll-event",
- G_CALLBACK (zoom_preview_cb), fontchooser);
+ /* Setup treeview/model auxilary functions */
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter_model),
+ visible_func, (gpointer)priv, NULL);
- /* Font list empty hides the scrolledwindow */
- g_signal_connect (G_OBJECT (priv->filter_model), "row-deleted",
- G_CALLBACK (row_deleted_cb), fontchooser);
- g_signal_connect (G_OBJECT (priv->filter_model), "row-inserted",
- G_CALLBACK (row_inserted_cb), fontchooser);
+ gtk_tree_view_column_set_cell_data_func (priv->family_face_column,
+ priv->family_face_cell,
+ gtk_font_chooser_widget_cell_data_func,
+ fontchooser,
+ NULL);
- /* Set default focus */
- gtk_widget_pop_composite_child ();
+ /* Load data and set initial style dependant parameters */
+ gtk_font_chooser_widget_load_fonts (fontchooser);
+ gtk_font_chooser_widget_set_cell_size (fontchooser);
gtk_font_chooser_widget_take_font_desc (fontchooser, NULL);
}
@@ -852,59 +806,6 @@ gtk_font_chooser_widget_set_cell_size (GtkFontChooserWidget *fontchooser)
}
static void
-gtk_font_chooser_widget_bootstrap_fontlist (GtkFontChooserWidget *fontchooser)
-{
- GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
- GtkTreeView *treeview = GTK_TREE_VIEW (priv->family_face_list);
- GtkTreeViewColumn *col;
-
- g_signal_connect_data (priv->family_face_list,
- "style-updated",
- G_CALLBACK (gtk_font_chooser_widget_set_cell_size),
- fontchooser,
- NULL,
- G_CONNECT_AFTER | G_CONNECT_SWAPPED);
-
- priv->model = GTK_TREE_MODEL (gtk_list_store_new (4,
- PANGO_TYPE_FONT_FAMILY,
- PANGO_TYPE_FONT_FACE,
- PANGO_TYPE_FONT_DESCRIPTION,
- G_TYPE_STRING));
-
- priv->filter_model = gtk_tree_model_filter_new (priv->model, NULL);
- g_object_unref (priv->model);
-
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter_model),
- visible_func, (gpointer)priv, NULL);
-
- gtk_tree_view_set_model (treeview, priv->filter_model);
- g_object_unref (priv->filter_model);
-
- gtk_tree_view_set_rules_hint (treeview, TRUE);
- gtk_tree_view_set_headers_visible (treeview, FALSE);
- gtk_tree_view_set_fixed_height_mode (treeview, TRUE);
-
- priv->family_face_cell = gtk_cell_renderer_text_new ();
- g_object_set (priv->family_face_cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-
- col = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_title (col, _("Font Family"));
- gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
- gtk_tree_view_column_pack_start (col, priv->family_face_cell, TRUE);
- gtk_tree_view_column_set_cell_data_func (col,
- priv->family_face_cell,
- gtk_font_chooser_widget_cell_data_func,
- fontchooser,
- NULL);
-
- gtk_tree_view_append_column (treeview, col);
-
- gtk_font_chooser_widget_load_fonts (fontchooser);
-
- gtk_font_chooser_widget_set_cell_size (fontchooser);
-}
-
-static void
gtk_font_chooser_widget_finalize (GObject *object)
{
GtkFontChooserWidget *fontchooser = GTK_FONT_CHOOSER_WIDGET (object);
diff --git a/gtk/gtkfontchooserwidget.ui b/gtk/gtkfontchooserwidget.ui
new file mode 100644
index 0000000..f8335fe
--- /dev/null
+++ b/gtk/gtkfontchooserwidget.ui
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="gtk30">
+ <!-- interface-requires gtk+ 3.10 -->
+ <template class="GtkFontChooserWidget" parent="GtkBox">
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkSearchEntry" id="search_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="primary_icon_name">edit-find-symbolic</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">False</property>
+ <property name="secondary_icon_sensitive">False</property>
+ <property name="placeholder_text" translatable="yes">Search font name</property>
+ <signal name="notify::text" handler="text_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="list_notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">False</property>
+ <child>
+ <object class="GtkScrolledWindow" id="list_scrolled_window">
+ <property name="width_request">400</property>
+ <property name="height_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">etched-in</property>
+ <child>
+ <object class="GtkTreeView" id="family_face_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">filter_model</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
+ <property name="fixed_height_mode">True</property>
+ <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
+ <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
+ <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" after="yes"
swapped="yes"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="family_face_column">
+ <property name="sizing">fixed</property>
+ <property name="title" translatable="yes">Font Family</property>
+ <child>
+ <object class="GtkCellRendererText" id="family_face_cell">
+ <property name="ellipsize">end</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="empty_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">start</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="label" translatable="yes">No fonts matched your search. You can revise your
search and try again.</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="preview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="text">Sample string goes here</property>
+ <signal name="scroll-event" handler="zoom_preview_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="size_slider">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">slider_adjustment</property>
+ <property name="digits">0</property>
+ <signal name="scroll-event" handler="zoom_preview_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="size_spin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="adjustment">spin_adjustment</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </template>
+ <object class="GtkListStore" id="model">
+ <columns>
+ <!-- column-name family -->
+ <column type="PangoFontFamily"/>
+ <!-- column-name face -->
+ <column type="PangoFontFace"/>
+ <!-- column-name description -->
+ <column type="PangoFontDescription"/>
+ <!-- column-name preview-title -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkTreeModelFilter" id="filter_model">
+ <property name="child_model">model</property>
+ <signal name="row-deleted" handler="row_deleted_cb" swapped="no"/>
+ <signal name="row-inserted" handler="row_inserted_cb" swapped="no"/>
+ </object>
+ <object class="GtkAdjustment" id="slider_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <signal name="value-changed" handler="size_change_cb" swapped="no"/>
+ </object>
+ <object class="GtkAdjustment" id="spin_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <signal name="value-changed" handler="size_change_cb" swapped="no"/>
+ </object>
+</interface>
diff --git a/gtk/tests/templates.c b/gtk/tests/templates.c
index 56704d2..6c61bda 100644
--- a/gtk/tests/templates.c
+++ b/gtk/tests/templates.c
@@ -224,6 +224,16 @@ test_file_chooser_dialog_basic (void)
gtk_widget_destroy (widget);
}
+static void
+test_font_chooser_widget_basic (void)
+{
+ GtkWidget *widget;
+
+ widget = gtk_font_chooser_widget_new ();
+ g_assert (GTK_IS_FONT_CHOOSER_WIDGET (widget));
+ gtk_widget_destroy (widget);
+}
+
int
main (int argc, char **argv)
{
@@ -250,6 +260,7 @@ main (int argc, char **argv)
g_test_add_func ("/Template/GtkColorChooserDialog/Basic", test_color_chooser_dialog_basic);
g_test_add_func ("/Template/GtkFileChooserWidget/Basic", test_file_chooser_widget_basic);
g_test_add_func ("/Template/GtkFileChooserDialog/Basic", test_file_chooser_dialog_basic);
+ g_test_add_func ("/Template/GtkFontChooserWidget/Basic", test_font_chooser_widget_basic);
return g_test_run();
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5c0fb8e..9e83c3e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -282,6 +282,7 @@ modules/printbackends/test/gtkprintbackendtest.c
[type: gettext/glade]gtk/gtkdialog.ui
[type: gettext/glade]gtk/gtkfilechooserdedault.ui
[type: gettext/glade]gtk/gtkfilechooserdialog.ui
+[type: gettext/glade]gtk/gtkfontchooserwidget.ui
[type: gettext/glade]gtk/gtkinfobar.ui
[type: gettext/glade]gtk/gtklockbutton.ui
[type: gettext/glade]gtk/gtkmessagedialog.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
