Updated French translation by Robert-André Mauchin.

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 6e7a6e673ea9afedd7a16981b21a3672b164a4fb..fd43c881eb65bfc984065dc3d70f253143b27270 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -21,44 +21,53 @@
  */
 
 #include <config.h>
  */
 
 #include <config.h>

-#include "ev-application.h"
-#include "ev-utils.h"
-#include "ev-file-helpers.h"
-#include "ev-document-factory.h"
-#include "totem-scrsaver.h"
+
+#include <string.h>

 
 #include <glib.h>
 #include <glib/gi18n.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>

-#include <glib-object.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
-
-#if WITH_GNOME
-#include <libgnomeui/gnome-client.h>
-#endif
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "totem-scrsaver.h"
+#include "eggsmclient.h"
+#include "eggdesktopfile.h"
+
+#include "ev-application.h"
+#include "ev-document-factory.h"
+#include "ev-file-helpers.h"
+#include "ev-utils.h"
+
+#ifdef ENABLE_DBUS
+#include "ev-media-player-keys.h"
+#endif /* ENABLE_DBUS */

 
 #ifdef ENABLE_DBUS
 
 #ifdef ENABLE_DBUS

-#include "ev-application-service.h"

 #include <dbus/dbus-glib-bindings.h>
 #include <dbus/dbus-glib-bindings.h>

+#include "ev-application-service.h"

 #endif
 
 #endif
 

-#include <string.h>
-

 static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
 
 struct _EvApplication {
        GObject base_instance;
 
 static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
 
 struct _EvApplication {
        GObject base_instance;
 

+       gchar *accel_map_file;
+       

        gchar *toolbars_file;
 
        EggToolbarsModel *toolbars_model;
 
        TotemScrsaver *scr_saver;
 
        gchar *toolbars_file;
 
        EggToolbarsModel *toolbars_model;
 
        TotemScrsaver *scr_saver;
 

+       EggSMClient *smclient;
+

        gchar *last_chooser_uri;
 
        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;
        GtkPrintSettings *print_settings;
 #if GTK_CHECK_VERSION (2, 11, 0)
        gchar            *print_settings_file;


@@ -145,55 +154,91 @@ ev_application_get_instance (void)
        return instance;
 }
 
        return instance;
 }
 

-#if WITH_GNOME
-static void
-removed_from_session (GnomeClient *client, EvApplication *application)
+/* Session */
+gboolean
+ev_application_load_session (EvApplication *application)

 {
 {

-       ev_application_shutdown (application);
+       GKeyFile *state_file;
+       gchar   **uri_list;
+       
+       if (!egg_sm_client_is_resumed (application->smclient))
+               return FALSE;
+
+       state_file = egg_sm_client_get_state_file (application->smclient);
+       if (!state_file)
+               return FALSE;
+
+       uri_list = g_key_file_get_string_list (state_file,
+                                              "Evince",
+                                              "documents",
+                                              NULL, NULL);
+       if (uri_list) {
+               gint i;
+
+               for (i = 0; uri_list[i]; i++) {
+                       if (g_ascii_strcasecmp (uri_list[i], "empty-window") == 0)
+                               ev_application_open_window (application, NULL, GDK_CURRENT_TIME, NULL);
+                       else
+                               ev_application_open_uri (application, uri_list[i], NULL, GDK_CURRENT_TIME, NULL);
+               }
+               g_strfreev (uri_list);
+       }
+       g_key_file_free (state_file);
+
+       return TRUE;

 }
 
 }
 

-static gint
-save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
-             GnomeInteractStyle interact_style, gint fast, EvApplication *application)
+static void
+smclient_save_state_cb (EggSMClient   *client,
+                       GKeyFile      *state_file,
+                       EvApplication *application)

 {
        GList *windows, *l;
 {
        GList *windows, *l;

-       char **restart_argv;
-       int argc = 0, k;
+       gint i;
+       const gchar **uri_list;
+       const gchar *empty = "empty-window";

 
        windows = ev_application_get_windows (application);
 
        windows = ev_application_get_windows (application);

-       restart_argv = g_new (char *, g_list_length (windows) + 1);
-       restart_argv[argc++] = g_strdup ("evince");
+       if (!windows)
+               return;

 
 

-       for (l = windows; l != NULL; l = l->next) {
+       uri_list = g_new (const gchar *, g_list_length (windows));
+       for (l = windows, i = 0; l != NULL; l = g_list_next (l), i++) {

                EvWindow *window = EV_WINDOW (l->data);
                EvWindow *window = EV_WINDOW (l->data);

-               restart_argv[argc++] = g_strdup (ev_window_get_uri (window));
-       }
-
-       gnome_client_set_restart_command (client, argc, restart_argv);

 
 

-       for (k = 0; k < argc; k++) {
-               g_free (restart_argv[k]);
+               if (ev_window_is_empty (window))
+                       uri_list[i] = empty;
+               else
+                       uri_list[i] = ev_window_get_uri (window);

        }
        }

-
-       g_list_free (windows);
-       g_free (restart_argv);
-       
-       return TRUE;
+       g_key_file_set_string_list (state_file,
+                                   "Evince",
+                                   "documents", 
+                                   (const char **)uri_list,
+                                   i);
+       g_free (uri_list);

 }
 
 static void
 }
 
 static void

