GObject *
-get_object_assert (GtkBuilder *builder, const gchar *name)
+get_object_assert (GtkBuilder *builder, const gchar *name, GType type)
{
GObject *o = NULL;
g_assert (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));
+ }
+
return o;
}
+
+GtkAction *
+get_action_assert (GtkBuilder *builder, const gchar *name)
+{
+ return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION));
+}
+
GtkWidget *
-get_widget_assert (gpointer x, const gchar *name)
+get_widget_assert (GtkBuilder *builder, const gchar *name)
{
- GObject *obj = G_OBJECT (x);
- GtkWidget *w = NULL;
- g_assert (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 *
+convert_glib_filename_to_system_filename (const gchar *fname, GError **err)
+{
+ gchar *output_name;
- if (GTK_IS_BUILDER (obj))
- w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name));
+#ifdef G_OS_WIN32
+ const gchar *target_encoding;
+ gchar *utf8_name = NULL;
- if (GLADE_IS_XML (obj))
- w = glade_xml_get_widget (GLADE_XML (obj), name);
+ g_get_charset (&target_encoding);
- if ( !w )
- g_critical ("Widget \"%s\" could not be found\n", name);
+ output_name = g_convert (fname, -1, target_encoding,
+ "UTF-8", NULL, NULL, err);
+#else
+ output_name = strdup (fname);
+#endif
- return w;
+ return output_name;
}
-/* Converts a string in the pspp locale to utf-8.
- The return value must be freed when no longer required*/
-gchar *
-pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
-{
- return recode_string (CONV_PSPP_TO_UTF8, text, len);
-}
+
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
gtk_widget_destroy (dialog);
}
-static void
-connect_help_builder (GtkBuilder *xml)
+void
+connect_help (GtkBuilder *xml)
{
GSList *helps = gtk_builder_get_objects (xml);
if ( 0 == strcmp ("help_button", s))
{
- g_signal_connect (GTK_WIDGET (o), "clicked", give_help, 0);
+ g_signal_connect (o, "clicked", give_help, 0);
}
}
}
g_slist_free (helps);
}
-static void
-connect_help_glade (GladeXML *xml)
-{
- GList *helps = glade_xml_get_widget_prefix (xml, "help_button_");
-
- 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);
-
- g_list_free (helps);
-}
-
-
-void
-connect_help (gpointer xml)
-{
- if (GTK_IS_BUILDER (xml))
- connect_help_builder (GTK_BUILDER (xml));
-
- else if (GLADE_IS_XML (xml))
- connect_help_glade (GLADE_XML (xml));
-
- else
- {
- g_error ("XML of type %s", G_OBJECT_TYPE_NAME (xml));
- }
-}
-
-
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);
}