[goffice] Font Selector: GtkFontChooser work.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Font Selector: GtkFontChooser work.
- Date: Thu, 14 Mar 2013 23:23:06 +0000 (UTC)
commit 156a09aaf39a6ba898ad8c328ebac5c5f2078bfc
Author: Morten Welinder <terra gnome org>
Date: Thu Mar 14 19:22:48 2013 -0400
Font Selector: GtkFontChooser work.
ChangeLog | 5 +
goffice/gtk/go-font-sel-dialog.c | 106 ++++++++++-----------------
goffice/gtk/go-font-sel.c | 150 ++++++++++++++++++++++++++++++++++++--
3 files changed, 187 insertions(+), 74 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1cac825..3953358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-03-14 Morten Welinder <terra gnome org>
+ * goffice/gtk/go-font-sel-dialog.c: Just delegate to GOFontSel.
+
+ * goffice/gtk/go-font-sel.c: Implement the GtkFontChooser
+ interface.
+
* goffice/gtk/go-font-sel-dialog.c (gfsd_get_property)
(gfsd_set_property): Partially implement.
diff --git a/goffice/gtk/go-font-sel-dialog.c b/goffice/gtk/go-font-sel-dialog.c
index 05a5013..553af31 100644
--- a/goffice/gtk/go-font-sel-dialog.c
+++ b/goffice/gtk/go-font-sel-dialog.c
@@ -54,34 +54,8 @@ gfsd_set_property (GObject *object,
GParamSpec *pspec)
{
GOFontSelDialog *gfsd = GO_FONT_SEL_DIALOG (object);
-
- switch (prop_id) {
- case GFSD_GTK_FONT_CHOOSER_PROP_FONT: {
- PangoFontDescription *desc = pango_font_description_from_string
- (g_value_get_string (value));
- go_font_sel_set_font_desc (gfsd->gfs, desc);
- pango_font_description_free (desc);
- break;
- }
-
- case GFSD_GTK_FONT_CHOOSER_PROP_FONT_DESC:
- go_font_sel_set_font_desc (gfsd->gfs,
- g_value_get_boxed (value));
- break;
-
- case GFSD_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT:
- go_font_sel_set_sample_text (gfsd->gfs,
- g_value_get_string (value));
- break;
-
- case GFSD_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
- /* Not implemented */
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ (void)prop_id;
+ g_object_set_property (G_OBJECT (gfsd->gfs), pspec->name, value);
}
static void
@@ -91,34 +65,26 @@ gfsd_get_property (GObject *object,
GParamSpec *pspec)
{
GOFontSelDialog *gfsd = GO_FONT_SEL_DIALOG (object);
+ (void)prop_id;
+ g_object_get_property (G_OBJECT (gfsd->gfs), pspec->name, value);
+}
- switch (prop_id) {
- case GFSD_GTK_FONT_CHOOSER_PROP_FONT: {
- PangoFontDescription *desc =
- go_font_sel_get_font_desc (gfsd->gfs);
- g_value_take_string (value, pango_font_description_to_string (desc));
- pango_font_description_free (desc);
- break;
- }
-
- case GFSD_GTK_FONT_CHOOSER_PROP_FONT_DESC:
- g_value_take_boxed (value, go_font_sel_get_font_desc (gfsd->gfs));
- break;
-
- case GFSD_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT:
- /* Not implemented */
- g_value_set_string (value, "");
- break;
-
- case GFSD_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
- /* Not implemented */
- g_value_set_boolean (value, TRUE);
- break;
-
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+static void
+delegate_notify (GObject *gfs, GParamSpec *pspec, gpointer gfsd)
+{
+ gpointer iface =
+ g_type_interface_peek (g_type_class_peek (G_OBJECT_TYPE (gfs)),
+ GTK_TYPE_FONT_CHOOSER);
+ if (g_object_interface_find_property (iface, pspec->name))
+ g_object_notify_by_pspec (gfsd, pspec);
+}
+
+static void
+delegate_font_activated (GtkFontChooser *gfs,
+ const gchar *fontname,
+ GtkFontChooser *gfsd)
+{
+ g_signal_emit_by_name (gfsd, "font-activated", 0, fontname);
}
static void
@@ -132,12 +98,16 @@ gfsd_init (GOFontSelDialog *gfsd)
gfs);
gtk_dialog_add_button (dialog, GTK_STOCK_OK, GTK_RESPONSE_OK);
gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+ g_signal_connect (gfs, "notify",
+ G_CALLBACK (delegate_notify), gfsd);
+ g_signal_connect (gfs, "font-activated",
+ G_CALLBACK (delegate_font_activated), gfsd);
}
static void
gfsd_class_init (GObjectClass *klass)
{
- // klass->dispose = gfsd_dispose;
klass->set_property = gfsd_set_property;
klass->get_property = gfsd_get_property;
@@ -159,31 +129,38 @@ gfsd_class_init (GObjectClass *klass)
static void
gfsd_font_chooser_set_filter_func (GtkFontChooser *chooser,
- GtkFontFilterFunc filter_func,
- gpointer filter_data,
- GDestroyNotify data_destroy)
+ GtkFontFilterFunc filter_func,
+ gpointer filter_data,
+ GDestroyNotify data_destroy)
{
+ GOFontSelDialog *gfsd = GO_FONT_SEL_DIALOG (chooser);
+ gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (gfsd->gfs),
+ filter_func,
+ filter_data,
+ data_destroy);
}
static PangoFontFamily *
gfsd_font_chooser_get_font_family (GtkFontChooser *chooser)
{
- return NULL;
+ GOFontSelDialog *gfsd = GO_FONT_SEL_DIALOG (chooser);
+ return gtk_font_chooser_get_font_family (GTK_FONT_CHOOSER (gfsd->gfs));
}
static int
gfsd_font_chooser_get_font_size (GtkFontChooser *chooser)
{
- return 0;
+ GOFontSelDialog *gfsd = GO_FONT_SEL_DIALOG (chooser);
+ return gtk_font_chooser_get_font_size (GTK_FONT_CHOOSER (gfsd->gfs));
}
static PangoFontFace *
gfsd_font_chooser_get_font_face (GtkFontChooser *chooser)
{
- return NULL;
+ GOFontSelDialog *gfsd = GO_FONT_SEL_DIALOG (chooser);
+ return gtk_font_chooser_get_font_face (GTK_FONT_CHOOSER (gfsd->gfs));
}
-
static void
gfsd_font_chooser_iface_init (GtkFontChooserIface *iface)
{
@@ -193,9 +170,6 @@ gfsd_font_chooser_iface_init (GtkFontChooserIface *iface)
iface->set_filter_func = gfsd_font_chooser_set_filter_func;
}
-
-
-
GSF_CLASS_FULL (GOFontSelDialog, go_font_sel_dialog,
NULL, NULL, gfsd_class_init, NULL,
gfsd_init, GTK_TYPE_DIALOG, 0,
diff --git a/goffice/gtk/go-font-sel.c b/goffice/gtk/go-font-sel.c
index d2d617c..e13e5ec 100644
--- a/goffice/gtk/go-font-sel.c
+++ b/goffice/gtk/go-font-sel.c
@@ -63,7 +63,14 @@ typedef struct {
enum {
PROP_0,
- PROP_SHOW_STYLE
+ PROP_SHOW_STYLE,
+
+ GFS_GTK_FONT_CHOOSER_PROP_FIRST = 0x4000,
+ GFS_GTK_FONT_CHOOSER_PROP_FONT,
+ GFS_GTK_FONT_CHOOSER_PROP_FONT_DESC,
+ GFS_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT,
+ GFS_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY,
+ GFS_GTK_FONT_CHOOSER_PROP_LAST
};
enum {
@@ -85,10 +92,17 @@ go_font_sel_add_attr (GOFontSel *gfs, PangoAttribute *attr)
static void
go_font_sel_emit_changed (GOFontSel *gfs)
{
+ char *fontname = NULL;
+
g_signal_emit (G_OBJECT (gfs),
gfs_signals[FONT_CHANGED], 0, gfs->modifications);
+
+ g_object_get (gfs, "font", &fontname, NULL);
+ g_signal_emit_by_name (gfs, "font-activated", 0, fontname);
+ g_free (fontname);
+
goc_item_set (gfs->font_preview_text,
- "attributes", gfs->modifications,
+ "attributes", gfs->modifications,
NULL);
}
@@ -280,9 +294,9 @@ size_set_text (GOFontSel *gfs, char const *size_text)
{
char *end;
double size;
- errno = 0; /* strtol sets errno, but does not clear it. */
- size = strtod (size_text, &end);
- size = ((int)floor ((size * 20.) + .5)) / 20.; /* round .05 */
+ size = go_strtod (size_text, &end);
+ size = CLAMP (size, 0.0, 1000.0);
+ size = floor ((size * 20.) + .5) / 20.; /* round .05 */
if (size_text != end && errno != ERANGE && 1. <= size && size <= 400.) {
gtk_entry_set_text (GTK_ENTRY (gfs->font_size_entry), size_text);
@@ -475,6 +489,46 @@ gfs_dispose (GObject *obj)
}
static void
+gfs_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GOFontSel *gfs = GO_FONT_SEL (object);
+
+ switch (prop_id) {
+ case PROP_SHOW_STYLE:
+ g_value_set_boolean (value, gfs->show_style);
+ break;
+
+ case GFS_GTK_FONT_CHOOSER_PROP_FONT: {
+ PangoFontDescription *desc = go_font_sel_get_font_desc (gfs);
+ g_value_take_string (value, pango_font_description_to_string (desc));
+ pango_font_description_free (desc);
+ break;
+ }
+
+ case GFS_GTK_FONT_CHOOSER_PROP_FONT_DESC:
+ g_value_take_boxed (value, go_font_sel_get_font_desc (gfs));
+ break;
+
+ case GFS_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT:
+ /* Not implemented */
+ g_value_set_string (value, "");
+ break;
+
+ case GFS_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
+ /* Not implemented */
+ g_value_set_boolean (value, TRUE);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
gfs_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -486,6 +540,26 @@ gfs_set_property (GObject *object,
case PROP_SHOW_STYLE:
gfs->show_style = g_value_get_boolean (value);
break;
+
+ case GFS_GTK_FONT_CHOOSER_PROP_FONT: {
+ PangoFontDescription *desc = pango_font_description_from_string
+ (g_value_get_string (value));
+ go_font_sel_set_font_desc (gfs, desc);
+ pango_font_description_free (desc);
+ break;
+ }
+
+ case GFS_GTK_FONT_CHOOSER_PROP_FONT_DESC:
+ go_font_sel_set_font_desc (gfs, g_value_get_boxed (value));
+ break;
+
+ case GFS_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT:
+ go_font_sel_set_sample_text (gfs, g_value_get_string (value));
+ break;
+
+ case GFS_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
+ /* Not implemented */
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -497,6 +571,7 @@ gfs_class_init (GObjectClass *klass)
{
klass->constructor = gfs_constructor;
klass->dispose = gfs_dispose;
+ klass->get_property = gfs_get_property;
klass->set_property = gfs_set_property;
gfs_parent_class = g_type_class_peek_parent (klass);
@@ -507,9 +582,22 @@ gfs_class_init (GObjectClass *klass)
_("Show Style"),
_("Whether style is part of the font being selected"),
FALSE,
- G_PARAM_WRITABLE |
+ G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_override_property (klass,
+ GFS_GTK_FONT_CHOOSER_PROP_FONT,
+ "font");
+ g_object_class_override_property (klass,
+ GFS_GTK_FONT_CHOOSER_PROP_FONT_DESC,
+ "font-desc");
+ g_object_class_override_property (klass,
+ GFS_GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT,
+ "preview-text");
+ g_object_class_override_property (klass,
+ GFS_GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY,
+ "show-preview-entry");
+
gfs_signals[FONT_CHANGED] =
g_signal_new (
"font_changed",
@@ -521,8 +609,54 @@ gfs_class_init (GObjectClass *klass)
G_TYPE_NONE, 1, G_TYPE_POINTER);
}
-GSF_CLASS (GOFontSel, go_font_sel,
- gfs_class_init, gfs_init, GTK_TYPE_GRID)
+static void
+gfs_font_chooser_set_filter_func (GtkFontChooser *chooser,
+ GtkFontFilterFunc filter_func,
+ gpointer filter_data,
+ GDestroyNotify data_destroy)
+{
+ GOFontSel *gfs = GO_FONT_SEL (chooser);
+ (void)gfs;
+}
+
+static PangoFontFamily *
+gfs_font_chooser_get_font_family (GtkFontChooser *chooser)
+{
+ GOFontSel *gfs = GO_FONT_SEL (chooser);
+ (void)gfs;
+ return NULL;
+}
+
+static int
+gfs_font_chooser_get_font_size (GtkFontChooser *chooser)
+{
+ GOFontSel *gfs = GO_FONT_SEL (chooser);
+ (void)gfs;
+ return 0;
+}
+
+static PangoFontFace *
+gfs_font_chooser_get_font_face (GtkFontChooser *chooser)
+{
+ GOFontSel *gfs = GO_FONT_SEL (chooser);
+ (void)gfs;
+ return NULL;
+}
+
+static void
+gfs_font_chooser_iface_init (GtkFontChooserIface *iface)
+{
+ iface->get_font_family = gfs_font_chooser_get_font_family;
+ iface->get_font_face = gfs_font_chooser_get_font_face;
+ iface->get_font_size = gfs_font_chooser_get_font_size;
+ iface->set_filter_func = gfs_font_chooser_set_filter_func;
+}
+
+GSF_CLASS_FULL (GOFontSel, go_font_sel,
+ NULL, NULL, gfs_class_init, NULL,
+ gfs_init, GTK_TYPE_GRID, 0,
+ GSF_INTERFACE (gfs_font_chooser_iface_init, GTK_TYPE_FONT_CHOOSER);
+ )
#if 0
;
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
