/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010, 2011 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
#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"
viewer->items = NULL;
viewer->n_items = viewer->allocated_items = 0;
- g_object_unref (viewer->print_settings);
+ if (viewer->print_settings != NULL)
+ g_object_unref (viewer->print_settings);
/* Chain up to the parent class */
G_OBJECT_CLASS (parent_class)->dispose (obj);
struct output_driver driver;
PsppireOutputWindow *viewer;
struct xr_driver *xr;
+ int font_height;
};
static struct output_driver_class psppire_output_class;
{
const GtkStyle *style = gtk_widget_get_style (GTK_WIDGET (viewer));
struct string_map options = STRING_MAP_INITIALIZER (options);
+ struct text_item *text_item;
PangoFontDescription *font_desc;
char *font_name;
+ int font_width;
/* Use GTK+ default font as proportional font. */
font_name = pango_font_description_to_string (style->font_desc);
pod->xr = xr_driver_create (cr, &options);
string_map_destroy (&options);
+
+ text_item = text_item_create (TEXT_ITEM_PARAGRAPH, "X");
+ r = xr_rendering_create (pod->xr, text_item_super (text_item), cr);
+ xr_rendering_measure (r, &font_width, &pod->font_height);
+ /* xr_rendering_destroy (r); */
+ text_item_unref (text_item);
}
+ else
+ pod->viewer->y += pod->font_height / 2;
r = xr_rendering_create (pod->xr, item, cr);
if (r == NULL)
ds_clear (&title);
if (is_text_item (item))
ds_put_cstr (&title, text_item_get_text (to_text_item (item)));
+ else if (is_message_item (item))
+ {
+ const struct message_item *msg_item = to_message_item (item);
+ const struct msg *msg = message_item_get_msg (msg_item);
+ ds_put_format (&title, "%s: %s", _("Message"),
+ msg_severity_to_string (msg->severity));
+ }
else if (is_table_item (item))
{
const char *caption = table_item_get_caption (to_table_item (item));
SETTINGS_DEVICE_UNFILTERED);
output_driver_register (d);
}
+
\f
-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) */
n_FT
};
-#define N_EXTENTIONS (n_FT - 1)
+#define N_EXTENSIONS (n_FT - 1)
struct file_types ft[n_FT] = {
{N_("Infer file type from extension"), NULL},
int x = 0;
gchar *fn = gtk_file_chooser_get_filename (chooser);
- if (combo && GTK_WIDGET_REALIZED (combo))
+ if (combo && gtk_widget_get_realized (combo))
x = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
if (fn == NULL)
if ( x != 0 )
sensitive = TRUE;
- for (i = 1 ; i < N_EXTENTIONS ; ++i)
+ for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
if ( g_str_has_suffix (fn, ft[i].ext))
{
GtkFileChooser *chooser = data;
const gchar *name = g_param_spec_get_name (pspec);
- if ( ! GTK_WIDGET_REALIZED (chooser))
+ if ( ! gtk_widget_get_realized (GTK_WIDGET (chooser)))
return;
/* Ignore this one. It causes recursion. */
GtkTreeIter iter;
GtkListStore *list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- for (i = 0 ; i < 6 ; ++i)
+ for (i = 0 ; i < n_FT ; ++i)
{
gtk_list_store_append (list, &iter);
gtk_list_store_set (list, &iter,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
+ g_object_set (dialog, "local-only", FALSE, NULL);
+
chooser = GTK_FILE_CHOOSER (dialog);
list = create_file_type_list ();
if (file_type == FT_AUTO)
{
gint i;
- for (i = 1 ; i < N_EXTENTIONS ; ++i)
+ for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
if ( g_str_has_suffix (filename, ft[i].ext))
{
SELECT_FMT_ODT
};
-
-static void
-insert_glyph (struct string_map *map, const char *opt, gunichar glyph)
-{
- char s[6] = {0,0,0,0,0,0};
-
- g_unichar_to_utf8 (glyph, s);
- string_map_insert (map, opt, s);
-}
-
-struct glyph_pair
-{
- gunichar glyph;
- char opt[10];
-};
-
-/* See the table at
- http://en.wikipedia.org/wiki/Box-drawing_characters */
-struct glyph_pair table[] = {
- {0x2500, "box[1010]"},
- {0x2501, "box[2020]"},
- {0x2502, "box[0101]"},
- {0x2503, "box[0202]"},
-
- {0x250C, "box[1100]"},
- {0x250D, "box[2100]"},
- {0x250E, "box[1200]"},
- {0x250F, "box[2200]"},
- {0x2510, "box[0110]"},
- {0x2511, "box[0110]"},
- {0x2512, "box[0210]"},
- {0x2513, "box[0220]"},
- {0x2514, "box[1001]"},
- {0x2515, "box[2001]"},
- {0x2516, "box[1002]"},
- {0x2517, "box[2002]"},
- {0x2518, "box[0011]"},
- {0x2519, "box[0021]"},
- {0x251A, "box[0012]"},
- {0x251B, "box[0022]"},
- {0x251C, "box[1101]"},
- {0x251D, "box[2101]"},
- {0x251E, "box[1102]"},
- {0x251F, "box[1201]"},
- {0x2520, "box[1202]"},
- {0x2521, "box[2102]"},
- {0x2522, "box[2201]"},
- {0x2523, "box[2202]"},
- {0x2524, "box[0111]"},
- {0x2525, "box[0121]"},
- {0x2526, "box[0112]"},
- {0x2527, "box[0211]"},
- {0x2528, "box[0212]"},
- {0x2529, "box[0122]"},
- {0x252A, "box[0221]"},
- {0x252B, "box[0222]"},
- {0x252C, "box[1110]"},
- {0x252D, "box[1120]"},
- {0x252E, "box[2110]"},
- {0x252F, "box[2120]"},
- {0x2530, "box[1210]"},
- {0x2531, "box[1220]"},
- {0x2532, "box[2210]"},
- {0x2533, "box[2220]"},
- {0x2534, "box[1011]"},
- {0x2535, "box[1021]"},
- {0x2536, "box[2011]"},
- {0x2537, "box[2021]"},
- {0x2538, "box[1012]"},
- {0x2539, "box[1022]"},
- {0x253A, "box[2012]"},
- {0x253B, "box[2022]"},
- {0x253C, "box[1111]"},
- {0x253D, "box[1121]"},
- {0x253E, "box[2111]"},
- {0x253F, "box[2121]"},
- {0x2540, "box[1112]"},
- {0x2541, "box[1211]"},
- {0x2542, "box[1212]"},
- {0x2543, "box[1122]"},
- {0x2544, "box[2112]"},
- {0x2545, "box[1221]"},
- {0x2546, "box[2211]"},
- {0x2547, "box[2122]"},
- {0x2548, "box[2221]"},
- {0x2549, "box[1222]"},
- {0x254A, "box[2212]"},
- {0x254B, "box[2222]"},
-
- {0x2574, "box[0010]"},
- {0x2575, "box[0001]"},
- {0x2576, "box[1000]"},
- {0x2577, "box[0100]"},
- {0x2578, "box[0020]"},
- {0x2579, "box[0002]"},
- {0x257A, "box[2000]"},
- {0x257B, "box[0200]"},
- {0x257C, "box[2010]"},
- {0x257D, "box[0201]"},
- {0x257E, "box[1020]"},
- {0x257F, "box[0102]"},
-};
-
-
-static void
-utf8_box_chars (struct string_map *map)
-{
- int i;
- for (i = 0; i < sizeof (table) / sizeof (table[0]); ++i)
- {
- const struct glyph_pair *p = &table[i];
- insert_glyph (map, p->opt, p->glyph);
- }
-}
-
-
-
static void
clipboard_get_cb (GtkClipboard *clipboard,
GtkSelectionData *selection_data,
switch (info)
{
case SELECT_FMT_UTF8:
- utf8_box_chars (&options);
+ string_map_insert (&options, "box", "unicode");
/* fall-through */
case SELECT_FMT_TEXT:
case SELECT_FMT_HTML:
string_map_insert (&options, "format", "html");
+ string_map_insert (&options, "borders", "false");
+ string_map_insert (&options, "css", "false");
break;
case SELECT_FMT_ODT:
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));
}
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))
+ while (xr_driver_need_new_page (window->print_xrd))
{
xr_driver_next_page (window->print_xrd, NULL);
window->print_n_pages ++;
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;
- }
+ while (!xr_driver_need_new_page (window->print_xrd)
+ && window->print_item < window->n_items)
+ xr_driver_output_item (window->print_xrd, window->items [window->print_item++]);
}
projects / pspp-builds.git / blobdiff