-init_session (EvApplication *application)
+smclient_quit_cb (EggSMClient   *client,
+                 EvApplication *application)

 {
 {

-       GnomeClient *client;
-
-       client = gnome_master_client ();
+       ev_application_shutdown (application);
+}

 
 

-       g_signal_connect (client, "save_yourself",
-                         G_CALLBACK (save_session), application);      
-       g_signal_connect (client, "die",
-                         G_CALLBACK (removed_from_session), application);
+static void
+ev_application_init_session (EvApplication *application)
+{
+       egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop");
+       
+       application->smclient = egg_sm_client_get ();
+       g_signal_connect (application->smclient, "save_state",
+                         G_CALLBACK (smclient_save_state_cb),
+                         application);
+       g_signal_connect (application->smclient, "quit",
+                         G_CALLBACK (smclient_quit_cb),
+                         application);

 }
 }

-#endif

 
 /**
  * ev_display_open_if_needed:
 
 /**
  * ev_display_open_if_needed:


@@ -405,11 +450,16 @@ ev_application_open_window (EvApplication  *application,
                gtk_window_set_screen (GTK_WINDOW (new_window), screen);
        }
        ev_application_add_icon_path_for_screen (screen);
                gtk_window_set_screen (GTK_WINDOW (new_window), screen);
        }
        ev_application_add_icon_path_for_screen (screen);

+
+       if (!GTK_WIDGET_REALIZED (new_window))
+               gtk_widget_realize (new_window);

        
        

-       gtk_widget_show (new_window);
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window);
+       gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp);

        
        

-       gtk_window_present_with_time (GTK_WINDOW (new_window),
-                                     timestamp);
+       gtk_window_present (GTK_WINDOW (new_window));
+

        return TRUE;
 }
 
        return TRUE;
 }
 


@@ -489,7 +539,7 @@ ev_application_add_icon_path_for_screen (GdkScreen *screen)
 {
        GtkIconTheme *icon_theme;
 
 {
        GtkIconTheme *icon_theme;
 

-       icon_theme = gtk_icon_theme_get_for_screen (screen);
+       icon_theme = screen ? gtk_icon_theme_get_for_screen (screen) : gtk_icon_theme_get_default ();

        if (icon_theme) {
                gchar **path = NULL;
                gint    n_paths;
        if (icon_theme) {
                gchar **path = NULL;
                gint    n_paths;


@@ -560,12 +610,16 @@ ev_application_open_uri_at_dest (EvApplication  *application,
        ev_window_open_uri (new_window, uri, dest, mode, search_string, 
                            unlink_temp_file, print_settings);
 
        ev_window_open_uri (new_window, uri, dest, mode, search_string, 
                            unlink_temp_file, print_settings);
 

+       if (!GTK_WIDGET_REALIZED (GTK_WIDGET (new_window)))
+               gtk_widget_realize (GTK_WIDGET (new_window));
+
+       if (timestamp <= 0)
+               timestamp = gdk_x11_get_server_time (GTK_WIDGET (new_window)->window);
+       gdk_x11_window_set_user_time (GTK_WIDGET (new_window)->window, timestamp);
+

        ev_document_fc_mutex_lock ();
        ev_document_fc_mutex_lock ();

-       gtk_widget_show (GTK_WIDGET (new_window));
+       gtk_window_present (GTK_WINDOW (new_window));

        ev_document_fc_mutex_unlock ();
        ev_document_fc_mutex_unlock ();

-
-       gtk_window_present_with_time (GTK_WINDOW (new_window),
-                                     timestamp);

 }
 
 /**
 }
 
 /**


@@ -629,6 +683,12 @@ ev_application_open_uri_list (EvApplication *application,
 void
 ev_application_shutdown (EvApplication *application)
 {
 void
 ev_application_shutdown (EvApplication *application)
 {

+       if (application->accel_map_file) {
+               gtk_accel_map_save (application->accel_map_file);
+               g_free (application->accel_map_file);
+               application->accel_map_file = NULL;
+       }
+       

        if (application->toolbars_model) {
                g_object_unref (application->toolbars_model);
                g_free (application->toolbars_file);
        if (application->toolbars_model) {
                g_object_unref (application->toolbars_model);
                g_free (application->toolbars_file);


@@ -678,11 +738,20 @@ static void
 ev_application_init (EvApplication *ev_application)
 {
        gint i;
 ev_application_init (EvApplication *ev_application)
 {
        gint i;

+       const gchar *home_dir;
+       
+       ev_application_init_session (ev_application);
+
+       home_dir = g_get_home_dir ();
+       if (home_dir) {
+               ev_application->accel_map_file = g_build_filename (home_dir,
+                                                                  ".gnome2",
+                                                                  "accels"
+                                                                  "evince",
+                                                                  NULL);
+               gtk_accel_map_load (ev_application->accel_map_file);
+       }

        
        

-#if WITH_GNOME
-       init_session (ev_application);
-#endif
-

        ev_application->toolbars_model = egg_toolbars_model_new ();
 
        ev_application->toolbars_file = g_build_filename
        ev_application->toolbars_model = egg_toolbars_model_new ();
 
        ev_application->toolbars_file = g_build_filename


@@ -715,6 +784,10 @@ ev_application_init (EvApplication *ev_application)
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
                                      EGG_TB_MODEL_NOT_REMOVABLE);
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
                                      EGG_TB_MODEL_NOT_REMOVABLE);

+
+#ifdef ENABLE_DBUS
+       ev_application->keys = ev_media_player_keys_new ();
+#endif /* ENABLE_DBUS */

 }
 
 /**
 }
 
 /**


@@ -744,6 +817,26 @@ ev_application_get_windows (EvApplication *application)
        return windows;
 }
 
        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)
 {
 EggToolbarsModel *
 ev_application_get_toolbars_model (EvApplication *application)
 {