Takuro Ashie
makei****@users*****
2006年 11月 30日 (木) 19:01:32 JST
Index: libtomoe-gtk/src/tomoe-gucharmap.c
diff -u libtomoe-gtk/src/tomoe-gucharmap.c:1.4 libtomoe-gtk/src/tomoe-gucharmap.c:1.5
--- libtomoe-gtk/src/tomoe-gucharmap.c:1.4 Thu Nov 30 18:17:24 2006
+++ libtomoe-gtk/src/tomoe-gucharmap.c Thu Nov 30 19:01:32 2006
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Copyright (C) 2006 Takuro Ashie
*
@@ -22,14 +23,17 @@
typedef struct _TomoeGucharmapPrivate TomoeGucharmapPrivate;
struct _TomoeGucharmapPrivate
{
- GucharmapCharmap *charmap;
+ GtkWidget *chapters_option_menu;
+ GucharmapChapters *chapters;
+ GucharmapCharmap *charmap;
};
#define TOMOE_GUCHARMAP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TOMOE_TYPE_GUCHARMAP, TomoeGucharmapPrivate))
G_DEFINE_TYPE (TomoeGucharmap, tomoe_gucharmap, GTK_TYPE_TABLE)
-static void dispose (GObject *object);
+static void dispose (GObject *object);
+static void setup_chapters_option_menu (TomoeGucharmap *page);
GtkWidget *
tomoe_gucharmap_new (void)
@@ -51,8 +55,7 @@
tomoe_gucharmap_init (TomoeGucharmap *page)
{
TomoeGucharmapPrivate *priv = TOMOE_GUCHARMAP_GET_PRIVATE (page);
- GucharmapChapters *chapters;
- GtkWidget *vbox, *widget;
+ GtkWidget *vbox, *hbox, *label, *option_menu, *widget;
gtk_table_resize (GTK_TABLE (page), 1, 1);
gtk_table_set_homogeneous (GTK_TABLE (page), FALSE);
@@ -62,17 +65,29 @@
gtk_table_attach_defaults (GTK_TABLE (page), vbox, 0, 1, 0, 1);
gtk_widget_show (vbox);
- /* An opiton menu for selecting unicode blocks will be placed here. */
+ /* opiton menu for selecting unicode blocks */
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 2);
+ gtk_widget_show (hbox);
+
+ label = gtk_label_new ("Unicode block:");
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
+ gtk_widget_show (label);
+
+ option_menu = gtk_option_menu_new ();
+ priv->chapters_option_menu = option_menu;
+ gtk_box_pack_start (GTK_BOX (hbox), option_menu, FALSE, FALSE, 2);
+ gtk_widget_show (option_menu);
/* gucharmap */
- chapters = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ());
- priv->charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new (chapters));
+ priv->chapters = GUCHARMAP_CHAPTERS (gucharmap_block_chapters_new ());
+ priv->charmap = GUCHARMAP_CHARMAP (gucharmap_charmap_new (priv->chapters));
widget = GTK_WIDGET (priv->charmap);
- gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 2);
gtk_widget_show (widget);
/* Hide chapters page by default. Usually use option menu instead. */
- gtk_widget_hide (GTK_WIDGET (chapters));
+ gtk_widget_hide (GTK_WIDGET (priv->chapters));
/* Add test page */
widget = gtk_paned_get_child2 (GTK_PANED (widget));
@@ -103,3 +118,11 @@
priv = TOMOE_GUCHARMAP_GET_PRIVATE (page);
return priv->charmap;
}
+
+static void
+setup_chapters_option_menu (TomoeGucharmap *page)
+{
+ TomoeGucharmapPrivate *priv = TOMOE_GUCHARMAP_GET_PRIVATE (page);
+
+#warning Implement me!
+}