Updated Greek translation

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index b18f98502f3940d472aba6a466ce04c523505b48..d860d74589186daff904a6cb20c4dae0bd6eeadd 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -52,16 +52,17 @@
 #include "eggfindbar.h"
 #include "egg-recent-view-uimanager.h"
 #include "egg-recent-view.h"
 #include "eggfindbar.h"
 #include "egg-recent-view-uimanager.h"
 #include "egg-recent-view.h"

-#include "egg-recent-model.h"

 #include "egg-toolbar-editor.h"
 #include "egg-toolbar-editor.h"

-#include "egg-toolbars-model.h"

 #include "egg-editable-toolbar.h"
 #include "egg-editable-toolbar.h"

+#include "egg-recent-model.h"
+#include "egg-toolbars-model.h"

 #include "ephy-zoom.h"
 #include "ephy-zoom-action.h"
 #include "ev-application.h"
 #include "ev-stock-icons.h"
 #include "ephy-zoom.h"
 #include "ephy-zoom-action.h"
 #include "ev-application.h"
 #include "ev-stock-icons.h"

-#include "ev-file-helpers.h"

 #include "ev-metadata-manager.h"
 #include "ev-metadata-manager.h"

+#include "ev-file-helpers.h"
+#include "ev-utils.h"

 
 #include <poppler.h>
 
 
 #include <poppler.h>
 


@@ -114,13 +115,10 @@ struct _EvWindowPrivate {
        GtkActionGroup *action_group;
        GtkUIManager *ui_manager;
 
        GtkActionGroup *action_group;
        GtkUIManager *ui_manager;
 

-       gchar *toolbar_file;
-       EggToolbarsModel *toolbar_model;
-       

        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
        GtkWidget *fullscreen_popup;

-       GSource *fullscreen_timeout_source;
+       GSource   *fullscreen_timeout_source;

 
        /* Document */
        char *uri;
 
        /* Document */
        char *uri;


@@ -139,8 +137,6 @@ struct _EvWindowPrivate {
        EvJob *xfer_job;
        EvJob *load_job;
 
        EvJob *xfer_job;
        EvJob *load_job;
 

-       /* recent file stuff */
-       EggRecentModel *recent_model;

        EggRecentViewUIManager *recent_view;
 };
 
        EggRecentViewUIManager *recent_view;
 };
 


@@ -158,11 +154,14 @@ static const GtkTargetEntry ev_drop_types[] = {
 #define GCONF_CHROME_TOOLBAR   "/apps/evince/show_toolbar"
 #define GCONF_CHROME_SIDEBAR   "/apps/evince/show_sidebar"
 #define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar"
 #define GCONF_CHROME_TOOLBAR   "/apps/evince/show_toolbar"
 #define GCONF_CHROME_SIDEBAR   "/apps/evince/show_sidebar"
 #define GCONF_CHROME_STATUSBAR "/apps/evince/show_statusbar"

-
+#define GCONF_LOCKDOWN_SAVE     "/desktop/gnome/lockdown/disable_save_to_disk"
+#define GCONF_LOCKDOWN_PRINT    "/desktop/gnome/lockdown/disable_printing"

 #define GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 
 #define GCONF_SIDEBAR_SIZE      "/apps/evince/sidebar_size"
 
 #define SIDEBAR_DEFAULT_SIZE    132
 

+#define PRINT_CONFIG_FILENAME  "ev-print-config.xml"
+

 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,
 static void     ev_window_update_fullscreen_popup       (EvWindow         *window);
 static void     ev_window_sidebar_visibility_changed_cb (EvSidebar        *ev_sidebar,
                                                         GParamSpec       *pspec,


@@ -216,6 +215,7 @@ update_action_sensitivity (EvWindow *ev_window)
        gboolean ok_to_print = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;
        gboolean ok_to_print = TRUE;
        gboolean ok_to_copy = TRUE;
        gboolean has_properties = TRUE;

+       GConfClient *client;

 
        view = EV_VIEW (ev_window->priv->view);
 
 
        view = EV_VIEW (ev_window->priv->view);
 


@@ -244,6 +244,16 @@ update_action_sensitivity (EvWindow *ev_window)
        if (!info || info->fields_mask == 0) {
                has_properties = FALSE;
        }
        if (!info || info->fields_mask == 0) {
                has_properties = FALSE;
        }

+       
+       client = gconf_client_get_default ();
+
+       if (gconf_client_get_bool (client, GCONF_LOCKDOWN_SAVE, NULL)) {
+               ok_to_copy = FALSE;
+       }
+
+       if (gconf_client_get_bool (client, GCONF_LOCKDOWN_PRINT, NULL)) {
+               ok_to_print = FALSE;
+       }

 
        /* File menu */
        /* "FileOpen": always sensitive */
 
        /* File menu */
        /* "FileOpen": always sensitive */


@@ -262,8 +272,8 @@ update_action_sensitivity (EvWindow *ev_window)
                              has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "EditFindNext",
                              ev_view_can_find_next (view));
                              has_pages && EV_IS_DOCUMENT_FIND (document));
        set_action_sensitive (ev_window, "EditFindNext",
                              ev_view_can_find_next (view));

