diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-05-11 12:43:02 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-05-11 12:43:02 (GMT) |
| commit | 0a71e82d1e6ca31f6e00a5b22ede0ccdc9913c35 (patch) | |
| tree | 95f2a6e9926d16a42ca480540677d0e8045da0e0 /shell/main.c | |
| parent | 18b8fee78c185473338f77d4f684b75828aeb09c (diff) | |
Add print button in preview mode. Fixes bug #396475.
2007-05-11 Carlos Garcia Campos <carlosgc@gnome.org>
* data/evince-ui.xml:
* shell/ev-application.[ch]: (get_print_settings_from_args),
(ev_application_open_uri_at_dest), (ev_application_open_uri),
(ev_application_open_uri_list):
* shell/ev-window.[ch]: (ev_window_clear_print_settings_file),
(ev_window_open_uri), (ev_window_cmd_file_open_copy_at_dest),
(ev_window_cmd_recent_file_activate), (ev_window_run_preview),
(ev_window_cmd_view_reload), (lookup_printer_from_name),
(ev_window_preview_print_finished), (ev_window_cmd_preview_print),
(ev_window_dispose):
* shell/main.c: (arguments_parse):
Add print button in preview mode. Fixes bug #396475.
svn path=/trunk/; revision=2450
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/shell/main.c b/shell/main.c index 64b86df..01d6c31 100644 --- a/shell/main.c +++ b/shell/main.c @@ -51,6 +51,7 @@ static gboolean preview_mode = FALSE; static gboolean fullscren_mode = FALSE; static gboolean presentation_mode = FALSE; static gboolean unlink_temp_file = FALSE; +static gchar *print_settings; static const char **file_arguments = NULL; static const GOptionEntry goption_options[] = @@ -60,6 +61,7 @@ static const GOptionEntry goption_options[] = { "presentation", 's', 0, G_OPTION_ARG_NONE, &presentation_mode, N_("Run evince in presentation mode"), NULL }, { "preview", 'w', 0, G_OPTION_ARG_NONE, &preview_mode, N_("Run evince as a previewer"), NULL }, { "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL }, + { "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") }, { NULL } }; @@ -127,6 +129,9 @@ arguments_parse (void) g_value_set_string (value, ev_page_label); g_hash_table_insert (args, g_strdup ("page-label"), value); + + g_free (ev_page_label); + ev_page_label = NULL; } if (fullscren_mode) @@ -154,6 +159,18 @@ arguments_parse (void) value); } + if (mode == EV_WINDOW_MODE_PREVIEW && print_settings) { + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, print_settings); + + g_hash_table_insert (args, + g_strdup ("print-settings"), + value); + g_free (print_settings); + print_settings = NULL; + } + return args; } |