X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=9eab28a3a40d7a2147e28f312665a5b3162e88a9;hb=db4719bf8f445529477290060d64637f134329b2;hp=1131b35ceeec7210e45c38b87f00d956c185044d;hpb=872101b786854841e6b32cac322f08d3dde6b946;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index 1131b35c..9eab28a3 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -145,7 +145,7 @@ struct _EvWindowPrivate { EvLinkDest *dest; EvDocument *document; - EvDocument *password_document; + EvPageCache *page_cache; EvWindowPageMode page_mode; EvWindowTitle *title; @@ -204,6 +204,7 @@ static void ev_window_run_presentation (EvWindow *windo static void ev_window_stop_presentation (EvWindow *window); static void ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window); +static void ev_window_run_preview (EvWindow *window); static void ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window); static void ev_view_popup_cmd_copy_link_address (GtkAction *action, @@ -803,7 +804,7 @@ password_dialog_response (GtkWidget *password_dialog, password = ev_password_dialog_get_password (EV_PASSWORD_DIALOG (password_dialog)); if (password) { ev_document_doc_mutex_lock (); - ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->password_document), + ev_document_security_set_password (EV_DOCUMENT_SECURITY (ev_window->priv->xfer_job->document), password); ev_document_doc_mutex_unlock (); } @@ -811,9 +812,6 @@ password_dialog_response (GtkWidget *password_dialog, ev_password_dialog_save_password (EV_PASSWORD_DIALOG (password_dialog)); - g_object_unref (ev_window->priv->password_document); - ev_window->priv->password_document = NULL; - ev_window_title_set_type (ev_window->priv->title, EV_WINDOW_TITLE_DOCUMENT); ev_job_queue_add_job (ev_window->priv->xfer_job, EV_JOB_PRIORITY_HIGH); @@ -833,7 +831,7 @@ password_dialog_response (GtkWidget *password_dialog, static void ev_window_popup_password_dialog (EvWindow *ev_window) { - g_assert (ev_window->priv->password_document); + g_assert (ev_window->priv->xfer_job); gtk_widget_set_sensitive (ev_window->priv->password_view, FALSE); @@ -906,11 +904,6 @@ ev_window_xfer_job_cb (EvJobXfer *job, ev_view_set_loading (EV_VIEW (ev_window->priv->view), FALSE); - if (ev_window->priv->password_document) { - g_object_unref (ev_window->priv->password_document); - ev_window->priv->password_document = NULL; - } - /* Success! */ if (job->error == NULL) { @@ -930,11 +923,25 @@ ev_window_xfer_job_cb (EvJobXfer *job, ev_window_setup_document (ev_window); ev_window_add_recent (ev_window, ev_window->priv->uri); - ev_window_clear_xfer_job (ev_window); - if (ev_window->priv->dest) - ev_window_goto_dest (ev_window, ev_window->priv->dest); - + if (job->dest) + ev_window_goto_dest (ev_window, job->dest); + + switch (job->mode) { + case EV_WINDOW_MODE_FULLSCREEN: + ev_window_run_fullscreen (ev_window); + break; + case EV_WINDOW_MODE_PRESENTATION: + ev_window_run_presentation (ev_window); + break; + case EV_WINDOW_MODE_PREVIEW: + ev_window_run_preview (ev_window); + break; + default: + break; + } + + ev_window_clear_xfer_job (ev_window); return; } @@ -946,7 +953,6 @@ ev_window_xfer_job_cb (EvJobXfer *job, ev_window->priv->uri = g_strdup (job->uri); setup_view_from_metadata (ev_window); - ev_window->priv->password_document = g_object_ref (document); file_name = gnome_vfs_format_uri_for_display (job->uri); base_name = g_path_get_basename (file_name); @@ -995,21 +1001,17 @@ ev_window_close_dialogs (EvWindow *ev_window) } void -ev_window_open_uri (EvWindow *ev_window, const char *uri, EvLinkDest *dest) +ev_window_open_uri (EvWindow *ev_window, + const char *uri, + EvLinkDest *dest, + EvWindowRunMode mode) { - g_free (ev_window->priv->uri); - ev_window->priv->uri = NULL; - - if (ev_window->priv->dest) - g_object_unref (ev_window->priv->dest); - ev_window->priv->dest = dest ? g_object_ref (dest) : NULL; - ev_window_close_dialogs (ev_window); ev_window_clear_xfer_job (ev_window); ev_window_clear_local_uri (ev_window); ev_view_set_loading (EV_VIEW (ev_window->priv->view), TRUE); - ev_window->priv->xfer_job = ev_job_xfer_new (uri); + ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode); g_signal_connect (ev_window->priv->xfer_job, "finished", G_CALLBACK (ev_window_xfer_job_cb), @@ -1137,7 +1139,7 @@ file_save_dialog_response_cb (GtkWidget *fc, if (err) { gchar *msg; - msg = g_strdup_printf (_("The file could not be saved as \"%s\"."), uri); + msg = g_strdup_printf (_("The file could not be saved as “%s”."), uri); ev_window_error_dialog (GTK_WINDOW (fc), msg, err); g_free (msg); } @@ -1230,7 +1232,7 @@ ev_window_print_dialog_response_cb (GtkDialog *print_dialog, gint response, gpoi GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Printing is not supported on this printer.")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."), + _("You were trying to print to a printer using the “%s” driver. This program requires a PostScript printer driver."), gnome_print_config_get (config, (guchar *)"Settings.Engine.Backend.Driver")); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -1846,6 +1848,35 @@ ev_window_cmd_view_presentation (GtkAction *action, EvWindow *window) } } +static void +ev_window_run_preview (EvWindow *window) +{ + EggToolbarsModel *model; + EggTbModelFlags flags; + + model = egg_toolbars_model_new (); + + egg_toolbars_model_load_toolbars (model, + DATADIR"/evince-toolbar.xml"); + + flags = egg_toolbars_model_get_flags (model, 1); + egg_toolbars_model_set_flags (model, 1, flags &= ~(EGG_TB_MODEL_HIDDEN)); + + egg_editable_toolbar_set_model (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), + model); + + egg_editable_toolbar_hide (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), + "DefaultToolBar"); + egg_editable_toolbar_show (EGG_EDITABLE_TOOLBAR (window->priv->toolbar), + "PreviewToolBar"); + + ev_view_set_continuous (EV_VIEW (window->priv->view), FALSE); + + update_chrome_flag (window, EV_CHROME_MENUBAR, FALSE); + update_chrome_flag (window, EV_CHROME_SIDEBAR, FALSE); + update_chrome_visibility (window); +} + static gboolean ev_window_focus_in_event (GtkWidget *widget, GdkEventFocus *event) { @@ -2072,19 +2103,12 @@ static void ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) { char *uri; - int page; g_return_if_fail (EV_IS_WINDOW (ev_window)); - page = ev_page_cache_get_current_page (ev_window->priv->page_cache); uri = g_strdup (ev_window->priv->uri); - ev_window_open_uri (ev_window, uri, NULL); - - /* In case the number of pages in the document has changed. */ - page = CLAMP (page, 0, ev_page_cache_get_n_pages (ev_window->priv->page_cache) - 1); - - ev_page_cache_set_current_page (ev_window->priv->page_cache, page); + ev_window_open_uri (ev_window, uri, NULL, 0); g_free (uri); } @@ -2738,11 +2762,6 @@ ev_window_dispose (GObject *object) if (priv->local_uri) { ev_window_clear_local_uri (window); } - - if (priv->password_document) { - g_object_unref (priv->password_document); - priv->password_document = NULL; - } ev_window_close_dialogs (window); @@ -3265,6 +3284,7 @@ open_remote_link (EvWindow *window, EvLinkAction *action) ev_application_open_uri_at_dest (EV_APP, uri, ev_link_action_get_dest (action), + 0, GDK_CURRENT_TIME); g_free (uri); @@ -3464,8 +3484,6 @@ ev_window_init (EvWindow *ev_window) ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window); - ev_window->priv->dest = NULL; - ev_window->priv->page_mode = PAGE_MODE_DOCUMENT; ev_window->priv->title = ev_window_title_new (ev_window); @@ -3583,6 +3601,7 @@ ev_window_init (EvWindow *ev_window) "popup", G_CALLBACK (attachment_bar_menu_popup_cb), ev_window, 0); + gtk_widget_show (sidebar_widget); ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar), sidebar_widget); @@ -3742,6 +3761,7 @@ ev_window_init (EvWindow *ev_window) update_chrome_visibility (ev_window); gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600); + setup_view_from_metadata (ev_window); setup_sidebar_from_metadata (ev_window, NULL);