-       set_action_sensitive (ev_window, "EditRotateLeft", has_document);
-       set_action_sensitive (ev_window, "EditRotateRight", has_document);
+       set_action_sensitive (ev_window, "EditRotateLeft", has_pages);
+       set_action_sensitive (ev_window, "EditRotateRight", has_pages);

 
         /* View menu */
        set_action_sensitive (ev_window, "ViewContinuous", has_pages);
 
         /* View menu */
        set_action_sensitive (ev_window, "ViewContinuous", has_pages);


@@ -347,13 +357,14 @@ update_chrome_visibility (EvWindow *window)
        set_widget_visibility (priv->sidebar, sidebar);
        set_widget_visibility (priv->find_bar, findbar);
        set_widget_visibility (priv->statusbar, statusbar);
        set_widget_visibility (priv->sidebar, sidebar);
        set_widget_visibility (priv->find_bar, findbar);
        set_widget_visibility (priv->statusbar, statusbar);

-       set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);

 
        if (priv->fullscreen_popup != NULL) {
                if (fullscreen)
                        show_fullscreen_popup (window);
                else
                        set_widget_visibility (priv->fullscreen_popup, FALSE);
 
        if (priv->fullscreen_popup != NULL) {
                if (fullscreen)
                        show_fullscreen_popup (window);
                else
                        set_widget_visibility (priv->fullscreen_popup, FALSE);

+
+               set_widget_visibility (priv->fullscreen_toolbar, fullscreen_toolbar);

        }
 }
 
        }
 }
 


@@ -579,11 +590,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
        }
 
        if (doc_title == NULL && ev_window->priv->uri) {
        }
 
        if (doc_title == NULL && ev_window->priv->uri) {

-               char *basename;
+               char *display_name;

 
 

-               basename = g_path_get_basename (ev_window->priv->uri);
-               doc_title = gnome_vfs_unescape_string_for_display (basename);
-               g_free (basename);
+               display_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+               doc_title = g_path_get_basename (display_name);
+               g_free (display_name);

        }
 
        if (password_needed) {
        }
 
        if (password_needed) {


@@ -756,20 +767,21 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
 
        update_window_title (ev_window->priv->password_document, NULL, ev_window);
        if (ev_window->priv->password_dialog == NULL) {
 
        update_window_title (ev_window->priv->password_document, NULL, ev_window);
        if (ev_window->priv->password_dialog == NULL) {

-               gchar *basename, *file_name;
+               gchar *base_name, *file_name;

 
 

-               basename = g_path_get_basename (ev_window->priv->password_uri);
-               file_name = gnome_vfs_unescape_string_for_display (basename);
+               file_name = gnome_vfs_format_uri_for_display (ev_window->priv->password_uri);
+               base_name = g_path_get_basename (file_name);

                ev_window->priv->password_dialog =
                ev_window->priv->password_dialog =

-                       ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
+                       ev_password_dialog_new (GTK_WIDGET (ev_window), base_name);
+               g_free (base_name);
+               g_free (file_name);
+

                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
                                           (gpointer *) &(ev_window->priv->password_dialog));
                g_signal_connect (ev_window->priv->password_dialog,
                                  "response",
                                  G_CALLBACK (password_dialog_response),
                                  ev_window);
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
                                           (gpointer *) &(ev_window->priv->password_dialog));
                g_signal_connect (ev_window->priv->password_dialog,
                                  "response",
                                  G_CALLBACK (password_dialog_response),
                                  ev_window);

-               g_free (basename);
-               g_free (file_name);

                gtk_widget_show (ev_window->priv->password_dialog);
        } else {
                ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog);
                gtk_widget_show (ev_window->priv->password_dialog);
        } else {
                ev_password_dialog_set_bad_pass (ev_window->priv->password_dialog);


@@ -871,11 +883,10 @@ ev_window_load_job_cb  (EvJobLoad *job,
                ev_window->priv->password_document = g_object_ref (document);
                ev_window->priv->password_uri = g_strdup (job->uri);
 
                ev_window->priv->password_document = g_object_ref (document);
                ev_window->priv->password_uri = g_strdup (job->uri);
 

-               base_name = g_path_get_basename (job->uri);
-               file_name = gnome_vfs_unescape_string_for_display (base_name);
-
+               file_name = gnome_vfs_format_uri_for_display (job->uri);
+               base_name = g_path_get_basename (file_name);

                ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),
                ev_password_view_set_file_name (EV_PASSWORD_VIEW (ev_window->priv->password_view),

-                                               file_name);
+                                               base_name);

                g_free (file_name);
                g_free (base_name);
                ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);
                g_free (file_name);
                g_free (base_name);
                ev_window_set_page_mode (ev_window, PAGE_MODE_PASSWORD);


