X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-application.c;h=2ce43c047622fc8d37f762997918bf1f33b51e46;hb=8497f6813f18d359a857ec1ac841059dcc24e833;hp=388c8d276d5dea5ac9d4af345b80f0ff34fbafa7;hpb=64d6ea86fc5614af0004c3e6e84d21706b04d56d;p=evince.git diff --git a/shell/ev-application.c b/shell/ev-application.c index 388c8d27..2ce43c04 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -75,7 +75,6 @@ ev_application_register_service (EvApplication *application) DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); -#if DBUS_VERSION >= 60 if (!org_freedesktop_DBus_request_name (driver_proxy, APPLICATION_SERVICE_NAME, DBUS_NAME_FLAG_DO_NOT_QUEUE, @@ -83,14 +82,6 @@ ev_application_register_service (EvApplication *application) g_warning ("Service registration failed."); g_clear_error (&err); } -#else - if (!org_freedesktop_DBus_request_name (driver_proxy, - APPLICATION_SERVICE_NAME, - 0, &request_name_result, &err)) { - g_warning ("Service registration failed."); - g_clear_error (&err); - } -#endif g_object_unref (driver_proxy); @@ -98,22 +89,25 @@ ev_application_register_service (EvApplication *application) return FALSE; } -#if DBUS_VERSION == 33 - dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application), - &dbus_glib_ev_application_object_info); -#else dbus_g_object_type_install_info (EV_TYPE_APPLICATION, &dbus_glib_ev_application_object_info); -#endif - dbus_g_connection_register_g_object (connection, "/org/gnome/evince/Evince", G_OBJECT (application)); - + + application->scr_saver = totem_scrsaver_new (connection); + return TRUE; } #endif /* ENABLE_DBUS */ +/** + * ev_application_get_instance: + * + * Checks for #EvApplication instance, if it doesn't exist it does create it. + * + * Returns: an instance of the #EvApplication data. + */ EvApplication * ev_application_get_instance (void) { @@ -174,6 +168,15 @@ init_session (EvApplication *application) G_CALLBACK (removed_from_session), application); } +/** + * ev_display_open_if_needed: + * @name: the name of the display to be open if it's needed. + * + * Search among all the open displays if any of them have the same name as the + * passed name. If the display isn't found it tries the open it. + * + * Returns: a #GdkDisplay of the display with the passed name. + */ static GdkDisplay * ev_display_open_if_needed (const gchar *name) { @@ -197,6 +200,17 @@ ev_display_open_if_needed (const gchar *name) return display != NULL ? display : gdk_display_open (name); } +/** + * get_screen_from_args: + * @args: a #GHashTable with data passed to the application. + * + * Looks for the screen in the display available in the hash table passed to the + * application. If the display isn't opened, it's opened and the #GdkScreen + * assigned to the screen in that display returned. + * + * Returns: the #GdkScreen assigned to the screen on the display indicated by + * the data on the #GHashTable. + */ static GdkScreen * get_screen_from_args (GHashTable *args) { @@ -225,6 +239,16 @@ get_screen_from_args (GHashTable *args) return screen; } +/** + * get_window_run_mode_from_args: + * @args: a #GHashTable with data passed to the application. + * + * It does look if the mode option has been passed from command line, using it + * as the window run mode, otherwise the run mode will be the normal mode. + * + * Returns: The window run mode passed from command line or + * EV_WINDOW_MODE_NORMAL in other case. + */ static EvWindowRunMode get_window_run_mode_from_args (GHashTable *args) { @@ -241,6 +265,16 @@ get_window_run_mode_from_args (GHashTable *args) return mode; } +/** + * get_destination_from_args: + * @args: a #GHashTable with data passed to the application. + * + * It does look for the page-label argument parsed from the command line and + * if it does exist, it returns an #EvLinkDest. + * + * Returns: An #EvLinkDest to page-label if it has been passed from the command + * line, NULL in other case. + */ static EvLinkDest * get_destination_from_args (GHashTable *args) { @@ -260,6 +294,45 @@ get_destination_from_args (GHashTable *args) return dest; } +/** + * get_unlink_temp_file_from_args: + * @args: a #GHashTable with data passed to the application. + * + * It does look if the unlink-temp-file option has been passed from the command + * line returning it's boolean representation, otherwise it does return %FALSE. + * + * Returns: the boolean representation of the unlink-temp-file value or %FALSE + * in other case. + */ +static gboolean +get_unlink_temp_file_from_args (GHashTable *args) +{ + gboolean unlink_temp_file = FALSE; + GValue *value = NULL; + + g_assert (args != NULL); + + value = g_hash_table_lookup (args, "unlink-temp-file"); + if (value) { + unlink_temp_file = g_value_get_boolean (value); + } + + return unlink_temp_file; +} + +/** + * ev_application_open_window: + * @application: The instance of the application. + * @args: A #GHashTable with the arguments data. + * @timestamp: Current time value. + * @error: The #GError facility. + * + * Creates a new window and if the args are available, it's not NULL, it gets + * the screen from them and assigns the just created window to it. At last it + * does show it. + * + * Returns: %TRUE. + */ gboolean ev_application_open_window (EvApplication *application, GHashTable *args, @@ -284,6 +357,16 @@ ev_application_open_window (EvApplication *application, return TRUE; } +/** + * ev_application_get_empty_window: + * @application: The instance of the application. + * @screen: The screen where the empty window will be search. + * + * It does look if there is any empty window in the indicated screen. + * + * Returns: The first empty #EvWindow in the passed #GdkScreen or NULL in other + * case. + */ static EvWindow * ev_application_get_empty_window (EvApplication *application, GdkScreen *screen) @@ -307,6 +390,18 @@ ev_application_get_empty_window (EvApplication *application, return empty_window; } +/** + * ev_application_get_uri_window: + * @application: The instance of the application. + * @uri: The uri to be opened. + * + * It looks in the list of the windows for the one with the document represented + * by the passed uri on it. If the window is empty or the document isn't present + * on any window, it will return NULL. + * + * Returns: The #EvWindow where the document represented by the passed uri is + * shown, NULL in other case. + */ static EvWindow * ev_application_get_uri_window (EvApplication *application, const char *uri) { @@ -333,18 +428,55 @@ 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) { - EvWindow *new_window; + 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; + gint n_paths; + gint i; + gchar *ev_icons_path; + + /* GtkIconTheme will then look in Evince custom hicolor dir + * for icons as well as the standard search paths + */ + ev_icons_path = g_build_filename (DATADIR, "icons", NULL); + gtk_icon_theme_get_search_path (icon_theme, &path, &n_paths); + for (i = n_paths - 1; i >= 0; i--) { + if (g_ascii_strcasecmp (ev_icons_path, path[i]) == 0) + break; + } + + if (i < 0) + gtk_icon_theme_append_search_path (icon_theme, + ev_icons_path); + + g_free (ev_icons_path); + g_strfreev (path); + } + new_window = ev_application_get_uri_window (application, uri); if (new_window == NULL) { @@ -360,14 +492,24 @@ 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, unlink_temp_file); + ev_document_fc_mutex_lock (); gtk_widget_show (GTK_WIDGET (new_window)); + ev_document_fc_mutex_unlock (); gtk_window_present_with_time (GTK_WINDOW (new_window), timestamp); } +/** + * ev_application_open_uri: + * @application: The instance of the application. + * @uri: The uri to be opened + * @args: A #GHashTable with the arguments data. + * @timestamp: Current time value. + * @error: The #GError facility. + */ gboolean ev_application_open_uri (EvApplication *application, const char *uri, @@ -377,16 +519,20 @@ ev_application_open_uri (EvApplication *application, { EvLinkDest *dest = NULL; EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL; + gboolean unlink_temp_file = FALSE; 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); + unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW && + get_unlink_temp_file_from_args (args)); } ev_application_open_uri_at_dest (application, uri, screen, - dest, mode, timestamp); + dest, mode, unlink_temp_file, + timestamp); if (dest) g_object_unref (dest); @@ -404,7 +550,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, timestamp); + screen, NULL, 0, FALSE, + timestamp); } } @@ -413,8 +560,10 @@ 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; } @@ -458,6 +607,14 @@ ev_application_init (EvApplication *ev_application) 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"); + + egg_toolbars_model_set_flags (ev_application->preview_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 @@ -469,6 +626,14 @@ ev_application_init (EvApplication *ev_application) #endif /* HAVE_GTK_RECENT */ } +/** + * ev_application_get_windows: + * @application: The instance of the application. + * + * It creates a list of the top level windows. + * + * Returns: A #GList of the top level windows. + */ GList * ev_application_get_windows (EvApplication *application) { @@ -488,9 +653,11 @@ ev_application_get_windows (EvApplication *application) return windows; } -EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application) +EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application, + gboolean preview) { - return application->toolbars_model; + return preview ? + application->preview_toolbars_model : application->toolbars_model; } #ifndef HAVE_GTK_RECENT @@ -517,3 +684,14 @@ const gchar* ev_application_get_chooser_uri (EvApplication *application) return application->last_chooser_uri; } +void ev_application_screensaver_enable (EvApplication *application) +{ + if (application->scr_saver) + totem_scrsaver_enable (application->scr_saver); +} + +void ev_application_screensaver_disable (EvApplication *application) +{ + if (application->scr_saver) + totem_scrsaver_disable (application->scr_saver); +}