X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=b7362e06e0255363d3fdb226ca56923a53b56e79;hb=595d902c5518765e086e8a911124ef36ed9300b7;hp=01d6c318a8a9c896e3294767435f6eb2c840a11f;hpb=0a71e82d1e6ca31f6e00a5b22ede0ccdc9913c35;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 01d6c318..b7362e06 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)
@@ -307,6 +320,7 @@ main (int argc, char *argv[])
 #if WITH_GNOME
 	GnomeProgram *program;
 #else
+	char *accel_filename;
 	GError *error = NULL;
 #endif
 
@@ -318,6 +332,7 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 	textdomain(GETTEXT_PACKAGE);
 	g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);
+	g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
 #else
 	g_option_context_add_main_entries (context, goption_options, NULL);
 #endif
@@ -339,6 +354,9 @@ main (int argc, char *argv[])
 	g_option_context_free (context);
 	
 	gnome_vfs_init ();
+
+	accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL);
+	gtk_accel_map_load (accel_filename);
 #endif
 
 	args = arguments_parse ();
@@ -379,6 +397,9 @@ main (int argc, char *argv[])
 
 #if WITH_GNOME
 	gnome_accelerators_sync ();
+#else
+	gtk_accel_map_save (accel_filename);
+	g_free (accel_filename);
 #endif
 
 	ev_file_helpers_shutdown ();