X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=b7ed01a1916c143cc406518bb0fd983b96bf3256;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=af47d3be51079a1e63c344824e74df20e4d5d322;hpb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;p=pspp diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index af47d3be51..b7ed01a191 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,72 +16,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 "about.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_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; @@ -94,26 +57,30 @@ 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. */ @@ -121,8 +88,7 @@ psppire_output_window_base_finalize (PsppireOutputWindowClass *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; @@ -134,74 +100,63 @@ 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); - GtkWidget *drawing_area; - struct xr_rendering *r; - 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; - } - - 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; + 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)); - xr_rendering_measure (r, &tw, &th); + pod->window->driver = pod; + } + window = pod->window; - 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); + psppire_output_view_put (window->view, item); - if (pod->viewer->max_width < tw) - pod->viewer->max_width = tw; - pod->viewer->y += th; + 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_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, /* create */ NULL, /* destroy */ psppire_output_submit, /* submit */ NULL, /* flush */ @@ -215,12 +170,12 @@ psppire_output_window_setup (void) pod = xzalloc (sizeof *pod); d = &pod->driver; - output_driver_init (d, &psppire_output_class, "PSPPIRE", 0); + 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) */ @@ -231,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; } @@ -244,99 +199,335 @@ 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); +} + + +struct file_types +{ + const gchar *label; + const gchar *ext; +}; + +enum + { + FT_AUTO = 0, + FT_SPV, + FT_PDF, + FT_HTML, + FT_ODT, + FT_TXT, + FT_ASCII, + FT_PS, + FT_CSV, + n_FT + }; + +#define N_EXTENSIONS (n_FT - 1) + +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"} +}; + + +static void +on_combo_change (GtkFileChooser *chooser) +{ + gboolean sensitive = FALSE; + GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser); - model = gtk_tree_view_get_model (overview); - if (!gtk_tree_model_get_iter (model, &iter, path)) + 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 +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; - 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); + /* 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 -psppire_output_window_init (PsppireOutputWindow *window) +iterate_widgets (GtkWidget *w, gpointer data) { - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkBuilder *xml; + 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); - xml = builder_new ("output-viewer.ui"); + list = create_file_type_list (); - gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window)); + combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list)); - 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->last_table_num = -1; + { + /* 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); - 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_file_chooser_set_extra_widget (chooser, combo); - g_signal_connect (GTK_TREE_VIEW (window->overview), - "row-activated", G_CALLBACK (on_row_activate), window); + /* 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_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); + 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_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_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 (); + } + + 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"))); g_signal_connect (window, "focus-in-event", 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", @@ -348,7 +539,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)); +}