X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Fpsppire-buttonbox.c;h=24d82d27d3ac9a9b2e139cf2306880c98dd4bb81;hb=fc3f48c05a02829466ab0dc472c96be3e14259e3;hp=921375f82e82e21fd6d090e949cdebea4e92d6c0;hpb=b06c888cf2e8c126b04d4678120439533a5086e5;p=pspp
diff --git a/src/ui/gui/psppire-buttonbox.c b/src/ui/gui/psppire-buttonbox.c
index 921375f82e..24d82d27d3 100644
--- a/src/ui/gui/psppire-buttonbox.c
+++ b/src/ui/gui/psppire-buttonbox.c
@@ -1,31 +1,29 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include
#include
#include
-#include
#include "psppire-buttonbox.h"
#include "psppire-dialog.h"
+#include "helper.h"
+
#include
#define _(msgid) gettext (msgid)
@@ -59,64 +57,92 @@ psppire_button_box_get_type (void)
};
button_box_type = g_type_register_static (GTK_TYPE_BUTTON_BOX,
- "PsppireButtonBox", &button_box_info, 0);
+ "PsppireButtonBox", &button_box_info, G_TYPE_FLAG_ABSTRACT);
}
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)
+
+ 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);
- 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;
+
+ case PROP_DEFAULT:
+ g_value_set_flags (value, bb->def);
- g_value_set_flags (value, flags);
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
@@ -126,12 +152,14 @@ 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)
@@ -143,21 +171,29 @@ psppire_button_box_class_init (PsppireButtonBoxClass *class)
button_flags =
g_param_spec_flags ("buttons",
- _("Buttons"),
- _("The mask that decides what buttons appear in the button box"),
- G_TYPE_PSPPIRE_BUTTON_MASK,
+ "Buttons",
+ "The mask that decides what buttons appear in the button box",
+ PSPPIRE_TYPE_BUTTON_MASK,
PSPPIRE_BUTTON_OK_MASK |
PSPPIRE_BUTTON_CANCEL_MASK |
PSPPIRE_BUTTON_RESET_MASK |
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
@@ -179,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)
@@ -186,24 +230,34 @@ close_dialog (GtkWidget *w, gpointer data)
close_and_respond (w, GTK_RESPONSE_CLOSE);
}
+static void
+continue_button_clicked (GtkWidget *w, gpointer data)
+{
+ 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);
}
@@ -222,12 +276,55 @@ refresh_clicked (GtkWidget *w, gpointer data)
}
+
+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;
+
+ /* Set the sensitivity of all the 'executive order' buttons */
+ gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_OK]), valid);
+ gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_PASTE]), valid);
+ gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_GOTO]), valid);
+ gtk_widget_set_sensitive (GTK_WIDGET (bb->button[PSPPIRE_BUTTON_CONTINUE]), valid);
+}
+
+static void
+on_realize (GtkWidget *buttonbox, gpointer data)
+{
+ GtkWidget *toplevel = gtk_widget_get_toplevel (buttonbox);
+
+ if ( PSPPIRE_IS_DIALOG (toplevel))
+ {
+ 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)
{
+ bb->def = PSPPIRE_BUTTON_CONTINUE;
bb->button[PSPPIRE_BUTTON_OK] = gtk_button_new_from_stock (GTK_STOCK_OK);
- gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_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);
g_object_set (bb->button[PSPPIRE_BUTTON_OK], "no-show-all", TRUE, NULL);
@@ -235,7 +332,7 @@ psppire_button_box_init (PsppireButtonBox *bb)
bb->button[PSPPIRE_BUTTON_GOTO] =
gtk_button_new_from_stock (GTK_STOCK_JUMP_TO);
- gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_GOTO]);
+ 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);
g_object_set (bb->button[PSPPIRE_BUTTON_GOTO], "no-show-all", TRUE, NULL);
@@ -244,36 +341,46 @@ psppire_button_box_init (PsppireButtonBox *bb)
bb->button[PSPPIRE_BUTTON_CONTINUE] =
gtk_button_new_with_mnemonic (_("Continue"));
- gtk_box_pack_start_defaults (GTK_BOX (bb),
+ psppire_box_pack_start_defaults (GTK_BOX (bb),
bb->button[PSPPIRE_BUTTON_CONTINUE]);
+ g_signal_connect (bb->button[PSPPIRE_BUTTON_CONTINUE], "clicked",
+ G_CALLBACK (continue_button_clicked), NULL);
g_object_set (bb->button[PSPPIRE_BUTTON_CONTINUE],
"no-show-all", TRUE, NULL);
- bb->button[PSPPIRE_BUTTON_PASTE] = gtk_button_new_with_mnemonic (_("_Paste"));
+ bb->button[PSPPIRE_BUTTON_PASTE] = gtk_button_new_from_stock (GTK_STOCK_PASTE);
g_signal_connect (bb->button[PSPPIRE_BUTTON_PASTE], "clicked",
G_CALLBACK (paste_button_clicked), NULL);
- gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_PASTE]);
+ 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);
g_signal_connect (bb->button[PSPPIRE_BUTTON_CANCEL], "clicked",
G_CALLBACK (close_dialog), NULL);
- gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_CANCEL]);
+ 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_from_stock (GTK_STOCK_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 (GTK_STOCK_REFRESH);
+
+ bb->button[PSPPIRE_BUTTON_RESET] = gtk_button_new_from_stock ("pspp-stock-reset");
g_signal_connect (bb->button[PSPPIRE_BUTTON_RESET], "clicked",
G_CALLBACK (refresh_clicked), NULL);
- gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_RESET]);
+ 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);
- gtk_box_pack_start_defaults (GTK_BOX (bb), bb->button[PSPPIRE_BUTTON_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);
@@ -294,6 +401,8 @@ psppire_button_box_init (PsppireButtonBox *bb)
g_value_unset (&value);
}
+
+ g_signal_connect (bb, "realize", G_CALLBACK (on_realize), NULL);
}
@@ -359,7 +468,7 @@ _psppire_button_box_child_requisition (GtkWidget *widget,
child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child->widget))
{
nchildren += 1;
gtk_widget_size_request (child->widget, &child_requisition);
@@ -392,16 +501,17 @@ 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 }
};
-
+
ftype = g_flags_register_static
(g_intern_static_string ("PsppireButtonFlags"), values);