X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=6d90cfc4ea5e7a4b6e5b2a33b6ad3210744c802c;hb=537fdeb3702c011e05d7826a8d556a7beeba2605;hp=fc9105d75921456a8f94ea41e1246d7065c59a55;hpb=a992bf1121d3e1eef76fd6184b95fe079bb91558;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index fc9105d7..6d90cfc4 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -20,6 +20,8 @@
 */
 #include <config.h>
 
+#include "psppire-syntax-window.h"
+
 #include	<glib-object.h>
 
 #include <glib.h>
@@ -46,7 +48,7 @@
 #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"
 
@@ -117,34 +119,65 @@ builder_new_real (const gchar *name)
 }
 
 
-
-GtkWidget *
-get_widget_assert (gpointer x, const gchar *name)
+GObject *
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
 {
-  GObject *obj = G_OBJECT (x);
-  GtkWidget *w = NULL;
+  GObject *o = NULL;
   g_assert (name);
 
-  if (GTK_IS_BUILDER (obj))
-    w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name));
+  o = gtk_builder_get_object (builder, name);
+
+  if ( !o )
+    g_critical ("Object \"%s\" could not be found\n", name);
 
-  if (GLADE_IS_XML (obj))
-    w = glade_xml_get_widget (GLADE_XML (obj), 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_critical ("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 = strdup (fname);
+#endif
+
+  return output_name;
 }
 
+
+
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
@@ -165,27 +198,48 @@ give_help (void)
 }
 
 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);
+
+  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);
 
-  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);
+	  if ( name)
+	    strncpy (s, name, 11);
+	  s[11] = '\0';
 
-  g_list_free (helps);
-}
 
+	  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);
 }
 
@@ -268,7 +322,7 @@ execute_syntax (struct getl_interface *sss)
 
   som_flush ();
 
-  reload_the_viewer ();
+  psppire_output_window_reload ();
 
   return retval;
 }
@@ -319,4 +373,12 @@ 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);
+}