X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=7ad13820dd9d8f2de408a93d0edde90f29d9c83b;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=2567a8bee41c816bc40f8ab0c00b966d99adb0f0;hpb=f75f5694d713ead3d2942127ad0dfeb7259a0357;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 2567a8be..7ad13820 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -20,10 +20,14 @@ * 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" #include "ev-document-factory.h" +#ifdef ENABLE_DBUS +#include "ev-media-player-keys.h" +#endif /* ENABLE_DBUS */ #include "totem-scrsaver.h" #include @@ -58,12 +62,14 @@ struct _EvApplication { gchar *last_chooser_uri; -#ifdef WITH_GTK_PRINT +#ifdef ENABLE_DBUS + EvMediaPlayerKeys *keys; +#endif /* ENABLE_DBUS */ + GtkPrintSettings *print_settings; #if GTK_CHECK_VERSION (2, 11, 0) gchar *print_settings_file; #endif -#endif }; struct _EvApplicationClass { @@ -322,6 +328,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. @@ -520,6 +538,7 @@ 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) @@ -545,7 +564,7 @@ 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, + ev_window_open_uri (new_window, uri, dest, mode, search_string, unlink_temp_file, print_settings); ev_document_fc_mutex_lock (); @@ -573,6 +592,7 @@ 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; @@ -581,13 +601,15 @@ ev_application_open_uri (EvApplication *application, 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, + dest, mode, search_string, + unlink_temp_file, print_settings, timestamp); if (dest) @@ -606,8 +628,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, - NULL, timestamp); + screen, NULL, 0, NULL, + FALSE, NULL, timestamp); } } @@ -621,7 +643,6 @@ ev_application_shutdown (EvApplication *application) application->toolbars_file = NULL; } -#ifdef WITH_GTK_PRINT #if GTK_CHECK_VERSION (2, 11, 0) if (application->print_settings_file) { if (application->print_settings) { @@ -631,7 +652,7 @@ ev_application_shutdown (EvApplication *application) application->print_settings_file, &error); if (error) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } @@ -648,7 +669,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); @@ -664,6 +684,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 @@ -682,8 +704,28 @@ 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); + EGG_TB_MODEL_NOT_REMOVABLE); + +#ifdef ENABLE_DBUS + ev_application->keys = ev_media_player_keys_new (); +#endif /* ENABLE_DBUS */ } /** @@ -713,6 +755,26 @@ ev_application_get_windows (EvApplication *application) return windows; } +/** + * ev_application_get_media_keys: + * @application: The instance of the application. + * + * It gives you access to the media player keys handler object. + * + * Returns: A #EvMediaPlayerKeys. + */ +GObject +*ev_application_get_media_keys (EvApplication *application) +{ +#ifdef ENABLE_DBUS + if (!application->keys) + return NULL; + return g_object_ref (G_OBJECT (application->keys)); +#else + return NULL; +#endif /* ENABLE_DBUS */ +} + EggToolbarsModel * ev_application_get_toolbars_model (EvApplication *application) { @@ -753,7 +815,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) { @@ -773,7 +834,7 @@ ev_application_get_print_settings (EvApplication *application) gtk_print_settings_new_from_file (application->print_settings_file, &error); if (error) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } else { return application->print_settings; @@ -800,4 +861,4 @@ ev_application_set_print_settings (EvApplication *application, application->print_settings = g_object_ref (settings); } -#endif /* WITH_GTK_PRINT */ +