From e03ccc6269d7e687b4f5a67a0c07a014f301930b Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Sun, 25 Nov 2007 16:54:00 +0000 Subject: Add a command line option for search. Fixes bug #497710. 2007-11-25 Carlos Garcia Campos * shell/ev-application.[ch]: (get_find_string_from_args), (ev_application_open_uri_at_dest), (ev_application_open_uri), (ev_application_open_uri_list): * shell/ev-jobs.[ch]: (ev_job_load_dispose), (ev_job_load_new): * shell/ev-window.[ch]: (ev_window_load_job_cb), (ev_window_open_uri), (ev_window_cmd_file_open_copy_at_dest), (ev_window_cmd_recent_file_activate), (ev_window_open_recent_action_item_activated), (ev_window_print_send), (open_remote_link): * shell/main.c: (arguments_parse): Add a command line option for search. Fixes bug #497710. svn path=/trunk/; revision=2746 --- (limited to 'shell/main.c') diff --git a/shell/main.c b/shell/main.c index cd64293..b7362e0 100644 --- a/shell/main.c +++ b/shell/main.c @@ -47,6 +47,7 @@ #include "ev-file-helpers.h" static gchar *ev_page_label; +static gchar *ev_find_string; static gboolean preview_mode = FALSE; static gboolean fullscren_mode = FALSE; static gboolean presentation_mode = FALSE; @@ -60,6 +61,7 @@ static const GOptionEntry goption_options[] = { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscren_mode, N_("Run evince in fullscreen mode"), NULL }, { "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 }, + { "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")}, { "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...]") }, @@ -134,6 +136,17 @@ arguments_parse (void) ev_page_label = NULL; } + if (ev_find_string) { + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_STRING); + g_value_set_string (value, ev_find_string); + + g_hash_table_insert (args, g_strdup ("find-string"), value); + + g_free (ev_find_string); + ev_page_label = NULL; + } + if (fullscren_mode) mode = EV_WINDOW_MODE_FULLSCREEN; else if (presentation_mode) -- cgit v0.9.1