Merge lp:~jeremywootten/pantheon-files/fix-1028637 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

When files are pasted or dropped into a view they are added to the current selection and appear highlighted. Files added other ways, e.g. from the command line or saved from another application are not affected.

When files are pasted or dropped into a view they are added to the current selection and appear highlighted. Files added other ways, e.g. from the command line or saved from another application are not affected.

[Danielle Foré (danrabbit)]

You've got design approval! Been waiting for this feature for a while :D

[David Gomes (davidgomes)]

>return (g_list_length (manager->files));
Wouldn't just
>return g_list_length (manager->files);
be better? In terms of code style of course.

Also, diff line 17 doesn't seem to be working.

Other than that, I approve of it, I'll just have to test it.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

Thanks. Not sure where the extra parentheses came from, now - I'll remove.
 Diff line 17 was for testing and can be removed. I await the results of
your testing with interest.

On 15 January 2014 01:31, David Gomes <email address hidden> wrote:

> Review: Needs Fixing
>
> >return (g_list_length (manager->files));
> Wouldn't just
> >return g_list_length (manager->files);
> be better? In terms of code style of course.
>
> Also, diff line 17 doesn't seem to be working.
>
> Other than that, I approve of it, I'll just have to test it.
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1028637/+merge/201174
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1028637.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Jeremy Wootten (jeremywootten)]

OK, removed extra parentheses and debugging message. Also added a comment.

On 15 January 2014 01:31, David Gomes <email address hidden> wrote:

> Review: Needs Fixing
>
> >return (g_list_length (manager->files));
> Wouldn't just
> >return g_list_length (manager->files);
> be better? In terms of code style of course.
>
> Also, diff line 17 doesn't seem to be working.
>
> Other than that, I approve of it, I'll just have to test it.
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1028637/+merge/201174
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1028637.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Cody Garver (codygarver)]

Focus is set to the file you copied AND the file you pasted, is that really the desired behavior? To reproduce:

copy file1
paste file1 so that it becomes file2
observe file1 AND file2 are selected
optional: continue pasting and you will observe all copies are selected at once

[Jeremy Wootten (jeremywootten)]

At the moment, any existing selection in the target directory is not
cleared (intentionally). The pasted file is added to the existing
selection. So if you are copying and pasting files into the same directory
using Ctrl-C and Ctrl-V you will get the behaviour you observed. If you use
the right-click menu you won't because this clears the current selection in
the source directory (even in trunk).

 The current behaviour in trunk is that any existing selection in the
target directory is not cleared by pasting with Ctrl-V or by drag & drop
but the pasted files are not selected.

It should be straightforward to change this if the consensus is that the
desired behaviour would be to clear the existing selection in the target
directory.

On 17 January 2014 12:18, Cody Garver <email address hidden> wrote:

> Focus is set to the file you copied AND the file you pasted, is that
> really the desired behavior? To reproduce:
>
> copy file1
> paste file1 so that it becomes file2
> observe file1 AND file2 are selected
> optional: continue pasting and you will observe all copies are selected at
> once
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1028637/+merge/201174
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1028637.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Jeremy Wootten (jeremywootten)]

A new version has just been uploaded that clears any existing selection
before selecting the pasted/dropped files. This also fixes a problem with
the previous version caused when some of the files expected to arrive had
been skipped. Files pasted/dropped directly into a view are selected.
 Those added indirectly (e.g. from the terminal or by dropping onto a
bookmark or folder icon) are not.

On 17 January 2014 12:18, Cody Garver <email address hidden> wrote:

> Focus is set to the file you copied AND the file you pasted, is that
> really the desired behavior? To reproduce:
>
> copy file1
> paste file1 so that it becomes file2
> observe file1 AND file2 are selected
> optional: continue pasting and you will observe all copies are selected at
> once
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1028637/+merge/201174
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1028637.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved

[Cody Garver (codygarver)]

And remove commented out code

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

OK, trunk has moved on a lot since this branch was first proposed.

Regarding the commented out code, I am not sure what the etiquette is with
respect to removing other people's debugging messages. That's why I only
commented them out - they were causing a lot of "noise" in the terminal.

In my view, the trunk code should only contain messages that are useful
warnings or critical error messages - there are a number of messages in the
code at the moment that are not useful or warn of things that are not
really errors. I try to take out any messages I have inserted during
debugging before proposing for merge.

On 24 March 2014 04:12, Cody Garver <email address hidden> wrote:

> Review: Needs Fixing
>
> And remove commented out code
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1028637/+merge/205487
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1028637.
>

[lp:~jeremywootten/pantheon-files/fix-1028637]

1409. By Jeremy Wootten on 2014-03-24

Merged changes from trunk and remove commented out code

[David Gomes (davidgomes)]

review: Approve

[Cody Garver (codygarver)]

Jeremy you are the main Files contributor at this time.

We liberated this project from someone else.

So your opinion on how code should go is almost as important as the design team. Fire at will.

[Jeremy Wootten (jeremywootten)]

