X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=45cd66c1308299e57c84e128b856fa2826afabd3;hb=57f8d4d2612512761fbdd49f1dbd0dc313a8d257;hp=767e10541d679ee028cbbee3dae14327699855fb;hpb=c7d0520e3af8636aa9be6e7c75dcf9ff17cbf52f;p=pspp-builds.git diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 767e1054..45cd66c1 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008 Free Software Foundation + Copyright (C) 2009 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ #include #include +#include #include @@ -26,7 +27,7 @@ #define N_(msgid) msgid #include "psppire-window.h" - +#include "psppire-window-register.h" static void psppire_window_base_finalize (PsppireWindowClass *, gpointer); static void psppire_window_base_init (PsppireWindowClass *class); @@ -49,7 +50,7 @@ psppire_window_get_type (void) sizeof (PsppireWindowClass), (GBaseInitFunc) psppire_window_base_init, (GBaseFinalizeFunc) psppire_window_base_finalize, - (GClassInitFunc)psppire_window_class_init, + (GClassInitFunc) psppire_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PsppireWindow), @@ -59,7 +60,7 @@ psppire_window_get_type (void) psppire_window_type = g_type_register_static (GTK_TYPE_WINDOW, "PsppireWindow", - &psppire_window_info, 0); + &psppire_window_info, G_TYPE_FLAG_ABSTRACT); } return psppire_window_type; @@ -71,7 +72,7 @@ enum { PROP_0, PROP_FILENAME, - PROP_USAGE + PROP_DESCRIPTION }; @@ -81,7 +82,23 @@ uniquify (const gchar *str, int *x) return g_strdup_printf ("%s%d", str, (*x)++); } +static gchar mdash[6] = {0,0,0,0,0,0}; + +static void +psppire_window_set_title (PsppireWindow *window) +{ + GString *title = g_string_sized_new (80); + g_string_printf (title, _("%s %s PSPPIRE %s"), + window->basename, mdash, window->description); + + if ( window->unsaved) + g_string_prepend_c (title, '*'); + + gtk_window_set_title (GTK_WINDOW (window), title->str); + + g_string_free (title, TRUE); +} static void psppire_window_set_property (GObject *object, @@ -91,57 +108,52 @@ psppire_window_set_property (GObject *object, { PsppireWindow *window = PSPPIRE_WINDOW (object); - PsppireWindowClass *class = PSPPIRE_WINDOW_CLASS (G_OBJECT_GET_CLASS (object)); switch (prop_id) { - case PROP_USAGE: - window->usage = g_value_get_enum (value); + case PROP_DESCRIPTION: + window->description = g_value_dup_string (value); + psppire_window_set_title (window); break; case PROP_FILENAME: { - gchar mdash[6] = {0,0,0,0,0,0}; - gchar *basename, *title; - const gchar *name = g_value_get_string (value); - gchar *candidate_name = strdup (name); - int x = 0; - - while ( g_hash_table_lookup (class->name_table, candidate_name)) - { - free (candidate_name); - candidate_name = uniquify (name, &x); - } - - basename = g_path_get_basename (candidate_name); - g_unichar_to_utf8 (0x2014, mdash); - - switch (window->usage) - { - case PSPPIRE_WINDOW_USAGE_SYNTAX: - title = g_strdup_printf ( _("%s %s PSPPIRE Syntax Editor"), - basename, mdash); - break; - case PSPPIRE_WINDOW_USAGE_OUTPUT: - title = g_strdup_printf ( _("%s %s PSPPIRE Output"), - basename, mdash); - case PSPPIRE_WINDOW_USAGE_DATA: - title = g_strdup_printf ( _("%s %s PSPPIRE Data Editor"), - basename, mdash); - break; - default: - g_assert_not_reached (); - break; - } - - gtk_window_set_title (GTK_WINDOW (window), title); + PsppireWindowRegister *reg = psppire_window_register_new (); - free (window->name); - window->name = candidate_name; + gchar *candidate_name ; + + { + const gchar *name = g_value_get_string (value); + int x = 0; + GValue def = {0}; + g_value_init (&def, pspec->value_type); + + if ( NULL == name) + { + g_param_value_set_default (pspec, &def); + name = g_value_get_string (&def); + } + + candidate_name = strdup (name); + while ( psppire_window_register_lookup (reg, candidate_name)) + { + free (candidate_name); + candidate_name = uniquify (name, &x); + } - g_hash_table_insert (class->name_table, window->name, window); + window->basename = g_path_get_basename (candidate_name); - free (basename); - free (title); + g_value_unset (&def); + } + + psppire_window_set_title (window); + + if ( window->name) + psppire_window_register_remove (reg, window->name); + + free (window->name); + window->name = candidate_name; + + psppire_window_register_insert (reg, window, window->name); } break; default: @@ -161,12 +173,12 @@ psppire_window_get_property (GObject *object, switch (prop_id) { - case PROP_USAGE: - g_value_set_enum (value, window->usage); - break; case PROP_FILENAME: g_value_set_string (value, window->name); break; + case PROP_DESCRIPTION: + g_value_set_string (value, window->description); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -179,10 +191,20 @@ static void psppire_window_finalize (GObject *object) { PsppireWindow *window = PSPPIRE_WINDOW (object); - PsppireWindowClass *class = PSPPIRE_WINDOW_CLASS (G_OBJECT_GET_CLASS (object)); - g_hash_table_remove (class->name_table, window->name); + PsppireWindowRegister *reg = psppire_window_register_new (); + + psppire_window_register_remove (reg, window->name); free (window->name); + free (window->description); + + g_signal_handler_disconnect (psppire_window_register_new (), + window->remove_handler); + + g_signal_handler_disconnect (psppire_window_register_new (), + window->insert_handler); + + g_hash_table_destroy (window->menuitem_table); if (G_OBJECT_CLASS (parent_class)->finalize) G_OBJECT_CLASS (parent_class)->finalize (object); @@ -194,41 +216,32 @@ psppire_window_class_init (PsppireWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - - - GParamSpec *use_class_spec = - g_param_spec_enum ("usage", - "Usage", - "What the window is used for", - G_TYPE_PSPPIRE_WINDOW_USAGE, - PSPPIRE_WINDOW_USAGE_SYNTAX /* default value */, - G_PARAM_CONSTRUCT_ONLY |G_PARAM_READABLE | G_PARAM_WRITABLE); - + GParamSpec *description_spec = + g_param_spec_string ("description", + "Description", + "A string describing the usage of the window", + "??????", /*Should be overridden by derived classes */ + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE); GParamSpec *filename_spec = g_param_spec_string ("filename", "File name", "The name of the file associated with this window, if any", "Untitled", - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT - ); + G_PARAM_CONSTRUCT | G_PARAM_READWRITE); + g_unichar_to_utf8 (0x2014, mdash); object_class->set_property = psppire_window_set_property; object_class->get_property = psppire_window_get_property; g_object_class_install_property (object_class, - PROP_FILENAME, - filename_spec); + PROP_DESCRIPTION, + description_spec); g_object_class_install_property (object_class, - PROP_USAGE, - use_class_spec); - - - class->name_table = g_hash_table_new (g_str_hash, g_str_equal); - - g_hash_table_insert (class->name_table, "Untitled", NULL); + PROP_FILENAME, + filename_spec); the_class = class; parent_class = g_type_class_peek_parent (class); @@ -249,89 +262,151 @@ static void psppire_window_base_finalize (PsppireWindowClass *class, gpointer class_data) { - g_hash_table_destroy (class->name_table); } +static void +menu_toggled (GtkCheckMenuItem *mi, gpointer data) +{ + /* Prohibit changes to the state */ + mi->active = !mi->active; +} +/* Look up the window associated with this menuitem and present it to the user */ static void -psppire_window_init (PsppireWindow *window) +menu_activate (GtkMenuItem *mi, gpointer data) { - window->name = NULL; - window->finalized = FALSE; -} + const gchar *key = data; + + PsppireWindowRegister *reg = psppire_window_register_new (); + PsppireWindow *window = psppire_window_register_lookup (reg, key); -GtkWidget* -psppire_window_new (PsppireWindowUsage usage) + gtk_window_present (GTK_WINDOW (window)); +} + +static void +insert_menuitem_into_menu (PsppireWindow *window, gpointer key) { - return GTK_WIDGET (g_object_new (psppire_window_get_type (), - "type", GTK_WINDOW_TOPLEVEL, - "usage", usage, - NULL)); + GtkWidget *item = gtk_check_menu_item_new_with_label (key); + + g_signal_connect (item, "toggled", G_CALLBACK (menu_toggled), NULL); + g_signal_connect (item, "activate", G_CALLBACK (menu_activate), key); + + gtk_widget_show (item); + + gtk_menu_shell_append (window->menu, item); + + /* Set the state without emitting a signal */ + GTK_CHECK_MENU_ITEM (item)->active = + (psppire_window_register_lookup (psppire_window_register_new (), key) == window); + + g_hash_table_insert (window->menuitem_table, key, item); } +static void +insert_item (gpointer key, gpointer value, gpointer data) +{ + PsppireWindow *window = PSPPIRE_WINDOW (data); + + if ( NULL != g_hash_table_lookup (window->menuitem_table, key)) + return; -const gchar * -psppire_window_get_filename (PsppireWindow *w) + insert_menuitem_into_menu (window, key); +} + +/* Insert a new item into the window menu */ +static void +insert_menuitem (GObject *reg, const gchar *key, gpointer data) { - const gchar *name = NULL; - g_object_get (w, "filename", name, NULL); - return name; + PsppireWindow *window = PSPPIRE_WINDOW (data); + + insert_menuitem_into_menu (window, (gpointer) key); } -void -psppire_window_set_filename (PsppireWindow *w, const gchar *filename) +static void +remove_menuitem (PsppireWindowRegister *reg, const gchar *key, gpointer data) { - g_object_set (w, "filename", filename, NULL); + PsppireWindow *window = PSPPIRE_WINDOW (data); + GtkWidget *item ; + + item = g_hash_table_lookup (window->menuitem_table, key); + + g_hash_table_remove (window->menuitem_table, key); + + if (GTK_IS_CONTAINER (window->menu)) + gtk_container_remove (GTK_CONTAINER (window->menu), item); } +static void +insert_existing_items (PsppireWindow *window) +{ + psppire_window_register_foreach (psppire_window_register_new (), insert_item, window); +} static void -minimise_all (gpointer key, - gpointer value, - gpointer user_data) +psppire_window_init (PsppireWindow *window) { - PsppireWindow *w = PSPPIRE_WINDOW (value); + window->name = NULL; + window->menu = NULL; + + window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal); + + + g_signal_connect (window, "realize", G_CALLBACK (insert_existing_items), NULL); + + window->insert_handler = g_signal_connect (psppire_window_register_new (), + "inserted", + G_CALLBACK (insert_menuitem), + window); + + window->remove_handler = g_signal_connect (psppire_window_register_new (), + "removed", + G_CALLBACK (remove_menuitem), + window); - gtk_window_iconify (GTK_WINDOW (w)); + window->unsaved = FALSE; } +const gchar * +psppire_window_get_filename (PsppireWindow *w) +{ + const gchar *name = NULL; + g_object_get (w, "filename", &name, NULL); + return name; +} + void -psppire_window_minimise_all (void) +psppire_window_set_filename (PsppireWindow *w, const gchar *filename) { - g_hash_table_foreach (the_class->name_table, minimise_all, NULL); + g_object_set (w, "filename", filename, NULL); } +void +psppire_window_set_unsaved (PsppireWindow *w, gboolean unsaved) +{ + w->unsaved = unsaved; + psppire_window_set_title (w); +} -GType -psppire_window_usage_get_type (void) -{ - static GType etype = 0; - if (etype == 0) - { - static const GEnumValue values[] = { - { PSPPIRE_WINDOW_USAGE_SYNTAX, "PSPPIRE_WINDOW_USAGE_SYNTAX", - "Syntax" }, - { PSPPIRE_WINDOW_USAGE_OUTPUT, "PSPPIRE_WINDOW_USAGE_OUTPUT", - "Output" }, - - { PSPPIRE_WINDOW_USAGE_DATA, "PSPPIRE_WINDOW_USAGE_DATA", - "Data" }, +static void +minimise_window (gpointer key, gpointer value, gpointer data) +{ + gtk_window_iconify (GTK_WINDOW (value)); +} - { 0, NULL, NULL } - }; - etype = g_enum_register_static - (g_intern_static_string ("PsppireWindowUsage"), values); - } +void +psppire_window_minimise_all (void) +{ + PsppireWindowRegister *reg = psppire_window_register_new (); - return etype; + g_hash_table_foreach (reg->name_table, minimise_window, NULL); }