projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xalloc.h-instead-of-alloc.h.patch from patch #6230.
[pspp-builds.git]
/
src
/
ui
/
gui
/
var-type-dialog.c
diff --git
a/src/ui/gui/var-type-dialog.c
b/src/ui/gui/var-type-dialog.c
index d3eb97edf0515195a63418c9730eb1c53353f7ce..dfdd895f6192f9964bda5785b02748d85441fe29 100644
(file)
--- a/
src/ui/gui/var-type-dialog.c
+++ b/
src/ui/gui/var-type-dialog.c
@@
-1,21
+1,18
@@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2005, 2006 Free Software Foundation
Copyright (C) 2005, 2006 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 <http://www.gnu.org/licenses/>. */
/* This module describes the behaviour of the Variable Type dialog box used
/* This module describes the behaviour of the Variable Type dialog box used
@@
-46,7
+43,7
@@
struct tgs
struct format_opt {
struct format_opt {
- gchar desc[
18
];
+ gchar desc[
21
];
struct fmt_spec spec;
};
struct fmt_spec spec;
};
@@
-69,7
+66,8
@@
static const struct format_opt format_option[] =
{ "mmm yy", {FMT_MOYR, 6, 0} },
{ "dd WK yyyy", {FMT_WKYR, 10, 0} },
{ "dd WK yy", {FMT_WKYR, 8, 0} },
{ "mmm yy", {FMT_MOYR, 6, 0} },
{ "dd WK yyyy", {FMT_WKYR, 10, 0} },
{ "dd WK yy", {FMT_WKYR, 8, 0} },
- { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}}
+ { "dd-mmm-yyyy HH:MM", {FMT_DATETIME, 17, 0}},
+ { "dd-mmm-yyyy HH:MM:SS", {FMT_DATETIME, 20, 0}}
};
};
@@
-175,6
+173,7
@@
on_toggle_2 (GtkToggleButton *togglebutton, gpointer user_data)
switch (dialog->active_button)
{
case BUTTON_STRING:
switch (dialog->active_button)
{
case BUTTON_STRING:
+ gtk_widget_show (dialog->entry_width);
gtk_widget_show (dialog->width_decimals);
gtk_widget_hide (dialog->label_decimals);
gtk_widget_hide (dialog->entry_decimals);
gtk_widget_show (dialog->width_decimals);
gtk_widget_hide (dialog->label_decimals);
gtk_widget_hide (dialog->entry_decimals);
@@
-207,8
+206,8
@@
on_toggle_2 (GtkToggleButton *togglebutton, gpointer user_data)
static gint on_var_type_ok_clicked (GtkWidget *w, gpointer data);
static gint on_var_type_ok_clicked (GtkWidget *w, gpointer data);
+static gint hide_dialog (GtkWidget *w, gpointer data);
-#define LEN 20
static void
add_to_group (GtkWidget *w, gpointer data)
static void
add_to_group (GtkWidget *w, gpointer data)
@@
-334,6
+333,10
@@
var_type_dialog_create (GladeXML *xml)
dialog->window = get_widget_assert (xml,"var_type_dialog");
dialog->window = get_widget_assert (xml,"var_type_dialog");
+
+ g_signal_connect (dialog->window, "delete-event",
+ G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
GTK_WINDOW (get_widget_assert (xml, "data_editor")));
gtk_window_set_transient_for (GTK_WINDOW (dialog->window),
GTK_WINDOW (get_widget_assert (xml, "data_editor")));
@@
-542,11
+545,17
@@
var_type_dialog_create (GladeXML *xml)
GTK_SIGNAL_FUNC (preview_custom), dialog);
GTK_SIGNAL_FUNC (preview_custom), dialog);
- /* Connect the OK button */
+ /* Connect t
o t
he OK button */
g_signal_connect (dialog->ok, "clicked", G_CALLBACK (on_var_type_ok_clicked),
dialog);
g_signal_connect (dialog->ok, "clicked", G_CALLBACK (on_var_type_ok_clicked),
dialog);
+ /* And the cancel button */
+ g_signal_connect (get_widget_assert (xml, "var_type_cancel") , "clicked",
+ G_CALLBACK (hide_dialog),
+ dialog);
+
+
}
return dialog;
}
return dialog;
@@
-832,10
+841,12
@@
on_var_type_ok_clicked (GtkWidget *w, gpointer data)
-gint
-
on_var_type_cancel_clicked
(GtkWidget *w, gpointer data)
+
static
gint
+
hide_dialog
(GtkWidget *w, gpointer data)
{
{
- gtk_widget_hide (w);
+ struct var_type_dialog *dialog = data;
+
+ gtk_widget_hide (dialog->window);
return FALSE;
}
return FALSE;
}