Allow opening a copy of the current document in a new window. Fixes bug

2006-11-14  Carlos Garcia Campos  <carlosgc@gnome.org>
	* data/evince-ui.xml:
	* shell/ev-window.c: (ev_window_setup_action_sensitivity),
	(ev_window_xfer_job_cb), (ev_window_get_copy_tmp_name),
	(ev_window_cmd_file_open_copy_at_dest),
	(ev_window_cmd_file_open_copy), (view_menu_popup_cb),
	(ev_view_popup_cmd_open_link_new_window):
	Allow opening a copy of the current document in a new window. Fixes bug
	#357472

diff --git a/ChangeLog b/ChangeLog
index d9a2644daf375af165d86d007982f9424b3cfb78..9015f1b2023737453d095f2320f11ea0550f6f2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-14  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * data/evince-ui.xml:
+       * shell/ev-window.c: (ev_window_setup_action_sensitivity),
+       (ev_window_xfer_job_cb), (ev_window_get_copy_tmp_name),
+       (ev_window_cmd_file_open_copy_at_dest),
+       (ev_window_cmd_file_open_copy), (view_menu_popup_cb),
+       (ev_view_popup_cmd_open_link_new_window):
+
+       Allow opening a copy of the current document in a new window. Fixes bug
+       #357472
+
 2006-11-11  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * data/evince-toolbar.xml:

diff --git a/data/evince-ui.xml b/data/evince-ui.xml
index c02940402776fb98ec697cc144ccfc468b5693b3..f7d411e3fa0cd9b0169980cddb6296da21ab6c7a 100644 (file)
--- a/data/evince-ui.xml
+++ b/data/evince-ui.xml
@@ -2,6 +2,7 @@
   <menubar name="MainMenu">
     <menu name="FileMenu" action="File">
       <menuitem name="FileOpenMenu" action="FileOpen"/>
+      <menuitem name="FileOpenCopyMenu" action="FileOpenCopy"/>
       <menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
       <separator/>
       <menuitem name="FilePrintSetupMenu" action="FilePrintSetup"/>
@@ -64,6 +65,7 @@
     <menuitem name="OpenLink" action="OpenLink"/>
     <menuitem name="CopyLinkAddress" action="CopyLinkAddress"/>
     <menuitem name="GoLink" action="GoLink"/>
+    <menuitem name="OpenLinkNewWindow" action="OpenLinkNewWindow"/>
     <separator/>
     <menuitem name="GoPreviousPage" action="GoPreviousPage"/>
     <menuitem name="GoNextPage" action="GoNextPage"/>

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 98db4a511d0c54d2455df2fe7aa22e90d191ee8d..c80314090e12bf6cbe33eefbb1fb604e983757c2 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -238,6 +238,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,
@@ -334,6 +336,7 @@ 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
@@ -1051,9 +1054,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);
@@ -1145,8 +1151,7 @@ ev_window_open_uri (EvWindow       *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 =
-               (mode == EV_WINDOW_MODE_PREVIEW) ? unlink_temp_file : FALSE;
+       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,
@@ -1216,6 +1221,88 @@ ev_window_cmd_file_open (GtkAction *action, EvWindow *window)
        gtk_widget_show (chooser);
 }
 
+static gchar *
+ev_window_get_copy_tmp_name (const gchar *filename)
+{
+       gchar *tmp_filename = NULL;
+       gchar *name;
+       guint  i = 0;
+
+       name = g_path_get_basename (filename);
+       
+       do {
+               gchar *basename;
+
+               basename = g_strdup_printf ("%s-%d", name, i);
+               tmp_filename = g_build_filename (g_get_tmp_dir (),
+                                                basename, NULL);
+               g_free (basename);
+       } while (g_file_test (tmp_filename, G_FILE_TEST_EXISTS));
+
+       g_free (name);
+       
+       return tmp_filename;
+}
+
+static void
+ev_window_cmd_file_open_copy_at_dest (EvWindow *window, EvLinkDest *dest)
+{
+       gchar *symlink_uri;
+       gchar *old_filename;
+       gchar *new_filename;
+
+       old_filename = g_filename_from_uri (window->priv->uri, NULL, NULL);
+       new_filename = ev_window_get_copy_tmp_name (old_filename);
+       
+       if (symlink (old_filename, new_filename) != 0) {
+               gchar  *msg;
+               GError *error;
+
+               msg = g_strdup_printf (_("Cannot open a copy."));
+               error = g_error_new (G_FILE_ERROR,
+                                    g_file_error_from_errno (errno),
+                                    _("Couldn't create symlink “%s”: %s"),
+                                    new_filename, strerror (errno));
+               ev_window_error_dialog (GTK_WINDOW (window), msg, error);
+               g_free (msg);
+               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,
@@ -3175,6 +3262,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 ());
@@ -3505,6 +3596,9 @@ static const GtkActionEntry entries[] = {
        { "FileOpen", GTK_STOCK_OPEN, N_("_Open..."), "<control>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..."), "<control>S",
          N_("Save a copy of the current document"),
          G_CALLBACK (ev_window_cmd_save_as) },
@@ -3656,6 +3750,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) },
@@ -4027,6 +4123,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)
 {