X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=bec6716689a9501561ced5fe0edcdb4451fd6b01;hb=f15c854d8500105766b2f5666bb62b983ff24f88;hp=5668496833cdd975d1874be4c345de0db54e67d0;hpb=4ea6e37d180c9412cbcd39afa48a516522e6dd71;p=pspp-builds.git diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 56684968..bec67166 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2009 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 @@ -25,22 +25,24 @@ #include #include "helper.h" #include "message-dialog.h" +#include #include #include #include +#include #include - +#include "psppire-syntax-window.h" +#include #include #include #include +#include #include -#include -#include -#include #include "psppire-data-store.h" +#include "xalloc.h" #include @@ -51,9 +53,7 @@ value_to_text (union value v, struct fmt_spec format) { gchar *s = 0; - s = g_new (gchar, format.w + 1); - data_out (&v, &format, s); - s[format.w]='\0'; + s = data_out (&v, &format); g_strchug (s); return s; @@ -85,7 +85,7 @@ text_to_value (const gchar *text, union value *v, } msg_disable (); - ok = data_in (ss_cstr (text), format.type, 0, 0, + ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0, 0, v, fmt_var_width (&format)); msg_enable (); @@ -93,29 +93,81 @@ text_to_value (const gchar *text, union value *v, } -GtkWidget * -get_widget_assert (GladeXML *xml, const gchar *name) +GtkBuilder * +builder_new_real (const gchar *name) +{ + GtkBuilder *builder = gtk_builder_new (); + + GError *err = NULL; + if ( ! gtk_builder_add_from_file (builder, name, &err)) + { + g_critical ("Couldnt open user interface file %s: %s", name, err->message); + g_clear_error (&err); + } + + return builder; +} + + +GObject * +get_object_assert (GtkBuilder *builder, const gchar *name, GType type) { - GtkWidget *w; - g_assert (xml); + GObject *o = NULL; g_assert (name); - w = glade_xml_get_widget (xml, name); + o = gtk_builder_get_object (builder, name); - if ( !w ) - g_warning ("Widget \"%s\" could not be found\n", name); + if ( !o ) + g_critical ("Object \"%s\" could not be found\n", name); - return w; + if ( ! g_type_is_a (G_OBJECT_TYPE (o), type)) + { + g_critical ("Object \"%s\" was expected to have type %s, but in fact has type %s", + name, g_type_name (type), G_OBJECT_TYPE_NAME (o)); + } + + return o; } -/* Converts a string in the pspp locale to utf-8. - The return value must be freed when no longer required*/ + +GtkAction * +get_action_assert (GtkBuilder *builder, const gchar *name) +{ + return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION)); +} + +GtkWidget * +get_widget_assert (GtkBuilder *builder, const gchar *name) +{ + return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET)); +} + +/* This function must be used whenever a filename generated by glib, + (eg, from gtk_file_chooser_get_filename) and passed to the C library, + (eg through a pspp syntax string). +*/ gchar * -pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err) +convert_glib_filename_to_system_filename (const gchar *fname, GError **err) { - return recode_string (CONV_PSPP_TO_UTF8, text, len); + gchar *output_name; + +#ifdef G_OS_WIN32 + const gchar *target_encoding; + gchar *utf8_name = NULL; + + g_get_charset (&target_encoding); + + output_name = g_convert (fname, -1, target_encoding, + "UTF-8", NULL, NULL, err); +#else + output_name = xstrdup (fname); +#endif + + return output_name; } + + #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -123,128 +175,115 @@ pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err) static void give_help (void) { - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; - - if (! m.text) - m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented.")); - - popup_message (&m); + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, + _("Sorry. The help system hasn't yet " + "been implemented.")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); } void -connect_help (GladeXML *xml) +connect_help (GtkBuilder *xml) { - GList *helps = glade_xml_get_widget_prefix (xml, "help_button_"); + GSList *helps = gtk_builder_get_objects (xml); - GList *i; - for ( i = g_list_first (helps); i ; i = g_list_next (i)) - g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0); -} + GSList *i; + for ( i = helps; i ; i = g_slist_next (i)) + { + GObject *o = i->data; + if ( GTK_IS_WIDGET (o) ) + { + gchar *name = NULL; + gchar s[12] = {0}; + g_object_get (o, "name", &name, NULL); + + if ( name) + strncpy (s, name, 11); + s[11] = '\0'; + + + if ( 0 == strcmp ("help_button", s)) + { + g_signal_connect (o, "clicked", give_help, 0); + } + } + } + g_slist_free (helps); +} void reference_manual (GtkMenuItem *menu, gpointer data) { GError *err = NULL; - if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) ) + gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml")); + + if ( ! g_spawn_command_line_async (cmd, &err) ) { msg (ME, _("Cannot open reference manual: %s"), err->message); } + + g_free (cmd); g_clear_error (&err); } -extern struct dataset *the_dataset; -extern struct source_stream *the_source_stream; -extern PsppireDataStore *the_data_store; - -void -execute_syntax (struct getl_interface *sss) +/* Create a deep copy of SRC */ +GtkListStore * +clone_list_store (const GtkListStore *src) { - struct lexer *lexer; - - struct casereader *reader = psppire_data_store_get_reader (the_data_store); - - proc_set_active_file_data (the_dataset, reader); + GtkTreeIter src_iter; + gboolean ok; + gint i; + const gint n_cols = gtk_tree_model_get_n_columns (GTK_TREE_MODEL (src)); + GType *types = g_malloc (sizeof (*types) * n_cols); - g_return_if_fail (proc_has_active_file (the_dataset)); + int row = 0; + GtkListStore *dest; - lexer = lex_create (the_source_stream); + for (i = 0 ; i < n_cols; ++i ) + types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i); - getl_append_source (the_source_stream, sss); + dest = gtk_list_store_newv (n_cols, types); - for (;;) + for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (src), + &src_iter); + ok; + ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (src), &src_iter)) { - int result = cmd_parse (lexer, the_dataset); + GtkTreeIter dest_iter; + gtk_list_store_append (dest, &dest_iter); - if (result == CMD_EOF || result == CMD_FINISH) - break; - } - - getl_abort_noninteractive (the_source_stream); + for (i = 0 ; i < n_cols; ++i ) + { + GValue val = {0}; - lex_destroy (lexer); + gtk_tree_model_get_value (GTK_TREE_MODEL (src), &src_iter, i, &val); + gtk_list_store_set_value (dest, &dest_iter, i, &val); - psppire_dict_replace_dictionary (the_data_store->dict, - dataset_dict (the_dataset)); + g_value_unset (&val); + } + row++; + } - { - PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset)); + g_free (types); - psppire_data_store_set_case_file (the_data_store, pcf); - } + return dest; } - -#ifdef G_ENABLE_DEBUG -# define g_marshal_value_peek_int(v) g_value_get_int (v) -#else -# define g_marshal_value_peek_int(v) (v)->data[0].v_int -#endif - - -/* VOID:INT,INT,INT */ void -marshaller_VOID__INT_INT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data) +paste_syntax_in_new_window (const gchar *syntax) { - typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer data1, - gint arg_1, - gint arg_2, - gint arg_3, - gpointer data2); - register GMarshalFunc_VOID__INT_INT_INT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__INT_INT_INT) (marshal_data ? marshal_data : cc->callback); + GtkWidget *se = psppire_syntax_window_new (); + + gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_int (param_values + 2), - g_marshal_value_peek_int (param_values + 3), - data2); + gtk_widget_show (se); }