Updated Ukrainian translation.

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index dc67739915faf9eba3864a8469952a3e363cebac..d860d74589186daff904a6cb20c4dae0bd6eeadd 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -62,6 +62,7 @@
 #include "ev-stock-icons.h"
 #include "ev-metadata-manager.h"
 #include "ev-file-helpers.h"
 #include "ev-stock-icons.h"
 #include "ev-metadata-manager.h"
 #include "ev-file-helpers.h"

+#include "ev-utils.h"

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


@@ -589,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) {


@@ -766,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);


@@ -881,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);


@@ -956,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)) {


@@ -1018,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


@@ -1054,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,


@@ -1212,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;


@@ -1233,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);
 


@@ -2036,11 +2060,27 @@ ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
         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


@@ -2048,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


@@ -2215,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;


@@ -2822,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",


@@ -2959,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,