X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=be601901ab38d925f416f4bec5d92948255f58bf;hb=48ab804ceec8229e351914ec863202418938d5fa;hp=dc67739915faf9eba3864a8469952a3e363cebac;hpb=00efc5c16ed191f07f9a8a5d00acc41ddb064b46;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index dc677399..be601901 100644 --- 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-utils.h" #include @@ -589,11 +590,11 @@ update_window_title (EvDocument *document, GParamSpec *pspec, EvWindow *ev_windo } 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) { @@ -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) { - 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_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_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); @@ -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); - 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), - file_name); + base_name); 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 rotation = { 0, }; /* Window size */ if (!GTK_WIDGET_VISIBLE (window)) { @@ -1018,6 +1020,25 @@ setup_view_from_metadata (EvWindow *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 @@ -1054,7 +1075,7 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) 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, @@ -1081,7 +1102,7 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (chooser)); - ev_application_open_uri_list (EV_APP, uris); + ev_application_open_uri_list (EV_APP, uris, GDK_CURRENT_TIME); g_slist_foreach (uris, (GFunc)g_free, NULL); g_slist_free (uris); @@ -1105,7 +1126,7 @@ ev_window_cmd_recent_file_activate (GtkAction *action, uri = egg_recent_item_get_uri (item); - ev_application_open_uri (EV_APP, uri, NULL, NULL); + ev_application_open_uri (EV_APP, uri, NULL, GDK_CURRENT_TIME, NULL); g_free (uri); } @@ -1212,7 +1233,8 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) GtkWidget *fc; gchar *uri; - gchar *basename; + gchar *base_name; + gchar *file_name; static char* folder = NULL; gboolean success; @@ -1233,9 +1255,11 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) 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); @@ -1462,6 +1486,8 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) break; } + g_object_unref (job); + gtk_widget_destroy (print_dialog); if (print_job != NULL) { @@ -2040,14 +2066,12 @@ 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_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)); } static void @@ -2215,6 +2239,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); + gtk_widget_grab_focus (window->priv->view); } else { gboolean fullscreen; gboolean presentation; @@ -2378,6 +2403,22 @@ ev_window_continuous_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_w ev_view_get_continuous (EV_VIEW (ev_window->priv->view))); } +static void +ev_window_rotation_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window) +{ + int rotation; + + rotation = ev_view_get_rotation (EV_VIEW (window->priv->view)); + + if (window->priv->uri) { + ev_metadata_manager_set_int (window->priv->uri, "rotation", + rotation); + } + + ev_sidebar_thumbnails_refresh (EV_SIDEBAR_THUMBNAILS (window->priv->sidebar_thumbs), + rotation); +} + static void ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_window) { @@ -2706,14 +2747,23 @@ zoom_control_changed_cb (EphyZoomAction *action, static void ev_window_finalize (GObject *object) { - GList *windows = gtk_window_list_toplevels (); + gboolean empty = TRUE; + GList *list, *windows; - if (windows == NULL) { - ev_application_shutdown (EV_APP); - } else { - g_list_free (windows); - } + windows = gtk_window_list_toplevels (); + + for (list = windows; list; list = list->next) { + if (EV_IS_WINDOW (list->data)) { + empty = FALSE; + break; + } + } + + if (empty) + ev_application_shutdown (EV_APP); + + g_list_free (windows); G_OBJECT_CLASS (ev_window_parent_class)->finalize (object); } @@ -2788,6 +2838,11 @@ ev_window_dispose (GObject *object) priv->find_bar = NULL; } + if (priv->uri) { + g_free (priv->uri); + priv->uri = NULL; + } + if (window->priv->fullscreen_timeout_source) { g_source_destroy (window->priv->fullscreen_timeout_source); window->priv->fullscreen_timeout_source = NULL; @@ -2822,16 +2877,16 @@ static const GtkActionEntry entries[] = { { "Help", NULL, N_("_Help") }, /* File menu */ - { "FileOpen", GTK_STOCK_OPEN, NULL, "O", + { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "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) }, - { "FilePrint", GTK_STOCK_PRINT, N_("Print..."), "P", + { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, - { "FileProperties", GTK_STOCK_PROPERTIES, N_("Properties"), "Return", + { "FileProperties", GTK_STOCK_PROPERTIES, N_("P_roperties"), "Return", N_("View the properties of this document"), G_CALLBACK (ev_window_cmd_file_properties) }, { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "W", @@ -2959,7 +3014,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 }, - { "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, @@ -3003,7 +3058,7 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gnome_vfs_uri_list_free (uri_list); - ev_application_open_uri_list (EV_APP, uris); + ev_application_open_uri_list (EV_APP, uris, 0); g_slist_free (uris); @@ -3471,6 +3526,10 @@ ev_window_init (EvWindow *ev_window) "notify::continuous", G_CALLBACK (ev_window_continuous_changed_cb), ev_window); + g_signal_connect (ev_window->priv->view, + "notify::rotation", + G_CALLBACK (ev_window_rotation_changed_cb), + ev_window); ev_window->priv->statusbar = ev_statusbar_new (); gtk_box_pack_end (GTK_BOX (ev_window->priv->main_box),