projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/ui/gui/helper.c: Remove unused functions
[pspp]
/
src
/
ui
/
gui
/
psppire-output-window.c
diff --git
a/src/ui/gui/psppire-output-window.c
b/src/ui/gui/psppire-output-window.c
index f61e8e546e64719a31c0cbac6fb3f4513d61d2cf..680618de92bfdfe17eb4f59ea07e2cd285ab24b6 100644
(file)
--- a/
src/ui/gui/psppire-output-window.c
+++ b/
src/ui/gui/psppire-output-window.c
@@
-253,6
+253,7
@@
struct file_types
enum
{
FT_AUTO = 0,
enum
{
FT_AUTO = 0,
+ FT_SPV,
FT_PDF,
FT_HTML,
FT_ODT,
FT_PDF,
FT_HTML,
FT_ODT,
@@
-267,6
+268,7
@@
enum
struct file_types ft[n_FT] = {
{N_("Infer file type from extension"), NULL},
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_("PDF (*.pdf)"), ".pdf"},
{N_("HTML (*.html)"), ".html"},
{N_("OpenDocument (*.odt)"), ".odt"},
@@
-296,12
+298,12
@@
on_combo_change (GtkFileChooser *chooser)
else
{
gint i;
else
{
gint i;
- if (
x != 0
)
+ if (
x != 0
)
sensitive = TRUE;
for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
sensitive = TRUE;
for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
- if (
g_str_has_suffix (fn, ft[i].ext))
+ if (g_str_has_suffix (fn, ft[i].ext))
{
sensitive = TRUE;
break;
{
sensitive = TRUE;
break;
@@
-322,11
+324,11
@@
on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data)
GtkFileChooser *chooser = data;
const gchar *name = g_param_spec_get_name (pspec);
GtkFileChooser *chooser = data;
const gchar *name = g_param_spec_get_name (pspec);
- if (
! gtk_widget_get_realized (GTK_WIDGET (chooser)))
+ if (! gtk_widget_get_realized (GTK_WIDGET (chooser)))
return;
/* Ignore this one. It causes recursion. */
return;
/* Ignore this one. It causes recursion. */
- if (
0 == strcmp ("tooltip-text", name))
+ if (0 == strcmp ("tooltip-text", name))
return;
on_combo_change (chooser);
return;
on_combo_change (chooser);
@@
-338,7
+340,7
@@
on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data)
static void
iterate_widgets (GtkWidget *w, gpointer data)
{
static void
iterate_widgets (GtkWidget *w, gpointer data)
{
- if (
GTK_IS_CONTAINER (w))
+ 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);
gtk_container_forall (GTK_CONTAINER (w), iterate_widgets, data);
else
g_signal_connect (w, "notify", G_CALLBACK (on_file_chooser_change), data);
@@
-393,7
+395,7
@@
psppire_output_window_export (PsppireOutputWindow *window)
{
/* Create text cell renderer */
GtkCellRenderer *cell = gtk_cell_renderer_text_new();
{
/* 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_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE);
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell, "text", 0);
}
gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell, "text", 0);
}
@@
-413,7
+415,7
@@
psppire_output_window_export (PsppireOutputWindow *window)
response = gtk_dialog_run (GTK_DIALOG (dialog));
response = gtk_dialog_run (GTK_DIALOG (dialog));
- if (
response == GTK_RESPONSE_ACCEPT
)
+ 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);
{
gint file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
gchar *filename = gtk_file_chooser_get_filename (chooser);
@@
-429,7
+431,7
@@
psppire_output_window_export (PsppireOutputWindow *window)
gint i;
for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
gint i;
for (i = 1 ; i < N_EXTENSIONS ; ++i)
{
- if (
g_str_has_suffix (filename, ft[i].ext))
+ if (g_str_has_suffix (filename, ft[i].ext))
{
file_type = i;
break;
{
file_type = i;
break;
@@
-453,6
+455,9
@@
psppire_output_window_export (PsppireOutputWindow *window)
switch (file_type)
{
switch (file_type)
{
+ case FT_SPV:
+ export_output (window, &options, "spv");
+ break;
case FT_PDF:
export_output (window, &options, "pdf");
break;
case FT_PDF:
export_output (window, &options, "pdf");
break;
@@
-474,13
+479,7
@@
psppire_output_window_export (PsppireOutputWindow *window)
/* Fall through */
case FT_ASCII:
/* 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, "charts", "none");
- string_map_insert (&options, "top-margin", "0");
- string_map_insert (&options, "bottom-margin", "0");
export_output (window, &options, "txt");
break;
default:
export_output (window, &options, "txt");
break;
default:
@@
-511,9
+510,6
@@
psppire_output_window_init (PsppireOutputWindow *window)
GTK_LAYOUT (get_widget_assert (xml, "output")),
GTK_TREE_VIEW (get_widget_assert (xml, "overview")));
GTK_LAYOUT (get_widget_assert (xml, "output")),
GTK_TREE_VIEW (get_widget_assert (xml, "overview")));
-
- connect_help (xml);
-
g_signal_connect (window,
"focus-in-event",
G_CALLBACK (cancel_urgency),
g_signal_connect (window,
"focus-in-event",
G_CALLBACK (cancel_urgency),
@@
-536,7
+532,7
@@
psppire_output_window_init (PsppireOutputWindow *window)
g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print));
g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (print));
- const gchar *accels[2] = { "<
Ctrl
>P", NULL};
+ const gchar *accels[2] = { "<
Primary
>P", NULL};
gtk_application_set_accels_for_action (app,
"win.print",
accels);
gtk_application_set_accels_for_action (app,
"win.print",
accels);
@@
-558,7
+554,7
@@
psppire_output_window_init (PsppireOutputWindow *window)
GSimpleAction *copy = g_simple_action_new ("copy", NULL);
g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (copy));
GSimpleAction *copy = g_simple_action_new ("copy", NULL);
g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (copy));
- const gchar *accels[2] = { "<
Ctrl
>C", NULL};
+ const gchar *accels[2] = { "<
Primary
>C", NULL};
gtk_application_set_accels_for_action (app,
"win.copy",
accels);
gtk_application_set_accels_for_action (app,
"win.copy",
accels);