@@ -946,6 +957,7 @@ setup_view_from_metadata (EvWindow *window)
        GValue dual_page = { 0, };
        GValue presentation = { 0, };
        GValue fullscreen = { 0, };
        GValue dual_page = { 0, };
        GValue presentation = { 0, };
        GValue fullscreen = { 0, };

+       GValue rotation = { 0, };

 
        /* Window size */
        if (!GTK_WIDGET_VISIBLE (window)) {
 
        /* Window size */
        if (!GTK_WIDGET_VISIBLE (window)) {


@@ -1008,6 +1020,25 @@ setup_view_from_metadata (EvWindow *window)
                        ev_window_run_fullscreen (window);
                }
        }
                        ev_window_run_fullscreen (window);
                }
        }

+
+       /* Rotation */
+       if (ev_metadata_manager_get (uri, "rotation", &rotation)) {
+               if (g_value_get_int (&rotation)) {
+                       switch (g_value_get_int (&rotation)) {
+                       case 90:
+                               ev_view_set_rotation (view, 90);
+                               break;
+                       case 180:
+                               ev_view_set_rotation (view, 180);
+                               break;
+                       case 270:
+                               ev_view_set_rotation (view, 270);
+                               break;
+                       default:
+                               break;
+                       }
+               }
+       }

 }
 
 void
 }
 
 void


@@ -1044,7 +1075,7 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        GtkWidget *chooser;
        static char *folder = NULL;
 
        GtkWidget *chooser;
        static char *folder = NULL;
 

-       chooser = gtk_file_chooser_dialog_new (_("Open document"),
+       chooser = gtk_file_chooser_dialog_new (_("Open Document"),

                                               GTK_WINDOW (window),
                                               GTK_FILE_CHOOSER_ACTION_OPEN,
                                               GTK_STOCK_CANCEL,
                                               GTK_WINDOW (window),
                                               GTK_FILE_CHOOSER_ACTION_OPEN,
                                               GTK_STOCK_CANCEL,


@@ -1107,33 +1138,22 @@ ev_window_add_recent (EvWindow *window, const char *filename)
 
        item = egg_recent_item_new_from_uri (filename);
        egg_recent_item_add_group (item, "Evince");
 
        item = egg_recent_item_new_from_uri (filename);
        egg_recent_item_add_group (item, "Evince");

-       egg_recent_model_add_full (window->priv->recent_model, item);
+       egg_recent_model_add_full (ev_application_get_recent_model (EV_APP), item);

 }
 
 static void
 ev_window_setup_recent (EvWindow *ev_window)
 {
 
 }
 
 static void
 ev_window_setup_recent (EvWindow *ev_window)
 {
 

-
-
-       /* it would be better if we just filtered by mime-type, but there
-        * doesn't seem to be an easy way to figure out which mime-types we
-        * can handle */
-       ev_window->priv->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
-

        ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager,
                                                                      "/MainMenu/FileMenu/RecentFilesMenu",
                                                                      G_CALLBACK (ev_window_cmd_recent_file_activate), 
                                                                      ev_window);       
 
         egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (ev_window->priv->recent_view), FALSE);
        ev_window->priv->recent_view = egg_recent_view_uimanager_new (ev_window->priv->ui_manager,
                                                                      "/MainMenu/FileMenu/RecentFilesMenu",
                                                                      G_CALLBACK (ev_window_cmd_recent_file_activate), 
                                                                      ev_window);       
 
         egg_recent_view_uimanager_show_icons (EGG_RECENT_VIEW_UIMANAGER (ev_window->priv->recent_view), FALSE);

