X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=9ebc51d19640473648c1750d621939b2a4927f63;hb=37cd3133c06caf3fce7e449a939098f62bd41a55;hp=08e9f1d9c58701f7df0e02efa1a6a704aa17264c;hpb=1075412b79b988d931209188fe9c0ab0c1b2fe94;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index 08e9f1d9c5..9ebc51d196 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009 Free Software Foundation + Copyright (C) 2008, 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 @@ -16,44 +16,42 @@ #include -#include -#include -#include "helper.h" +#include "ui/gui/psppire-output-window.h" -#include -#include -#include -#include -#include +#include +#include #include - -#include "about.h" - -#include "psppire-output-window.h" - - -#include "xalloc.h" - -#include #include +#include #include +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/string-map.h" +#include "output/chart-item.h" +#include "output/driver-provider.h" +#include "output/message-item.h" +#include "output/output-item.h" +#include "output/tab.h" +#include "output/table-item.h" +#include "output/text-item.h" +#include "ui/gui/help-menu.h" +#include "ui/gui/builder-wrapper.h" +#include "ui/gui/psppire-output-view.h" +#include "ui/gui/psppire-conf.h" +#include "ui/gui/windows-menu.h" + +#include "gl/xalloc.h" + +#include "helper.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid -enum - { - COL_TITLE, /* Table title. */ - N_COLS - }; - -static void psppire_output_window_base_finalize (PsppireOutputWindowClass *, gpointer); -static void psppire_output_window_base_init (PsppireOutputWindowClass *class); static void psppire_output_window_class_init (PsppireOutputWindowClass *class); static void psppire_output_window_init (PsppireOutputWindow *window); - GType psppire_output_window_get_type (void) { @@ -64,8 +62,8 @@ psppire_output_window_get_type (void) static const GTypeInfo psppire_output_window_info = { sizeof (PsppireOutputWindowClass), - (GBaseInitFunc) psppire_output_window_base_init, - (GBaseFinalizeFunc) psppire_output_window_base_finalize, + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, (GClassInitFunc)psppire_output_window_class_init, (GClassFinalizeFunc) NULL, NULL, @@ -93,160 +91,125 @@ psppire_output_window_finalize (GObject *object) static void -psppire_output_window_class_init (PsppireOutputWindowClass *class) +psppire_output_window_dispose (GObject *obj) { - parent_class = g_type_class_peek_parent (class); -} + PsppireOutputWindow *window = PSPPIRE_OUTPUT_WINDOW (obj); + if (window->dispose_has_run) + return; -static void -psppire_output_window_base_init (PsppireOutputWindowClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); + window->dispose_has_run = TRUE; + psppire_output_view_destroy (window->view); + window->view = NULL; - object_class->finalize = psppire_output_window_finalize; + /* Chain up to the parent class */ + G_OBJECT_CLASS (parent_class)->dispose (obj); } - - static void -psppire_output_window_base_finalize (PsppireOutputWindowClass *class, - gpointer class_data) +psppire_output_window_class_init (PsppireOutputWindowClass *class) { + GObjectClass *object_class = G_OBJECT_CLASS (class); + + parent_class = g_type_class_peek_parent (class); + object_class->dispose = psppire_output_window_dispose; + + object_class->finalize = psppire_output_window_finalize; } /* Output driver class. */ -static PsppireOutputWindow *the_output_viewer = NULL; +struct psppire_output_driver + { + struct output_driver driver; + PsppireOutputWindow *window; + }; -static gboolean -expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) +static struct output_driver_class psppire_output_class; + +static struct psppire_output_driver * +psppire_output_cast (struct output_driver *driver) { - struct som_entity *entity = g_object_get_data (G_OBJECT (widget), "entity"); - GdkWindow *window = widget->window; - cairo_t *cairo = gdk_cairo_create (GDK_DRAWABLE (window)); - struct outp_driver *driver = xr_create_driver (cairo); /* XXX can fail */ - struct tab_table *t = entity->ext; - void *rendering; - - rendering = entity->class->render_init (entity, driver, tab_l (t), - tab_r (t), tab_t (t), tab_b (t)); - - entity->class->title (rendering, 0, 0, - entity->table_num, entity->subtable_num, - entity->command_name); - entity->class->render (rendering, tab_l (t), tab_t (t), - tab_nc (t) - tab_r (t), - tab_nr (t) - tab_b (t)); - - entity->class->render_free (rendering); - driver->class->close_driver (driver); - outp_free_driver (driver); - return TRUE; + assert (driver->class == &psppire_output_class); + return UP_CAST (driver, struct psppire_output_driver, driver); } static void -psppire_output_submit (struct outp_driver *this, struct som_entity *entity) +psppire_output_submit (struct output_driver *this, + const struct output_item *item) { - if (the_output_viewer == NULL) + struct psppire_output_driver *pod = psppire_output_cast (this); + PsppireOutputWindow *window; + bool new; + + new = pod->window == NULL; + if (new) { - the_output_viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); - gtk_widget_show_all (GTK_WIDGET (the_output_viewer)); + pod->window = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); + GApplication *app = g_application_get_default (); + gtk_application_add_window (GTK_APPLICATION (app), + GTK_WINDOW (pod->window)); + + pod->window->driver = pod; } + window = pod->window; - if (entity->type == SOM_TABLE) - { - GdkWindow *window = GTK_WIDGET (the_output_viewer)->window; - cairo_t *cairo = gdk_cairo_create (GDK_DRAWABLE (window)); - struct outp_driver *driver = xr_create_driver (cairo); /* XXX can fail */ - struct tab_table *t = entity->ext; - GtkTreeStore *store; - GtkTreeIter item; - GtkTreePath *path; - GtkWidget *drawing_area; - void *rendering; - int tw, th; - - tab_ref (t); - rendering = entity->class->render_init (entity, driver, tab_l (t), - tab_r (t), tab_t (t), tab_b (t)); - entity->class->area (rendering, &tw, &th); - - drawing_area = gtk_drawing_area_new (); - gtk_widget_modify_bg (GTK_WIDGET (drawing_area), GTK_STATE_NORMAL, - >k_widget_get_style (drawing_area)->base[GTK_STATE_NORMAL]); - g_object_set_data (G_OBJECT (drawing_area), - "entity", som_entity_clone (entity)); - gtk_widget_set_size_request (drawing_area, tw / 1024, th / 1024); - gtk_layout_put (the_output_viewer->output, drawing_area, - 0, the_output_viewer->y); - gtk_widget_show (drawing_area); - g_signal_connect (G_OBJECT (drawing_area), "expose_event", - G_CALLBACK (expose_event_callback), NULL); - - entity->class->render_free (rendering); - driver->class->close_driver (driver); - outp_free_driver (driver); - - if (tw / 1024 > the_output_viewer->max_width) - the_output_viewer->max_width = tw / 1024; - the_output_viewer->y += th / 1024; - - gtk_layout_set_size (the_output_viewer->output, - the_output_viewer->max_width, the_output_viewer->y); - - store = GTK_TREE_STORE (gtk_tree_view_get_model ( - the_output_viewer->overview)); - if (entity->table_num != the_output_viewer->last_table_num) - { - gtk_tree_store_append (store, &item, NULL); - gtk_tree_store_set (store, &item, COL_TITLE, entity->command_name, - -1); + psppire_output_view_put (window->view, item); - /* XXX shouldn't save a GtkTreeIter */ - the_output_viewer->last_table_num = entity->table_num; - the_output_viewer->last_top_level = item; - } - gtk_tree_store_append (store, &item, - &the_output_viewer->last_top_level); - gtk_tree_store_set (store, &item, COL_TITLE, - t->title ? t->title : "(unnamed)", -1); - - path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), - &the_output_viewer->last_top_level); - gtk_tree_view_expand_row (the_output_viewer->overview, path, TRUE); - gtk_tree_path_free (path); + if (new) + { + /* We could have called this earlier in the previous "if (new)" block, + but doing it here finds, in a plain GTK+ environment, a bug that + otherwise only showed up on an Ubuntu Unity desktop. See bug + #43362. */ + gtk_widget_show_all (GTK_WIDGET (pod->window)); } - gtk_window_set_urgency_hint (GTK_WINDOW (the_output_viewer), TRUE); + PsppireConf *conf = psppire_conf_new (); + { + gboolean status = true; + psppire_conf_get_boolean (conf, "OutputWindowAction", "alert", + &status); + gtk_window_set_urgency_hint (GTK_WINDOW (pod->window), status); + } + + { + gboolean status ; + if (psppire_conf_get_boolean (conf, "OutputWindowAction", "maximize", + &status) && status) + gtk_window_maximize (GTK_WINDOW (pod->window)); + } + + { + gboolean status ; + if (psppire_conf_get_boolean (conf, "OutputWindowAction", "raise", + &status) && status) + gtk_window_present (GTK_WINDOW (pod->window)); + } } -static struct outp_class psppire_output_class = +static struct output_driver_class psppire_output_class = { "PSPPIRE", /* name */ - true, /* special */ - NULL, /* open_driver */ - NULL, /* close_driver */ - NULL, /* open_page */ - NULL, /* close_page */ - NULL, /* flush */ + NULL, /* destroy */ psppire_output_submit, /* submit */ - NULL, /* line */ - NULL, /* text_metrics */ - NULL, /* text_draw */ - NULL, /* initialise_chart */ - NULL, /* finalise_chart */ + NULL, /* flush */ }; void psppire_output_window_setup (void) { - outp_register_driver (outp_allocate_driver (&psppire_output_class, - "PSPPIRE", 0)); + struct psppire_output_driver *pod; + struct output_driver *d; + + pod = xzalloc (sizeof *pod); + d = &pod->driver; + output_driver_init (d, &psppire_output_class, "PSPPIRE", + SETTINGS_DEVICE_UNFILTERED); + output_driver_register (d); } + -int viewer_length = 16; -int viewer_width = 59; /* Callback for the "delete" action (clicking the x on the top right hand corner of the window) */ @@ -257,7 +220,7 @@ on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data) gtk_widget_destroy (GTK_WIDGET (ow)); - the_output_viewer = NULL; + ow->driver->window = NULL; return FALSE; } @@ -270,36 +233,285 @@ cancel_urgency (GtkWindow *window, gpointer data) gtk_window_set_urgency_hint (window, FALSE); } +static void psppire_output_window_print (PsppireOutputWindow *window); + static void -psppire_output_window_init (PsppireOutputWindow *window) +export_output (PsppireOutputWindow *window, struct string_map *options, + const char *format) +{ + string_map_insert (options, "format", format); + psppire_output_view_export (window->view, options); +} + + +struct file_types { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkBuilder *xml; + const gchar *label; + const gchar *ext; +}; + +enum + { + FT_AUTO = 0, + FT_PDF, + FT_HTML, + FT_ODT, + FT_TXT, + FT_ASCII, + FT_PS, + FT_CSV, + n_FT + }; - xml = builder_new ("output-viewer.ui"); +#define N_EXTENSIONS (n_FT - 1) - gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window)); +struct file_types ft[n_FT] = { + {N_("Infer file type from extension"), NULL}, + {N_("PDF (*.pdf)"), ".pdf"}, + {N_("HTML (*.html)"), ".html"}, + {N_("OpenDocument (*.odt)"), ".odt"}, + {N_("Text (*.txt)"), ".txt"}, + {N_("Text [plain] (*.txt)"), ".txt"}, + {N_("PostScript (*.ps)"), ".ps"}, + {N_("Comma-Separated Values (*.csv)"), ".csv"} +}; - window->output = GTK_LAYOUT (get_widget_assert (xml, "output")); - window->y = 0; - window->overview = GTK_TREE_VIEW (get_widget_assert (xml, "overview")); - gtk_tree_view_set_model (window->overview, - GTK_TREE_MODEL (gtk_tree_store_new ( - N_COLS, - G_TYPE_STRING))); /* COL_TITLE */ - window->last_table_num = -1; +static void +on_combo_change (GtkFileChooser *chooser) +{ + gboolean sensitive = FALSE; + GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser); + + int x = 0; + gchar *fn = gtk_file_chooser_get_filename (chooser); - column = gtk_tree_view_column_new (); - gtk_tree_view_append_column (GTK_TREE_VIEW (window->overview), column); - renderer = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (column, renderer, TRUE); - gtk_tree_view_column_add_attribute (column, renderer, "text", COL_TITLE); + if (combo && gtk_widget_get_realized (combo)) + x = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + + if (fn == NULL) + { + sensitive = FALSE; + } + else + { + gint i; + if ( x != 0 ) + sensitive = TRUE; + + for (i = 1 ; i < N_EXTENSIONS ; ++i) + { + if ( g_str_has_suffix (fn, ft[i].ext)) + { + sensitive = TRUE; + break; + } + } + } + + g_free (fn); + + gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, sensitive); +} + + +static void +on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data) +{ + + GtkFileChooser *chooser = data; + const gchar *name = g_param_spec_get_name (pspec); + + if ( ! gtk_widget_get_realized (GTK_WIDGET (chooser))) + return; + + /* Ignore this one. It causes recursion. */ + if ( 0 == strcmp ("tooltip-text", name)) + return; + + on_combo_change (chooser); +} + + +/* Recursively descend all the children of W, connecting + to their "notify" signal */ +static void +iterate_widgets (GtkWidget *w, gpointer data) +{ + if ( GTK_IS_CONTAINER (w)) + gtk_container_forall (GTK_CONTAINER (w), iterate_widgets, data); + else + g_signal_connect (w, "notify", G_CALLBACK (on_file_chooser_change), data); +} + + + +static GtkListStore * +create_file_type_list (void) +{ + int i; + GtkTreeIter iter; + GtkListStore *list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + + for (i = 0 ; i < n_FT ; ++i) + { + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, + 0, gettext (ft[i].label), + 1, ft[i].ext, + -1); + } + + return list; +} + +static void +psppire_output_window_export (PsppireOutputWindow *window) +{ + gint response; + GtkWidget *combo; + GtkListStore *list; + + GtkFileChooser *chooser; + + GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"), + GTK_WINDOW (window), + GTK_FILE_CHOOSER_ACTION_SAVE, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_ACCEPT, + NULL); + + g_object_set (dialog, "local-only", FALSE, NULL); + + chooser = GTK_FILE_CHOOSER (dialog); + + list = create_file_type_list (); + + combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list)); + + + { + /* Create text cell renderer */ + GtkCellRenderer *cell = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE ); + + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell, "text", 0); + } + + g_signal_connect_swapped (combo, "changed", G_CALLBACK (on_combo_change), chooser); + + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); + + gtk_file_chooser_set_extra_widget (chooser, combo); + + /* This kludge is necessary because there is no signal to tell us + when the candidate filename of a GtkFileChooser has changed */ + gtk_container_forall (GTK_CONTAINER (dialog), iterate_widgets, dialog); + + + gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + if ( response == GTK_RESPONSE_ACCEPT ) + { + gint file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + gchar *filename = gtk_file_chooser_get_filename (chooser); + struct string_map options; + + g_return_if_fail (filename); + + if (file_type == FT_AUTO) + { + /* If the "Infer file type from extension" option was chosen, + search for the respective type in the list. + (It's a O(n) search, but fortunately n is small). */ + gint i; + for (i = 1 ; i < N_EXTENSIONS ; ++i) + { + if ( g_str_has_suffix (filename, ft[i].ext)) + { + file_type = i; + break; + } + } + } + else if (! g_str_has_suffix (filename, ft[file_type].ext)) + { + /* If an explicit document format was chosen, and if the chosen + filename does not already have that particular "extension", + then append it. + */ + + gchar *of = filename; + filename = g_strconcat (filename, ft[file_type].ext, NULL); + g_free (of); + } + + string_map_init (&options); + string_map_insert (&options, "output-file", filename); + + switch (file_type) + { + case FT_PDF: + export_output (window, &options, "pdf"); + break; + case FT_HTML: + export_output (window, &options, "html"); + break; + case FT_ODT: + export_output (window, &options, "odt"); + break; + case FT_PS: + export_output (window, &options, "ps"); + break; + case FT_CSV: + export_output (window, &options, "csv"); + break; + + case FT_TXT: + string_map_insert (&options, "box", "unicode"); + /* Fall through */ + + case FT_ASCII: + string_map_insert (&options, "headers", "false"); + string_map_insert (&options, "paginate", "false"); + string_map_insert (&options, "squeeze", "true"); + string_map_insert (&options, "emphasis", "none"); + string_map_insert (&options, "charts", "none"); + string_map_insert (&options, "top-margin", "0"); + string_map_insert (&options, "bottom-margin", "0"); + export_output (window, &options, "txt"); + break; + default: + g_assert_not_reached (); + } + + string_map_destroy (&options); + + free (filename); + } + + gtk_widget_destroy (dialog); +} + +static void +psppire_output_window_init (PsppireOutputWindow *window) +{ + GtkBuilder *xml = builder_new ("output-window.ui"); + GtkApplication *app = GTK_APPLICATION (g_application_get_default()); + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_container_add (GTK_CONTAINER (window), box); + + GtkWidget *paned = get_widget_assert (xml, "paned1"); + + window->dispose_has_run = FALSE; + + window->view = psppire_output_view_new ( + GTK_LAYOUT (get_widget_assert (xml, "output")), + GTK_TREE_VIEW (get_widget_assert (xml, "overview"))); - gtk_widget_modify_bg (GTK_WIDGET (window->output), GTK_STATE_NORMAL, - >k_widget_get_style (GTK_WIDGET (window->output))->base[GTK_STATE_NORMAL]); connect_help (xml); @@ -308,28 +520,52 @@ psppire_output_window_init (PsppireOutputWindow *window) G_CALLBACK (cancel_urgency), NULL); - g_signal_connect (get_action_assert (xml,"help_about"), - "activate", - G_CALLBACK (about_new), - window); + GObject *menu = get_object_assert (xml, "output-window-menu", G_TYPE_MENU); + GtkWidget *menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (menu)); + gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), paned, TRUE, TRUE, 0); - g_signal_connect (get_action_assert (xml,"help_reference"), - "activate", - G_CALLBACK (reference_manual), - NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_windows_menu (GTK_WINDOW (window))); - g_signal_connect (get_action_assert (xml,"windows_minimise-all"), - "activate", - G_CALLBACK (psppire_window_minimise_all), - NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_help_menu (GTK_WINDOW (window))); + + { + GSimpleAction *print = g_simple_action_new ("print", NULL); + g_signal_connect_swapped (print, "activate", G_CALLBACK (psppire_output_window_print), window); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print)); + + + const gchar *accels[2] = { "P", NULL}; + gtk_application_set_accels_for_action (app, + "win.print", + accels); + } + + + { + GSimpleAction *export = g_simple_action_new ("export", NULL); + g_signal_connect_swapped (export, "activate", G_CALLBACK (psppire_output_window_export), window); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (export)); + } { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + GSimpleAction *select_all = g_simple_action_new ("select-all", NULL); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (select_all)); + } - PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent); + { + GSimpleAction *copy = g_simple_action_new ("copy", NULL); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (copy)); + + const gchar *accels[2] = { "C", NULL}; + gtk_application_set_accels_for_action (app, + "win.copy", + accels); } + g_object_unref (xml); g_signal_connect (window, "delete-event", @@ -341,7 +577,14 @@ GtkWidget* psppire_output_window_new (void) { return GTK_WIDGET (g_object_new (psppire_output_window_get_type (), - "filename", "Output", + /* TRANSLATORS: This will be part of a filename. Please avoid whitespace. */ + "filename", _("Output"), "description", _("Output Viewer"), NULL)); } + +static void +psppire_output_window_print (PsppireOutputWindow *window) +{ + psppire_output_view_print (window->view, GTK_WINDOW (window)); +}