projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[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..05ba5d3c9e748c61662bc8ee48914a521938490f 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
@@
-24,7
+21,6
@@
#include <config.h>
#include <gtk/gtk.h>
#include <config.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-46,7
+42,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
+65,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
+172,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
+205,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)
@@
-264,12
+262,12
@@
preview_custom (GtkWidget *w, gpointer data)
union value v;
v.f = 1234.56;
union value v;
v.f = 1234.56;
- sample_text = value_to_text (v, dialog->fmt_l);
+ sample_text = value_to_text (v,
NULL,
dialog->fmt_l);
gtk_label_set_text (GTK_LABEL (dialog->label_psample), sample_text);
g_free (sample_text);
v.f = -v.f;
gtk_label_set_text (GTK_LABEL (dialog->label_psample), sample_text);
g_free (sample_text);
v.f = -v.f;
- sample_text = value_to_text (v, dialog->fmt_l);
+ sample_text = value_to_text (v,
NULL,
dialog->fmt_l);
gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text);
g_free (sample_text);
}
gtk_label_set_text (GTK_LABEL (dialog->label_nsample), sample_text);
g_free (sample_text);
}
@@
-323,19
+321,24
@@
set_format_type_from_treeview (GtkTreeView *treeview, gpointer data)
-/* Create the structure
from the XML definitions
*/
+/* Create the structure */
struct var_type_dialog *
struct var_type_dialog *
-var_type_dialog_create (G
ladeXML *xm
l)
+var_type_dialog_create (G
tkWindow *topleve
l)
{
gint i;
struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
{
gint i;
struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog));
-
g_assert (xml
);
+
GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui"
);
dialog->window = get_widget_assert (xml,"var_type_dialog");
dialog->window = get_widget_assert (xml,"var_type_dialog");
+ dialog->active_button = -1;
+
+
+ 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_set_transient_for (GTK_WINDOW (dialog->window),
-
GTK_WINDOW (get_widget_assert (xml, "data_editor"))
);
+
toplevel
);
dialog->radioButton[BUTTON_NUMERIC] =
get_widget_assert (xml,"radiobutton1");
dialog->radioButton[BUTTON_NUMERIC] =
get_widget_assert (xml,"radiobutton1");
@@
-441,7
+444,7
@@
var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
g_object_unref (list_store);
- g_signal_connect (
GTK_OBJECT (dialog->date_format_treeview)
, "cursor-changed",
+ g_signal_connect (
dialog->date_format_treeview
, "cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
@@
-464,7
+467,7
@@
var_type_dialog_create (GladeXML *xml)
for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i )
{
for ( i = 0 ; i < sizeof (dollar_format)/sizeof (dollar_format[0]) ; ++i )
{
- char *template =
fmt
_dollar_template (&dollar_format[i]);
+ char *template =
settings
_dollar_template (&dollar_format[i]);
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
0, template,
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
0, template,
@@
-478,11
+481,11
@@
var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
g_object_unref (list_store);
- g_signal_connect (
GTK_OBJECT (dialog->dollar_treeview)
,
+ g_signal_connect (
dialog->dollar_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_from_treeview), dialog);
- g_signal_connect_swapped (
GTK_OBJECT (dialog->dollar_treeview)
,
+ g_signal_connect_swapped (
dialog->dollar_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (update_width_decimals), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (update_width_decimals), dialog);
@@
-522,33
+525,39
@@
var_type_dialog_create (GladeXML *xml)
g_object_unref (list_store);
g_object_unref (list_store);
- g_signal_connect (
GTK_OBJECT (dialog->custom_treeview)
,
+ g_signal_connect (
dialog->custom_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (set_format_type_from_treeview), dialog);
- g_signal_connect (
GTK_OBJECT (dialog->custom_treeview)
,
+ g_signal_connect (
dialog->custom_treeview
,
"cursor-changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
"cursor-changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
- g_signal_connect (
GTK_OBJECT (dialog->entry_width)
,
+ g_signal_connect (
dialog->entry_width
,
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
- g_signal_connect (
GTK_OBJECT (dialog->entry_decimals)
,
+ g_signal_connect (
dialog->entry_decimals
,
"changed",
GTK_SIGNAL_FUNC (preview_custom), dialog);
"changed",
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);
}
}
+ g_object_unref (xml);
+
return dialog;
}
return dialog;
}
@@
-781,14
+790,14
@@
on_var_type_ok_clicked (GtkWidget *w, gpointer data)
gint decimals = atoi (gtk_entry_get_text
(GTK_ENTRY (dialog->entry_decimals)));
gint decimals = atoi (gtk_entry_get_text
(GTK_ENTRY (dialog->entry_decimals)));
- gint new_type = VA
R
_NUMERIC;
+ gint new_type = VA
L
_NUMERIC;
gint new_width = 0;
bool result = false;
struct fmt_spec spec;
switch (dialog->active_button)
{
case BUTTON_STRING:
gint new_width = 0;
bool result = false;
struct fmt_spec spec;
switch (dialog->active_button)
{
case BUTTON_STRING:
- new_type = VA
R
_STRING;
+ new_type = VA
L
_STRING;
new_width = width;
result = make_output_format_try (&spec, FMT_A, width, 0);
break;
new_width = width;
result = make_output_format_try (&spec, FMT_A, width, 0);
break;
@@
-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;
}