-       egg_recent_model_set_limit (ev_window->priv->recent_model, 5);

 
        egg_recent_view_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view),
 
        egg_recent_view_set_model (EGG_RECENT_VIEW (ev_window->priv->recent_view),

-                                  ev_window->priv->recent_model);
-
-       egg_recent_model_set_filter_groups (ev_window->priv->recent_model,
-                                           "Evince", NULL);
+                                  ev_application_get_recent_model (EV_APP));

 
        egg_recent_view_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE);
        
 
        egg_recent_view_uimanager_set_trailing_sep (ev_window->priv->recent_view, TRUE);
        


@@ -1213,7 +1233,8 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        GtkWidget *fc;
 
        gchar *uri;
        GtkWidget *fc;
 
        gchar *uri;

-       gchar *basename;
+       gchar *base_name;
+       gchar *file_name;

        static char* folder = NULL;
 
        gboolean success;
        static char* folder = NULL;
 
        gboolean success;


@@ -1234,9 +1255,11 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
                                                        folder);
        }
        
                                                        folder);
        }
        

-       basename = g_path_get_basename (ev_window->priv->uri);
-       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), basename);
-       g_free (basename);
+       file_name = gnome_vfs_format_uri_for_display (ev_window->priv->uri);
+       base_name = g_path_get_basename (file_name);
+       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (fc), base_name);
+       g_free (file_name);
+       g_free (base_name);

 
        gtk_widget_show (fc);
 
 
        gtk_widget_show (fc);
 


@@ -1267,6 +1290,24 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window)
        gtk_widget_destroy (fc);
 }
 
        gtk_widget_destroy (fc);
 }
 

+static gboolean
+using_pdf_printer (GnomePrintConfig *config)
+{
+       const guchar *driver;
+
+       driver = gnome_print_config_get (
+               config, (const guchar *)"Settings.Engine.Backend.Driver");
+
+       if (driver) {
+               if (!strcmp ((const gchar *)driver, "gnome-print-pdf"))
+                       return TRUE;
+               else
+                       return FALSE;
+       }
+
+       return FALSE;
+}
+

 static gboolean
 using_postscript_printer (GnomePrintConfig *config)
 {
 static gboolean
 using_postscript_printer (GnomePrintConfig *config)
 {


@@ -1284,7 +1325,7 @@ using_postscript_printer (GnomePrintConfig *config)
                        return TRUE;
                else
                        return FALSE;
                        return TRUE;
                else
                        return FALSE;

-       } else  if (transport) {
+       } else  if (transport) { /* these transports default to PostScript */

                if (!strcmp ((const gchar *)transport, "CUPS"))
                        return TRUE;
                else if (!strcmp ((const gchar *)transport, "LPD"))
                if (!strcmp ((const gchar *)transport, "CUPS"))
                        return TRUE;
                else if (!strcmp ((const gchar *)transport, "LPD"))


@@ -1294,6 +1335,53 @@ using_postscript_printer (GnomePrintConfig *config)
        return FALSE;
 }
 
        return FALSE;
 }
 

