-/*
- PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
Copyright (C) 2004, 2005, 2006 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "relocatable.h"
#include "data-editor.h"
-
#include "psppire.h"
-
+#include <unistd.h>
#include <data/casereader.h>
#include <data/datasheet.h>
#include <data/file-handle-def.h>
#include <libpspp/getl.h>
#include <language/lexer/lexer.h>
#include <libpspp/version.h>
+#include <output/output.h>
+#include <output/journal.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "var-sheet.h"
#include "message-dialog.h"
+#include "output-viewer.h"
+
PsppireDataStore *the_data_store = 0;
PsppireVarStore *the_var_store = 0;
glade_init ();
fmt_init ();
+ fn_init ();
+ outp_init ();
settings_init ();
fh_init ();
the_source_stream =
fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
);
- the_dataset = create_dataset (NULL, NULL);
+ the_dataset = create_dataset ();
message_dialog_init (the_source_stream);
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);
-
create_icon_factory ();
+ outp_configure_driver_line (
+ ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+ "bottom-margin=0 paginate=off length=50 "
+ "width=" OUTPUT_LINE_WIDTH_str " emphasis=none "
+ "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+
+ unlink (OUTPUT_FILE_NAME);
+
+ journal_enable ();
+
new_data_window (NULL, NULL);
}
destroy_source_stream (the_source_stream);
message_dialog_done ();
settings_done ();
+ outp_done ();
}
-#define PIXBUF_NEW_FROM_FILE(FILE) \
- gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0)
-
+struct icon_info
+{
+ const char *file_name;
+ const gchar *id;
+};
+
+
+static const struct icon_info icons[] =
+ {
+ {PKGDATADIR "/value-labels.png", "pspp-value-labels"},
+ {PKGDATADIR "/weight-cases.png", "pspp-weight-cases"},
+ {PKGDATADIR "/goto-variable.png", "pspp-goto-variable"},
+ {PKGDATADIR "/insert-variable.png", "pspp-insert-variable"},
+ {PKGDATADIR "/insert-case.png", "pspp-insert-case"},
+ {PKGDATADIR "/split-file.png", "pspp-split-file"},
+ {PKGDATADIR "/select-cases.png", "pspp-select-cases"},
+ {PKGDATADIR "/recent-dialogs.png", "pspp-recent-dialogs"},
+ {PKGDATADIR "/nominal.png", "var-nominal"},
+ {PKGDATADIR "/ordinal.png", "var-ordinal"},
+ {PKGDATADIR "/scale.png", "var-scale"},
+ {PKGDATADIR "/string.png", "var-string"},
+ {PKGDATADIR "/date-scale.png", "var-date-scale"}
+ };
static void
create_icon_factory (void)
{
+ gint i;
GtkIconFactory *factory = gtk_icon_factory_new ();
- GtkIconSet *icon_set;
-
- GdkPixbuf *pixbuf;
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("value-labels.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("weight-cases.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("goto-variable.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("insert-variable.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("insert-case.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("split-file.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("select-cases.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("recent-dialogs.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "pspp-recent-dialogs", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("nominal.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "var-nominal", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("ordinal.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "var-ordinal", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("scale.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "var-scale", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("string.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "var-string", icon_set);
-
- pixbuf = PIXBUF_NEW_FROM_FILE ("date-scale.png");
- icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- gtk_icon_factory_add ( factory, "var-date-scale", icon_set);
-
+ for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i)
+ {
+ GError *err = NULL;
+ GdkPixbuf *pixbuf =
+ gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err);
+
+ if ( pixbuf )
+ {
+ GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+ g_object_unref (pixbuf);
+ gtk_icon_factory_add ( factory, icons[i].id, icon_set);
+ }
+ else
+ {
+ g_warning ("Cannot create icon: %s", err->message);
+ g_clear_error (&err);
+ }
+ }
gtk_icon_factory_add_default (factory);
}
projects / pspp-builds.git / blobdiff