[goffice] Font Selector: implement show-preview-entry.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Font Selector: implement show-preview-entry.
- Date: Sat, 16 Mar 2013 02:42:29 +0000 (UTC)
commit 9e5b0b507ad88010605407fb20ca277d2f6e5116
Author: Morten Welinder <terra gnome org>
Date: Fri Mar 15 22:42:12 2013 -0400
Font Selector: implement show-preview-entry.
goffice/gtk/go-font-sel.c | 13 +++++++++----
goffice/gtk/go-font-sel.ui | 1 +
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/goffice/gtk/go-font-sel.c b/goffice/gtk/go-font-sel.c
index a0a2704..7ff5dac 100644
--- a/goffice/gtk/go-font-sel.c
+++ b/goffice/gtk/go-font-sel.c
@@ -55,6 +55,7 @@ struct _GOFontSel {
gboolean show_style;
char *preview_text;
+ gboolean show_preview_entry;
GtkFontFilterFunc filter_func;
gpointer filter_data;
@@ -105,6 +106,8 @@ update_preview (GOFontSel *gfs)
if (!gfs->preview_label)
return;
+ gtk_widget_set_visible (gfs->preview_label, gfs->show_preview_entry);
+
gtk_label_set_text (GTK_LABEL (gfs->preview_label), gfs->preview_text);
attrs = go_pango_translate_attributes (gfs->modifications);
@@ -463,7 +466,8 @@ cb_size_picker_changed (GtkButton *button, GOFontSel *gfs)
static void
gfs_init (GOFontSel *gfs)
{
- go_font_sel_set_sample_text (gfs, _("AaBbCcDdEe12345"));
+ gfs->show_preview_entry = TRUE;
+ gfs->preview_text = g_strdup (pango_language_get_sample_string (NULL));
gfs->font_sizes = go_fonts_list_sizes ();
}
@@ -605,8 +609,7 @@ gfs_get_property (GObject *object,
break;
case GFS_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
- /* Not implemented */
- g_value_set_boolean (value, TRUE);
+ g_value_set_boolean (value, gfs->show_preview_entry);
break;
default:
@@ -647,8 +650,10 @@ gfs_set_property (GObject *object,
break;
case GFS_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
- /* Not implemented */
+ gfs->show_preview_entry = g_value_get_boolean (value);
+ update_preview (gfs);
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
diff --git a/goffice/gtk/go-font-sel.ui b/goffice/gtk/go-font-sel.ui
index f04bf9f..317f2a4 100644
--- a/goffice/gtk/go-font-sel.ui
+++ b/goffice/gtk/go-font-sel.ui
@@ -164,6 +164,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ellipsize">end</property>
+ <property name="single_line_mode">True</property>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]