+static GnomePrintConfig *
+load_print_config_from_file (void)
+{
+       GnomePrintConfig *print_config = NULL;
+       char *file_name, *contents = NULL;
+
+       file_name = g_build_filename (ev_dot_dir (), PRINT_CONFIG_FILENAME,
+                                     NULL);
+
+       if (g_file_get_contents (file_name, &contents, NULL, NULL)) {
+               print_config = gnome_print_config_from_string (contents, 0);
+               g_free (contents);
+       }
+
+       if (print_config == NULL) {
+               print_config = gnome_print_config_default ();
+       }
+
+       g_free (file_name);
+
+       return print_config;
+}
+
+static void
+save_print_config_to_file (GnomePrintConfig *config)
+{
+       char *file_name, *str;
+
+       g_return_if_fail (config != NULL);
+
+       str = gnome_print_config_to_string (config, 0);
+       if (str == NULL) return;
+
+       file_name = g_build_filename (ev_dot_dir (),
+                                     PRINT_CONFIG_FILENAME,
+                                     NULL);
+
+#ifdef HAVE_G_FILE_SET_CONTENTS
+       g_file_set_contents (file_name, str, -1, NULL);
+#else
+       ev_file_set_contents (file_name, str, -1, NULL);
+#endif
+
+       g_free (file_name);
+       g_free (str);
+}
+

 static void
 ev_window_print (EvWindow *window)
 {
 static void
 ev_window_print (EvWindow *window)
 {


@@ -1330,7 +1418,7 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
                last_page = ev_page_cache_get_n_pages (page_cache);
        }
 
                last_page = ev_page_cache_get_n_pages (page_cache);
        }
 

-       config = gnome_print_config_default ();
+       config = load_print_config_from_file ();

        job = gnome_print_job_new (config);
 
        print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),
        job = gnome_print_job_new (config);
 
        print_dialog = gnome_print_dialog_new (job, (guchar *) _("Print"),


@@ -1359,7 +1447,18 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
                /* FIXME: Change this when we have the first backend
                 * that can print more than postscript
                 */
                /* FIXME: Change this when we have the first backend
                 * that can print more than postscript
                 */

-               if (!using_postscript_printer (config)) {
+               if (using_pdf_printer (config)) {
+                       GtkWidget *dialog;
+
+                       dialog = gtk_message_dialog_new (
+                               GTK_WINDOW (print_dialog), GTK_DIALOG_MODAL,
+                               GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                               _("Generating PDF is not supported"));
+                       gtk_dialog_run (GTK_DIALOG (dialog));
+                       gtk_widget_destroy (dialog);
+                       
+                       continue;
+               } else if (!using_postscript_printer (config)) {

                        GtkWidget *dialog;
 
                        dialog = gtk_message_dialog_new (
                        GtkWidget *dialog;
 
                        dialog = gtk_message_dialog_new (


@@ -1377,6 +1476,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
                        continue;
                }
 
                        continue;
                }
 

+               save_print_config_to_file (config);
+

                print_job = g_object_new (EV_TYPE_PRINT_JOB,
                                          "gnome_print_job", job,
                                          "document", ev_window->priv->document,
                print_job = g_object_new (EV_TYPE_PRINT_JOB,
                                          "gnome_print_job", job,
                                          "document", ev_window->priv->document,


@@ -1391,6 +1492,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page)
                ev_print_job_print (print_job, GTK_WINDOW (ev_window));
                g_object_unref (print_job);
        }
                ev_print_job_print (print_job, GTK_WINDOW (ev_window));
                g_object_unref (print_job);
        }

+
+       g_object_unref (config);

 }
 
 static void
 }
 
 static void


@@ -1493,6 +1596,9 @@ ev_window_update_fullscreen_popup (EvWindow *window)
 
        g_return_if_fail (popup != NULL);
 
 
        g_return_if_fail (popup != NULL);
 

+       if (GTK_WIDGET (window)->window == NULL)
+               return;
+

        toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
                  (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
        popup_width = popup->requisition.width;
        toolbar = (window->priv->chrome & EV_CHROME_TOOLBAR) != 0 || 
                  (window->priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0;
        popup_width = popup->requisition.width;


@@ -1679,6 +1785,9 @@ ev_window_create_fullscreen_popup (EvWindow *window)
        GtkWidget *hbox;
        GtkWidget *button;
 
        GtkWidget *hbox;
        GtkWidget *button;
 

+       window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model
+                       (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));
+

        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
        button = ev_window_get_exit_fullscreen_button (window);
        popup = gtk_window_new (GTK_WINDOW_POPUP);
        hbox = gtk_hbox_new (FALSE, 0);
        button = ev_window_get_exit_fullscreen_button (window);


@@ -1947,16 +2056,31 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
        EvWindow *ev_window = EV_WINDOW (data);
         egg_editable_toolbar_set_edit_mode
                        (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);
        EvWindow *ev_window = EV_WINDOW (data);
         egg_editable_toolbar_set_edit_mode
                        (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar), FALSE);

