[gtk+] GtkFontChooser: Expose the new widget in gtk.h and add test cases
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkFontChooser: Expose the new widget in gtk.h and add test cases
- Date: Mon, 15 Aug 2011 23:52:40 +0000 (UTC)
commit 4bf22639d13a86f4ab38a4435ef5fc00bc2b4bce
Author: Alberto Ruiz <aruiz gnome org>
Date: Wed May 11 15:48:21 2011 +0200
GtkFontChooser: Expose the new widget in gtk.h and add test cases
gtk/gtk.h | 1 +
tests/Makefile.am | 16 ++++++++-
tests/testfontchooser.c | 67 +++++++++++++++++++++++++++++++++++++++++
tests/testfontchooserdialog.c | 38 +++++++++++++++++++++++
4 files changed, 120 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtk.h b/gtk/gtk.h
index c644111..97317fd 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -101,6 +101,7 @@
#include <gtk/gtkfilefilter.h>
#include <gtk/gtkfontbutton.h>
#include <gtk/gtkfontsel.h>
+#include <gtk/gtkfontchooser.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkgradient.h>
#include <gtk/gtkgrid.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6b421d3..ac05e62 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -50,8 +50,10 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testentryicons \
testfilechooser \
testfilechooserbutton \
- testfontselection \
- testfontselectiondialog \
+ testfontselection \
+ testfontselectiondialog \
+ testfontchooser \
+ testfontchooserdialog \
testframe \
testgeometry \
testgiconpixbuf \
@@ -165,6 +167,8 @@ testfilechooser_DEPENDENCIES = $(TEST_DEPS)
testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
testfontselection_DEPENDENCIES = $(TEST_DEPS)
testfontselectiondialog_DEPENDENCIES = $(TEST_DEPS)
+testfontchooser_DEPENDENCIES = $(TEST_DEPS)
+testfontchooserdialog_DEPENDENCIES = $(TEST_DEPS)
testframe_DEPENDENCIES = $(TEST_DEPS)
testgeometry_DEPENDENCIES = $(TEST_DEPS)
testgiconpixbuf = $(TEST_DEPS)
@@ -255,6 +259,8 @@ testfilechooser_LDADD = $(LDADDS)
testfilechooserbutton_LDADD = $(LDADDS)
testfontselection_LDADD = $(LDADDS)
testfontselectiondialog_LDADD = $(LDADDS)
+testfontchooser_LDADD = $(LDADDS)
+testfontchooserdialog_LDADD = $(LDADDS)
testframe_LDADD = $(LDADDS)
testgeometry_LDADD = $(LDADDS)
testgiconpixbuf_LDADD = $(LDADDS)
@@ -354,6 +360,12 @@ testfontselection_SOURCES = \
testfontselectiondialog_SOURCES = \
testfontselectiondialog.c
+testfontchooser_SOURCES = \
+ testfontchooser.c
+
+testfontchooserdialog_SOURCES = \
+ testfontchooserdialog.c
+
testgrid_SOURCES = \
testgrid.c
diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
new file mode 100644
index 0000000..bca728d
--- /dev/null
+++ b/tests/testfontchooser.c
@@ -0,0 +1,67 @@
+/* testfontchooser.c
+ * Copyright (C) 2011 Alberto Ruiz <aruiz gnome org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+static void
+notify_font_name_cb (GObject *fontchooser, GParamSpec *pspec, gpointer data)
+{
+ g_debug ("Changed font name %s", gtk_font_chooser_get_font_name (GTK_FONT_CHOOSER (fontchooser)));
+}
+
+static void
+notify_preview_text_cb (GObject *fontchooser, GParamSpec *pspec, gpointer data)
+{
+ g_debug ("Changed preview text %s", gtk_font_chooser_get_preview_text (GTK_FONT_CHOOSER (fontchooser)));
+}
+
+int
+main (int argc, char *argv[])
+{
+ GtkWidget *window;
+ GtkWidget *hbox;
+ GtkWidget *fontchooser;
+
+ gtk_init (NULL, NULL);
+
+ fontchooser = gtk_font_chooser_new ();
+
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request (window, 600, 600);
+ hbox = gtk_hbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (window), hbox);
+ gtk_container_add (GTK_CONTAINER (hbox), fontchooser);
+
+ gtk_widget_show_all (window);
+
+ g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK(gtk_main_quit), NULL);
+ g_signal_connect (G_OBJECT (fontchooser), "notify::font-name", G_CALLBACK(notify_font_name_cb), NULL);
+ g_signal_connect (G_OBJECT (fontchooser), "notify::preview-text", G_CALLBACK(notify_preview_text_cb), NULL);
+
+ gtk_font_chooser_set_font_name (GTK_FONT_CHOOSER (fontchooser), "Bitstream Vera Sans 45");
+ gtk_font_chooser_set_preview_text (GTK_FONT_CHOOSER (fontchooser), "[user host ~]$ ");
+
+ gtk_main ();
+
+ gtk_widget_destroy (window);
+
+ return 0;
+}
diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
new file mode 100644
index 0000000..b06ddb5
--- /dev/null
+++ b/tests/testfontchooserdialog.c
@@ -0,0 +1,38 @@
+/* testfontchooserdialog.c
+ * Copyright (C) 2011 Alberto Ruiz <aruiz gnome org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+#include <gtk/gtk.h>
+
+int
+main (int argc, char *argv[])
+{
+ GtkWidget *dialog;
+ GtkWidget *ok;
+
+ gtk_init (&argc, &argv);
+
+ dialog = gtk_font_chooser_dialog_new (NULL);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+
+ gtk_widget_destroy (dialog);
+
+ return 0;
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]