X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=46535b0f2362fd7cc8777cdeeaf18a67057c7e9b;hb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;hp=f2580b7b16ca225844caa6ecc5bb150fc8d49658;hpb=d0c5a88743b6e6964133405548a0833f410b6979;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index f2580b7b16..46535b0f23 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, + 2021 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,78 +17,35 @@ #include -#include -#include -#include "helper.h" +#include "ui/gui/psppire-output-window.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include +#include +#include -#include "help-menu.h" - -#include "psppire-output-window.h" - +#include "libpspp/cast.h" +#include "libpspp/message.h" +#include "libpspp/string-map.h" +#include "output/driver-provider.h" +#include "output/output-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 "xalloc.h" +#include "gl/xalloc.h" -#include -#include -#include +#include "helper.h" #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid -enum - { - COL_TITLE, /* Table title. */ - COL_ADDR, /* Pointer to the table */ - COL_Y, /* Y position of top of 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) -{ - static GType psppire_output_window_type = 0; - - if (!psppire_output_window_type) - { - static const GTypeInfo psppire_output_window_info = - { - sizeof (PsppireOutputWindowClass), - (GBaseInitFunc) psppire_output_window_base_init, - (GBaseFinalizeFunc) psppire_output_window_base_finalize, - (GClassInitFunc)psppire_output_window_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireOutputWindow), - 0, - (GInstanceInitFunc) psppire_output_window_init, - }; - - psppire_output_window_type = - g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow", - &psppire_output_window_info, 0); - } - - return psppire_output_window_type; -} +G_DEFINE_TYPE (PsppireOutputWindow, psppire_output_window, PSPPIRE_TYPE_WINDOW) static GObjectClass *parent_class; @@ -102,16 +60,14 @@ psppire_output_window_finalize (GObject *object) static void psppire_output_window_dispose (GObject *obj) { - PsppireOutputWindow *viewer = PSPPIRE_OUTPUT_WINDOW (obj); - size_t i; + PsppireOutputWindow *window = PSPPIRE_OUTPUT_WINDOW (obj); - for (i = 0; i < viewer->n_items; i++) - output_item_unref (viewer->items[i]); - free (viewer->items); - viewer->items = NULL; - viewer->n_items = viewer->allocated_items = 0; + if (window->dispose_has_run) + return; - g_object_unref (viewer->print_settings); + window->dispose_has_run = TRUE; + psppire_output_view_destroy (window->view); + window->view = NULL; /* Chain up to the parent class */ G_OBJECT_CLASS (parent_class)->dispose (obj); @@ -124,32 +80,16 @@ psppire_output_window_class_init (PsppireOutputWindowClass *class) parent_class = g_type_class_peek_parent (class); object_class->dispose = psppire_output_window_dispose; -} - - -static void -psppire_output_window_base_init (PsppireOutputWindowClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); object_class->finalize = psppire_output_window_finalize; } - - - -static void -psppire_output_window_base_finalize (PsppireOutputWindowClass *class, - gpointer class_data) -{ -} /* Output driver class. */ struct psppire_output_driver { struct output_driver driver; - PsppireOutputWindow *viewer; - struct xr_driver *xr; + PsppireOutputWindow *window; }; static struct output_driver_class psppire_output_class; @@ -161,204 +101,81 @@ psppire_output_cast (struct output_driver *driver) return UP_CAST (driver, struct psppire_output_driver, driver); } -static gboolean -expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) -{ - struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); - cairo_t *cr; - - cr = gdk_cairo_create (widget->window); - xr_rendering_draw (r, cr); - cairo_destroy (cr); - - return TRUE; -} - static void psppire_output_submit (struct output_driver *this, const struct output_item *item) { struct psppire_output_driver *pod = psppire_output_cast (this); - PsppireOutputWindow *viewer; - GtkWidget *drawing_area; - struct xr_rendering *r; - struct string title; - GtkTreeStore *store; - GtkTreePath *path; - GtkTreeIter iter; - cairo_t *cr; - int tw, th; - - if (pod->viewer == NULL) - { - pod->viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); - gtk_widget_show_all (GTK_WIDGET (pod->viewer)); - pod->viewer->driver = pod; - } - viewer = pod->viewer; + PsppireOutputWindow *window; + bool new; - if (viewer->n_items >= viewer->allocated_items) - viewer->items = x2nrealloc (viewer->items, &viewer->allocated_items, - sizeof *viewer->items); - viewer->items[viewer->n_items++] = output_item_ref (item); - - if (is_text_item (item)) + new = pod->window == NULL; + if (new) { - const struct text_item *text_item = to_text_item (item); - enum text_item_type type = text_item_get_type (text_item); - const char *text = text_item_get_text (text_item); + 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)); - if (type == TEXT_ITEM_COMMAND_CLOSE) - { - viewer->in_command = false; - return; - } - else if (text[0] == '\0') - return; + pod->window->driver = pod; } + window = pod->window; - cr = gdk_cairo_create (GTK_WIDGET (pod->viewer)->window); - if (pod->xr == NULL) - { - const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer)); - struct string_map options = STRING_MAP_INITIALIZER (options); - PangoFontDescription *font_desc; - char *font_name; - - /* Use GTK+ default font as proportional font. */ - font_name = pango_font_description_to_string (style->font_desc); - string_map_insert (&options, "prop-font", font_name); - g_free (font_name); - - /* Derived emphasized font from proportional font. */ - font_desc = pango_font_description_copy (style->font_desc); - pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC); - font_name = pango_font_description_to_string (font_desc); - string_map_insert (&options, "emph-font", font_name); - g_free (font_name); - pango_font_description_free (font_desc); - - /* Pretend that the "page" has a reasonable width and a very big length, - so that most tables can be conveniently viewed on-screen with vertical - scrolling only. (The length should not be increased very much because - it is already close enough to INT_MAX when expressed as thousands of a - point.) */ - string_map_insert (&options, "paper-size", "300x200000mm"); - string_map_insert (&options, "headers", "off"); - string_map_insert (&options, "left-margin", "0"); - string_map_insert (&options, "right-margin", "0"); - string_map_insert (&options, "top-margin", "0"); - string_map_insert (&options, "bottom-margin", "0"); - - pod->xr = xr_driver_create (cr, &options); - - string_map_destroy (&options); - } + psppire_output_view_put (window->view, item); - r = xr_rendering_create (pod->xr, item, cr); - if (r == NULL) - goto done; - - xr_rendering_measure (r, &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), "rendering", r); - gtk_widget_set_size_request (drawing_area, tw, th); - gtk_layout_put (pod->viewer->output, drawing_area, 0, pod->viewer->y); - gtk_widget_show (drawing_area); - g_signal_connect (G_OBJECT (drawing_area), "expose_event", - G_CALLBACK (expose_event_callback), NULL); - - if (!is_text_item (item) - || text_item_get_type (to_text_item (item)) != TEXT_ITEM_SYNTAX - || !viewer->in_command) + if (new) { - store = GTK_TREE_STORE (gtk_tree_view_get_model (viewer->overview)); - - ds_init_empty (&title); - if (is_text_item (item) - && text_item_get_type (to_text_item (item)) == TEXT_ITEM_COMMAND_OPEN) - { - gtk_tree_store_append (store, &iter, NULL); - viewer->cur_command = iter; /* XXX shouldn't save a GtkTreeIter */ - viewer->in_command = true; - } - else - { - GtkTreeIter *p = viewer->in_command ? &viewer->cur_command : NULL; - gtk_tree_store_append (store, &iter, p); - } - - ds_clear (&title); - if (is_text_item (item)) - ds_put_cstr (&title, text_item_get_text (to_text_item (item))); - else if (is_table_item (item)) - { - const char *caption = table_item_get_caption (to_table_item (item)); - if (caption != NULL) - ds_put_format (&title, "Table: %s", caption); - else - ds_put_cstr (&title, "Table"); - } - else if (is_chart_item (item)) - { - const char *s = chart_item_get_title (to_chart_item (item)); - if (s != NULL) - ds_put_format (&title, "Chart: %s", s); - else - ds_put_cstr (&title, "Chart"); - } - gtk_tree_store_set (store, &iter, - COL_TITLE, ds_cstr (&title), - COL_ADDR, item, - COL_Y, viewer->y, - -1); - ds_destroy (&title); - - path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter); - gtk_tree_view_expand_row (viewer->overview, path, TRUE); - gtk_tree_path_free (path); + /* 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)); } - if (pod->viewer->max_width < tw) - pod->viewer->max_width = tw; - pod->viewer->y += th; - - gtk_layout_set_size (pod->viewer->output, - pod->viewer->max_width, pod->viewer->y); + 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); + } - gtk_window_set_urgency_hint (GTK_WINDOW (pod->viewer), TRUE); + { + gboolean status ; + if (psppire_conf_get_boolean (conf, "OutputWindowAction", "maximize", + &status) && status) + gtk_window_maximize (GTK_WINDOW (pod->window)); + } -done: - cairo_destroy (cr); + { + gboolean status ; + if (psppire_conf_get_boolean (conf, "OutputWindowAction", "raise", + &status) && status) + gtk_window_present (GTK_WINDOW (pod->window)); + } } static struct output_driver_class psppire_output_class = { - "PSPPIRE", /* name */ - NULL, /* destroy */ - psppire_output_submit, /* submit */ - NULL, /* flush */ + .name = "PSPPIRE", + .submit = psppire_output_submit, + .handles_groups = true, + .handles_show = true, }; void psppire_output_window_setup (void) { - struct psppire_output_driver *pod; + struct psppire_output_driver *pod = XZALLOC (struct psppire_output_driver); 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) */ @@ -369,7 +186,7 @@ on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data) gtk_widget_destroy (GTK_WIDGET (ow)); - ow->driver->viewer = NULL; + ow->driver->window = NULL; return FALSE; } @@ -382,419 +199,301 @@ cancel_urgency (GtkWindow *window, gpointer data) gtk_window_set_urgency_hint (window, FALSE); } -static void -on_row_activate (GtkTreeView *overview, - GtkTreePath *path, - GtkTreeViewColumn *column, - PsppireOutputWindow *window) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GtkAdjustment *vadj; - GValue value = {0}; - double y, min, max; - - model = gtk_tree_view_get_model (overview); - if (!gtk_tree_model_get_iter (model, &iter, path)) - return; - - gtk_tree_model_get_value (model, &iter, COL_Y, &value); - y = g_value_get_long (&value); - g_value_unset (&value); - - vadj = gtk_layout_get_vadjustment (window->output); - min = vadj->lower; - max = vadj->upper - vadj->page_size; - if (y < min) - y = min; - else if (y > max) - y = max; - gtk_adjustment_set_value (vadj, y); -} - static void psppire_output_window_print (PsppireOutputWindow *window); -static GtkFileFilter * -add_filter (GtkFileChooser *chooser, const char *name, const char *pattern) -{ - GtkFileFilter *filter = gtk_file_filter_new (); - g_object_ref_sink (G_OBJECT (filter)); - gtk_file_filter_set_name (filter, name); - gtk_file_filter_add_pattern (filter, pattern); - gtk_file_chooser_add_filter (chooser, filter); - return filter; -} - static void export_output (PsppireOutputWindow *window, struct string_map *options, const char *format) { - struct output_driver *driver; - size_t i; - string_map_insert (options, "format", format); - driver = output_driver_create (options); - if (driver == NULL) - return; - - for (i = 0; i < window->n_items; i++) - driver->class->submit (driver, window->items[i]); - output_driver_destroy (driver); + psppire_output_view_export (window->view, options); } -static void -psppire_output_window_export (PsppireOutputWindow *window) -{ - gint response; - - GtkFileFilter *pdf_filter; - GtkFileFilter *html_filter; - GtkFileFilter *odt_filter; - GtkFileFilter *txt_filter; - GtkFileFilter *ps_filter; - GtkFileFilter *csv_filter; - GtkFileChooser *chooser; - GtkWidget *dialog; - dialog = gtk_file_chooser_dialog_new (_("Export Output"), - GTK_WINDOW (window), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - chooser = GTK_FILE_CHOOSER (dialog); +struct file_types +{ + const gchar *label; + const gchar *ext; +}; - pdf_filter = add_filter (chooser, _("PDF Files (*.pdf)"), "*.pdf"); - html_filter = add_filter (chooser, _("HTML Files (*.html)"), "*.html"); - odt_filter = add_filter (chooser, _("OpenDocument Files (*.odt)"), "*.odt"); - txt_filter = add_filter (chooser, _("Text Files (*.txt)"), "*.txt"); - ps_filter = add_filter (chooser, _("PostScript Files (*.ps)"), "*.ps"); - csv_filter = add_filter (chooser, _("Comma-Separated Value Files (*.csv)"), - "*.csv"); +enum + { + FT_AUTO = 0, + FT_SPV, + FT_PDF, + FT_HTML, + FT_ODT, + FT_TXT, + FT_ASCII, + FT_PS, + FT_CSV, + FT_PNG, + FT_SVG, + n_FT + }; - gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); - gtk_file_chooser_set_filter (chooser, pdf_filter); +static const struct file_types ft[n_FT] = { + {N_("Infer file type from extension"), NULL}, + {N_("SPSS Viewer (*.spv)"), ".spv"}, + {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"}, + {N_("Portable Network Graphics (*.png)"), ".png"}, + {N_("Scalable Vector Graphics (*.svg)"), ".svg"} +}; - response = gtk_dialog_run (GTK_DIALOG (dialog)); - if ( response == GTK_RESPONSE_ACCEPT ) - { - char *filename = gtk_file_chooser_get_filename (chooser); - GtkFileFilter *filter = gtk_file_chooser_get_filter (chooser); - struct string_map options; +static void +on_combo_change (GtkFileChooser *chooser) +{ + gboolean sensitive = FALSE; + GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser); - g_return_if_fail (filename); - g_return_if_fail (filter); + int file_type = FT_AUTO; + gchar *fn = gtk_file_chooser_get_filename (chooser); - string_map_init (&options); - string_map_insert (&options, "output-file", filename); - if (filter == pdf_filter) - { - export_output (window, &options, "pdf"); - } - else if (filter == html_filter) - export_output (window, &options, "html"); - else if (filter == odt_filter) - export_output (window, &options, "odt"); - else if (filter == txt_filter) - { - 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"); - } - else if (filter == ps_filter) - export_output (window, &options, "ps"); - else if (filter == csv_filter) - export_output (window, &options, "csv"); - else - g_return_if_reached (); + if (combo && gtk_widget_get_realized (combo)) + file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); - free (filename); + if (fn != NULL && file_type == FT_AUTO) + { + for (gint i = 1 ; i < n_FT ; ++i) + { + if (g_str_has_suffix (fn, ft[i].ext)) + { + sensitive = TRUE; + break; + } + } } + else + sensitive = (fn != NULL); - g_object_unref (G_OBJECT (pdf_filter)); - g_object_unref (G_OBJECT (html_filter)); - g_object_unref (G_OBJECT (txt_filter)); - g_object_unref (G_OBJECT (ps_filter)); - g_object_unref (G_OBJECT (csv_filter)); - - gtk_widget_destroy (dialog); -} - - -enum { - SELECT_FMT_NULL, - SELECT_FMT_TEXT, - SELECT_FMT_UTF8, - SELECT_FMT_HTML -}; - - -static void -insert_glyph (struct string_map *map, const char *opt, gunichar glyph) -{ - char s[6] = {0,0,0,0,0,0}; + g_free (fn); - g_unichar_to_utf8 (glyph, s); - string_map_insert (map, opt, s); + gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, sensitive); } -struct glyph_pair -{ - gunichar glyph; - char opt[10]; -}; - -struct glyph_pair table[] = { - {0x250C, "box[1100]"}, - {0x2518, "box[0011]"}, - {0x2510, "box[0110]"}, - {0x2514, "box[1001]"}, - {0x2502, "box[0101]"}, - {0x2500, "box[1010]"}, - {0x2534, "box[1011]"}, - {0x252C, "box[1110]"}, - {0x2501, "box[2020]"}, - {0x2503, "box[0202]"}, - {0x253F, "box[2121]"}, - {0x2542, "box[1212]"}, - {0x254B, "box[2222]"}, - {0x2525, "box[0121]"}, - {0x2530, "box[1210]"}, - {0x2538, "box[1012]"}, - {0x251D, "box[2101]"}, - {0x2537, "box[2021]"}, - {0x252F, "box[2120]"} -}; - -static void -utf8_box_chars (struct string_map *map) +static GtkListStore * +create_file_type_list (void) { int i; - for (i = 0; i < sizeof (table) / sizeof (table[0]); ++i) + GtkTreeIter iter; + GtkListStore *list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + + for (i = 0 ; i < n_FT ; ++i) { - const struct glyph_pair *p = &table[i]; - insert_glyph (map, p->opt, p->glyph); + 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 -clipboard_get_cb (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer data) +psppire_output_window_export (PsppireOutputWindow *window) { - PsppireOutputWindow *window = data; - - gsize length; - gchar *text = NULL; - struct output_driver *driver = NULL; - char *filename = NULL; - struct string_map options; + gint response; + GtkWidget *combo; + GtkListStore *list; - GtkTreeSelection *sel = gtk_tree_view_get_selection (window->overview); - GtkTreeModel *model = gtk_tree_view_get_model (window->overview); + GtkFileChooser *chooser; - GList *rows = gtk_tree_selection_get_selected_rows (sel, &model); - GList *n = rows; + 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); - if ( n == NULL) - return; + g_object_set (dialog, "local-only", FALSE, NULL); - string_map_init (&options); - filename = tempnam (NULL, NULL); - string_map_insert (&options, "output-file", filename); + chooser = GTK_FILE_CHOOSER (dialog); - switch (info) - { - case SELECT_FMT_UTF8: - utf8_box_chars (&options); - /* fall-through */ + list = create_file_type_list (); - case SELECT_FMT_TEXT: - string_map_insert (&options, "format", "txt"); - break; + combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list)); - case SELECT_FMT_HTML: - string_map_insert (&options, "format", "html"); - break; - default: - goto finish; - break; - } + { + /* Create text cell renderer */ + GtkCellRenderer *cell = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE); - driver = output_driver_create (&options); - if (driver == NULL) - goto finish; + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell, "text", 0); + } - while (n) - { - GtkTreePath *path = n->data ; - GtkTreeIter iter; - struct output_item *item ; + g_signal_connect_swapped (combo, "changed", G_CALLBACK (on_combo_change), chooser); - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, COL_ADDR, &item, -1); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - driver->class->submit (driver, item); + gtk_file_chooser_set_extra_widget (chooser, combo); - n = n->next; - } + g_signal_connect (chooser, "selection-changed", G_CALLBACK (on_combo_change), NULL); + gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE); - if ( driver->class->flush) - driver->class->flush (driver); + response = gtk_dialog_run (GTK_DIALOG (dialog)); - if ( g_file_get_contents (filename, &text, &length, NULL) ) + if (response == GTK_RESPONSE_ACCEPT) { - gtk_selection_data_set (selection_data, selection_data->target, - 8, - (const guchar *) text, length); - } - - finish: - - output_driver_destroy (driver); - g_free (text); - - unlink (filename); - free (filename); - - g_list_free (rows); -} - -static void -clipboard_clear_cb (GtkClipboard *clipboard, - gpointer data) -{ -} - -static const GtkTargetEntry targets[] = { + gint file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + gchar *filename = gtk_file_chooser_get_filename (chooser); + struct string_map options; - { "STRING", 0, SELECT_FMT_TEXT }, - { "TEXT", 0, SELECT_FMT_TEXT }, - { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT }, - { "text/plain", 0, SELECT_FMT_TEXT }, + g_return_if_fail (filename); - { "UTF8_STRING", 0, SELECT_FMT_UTF8 }, - { "text/plain;charset=utf-8", 0, SELECT_FMT_UTF8 }, + 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_FT ; ++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); + } - { "text/html", 0, SELECT_FMT_HTML } -}; + string_map_init (&options); + string_map_insert (&options, "output-file", filename); -static void -on_copy (PsppireOutputWindow *window) -{ - { - GtkClipboard *clipboard = - gtk_widget_get_clipboard (GTK_WIDGET (window), - GDK_SELECTION_CLIPBOARD); + switch (file_type) + { + case FT_SPV: + export_output (window, &options, "spv"); + break; + 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_PNG: + export_output (window, &options, "png"); + break; + case FT_SVG: + export_output (window, &options, "svg"); + break; + + case FT_TXT: + string_map_insert (&options, "box", "unicode"); + /* Fall through */ + + case FT_ASCII: + string_map_insert (&options, "charts", "none"); + export_output (window, &options, "txt"); + break; + default: + g_assert_not_reached (); + } - if (!gtk_clipboard_set_with_data (clipboard, targets, - G_N_ELEMENTS (targets), - clipboard_get_cb, clipboard_clear_cb, - window)) + string_map_destroy (&options); - clipboard_clear_cb (clipboard, window); - } -} + free (filename); + } -static void -on_selection_change (GtkTreeSelection *sel, GtkAction *copy_action) -{ - /* The Copy action is available only if there is something selected */ - gtk_action_set_sensitive (copy_action, gtk_tree_selection_count_selected_rows (sel) > 0); + gtk_widget_destroy (dialog); } static void psppire_output_window_init (PsppireOutputWindow *window) { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkBuilder *xml; - GtkAction *copy_action; - GtkTreeSelection *sel; + 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); - xml = builder_new ("output-viewer.ui"); + GtkWidget *paned = get_widget_assert (xml, "paned1"); - copy_action = get_action_assert (xml, "edit_copy"); + window->dispose_has_run = FALSE; - gtk_action_set_sensitive (copy_action, FALSE); + window->view = psppire_output_view_new ( + GTK_LAYOUT (get_widget_assert (xml, "output")), + GTK_TREE_VIEW (get_widget_assert (xml, "overview"))); - g_signal_connect_swapped (copy_action, "activate", G_CALLBACK (on_copy), window); - - gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window)); - - window->output = GTK_LAYOUT (get_widget_assert (xml, "output")); - window->y = 0; - - window->overview = GTK_TREE_VIEW (get_widget_assert (xml, "overview")); - - sel = gtk_tree_view_get_selection (window->overview); - - gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE); - - g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), copy_action); - - gtk_tree_view_set_model (window->overview, - GTK_TREE_MODEL (gtk_tree_store_new ( - N_COLS, - G_TYPE_STRING, /* COL_TITLE */ - G_TYPE_POINTER, /* COL_ADDR */ - G_TYPE_LONG))); /* COL_Y */ - - window->in_command = false; + g_signal_connect (window, + "focus-in-event", + G_CALLBACK (cancel_urgency), + NULL); - window->items = NULL; - window->n_items = window->allocated_items = 0; + 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); - 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); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_windows_menu (GTK_WINDOW (window))); - g_signal_connect (GTK_TREE_VIEW (window->overview), - "row-activated", G_CALLBACK (on_row_activate), window); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), + create_help_menu (GTK_WINDOW (window))); - gtk_widget_modify_bg (GTK_WIDGET (window->output), GTK_STATE_NORMAL, - >k_widget_get_style (GTK_WIDGET (window->output))->base[GTK_STATE_NORMAL]); + { + 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)); - connect_help (xml); - g_signal_connect (window, - "focus-in-event", - G_CALLBACK (cancel_urgency), - NULL); + const gchar *accels[2] = { "P", NULL}; + gtk_application_set_accels_for_action (app, + "win.print", + accels); + } - g_signal_connect (get_action_assert (xml,"windows_minimise-all"), - "activate", - G_CALLBACK (psppire_window_minimise_all), - NULL); { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); - merge_help_menu (uim); + 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)); + } - PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all")->parent); + { + GSimpleAction *select_all = g_simple_action_new ("select-all", NULL); + g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (select_all)); } - g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate", - G_CALLBACK (psppire_output_window_export), window); + { + 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_signal_connect_swapped (get_action_assert (xml, "file_print"), "activate", - G_CALLBACK (psppire_output_window_print), window); g_object_unref (xml); @@ -807,135 +506,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 -create_xr_print_driver (GtkPrintContext *context, PsppireOutputWindow *window) -{ - struct string_map options; - GtkPageSetup *page_setup; - double width, height; - double left_margin; - double right_margin; - double top_margin; - double bottom_margin; - - page_setup = gtk_print_context_get_page_setup (context); - width = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_MM); - height = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_MM); - left_margin = gtk_page_setup_get_left_margin (page_setup, GTK_UNIT_MM); - right_margin = gtk_page_setup_get_right_margin (page_setup, GTK_UNIT_MM); - top_margin = gtk_page_setup_get_top_margin (page_setup, GTK_UNIT_MM); - bottom_margin = gtk_page_setup_get_bottom_margin (page_setup, GTK_UNIT_MM); - - string_map_init (&options); - string_map_insert_nocopy (&options, xstrdup ("paper-size"), - xasprintf("%.2fx%.2fmm", width, height)); - string_map_insert_nocopy (&options, xstrdup ("left-margin"), - xasprintf ("%.2fmm", left_margin)); - string_map_insert_nocopy (&options, xstrdup ("right-margin"), - xasprintf ("%.2fmm", right_margin)); - string_map_insert_nocopy (&options, xstrdup ("top-margin"), - xasprintf ("%.2fmm", top_margin)); - string_map_insert_nocopy (&options, xstrdup ("bottom-margin"), - xasprintf ("%.2fmm", bottom_margin)); - - window->print_xrd = - xr_driver_create (gtk_print_context_get_cairo_context (context), &options); - - string_map_destroy (&options); -} - -static gboolean -paginate (GtkPrintOperation *operation, - GtkPrintContext *context, - PsppireOutputWindow *window) -{ - if ( window->print_item < window->n_items ) - { - xr_driver_output_item (window->print_xrd, window->items[window->print_item++]); - if (xr_driver_need_new_page (window->print_xrd)) - { - xr_driver_next_page (window->print_xrd, NULL); - window->print_n_pages ++; - } - return FALSE; - } - else - { - gtk_print_operation_set_n_pages (operation, window->print_n_pages); - window->print_item = 0; - create_xr_print_driver (context, window); - return TRUE; - } -} - -static void -begin_print (GtkPrintOperation *operation, - GtkPrintContext *context, - PsppireOutputWindow *window) -{ - create_xr_print_driver (context, window); - - window->print_item = 0; - window->print_n_pages = 1; -} - -static void -end_print (GtkPrintOperation *operation, - GtkPrintContext *context, - PsppireOutputWindow *window) -{ - xr_driver_destroy (window->print_xrd); -} - - -static void -draw_page (GtkPrintOperation *operation, - GtkPrintContext *context, - gint page_number, - PsppireOutputWindow *window) -{ - xr_driver_next_page (window->print_xrd, gtk_print_context_get_cairo_context (context)); - while ( window->print_item < window->n_items) - { - xr_driver_output_item (window->print_xrd, window->items [window->print_item++]); - if ( xr_driver_need_new_page (window->print_xrd) ) - break; - } -} - - static void psppire_output_window_print (PsppireOutputWindow *window) { - GtkPrintOperationResult res; - - GtkPrintOperation *print = gtk_print_operation_new (); - - if (window->print_settings != NULL) - gtk_print_operation_set_print_settings (print, window->print_settings); - - g_signal_connect (print, "begin_print", G_CALLBACK (begin_print), window); - g_signal_connect (print, "end_print", G_CALLBACK (end_print), window); - g_signal_connect (print, "paginate", G_CALLBACK (paginate), window); - g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), window); - - res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, - GTK_WINDOW (window), NULL); - - if (res == GTK_PRINT_OPERATION_RESULT_APPLY) - { - if (window->print_settings != NULL) - g_object_unref (window->print_settings); - window->print_settings = g_object_ref (gtk_print_operation_get_print_settings (print)); - - } - - g_object_unref (print); + psppire_output_view_print (window->view, GTK_WINDOW (window)); }