Thanks Cody, although there have been several other contributors recently
which is good to see.

On 16 April 2014 22:27, Cody Garver <email address hidden> wrote:

> Jeremy you are the main Files contributor at this time.
>
> We liberated this project from someone else.
>
> So your opinion on how code should go is almost as important as the design
> team. Fire at will.
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1028637/+merge/205487
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1028637.
>

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2014-01-07 22:25:32 +0000
+++ libcore/marlin-file-operations.c	2014-03-24 20:45:22 +0000
@@ -4700,7 +4700,6 @@
                              gpointer done_callback_data)
 {
     CopyMoveJob *job;
-
     job = op_job_new (JOB_COPY, CopyMoveJob, parent_window);
     //job->desktop_location = marlin_get_desktop_location ();
     job->done_callback = done_callback;

=== modified file 'src/fm-columns-view.c'
--- src/fm-columns-view.c	2014-03-18 20:00:44 +0000
+++ src/fm-columns-view.c	2014-03-24 20:45:22 +0000
@@ -329,7 +329,12 @@
 
 static void fm_columns_view_unselect_all(FMDirectoryView *view)
 {
-    gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (FM_COLUMNS_VIEW (view)->tree));
+    g_return_if_fail (FM_IS_COLUMNS_VIEW (view));
+
+    GtkTreeSelection *selection;
+    selection = gtk_tree_view_get_selection (FM_COLUMNS_VIEW (view)->tree);
+    if (selection)
+        gtk_tree_selection_unselect_all (selection);
 }
 
 static gboolean

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2014-03-16 18:08:56 +0000
+++ src/fm-directory-view.c	2014-03-24 20:45:22 +0000
@@ -128,6 +128,8 @@
     GtkWidget       *menu_selection;
     GtkWidget       *menu_background;
 
+    gboolean        select_added_files;
+
     /* Support for zoom by smooth scrolling */
     gdouble total_delta_y;
 };
@@ -249,6 +251,10 @@
 fm_directory_view_add_file (FMDirectoryView *view, GOFFile *file, GOFDirectoryAsync *directory)
 {
     fm_list_model_add_file (view->model, file, directory);
+
+    if (view->details->select_added_files)
+        fm_directory_view_add_to_selection_gof_file (view, file);
+        
 }
 
 static void
@@ -257,6 +263,7 @@
     if (file)
         g_debug ("%s %s %u\n", G_STRFUNC, file->uri, G_OBJECT (file)->ref_count);
     //g_debug ("%s %s\n", G_STRFUNC, file->uri);
+    view->details->select_added_files = FALSE;
     g_signal_emit (view, signals[ADD_FILE], 0, file, directory);
 }
 
@@ -462,6 +469,7 @@
     view->details->newly_folder_added = NULL;
     view->details->open_with_apps = NULL;
     view->details->default_app = NULL;
+    view->details->select_added_files = FALSE;
     view->details->total_delta_y = 0;
 
     /* create a thumbnailer */
