X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.c;h=87989cf12bfc76e4a6ccf8f57714afea41a93437;hb=b5a56f8d1592fd0d9bf981d71e28851c4e733fef;hp=c3b94dd05c918cdcc38f386e321cebf96f7b46f5;hpb=2b998cd1a6d72214726d05cc050b816d131399e6;p=pspp diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c index c3b94dd05c..87989cf12b 100644 --- a/src/ui/gui/psppire-buttonbox.c +++ b/src/ui/gui/psppire-buttonbox.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2010 Free Software Foundation + Copyright (C) 2007, 2010, 2011, 2012 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 @@ -32,12 +32,12 @@ GType psppire_button_flags_get_type (void); -static void psppire_button_box_class_init (PsppireButtonBoxClass *); -static void psppire_button_box_init (PsppireButtonBox *); +static void psppire_button_box_class_init (PsppireButtonboxClass *); +static void psppire_button_box_init (PsppireButtonbox *); GType -psppire_button_box_get_type (void) +psppire_buttonbox_get_type (void) { static GType button_box_type = 0; @@ -45,76 +45,104 @@ psppire_button_box_get_type (void) { static const GTypeInfo button_box_info = { - sizeof (PsppireButtonBoxClass), + sizeof (PsppireButtonboxClass), NULL, /* base_init */ NULL, /* base_finalize */ (GClassInitFunc) psppire_button_box_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (PsppireButtonBox), + sizeof (PsppireButtonbox), 0, (GInstanceInitFunc) psppire_button_box_init, }; button_box_type = g_type_register_static (GTK_TYPE_BUTTON_BOX, - "PsppireButtonBox", &button_box_info, G_TYPE_FLAG_ABSTRACT); + "PsppireButtonbox", &button_box_info, 0); } return button_box_type; } enum { - PROP_BUTTONS = 1 + PROP_BUTTONS = 1, + PROP_DEFAULT = 2 }; +static void +set_default (PsppireButtonbox *bb) +{ + int i; + + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + if (bb->def == (1 << i)) + { + gtk_widget_set_can_default (bb->button[i], TRUE); + gtk_widget_grab_default (bb->button[i]); + } +} + static void psppire_buttonbox_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { gint i; guint flags; - PsppireButtonBox *bb = PSPPIRE_BUTTONBOX (object); - if ( prop_id != PROP_BUTTONS) + PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (object); + + switch (prop_id) { + case PROP_BUTTONS: + flags = g_value_get_flags (value); + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); + break; + + case PROP_DEFAULT: + bb->def = g_value_get_flags (value); + if (gtk_widget_get_realized (GTK_WIDGET (bb))) + set_default (bb); + break; + + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - return ; } - - flags = g_value_get_flags (value); - - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) - g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); } static void psppire_buttonbox_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { guint flags = 0; gint i; - PsppireButtonBox *bb = PSPPIRE_BUTTONBOX (object); + PsppireButtonbox *bb = PSPPIRE_BUTTONBOX (object); - if (PROP_BUTTONS != prop_id) + switch (prop_id) { - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - return; - } + case PROP_BUTTONS: + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) + { + gboolean visibility; + g_object_get (bb->button[i], "visible", &visibility, NULL); - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) - { - gboolean visibility; - g_object_get (bb->button[i], "visible", &visibility, NULL); + if ( visibility ) + flags |= (0x01 << i); + } - if ( visibility ) - flags |= (0x01 << i); - } + g_value_set_flags (value, flags); + break; - g_value_set_flags (value, flags); + case PROP_DEFAULT: + g_value_set_flags (value, bb->def); + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } @@ -124,15 +152,17 @@ typedef enum PSPPIRE_BUTTON_GOTO_MASK = (1 << PSPPIRE_BUTTON_GOTO), PSPPIRE_BUTTON_CONTINUE_MASK = (1 << PSPPIRE_BUTTON_CONTINUE), PSPPIRE_BUTTON_CANCEL_MASK = (1 << PSPPIRE_BUTTON_CANCEL), + PSPPIRE_BUTTON_CLOSE_MASK = (1 << PSPPIRE_BUTTON_CLOSE), PSPPIRE_BUTTON_HELP_MASK = (1 << PSPPIRE_BUTTON_HELP), PSPPIRE_BUTTON_RESET_MASK = (1 << PSPPIRE_BUTTON_RESET), PSPPIRE_BUTTON_PASTE_MASK = (1 << PSPPIRE_BUTTON_PASTE) } PsppireButtonMask; static GParamSpec *button_flags; +static GParamSpec *default_flags; static void -psppire_button_box_class_init (PsppireButtonBoxClass *class) +psppire_button_box_class_init (PsppireButtonboxClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); @@ -150,12 +180,20 @@ psppire_button_box_class_init (PsppireButtonBoxClass *class) PSPPIRE_BUTTON_HELP_MASK | PSPPIRE_BUTTON_PASTE_MASK, G_PARAM_READWRITE); - - g_object_class_install_property (object_class, PROP_BUTTONS, button_flags); + default_flags = + g_param_spec_flags ("default", + "Default", + "The mask that decides what what button grabs the default", + PSPPIRE_TYPE_BUTTON_MASK, + 0, + G_PARAM_READWRITE); + g_object_class_install_property (object_class, + PROP_DEFAULT, + default_flags); } static void @@ -177,6 +215,14 @@ close_and_respond (GtkWidget *w, gint response) psppire_dialog_close (dialog); } +static gboolean +is_acceptable (GtkWidget *w) +{ + GtkWidget *toplevel = gtk_widget_get_toplevel (w); + + return (PSPPIRE_IS_DIALOG (toplevel) + && psppire_dialog_is_acceptable (PSPPIRE_DIALOG (toplevel))); +} static void close_dialog (GtkWidget *w, gpointer data) @@ -187,27 +233,31 @@ close_dialog (GtkWidget *w, gpointer data) static void continue_button_clicked (GtkWidget *w, gpointer data) { - close_and_respond (w, PSPPIRE_RESPONSE_CONTINUE); + if (is_acceptable (w)) + close_and_respond (w, PSPPIRE_RESPONSE_CONTINUE); } static void ok_button_clicked (GtkWidget *w, gpointer data) { - close_and_respond (w, GTK_RESPONSE_OK); + if (is_acceptable (w)) + close_and_respond (w, GTK_RESPONSE_OK); } static void paste_button_clicked (GtkWidget *w, gpointer data) { - close_and_respond (w, PSPPIRE_RESPONSE_PASTE); + if (is_acceptable (w)) + close_and_respond (w, PSPPIRE_RESPONSE_PASTE); } static void goto_button_clicked (GtkWidget *w, gpointer data) { - close_and_respond (w, PSPPIRE_RESPONSE_GOTO); + if (is_acceptable (w)) + close_and_respond (w, PSPPIRE_RESPONSE_GOTO); } @@ -225,12 +275,24 @@ refresh_clicked (GtkWidget *w, gpointer data) psppire_dialog_reload (dialog); } +static void +help_clicked (GtkWidget *w, gpointer data) +{ + GtkWidget *toplevel = gtk_widget_get_toplevel (w); + PsppireDialog *dialog; + if ( ! PSPPIRE_IS_DIALOG (toplevel)) + return; + + dialog = PSPPIRE_DIALOG (toplevel); + + psppire_dialog_help (dialog); +} static void on_validity_change (GtkWidget *toplevel, gboolean valid, gpointer data) { - PsppireButtonBox *bb = data; + PsppireButtonbox *bb = data; /* Set the sensitivity of all the 'executive order' buttons */ gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_OK]), valid); @@ -249,13 +311,15 @@ on_realize (GtkWidget *buttonbox, gpointer data) g_signal_connect (toplevel, "validity-changed", G_CALLBACK (on_validity_change), buttonbox); } + set_default (PSPPIRE_BUTTONBOX (buttonbox)); } static void -psppire_button_box_init (PsppireButtonBox *bb) +psppire_button_box_init (PsppireButtonbox *bb) { + bb->def = PSPPIRE_BUTTON_CONTINUE; - bb->button[PSPPIRE_BUTTON_OK] = gtk_button_new_from_stock (GTK_STOCK_OK); + bb->button[PSPPIRE_BUTTON_OK] = gtk_button_new_with_label (_("OK")); psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_OK]); g_signal_connect (bb->button[PSPPIRE_BUTTON_OK], "clicked", G_CALLBACK (ok_button_clicked), NULL); @@ -263,7 +327,7 @@ psppire_button_box_init (PsppireButtonBox *bb) bb->button[PSPPIRE_BUTTON_GOTO] = - gtk_button_new_from_stock (GTK_STOCK_JUMP_TO); + gtk_button_new_with_label (_("Go To")); psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_GOTO]); g_signal_connect (bb->button[PSPPIRE_BUTTON_GOTO], "clicked", G_CALLBACK (goto_button_clicked), NULL); @@ -273,12 +337,6 @@ psppire_button_box_init (PsppireButtonBox *bb) bb->button[PSPPIRE_BUTTON_CONTINUE] = gtk_button_new_with_mnemonic (_("Continue")); - GTK_WIDGET_SET_FLAGS (bb->button[PSPPIRE_BUTTON_CONTINUE], - GTK_CAN_DEFAULT); - - g_signal_connect (bb->button[PSPPIRE_BUTTON_CONTINUE], "realize", - G_CALLBACK (gtk_widget_grab_default), NULL); - psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_CONTINUE]); g_signal_connect (bb->button[PSPPIRE_BUTTON_CONTINUE], "clicked", @@ -289,27 +347,35 @@ psppire_button_box_init (PsppireButtonBox *bb) - bb->button[PSPPIRE_BUTTON_PASTE] = gtk_button_new_from_stock (GTK_STOCK_PASTE); + bb->button[PSPPIRE_BUTTON_PASTE] = gtk_button_new_with_label (_("Paste")); g_signal_connect (bb->button[PSPPIRE_BUTTON_PASTE], "clicked", G_CALLBACK (paste_button_clicked), NULL); psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_PASTE]); g_object_set (bb->button[PSPPIRE_BUTTON_PASTE], "no-show-all", TRUE, NULL); - bb->button[PSPPIRE_BUTTON_CANCEL] = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + bb->button[PSPPIRE_BUTTON_CANCEL] = gtk_button_new_with_label (_("Cancel")); g_signal_connect (bb->button[PSPPIRE_BUTTON_CANCEL], "clicked", G_CALLBACK (close_dialog), NULL); psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_CANCEL]); g_object_set (bb->button[PSPPIRE_BUTTON_CANCEL], "no-show-all", TRUE, NULL); + bb->button[PSPPIRE_BUTTON_CLOSE] = gtk_button_new_with_label (_("Close")); + g_signal_connect (bb->button[PSPPIRE_BUTTON_CLOSE], "clicked", + G_CALLBACK (close_dialog), NULL); + psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_CLOSE]); + g_object_set (bb->button[PSPPIRE_BUTTON_CLOSE], "no-show-all", TRUE, NULL); - bb->button[PSPPIRE_BUTTON_RESET] = gtk_button_new_from_stock ("pspp-stock-reset"); + + bb->button[PSPPIRE_BUTTON_RESET] = gtk_button_new_with_label (_("Reset")); g_signal_connect (bb->button[PSPPIRE_BUTTON_RESET], "clicked", G_CALLBACK (refresh_clicked), NULL); psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_RESET]); g_object_set (bb->button[PSPPIRE_BUTTON_RESET], "no-show-all", TRUE, NULL); - bb->button[PSPPIRE_BUTTON_HELP] = gtk_button_new_from_stock (GTK_STOCK_HELP); + bb->button[PSPPIRE_BUTTON_HELP] = gtk_button_new_with_label (_("Help")); + g_signal_connect (bb->button[PSPPIRE_BUTTON_HELP], "clicked", + G_CALLBACK (help_clicked), NULL); psppire_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_HELP]); g_object_set (bb->button[PSPPIRE_BUTTON_HELP], "no-show-all", TRUE, NULL); @@ -325,7 +391,7 @@ psppire_button_box_init (PsppireButtonBox *bb) flags = g_value_get_flags (&value); - for (i = 0 ; i < n_PsppireButtonBoxButtons ; ++i ) + for (i = 0 ; i < n_PsppireButtonboxButtons ; ++i ) g_object_set (bb->button[i], "visible", 0x01 & (flags >> i) , NULL); g_value_unset (&value); @@ -335,94 +401,6 @@ psppire_button_box_init (PsppireButtonBox *bb) g_signal_connect (bb, "realize", G_CALLBACK (on_realize), NULL); } - -/* This function is lifted verbatim from the Gtk2.10.6 library */ - -void -_psppire_button_box_child_requisition (GtkWidget *widget, - int *nvis_children, - int *nvis_secondaries, - int *width, - int *height) -{ - GtkButtonBox *bbox; - GtkBoxChild *child; - GList *children; - gint nchildren; - gint nsecondaries; - gint needed_width; - gint needed_height; - GtkRequisition child_requisition; - gint ipad_w; - gint ipad_h; - gint width_default; - gint height_default; - gint ipad_x_default; - gint ipad_y_default; - - gint child_min_width; - gint child_min_height; - gint ipad_x; - gint ipad_y; - - g_return_if_fail (GTK_IS_BUTTON_BOX (widget)); - - bbox = GTK_BUTTON_BOX (widget); - - gtk_widget_style_get (widget, - "child-min-width", &width_default, - "child-min-height", &height_default, - "child-internal-pad-x", &ipad_x_default, - "child-internal-pad-y", &ipad_y_default, - NULL); - - child_min_width = bbox->child_min_width != GTK_BUTTONBOX_DEFAULT - ? bbox->child_min_width : width_default; - child_min_height = bbox->child_min_height !=GTK_BUTTONBOX_DEFAULT - ? bbox->child_min_height : height_default; - ipad_x = bbox->child_ipad_x != GTK_BUTTONBOX_DEFAULT - ? bbox->child_ipad_x : ipad_x_default; - ipad_y = bbox->child_ipad_y != GTK_BUTTONBOX_DEFAULT - ? bbox->child_ipad_y : ipad_y_default; - - nchildren = 0; - nsecondaries = 0; - children = GTK_BOX(bbox)->children; - needed_width = child_min_width; - needed_height = child_min_height; - ipad_w = ipad_x * 2; - ipad_h = ipad_y * 2; - - while (children) - { - child = children->data; - children = children->next; - - if (GTK_WIDGET_VISIBLE (child->widget)) - { - nchildren += 1; - gtk_widget_size_request (child->widget, &child_requisition); - - if (child_requisition.width + ipad_w > needed_width) - needed_width = child_requisition.width + ipad_w; - if (child_requisition.height + ipad_h > needed_height) - needed_height = child_requisition.height + ipad_h; - if (child->is_secondary) - nsecondaries++; - } - } - - if (nvis_children) - *nvis_children = nchildren; - if (nvis_secondaries) - *nvis_secondaries = nsecondaries; - if (width) - *width = needed_width; - if (height) - *height = needed_height; -} - - GType psppire_button_flags_get_type (void) { @@ -431,13 +409,14 @@ psppire_button_flags_get_type (void) { static const GFlagsValue values[] = { - { PSPPIRE_BUTTON_OK_MASK, "PSPPIRE_BUTTON_OK_MASK", N_("OK") }, - { PSPPIRE_BUTTON_GOTO_MASK, "PSPPIRE_BUTTON_GOTO_MASK", N_("Go To") }, - { PSPPIRE_BUTTON_CONTINUE_MASK,"PSPPIRE_BUTTON_CONTINUE_MASK", N_("Continue") }, - { PSPPIRE_BUTTON_CANCEL_MASK, "PSPPIRE_BUTTON_CANCEL_MASK", N_("Cancel") }, - { PSPPIRE_BUTTON_HELP_MASK, "PSPPIRE_BUTTON_HELP_MASK", N_("Help") }, - { PSPPIRE_BUTTON_RESET_MASK, "PSPPIRE_BUTTON_RESET_MASK", N_("Reset") }, - { PSPPIRE_BUTTON_PASTE_MASK, "PSPPIRE_BUTTON_PASTE_MASK", N_("Paste") }, + { PSPPIRE_BUTTON_OK_MASK, "PSPPIRE_BUTTON_OK_MASK", "Accept dialog and run it" }, + { PSPPIRE_BUTTON_GOTO_MASK, "PSPPIRE_BUTTON_GOTO_MASK", "Goto case/variable" }, + { PSPPIRE_BUTTON_CONTINUE_MASK,"PSPPIRE_BUTTON_CONTINUE_MASK", "Accept and close the subdialog" }, + { PSPPIRE_BUTTON_CANCEL_MASK, "PSPPIRE_BUTTON_CANCEL_MASK", "Close dialog and discard settings" }, + { PSPPIRE_BUTTON_CLOSE_MASK, "PSPPIRE_BUTTON_CLOSE_MASK", "Close dialog" }, + { PSPPIRE_BUTTON_HELP_MASK, "PSPPIRE_BUTTON_HELP_MASK", "Invoke context sensitive help" }, + { PSPPIRE_BUTTON_RESET_MASK, "PSPPIRE_BUTTON_RESET_MASK", "Restore dialog to its default settings" }, + { PSPPIRE_BUTTON_PASTE_MASK, "PSPPIRE_BUTTON_PASTE_MASK", "Accept dialog and paste syntax" }, { 0, NULL, NULL } };