#include <config.h>
+#include <locale.h>
#include <assert.h>
#include <libintl.h>
#include <gsl/gsl_errno.h>
#include <data/casereader.h>
#include <data/datasheet.h>
#include <data/file-handle-def.h>
-#include <data/format.h>
#include <data/settings.h>
#include <data/file-name.h>
#include <data/procedure.h>
#include "psppire-var-store.h"
#include "psppire-data-store.h"
#include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
#include "message-dialog.h"
#include "output-viewer.h"
glade_init ();
gsl_set_error_handler_off ();
- fmt_init ();
fn_init ();
outp_init ();
settings_init (&viewer_width, &viewer_length);
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=auto width=auto "
- "emphasis=none "
- "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+ {
+ const char *filename = output_file_name ();
+
+ struct string config_string;
+
+ ds_init_empty (&config_string);
+
+ ds_put_format (&config_string,
+ "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+ "bottom-margin=0 paginate=off length=auto width=auto "
+ "emphasis=none "
+ "output-file=\"%s\" append=yes", filename);
+
+ outp_configure_driver_line (ds_ss (&config_string));
+
+ unlink (filename);
- unlink (OUTPUT_FILE_NAME);
+ ds_destroy (&config_string);
+ }
journal_enable ();
textdomain (PACKAGE);
}
}
-
{
/* Create our own "pspp-stock-reset" item, using the
GTK_STOCK_REFRESH icon set */
- GtkStockItem item = {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE};
- GtkIconSet *icon_set =
- gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH);
+ GtkStockItem items[] = {
+ {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
+ {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
+ };
+
- gtk_stock_add (&item, 1);
- gtk_icon_factory_add (factory, "pspp-stock-reset", icon_set);
+ 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);