/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013, 2014,
+ 2016 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 <assert.h>
#include <gsl/gsl_errno.h>
#include <gtk/gtk.h>
#include <libintl.h>
#include "output/driver.h"
#include "output/journal.h"
-#include "output/message-item.h"
+#include "output/output-item.h"
+#include "output/spv/spv.h"
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
-#include "ui/gui/icons/icon-names.h"
-
#include "gl/configmake.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
-static void create_icon_factory (void);
+void create_icon_factory (void);
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
+void
+register_selection_functions (void)
+{
+ 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);
+}
bool
initialize (const struct init_source *is)
bind_textdomain_codeset (PACKAGE, "UTF-8");
break;
case 8:
- if ( ! gtk_parse_args (is->argc, is->argv) )
+ 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:
+ case 10:
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 ();
- }
- return TRUE;
- }
- break;
default:
return TRUE;
break;
}
void
-psppire_quit (void)
+psppire_quit (GApplication *app)
{
- gtk_main_quit ();
+ g_application_quit (app);
}
-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. */
- 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 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},
- {32, sizeof (large_toolbar) / sizeof (GtkIconSize), large_toolbar}
-};
-
-
+\f
static void
-create_icon_factory (void)
+handle_msg (const struct msg *m_, struct lexer *lexer)
{
- gint c;
- GtkIconFactory *factory = gtk_icon_factory_new ();
- struct icon_context ctx[2];
- ctx[0] = action_icon_context;
- ctx[1] = category_icon_context;
- for (c = 0 ; c < 2 ; ++c)
- {
- const struct icon_context *ic = &ctx[c];
- 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)
- {
- int s;
- GtkIconSource *source = gtk_icon_source_new ();
- gchar *filename = g_strdup_printf ("%s/%s/%dx%d/%s.png", PKGDATADIR,
- ic->context_name,
- 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);
-
- 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);
-
- 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);
- }
- }
-
- {
- struct iconmap
- {
- const gchar *gtk_id;
- gchar *pspp_id;
- };
-
- /* We have our own icons for some things.
- But we want the Stock Item to be identical to the Gtk standard
- 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_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])];
- int i;
-
- for (i = 0; i < sizeof (map) / sizeof (map[0]); ++i)
- {
- gtk_stock_lookup (map[i].gtk_id, &customised[i]);
- customised[i].stock_id = map[i].pspp_id;
- }
-
-
-
- gtk_stock_add (customised, sizeof (map) / sizeof (map[0]));
- }
-
- {
- /* Create our own "pspp-stock-reset" item, using the
- GTK_STOCK_REFRESH icon set */
- GtkStockItem items[2] = {
- {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
- {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
- };
-
- gtk_stock_add (items, 2);
-
- gtk_icon_factory_add (factory, "pspp-stock-reset",
- gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
- );
-
- gtk_icon_factory_add (factory, "pspp-stock-select",
- gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
- );
- }
-
- gtk_icon_factory_add_default (factory);
+ struct msg m = {
+ .category = m_->category,
+ .severity = m_->severity,
+ .location = (m_->location ? m_->location
+ : lexer ? lex_get_location (lexer, 0, 0)
+ : NULL),
+ .command_name = output_get_uppercase_command_name (),
+ .text = m_->text,
+ };
+
+ output_item_submit (message_item_create (&m));
+
+ free (m.command_name);
+ if (m.location != m_->location)
+ msg_location_destroy (m.location);
}
-\f
-
-static void
-handle_msg (const struct msg *m_, void *lexer_)
+void
+psppire_set_lexer (struct lexer *lexer)
{
- struct lexer *lexer = lexer_;
- struct msg m = *m_;
+ lex_set_message_handler (lexer, handle_msg);
+}
- if (lexer != NULL && m.file_name == NULL)
+GtkWindow *
+psppire_preload_file (const gchar *file, GtkWindow *victim)
+{
+ const gchar *local_encoding = "UTF-8";
+
+ 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);
+
+ GtkWindow *w = 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)
+ w = open_data_window (PSPPIRE_WINDOW (victim), filename, NULL, NULL);
+ else if (retval == 0)
{
- m.file_name = CONST_CAST (char *, lex_get_file_name (lexer));
- m.first_line = lex_get_first_line_number (lexer, 0);
- m.last_line = lex_get_last_line_number (lexer, 0);
- m.first_column = lex_get_first_column (lexer, 0);
- m.last_column = lex_get_last_column (lexer, 0);
+ char *error = spv_detect (filename);
+ if (!error)
+ read_spv_file (filename);
+ else
+ {
+ free (error);
+ create_data_window ();
+ open_syntax_window (filename, NULL);
+ }
}
- message_item_submit (message_item_create (&m));
-}
-
-void
-psppire_set_lexer (struct lexer *lexer)
-{
- msg_set_handler (handle_msg, lexer);
+ fh_unref (fh);
+ return w;
}
projects / pspp / blobdiff