callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkFontChooser: Add preview entry to the grid

Browse Source
This commit is contained in:
Alberto Ruiz 2011-05-12 02:41:10 +02:00 committed by Matthias Clasen
parent f60d0dc35a
commit 03ab18fa7a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkfontchooser.c
View File

@ -546,7 +546,6 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser)
/** Bootstrapping widget layout **/ /** Bootstrapping widget layout **/
gtk_box_set_spacing (GTK_BOX (fontchooser), 6); gtk_box_set_spacing (GTK_BOX (fontchooser), 6);
/* Main font family/face view */ /* Main font family/face view */
scrolled_win = gtk_scrolled_window_new (NULL, NULL); scrolled_win = gtk_scrolled_window_new (NULL, NULL);
@ -558,13 +557,14 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser)
/* Basic layout */ /* Basic layout */
grid = gtk_grid_new (); grid = gtk_grid_new ();
gtk_grid_attach (GTK_GRID (grid), priv->search_entry, 0, 0, 3, 1); gtk_grid_attach (GTK_GRID (grid), priv->search_entry, 0, 0, 3, 1);
gtk_grid_attach (GTK_GRID (grid), scrolled_win, 0, 1, 3, 1); gtk_grid_attach (GTK_GRID (grid), scrolled_win, 0, 1, 3, 1);
gtk_grid_attach (GTK_GRID (grid), priv->size_slider, 0, 2, 2, 1); gtk_grid_attach (GTK_GRID (grid), priv->preview, 0, 2, 3, 1);
gtk_grid_attach (GTK_GRID (grid), priv->size_spin, 2, 2, 1, 1); gtk_grid_attach (GTK_GRID (grid), priv->size_slider, 0, 3, 2, 1);
gtk_grid_attach (GTK_GRID (grid), priv->size_spin, 2, 3, 1, 1);
gtk_box_pack_start (GTK_BOX (fontchooser), grid, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (fontchooser), grid, TRUE, FALSE, 0);
/* Setting the adjustment values for the size slider */ /* Setting the adjustment values for the size slider */
gtk_adjustment_set_value (gtk_range_get_adjustment (GTK_RANGE (priv->size_slider)), gtk_adjustment_set_value (gtk_range_get_adjustment (GTK_RANGE (priv->size_slider)),
@ -577,11 +577,11 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser)
/* Treeview column and model bootstrapping */ /* Treeview column and model bootstrapping */
gtk_font_chooser_bootstrap_fontlist (fontchooser); gtk_font_chooser_bootstrap_fontlist (fontchooser);
/* Set default preview text */ /* Set default preview text */
gtk_entry_set_text (GTK_ENTRY (priv->preview), gtk_entry_set_text (GTK_ENTRY (priv->preview),
pango_language_get_sample_string (NULL)); pango_language_get_sample_string (NULL));
/* Set search icon and place holder text */ /* Set search icon and place holder text */
icon = g_themed_icon_new_with_default_fallbacks ("edit-find-symbolic"); icon = g_themed_icon_new_with_default_fallbacks ("edit-find-symbolic");
gtk_entry_set_icon_from_gicon (GTK_ENTRY (priv->search_entry), gtk_entry_set_icon_from_gicon (GTK_ENTRY (priv->search_entry),
@ -590,7 +590,7 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser)
g_object_unref (icon); g_object_unref (icon);
gtk_entry_set_placeholder_text (GTK_ENTRY (priv->search_entry), _("Search font name")); gtk_entry_set_placeholder_text (GTK_ENTRY (priv->search_entry), _("Search font name"));
/** Callback connections **/ /** Callback connections **/
/* Connect to callback for the live search text entry */ /* Connect to callback for the live search text entry */
g_signal_connect (G_OBJECT (gtk_entry_get_buffer (GTK_ENTRY (priv->search_entry))), g_signal_connect (G_OBJECT (gtk_entry_get_buffer (GTK_ENTRY (priv->search_entry))),