Use an entry for the page control instead of spinbuttons

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4a94e3449129e6239c4057a95978488526a7684f..f1c41bb793700b018b79386e7772519b39fc2578 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -34,7 +34,6 @@
 #include "ev-sidebar-links.h"
 #include "ev-sidebar-thumbnails.h"
 #include "ev-view.h"
-#include "ev-page-view.h"
 #include "ev-password.h"
 #include "ev-password-view.h"
 #include "ev-print-job.h"
@@ -53,6 +52,7 @@
 
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
+#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 
 #include <gconf/gconf-client.h>
@@ -452,7 +452,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo
        }
 
        if (doc_title == NULL && ev_window->priv->uri) {
-               doc_title = g_path_get_basename (ev_window->priv->uri);
+               char *basename;
+
+               basename = g_path_get_basename (ev_window->priv->uri);
+               doc_title = gnome_vfs_unescape_string_for_display (basename);
+               g_free (basename);
        }
 
        if (password_needed) {
@@ -588,9 +592,10 @@ 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) {
-               gchar *file_name;
+               gchar *basename, *file_name;
 
-               file_name = g_path_get_basename (ev_window->priv->password_uri);
+               basename = g_path_get_basename (ev_window->priv->password_uri);
+               file_name = gnome_vfs_unescape_string_for_display (basename);
                ev_window->priv->password_dialog =
                        ev_password_dialog_new (GTK_WIDGET (ev_window), file_name);
                g_object_add_weak_pointer (G_OBJECT (ev_window->priv->password_dialog),
@@ -599,6 +604,7 @@ ev_window_popup_password_dialog (EvWindow *ev_window)
                                  "response",
                                  G_CALLBACK (password_dialog_response),
                                  ev_window);
+               g_free (basename);
                g_free (file_name);
                gtk_widget_show (ev_window->priv->password_dialog);
        } else {
@@ -2426,6 +2432,6 @@ ev_window_init (EvWindow *ev_window)
 
        /* Set it to something random to force a change */
        ev_window->priv->sizing_mode = EV_SIZING_FREE;
-       ev_window_set_sizing_mode (ev_window, EV_SIZING_BEST_FIT);
+       ev_window_set_sizing_mode (ev_window,  EV_SIZING_FIT_WIDTH);
        update_action_sensitivity (ev_window);
 }