X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=695aa77eec81589a6e60319b29fff7fbe9135e47;hb=5ce6b1f0994ebe14da237b2b76d6ba27d92bbe7c;hp=ebf29c01a3ca41c3a58f9d456fee644fb8679919;hpb=f51ecb48027e6b1eb46840ae25888a25b429f012;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index ebf29c01a3..695aa77eec 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, 2010 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 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,50 +16,41 @@ #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 "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/cairo.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 "gl/xalloc.h" + +#include "helper.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid -enum - { - COL_TITLE, /* Table title. */ - 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) { @@ -70,8 +61,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, @@ -101,14 +92,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); + + if (window->dispose_has_run) + return; - 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; + 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); @@ -121,32 +112,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; @@ -158,144 +133,34 @@ 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; + PsppireOutputWindow *window; + bool new; - if (pod->viewer == NULL) + new = pod->window == NULL; + if (new) { - pod->viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); - gtk_widget_show_all (GTK_WIDGET (pod->viewer)); - pod->viewer->driver = pod; + pod->window = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); + pod->window->driver = pod; } - viewer = pod->viewer; + window = pod->window; - 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); + psppire_output_view_put (window->view, item); - if (is_text_item (item)) + 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); - - if (type == TEXT_ITEM_COMMAND_CLOSE) - { - viewer->in_command = false; - return; - } - else if (text[0] == '\0') - return; - } - - cr = gdk_cairo_create (GTK_WIDGET (pod->viewer)->window); - if (pod->xr == NULL) - pod->xr = xr_create_driver (cr); - - 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) - { - 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_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); - - gtk_window_set_urgency_hint (GTK_WINDOW (pod->viewer), TRUE); - -done: - cairo_destroy (cr); + gtk_window_set_urgency_hint (GTK_WINDOW (pod->window), TRUE); } static struct output_driver_class psppire_output_class = @@ -318,9 +183,8 @@ psppire_output_window_setup (void) 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) */ @@ -331,7 +195,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; } @@ -344,189 +208,286 @@ cancel_urgency (GtkWindow *window, gpointer data) gtk_window_set_urgency_hint (window, FALSE); } +static void psppire_output_window_print (PsppireOutputWindow *window); + + static void -on_row_activate (GtkTreeView *overview, - GtkTreePath *path, - GtkTreeViewColumn *column, - PsppireOutputWindow *window) +export_output (PsppireOutputWindow *window, struct string_map *options, + const char *format) { - GtkTreeModel *model; - GtkTreeIter iter; - GtkAdjustment *vadj; - GValue value = {0}; - double y, min, max; + string_map_insert (options, "format", format); + psppire_output_view_export (window->view, options); +} - 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); -} +struct file_types +{ + 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 + }; + +#define N_EXTENSIONS (n_FT - 1) + +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"} +}; -static GtkFileFilter * -add_filter (GtkFileChooser *chooser, const char *name, const char *pattern) + +static void +on_combo_change (GtkFileChooser *chooser) { - 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; + gboolean sensitive = FALSE; + GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser); + + int x = 0; + gchar *fn = gtk_file_chooser_get_filename (chooser); + + 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 -export_output (PsppireOutputWindow *window, struct string_map *options, - const char *format) +on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data) { - struct output_driver *driver; - size_t i; - string_map_insert (options, "format", format); - driver = output_driver_create (options); - if (driver == NULL) + 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; - for (i = 0; i < window->n_items; i++) - driver->class->submit (driver, window->items[i]); - output_driver_destroy (driver); + 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; - 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"), + + GtkWidget *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); + + g_object_set (dialog, "local-only", FALSE, NULL); + chooser = GTK_FILE_CHOOSER (dialog); - 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"); + 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); - gtk_file_chooser_set_filter (chooser, pdf_filter); 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); + 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); - g_return_if_fail (filter); - string_map_init (&options); - string_map_insert (&options, "output-file", filename); - if (filter == pdf_filter) + 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)) { - string_map_insert (&options, "output-type", "pdf"); - export_output (window, &options, "cairo"); + /* 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); } - else if (filter == html_filter) - export_output (window, &options, "html"); - else if (filter == odt_filter) - export_output (window, &options, "odf"); - else if (filter == txt_filter) - { + + 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, "chart-type", "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, "ascii"); - } - else if (filter == ps_filter) - { - string_map_insert (&options, "output-type", "ps"); - export_output (window, &options, "cairo"); - } - else if (filter == csv_filter) - export_output (window, &options, "csv"); - else - g_return_if_reached (); + export_output (window, &options, "txt"); + break; + default: + g_assert_not_reached (); + } + + string_map_destroy (&options); free (filename); } - 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); } static void psppire_output_window_init (PsppireOutputWindow *window) { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; GtkBuilder *xml; - xml = builder_new ("output-viewer.ui"); + xml = builder_new ("output-window.ui"); 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")); - gtk_tree_view_set_model (window->overview, - GTK_TREE_MODEL (gtk_tree_store_new ( - N_COLS, - G_TYPE_STRING, /* COL_TITLE */ - G_TYPE_LONG))); /* COL_Y */ - - window->in_command = false; - - window->items = NULL; - window->n_items = window->allocated_items = 0; + window->dispose_has_run = FALSE; - 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); + window->view = psppire_output_view_new ( + GTK_LAYOUT (get_widget_assert (xml, "output")), + GTK_TREE_VIEW (get_widget_assert (xml, "overview")), + get_action_assert (xml, "edit_copy"), + get_action_assert (xml, "edit_select-all")); - g_signal_connect (GTK_TREE_VIEW (window->overview), - "row-activated", G_CALLBACK (on_row_activate), window); - - 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); @@ -535,16 +496,6 @@ 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); - - g_signal_connect (get_action_assert (xml,"help_reference"), - "activate", - G_CALLBACK (reference_manual), - NULL); - g_signal_connect (get_action_assert (xml,"windows_minimise-all"), "activate", G_CALLBACK (psppire_window_minimise_all), @@ -552,14 +503,19 @@ psppire_output_window_init (PsppireOutputWindow *window) { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); + merge_help_menu (uim); PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent); + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all")->parent); } g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate", G_CALLBACK (psppire_output_window_export), window); + + g_signal_connect_swapped (get_action_assert (xml, "file_print"), "activate", + G_CALLBACK (psppire_output_window_print), window); + g_object_unref (xml); g_signal_connect (window, "delete-event", @@ -571,7 +527,14 @@ GtkWidget* psppire_output_window_new (void) { return GTK_WIDGET (g_object_new (psppire_output_window_get_type (), - "filename", "Output", + /* TRANSLATORS: This will form 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)); +}