X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=d4a1d1fa89e01cf199f835bc866cd6d67720914b;hb=a003d7ffe3fd328ae430ae613a8da037f766aabb;hp=ce67ebbf02c6f6930ff5eec2d3adb8c1abb8ac21;hpb=122c227b07387a942e4379eef8132fe6b6e92e80;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index ce67ebbf..d4a1d1fa 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#include #include "ev-application.h" #include "ev-utils.h" #include "ev-file-helpers.h" @@ -54,20 +55,14 @@ struct _EvApplication { EggToolbarsModel *toolbars_model; -#ifndef HAVE_GTK_RECENT - EggRecentModel *recent_model; -#endif - TotemScrsaver *scr_saver; gchar *last_chooser_uri; -#ifdef WITH_GTK_PRINT GtkPrintSettings *print_settings; #if GTK_CHECK_VERSION (2, 11, 0) gchar *print_settings_file; #endif -#endif }; struct _EvApplicationClass { @@ -326,6 +321,18 @@ get_destination_from_args (GHashTable *args) return dest; } +static const gchar * +get_find_string_from_args (GHashTable *args) +{ + GValue *value = NULL; + + g_assert (args != NULL); + + value = g_hash_table_lookup (args, "find-string"); + + return value ? g_value_get_string (value) : NULL; +} + /** * get_unlink_temp_file_from_args: * @args: a #GHashTable with data passed to the application. @@ -352,6 +359,22 @@ get_unlink_temp_file_from_args (GHashTable *args) return unlink_temp_file; } +static const gchar * +get_print_settings_from_args (GHashTable *args) +{ + const gchar *print_settings = NULL; + GValue *value = NULL; + + g_assert (args != NULL); + + value = g_hash_table_lookup (args, "print-settings"); + if (value) { + print_settings = g_value_get_string (value); + } + + return print_settings; +} + /** * ev_application_open_window: * @application: The instance of the application. @@ -508,10 +531,12 @@ ev_application_open_uri_at_dest (EvApplication *application, GdkScreen *screen, EvLinkDest *dest, EvWindowRunMode mode, + const gchar *search_string, gboolean unlink_temp_file, + const gchar *print_settings, guint timestamp) { - EvWindow *new_window; + EvWindow *new_window; g_return_if_fail (uri != NULL); @@ -532,7 +557,8 @@ ev_application_open_uri_at_dest (EvApplication *application, /* We need to load uri before showing the window, so we can restore window size without flickering */ - ev_window_open_uri (new_window, uri, dest, mode, unlink_temp_file); + ev_window_open_uri (new_window, uri, dest, mode, search_string, + unlink_temp_file, print_settings); ev_document_fc_mutex_lock (); gtk_widget_show (GTK_WIDGET (new_window)); @@ -559,20 +585,25 @@ ev_application_open_uri (EvApplication *application, { EvLinkDest *dest = NULL; EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL; + const gchar *search_string = NULL; gboolean unlink_temp_file = FALSE; + const gchar *print_settings = NULL; GdkScreen *screen = NULL; if (args) { screen = get_screen_from_args (args); dest = get_destination_from_args (args); mode = get_window_run_mode_from_args (args); + search_string = get_find_string_from_args (args); unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW && get_unlink_temp_file_from_args (args)); + print_settings = get_print_settings_from_args (args); } ev_application_open_uri_at_dest (application, uri, screen, - dest, mode, unlink_temp_file, - timestamp); + dest, mode, search_string, + unlink_temp_file, + print_settings, timestamp); if (dest) g_object_unref (dest); @@ -590,8 +621,8 @@ ev_application_open_uri_list (EvApplication *application, for (l = uri_list; l != NULL; l = l->next) { ev_application_open_uri_at_dest (application, (char *)l->data, - screen, NULL, 0, FALSE, - timestamp); + screen, NULL, 0, NULL, + FALSE, NULL, timestamp); } } @@ -605,14 +636,6 @@ ev_application_shutdown (EvApplication *application) application->toolbars_file = NULL; } -#ifndef HAVE_GTK_RECENT - if (application->recent_model) { - g_object_unref (application->recent_model); - application->recent_model = NULL; - } -#endif - -#ifdef WITH_GTK_PRINT #if GTK_CHECK_VERSION (2, 11, 0) if (application->print_settings_file) { if (application->print_settings) { @@ -639,7 +662,6 @@ ev_application_shutdown (EvApplication *application) application->print_settings = NULL; } #endif /* GTK 2.11.0 */ -#endif /* WITH_GTK_PRINT */ g_free (application->last_chooser_uri); g_object_unref (application); @@ -655,6 +677,8 @@ ev_application_class_init (EvApplicationClass *ev_application_class) static void ev_application_init (EvApplication *ev_application) { + gint i; + #if WITH_GNOME init_session (ev_application); #endif @@ -673,18 +697,24 @@ ev_application_init (EvApplication *ev_application) DATADIR"/evince-toolbar.xml"); } + /* Open item doesn't exist anymore, + * convert it to OpenRecent for compatibility + */ + for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) { + const gchar *item; + + item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i); + if (g_ascii_strcasecmp (item, "FileOpen") == 0) { + egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i); + egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i, + "FileOpenRecent"); + ev_application_save_toolbars_model (ev_application); + break; + } + } + egg_toolbars_model_set_flags (ev_application->toolbars_model, 0, - EGG_TB_MODEL_NOT_REMOVABLE); - -#ifndef HAVE_GTK_RECENT - ev_application->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU); - /* FIXME we should add a mime type filter but current eggrecent - has only a varargs style api which does not work well when - the list of mime types is dynamic */ - egg_recent_model_set_limit (ev_application->recent_model, 5); - egg_recent_model_set_filter_groups (ev_application->recent_model, - "Evince", NULL); -#endif /* HAVE_GTK_RECENT */ + EGG_TB_MODEL_NOT_REMOVABLE); } /** @@ -720,14 +750,6 @@ ev_application_get_toolbars_model (EvApplication *application) return application->toolbars_model; } -#ifndef HAVE_GTK_RECENT -EggRecentModel * -ev_application_get_recent_model (EvApplication *application) -{ - return application->recent_model; -} -#endif - void ev_application_save_toolbars_model (EvApplication *application) { @@ -762,7 +784,6 @@ ev_application_screensaver_disable (EvApplication *application) totem_scrsaver_disable (application->scr_saver); } -#ifdef WITH_GTK_PRINT GtkPrintSettings * ev_application_get_print_settings (EvApplication *application) { @@ -809,4 +830,4 @@ ev_application_set_print_settings (EvApplication *application, application->print_settings = g_object_ref (settings); } -#endif /* WITH_GTK_PRINT */ +