X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=b3ad4ee7dbd01d7dc2939ed1bab1b38594a31640;hb=0788c8b420efdf4f9bdcd89ec358067b4ab38ada;hp=dcf687e9e35c7cac430be2558b3ef74426064f7d;hpb=d47bc2205d248b34dbfcdd349473f54d45d5ec70;p=evince.git diff --git a/shell/ev-window.c b/shell/ev-window.c index dcf687e9..b3ad4ee7 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -30,6 +30,7 @@ #include "ev-window.h" #include "ev-window-title.h" +#include "ev-navigation-action.h" #include "ev-page-action.h" #include "ev-sidebar.h" #include "ev-sidebar-links.h" @@ -39,7 +40,7 @@ #include "ev-password.h" #include "ev-password-view.h" #include "ev-properties-dialog.h" -#include "ev-ps-exporter.h" +#include "ev-file-exporter.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" #include "ev-document-fonts.h" @@ -68,6 +69,7 @@ #include "ev-file-helpers.h" #include "ev-utils.h" #include "ev-debug.h" +#include "ev-history.h" #ifdef WITH_GNOME_PRINT #include "ev-print-job.h" @@ -78,8 +80,11 @@ #include #endif +#ifdef ENABLE_PDF #include +#endif +#include #include #include #include @@ -100,6 +105,7 @@ typedef enum { EV_CHROME_RAISE_TOOLBAR = 1 << 3, EV_CHROME_FULLSCREEN_TOOLBAR = 1 << 4, EV_CHROME_SIDEBAR = 1 << 5, + EV_CHROME_PREVIEW_TOOLBAR = 1 << 6, EV_CHROME_NORMAL = EV_CHROME_MENUBAR | EV_CHROME_TOOLBAR | EV_CHROME_SIDEBAR } EvChrome; @@ -120,6 +126,7 @@ struct _EvWindowPrivate { GtkWidget *sidebar_thumbs; GtkWidget *sidebar_links; GtkWidget *sidebar_attachments; + GtkWidget *preview_toolbar; /* Dialogs */ GtkWidget *properties; @@ -143,7 +150,7 @@ struct _EvWindowPrivate { GtkWidget *fullscreen_toolbar; GtkWidget *fullscreen_popup; guint fullscreen_timeout_id; - + /* Popup link */ GtkWidget *view_popup; EvLink *link; @@ -156,9 +163,10 @@ struct _EvWindowPrivate { char *uri; char *local_uri; EvLinkDest *dest; + gboolean unlink_temp_file; EvDocument *document; - + EvHistory *history; EvPageCache *page_cache; EvWindowPageMode page_mode; EvWindowTitle *title; @@ -190,6 +198,7 @@ static const GtkTargetEntry ev_drop_types[] = { #define PAGE_SELECTOR_ACTION "PageSelector" #define ZOOM_CONTROL_ACTION "ViewZoom" +#define NAVIGATION_ACTION "Navigation" #define GCONF_OVERRIDE_RESTRICTIONS "/apps/evince/override_restrictions" #define GCONF_LOCKDOWN_SAVE "/desktop/gnome/lockdown/disable_save_to_disk" @@ -234,6 +243,8 @@ static void ev_window_cmd_view_presentation (GtkAction *actio 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_open_link_new_window (GtkAction *action, + EvWindow *window); static void ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window); static void ev_attachment_popup_cmd_open_attachment (GtkAction *action, @@ -312,7 +323,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) ok_to_copy = (info->permissions & EV_DOCUMENT_PERMISSIONS_OK_TO_COPY); } - if (has_document && !EV_IS_PS_EXPORTER(document)) + if (has_document && !EV_IS_FILE_EXPORTER(document)) ok_to_print = FALSE; @@ -330,7 +341,17 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) /* File menu */ + ev_window_set_action_sensitive (ev_window, "FileOpenCopy", has_document); ev_window_set_action_sensitive (ev_window, "FileSaveAs", has_document && ok_to_copy); + +#ifdef WITH_GTK_PRINT + ev_window_set_action_sensitive (ev_window, "FilePrintSetup", has_pages && ok_to_print); +#endif + +#ifdef WITH_GNOME_PRINT + ev_window_set_action_sensitive (ev_window, "FilePrintSetup", FALSE); +#endif + ev_window_set_action_sensitive (ev_window, "FilePrint", has_pages && ok_to_print); ev_window_set_action_sensitive (ev_window, "FileProperties", has_document && has_properties); @@ -351,6 +372,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window) /* Toolbar-specific actions: */ ev_window_set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages); ev_window_set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION, has_pages); + ev_window_set_action_sensitive (ev_window, NAVIGATION_ACTION, has_pages); ev_window_update_actions (ev_window); } @@ -453,6 +475,7 @@ update_chrome_visibility (EvWindow *window) EvWindowPrivate *priv = window->priv; gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar; gboolean fullscreen_mode, presentation, fullscreen; + gboolean preview_toolbar; presentation = ev_view_get_presentation (EV_VIEW (priv->view)); fullscreen = ev_view_get_fullscreen (EV_VIEW (priv->view)); @@ -465,11 +488,13 @@ update_chrome_visibility (EvWindow *window) (priv->chrome & EV_CHROME_RAISE_TOOLBAR) != 0) && fullscreen; findbar = (priv->chrome & EV_CHROME_FINDBAR) != 0; sidebar = (priv->chrome & EV_CHROME_SIDEBAR) != 0 && !fullscreen_mode; + preview_toolbar = (priv->chrome& EV_CHROME_PREVIEW_TOOLBAR); set_widget_visibility (priv->menubar, menubar); set_widget_visibility (priv->toolbar_dock, toolbar); set_widget_visibility (priv->find_bar, findbar); set_widget_visibility (priv->sidebar, sidebar); + set_widget_visibility (priv->preview_toolbar, preview_toolbar); ev_window_set_action_sensitive (window, "EditToolbar", toolbar); gtk_widget_set_sensitive (priv->menubar, menubar); @@ -594,7 +619,15 @@ page_changed_cb (EvPageCache *page_cache, gint page, EvWindow *ev_window) { + gchar *label; + ev_window_update_actions (ev_window); + + if (ev_window->priv->history) { + label = ev_page_cache_get_page_label (ev_window->priv->page_cache, page); + ev_history_add_page (ev_window->priv->history, page, label); + g_free (label); + } if (!ev_window_is_empty (ev_window)) ev_metadata_manager_set_int (ev_window->priv->uri, "page", page); @@ -864,6 +897,13 @@ ev_window_setup_document (EvWindow *ev_window) ev_page_action_set_document (EV_PAGE_ACTION (action), document); ev_window_setup_action_sensitivity (ev_window); + if (ev_window->priv->history) + g_object_unref (ev_window->priv->history); + ev_window->priv->history = ev_history_new (); + action = gtk_action_group_get_action (ev_window->priv->action_group, NAVIGATION_ACTION); + ev_navigation_action_set_history (EV_NAVIGATION_ACTION (action), ev_window->priv->history); + ev_navigation_action_set_window (EV_NAVIGATION_ACTION (action), ev_window); + if (ev_window->priv->properties) { ev_properties_dialog_set_document (EV_PROPERTIES_DIALOG (ev_window->priv->properties), ev_window->priv->document); @@ -962,7 +1002,7 @@ ev_window_clear_local_uri (EvWindow *ev_window) if (ev_window->priv->local_uri) { filename = g_filename_from_uri (ev_window->priv->local_uri, NULL, NULL); if (filename != NULL) { - unlink (filename); + g_unlink (filename); g_free (filename); } g_free (ev_window->priv->local_uri); @@ -970,6 +1010,35 @@ ev_window_clear_local_uri (EvWindow *ev_window) } } +static void +ev_window_clear_temp_file (EvWindow *ev_window) +{ + GnomeVFSURI *uri; + gchar *filename; + const gchar *tempdir; + + if (!ev_window->priv->uri) + return; + + uri = gnome_vfs_uri_new (ev_window->priv->uri); + if (!gnome_vfs_uri_is_local (uri)) { + gnome_vfs_uri_unref (uri); + return; + } + gnome_vfs_uri_unref (uri); + + filename = g_filename_from_uri (ev_window->priv->uri, NULL, NULL); + if (!filename) + return; + + tempdir = g_get_tmp_dir (); + if (g_ascii_strncasecmp (filename, tempdir, strlen (tempdir)) == 0) { + g_unlink (filename); + } + + g_free (filename); +} + /* This callback will executed when load job will be finished. * * Since the flow of the error dialog is very confusing, we assume that both @@ -1005,9 +1074,12 @@ ev_window_xfer_job_cb (EvJobXfer *job, g_object_unref (ev_window->priv->document); ev_window->priv->document = g_object_ref (document); - setup_view_from_metadata (ev_window); + if (!ev_window->priv->unlink_temp_file) { + setup_view_from_metadata (ev_window); + ev_window_add_recent (ev_window, ev_window->priv->uri); + } + ev_window_setup_document (ev_window); - ev_window_add_recent (ev_window, ev_window->priv->uri); if (job->dest) ev_window_goto_dest (ev_window, job->dest); @@ -1091,13 +1163,16 @@ void ev_window_open_uri (EvWindow *ev_window, const char *uri, EvLinkDest *dest, - EvWindowRunMode mode) + EvWindowRunMode mode, + gboolean unlink_temp_file) { 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->unlink_temp_file = unlink_temp_file; + ev_window->priv->xfer_job = ev_job_xfer_new (uri, dest, mode); g_signal_connect (ev_window->priv->xfer_job, "finished", @@ -1166,6 +1241,100 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window) gtk_widget_show (chooser); } +static gchar * +ev_window_create_tmp_symlink (const gchar *filename, GError **error) +{ + gchar *tmp_filename = NULL; + gchar *name; + gint res; + guint i = 0; + + name = g_path_get_basename (filename); + + do { + gchar *basename; + + if (tmp_filename) + g_free (tmp_filename); + + basename = g_strdup_printf ("%s-%d", name, i++); + tmp_filename = g_build_filename (ev_tmp_dir (), + basename, NULL); + + g_free (basename); + } while ((res = symlink (filename, tmp_filename)) != 0 && errno == EEXIST); + + g_free (name); + + if (res != 0 && errno != EEXIST) { + if (error) { + *error = g_error_new (G_FILE_ERROR, + g_file_error_from_errno (errno), + _("Couldn't create symlink “%s”: %s"), + tmp_filename, strerror (errno)); + } + + g_free (tmp_filename); + + return NULL; + } + + return tmp_filename; +} + +static void +ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest) +{ + GError *error = NULL; + gchar *symlink_uri; + gchar *old_filename; + gchar *new_filename; + + old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL); + new_filename = ev_window_create_tmp_symlink (old_filename, &error); + + if (error) { + ev_window_error_dialog (GTK_WINDOW (window), + _("Cannot open a copy."), + error); + + g_error_free (error); + g_free (old_filename); + g_free (new_filename); + + return; + } + + g_free (old_filename); + + symlink_uri = g_filename_to_uri (new_filename, NULL, NULL); + g_free (new_filename); + + ev_application_open_uri_at_dest (EV_APP, + symlink_uri, + gtk_window_get_screen (GTK_WINDOW (window)), + dest, + 0, + TRUE, + GDK_CURRENT_TIME); + g_free (symlink_uri); +} + +static void +ev_window_cmd_file_open_copy (GtkAction *action, EvWindow *window) +{ + EvPageCache *page_cache; + EvLinkDest *dest; + gint current_page; + + page_cache = ev_page_cache_get (window->priv->document); + current_page = ev_page_cache_get_current_page (page_cache); + + dest = ev_link_dest_new_page (current_page); + ev_window_cmd_file_open_copy_at_dest (window, dest); + g_object_unref (dest); +} + #ifdef HAVE_GTK_RECENT static void ev_window_cmd_recent_file_activate (GtkAction *action, @@ -1181,7 +1350,7 @@ ev_window_cmd_recent_file_activate (GtkAction *action, ev_application_open_uri_at_dest (EV_APP, uri, gtk_window_get_screen (GTK_WINDOW (window)), - NULL, 0, + NULL, 0, FALSE, GDK_CURRENT_TIME); } #else @@ -1442,6 +1611,34 @@ ev_window_cmd_save_as (GtkAction *action, EvWindow *ev_window) gtk_widget_show (fc); } +#ifdef WITH_GTK_PRINT +static void +ev_window_print_page_setup_done_cb (GtkPageSetup *page_setup, + EvWindow *window) +{ + /* Dialog was canceled */ + if (!page_setup) + return; + + if (window->priv->print_page_setup) + g_object_unref (window->priv->print_page_setup); + window->priv->print_page_setup = g_object_ref (page_setup); +} +#endif /* WITH_GTK_PRINT */ + +static void +ev_window_cmd_file_print_setup (GtkAction *action, EvWindow *ev_window) +{ +#ifdef WITH_GTK_PRINT + gtk_print_run_page_setup_dialog_async ( + GTK_WINDOW (ev_window), + ev_window->priv->print_page_setup, + ev_window->priv->print_settings, + (GtkPageSetupDoneFunc) ev_window_print_page_setup_done_cb, + ev_window); +#endif /* WITH_GTK_PRINT */ +} + #ifdef WITH_GTK_PRINT static void ev_window_clear_print_job (EvWindow *window) @@ -1531,16 +1728,16 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, { EvPrintRange *ranges = NULL; EvPrintPageSet page_set; - EvPageCache *page_cache; gint n_ranges = 0; gint copies; gboolean collate; gboolean reverse; gdouble scale; gint current_page; - gint width; - gint height; + gdouble width; + gdouble height; GtkPrintPages print_pages; + const gchar *file_format; if (response != GTK_RESPONSE_OK) { gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -1563,6 +1760,9 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, window->priv->print_page_setup = g_object_ref ( gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (dialog))); + file_format = gtk_print_settings_get (window->priv->print_settings, + GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT); + if (!gtk_printer_accepts_ps (window->priv->printer)) { GtkWidget *msgdialog; @@ -1608,19 +1808,24 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, page_set = (EvPrintPageSet)gtk_print_settings_get_page_set (window->priv->print_settings); scale = gtk_print_settings_get_scale (window->priv->print_settings) * 0.01; - page_cache = ev_page_cache_get (window->priv->document); - ev_page_cache_get_size (page_cache, - current_page, - 0, scale, - &width, &height); + width = gtk_page_setup_get_paper_width (window->priv->print_page_setup, + GTK_UNIT_PIXEL); + height = gtk_page_setup_get_paper_height (window->priv->print_page_setup, + GTK_UNIT_PIXEL); + + if (scale != 1.0) { + width *= scale; + height *= scale; + } + copies = gtk_print_settings_get_n_copies (window->priv->print_settings); collate = gtk_print_settings_get_collate (window->priv->print_settings); reverse = gtk_print_settings_get_reverse (window->priv->print_settings); window->priv->print_job = ev_job_print_new (window->priv->document, - (gdouble)width, - (gdouble)height, + file_format ? file_format : "ps", + width, height, ranges, n_ranges, page_set, copies, collate, @@ -1641,10 +1846,11 @@ ev_window_print_dialog_response_cb (GtkDialog *dialog, void ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) { - GtkWidget *dialog; - EvPageCache *page_cache; - gint current_page; - gint document_last_page; + GtkWidget *dialog; + EvPageCache *page_cache; + gint current_page; + gint document_last_page; + GtkPrintCapabilities capabilities; g_return_if_fail (EV_IS_WINDOW (ev_window)); g_return_if_fail (ev_window->priv->document != NULL); @@ -1676,14 +1882,23 @@ ev_window_print_range (EvWindow *ev_window, int first_page, int last_page) dialog = gtk_print_unix_dialog_new (_("Print"), GTK_WINDOW (ev_window)); ev_window->priv->print_dialog = dialog; + + capabilities = GTK_PRINT_CAPABILITY_PAGE_SET | + GTK_PRINT_CAPABILITY_COPIES | + GTK_PRINT_CAPABILITY_COLLATE | + GTK_PRINT_CAPABILITY_REVERSE | + GTK_PRINT_CAPABILITY_SCALE | + GTK_PRINT_CAPABILITY_GENERATE_PS; + + if (EV_IS_FILE_EXPORTER (ev_window->priv->document) && + ev_file_exporter_format_supported (EV_FILE_EXPORTER (ev_window->priv->document), + EV_FILE_FORMAT_PDF)) { + capabilities |= GTK_PRINT_CAPABILITY_GENERATE_PDF; + } + gtk_print_unix_dialog_set_manual_capabilities (GTK_PRINT_UNIX_DIALOG (dialog), - GTK_PRINT_CAPABILITY_PAGE_SET | - GTK_PRINT_CAPABILITY_COPIES | - GTK_PRINT_CAPABILITY_COLLATE | - GTK_PRINT_CAPABILITY_REVERSE | - GTK_PRINT_CAPABILITY_SCALE | - GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_GENERATE_PDF); + capabilities); + gtk_print_unix_dialog_set_current_page (GTK_PRINT_UNIX_DIALOG (dialog), current_page); @@ -2082,9 +2297,11 @@ fullscreen_timeout_cb (EvWindow *window) { EvView *view = EV_VIEW (window->priv->view); - if (!view || !ev_view_get_fullscreen (EV_VIEW (view))) + if (!view || + (!ev_view_get_fullscreen (EV_VIEW (view)) && + !ev_view_get_presentation (EV_VIEW (view)))) return FALSE; - + update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, FALSE); ev_view_hide_cursor (EV_VIEW (window->priv->view)); window->priv->fullscreen_timeout_id = 0; @@ -2179,7 +2396,7 @@ ev_window_create_fullscreen_popup (EvWindow *window) GdkScreen *screen; window->priv->fullscreen_toolbar = egg_editable_toolbar_new_with_model - (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL); + (window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, FALSE), NULL); popup = gtk_window_new (GTK_WINDOW_POPUP); hbox = gtk_hbox_new (FALSE, 0); @@ -2337,6 +2554,8 @@ ev_window_run_presentation (EvWindow *window) window); fullscreen_set_timeout (window); + ev_application_screensaver_disable (EV_APP); + if (!ev_window_is_empty (window)) ev_metadata_manager_set_boolean (window->priv->uri, "presentation", TRUE); } @@ -2363,6 +2582,8 @@ ev_window_stop_presentation (EvWindow *window) window); fullscreen_clear_timeout (window); + ev_application_screensaver_enable (EV_APP); + if (!ev_window_is_empty (window)) ev_metadata_manager_set_boolean (window->priv->uri, "presentation", FALSE); } @@ -2386,29 +2607,14 @@ 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_TOOLBAR, FALSE); update_chrome_flag (window, EV_CHROME_MENUBAR, FALSE); update_chrome_flag (window, EV_CHROME_SIDEBAR, FALSE); + + update_chrome_flag (window, EV_CHROME_PREVIEW_TOOLBAR, TRUE); + update_chrome_visibility (window); } @@ -2556,7 +2762,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, - ev_application_get_toolbars_model (EV_APP)); + ev_application_get_toolbars_model (EV_APP, FALSE)); gtk_container_set_border_width (GTK_CONTAINER (editor), 5); gtk_box_set_spacing (GTK_BOX (EGG_TOOLBAR_EDITOR (editor)), 5); @@ -2660,7 +2866,7 @@ ev_window_cmd_view_reload (GtkAction *action, EvWindow *ev_window) uri = g_strdup (ev_window->priv->uri); - ev_window_open_uri (ev_window, uri, NULL, 0); + ev_window_open_uri (ev_window, uri, NULL, 0, FALSE); g_free (uri); } @@ -2896,6 +3102,7 @@ ev_window_dual_mode_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *ev_wi static char * build_comments_string (void) { +#ifdef ENABLE_PDF PopplerBackend backend; const char *backend_name; const char *version; @@ -2914,9 +3121,12 @@ build_comments_string (void) break; } - return g_strdup_printf (_("PostScript and PDF File Viewer.\n" + return g_strdup_printf (_("Document Viewer.\n" "Using poppler %s (%s)"), version, backend_name); +#else + return g_strdup_printf (_("Document Viewer")); +#endif } static void @@ -2974,7 +3184,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "name", _("Evince"), "version", VERSION, "copyright", - _("\xc2\xa9 1996-2005 The Evince authors"), + _("\xc2\xa9 1996-2007 The Evince authors"), "license", license_trans, "website", "http://www.gnome.org/projects/evince", "comments", comments, @@ -3041,11 +3251,13 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar *ev_sidebar, GtkAction *action; action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - GTK_WIDGET_VISIBLE (ev_sidebar)); if (!ev_view_get_presentation (view) && !ev_view_get_fullscreen (view)) { + + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + GTK_WIDGET_VISIBLE (ev_sidebar)); + ev_metadata_manager_set_boolean (ev_window->priv->uri, "sidebar_visibility", GTK_WIDGET_VISIBLE (ev_sidebar)); } @@ -3107,6 +3319,10 @@ view_menu_popup_cb (EvView *view, "GoLink"); gtk_action_set_visible (action, show_internal); + action = gtk_action_group_get_action (ev_window->priv->view_popup_action_group, + "OpenLinkNewWindow"); + gtk_action_set_visible (action, show_internal); + gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL, 3, gtk_get_current_event_time ()); @@ -3389,6 +3605,8 @@ ev_window_dispose (GObject *object) } if (priv->uri) { + if (priv->unlink_temp_file) + ev_window_clear_temp_file (window); g_free (priv->uri); priv->uri = NULL; } @@ -3398,6 +3616,11 @@ ev_window_dispose (GObject *object) priv->dest = NULL; } + if (priv->history) { + g_object_unref (priv->history); + priv->history = NULL; + } + if (priv->fullscreen_timeout_id) { g_source_remove (priv->fullscreen_timeout_id); priv->fullscreen_timeout_id = 0; @@ -3435,9 +3658,15 @@ static const GtkActionEntry entries[] = { { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "O", N_("Open an existing document"), G_CALLBACK (ev_window_cmd_file_open) }, + { "FileOpenCopy", NULL, N_("Open a _Copy"), NULL, + N_("Open a copy of the current document in a new window"), + G_CALLBACK (ev_window_cmd_file_open_copy) }, { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), "S", N_("Save a copy of the current document"), G_CALLBACK (ev_window_cmd_save_as) }, + { "FilePrintSetup", NULL, N_("Print Set_up..."), NULL, + N_("Setup the page settings for printing"), + G_CALLBACK (ev_window_cmd_file_print_setup) }, { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print this document"), G_CALLBACK (ev_window_cmd_file_print) }, @@ -3449,7 +3678,7 @@ static const GtkActionEntry entries[] = { /* Edit menu */ { "EditCopy", GTK_STOCK_COPY, NULL, "C", NULL, G_CALLBACK (ev_window_cmd_edit_copy) }, - { "EditSelectAll", NULL, N_("Select _All"), "A", NULL, + { "EditSelectAll", GTK_STOCK_SELECT_ALL, N_("Select _All"), "A", NULL, G_CALLBACK (ev_window_cmd_edit_select_all) }, { "EditFind", GTK_STOCK_FIND, N_("_Find..."), "F", N_("Find a word or phrase in the document"), @@ -3460,9 +3689,9 @@ static const GtkActionEntry entries[] = { G_CALLBACK (ev_window_cmd_edit_find_previous) }, { "EditToolbar", NULL, N_("T_oolbar"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_toolbar) }, - { "EditRotateLeft", NULL, N_("Rotate _Left"), NULL, NULL, + { "EditRotateLeft", EV_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_rotate_left) }, - { "EditRotateRight", NULL, N_("Rotate _Right"), NULL, NULL, + { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, NULL, G_CALLBACK (ev_window_cmd_edit_rotate_right) }, /* View menu */ @@ -3583,6 +3812,8 @@ static const GtkActionEntry view_popup_entries [] = { NULL, G_CALLBACK (ev_view_popup_cmd_open_link) }, { "GoLink", GTK_STOCK_GO_FORWARD, N_("_Go To"), NULL, NULL, G_CALLBACK (ev_view_popup_cmd_open_link) }, + { "OpenLinkNewWindow", NULL, N_("Open in New _Window"), NULL, + NULL, G_CALLBACK (ev_view_popup_cmd_open_link_new_window) }, { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL, NULL, G_CALLBACK (ev_view_popup_cmd_copy_link_address) }, @@ -3670,6 +3901,17 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group) G_CALLBACK (zoom_control_changed_cb), window); gtk_action_group_add_action (group, action); g_object_unref (action); + + action = g_object_new (EV_TYPE_NAVIGATION_ACTION, + "name", NAVIGATION_ACTION, + "label", _("Navigation"), + "is_important", TRUE, + "short_label", _("Back"), + "stock_id", GTK_STOCK_GO_DOWN, + "tooltip", _("Move across visited pages"), + NULL); + gtk_action_group_add_action (group, action); + g_object_unref (action); } static void @@ -3894,6 +4136,7 @@ open_remote_link (EvWindow *window, EvLinkAction *action) gtk_window_get_screen (GTK_WINDOW (window)), ev_link_action_get_dest (action), 0, + FALSE, GDK_CURRENT_TIME); g_free (uri); @@ -3953,6 +4196,23 @@ ev_view_popup_cmd_open_link (GtkAction *action, EvWindow *window) ev_view_handle_link (EV_VIEW (window->priv->view), window->priv->link); } +static void +ev_view_popup_cmd_open_link_new_window (GtkAction *action, EvWindow *window) +{ + EvLinkAction *ev_action = NULL; + EvLinkDest *dest; + + ev_action = ev_link_get_action (window->priv->link); + if (!ev_action) + return; + + dest = ev_link_action_get_dest (ev_action); + if (!dest) + return; + + ev_window_cmd_file_open_copy_at_dest (window, dest); +} + static void ev_view_popup_cmd_copy_link_address (GtkAction *action, EvWindow *window) { @@ -4179,14 +4439,25 @@ ev_window_init (EvWindow *ev_window) FALSE, FALSE, 0); gtk_widget_show (toolbar_dock); - ev_window->priv->toolbar = egg_editable_toolbar_new_with_model - (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP), NULL); + ev_window->priv->toolbar = GTK_WIDGET + (g_object_new (EGG_TYPE_EDITABLE_TOOLBAR, + "ui-manager", ev_window->priv->ui_manager, + "popup-path", "/ToolbarPopup", + "model", ev_application_get_toolbars_model (EV_APP, FALSE), + NULL)); + 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); + /* Preview toolbar */ + ev_window->priv->preview_toolbar = egg_editable_toolbar_new_with_model + (ev_window->priv->ui_manager, ev_application_get_toolbars_model (EV_APP, TRUE), NULL); + gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box), ev_window->priv->preview_toolbar, + FALSE, FALSE, 0); + /* Add the main area */ ev_window->priv->hpaned = gtk_hpaned_new (); g_signal_connect (ev_window->priv->hpaned, @@ -4377,7 +4648,7 @@ ev_window_init (EvWindow *ev_window) g_signal_connect_swapped (G_OBJECT (ev_window->priv->view), "drag-data-received", G_CALLBACK (drag_data_received_cb), ev_window); - + /* Set it user interface params */ ev_window_setup_recent (ev_window);