#include <libintl.h>
#include <unistd.h>
+#include "data/any-reader.h"
#include "data/casereader.h"
#include "data/dataset.h"
#include "data/datasheet.h"
#include "data/file-handle-def.h"
#include "data/file-name.h"
#include "data/por-file-reader.h"
+#include "data/session.h"
#include "data/settings.h"
#include "data/sys-file-reader.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dict.h"
+#include "ui/gui/psppire.h"
#include "ui/gui/psppire-output-window.h"
+#include "ui/gui/psppire-syntax-window.h"
#include "ui/gui/psppire-selector.h"
#include "ui/gui/psppire-var-store.h"
#include "ui/gui/psppire-var-view.h"
#include "ui/gui/psppire-window-register.h"
-#include "ui/gui/psppire.h"
#include "ui/gui/widgets.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
-GtkRecentManager *the_recent_mgr = 0;
-PsppireDataStore *the_data_store = 0;
-PsppireVarStore *the_var_store = 0;
-
+static void inject_renamed_icons (void);
static void create_icon_factory (void);
+static gchar *local_to_filename_encoding (const char *fn);
-struct dataset * the_dataset = NULL;
-
-static GtkWidget *the_data_window;
-
-static void load_data_file (const char *);
-
-static void
-replace_casereader (struct casereader *s)
-{
- psppire_data_store_set_reader (the_data_store, s);
-}
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-
-
void
initialize (const char *data_file)
{
- PsppireDict *dictionary = 0;
+ PsppireDataWindow *data_window;
i18n_init ();
settings_init ();
fh_init ();
- the_dataset = dataset_create ();
psppire_set_lexer (NULL);
- dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
-
bind_textdomain_codeset (PACKAGE, "UTF-8");
- /* Create the model for the var_sheet */
- the_var_store = psppire_var_store_new (dictionary);
-
- the_data_store = psppire_data_store_new (dictionary);
- replace_casereader (NULL);
-
+ inject_renamed_icons ();
create_icon_factory ();
psppire_output_window_setup ();
journal_enable ();
textdomain (PACKAGE);
-
- the_recent_mgr = gtk_recent_manager_get_default ();
-
psppire_selector_set_default_selection_func (GTK_TYPE_ENTRY, insert_source_row_into_entry);
psppire_selector_set_default_selection_func (PSPPIRE_VAR_VIEW_TYPE, insert_source_row_into_tree_view);
psppire_selector_set_default_selection_func (GTK_TYPE_TREE_VIEW, insert_source_row_into_tree_view);
- the_data_window = psppire_data_window_new ();
- if (data_file != NULL)
- load_data_file (data_file);
+ data_window = psppire_default_data_window ();
- execute_const_syntax_string (PSPPIRE_DATA_WINDOW (the_data_window), "");
+ if (data_file)
+ {
+ gchar *filename = local_to_filename_encoding (data_file);
- gtk_widget_show (the_data_window);
+ /* Check to see if the file is a .sav or a .por file. If not
+ assume that it is a syntax file */
+ if ( any_reader_may_open (filename))
+ psppire_window_load (PSPPIRE_WINDOW (data_window), filename);
+ else
+ open_syntax_window (filename, NULL);
+
+ g_free (filename);
+ }
}
i18n_done ();
}
-PsppireDataWindow *
-psppire_default_data_window (void)
-{
- return PSPPIRE_DATA_WINDOW (the_data_window);
-}
-
static void
func (gpointer key, gpointer value, gpointer data)
{
gtk_main_quit ();
}
+static void
+inject_renamed_icon (const char *icon, const char *substitute)
+{
+ GtkIconTheme *theme = gtk_icon_theme_get_default ();
+ if (!gtk_icon_theme_has_icon (theme, icon)
+ && gtk_icon_theme_has_icon (theme, substitute))
+ {
+ gint *sizes = gtk_icon_theme_get_icon_sizes (theme, substitute);
+ gint *p;
+
+ for (p = sizes; *p != 0; p++)
+ {
+ gint size = *p;
+ GdkPixbuf *pb;
+
+ pb = gtk_icon_theme_load_icon (theme, substitute, size, 0, NULL);
+ if (pb != NULL)
+ {
+ GdkPixbuf *copy = gdk_pixbuf_copy (pb);
+ if (copy != NULL)
+ gtk_icon_theme_add_builtin_icon (icon, size, copy);
+ }
+ }
+ }
+}
+
+/* Avoid a bug in GTK+ 2.22 that can cause a segfault at startup time. Earlier
+ and later versions of GTK+ do not have the bug. Bug #31511.
+
+ Based on this patch against Inkscape:
+ https://launchpadlibrarian.net/60175914/copy_renamed_icons.patch */
+static void
+inject_renamed_icons (void)
+{
+ if (gtk_major_version == 2 && gtk_minor_version == 22)
+ {
+ inject_renamed_icon ("gtk-file", "document-x-generic");
+ inject_renamed_icon ("gtk-directory", "folder");
+ }
+}
struct icon_info
{
gtk_icon_factory_add_default (factory);
}
\f
-static void
-load_data_file (const char *arg)
+/*
+ Convert a filename from the local encoding into "filename" encoding.
+ The return value will be allocated on the heap. It is the responsibility
+ of the caller to free it.
+ */
+static gchar *
+local_to_filename_encoding (const char *fn)
{
gchar *filename = NULL;
gchar *utf8 = NULL;
if ( local_is_utf8)
{
- utf8 = xstrdup (arg);
+ utf8 = xstrdup (fn);
}
else
{
GError *err = NULL;
- utf8 = g_locale_to_utf8 (arg, -1, NULL, &written, &err);
+ utf8 = g_locale_to_utf8 (fn, -1, NULL, &written, &err);
if ( NULL == utf8)
{
g_warning ("Cannot convert filename from local encoding `%s' to UTF-8: %s",
g_free (utf8);
if ( filename == NULL)
- filename = xstrdup (arg);
-
- psppire_window_load (PSPPIRE_WINDOW (the_data_window), filename);
+ filename = xstrdup (fn);
- g_free (filename);
+ return filename;
}
static void
projects / pspp / blobdiff