X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-application.c;h=7ad13820dd9d8f2de408a93d0edde90f29d9c83b;hb=f343927df4325959193353c52cff1ea4b20b2286;hp=2ce43c047622fc8d37f762997918bf1f33b51e46;hpb=fb53dffc05b5bf6f767a6b33abf6eabb627e7644;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 2ce43c04..7ad13820 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -20,14 +20,15 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - +#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 #include @@ -36,14 +37,45 @@ #include #include #include + +#if WITH_GNOME #include -#include +#endif #ifdef ENABLE_DBUS #include "ev-application-service.h" #include #endif +#include + +static void ev_application_add_icon_path_for_screen (GdkScreen *screen); + +struct _EvApplication { + GObject base_instance; + + gchar *toolbars_file; + + EggToolbarsModel *toolbars_model; + + TotemScrsaver *scr_saver; + + gchar *last_chooser_uri; + +#ifdef ENABLE_DBUS + EvMediaPlayerKeys *keys; +#endif /* ENABLE_DBUS */ + + GtkPrintSettings *print_settings; +#if GTK_CHECK_VERSION (2, 11, 0) + gchar *print_settings_file; +#endif +}; + +struct _EvApplicationClass { + GObjectClass base_class; +}; + G_DEFINE_TYPE (EvApplication, ev_application, G_TYPE_OBJECT); #define APPLICATION_SERVICE_NAME "org.gnome.evince.ApplicationService" @@ -120,6 +152,7 @@ ev_application_get_instance (void) return instance; } +#if WITH_GNOME static void removed_from_session (GnomeClient *client, EvApplication *application) { @@ -167,6 +200,7 @@ init_session (EvApplication *application) g_signal_connect (client, "die", G_CALLBACK (removed_from_session), application); } +#endif /** * ev_display_open_if_needed: @@ -294,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. @@ -320,6 +366,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. @@ -349,6 +411,7 @@ ev_application_open_window (EvApplication *application, if (screen) { gtk_window_set_screen (GTK_WINDOW (new_window), screen); } + ev_application_add_icon_path_for_screen (screen); gtk_widget_show (new_window); @@ -428,30 +491,11 @@ ev_application_get_uri_window (EvApplication *application, const char *uri) return uri_window; } -/** - * ev_application_open_uri_at_dest: - * @application: The instance of the application. - * @uri: The uri to be opened. - * @screen: Thee screen where the link will be shown. - * @dest: The #EvLinkDest of the document. - * @mode: The run mode of the window. - * @unlink_temp_file: The unlink_temp_file option value. - * @timestamp: Current time value. - */ -void -ev_application_open_uri_at_dest (EvApplication *application, - const char *uri, - GdkScreen *screen, - EvLinkDest *dest, - EvWindowRunMode mode, - gboolean unlink_temp_file, - guint timestamp) +static void +ev_application_add_icon_path_for_screen (GdkScreen *screen) { - EvWindow *new_window; GtkIconTheme *icon_theme; - g_return_if_fail (uri != NULL); - icon_theme = gtk_icon_theme_get_for_screen (screen); if (icon_theme) { gchar **path = NULL; @@ -476,6 +520,34 @@ ev_application_open_uri_at_dest (EvApplication *application, g_free (ev_icons_path); g_strfreev (path); } +} + +/** + * ev_application_open_uri_at_dest: + * @application: The instance of the application. + * @uri: The uri to be opened. + * @screen: Thee screen where the link will be shown. + * @dest: The #EvLinkDest of the document. + * @mode: The run mode of the window. + * @unlink_temp_file: The unlink_temp_file option value. + * @timestamp: Current time value. + */ +void +ev_application_open_uri_at_dest (EvApplication *application, + const char *uri, + GdkScreen *screen, + EvLinkDest *dest, + EvWindowRunMode mode, + const gchar *search_string, + gboolean unlink_temp_file, + const gchar *print_settings, + guint timestamp) +{ + EvWindow *new_window; + + g_return_if_fail (uri != NULL); + + ev_application_add_icon_path_for_screen (screen); new_window = ev_application_get_uri_window (application, uri); @@ -492,7 +564,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)); @@ -519,20 +592,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); @@ -550,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, - timestamp); + screen, NULL, 0, NULL, + FALSE, NULL, timestamp); } } @@ -560,19 +638,37 @@ ev_application_shutdown (EvApplication *application) { if (application->toolbars_model) { g_object_unref (application->toolbars_model); - g_object_unref (application->preview_toolbars_model); g_free (application->toolbars_file); application->toolbars_model = NULL; - application->preview_toolbars_model = NULL; application->toolbars_file = NULL; } -#ifndef HAVE_GTK_RECENT - if (application->recent_model) { - g_object_unref (application->recent_model); - application->recent_model = NULL; +#if GTK_CHECK_VERSION (2, 11, 0) + if (application->print_settings_file) { + if (application->print_settings) { + GError *error = NULL; + + gtk_print_settings_to_file (application->print_settings, + application->print_settings_file, + &error); + if (error) { + g_warning ("%s", error->message); + g_error_free (error); + } + + g_object_unref (application->print_settings); + application->print_settings = NULL; + } + + g_free (application->print_settings_file); + application->print_settings_file = NULL; } -#endif +#else /* ! GTK 2.11.0 */ + if (application->print_settings) { + g_object_unref (application->print_settings); + application->print_settings = NULL; + } +#endif /* GTK 2.11.0 */ g_free (application->last_chooser_uri); g_object_unref (application); @@ -588,7 +684,11 @@ 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 ev_application->toolbars_model = egg_toolbars_model_new (); @@ -604,26 +704,28 @@ ev_application_init (EvApplication *ev_application) DATADIR"/evince-toolbar.xml"); } - egg_toolbars_model_set_flags (ev_application->toolbars_model, 0, - EGG_TB_MODEL_NOT_REMOVABLE); - - ev_application->preview_toolbars_model = egg_toolbars_model_new (); - - egg_toolbars_model_load_toolbars (ev_application->preview_toolbars_model, - DATADIR"/evince-preview-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->preview_toolbars_model, 0, - EGG_TB_MODEL_NOT_REMOVABLE); + 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 */ +#ifdef ENABLE_DBUS + ev_application->keys = ev_media_player_keys_new (); +#endif /* ENABLE_DBUS */ } /** @@ -653,45 +755,110 @@ ev_application_get_windows (EvApplication *application) return windows; } -EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application, - gboolean preview) +/** + * 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) { - return preview ? - application->preview_toolbars_model : application->toolbars_model; +#ifdef ENABLE_DBUS + if (!application->keys) + return NULL; + return g_object_ref (G_OBJECT (application->keys)); +#else + return NULL; +#endif /* ENABLE_DBUS */ } -#ifndef HAVE_GTK_RECENT -EggRecentModel *ev_application_get_recent_model (EvApplication *application) +EggToolbarsModel * +ev_application_get_toolbars_model (EvApplication *application) { - return application->recent_model; + return application->toolbars_model; } -#endif -void ev_application_save_toolbars_model (EvApplication *application) +void +ev_application_save_toolbars_model (EvApplication *application) { egg_toolbars_model_save_toolbars (application->toolbars_model, application->toolbars_file, "1.0"); } -void ev_application_set_chooser_uri (EvApplication *application, const gchar *uri) +void +ev_application_set_chooser_uri (EvApplication *application, const gchar *uri) { g_free (application->last_chooser_uri); application->last_chooser_uri = g_strdup (uri); } -const gchar* ev_application_get_chooser_uri (EvApplication *application) +const gchar * +ev_application_get_chooser_uri (EvApplication *application) { return application->last_chooser_uri; } -void ev_application_screensaver_enable (EvApplication *application) +void +ev_application_screensaver_enable (EvApplication *application) { if (application->scr_saver) totem_scrsaver_enable (application->scr_saver); } -void ev_application_screensaver_disable (EvApplication *application) +void +ev_application_screensaver_disable (EvApplication *application) { if (application->scr_saver) totem_scrsaver_disable (application->scr_saver); } + +GtkPrintSettings * +ev_application_get_print_settings (EvApplication *application) +{ + if (application->print_settings) + return application->print_settings; + +#if GTK_CHECK_VERSION (2, 11, 0) + if (!application->print_settings_file) { + application->print_settings_file = + g_build_filename (ev_dot_dir (), "print-settings", NULL); + } + + if (g_file_test (application->print_settings_file, G_FILE_TEST_IS_REGULAR)) { + GError *error = NULL; + + application->print_settings = + gtk_print_settings_new_from_file (application->print_settings_file, &error); + + if (error) { + g_warning ("%s", error->message); + g_error_free (error); + } else { + return application->print_settings; + } + } +#endif /* GTK 2.11.0 */ + + application->print_settings = gtk_print_settings_new (); + + return application->print_settings; +} + +void +ev_application_set_print_settings (EvApplication *application, + GtkPrintSettings *settings) +{ + g_return_if_fail (GTK_IS_PRINT_SETTINGS (settings)); + + if (settings == application->print_settings) + return; + + if (application->print_settings) + g_object_unref (application->print_settings); + + application->print_settings = g_object_ref (settings); +} +