projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the refresh button on the dialogs.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-buttonbox.c
diff --git
a/src/ui/gui/psppire-buttonbox.c
b/src/ui/gui/psppire-buttonbox.c
index bab2b52850261d6e35406ea314aad6c38056c78e..e5c1c561a76704c59851820541c2212aec6958d2 100644
(file)
--- a/
src/ui/gui/psppire-buttonbox.c
+++ b/
src/ui/gui/psppire-buttonbox.c
@@
-18,12
+18,20
@@
02110-1301, USA. */
02110-1301, USA. */
+#include <config.h>
+
#include <glib.h>
#include <gtk/gtk.h>
#include <gtk/gtksignal.h>
#include "psppire-buttonbox.h"
#include "psppire-dialog.h"
#include <glib.h>
#include <gtk/gtk.h>
#include <gtk/gtksignal.h>
#include "psppire-buttonbox.h"
#include "psppire-dialog.h"
+#include <gettext.h>
+
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
static void psppire_buttonbox_class_init (PsppireButtonBoxClass *);
static void psppire_buttonbox_init (PsppireButtonBox *);
static void psppire_buttonbox_class_init (PsppireButtonBoxClass *);
static void psppire_buttonbox_init (PsppireButtonBox *);
@@
-55,9
+63,6
@@
psppire_button_box_get_type (void)
return buttonbox_type;
}
return buttonbox_type;
}
-static GObjectClass *parent_class = NULL;
-
-
static void
psppire_buttonbox_class_init (PsppireButtonBoxClass *class)
{
static void
psppire_buttonbox_class_init (PsppireButtonBoxClass *class)
{
@@
-88,6
+93,19
@@
ok_button_clicked (GtkWidget *w, gpointer data)
}
}
+static void
+paste_button_clicked (GtkWidget *w, gpointer data)
+{
+ PsppireDialog *dialog;
+
+ dialog = PSPPIRE_DIALOG (gtk_widget_get_toplevel (w));
+
+ dialog->response = PSPPIRE_RESPONSE_PASTE;
+
+ psppire_dialog_close (dialog);
+}
+
+
static void
refresh_clicked (GtkWidget *w, gpointer data)
{
static void
refresh_clicked (GtkWidget *w, gpointer data)
{
@@
-95,7
+113,7
@@
refresh_clicked (GtkWidget *w, gpointer data)
dialog = PSPPIRE_DIALOG (gtk_widget_get_toplevel (w));
dialog = PSPPIRE_DIALOG (gtk_widget_get_toplevel (w));
- psppire_dialog_reload (dialog
, data
);
+ psppire_dialog_reload (dialog);
}
}
@@
-109,6
+127,12
@@
psppire_buttonbox_init (PsppireButtonBox *buttonbox)
g_signal_connect (button, "clicked", G_CALLBACK (ok_button_clicked), NULL);
gtk_widget_show (button);
g_signal_connect (button, "clicked", G_CALLBACK (ok_button_clicked), NULL);
gtk_widget_show (button);
+ button = gtk_button_new_with_mnemonic (_("_Paste"));
+ g_signal_connect (button, "clicked", G_CALLBACK (paste_button_clicked),
+ NULL);
+ gtk_box_pack_start_defaults (GTK_BOX (buttonbox), button);
+ gtk_widget_show (button);
+
button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
g_signal_connect (button, "clicked", G_CALLBACK (close_dialog), NULL);
gtk_box_pack_start_defaults (GTK_BOX (buttonbox), button);
button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
g_signal_connect (button, "clicked", G_CALLBACK (close_dialog), NULL);
gtk_box_pack_start_defaults (GTK_BOX (buttonbox), button);
@@
-123,7
+147,7
@@
psppire_buttonbox_init (PsppireButtonBox *buttonbox)
gtk_box_pack_start_defaults (GTK_BOX (buttonbox), button);
gtk_widget_show (button);
gtk_box_pack_start_defaults (GTK_BOX (buttonbox), button);
gtk_widget_show (button);
- gtk_widget_show (
buttonbox
);
+ gtk_widget_show (
GTK_WIDGET (buttonbox)
);
}
}