Move page next/previous functions from page chace to view and change it to

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

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 6a106fcc824164907f2211c55d98b3f6f27d5bab..2b4762927818627945823d599e60e067e6f4cdf3 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -27,6 +27,7 @@
 #include "ev-application.h"
 #include "ev-utils.h"
 #include "ev-document-types.h"
+#include "ev-file-helpers.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -61,6 +62,9 @@ ev_application_register_service (EvApplication *application)
        connection = dbus_g_bus_get (DBUS_BUS_STARTER, &err);
        if (connection == NULL) {
                g_warning ("Service registration failed.");
+               g_error_free (err);
+
+               return FALSE;
        }
 
        driver_proxy = dbus_g_proxy_new_for_name (connection,
@@ -70,24 +74,30 @@ ev_application_register_service (EvApplication *application)
 
        if (!org_freedesktop_DBus_request_name (driver_proxy,
                                                APPLICATION_SERVICE_NAME,
-                                               0, &request_name_result, &err))
-       {
+                                               0, &request_name_result, &err)) {
                g_warning ("Service registration failed.");
+               g_clear_error (&err);
        }
 
        if (request_name_result == DBUS_REQUEST_NAME_REPLY_EXISTS) {
                return FALSE;
        }
 
+#if DBUS_VERSION == 33
        dbus_g_object_class_install_info (G_OBJECT_GET_CLASS (application),
-                                          &dbus_glib_ev_application_object_info);
+                                         &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));
 
        return TRUE;
 }
-#endif
+#endif /* ENABLE_DBUS */
 
 EvApplication *
 ev_application_get_instance (void)
@@ -101,10 +111,23 @@ ev_application_get_instance (void)
        return instance;
 }
 
-void
-ev_application_open_window (EvApplication *application)
+gboolean
+ev_application_open_window (EvApplication  *application,
+                           guint32         timestamp,
+                           GError        **error)
 {
-       gtk_widget_show (ev_window_new ());
+       GtkWidget *new_window = ev_window_new ();
+
+       gtk_widget_show (new_window);
+       
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+       gtk_window_present_with_time (GTK_WINDOW (new_window),
+                                     timestamp);
+#else
+       gtk_window_present (GTK_WINDOW (new_window));
+#endif
+
+       return TRUE;
 }
 
 static EvWindow *
@@ -156,49 +179,81 @@ ev_application_get_uri_window (EvApplication *application, const char *uri)
        return uri_window;
 }
 
-void
-ev_application_open_uri (EvApplication *application,
-                        const char    *uri,
-                        const char    *page_label)
+gboolean
+ev_application_open_uri (EvApplication  *application,
+                        const char     *uri,
+                        const char     *page_label,
+                        guint           timestamp,
+                        GError        **error)
 {
        EvWindow *new_window;
 
-       g_return_if_fail (uri != NULL);
+       g_return_val_if_fail (uri != NULL, FALSE);
 
        new_window = ev_application_get_uri_window (application, uri);
        if (new_window != NULL) {
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+               gtk_window_present_with_time (GTK_WINDOW (new_window),
+                                             timestamp);
+#else
                gtk_window_present (GTK_WINDOW (new_window));
-               return;
+#endif 
+               return TRUE;
        }
 
        new_window = ev_application_get_empty_window (application);
 
        if (new_window == NULL) {
                new_window = EV_WINDOW (ev_window_new ());
+               gtk_widget_show (GTK_WIDGET (new_window));
        }
        
-       gtk_window_present (GTK_WINDOW (new_window));
-
        ev_window_open_uri (new_window, uri);
 
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+       gtk_window_present_with_time (GTK_WINDOW (new_window),
+                                     timestamp);
+#else
+       gtk_window_present (GTK_WINDOW (new_window));
+#endif
+
        if (page_label != NULL) {
                ev_window_open_page_label (new_window, page_label);
        }
+
+       return TRUE;
 }
 
 void
-ev_application_open_uri_list (EvApplication *application, GSList *uri_list)
+ev_application_open_uri_list (EvApplication *application,
+                             GSList        *uri_list,
+                             guint          timestamp)
 {
        GSList *l;
 
        for (l = uri_list; l != NULL; l = l->next) {
-               ev_application_open_uri (application, (char *)l->data, NULL);
+               ev_application_open_uri (application, (char *)l->data,
+                                        NULL,
+                                        timestamp,
+                                        NULL);
        }
 }
 
 void
 ev_application_shutdown (EvApplication *application)
 {
+       if (application->toolbars_model) {
+               g_object_unref (application->toolbars_model);
+               g_free (application->toolbars_file);
+               application->toolbars_model = NULL;
+               application->toolbars_file = NULL;
+       }
+
+       if (application->recent_model) {
+               g_object_unref (application->recent_model);
+               application->recent_model = NULL;
+       }
+
        g_object_unref (application);
        gtk_main_quit ();
 }
@@ -211,5 +266,43 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
 static void
 ev_application_init (EvApplication *ev_application)
 {
+       ev_application->toolbars_model = egg_toolbars_model_new ();
+
+       ev_application->toolbars_file = g_build_filename
+                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
+
+       if (!egg_toolbars_model_load (ev_application->toolbars_model,
+                                     ev_application->toolbars_file)) {
+               egg_toolbars_model_load (ev_application->toolbars_model,
+                                        DATADIR"/evince-toolbar.xml");
+       }
+
+       egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
+                                     EGG_TB_MODEL_NOT_REMOVABLE); 
+                                     
+       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);
+}
+
+EggToolbarsModel *ev_application_get_toolbars_model (EvApplication *application)
+{
+       return application->toolbars_model;
+}
+
+EggRecentModel *ev_application_get_recent_model (EvApplication *application)
+{
+       return application->recent_model;
 }
 
+void ev_application_save_toolbars_model (EvApplication *application)
+{
+        egg_toolbars_model_save (application->toolbars_model,
+                                application->toolbars_file, "1.0");
+}
+
+