-        egg_toolbars_model_save (ev_window->priv->toolbar_model,
-                                ev_window->priv->toolbar_file, "1.0");
+       ev_application_save_toolbars_model (EV_APP);

         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
         gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 

+/* should these be hooked up to properties?? */
+static void
+save_rotation_to_file (EvWindow *window)
+{
+       int rotation;
+
+       if (window->priv->uri) {
+               rotation = ev_view_get_rotation (EV_VIEW (window->priv->view));
+               ev_metadata_manager_set_int (window->priv->uri, "rotation",
+                                            rotation);
+       }
+
+
+}
+

 static void
 ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
 {
        ev_view_rotate_left (EV_VIEW (ev_window->priv->view));
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
 static void
 ev_window_cmd_edit_rotate_left (GtkAction *action, EvWindow *ev_window)
 {
        ev_view_rotate_left (EV_VIEW (ev_window->priv->view));
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));

+       save_rotation_to_file (ev_window);

 }
 
 static void
 }
 
 static void


@@ -1964,6 +2088,7 @@ ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
 {
        ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));
 {
        ev_view_rotate_right (EV_VIEW (ev_window->priv->view));
        ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (ev_window->priv->sidebar_thumbs));

+       save_rotation_to_file (ev_window);

 }
 
 static void
 }
 
 static void


