From: John Darrington Date: Sat, 14 Mar 2009 23:24:12 +0000 (+0900) Subject: Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp X-Git-Tag: v0.7.3~231 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=666b3bc20d87c833bab09901749ab72c82601d4a;hp=428b694be3fe5ab2b4ba430f3a1d12d60a8e510c;p=pspp-builds.git Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp --- diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c index 36ef97f4..d9f6800f 100644 --- a/src/ui/gui/psppire-conf.c +++ b/src/ui/gui/psppire-conf.c @@ -176,6 +176,25 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base, return ok; } +gboolean +psppire_conf_get_boolean (PsppireConf *conf, const gchar *base, + const gchar *name, gboolean *value) +{ + gboolean ok; + GError *err = NULL; + conf_read (conf); + *value = g_key_file_get_boolean (conf->keyfile, + base, + name, &err); + + ok = (err == NULL); + if ( err != NULL ) + g_error_free (err); + + return ok; +} + + void psppire_conf_set_int (PsppireConf *conf, const gchar *base, const gchar *name, @@ -185,7 +204,14 @@ psppire_conf_set_int (PsppireConf *conf, conf_write (conf); } - +void +psppire_conf_set_boolean (PsppireConf *conf, + const gchar *base, const gchar *name, + gboolean value) +{ + g_key_file_set_boolean (conf->keyfile, base, name, value); + conf_write (conf); +} /* A convenience function to set the geometry of a @@ -198,6 +224,7 @@ psppire_conf_set_window_geometry (PsppireConf *conf, { gint height, width; gint x, y; + gboolean maximize; if (psppire_conf_get_int (conf, base, "height", &height) && @@ -212,22 +239,57 @@ psppire_conf_set_window_geometry (PsppireConf *conf, { gtk_window_move (window, x, y); } + + if ( psppire_conf_get_boolean (conf, base, "maximize", &maximize)) + { + if (maximize) + gtk_window_maximize (window); + else + gtk_window_unmaximize (window); + } } /* A convenience function to save the window geometry. This should typically be called from a window's - "configure-event" signal handler + "configure-event" and "window-state-event" signal handlers */ void psppire_conf_save_window_geometry (PsppireConf *conf, const gchar *base, - GdkEventConfigure *event) + GdkEvent *e) { - psppire_conf_set_int (conf, base, "height", event->height); - psppire_conf_set_int (conf, base, "width", event->width); + switch (e->type) + { + case GDK_CONFIGURE: + { + GdkEventConfigure *event = &e->configure; + + if ( gdk_window_get_state (event->window) & + GDK_WINDOW_STATE_MAXIMIZED ) + return; - psppire_conf_set_int (conf, base, "x", event->x); - psppire_conf_set_int (conf, base, "y", event->y); + if ( event->send_event ) + return; + + psppire_conf_set_int (conf, base, "height", event->height); + psppire_conf_set_int (conf, base, "width", event->width); + + psppire_conf_set_int (conf, base, "x", event->x); + psppire_conf_set_int (conf, base, "y", event->y); + } + break; + case GDK_WINDOW_STATE: + { + GdkEventWindowState *event = &e->window_state; + + psppire_conf_set_boolean (conf, base, "maximize", + event->new_window_state & + GDK_WINDOW_STATE_MAXIMIZED ); + } + break; + default: + break; + }; } diff --git a/src/ui/gui/psppire-conf.h b/src/ui/gui/psppire-conf.h index b98c1e65..a7415b24 100644 --- a/src/ui/gui/psppire-conf.h +++ b/src/ui/gui/psppire-conf.h @@ -78,17 +78,25 @@ PsppireConf * psppire_conf_new (void); gboolean psppire_conf_get_int (PsppireConf *, const gchar *, const gchar *, int *); +gboolean psppire_conf_get_boolean (PsppireConf *, + const gchar *, const gchar *, gboolean *); + void psppire_conf_set_int (PsppireConf *conf, const gchar *base, const gchar *name, gint value); +void psppire_conf_set_boolean (PsppireConf *conf, + const gchar *base, const gchar *name, + gboolean value); + + void psppire_conf_set_window_geometry (PsppireConf *conf, const gchar *base, GtkWindow *window); void psppire_conf_save_window_geometry (PsppireConf *, const gchar *, - GdkEventConfigure *); + GdkEvent *); G_END_DECLS diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 5d35551a..c754f730 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -690,6 +690,7 @@ static void fonts_activate (GtkMenuItem *menuitem, gpointer data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de)); PangoFontDescription *current_font; gchar *font_name; GtkWidget *dialog = @@ -704,8 +705,8 @@ fonts_activate (GtkMenuItem *menuitem, gpointer data) g_free (font_name); gtk_window_set_transient_for (GTK_WINDOW (dialog), - GTK_WINDOW (get_widget_assert (de->builder, - "data_editor"))); + GTK_WINDOW (toplevel)); + if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) { const gchar *font = gtk_font_selection_dialog_get_font_name diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 85438003..22b4cf4e 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -267,7 +267,7 @@ delete_event_callback (GtkWidget *w, GdkEvent *e, gpointer data) static gboolean configure_event_callback (GtkDialog *dialog, - GdkEventConfigure *event, gpointer data) + GdkEvent *event, gpointer data) { gchar *base = NULL; diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 103bcdad..d5f3948f 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -203,7 +203,7 @@ on_realize (GtkWindow *window, gpointer data) static gboolean -on_configure (GtkWidget *window, GdkEventConfigure *event, gpointer data) +save_geometry (GtkWidget *window, GdkEvent *event, gpointer data) { const gchar *base = G_OBJECT_TYPE_NAME (window); @@ -431,7 +431,10 @@ psppire_window_init (PsppireWindow *window) g_object_set (window, "icon-name", "psppicon", NULL); g_signal_connect (window, "configure-event", - G_CALLBACK (on_configure), window); + G_CALLBACK (save_geometry), window); + + g_signal_connect (window, "window-state-event", + G_CALLBACK (save_geometry), window); g_signal_connect (window, "realize", G_CALLBACK (on_realize), window);