/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014 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 "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 "language/lexer/lexer.h"
#include "libpspp/i18n.h"
#include "ui/gui/psppire-syntax-window.h"
#include "ui/gui/psppire-selector.h"
#include "ui/gui/psppire-var-view.h"
+#include "ui/gui/psppire-means-layer.h"
#include "ui/gui/psppire-window-register.h"
#include "ui/gui/widgets.h"
#include "ui/source-init-opts.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
-static void inject_renamed_icons (void);
static void create_icon_factory (void);
-static gchar *local_to_filename_encoding (const char *fn);
-
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-void
-initialize (const char *data_file)
+bool
+initialize (const struct init_source *is)
{
- i18n_init ();
-
- preregister_widgets ();
-
- gsl_set_error_handler_off ();
- settings_init ();
- fh_init ();
-
- psppire_set_lexer (NULL);
-
- bind_textdomain_codeset (PACKAGE, "UTF-8");
-
- inject_renamed_icons ();
- create_icon_factory ();
-
- psppire_output_window_setup ();
-
- journal_enable ();
- textdomain (PACKAGE);
-
- 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);
-
- if (data_file)
+ switch (is->state)
{
- gchar *filename = local_to_filename_encoding (data_file);
-
- /* 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))
- open_data_window (NULL, filename, NULL);
+ case 0:
+ i18n_init ();
+ break;
+ case 1:
+ preregister_widgets ();
+ break;
+ case 2:
+ gsl_set_error_handler_off ();
+ break;
+ case 3:
+ output_engine_push ();
+ break;
+ case 4:
+ settings_init ();
+ break;
+ case 5:
+ fh_init ();
+ break;
+ case 6:
+ psppire_set_lexer (NULL);
+ break;
+ case 7:
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ break;
+ case 8:
+ if ( ! gtk_parse_args (is->argc, is->argv) )
+ {
+ perror ("Error parsing arguments");
+ exit (1);
+ }
+ break;
+ case 9:
+ create_icon_factory ();
+ break;
+ case 10:
+ psppire_output_window_setup ();
+ break;
+ case 11:
+ journal_init ();
+ break;
+ case 12:
+ textdomain (PACKAGE);
+ break;
+ case 13:
+ /* FIXME: This should be implemented with a GtkInterface */
+ 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);
+ psppire_selector_set_default_selection_func (PSPPIRE_TYPE_MEANS_LAYER, insert_source_row_into_layers);
+ break;
+ case 14:
+ {
+ if (is->filename_arg != -1)
+ {
+#ifndef G_OS_WIN32
+ const char *file = (*is->argv)[is->filename_arg];
+ const gchar *local_encoding = NULL;
+ g_get_charset (&local_encoding);
+#else
+ char **as = g_win32_get_command_line ();
+ const char *file = as[is->filename_arg];
+ const gchar *local_encoding = "UTF-8";
+#endif
+
+ struct file_handle *fh = fh_create_file (NULL,
+ file,
+ local_encoding,
+ fh_default_properties ());
+
+ const char *filename = fh_get_file_name (fh);
+
+ int retval = any_reader_detect (fh, NULL);
+
+ /* Check to see if the file is a .sav or a .por file. If not
+ assume that it is a syntax file */
+ if (retval == 1)
+ open_data_window (NULL, filename, NULL, NULL);
+ else if (retval == 0)
+ {
+ create_data_window ();
+ open_syntax_window (filename, NULL);
+ }
+
+ fh_unref (fh);
+ }
else
- {
- create_data_window ();
- open_syntax_window (filename, NULL);
- }
-
- g_free (filename);
+ {
+ create_data_window ();
+ }
+ return TRUE;
+ }
+ break;
+ default:
+ return TRUE;
+ break;
}
- else
- create_data_window ();
+ return FALSE;
}
de_initialize (void)
{
settings_done ();
- output_close ();
+ output_engine_pop ();
i18n_done ();
}
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_size
{
int resolution; /* The dimension of the images which will be used */
- size_t n_sizes; /* The number of items in the array below.
- This may be zero, in which case the iconset will be wildcarded
- (used by default when no non-wildcarded set is available) */
+ size_t n_sizes; /* The number of items in the array below. */
const GtkIconSize *usage; /* An array determining for what the icon set is used */
};
static const GtkIconSize menus[] = {GTK_ICON_SIZE_MENU};
+static const GtkIconSize large_toolbar[] = {GTK_ICON_SIZE_LARGE_TOOLBAR};
+static const GtkIconSize small_toolbar[] = {GTK_ICON_SIZE_SMALL_TOOLBAR};
-/* We currently have two icon sets viz: 16x16 and 24x24.
- We use the 16x16 for menus, and the 24x24 for everything else. */
+/* We currently have three icon sets viz: 16x16, 24x24 and 32x32
+ We use the 16x16 for menus, the 32x32 for the large_toolbars and
+ the 24x24 for small_toolbars.
+
+ The order of this array is pertinent. The icons in the sets occuring
+ earlier in the array will be used a the wildcard (default) icon size,
+ if such an icon exists.
+*/
static const struct icon_size sizemap[] =
{
+ {24, sizeof (small_toolbar) / sizeof (GtkIconSize), small_toolbar},
{16, sizeof (menus) / sizeof (GtkIconSize), menus},
- {24, 0, 0}
+ {32, sizeof (large_toolbar) / sizeof (GtkIconSize), large_toolbar}
};
gint i;
for (i = 0 ; i < ic->n_icons ; ++i)
{
+ gboolean wildcarded = FALSE;
GtkIconSet *icon_set = gtk_icon_set_new ();
int r;
for (r = 0 ; r < sizeof (sizemap) / sizeof (sizemap[0]); ++r)
sizemap[r].resolution, sizemap[r].resolution,
ic->icon_name[i]);
const char *relocated_filename = relocate (filename);
+ GFile *gf = g_file_new_for_path (relocated_filename);
+ if (g_file_query_exists (gf, NULL))
+ {
+ gtk_icon_source_set_filename (source, relocated_filename);
+ if (!wildcarded)
+ {
+ gtk_icon_source_set_size_wildcarded (source, TRUE);
+ wildcarded = TRUE;
+ }
+ }
+ g_object_unref (gf);
- gtk_icon_source_set_filename (source, relocated_filename);
- gtk_icon_source_set_size_wildcarded (source, sizemap[r].n_sizes <= 0);
for (s = 0 ; s < sizemap[r].n_sizes ; ++s)
gtk_icon_source_set_size (source, sizemap[r].usage[s]);
if (filename != relocated_filename)
free (CONST_CAST (char *, relocated_filename));
g_free (filename);
- gtk_icon_set_add_source (icon_set, source);
+
+ if ( gtk_icon_source_get_filename (source))
+ gtk_icon_set_add_source (icon_set, source);
+
+ gtk_icon_source_free (source);
}
gtk_icon_factory_add (factory, ic->icon_name[i], icon_set);
ones in all other respects.
*/
const struct iconmap map[] = {
- {GTK_STOCK_NEW, "file-new-document"},
- {GTK_STOCK_QUIT, "file-quit"},
- {GTK_STOCK_SAVE, "file-save-document"},
- {GTK_STOCK_CUT, "edit-cut"},
- {GTK_STOCK_COPY, "edit-copy"},
- {GTK_STOCK_PASTE, "edit-paste"},
- {GTK_STOCK_ABOUT, "help-about"},
- {GTK_STOCK_PRINT, "file-print-document"}
+ {GTK_STOCK_NEW, "file-new-document"},
+ {GTK_STOCK_QUIT, "file-quit"},
+ {GTK_STOCK_SAVE, "file-save-document"},
+ {GTK_STOCK_CUT, "edit-cut"},
+ {GTK_STOCK_COPY, "edit-copy"},
+ {GTK_STOCK_PASTE, "edit-paste"},
+ {GTK_STOCK_UNDO, "edit-undo"},
+ {GTK_STOCK_REDO, "edit-redo"},
+ {GTK_STOCK_DELETE, "edit-delete"},
+ {GTK_STOCK_ABOUT, "help-about"},
+ {GTK_STOCK_PRINT, "file-print-document"}
};
GtkStockItem customised[sizeof (map) / sizeof (map[0])];
gtk_icon_factory_add_default (factory);
}
-\f
-/*
- 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;
- const gchar *local_encoding = NULL;
- gsize written = -1;
- const gboolean local_is_utf8 = g_get_charset (&local_encoding);
-
- /* There seems to be no Glib function to convert from local encoding
- to filename encoding. Therefore it has to be done in two steps:
- the intermediate encoding is UTF8.
-
- Either step could fail. However, in many cases the file can still
- be loaded even if the conversion fails. So in those cases, after showing
- a warning, we simply copy the locally encoded filename to the destination
- and hope for the best.
- */
-
- if ( local_is_utf8)
- {
- utf8 = xstrdup (fn);
- }
- else
- {
- GError *err = NULL;
- 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",
- local_encoding,
- err->message);
- g_clear_error (&err);
- }
- }
- if ( NULL != utf8)
- {
- GError *err = NULL;
- filename = g_filename_from_utf8 (utf8, written, NULL, NULL, &err);
- if ( NULL == filename)
- {
- g_warning ("Cannot convert filename from UTF8 to filename encoding: %s",
- err->message);
- g_clear_error (&err);
- }
- }
-
- g_free (utf8);
-
- if ( filename == NULL)
- filename = xstrdup (fn);
-
- return filename;
-}
+\f
static void
handle_msg (const struct msg *m_, void *lexer_)
projects / pspp / blobdiff