@@ -1971,7 +2096,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
 {
        GtkWidget *dialog;
        GtkWidget *editor;
 {
        GtkWidget *dialog;
        GtkWidget *editor;

-    
+

        dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"),
                                              GTK_WINDOW (ev_window), 
                                              GTK_DIALOG_DESTROY_WITH_PARENT, 
        dialog = gtk_dialog_new_with_buttons (_("Toolbar editor"),
                                              GTK_WINDOW (ev_window), 
                                              GTK_DIALOG_DESTROY_WITH_PARENT, 


@@ -1984,7 +2109,7 @@ ev_window_cmd_edit_toolbar (GtkAction *action, EvWindow *ev_window)
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
          
        editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,
        gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
          
        editor = egg_toolbar_editor_new (ev_window->priv->ui_manager,

-                                        ev_window->priv->toolbar_model);
+                                        ev_application_get_toolbars_model (EV_APP));

        gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              
        gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
        gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5);
              


@@ -2131,6 +2256,7 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
                update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);
        widget = gtk_window_get_focus (GTK_WINDOW (window));
        if (widget && gtk_widget_get_ancestor (widget, EGG_TYPE_FIND_BAR)) {
                update_chrome_flag (window, EV_CHROME_FINDBAR, NULL, FALSE);

+               gtk_widget_grab_focus (window->priv->view);

        } else {
                gboolean fullscreen;
                gboolean presentation;
        } else {
                gboolean fullscreen;
                gboolean presentation;


@@ -2639,18 +2765,6 @@ ev_window_dispose (GObject *object)
        EvWindow *window = EV_WINDOW (object);
        EvWindowPrivate *priv = window->priv;
 
        EvWindow *window = EV_WINDOW (object);
        EvWindowPrivate *priv = window->priv;
 

-       if (priv->toolbar_model) {
-               g_object_unref (priv->toolbar_model);
-               g_free (priv->toolbar_file);
-               priv->toolbar_model = NULL;
-               priv->toolbar_file = NULL;
-       }
-
-       if (priv->recent_model) {
-               g_object_unref (priv->recent_model);
-               priv->recent_model = NULL;
-       }
-

        if (priv->recent_view) {
                g_object_unref (priv->recent_view);
                priv->recent_view = NULL;
        if (priv->recent_view) {
                g_object_unref (priv->recent_view);
                priv->recent_view = NULL;


@@ -2750,16 +2864,16 @@ static const GtkActionEntry entries[] = {
        { "Help", NULL, N_("_Help") },
 
        /* File menu */
        { "Help", NULL, N_("_Help") },
 
        /* File menu */

-       { "FileOpen", GTK_STOCK_OPEN, NULL, "<control>O",
+       { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>O",

          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
          N_("Save the current document with a new filename"),
          G_CALLBACK (ev_window_cmd_save_as) },
          N_("Open an existing document"),
          G_CALLBACK (ev_window_cmd_file_open) },
                { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL,
          N_("Save the current document with a new filename"),
          G_CALLBACK (ev_window_cmd_save_as) },

-       { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "<control>P",
+       { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",

          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },
          N_("Print this document"),
          G_CALLBACK (ev_window_cmd_file_print) },

-       { "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "<alt>Return",
+       { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "<alt>Return",

          N_("View the properties of this document"),
          G_CALLBACK (ev_window_cmd_file_properties) },                       
        { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",
          N_("View the properties of this document"),
          G_CALLBACK (ev_window_cmd_file_properties) },                       
        { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "<control>W",


@@ -2870,6 +2984,12 @@ static const GtkActionEntry entries[] = {
         { "GoForwardFast", NULL, "", "<shift>Page_Down",
           N_("Go ten pages forward"),
           G_CALLBACK (ev_window_cmd_go_forward) },
         { "GoForwardFast", NULL, "", "<shift>Page_Down",
           N_("Go ten pages forward"),
           G_CALLBACK (ev_window_cmd_go_forward) },

+        { "KpPlus", GTK_STOCK_ZOOM_IN, NULL, "KP_Add",
+          N_("Enlarge the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_in) },
+        { "KpMinus", GTK_STOCK_ZOOM_OUT, NULL, "KP_Subtract",
+          N_("Shrink the document"),
+          G_CALLBACK (ev_window_cmd_view_zoom_out) },

 };
 
 /* Toggle items */
 };
 
 /* Toggle items */


@@ -2881,7 +3001,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
        { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
          N_("Show or hide the statusbar"),
          G_CALLBACK (ev_window_view_statusbar_cb), TRUE },
        { "ViewStatusbar", NULL, N_("_Statusbar"), NULL,
          N_("Show or hide the statusbar"),
          G_CALLBACK (ev_window_view_statusbar_cb), TRUE },

-        { "ViewSidebar", NULL, N_("Side _pane"), "F9",
+        { "ViewSidebar", NULL, N_("Side _Pane"), "F9",

          N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,
          N_("Show or hide the side pane"),
          G_CALLBACK (ev_window_view_sidebar_cb), TRUE },
         { "ViewContinuous", EV_STOCK_VIEW_CONTINUOUS, N_("_Continuous"), NULL,


@@ -2893,7 +3013,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
         { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },
         { "ViewFullscreen", NULL, N_("_Fullscreen"), "F11",
           N_("Expand the window to fill the screen"),
           G_CALLBACK (ev_window_cmd_view_fullscreen) },

-        { "ViewPresentation", NULL, N_("_Presentation"), "F12",
+        { "ViewPresentation", NULL, N_("_Presentation"), "F5",

           N_("Run document as a presentation"),
           G_CALLBACK (ev_window_cmd_view_presentation) },
         { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,
           N_("Run document as a presentation"),
           G_CALLBACK (ev_window_cmd_view_presentation) },
         { "ViewBestFit", EV_STOCK_ZOOM_PAGE, N_("_Best Fit"), NULL,


@@ -3111,7 +3231,7 @@ sidebar_widget_model_set (EvSidebarLinks *ev_sidebar_links,
 
 
 static void
 
 
 static void

-set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
+ev_window_set_view_accels_sensitivity (EvWindow *window, gboolean sensitive)

 {
        if (window->priv->action_group) {
                set_action_sensitive (window, "PageDown", sensitive);
 {
        if (window->priv->action_group) {
                set_action_sensitive (window, "PageDown", sensitive);


@@ -3123,22 +3243,28 @@ set_view_actions_sensitivity (EvWindow *window, gboolean sensitive)
                set_action_sensitive (window, "Slash", sensitive);
                set_action_sensitive (window, "Plus", sensitive);
                set_action_sensitive (window, "Minus", sensitive);
                set_action_sensitive (window, "Slash", sensitive);
                set_action_sensitive (window, "Plus", sensitive);
                set_action_sensitive (window, "Minus", sensitive);

+               set_action_sensitive (window, "KpPlus", sensitive);
+               set_action_sensitive (window, "KpMinus", sensitive);

        }
 }
 
        }
 }
 

-static void
+static gboolean

 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
        update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE);
        set_action_sensitive (window, "ViewToolbar", TRUE);
 
 view_actions_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
        update_chrome_flag (window, EV_CHROME_RAISE_TOOLBAR, NULL, FALSE);
        set_action_sensitive (window, "ViewToolbar", TRUE);
 

-       set_view_actions_sensitivity (window, TRUE);
+       ev_window_set_view_accels_sensitivity (window, TRUE);
+
+       return FALSE;

 }
 
 }
 

-static void
+static gboolean

 view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {
 view_actions_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, EvWindow *window)
 {

-       set_view_actions_sensitivity (window, FALSE);
+       ev_window_set_view_accels_sensitivity (window, FALSE);
+
+       return FALSE;

 }
 
 static void
 }
 
 static void


@@ -3242,7 +3368,7 @@ ev_window_init (EvWindow *ev_window)
                gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
        gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 
                gtk_ui_manager_get_accel_group (ev_window->priv->ui_manager);
        gtk_window_add_accel_group (GTK_WINDOW (ev_window), accel_group);
 

-       set_view_actions_sensitivity (ev_window, FALSE);
+       ev_window_set_view_accels_sensitivity (ev_window, FALSE);

 
        g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
                          G_CALLBACK (connect_proxy_cb), ev_window);
 
        g_signal_connect (ev_window->priv->ui_manager, "connect_proxy",
                          G_CALLBACK (connect_proxy_cb), ev_window);


@@ -3263,23 +3389,6 @@ ev_window_init (EvWindow *ev_window)
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);
 
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);
 

-       /* Toolbar editor */
-       ev_window->priv->toolbar_model = egg_toolbars_model_new ();
-       
-       ev_window->priv->toolbar_file = g_build_filename
-                       (ev_dot_dir (), "evince_toolbar.xml", NULL);
-
-       if (!g_file_test (ev_window->priv->toolbar_file, G_FILE_TEST_EXISTS)) {
-               egg_toolbars_model_load (ev_window->priv->toolbar_model,
-                                        DATADIR"/evince-toolbar.xml");
-       } else {
-               egg_toolbars_model_load (ev_window->priv->toolbar_model,
-                                        ev_window->priv->toolbar_file);
-       }
-
-       egg_toolbars_model_set_flags (ev_window->priv->toolbar_model, 0,
-                                     EGG_TB_MODEL_NOT_REMOVABLE); 
-       

        /* This sucks, but there is no way to have a draw=no, expand=true separator
         * in a GtkUIManager-built toolbar. So, just add another toolbar.
         * See gtk+ bug 166489.
        /* This sucks, but there is no way to have a draw=no, expand=true separator
         * in a GtkUIManager-built toolbar. So, just add another toolbar.
         * See gtk+ bug 166489.


@@ -3290,18 +3399,13 @@ ev_window_init (EvWindow *ev_window)
        gtk_widget_show (toolbar_dock);
 
        ev_window->priv->toolbar = egg_editable_toolbar_new_with_model
        gtk_widget_show (toolbar_dock);
 
        ev_window->priv->toolbar = egg_editable_toolbar_new_with_model

-                               (ev_window->priv->ui_manager, ev_window->priv->toolbar_model);
+                               (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP));

        egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
                                   "DefaultToolBar");
        gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
                            TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->toolbar);
 
        egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (ev_window->priv->toolbar),
                                   "DefaultToolBar");
        gtk_box_pack_start (GTK_BOX (toolbar_dock), ev_window->priv->toolbar,
                            TRUE, TRUE, 0);
        gtk_widget_show (ev_window->priv->toolbar);
 

-       ev_window->priv->fullscreen_toolbar =
-               gtk_ui_manager_get_widget (ev_window->priv->ui_manager, "/LeaveFullscreenToolbar");
-       gtk_toolbar_set_show_arrow (GTK_TOOLBAR (ev_window->priv->fullscreen_toolbar), TRUE);
-       
-

        /* Add the main area */
        ev_window->priv->hpaned = gtk_hpaned_new ();
        g_signal_connect (ev_window->priv->hpaned,
        /* Add the main area */
        ev_window->priv->hpaned = gtk_hpaned_new ();
        g_signal_connect (ev_window->priv->hpaned,