/* 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
*/
#include <config.h>
+#include "psppire-syntax-window.h"
+
#include <glib-object.h>
#include <glib.h>
#include "helper.h"
#include "message-dialog.h"
+#include <data/format.h>
#include <data/data-in.h>
#include <data/data-out.h>
#include <data/dictionary.h>
#include <data/casereader-provider.h>
#include <libpspp/message.h>
+#include <gtk/gtkbuilder.h>
#include <libpspp/i18n.h>
#include <ctype.h>
#include <language/lexer/lexer.h>
#include "psppire-data-store.h"
#include <output/manager.h>
-#include "output-viewer.h"
+#include "psppire-output-window.h"
#include "xalloc.h"
}
-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 ( !w )
- g_critical ("Widget \"%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));
+ }
- return w;
+ 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
}
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);
- g_list_free (helps);
-}
+ 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);
}
reader = proc_extract_active_file_data (the_dataset);
if (!lazy_casereader_destroy (reader, lazy_serial))
- psppire_data_store_set_case_file (the_data_store,
- psppire_case_file_new (reader));
+ psppire_data_store_set_reader (the_data_store, reader);
som_flush ();
- reload_the_viewer ();
+ psppire_output_window_reload ();
return retval;
}
-#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)
-{
- 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);
-
- 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);
-}
-
/* Create a deep copy of SRC */
GtkListStore *
clone_list_store (const GtkListStore *src)
}
+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);
+}
projects / pspp-builds.git / blobdiff