X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=4ec4bb0c1a9601601b0e02b2f1cc2b7a185856f6;hb=82217038368a953179398d9ecc7b80169a1b9ddc;hp=bd6e2198f4efc7ca276dc2b04cc79645e4338534;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp-builds.git
diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index bd6e2198..4ec4bb0c 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,41 +1,59 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+ 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
+ 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+
+
/* This file is a rubbish bin where stuff gets put when it doesn't seem to
belong anywhere else.
*/
#include
+#include
+
#include
#include "helper.h"
#include "message-dialog.h"
+#include
#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
/* Formats a value according to FORMAT
The returned string must be freed when no longer required */
gchar *
-value_to_text (union value v, struct fmt_spec format)
+value_to_text (union value v, const PsppireDict *dict, 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, dict_get_encoding (dict->dict), &format);
g_strchug (s);
return s;
@@ -67,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 ();
@@ -75,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)
{
- GtkWidget *w;
- g_assert (xml);
+ 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)
+{
+ GObject *o = NULL;
g_assert (name);
- w = glade_xml_get_widget (xml, name);
+ o = gtk_builder_get_object (builder, name);
+
+ if ( !o )
+ g_critical ("Object \"%s\" could not be found\n", name);
+
+ 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));
+ }
- if ( !w )
- g_warning ("Widget \"%s\" could not be found\n", name);
+ return o;
+}
+
+
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+ return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
- return w;
+GtkWidget *
+get_widget_assert (GtkBuilder *builder, const gchar *name)
+{
+ return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET));
}
-/* Converts a string in the pspp locale to utf-8.
- The return value must be freed when no longer required*/
+/* 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
@@ -105,82 +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;
-
-gboolean
-execute_syntax (struct getl_interface *sss)
+/* Create a deep copy of SRC */
+GtkListStore *
+clone_list_store (const GtkListStore *src)
{
- struct lexer *lexer;
+ 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_val_if_fail (proc_has_source (the_dataset), FALSE);
+ 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;
- }
+ for (i = 0 ; i < n_cols; ++i )
+ {
+ GValue val = {0};
- getl_abort_noninteractive (the_source_stream);
+ gtk_tree_model_get_value (GTK_TREE_MODEL (src), &src_iter, i, &val);
+ gtk_list_store_set_value (dest, &dest_iter, i, &val);
- lex_destroy (lexer);
+ g_value_unset (&val);
+ }
+ row++;
+ }
- /* The GUI must *always* have a data source, even if it's an empty one.
- Therefore, we find that there is none, (for example NEW FILE was the last
- item in the syntax) then we create a new one. */
- if ( ! proc_has_source (the_dataset))
- proc_set_source (the_dataset,
- storage_source_create (the_data_store->case_file->flexifile)
- );
+ g_free (types);
- /* GUI syntax needs this implicit EXECUTE command at the end of
- every script. Otherwise commands like GET could leave the GUI without
- a casefile. */
- return procedure (the_dataset, NULL, NULL);
+ return dest;
}
+void
+paste_syntax_in_new_window (const gchar *syntax)
+{
+ GtkWidget *se = psppire_syntax_window_new ();
+
+ gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
+
+ gtk_widget_show (se);
+}