X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=6945914a5e294aec189f3ff521b923c1483b3826;hb=12fc15c56844de1492c4ee31cbb12a54b37cfc2e;hp=c1333769802671d1fcd612cb3194ece3a38bffff;hpb=1efacfa55381cfdbd7f01006f217f1d03a4c48af;p=pspp-builds.git diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index c1333769..6945914a 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 @@ -16,6 +16,8 @@ #include +#include +#include #include #include #include @@ -60,7 +62,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; @@ -72,7 +74,7 @@ enum { PROP_0, PROP_FILENAME, - PROP_USAGE + PROP_DESCRIPTION }; @@ -82,7 +84,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, @@ -94,47 +112,42 @@ psppire_window_set_property (GObject *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; - PsppireWindowRegister *reg = psppire_window_register_new (); - while ( psppire_window_register_lookup (reg, 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); + 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); + } + + window->basename = g_path_get_basename (candidate_name); + + g_value_unset (&def); + } + + psppire_window_set_title (window); if ( window->name) psppire_window_register_remove (reg, window->name); @@ -143,9 +156,6 @@ psppire_window_set_property (GObject *object, window->name = candidate_name; psppire_window_register_insert (reg, window, window->name); - - free (basename); - free (title); } break; default: @@ -165,12 +175,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; @@ -183,11 +193,12 @@ static void psppire_window_finalize (GObject *object) { PsppireWindow *window = PSPPIRE_WINDOW (object); - + 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); @@ -207,35 +218,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); - + PROP_FILENAME, + filename_spec); the_class = class; parent_class = g_type_class_peek_parent (class); @@ -288,7 +296,7 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key) 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 */ @@ -325,14 +333,12 @@ remove_menuitem (PsppireWindowRegister *reg, const gchar *key, gpointer data) PsppireWindow *window = PSPPIRE_WINDOW (data); GtkWidget *item ; - if ( !GTK_WIDGET_REALIZED (window)) - return; - item = g_hash_table_lookup (window->menuitem_table, key); g_hash_table_remove (window->menuitem_table, key); - gtk_container_remove (GTK_CONTAINER (window->menu), item); + if (GTK_IS_CONTAINER (window->menu)) + gtk_container_remove (GTK_CONTAINER (window->menu), item); } static void @@ -341,6 +347,22 @@ insert_existing_items (PsppireWindow *window) psppire_window_register_foreach (psppire_window_register_new (), insert_item, window); } + +static gboolean +on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data) +{ + PsppireWindow *dw = PSPPIRE_WINDOW (user_data); + + PsppireWindowRegister *reg = psppire_window_register_new (); + + + if ( 1 == psppire_window_register_n_items (reg)) + gtk_main_quit (); + + return FALSE; +} + + static void psppire_window_init (PsppireWindow *window) { @@ -361,16 +383,66 @@ psppire_window_init (PsppireWindow *window) "removed", G_CALLBACK (remove_menuitem), window); + + window->unsaved = FALSE; + + g_signal_connect (window, "delete-event", G_CALLBACK (on_delete), window); + + g_object_set (window, "icon-name", "psppicon", NULL); } -GtkWidget* -psppire_window_new (PsppireWindowUsage usage) +/* If the buffer's modified flag is set, + ask the user if the buffer should be saved. + Return TRUE if is should. +*/ +gboolean +psppire_window_query_save (PsppireWindow *se) { - return GTK_WIDGET (g_object_new (psppire_window_get_type (), - "type", GTK_WINDOW_TOPLEVEL, - "usage", usage, - NULL)); + gint response; + GtkWidget *dialog; + + const gchar *description; + const gchar *filename = psppire_window_get_filename (se); + + if ( ! psppire_window_get_unsaved (se)) + return FALSE; + + g_object_get (se, "description", &description, NULL); + + g_return_val_if_fail (filename != NULL, FALSE); + + dialog = + gtk_message_dialog_new (GTK_WINDOW (se), + GTK_DIALOG_MODAL, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + _("Save contents of %s to \"%s\"?"), + description, + filename); + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_YES, + GTK_RESPONSE_ACCEPT); + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_NO, + GTK_RESPONSE_REJECT); + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); + + if ( response == GTK_RESPONSE_ACCEPT ) + { + return TRUE; + } + + return FALSE; } @@ -389,35 +461,23 @@ psppire_window_set_filename (PsppireWindow *w, const gchar *filename) g_object_set (w, "filename", filename, NULL); } - - -GType -psppire_window_usage_get_type (void) +void +psppire_window_set_unsaved (PsppireWindow *w, gboolean unsaved) { - 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" }, + w->unsaved = unsaved; - { PSPPIRE_WINDOW_USAGE_DATA, "PSPPIRE_WINDOW_USAGE_DATA", - "Data" }, - - { 0, NULL, NULL } - }; - - etype = g_enum_register_static (g_intern_static_string ("PsppireWindowUsage"), - values); - } + psppire_window_set_title (w); +} - return etype; +gboolean +psppire_window_get_unsaved (PsppireWindow *w) +{ + return w->unsaved; } + + static void minimise_window (gpointer key, gpointer value, gpointer data)