@@ -1394,6 +1402,8 @@
                 if (G_LIKELY (action != 0))
                 {
                     printf ("%s perform action %d\n", G_STRFUNC, action);
+
+                    prepare_to_select_added_files (view);
                     succeed = marlin_dnd_perform (GTK_WIDGET (view),
                                                   file,
                                                   view->details->drop_file_list,
@@ -1462,7 +1472,6 @@
     GOFFile         *file = NULL;
     GdkAtom         target;
 
-    printf ("%s\n", G_STRFUNC);
     /* request the drop data on-demand (if we don't have it already) */
     if (G_UNLIKELY (!view->details->drop_data_ready))
     {
@@ -1529,7 +1538,6 @@
     {
         /* check whether we can drop at (x,y) */
         //TODO
-        printf ("check whether we can drop at (x,y)\n");
         fm_directory_view_get_dest_actions (view, context, x, y, timestamp, NULL);
     }
 
@@ -2376,6 +2384,21 @@
 }
 
 void
+fm_directory_view_add_to_selection_gof_file (FMDirectoryView *view, GOFFile *file)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path;
+
+    g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
+    if (!fm_list_model_get_first_iter_for_file (view->model, file, &iter))
+        return;
+
+    path = gtk_tree_model_get_path (GTK_TREE_MODEL (view->model), &iter);
+    (*FM_DIRECTORY_VIEW_GET_CLASS (view)->select_path) (view, path);
+    gtk_tree_path_free (path);
+}
+
+void
 fm_directory_view_select_glib_files (FMDirectoryView *view, GList *files)
 {
     GList *l;
@@ -3169,6 +3192,17 @@
     return (*FM_DIRECTORY_VIEW_GET_CLASS (view)->get_selection) (view);
 }
 
+void
+prepare_to_select_added_files (FMDirectoryView *view)
+{
+    g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
+
+    if (fm_directory_view_get_selection (view))
+        (*FM_DIRECTORY_VIEW_GET_CLASS (view)->unselect_all) (view);
+
+    view->details->select_added_files = TRUE;
+}
+
 GList *
 fm_directory_view_get_selection_for_file_transfer (FMDirectoryView *view)
 {
@@ -3257,13 +3291,13 @@
 {
     GFile *current_directory;
 
-    //g_message ("%s", G_STRFUNC);
     g_return_if_fail (GTK_IS_ACTION (action));
     g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
     current_directory = view->details->slot->location;
     if (G_LIKELY (current_directory != NULL))
     {
+        prepare_to_select_added_files (view);
         marlin_clipboard_manager_paste_files (view->clipboard, current_directory,
                                               GTK_WIDGET (view), NULL);
         //TODO evalutate
@@ -3276,14 +3310,15 @@
 {
     GOFFile *file;
 
-    //g_message ("%s", G_STRFUNC);
     g_return_if_fail (GTK_IS_ACTION (action));
     g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
 
     /* determine the first selected file and verify that it's a folder */
     file = g_list_nth_data (fm_directory_view_get_selection (view), 0);
-    if (G_LIKELY (file != NULL && gof_file_is_folder (file)))
+    if (G_LIKELY (file != NULL && gof_file_is_folder (file))) {
+        prepare_to_select_added_files (view);
         marlin_clipboard_manager_paste_files (view->clipboard, gof_file_get_target_location (file), GTK_WIDGET (view), NULL);
+    }
 }
 
 static void

=== modified file 'src/fm-icon-view.c'
--- src/fm-icon-view.c	2014-02-09 09:45:35 +0000
+++ src/fm-icon-view.c	2014-03-24 20:45:22 +0000
@@ -19,13 +19,14 @@
 
 #include <fm-icon-view.h>
 #include "fm-directory-view.h"
+#include "fm-abstract-icon-view.h"
 #include "marlin-global-preferences.h"
 #include "eel-i18n.h"
 
 static AtkObject   *fm_icon_view_get_accessible (GtkWidget *widget);
 static void         fm_icon_view_zoom_normal (FMDirectoryView *view);
 static void         fm_icon_view_zoom_level_changed (FMDirectoryView *view);
-
+static void         fm_icon_view_unselect_all (FMDirectoryView *view);
 
 G_DEFINE_TYPE (FMIconView, fm_icon_view, FM_TYPE_ABSTRACT_ICON_VIEW)
 
@@ -46,6 +47,15 @@
     fm_directory_view_class = FM_DIRECTORY_VIEW_CLASS (klass);
     fm_directory_view_class->zoom_normal = fm_icon_view_zoom_normal;
     fm_directory_view_class->zoom_level_changed = fm_icon_view_zoom_level_changed;
+    fm_directory_view_class->unselect_all = fm_icon_view_unselect_all;
+}
+
+static void
+fm_icon_view_unselect_all (FMDirectoryView *icon_view)
+{
+    g_return_if_fail (FM_IS_ICON_VIEW (icon_view));
+    
+    exo_icon_view_unselect_all (FM_ABSTRACT_ICON_VIEW (icon_view)->icons);
 }
 
 static void

=== modified file 'src/fm-list-view.c'
--- src/fm-list-view.c	2014-02-17 22:00:43 +0000
+++ src/fm-list-view.c	2014-03-24 20:45:22 +0000
@@ -774,6 +774,16 @@
     gtk_tree_selection_select_all (gtk_tree_view_get_selection (FM_LIST_VIEW (view)->tree));
 }
 
+static void fm_list_view_unselect_all(FMDirectoryView *view)
+{
+    g_return_if_fail (FM_IS_LIST_VIEW (view));
+    
+    GtkTreeSelection *selection;
+    selection = gtk_tree_view_get_selection (FM_LIST_VIEW (view)->tree);
+    if (selection)
+        gtk_tree_selection_unselect_all (selection);
+}
+
 static void
 fm_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
@@ -971,6 +981,7 @@
     fm_directory_view_class->get_selected_paths = fm_list_view_get_selected_paths;
     fm_directory_view_class->select_path = fm_list_view_select_path;
     fm_directory_view_class->select_all = fm_list_view_select_all;
+    fm_directory_view_class->unselect_all = fm_list_view_unselect_all;
     fm_directory_view_class->set_cursor = fm_list_view_set_cursor;
 
     fm_directory_view_class->get_path_at_pos = fm_list_view_get_path_at_pos;

=== modified file 'src/marlin-clipboard-manager.c'
--- src/marlin-clipboard-manager.c	2013-08-10 20:15:26 +0000
+++ src/marlin-clipboard-manager.c	2014-03-24 20:45:22 +0000
@@ -655,7 +655,13 @@
     return (manager->files_cutted && g_list_find (manager->files, file) != NULL);
 }
 
+guint
+marlin_clipboard_manager_count_files (MarlinClipboardManager *manager)
+{
+    g_return_val_if_fail (MARLIN_IS_CLIPBOARD_MANAGER (manager), 0);
 
+    return g_list_length (manager->files);
+}
 
 /**
  * marlin_clipboard_manager_copy_files: