X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window.c;h=576d3159deceb63bcc5be797607eb2ed8f0b6412;hb=6234cd81c073b8a08077847d08a22c1715d903ae;hp=1e2e75d3570902c0146539dafd7c07fa7e0ea9d9;hpb=211e4f7fcacb8aab37e2fbc3e7387fb448f8eb56;p=pspp-builds.git diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 1e2e75d3..576d3159 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -16,11 +16,13 @@ #include + #include #include #include #include #include +#include #include @@ -30,6 +32,7 @@ #include "psppire-window.h" #include "psppire-window-register.h" +#include "psppire-conf.h" static void psppire_window_base_finalize (PsppireWindowClass *, gpointer); static void psppire_window_base_init (PsppireWindowClass *class); @@ -37,7 +40,6 @@ static void psppire_window_class_init (PsppireWindowClass *class); static void psppire_window_init (PsppireWindow *window); -static PsppireWindowClass *the_class; static GObjectClass *parent_class; GType @@ -92,7 +94,8 @@ 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); + window->basename ? window->basename : "", + mdash, window->description); if ( window->unsaved) g_string_prepend_c (title, '*'); @@ -188,6 +191,29 @@ psppire_window_get_property (GObject *object, } +static void +on_realize (GtkWindow *window, gpointer data) +{ + PsppireConf *conf = psppire_conf_new (); + + const gchar *base = G_OBJECT_TYPE_NAME (window); + + psppire_conf_set_window_geometry (conf, base, window); +} + + +static gboolean +on_configure (GtkWidget *window, GdkEventConfigure *event, gpointer data) +{ + const gchar *base = G_OBJECT_TYPE_NAME (window); + + PsppireConf *conf = psppire_conf_new (); + + psppire_conf_save_window_geometry (conf, base, event); + + return FALSE; +} + static void psppire_window_finalize (GObject *object) @@ -245,7 +271,6 @@ psppire_window_class_init (PsppireWindowClass *class) PROP_FILENAME, filename_spec); - the_class = class; parent_class = g_type_class_peek_parent (class); } @@ -349,12 +374,22 @@ insert_existing_items (PsppireWindow *window) static gboolean -on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data) +on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data) { - PsppireWindow *dw = PSPPIRE_WINDOW (user_data); - PsppireWindowRegister *reg = psppire_window_register_new (); + if ( w->unsaved ) + { + gint response = psppire_window_query_save (w); + + if ( response == GTK_RESPONSE_CANCEL) + return TRUE; + + if ( response == GTK_RESPONSE_ACCEPT) + { + psppire_window_save (w); + } + } if ( 1 == psppire_window_register_n_items (reg)) gtk_main_quit (); @@ -386,15 +421,24 @@ psppire_window_init (PsppireWindow *window) window->unsaved = FALSE; - g_signal_connect (window, "delete-event", G_CALLBACK (on_delete), window); + g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); + + g_object_set (window, "icon-name", "psppicon", NULL); + + g_signal_connect (window, "configure-event", + G_CALLBACK (on_configure), window); + + g_signal_connect (window, "realize", + G_CALLBACK (on_realize), window); + } -/* If the buffer's modified flag is set, - ask the user if the buffer should be saved. - Return TRUE if is should. +/* + Ask the user if the buffer should be saved. + Return the response. */ -gboolean +gint psppire_window_query_save (PsppireWindow *se) { gint response; @@ -403,12 +447,9 @@ psppire_window_query_save (PsppireWindow *se) 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); + g_return_val_if_fail (filename != NULL, GTK_RESPONSE_NONE); dialog = gtk_message_dialog_new (GTK_WINDOW (se), @@ -435,12 +476,7 @@ psppire_window_query_save (PsppireWindow *se) gtk_widget_destroy (dialog); - if ( response == GTK_RESPONSE_ACCEPT ) - { - return TRUE; - } - - return FALSE; + return response; } @@ -491,3 +527,113 @@ psppire_window_minimise_all (void) g_hash_table_foreach (reg->name_table, minimise_window, NULL); } + + + + +GType +psppire_window_model_get_type (void) +{ + static GType window_model_type = 0; + + if (! window_model_type) + { + static const GTypeInfo window_model_info = + { + sizeof (PsppireWindowIface), /* class_size */ + NULL, /* base_init */ + NULL, /* base_finalize */ + NULL, + NULL, /* class_finalize */ + NULL, /* class_data */ + 0, + 0, /* n_preallocs */ + NULL + }; + + window_model_type = + g_type_register_static (G_TYPE_INTERFACE, "PsppireWindowModel", + &window_model_info, 0); + + g_type_interface_add_prerequisite (window_model_type, G_TYPE_OBJECT); + } + + return window_model_type; +} + + +void +psppire_window_save (PsppireWindow *w) +{ + PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w); + + g_assert (PSPPIRE_IS_WINDOW_MODEL (w)); + + g_assert (i); + + g_return_if_fail (i->save); + + i->save (w); +} + +extern GtkRecentManager *the_recent_mgr; + +static void add_most_recent (const char *file_name, GtkRecentManager *rm); +static void delete_recent (const char *file_name, GtkRecentManager *rm); + +gboolean +psppire_window_load (PsppireWindow *w, const gchar *file) +{ + gboolean ok; + PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w); + + g_assert (PSPPIRE_IS_WINDOW_MODEL (w)); + + g_assert (i); + + g_return_val_if_fail (i->load, FALSE); + + ok = i->load (w, file); + + if ( ok ) + add_most_recent (file, the_recent_mgr); + else + delete_recent (file, the_recent_mgr); + + psppire_window_set_unsaved (w, FALSE); + + return ok; +} + + +/* Puts FILE_NAME into the recent list. + If it's already in the list, it moves it to the top +*/ +static void +add_most_recent (const char *file_name, GtkRecentManager *rm) +{ + gchar *uri = g_filename_to_uri (file_name, NULL, NULL); + + if ( uri ) + gtk_recent_manager_add_item (rm, uri); + + g_free (uri); +} + + + +/* + If FILE_NAME exists in the recent list, then delete it. + */ +static void +delete_recent (const char *file_name, GtkRecentManager *rm) +{ + gchar *uri = g_filename_to_uri (file_name, NULL, NULL); + + if ( uri ) + gtk_recent_manager_remove_item (rm, uri, NULL); + + g_free (uri); + +} +