Merge lp:~jeremywootten/pantheon-files/transfer-popover-with-pie-progress into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

This branch transfers handling of unity launcher quicklist and progress indicator to pantheon-files daemon.
It also refactors the progress UI handling, replacing the dialog window with a pie (doughnut) shaped progress indicator in the headerbar associated with a popover to show details.

[Danielle Foré (danrabbit)]

I don't think we need to send a notification when cancelling a transfer. That's something that I just did. There's no delay between me doing it and it happening and it's obvious that it happened because the file is removed from the popover. So it seems unnecessary to send a notification here.

[Danielle Foré (danrabbit)]

I don't really like that it warns you about closing the window now. That seems like a regression. Users should be able to close a window without worry and the process just continue to run in the background.

I also get notifications when moving things to the trash from an external disk. That seems unnecessary.

I get a notification on starting a transfer. Again, it seems unnecessary to notify me of things that I'm doing.

[Jeremy Wootten (jeremywootten)]

OK, thanks for your comments. I'll work on that.

[Jeremy Wootten (jeremywootten)]

The stop process button is now more clearly associated with the progress bar (not a close popover button) and is not symbolic - the red color warning that it has an irreversible effect (is confirmation required?). This follows comments on Google+.

[Danielle Foré (danrabbit)]

No, I don't think confirmation is required. It is quite reversible. Just start another transfer :p

Notifications don't seen to have an icon. Probably should use the Files icon so it's clear which app this is coming from.

"File operation completed" is pretty vague. Can we get a little more specific? "5 files copied to Foo" for example?

I seem to always get the HTML mime. I'm guessing this is hardcoded?

Can the gradient on the progressbar go from top to bottom instead of around the doughnut? Looks kinda weird and doesn't really make sense. I'm not sure how the light would have to be to produce that effect :p

I'm thinking maybe we shouldn't group files into a single row. I have two rows that say "Copying foo files to bar". It's hard to remember what exactly each one is.

I'm not sure why you're creating constants for icon names, especially if you're only using it once. Seems like it makes the code less legible.

Any reason you're subclassing gtk.box here instead of using ListBox and ListBoxRow?

Margins on the popover seem oddly huge. Margins on dialogs and popovers should be 12px.

I think it would be helpful to name "ProgressInfoWidget.vala" something more indicative of what it actually is. It seems like that could mean just about anything. Something like "TransferRow" might be more clear about what it is used for and what shape it takes. "Widget" could be anything.

You should use gtk.grid instead of nesting boxes

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

The completion notification is "All file operations have been completed" and only appears when the last of the file operations finishes - there are no notifications for individual notifications for file operations. So your suggestion would only work if there was only one file operation (which, admittedly there usually is). Otherwise you would have to list each operation? And whether or not they were successful or failed? Or notify the ending of each operation individually?

[Zisu Andrei (matzipan)]

Tested it. Works nicely, although the pie needs a bit of visual improvements to better match the mockup (https://github.com/elementary/mockups/blob/master/files/transfer.svg). I'll try and do those improvements myself if I have some time.

Diff comments attached to this message.

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/transfer-popover-with-pie-progress]

2044. By Jeremy Wootten on 2017-01-14

Merge trunk to r2444 and resolve conflicts

2045. By Jeremy Wootten on 2017-01-14

Move Progress widgets to src/View/Widgets

2046. By Jeremy Wootten on 2017-01-14

Define MarlinFileOperationType in marlin-progress-info.h not Enums.vala to avoid conflicts with testing branches

2047. By Jeremy Wootten on 2017-02-04

Merge trunk to r2470

Unmerged revisions

2047. By Jeremy Wootten on 2017-02-04

Merge trunk to r2470

2046. By Jeremy Wootten on 2017-01-14

Define MarlinFileOperationType in marlin-progress-info.h not Enums.vala to avoid conflicts with testing branches

2045. By Jeremy Wootten on 2017-01-14

Move Progress widgets to src/View/Widgets

2044. By Jeremy Wootten on 2017-01-14

Merge trunk to r2444 and resolve conflicts

2043. By Jeremy Wootten on 2016-11-20

Merge trunk to r2382 and resolve conflicts

2042. By Jeremy Wootten on 2016-07-03

Merge trunk to r2229 and resolve conflicts. Make prefix for APP_ID, .desktop files, dbus service files, dbus service addresses, settings schemas consistently org.pantheon.files

2041. By Jeremy Wootten on 2016-07-03

Change total_files to total_file_count

2040. By Jeremy Wootten on 2016-07-03

Change remaining_files to remaining_file_count

2039. By Jeremy Wootten on 2016-07-03

Rename info->no_files

2038. By Jeremy Wootten on 2016-07-03

Initialise info->current_filename; return empty string if null

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-16 10:09:11 +0000
+++ CMakeLists.txt	2017-01-14 12:39:17 +0000
@@ -2,6 +2,7 @@
 
 cmake_minimum_required (VERSION 2.8)
 cmake_policy (VERSION 2.8)
+cmake_policy (SET CMP0015 OLD)
 project (pantheon-files C)
 enable_testing ()
 
@@ -35,9 +36,9 @@
 ELSE ()
     add_subdirectory (src)
     add_subdirectory (data)
+    add_subdirectory (libcore)
+    add_subdirectory (libwidgets)
     add_subdirectory (pantheon-files-daemon)
-    add_subdirectory (libcore)
-    add_subdirectory (libwidgets)
     add_subdirectory (plugins)
     add_subdirectory (filechooser-module)
     add_subdirectory (po)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-08-01 23:47:17 +0000
+++ data/CMakeLists.txt	2017-01-14 12:39:17 +0000
@@ -1,6 +1,8 @@
 include (Translations)
 
-configure_file(pantheon-files.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service)
+configure_file(pantheon-files.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop)
+configure_file(pantheon-files.db.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.db.service)
+configure_file(pantheon-files.ql.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.ql.service)
 configure_file(pantheon-files-pkexec.cmake ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec)
 configure_file(net.launchpad.pantheon-files.policy.cmake ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy)
 
@@ -9,7 +11,8 @@
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.appdata.xml DESTINATION share/appdata)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.desktop DESTINATION share/applications)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files.service DESTINATION share/dbus-1/services/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.db.service DESTINATION share/dbus-1/services/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.files.ql.service DESTINATION share/dbus-1/services/)
 install (PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pantheon-files-pkexec DESTINATION bin)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/net.launchpad.pantheon-files.policy DESTINATION share/polkit-1/actions/)
 

=== added file 'data/pantheon-files.db.service.cmake'
--- data/pantheon-files.db.service.cmake	1970-01-01 00:00:00 +0000
+++ data/pantheon-files.db.service.cmake	2017-01-14 12:39:17 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.pantheon.files.db
+Exec=@CMAKE_INSTALL_PREFIX@/bin/pantheon-files-daemon
+

=== added file 'data/pantheon-files.ql.service.cmake'
--- data/pantheon-files.ql.service.cmake	1970-01-01 00:00:00 +0000
+++ data/pantheon-files.ql.service.cmake	2017-01-14 12:39:17 +0000
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.pantheon.files.ql
+Exec=@CMAKE_INSTALL_PREFIX@/bin/pantheon-files-daemon
+

=== modified file 'data/pantheon-files.service.cmake'
--- data/pantheon-files.service.cmake	2016-06-18 11:25:11 +0000
+++ data/pantheon-files.service.cmake	2017-01-14 12:39:17 +0000
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.pantheon.files.db
 Exec=@CMAKE_INSTALL_PREFIX@/bin/pantheon-files-daemon
+

=== modified file 'libcore/Enums.vala'
--- libcore/Enums.vala	2016-12-31 19:42:09 +0000
+++ libcore/Enums.vala	2017-01-14 12:39:17 +0000
@@ -149,4 +149,13 @@
         XDND_DIRECT_SAVE0,
         NETSCAPE_URL
     }
+
+    public enum FileOperationType {
+        COPY,
+        MOVE,
+        TRASH,
+        DELETE,
+        LINK,
+        INVALID
+    }
 }

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2017-01-04 13:40:56 +0000
+++ libcore/gof-directory-async.vala	2017-01-14 12:39:17 +0000
@@ -555,6 +555,7 @@
             }
             state = State.LOADED;
         } catch (Error err) {
+            cancel_timeout (ref load_timeout_id);
             warning ("Listing directory error: %s %s", err.message, file.uri);
             can_load = false;
             if (err is IOError.NOT_FOUND || err is IOError.NOT_DIRECTORY) {

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2016-10-16 18:35:01 +0000
+++ libcore/marlin-file-operations.c	2017-01-14 12:39:17 +0000
@@ -2066,6 +2066,11 @@
 #ifdef ENABLE_TASKVIEW
     taskview_generic_set_state (TASKVIEW_GENERIC (job->common.tv_io), TASKVIEW_RUNNING);
 #else
+    if (job->try_trash) {
+        marlin_progress_info_set_optype (common->progress, MARLIN_FILE_OPERATION_TYPE_TRASH);
+    } else {
+        marlin_progress_info_set_optype (common->progress, MARLIN_FILE_OPERATION_TYPE_DELETE);
+    }
     marlin_progress_info_start (job->common.progress);
 #endif
 
@@ -2649,8 +2654,10 @@
 static void
 count_file (GFileInfo *info,
             CommonJob *job,
-            SourceInfo *source_info)
+            SourceInfo *source_info,
+            const char *lastctype)
 {
+    const char *ctype;
     source_info->num_files += 1;
     source_info->num_bytes += g_file_info_get_size (info);
 
@@ -2658,6 +2665,16 @@
         report_count_progress (job, source_info);
         source_info->num_files_since_progress = 0;
     }
+
+    if (info != NULL) {
+        ctype = g_file_info_get_content_type (info);
+
+        if (source_info->num_files == 1) {
+            marlin_progress_info_set_ctype (job->progress, ctype);
+        } else if (strcmp (ctype, lastctype) != 0) {
+            marlin_progress_info_set_ctype (job->progress, "");
+        }
+    }
 }
 
 static char *
@@ -2697,6 +2714,7 @@
     enumerator = g_file_enumerate_children (dir,
                                             G_FILE_ATTRIBUTE_STANDARD_NAME","
                                             G_FILE_ATTRIBUTE_STANDARD_TYPE","
+                                            G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE","
                                             G_FILE_ATTRIBUTE_STANDARD_SIZE,
                                             G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
                                             job->cancellable,
@@ -2704,7 +2722,7 @@
     if (enumerator) {
         error = NULL;
         while ((info = g_file_enumerator_next_file (enumerator, job->cancellable, &error)) != NULL) {
-            count_file (info, job, source_info);
+            count_file (info, job, source_info, "");
 
             if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
                 subdir = g_file_get_child (dir,
@@ -2713,8 +2731,6 @@
                 /* Push to head, since we want depth-first */
                 g_queue_push_head (dirs, subdir);
             }
-
-            g_object_unref (info);
         }
         g_file_enumerator_close (enumerator, job->cancellable, NULL);
         g_object_unref (enumerator);
@@ -2799,10 +2815,11 @@
     }
 }
 
-static void
+static const char*
 scan_file (GFile *file,
            SourceInfo *source_info,
-           CommonJob *job)
+           CommonJob *job,
+           const char* lastctype)
 {
     GFileInfo *info;
     GError *error;
@@ -2817,20 +2834,20 @@
 retry:
     error = NULL;
     info = g_file_query_info (file,
+                              G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME","
                               G_FILE_ATTRIBUTE_STANDARD_TYPE","
+                              G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE","
                               G_FILE_ATTRIBUTE_STANDARD_SIZE,
                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
                               job->cancellable,
                               &error);
 
     if (info) {
-        count_file (info, job, source_info);
+        count_file (info, job, source_info,lastctype);
 
         if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
             g_queue_push_head (dirs, g_object_ref (file));
         }
-
-        g_object_unref (info);
     } else if (job->skip_all_error) {
         g_error_free (error);
         skip_file (job, file);
@@ -2883,6 +2900,17 @@
     /* Free all from queue if we exited early */
     g_queue_foreach (dirs, (GFunc)g_object_unref, NULL);
     g_queue_free (dirs);
+
+
+    const char* res;
+    if (info) {
+        res = g_strdup (g_file_info_get_content_type (info));
+        g_object_unref (info);
+    } else {
+        res = "";
+    }
+
+    return res;
 }
 
 static void
@@ -2893,6 +2921,8 @@
 {
     GList *l;
     GFile *file;
+    const char *lastctype;
+
 
     memset (source_info, 0, sizeof (SourceInfo));
     source_info->op = kind;
@@ -2902,11 +2932,12 @@
     for (l = files; l != NULL && !job_aborted (job); l = l->next) {
         file = l->data;
 
-        scan_file (file,
-                   source_info,
-                   job);
+        lastctype = scan_file (file,
+                              source_info,
+                              job,
+                              lastctype);
     }
-
+    g_free (lastctype);
     /* Make sure we report the final count */
     report_count_progress (job, source_info);
 }
@@ -3076,6 +3107,7 @@
     CommonJob *job;
     gboolean is_move;
     int files_left;
+    int nth_file;
 #ifndef ENABLE_TASKVIEW
     goffset total_size;
     double elapsed, transfer_rate;
@@ -3104,15 +3136,15 @@
         files_left = 1;
     }
 
+    nth_file = source_info->num_files - files_left + 1; /*nominal number of file currently being transferred */
+
     if (files_left != transfer_info->last_reported_files_left ||
         transfer_info->last_reported_files_left == 0) {
         /* Avoid changing this unless files_left changed since last time */
         transfer_info->last_reported_files_left = files_left;
-
         if (source_info->num_files == 1) {
             if (copy_job->destination != NULL) {
-                s = f (is_move ? _("Moving \"%B\" to \"%B\"") :
-                       _("Copying \"%B\" to \"%B\""),
+                s = f (is_move ? _("Moving \"%B\" to \"%B\"") : _("Copying \"%B\" to \"%B\""),
                        (GFile *)copy_job->files->data,
                        copy_job->destination);
             } else {
@@ -3120,20 +3152,22 @@
             }
         } else if (copy_job->files != NULL && copy_job->files->next == NULL) {
             if (copy_job->destination != NULL) {
-                s = f (is_move ? ngettext ("Moving %'d file (in \"%B\") to \"%B\"",
-                                           "Moving %'d files (in \"%B\") to \"%B\"",
-                                           files_left) :
-                       ngettext ("Copying %'d file (in \"%B\") to \"%B\"",
-                                 "Copying %'d files (in \"%B\") to \"%B\"",
-                                 files_left),
-                       files_left,
+                /* TRANSLATORS: The first %'d represents the (nominal) number of the file currently being transferred and should not be translated.
+                 * The second %'d represents the (nominal) total number of files in the transfer operation and should not be translated.
+                 * The \"%B\" 's represent the paths of the source and destination folders respectively and should not be translated. */ 
+                s = f (is_move ? _("Moving file %'d of %'d (in \"%B\") to \"%B\". ")
+                               : _("Copying file %'d of %'d (in \"%B\") to \"%B\". "),
+                       nth_file,
+                       source_info->num_files,
                        (GFile *)copy_job->files->data,
                        copy_job->destination);
             } else {
-                s = f (ngettext ("Duplicating %'d file (in \"%B\")",
-                                 "Duplicating %'d files (in \"%B\")",
-                                 files_left),
-                       files_left,
+                /* TRANSLATORS: The first %'d represents the (nominal) number of the file currently being transferred and should not be translated.
+                 * The second %'d represents the (nominal) total number of files in the transfer operation and should not be translated.
+                 * The \"%B\" represents the path of the source and should not be translated. */ 
+                s = f ("Duplicating file %'d of %'d (in \"%B\")",
+                       nth_file,
+                       source_info->num_files,
                        (GFile *)copy_job->files->data);
             }
         } else {
@@ -4344,6 +4378,17 @@
     pdata.source_info = source_info;
     pdata.transfer_info = transfer_info;
 
+    GFileInfo *info;
+    info = g_file_query_info (src, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+                              G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+                             job->cancellable,
+                             NULL);
+
+    marlin_progress_info_set_current_filename (job->progress, g_file_info_get_display_name (info));
+    marlin_progress_info_decrement_remaining_file_count (job->progress);
+
+    g_object_unref (info);
+
     if (copy_job->is_move) {
         res = g_file_move (src, dest,
                            flags,
@@ -4352,6 +4397,7 @@
                            &pdata,
                            &error);
     } else {
+
         res = g_file_copy (src, dest,
                            flags,
                            job->cancellable,
@@ -4747,6 +4793,8 @@
 #ifdef ENABLE_TASKVIEW
     g_object_set (job->common.tv_io, "state", TASKVIEW_RUNNING, NULL);
 #else
+    marlin_progress_info_set_optype (common->progress, MARLIN_FILE_OPERATION_TYPE_COPY);
+    marlin_progress_info_set_destination_uri (common->progress, g_file_get_uri (job->destination));
     marlin_progress_info_start (job->common.progress);
 #endif
 
@@ -4754,10 +4802,13 @@
                   &source_info,
                   common,
                   OP_KIND_COPY);
+
     if (job_aborted (common)) {
         goto aborted;
     }
 
+    marlin_progress_info_set_remaining_file_count (common->progress, source_info.num_files);
+
     if (job->destination) {
         dest = g_object_ref (job->destination);
     } else {
@@ -4855,7 +4906,6 @@
                   NULL);
     g_free (s);
 #else
-    marlin_progress_info_take_status (job->progress, s);
     marlin_progress_info_take_details (job->progress,
                                        f (ngettext ("Preparing to move %'d file",
                                                     "Preparing to move %'d files",
@@ -5284,6 +5334,8 @@
 #ifdef ENABLE_TASKVIEW
     g_object_set (job->common.tv_io, "state", TASKVIEW_RUNNING, NULL);
 #else
+    marlin_progress_info_set_optype (common->progress, MARLIN_FILE_OPERATION_TYPE_MOVE);
+    marlin_progress_info_set_destination_uri (common->progress, g_file_get_uri (job->destination));
     marlin_progress_info_start (job->common.progress);
 #endif
 
@@ -5297,6 +5349,7 @@
 
     /* This moves all files that we can do without copy + delete */
     move_files_prepare (job, dest_fs_id, &dest_fs_type, &fallbacks);
+
     if (job_aborted (common)) {
         goto aborted;
     }
@@ -5310,6 +5363,8 @@
                   common,
                   OP_KIND_MOVE);
 
+    marlin_progress_info_set_remaining_file_count (common->progress, source_info.num_files);
+
     g_list_free (fallback_files);
 
     if (job_aborted (common)) {
@@ -5320,6 +5375,7 @@
                         job->destination,
                         NULL,
                         source_info.num_bytes);
+
     if (job_aborted (common)) {
         goto aborted;
     }
@@ -5616,8 +5672,6 @@
 {
     CopyMoveJob *job;
     CommonJob *common;
-    GList *copy_files;
-    GArray *copy_positions;
     GFile *src;
     GdkPoint *point;
     char *dest_fs_type;
@@ -5629,14 +5683,15 @@
     common = &job->common;
     common->io_job = io_job;
 
-    copy_files = NULL;
-    copy_positions = NULL;
-
     dest_fs_type = NULL;
+    total = left = g_list_length (job->files);
 
 #ifdef ENABLE_TASKVIEW
     g_object_set (job->common.tv_io, "state", TASKVIEW_RUNNING, NULL);
 #else
+    marlin_progress_info_set_optype (common->progress, MARLIN_FILE_OPERATION_TYPE_LINK);
+    marlin_progress_info_set_destination_uri (common->progress, g_file_get_uri (job->destination));
+    marlin_progress_info_set_remaining_file_count (common->progress, total);
     marlin_progress_info_start (job->common.progress);
 #endif
 
@@ -5648,7 +5703,7 @@
         goto aborted;
     }
 
-    total = left = g_list_length (job->files);
+
 
     report_link_progress (job, total, left);
 

=== modified file 'libcore/marlin-progress-info.c'
--- libcore/marlin-progress-info.c	2016-06-24 18:59:29 +0000
+++ libcore/marlin-progress-info.c	2017-01-14 12:39:17 +0000
@@ -49,9 +49,15 @@
     char *title;
     char *status;
     char *details;
+    char *ctype;
+    char *destination;
+    MarlinFileOperationType optype;
+    char *current_filename;
     double progress;
-    double current;
-    double total;
+    double current; /* Current number of bytes that have been copied/moved/deleted */
+    double total;  /* Total number of bytes to be copied/moved/deleted */
+    int file_count; /* Current number of files that have been copied/moved/deleted */
+    int total_file_count; /* Total number of files to be copied/moved/deleted */
     gboolean activity_mode;
     gboolean started;
     gboolean finished;
@@ -85,6 +91,9 @@
     g_free (info->title);
     g_free (info->status);
     g_free (info->details);
+    g_free (info->ctype);
+    g_free (info->destination);
+    g_free (info->current_filename);
     g_object_unref (info->cancellable);
 
     if (G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) {
@@ -160,6 +169,13 @@
     MarlinProgressInfoManager *manager;
 
     info->cancellable = g_cancellable_new ();
+    info->title = NULL;
+    info->status = NULL;
+    info->ctype = NULL;
+    info->destination = NULL;
+    info->current_filename = NULL;
+    info->total_file_count = -1;
+    info->file_count = -1;
 
     info->title = NULL;
 
@@ -296,6 +312,10 @@
     g_cancellable_cancel (info->cancellable);
 
     G_UNLOCK (progress_info);
+    /* Call finish now for responsiveness of interface, as it may take some tiime for the
+     * marlin file operation to actually finish.
+     */ 
+    marlin_progress_info_finish (info);
 }
 
 GCancellable *
@@ -509,12 +529,177 @@
     G_UNLOCK (progress_info);
 }
 
+char *
+marlin_progress_info_get_destination_uri (MarlinProgressInfo *info)
+{
+    char *uri;
+    G_LOCK (progress_info);
+
+    uri = g_strdup (info->destination);
+
+    G_UNLOCK (progress_info);
+
+    return uri;
+}
+
+char *
+marlin_progress_info_get_ctype (MarlinProgressInfo *info)
+{
+    char *ct;
+    G_LOCK (progress_info);
+
+    ct = g_strdup (info->ctype);
+
+    G_UNLOCK (progress_info);
+
+    return ct;
+}
+
+MarlinFileOperationType
+marlin_progress_info_get_optype (MarlinProgressInfo *info)
+{
+    MarlinFileOperationType ot;
+    G_LOCK (progress_info);
+
+    ot = info->optype;
+
+    G_UNLOCK (progress_info);
+
+    return ot;
+}
+
+char *
+marlin_progress_info_get_current_filename (MarlinProgressInfo *info)
+{
+    char *cfn;
+    G_LOCK (progress_info);
+
+    if (info->current_filename) {
+        cfn = g_strdup (info->current_filename);
+    } else {
+        cfn = "";
+    }
+
+    G_UNLOCK (progress_info);
+
+    return cfn;
+}
+
+int
+marlin_progress_info_get_remaining_file_count (MarlinProgressInfo *info)
+{
+    uint rf;
+
+    G_LOCK (progress_info);
+
+    rf = info->file_count;
+
+    G_UNLOCK (progress_info);
+
+    return rf;
+}
+
+int
+marlin_progress_info_get_total_file_count (MarlinProgressInfo *info)
+{
+    uint tf;
+
+    G_LOCK (progress_info);
+
+    tf = info->total_file_count;
+
+    G_UNLOCK (progress_info);
+
+    return tf;
+}
+
+void
+marlin_progress_info_set_destination_uri (MarlinProgressInfo *info,
+                                          const char *uri)
+{
+    G_LOCK (progress_info);
+
+    if (info->destination) {
+        g_free (info->destination);
+    }
+    info->destination = g_strdup (uri);
+
+    G_UNLOCK (progress_info);
+}
+
+void
+marlin_progress_info_set_ctype (MarlinProgressInfo *info,
+                                const char *ctype)
+{
+    G_LOCK (progress_info);
+
+    if (info->ctype) {
+        g_free (info->ctype);
+    }
+    info->ctype = g_strdup (ctype);
+
+    G_UNLOCK (progress_info);
+}
+
+void
+marlin_progress_info_set_current_filename (MarlinProgressInfo *info,
+                                           char *current_filename)
+{
+    G_LOCK (progress_info);
+
+    if (info->current_filename) {
+        g_free (info->current_filename);
+    }
+    info->current_filename = g_strdup (current_filename);
+
+    G_UNLOCK (progress_info);
+}
+
+void
+marlin_progress_info_set_optype (MarlinProgressInfo *info,
+                                MarlinFileOperationType optype)
+{
+    G_LOCK (progress_info);
+    /* Should only be set once */
+
+    info->optype = optype;
+
+    G_UNLOCK (progress_info);
+}
+
+void
+marlin_progress_info_set_remaining_file_count (MarlinProgressInfo *info,
+                                         int file_count)
+{
+    G_LOCK (progress_info);
+
+    info->file_count = file_count;
+    if (info->total_file_count < 0) { /* Initialized as -1 */
+        info->total_file_count = file_count;
+    }
+
+    G_UNLOCK (progress_info);
+}
+
+void
+marlin_progress_info_decrement_remaining_file_count (MarlinProgressInfo *info)
+{
+    G_LOCK (progress_info);
+
+    info->file_count = info->file_count - 1;
+
+    G_UNLOCK (progress_info);
+}
+
 void
 marlin_progress_info_take_status (MarlinProgressInfo *info,
                                   char *status)
 {
     G_LOCK (progress_info);
 
+    if (info->title == NULL) {
+        info->title = g_strdup (status);
+    }
     if (eel_strcmp (info->status, status) != 0) {
         g_free (info->status);
         info->status = status;
@@ -534,6 +719,9 @@
 {
     G_LOCK (progress_info);
 
+    if (info->title == NULL) {
+        info->title = g_strdup (status);
+    }
     if (eel_strcmp (info->status, status) != 0) {
         g_free (info->status);
         info->status = g_strdup (status);

=== modified file 'libcore/marlin-progress-info.h'
--- libcore/marlin-progress-info.h	2016-06-24 18:59:29 +0000
+++ libcore/marlin-progress-info.h	2017-01-14 12:39:17 +0000
@@ -26,6 +26,7 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
+#include "pantheon-files-core.h"
 
 /* Match .vapi class Marlin.Progress.Info */
 #define MARLIN_PROGRESS_TYPE_INFO         (marlin_progress_info_get_type ())
@@ -81,6 +82,23 @@
 void          marlin_progress_info_set_progress    (MarlinProgressInfo *info,
                                                     double             current,
                                                     double             total);
+void          marlin_progress_info_set_ctype        (MarlinProgressInfo *info,
+                                                     const char         *ctype);
+char*         marlin_progress_info_get_ctype        (MarlinProgressInfo *info);
+void          marlin_progress_info_set_destination_uri  (MarlinProgressInfo *info,
+                                                         const char         *ctype);
+char*         marlin_progress_info_get_destination_uri   (MarlinProgressInfo *info);
+void          marlin_progress_info_set_optype        (MarlinProgressInfo *info,
+                                                     MarlinFileOperationType  optype);
+MarlinFileOperationType  marlin_progress_info_get_optype (MarlinProgressInfo *info);
+void          marlin_progress_info_set_current_filename (MarlinProgressInfo *info,
+                                                         char               *filename);
+char*         marlin_progress_info_get_current_filename (MarlinProgressInfo *info);
+void          marlin_progress_info_set_remaining_file_count (MarlinProgressInfo *info,
+                                                        int no_files);
+void          marlin_progress_info_decrement_remaining_file_count (MarlinProgressInfo *info);
+int           marlin_progress_info_get_remaining_file_count (MarlinProgressInfo *info);
+int           marlin_progress_info_get_total_files (MarlinProgressInfo *info);
 void          marlin_progress_info_pulse_progress  (MarlinProgressInfo *info);
 
 

=== modified file 'libcore/pantheon-files-core-C.vapi'
--- libcore/pantheon-files-core-C.vapi	2016-12-23 14:29:30 +0000
+++ libcore/pantheon-files-core-C.vapi	2017-01-14 12:39:17 +0000
@@ -208,6 +208,13 @@
         public bool get_is_finished ();
         public bool get_is_paused ();
         public GLib.Cancellable get_cancellable ();
+//        public string get_title ();
+        public string get_ctype ();
+        public string get_destination_uri ();
+        public FileOperationType get_optype ();
+        public string get_current_filename ();
+        public int get_remaining_file_count ();
+        public int get_total_file_count ();
     }
 
     [CCode (cheader_filename = "marlin-progress-info-manager.h")]

=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2016-12-27 18:19:20 +0000
+++ libwidgets/CMakeLists.txt	2017-01-14 12:39:17 +0000
@@ -37,6 +37,9 @@
     Chrome/BreadcrumbIconList.vala
     Chrome/ButtonWithMenu.vala
     Chrome/ImgEventBox.vala
+    #~ Chrome/ProgressIndicator.vala
+    #~ Chrome/ProgressIndicatorWithPopover.vala
+    #~ Chrome/ProgressInfoListRow.vala
     View/SearchResults.vala
     Interfaces/SearchableInterface.vala
     Chrome/ViewSwitcher.vala

=== modified file 'pantheon-files-daemon/CMakeLists.txt'
--- pantheon-files-daemon/CMakeLists.txt	2014-08-05 18:18:49 +0000
+++ pantheon-files-daemon/CMakeLists.txt	2017-01-14 12:39:17 +0000
@@ -1,11 +1,25 @@
 # Vala stuff
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libcore/)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../libwidgets/)
+set (PKGNAME pantheon-files-daemon)
+
+include_directories (${CMAKE_SOURCE_DIR}/libcore/)
+include_directories (${CMAKE_BINARY_DIR}/libcore/)
+include_directories (${CMAKE_SOURCE_DIR}/libwidgets/)
+include_directories (${CMAKE_BINARY_DIR}/libwidgets/)
+
 find_package(PkgConfig)
+OPTION (WITH_UNITY "Add Unity launcher support" ON)
+pkg_check_modules (UNITY unity>=4.0.0)
+IF (WITH_UNITY AND UNITY_FOUND)
+    set (UNITY_OPTIONS --define=HAVE_UNITY)
+    set (UNITY_PKG unity)
+    include_directories (${UNITY_INCLUDE_DIRS})
+    link_libraries (${UNITY_LIBRARIES})
+    link_directories (${UNITY_LIBRARY_DIRS})
+ELSE (WITH_UNITY AND UNITY_FOUND)
+    set (UNITY_PKG "")
+ENDIF (WITH_UNITY AND UNITY_FOUND)
+
 pkg_check_modules(DEPS REQUIRED
 	glib-2.0>=2.29.0
 	gthread-2.0
@@ -16,26 +30,43 @@
 	gee-0.8
 	sqlite3
     dbus-glib-1
-	libnotify>=0.7.2)
-set(CFLAGS
-	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
-)
-set(LIB_PATHS
-	${DEPS_LIBRARY_DIRS}
-)
+	libnotify>=0.7.2
+    ${UNITY_PKG})
+
+set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
+set(LIB_PATHS {DEPS_LIBRARY_DIRS} ${UNITY_LIBRARIES})
 link_directories(${LIB_PATHS})
 add_definitions(${CFLAGS})
 
-vala_precompile(VALA_C pantheon-files-daemon
+vala_precompile(VALA_C ${PKGNAME}
+    main.vala
     marlind-tagging.vala
+    QuicklistHandler.vala
+    ProgressHandlerQuicklistInterface.vala
 PACKAGES
     gtk+-3.0
     gio-2.0
     gee-0.8
     sqlite3
+    dbus-glib-1
+    libnotify
+    pantheon-files-core
+    pantheon-files-widgets
+    pantheon-files-core-C
+    ${UNITY_PKG}
 OPTIONS
+    --vapidir=${CMAKE_SOURCE_DIR}/libcore
+    --vapidir=${CMAKE_BINARY_DIR}/libcore
     --thread)
-add_executable(pantheon-files-daemon
-    ${VALA_C} )
-target_link_libraries(pantheon-files-daemon ${DEPS_LIBRARIES})
-install(TARGETS pantheon-files-daemon RUNTIME DESTINATION bin)
+
+add_executable(${PKGNAME} ${VALA_C} )
+
+add_dependencies (${PKGNAME} pantheon-files-core pantheon-files-widgets)
+target_link_libraries (pantheon-files-daemon pantheon-files-core)
+
+IF (WITH_UNITY AND UNITY_FOUND)
+    target_link_libraries (pantheon-files-daemon pantheon-files-core ${UNITY_LIBRARIES})
+    add_definitions ("-DHAVE_UNITY=1")
+ENDIF (WITH_UNITY AND UNITY_FOUND)
+
+install(TARGETS ${PKGNAME} RUNTIME DESTINATION bin)

=== added file 'pantheon-files-daemon/ProgressHandlerQuicklistInterface.vala'
--- pantheon-files-daemon/ProgressHandlerQuicklistInterface.vala	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/ProgressHandlerQuicklistInterface.vala	2017-01-14 12:39:17 +0000
@@ -0,0 +1,31 @@
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+namespace Marlin {
+    [DBus (name = "org.pantheon.files.ql")]
+    public interface ProgressHandlerQuicklistInterface : Object {
+        public signal void cancel_all_infos ();
+        public signal void show_dialog ();
+        public signal void show_error_message (string msg); /* For debugging use */
+
+        public abstract bool build_unity_quicklist () throws IOError;
+        public abstract void update_unity_launcher_entries (bool infos_active, bool info_cancelled) throws IOError;
+        public abstract void progress_changed (double progress) throws IOError;
+        public abstract void initialize () throws IOError;
+    }
+}

=== renamed file 'src/QuicklistHandler.vala' => 'pantheon-files-daemon/QuicklistHandler.vala'
--- src/QuicklistHandler.vala	2016-06-18 11:25:11 +0000
+++ pantheon-files-daemon/QuicklistHandler.vala	2017-01-14 12:39:17 +0000
@@ -13,6 +13,9 @@
 
     You should have received a copy of the GNU General Public License along
     with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors: Julián Unrrein <[e-mail]>
+             Jeremy Wootten <[e-mail]>
 ***/
 
 namespace Marlin {
@@ -23,27 +26,24 @@
         public List<Dbusmenu.Menuitem> progress_quicklists = null;
     }
 
-    private QuicklistHandler quicklisthandler_singleton = null;
-
-    public class QuicklistHandler : Object {
-
-        public List<Marlin.LauncherEntry> launcher_entries = null;
-
-        private QuicklistHandler () {
-            this.entry_add (Marlin.APP_DESKTOP);
-
-            if (this.launcher_entries.length () == 0) {
-                error ("Couldn't find a valid Unity launcher entry.");
-            } else {
-                var bookmarks = Marlin.BookmarkList.get_instance ();
-
-                bookmarks.contents_changed.connect (() => {
-                    debug ("Refreshing Unity dynamic bookmarks.");
-                    this.remove_bookmark_quicklists ();
-                    this.load_bookmarks (bookmarks);
-                });
-            }
+    [DBus (name = "org.pantheon.files.ql")]
+    public class QuicklistHandler : Object, ProgressHandlerQuicklistInterface {
+
+        private enum State {
+            UNINITIALIZED,
+            LOADING,
+            LOADED
         }
+        /* NOTE This runs as a daemon and is started, if necessary, by DBus.  Any warning messages
+         * produced by it therefore would not normally appear in the terminal.  Use "show_error_message"
+         * signal to produce notifications */
+
+        private static QuicklistHandler quicklisthandler_singleton = null;
+        private GLib.List<string> bookmark_list = null;
+        private State state = State.UNINITIALIZED;
+        public List<Marlin.LauncherEntry> launcher_entries;
+        private GLib.File? bookmarks_file = null;
+        private GLib.FileMonitor? bookmarks_monitor = null;
 
         public static unowned QuicklistHandler get_singleton () {
             if (quicklisthandler_singleton == null)
@@ -52,18 +52,80 @@
             return quicklisthandler_singleton;
         }
 
+        public void initialize () {
+            if (state != State.UNINITIALIZED) {
+                return;
+            }
+            state = State.LOADING;
+            foreach (var marlin_lentry in launcher_entries) {
+                marlin_lentry.entry.quicklist = null;
+                marlin_lentry.bookmark_quicklists = null;
+                marlin_lentry.progress_quicklists = null;
+            }
+            launcher_entries = null;
+
+            this.entry_add (Marlin.APP_DESKTOP);
+
+            load_bookmarks_file_async ();
+        }
+
+        private QuicklistHandler () {
+            string filename = GLib.Path.build_filename (GLib.Environment.get_user_config_dir (),
+                                                        "gtk-3.0",
+                                                        "bookmarks",
+                                                        null);
+
+            var file = GLib.File.new_for_path (filename);
+            if (file.query_exists (null)) {
+                bookmarks_file = file;
+                try {
+                    bookmarks_monitor = bookmarks_file.monitor (GLib.FileMonitorFlags.SEND_MOVED, null);
+                    bookmarks_monitor.set_rate_limit (1000);
+                    bookmarks_monitor.changed.connect (on_bookmarks_file_changed);
+                }
+                catch (GLib.Error error) {} 
+            }
+        }
+
+        private void load_bookmarks_file_async () {
+            if (bookmarks_file == null) {
+                state = State.LOADED;
+                return;
+            }
+            state = State.LOADED;
+            bookmarks_file.load_contents_async.begin (null, (obj, res) => {
+                try {
+                    uint8[] contents;
+                    bookmarks_file.load_contents_async.end (res, out contents, null);
+                    if (contents != null) {
+                        bookmark_list_from_string ((string)contents);
+                        load_bookmarks ();
+                    }
+                }
+                catch (GLib.Error error) {}
+            });
+        }
+
+        private void bookmark_list_from_string (string contents) {
+            string [] lines = contents.split ("\n");
+            foreach (string line in lines) {
+                if (line[0] == '\0' || line[0] == ' ') {
+                    continue; /* ignore blank lines */
+                }
+                /* Keep both the full uri and the custom label (if any) */
+                bookmark_list.append (line);
+            }
+        }
+
         private void entry_add (string entry_id) {
             var unity_lentry = Unity.LauncherEntry.get_for_desktop_id (entry_id);
-
             if (unity_lentry != null) {
                 var marlin_lentry = new Marlin.LauncherEntry ();
                 marlin_lentry.entry = unity_lentry;
 
                 this.launcher_entries.prepend (marlin_lentry);
-
                 /* Ensure dynamic quicklist exists */
                 Dbusmenu.Menuitem ql = unity_lentry.quicklist;
-
                 if (ql == null) {
                     ql = new Dbusmenu.Menuitem ();
                     unity_lentry.quicklist = ql;
@@ -76,42 +138,154 @@
                 var unity_lentry = marlin_lentry.entry;
                 Dbusmenu.Menuitem ql = unity_lentry.quicklist;
 
-                if (ql == null)
-                    break;
-
-                foreach (var menuitem in marlin_lentry.bookmark_quicklists) {
-                    ql.child_delete (menuitem);
+                if (ql != null) {
+                    foreach (var menuitem in marlin_lentry.bookmark_quicklists) {
+                        ql.child_delete (menuitem);
+                    }
                 }
 
                 marlin_lentry.bookmark_quicklists = null;
+                bookmark_list = null;
             }
         }
 
-        private void load_bookmarks (Marlin.BookmarkList bookmarks) {
-            var bookmark_count = bookmarks.length ();
-
-            for (int index = 0; index < bookmark_count; index++) {
-                var bookmark = bookmarks.item_at (index);
-
-                if (bookmark.uri_known_not_to_exist ())
-                    continue;
-
+        private void load_bookmarks () {
+            int index = -1;
+            foreach (string line in bookmark_list) {
+                string [] parts = line.split (" ", 2);
+                /* First part is full uri and second part is the custom label */
+                GLib.List<GLib.File> files = null;
+                GLib.File file = GLib.File.new_for_uri (parts[0]);
+                files.append (file);
+                string label = parts.length > 1 ? parts[1] : file.get_basename ();
+                index++;
                 foreach (var marlin_lentry in this.launcher_entries) {
                     var unity_lentry = marlin_lentry.entry;
                     Dbusmenu.Menuitem ql = unity_lentry.quicklist;
                     var menuitem = new Dbusmenu.Menuitem ();
-
-                    menuitem.property_set ("label", bookmark.label);
+                    menuitem.property_set (Dbusmenu.MENUITEM_PROP_TYPE,
+                                           Dbusmenu.CLIENT_TYPES_DEFAULT);
+                    menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                           label);
                     menuitem.item_activated.connect (() => {
-                        var location = bookmark.get_location ();
-                        Marlin.Application.get ().create_window (location);
+                        try {
+                            var launcher = GLib.AppInfo.create_from_commandline ("pantheon-files",
+                                                                                 null,
+                                                                                 GLib.AppInfoCreateFlags.SUPPORTS_URIS);
+                            launcher.launch (files, null);
+                        } catch (GLib.Error e) {}
                     });
 
                     ql.child_add_position (menuitem, index);
                     marlin_lentry.bookmark_quicklists.prepend (menuitem);
                 }
             }
-        }
-
+            state = State.LOADED;
+        }
+
+        private void on_bookmarks_file_changed (GLib.File file, GLib.File? other_file, GLib.FileMonitorEvent event_type) {
+            if (event_type != FileMonitorEvent.CREATED || state == State.LOADING) {
+                return;
+            }
+
+            state = State.LOADING;
+            remove_bookmark_quicklists ();
+
+            load_bookmarks_file_async ();
+        }
+
+        public bool build_unity_quicklist () {
+            /* Create menu items for the quicklist */
+            foreach (var marlin_lentry in this.launcher_entries) {
+                if (marlin_lentry.progress_quicklists != null) {
+                    continue;
+                }
+                /* Separator between bookmarks and progress items */
+                var separator = new Dbusmenu.Menuitem ();
+
+                separator.property_set (Dbusmenu.MENUITEM_PROP_TYPE,
+                                        Dbusmenu.CLIENT_TYPES_SEPARATOR);
+                separator.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                        "Progress items separator");
+                marlin_lentry.progress_quicklists.append (separator);
+
+#if 0           /* Now use popover but keep possibility of showing a dialog when Files window is closed */
+                /* "Show progress window" menu item */
+                var show_menuitem = new Dbusmenu.Menuitem ();
+
+                show_menuitem.property_set (Dbusmenu.MENUITEM_PROP_TYPE,
+                                            Dbusmenu.CLIENT_TYPES_DEFAULT);
+                show_menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                            _("Show Copy Dialog"));
+
+                show_menuitem.item_activated.connect (() => {
+                    show_dialog ();
+                });
+
+                marlin_lentry.progress_quicklists.append (show_menuitem);
+
+                /* "Cancel in-progress operations" menu item */
+#endif
+                var cancel_menuitem = new Dbusmenu.Menuitem ();
+
+                cancel_menuitem.property_set (Dbusmenu.MENUITEM_PROP_TYPE,
+                                              Dbusmenu.CLIENT_TYPES_DEFAULT);
+                cancel_menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                              _("Cancel All In-progress Actions"));
+
+                cancel_menuitem.item_activated.connect (() => {
+                    cancel_all_infos ();
+                });
+
+                marlin_lentry.progress_quicklists.append (cancel_menuitem);
+            }
+
+            return this.launcher_entries.length () > 0;
+        }
+
+        public void update_unity_launcher_entries (bool infos_active, bool info_cancelled) {
+            foreach (var marlin_lentry in this.launcher_entries) {
+                Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
+
+                if (infos_active) {
+                    unity_lentry.progress_visible = true;
+                    show_progress_quicklist (marlin_lentry, true);
+                } else {
+                    unity_lentry.progress_visible = false;
+                    unity_lentry.progress = 0.0;
+                    show_progress_quicklist (marlin_lentry, false);
+                    if (info_cancelled) {
+                        unity_lentry.urgent = true;
+
+                        Timeout.add_seconds (2, () => {
+                            unity_lentry.urgent = false;
+                            return false;
+                        });
+                    }
+                }
+            }
+        }
+
+        private void show_progress_quicklist (Marlin.LauncherEntry marlin_lentry, bool show) {
+            Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
+            Dbusmenu.Menuitem quicklist = unity_lentry.quicklist;
+
+            foreach (Dbusmenu.Menuitem menuitem in marlin_lentry.progress_quicklists) {
+                if (show) {
+                    if (menuitem.get_parent () == null) {
+                        quicklist.child_add_position (menuitem, -1);
+                    }
+                } else {
+                    quicklist.child_delete (menuitem);
+                }
+            }
+        }
+
+        public void progress_changed (double progress) {
+            foreach (Marlin.LauncherEntry marlin_lentry in this.launcher_entries) {
+                Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
+                unity_lentry.progress = progress;
+            }
+        }
     }
 }

=== added file 'pantheon-files-daemon/main.vala'
--- pantheon-files-daemon/main.vala	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/main.vala	2017-01-14 12:39:17 +0000
@@ -0,0 +1,68 @@
+/* -*- Mode: C; indent-tabs-mode: s; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * Copyright (C) 2010 Jordi Puigdellívol <[e-mail]>
+ * Copyright (C) 2015 Elementary Developers
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * version 3.0 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3.0 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Jordi Puigdellívol <[e-mail]>
+ *          ammonkey <[e-mail]>
+ *          Jeremy Wootten <[e-mail]>
+*/
+
+
+    void on_bus_aquired (DBusConnection conn, string n) {
+        try {
+            string name = "/org/pantheon/files/db";
+            var object = new MarlinTags ();
+            conn.register_object (name, object);
+            message ("MarlinTags object registered with dbus connection name %s", name);
+        } catch (IOError e) {
+            error ("Could not register service");
+        }
+    }
+    void on_ql_bus_aquired (DBusConnection conn) {
+        uint conn_id = 0;
+            try {
+                string name = "/org/pantheon/files/ql";
+                Marlin.ProgressHandlerQuicklistInterface object = Marlin.QuicklistHandler.get_singleton ();
+                conn_id = conn.register_object (name, object);
+                message ("QuicklistHandler object registered with dbus connection name %s", name);
+                object.initialize ();
+            } catch (IOError e) {
+                error ("Could not register service");
+            }
+    }
+
+    // Exit C function to quit the loop
+    extern void exit (int exit_code);
+
+    void on_name_lost (DBusConnection connection, string name) {
+        critical ("Name %s was not acquired", name);
+        exit (-1);
+    }
+
+    void main () {
+        Bus.own_name (BusType.SESSION, "org.pantheon.files.db", BusNameOwnerFlags.NONE,
+                      on_bus_aquired,
+                      () => {},
+                      on_name_lost);
+
+        Bus.own_name (BusType.SESSION, "org.pantheon.files.ql", BusNameOwnerFlags.NONE,
+                      on_ql_bus_aquired,
+                      () => {},
+                      on_name_lost);
+
+        new MainLoop ().run ();
+    }

=== modified file 'pantheon-files-daemon/marlind-tagging.vala'
--- pantheon-files-daemon/marlind-tagging.vala	2016-06-18 11:25:11 +0000
+++ pantheon-files-daemon/marlind-tagging.vala	2017-01-14 12:39:17 +0000
@@ -113,14 +113,12 @@
         var uri = escape(raw_uri);
 
         var sql = "INSERT OR REPLACE INTO tags (uri,content_type,modified_time) VALUES ('"+uri+"','"+content_type+"',"+modified_time.to_string()+");\n";
-        //var c = "INSERT OR IGNORE INTO tags (uri,content_type,modified_time) VALUES ('"+uri+"','"+content_type+"',"+modified_time.to_string()+");\n";
 
         int rc = db.exec (sql, null, null);
         if (rc != Sqlite.OK) {
             stderr.printf ("[record_uri: SQL error]  %d, %s\n", rc, db.errmsg ());
             return false;
         }
-        //stdout.printf("[Consult]: %s\n",c);
 
         return true;
     }
@@ -143,7 +141,6 @@
             stderr.printf ("[record_uri: SQL error]  %d, %s\n", rc, db.errmsg ());
             return false;
         }
-        //stdout.printf("[Consult]: %s\n",sql);
 
         return true;
     }
@@ -163,7 +160,6 @@
                                 -1, out stmt);
         assert (rc == Sqlite.OK);
         rc = stmt.step();
-
         vb.open (new VariantType ("as"));
 
         switch (rc) {
@@ -209,7 +205,6 @@
             case Sqlite.ROW:
                 for (col = 0; col < cols; col++) {
                     txt = stmt.column_text(col);
-                    //print ("%s = %s\n", stmt.column_name (col), txt);
                 }
                 break;
             default:
@@ -217,7 +212,6 @@
                 break;
             }
         } while (rc == Sqlite.ROW);
-        //stdout.printf("[getColor]: %s\n", txt);
 
         int ret = int.parse(txt);
         /* It appears that a db error return -1, we got to check the value just in case */
@@ -309,9 +303,6 @@
     }
 
     private void upgrade_database () {
-
-        // version 2
-
         if (!has_column("tags", "content_type")) {
             message("upgrade_database: adding content_type column to tags");
             if (!add_column("tags", "content_type", "TEXT"))
@@ -329,52 +320,3 @@
         }
     }
 }
-
-/* =============== Main ==================== */
-/*void main (string[] args) {
-
-  MarlinTags t = new MarlinTags();
-
-  t.openMarlinDB();
-
-  t.setColor("file:///home/jordi"	,MARLIN_RED);
-  t.setColor("file:///home/dev"	,MARLIN_YELLOW);
-
-//t.deleteEntry(File.new_for_path ("/home/dev"));	//When deleting files
-//t.deleteEntry("/home/documents");
-
-//t.clearDB();
-t.showTable("tags");
-
-
-// DBUS Things
-print("\n\nColor for file is %i\n",
-t.getColor("file:///home/jordi"));
-}*/
-
-
-void on_bus_aquired (DBusConnection conn) {
-    try {
-        conn.register_object ("/org/pantheon/files/db", new MarlinTags ());
-    } catch (IOError e) {
-        error ("Could not register service");
-    }
-}
-
-// Exit C function to quit the loop
-extern void exit (int exit_code);
-
-void on_bus_lost (DBusConnection connection, string name) {
-    critical ("Could not aquire name.");
-    exit (-1);
-}
-
-void main () {
-    Bus.own_name (BusType.SESSION, "org.pantheon.files.db", BusNameOwnerFlags.NONE,
-                  on_bus_aquired,
-                  () => {},
-                  on_bus_lost);
-
-    new MainLoop ().run ();
-}
-

=== added file 'pantheon-files-daemon/pantheon-files-daemon.vapi'
--- pantheon-files-daemon/pantheon-files-daemon.vapi	1970-01-01 00:00:00 +0000
+++ pantheon-files-daemon/pantheon-files-daemon.vapi	2017-01-14 12:39:17 +0000
@@ -0,0 +1,28 @@
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+[DBus (name = "org.pantheon.files.ql")]
+interface ProgressHandlerQuicklistInterface : Object {
+    public signal void cancel_all_infos ();
+    public signal void show_dialog ();
+
+    public abstract async bool build_unity_quicklist () throws IOError;
+    public abstract async void update_unity_launcher_entries (bool infos_active, bool info_cancelled) throws IOError;
+    public abstract async void progress_changed (double progress) throws IOError;
+
+}

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-12-31 19:42:09 +0000
+++ src/Application.vala	2017-01-14 12:39:17 +0000
@@ -26,10 +26,11 @@
 public class Marlin.Application : Granite.Application {
 
     private VolumeMonitor volume_monitor;
-    private Marlin.Progress.UIHandler progress_handler;
+    public Marlin.Progress.UIHandler progress_handler {get; private set;}
     private Marlin.ClipboardManager clipboard;
     private Marlin.Thumbnailer thumbnailer;
     private Gtk.RecentManager recent;
+    private double current_progress = 0.0;
 
     private const int MARLIN_ACCEL_MAP_SAVE_DELAY = 15;
     private const uint MAX_WINDOWS = 25;
@@ -88,12 +89,15 @@
             Marlin.IconInfo.clear_caches ();
         });
 
-        progress_handler = new Marlin.Progress.UIHandler (this);
-
         this.clipboard = Marlin.ClipboardManager.get_for_display ();
         this.thumbnailer = Marlin.Thumbnailer.get ();
         this.recent = new Gtk.RecentManager ();
 
+        progress_handler = new Marlin.Progress.UIHandler (this);
+        progress_handler.new_progress_info.connect (on_uihandler_new_progress_info);
+        progress_handler.show_progress.connect (on_uihandler_show_progress);
+        progress_handler.overall_progress_changed.connect (on_uihandler_overall_progress_changed);
+        progress_handler.completed.connect (on_uihandler_completed);
         plugins = new Marlin.PluginManager (Config.PLUGIN_DIR);
 
         /**TODO** move the volume manager here? */
@@ -102,12 +106,27 @@
         this.volume_monitor = VolumeMonitor.get ();
         this.volume_monitor.mount_removed.connect (mount_removed_callback);
 
-#if HAVE_UNITY
-        QuicklistHandler.get_singleton ();
-#endif
-
         window_count = 0;
-        this.window_added.connect_after (() => {window_count++;});
+        this.window_added.connect ((w) => {
+            window_count++;
+            if (progress_handler.get_active_info_count () > 0) {
+                /* Files window may previously have been closed, or a new window added with
+                 * file operations ongoing.  In this case, we need to show the progress indicator
+                 * in the header bar. 
+                 */ 
+                Timeout.add (200, () => {
+                    /* Allow time for the top menu to be realized */
+                    var win = (Marlin.View.Window)w;
+                    foreach (Marlin.Progress.Info info in progress_handler.get_active_info_list ()) {
+                        win.add_progress_info (info);
+                    }
+                    win.show_progress (true);
+                    win.overall_progress_changed (current_progress);
+                    return false;
+                });
+            }
+        });
+
         this.window_removed.connect (() => {
             window_count--;
         });
@@ -222,8 +241,9 @@
 
     public new void quit () {
         /* Protect against holding Ctrl-Q down */
-        if (quitting)
+        if (quitting) {
             return;
+        }
 
         quitting = true;
         unowned List<Gtk.Window> window_list = this.get_windows ();
@@ -248,6 +268,34 @@
         }
     }
 
+    private void on_uihandler_new_progress_info (Marlin.Progress.Info info) {
+        /* Notify each window */
+        foreach (var window in this.get_windows ()) {
+            ((Marlin.View.Window)window).add_progress_info (info);
+        }
+    }
+
+    private void on_uihandler_show_progress (bool show) {
+        /* Notify each window */
+        foreach (var window in this.get_windows ()) {
+            ((Marlin.View.Window)window).show_progress (show);
+        }
+    }
+
+    private void on_uihandler_overall_progress_changed (double progress) {
+        /* Notify each window */
+        foreach (var window in this.get_windows ()) {
+            ((Marlin.View.Window)window).overall_progress_changed (progress);
+        }
+        current_progress = progress;
+    }
+
+    private void on_uihandler_completed () {
+        if (get_windows () != null) {
+            current_progress = 0.0;
+        }
+    }
+
     private void init_schemas () {
         /* GSettings parameters */
         Preferences.settings = new Settings ("org.pantheon.files.preferences");

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-12-27 18:19:20 +0000
+++ src/CMakeLists.txt	2017-01-14 12:39:17 +0000
@@ -58,14 +58,8 @@
   set (PLANK_OPTIONS --define=HAVE_PLANK_0_11)
 endif ()
 
-set (CFLAGS
-    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
-)
-
-set (LIB_PATHS
-    ${DEPS_LIBRARY_DIRS}
-)
-
+set (CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
+set (LIB_PATHS ${DEPS_LIBRARY_DIRS})
 link_directories (${LIB_PATHS})
 add_definitions (${CFLAGS} -O2)
 
@@ -77,7 +71,6 @@
         marlin-deep-count.vala
         ProgressUIHandler.vala
         TextRenderer.vala
-        QuicklistHandler.vala
         ClipboardManager.vala
         Dialogs/AbstractPropertiesDialog.vala
         Dialogs/ChooseAppDialog.vala
@@ -98,6 +91,7 @@
         View/Sidebar.vala
         View/Slot.vala
         View/Miller.vala
+        ${CMAKE_SOURCE_DIR}/pantheon-files-daemon/ProgressHandlerQuicklistInterface.vala
         View/Widgets/AbstractEditableLabel.vala
         View/Widgets/BreadcrumbsEntry.vala
         View/Widgets/DiskRenderer.vala
@@ -106,10 +100,11 @@
         View/Widgets/MultiLineEditableLabel.vala
         View/Widgets/OverlayBar.vala
         View/Widgets/PermissionButton.vala
-        View/Widgets/ProgressInfoWidget.vala
         View/Widgets/SingleLineEditableLabel.vala
         View/Widgets/TopMenu.vala
-
+        View/Widgets/ProgressIndicator.vala
+        View/Widgets/ProgressIndicatorWithPopover.vala
+        View/Widgets/ProgressInfoListRow.vala
     PACKAGES
         gtk+-3.0
         gio-2.0
@@ -162,6 +157,7 @@
         View/Sidebar.vala
         View/Slot.vala
         View/Miller.vala
+        ${CMAKE_SOURCE_DIR}/pantheon-files-daemon/ProgressHandlerQuicklistInterface.vala
         View/Widgets/AbstractEditableLabel.vala
         View/Widgets/BreadcrumbsEntry.vala
         View/Widgets/DiskRenderer.vala
@@ -170,10 +166,11 @@
         View/Widgets/MultiLineEditableLabel.vala
         View/Widgets/OverlayBar.vala
         View/Widgets/PermissionButton.vala
-        View/Widgets/ProgressInfoWidget.vala
         View/Widgets/SingleLineEditableLabel.vala
         View/Widgets/TopMenu.vala
-
+        View/Widgets/ProgressIndicator.vala
+        View/Widgets/ProgressIndicatorWithPopover.vala
+        View/Widgets/ProgressInfoListRow.vala
     PACKAGES
         gtk+-3.0
         gio-2.0

=== modified file 'src/ProgressUIHandler.vala'
--- src/ProgressUIHandler.vala	2016-12-18 22:01:14 +0000
+++ src/ProgressUIHandler.vala	2017-01-14 12:39:17 +0000
@@ -20,27 +20,47 @@
              Jeremy Wootten <[e-mail]>
 ***/
 
-/*** One instance of this class is owned by the application and handles UI for file transfers initiated by
- *   of the app windows.  Feedback is provided by a dialog window which appears if a transfer takes longer than
- *   approximately 1 second. The unity launcher is also updated if present and a notification is sent of the
- *   completion of the operation unless it was cancelled by the user. 
-***/ 
+/** This class controls the UI relating to file operations in progress (Unity launchers, notifications and signals
+ *  to progress indicators) but does not itself display any widgets. Displayed widgets are in libwidgets.
+ *  **/
 public class Marlin.Progress.UIHandler : Object {
-
     private Marlin.Progress.InfoManager manager = null;
-#if HAVE_UNITY
-    private Marlin.QuicklistHandler quicklist_handler = null;
-#endif
-    private Gtk.Dialog progress_window = null;
-    private Gtk.Widget window_vbox = null;
+    private ProgressHandlerQuicklistInterface qldaemon;
+    private Marlin.Application application;
+
     private uint active_infos = 0;
-
-    private Marlin.Application application;
+    private bool updating_overall_progress = false;
+
+    private const string ACTION_DETAILS = "details";
+    private const string TITLE = _("File Manager Operations");
+    private const string ICON_NAME = "system-file-manager";
+    private const int ICON_SIZE = 64;
+    private const string CANCELLED_ICON_NAME = "dialog-warning";
+
+    public signal void overall_progress_changed (double progress);
+    public signal void show_progress (bool show);
+    public signal void new_progress_info (Marlin.Progress.Info info);
+    public signal void completed ();
 
     public UIHandler (Marlin.Application app) {
         this.manager = new Marlin.Progress.InfoManager ();
         this.application = app;
 
+        try {
+            qldaemon = Bus.get_proxy_sync (BusType.SESSION, "org.pantheon.files.ql",
+                                           "/org/pantheon/files/ql");
+            qldaemon.cancel_all_infos.connect (() => {
+                cancel_all ();
+            });
+
+            qldaemon.show_error_message.connect (show_daemon_notification);
+
+            qldaemon.initialize ();
+
+        } catch (IOError e) {
+            stderr.printf ("%s\n", e.message);
+        }
+
         manager.new_progress_info.connect ((info) => {
             info.started.connect (progress_info_started_cb);
         });
@@ -72,27 +92,25 @@
     private void progress_info_started_cb (Marlin.Progress.Info info) {
         application.hold ();
 
-        if (info == null || !(info is Marlin.Progress.Info) ||
-            info.get_is_finished () || info.get_cancellable ().is_cancelled ()) {
-
-            return;
-        }
-
-        this.active_infos++;
-        info.finished.connect (progress_info_finished_cb);
-
-        var operation_running = false;
+        info.finished.connect (() => {
+            debug ("Release application");
+            application.release ();
+        });
+
+        bool operation_running = false;
+        /* Do not create progress info widget until operation has been running for at least 1 seconds
+         * not including time while paused.
+         */  
         Timeout.add_full (GLib.Priority.LOW, 500, () => {
             if (info == null || !(info is Marlin.Progress.Info) ||
                 info.get_is_finished () || info.get_cancellable ().is_cancelled ()) {
 
                 return false;
             }
-
             if (info.get_is_paused ()) {
                 return true;
             } else if (operation_running && !info.get_is_finished ()) {
-                add_progress_info_to_window (info);
+                handle_new_progress_info (info);
                 return false;
             } else {
                 operation_running = true;
@@ -101,13 +119,13 @@
         });
     }
 
-    private void add_progress_info_to_window (Marlin.Progress.Info info) {
-        if (this.active_infos == 1) {
-            /* This is the only active operation, present the window */
-            add_to_window (info);
-            (this.progress_window as Gtk.Window).present ();
-        } else if (this.progress_window.visible) {
-                add_to_window (info);
+    private void handle_new_progress_info (Marlin.Progress.Info info) {
+        this.active_infos++;
+        info.finished.connect (progress_info_finished_cb);
+        new_progress_info (info);
+
+        if (this.active_infos > 0) {
+            show_progress (true);
         }
 
 #if HAVE_UNITY
@@ -115,46 +133,7 @@
 #endif
     }
 
-    private void add_to_window (Marlin.Progress.Info info) {
-        ensure_window ();
-
-        var progress_widget = new Marlin.Progress.InfoWidget (info);
-        (this.window_vbox as Gtk.Box).pack_start (progress_widget, false, false, 6);
-
-        progress_widget.show ();
-        if (this.progress_window.visible) {
-            (this.progress_window as Gtk.Window).present ();
-        }
-    }
-
-    private void ensure_window () {
-        if (this.progress_window == null) {
-            /* This provides an undeletable, unminimisable window in which to show the info widgets */
-            this.progress_window = new Gtk.Dialog ();
-            this.progress_window.resizable = false;
-            this.progress_window.deletable = false;
-            this.progress_window.title = _("File Operations");
-            this.progress_window.set_wmclass ("file_progress", "Marlin");
-            this.progress_window.icon_name = "system-file-manager";
-
-            this.window_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
-
-            this.progress_window.get_content_area ().set_border_width (10);
-            this.progress_window.get_content_area ().add (this.window_vbox);
-            this.window_vbox.show ();
-
-            this.progress_window.delete_event.connect ((widget, event) => {
-                widget.hide ();
-                return true;
-            });
-        }
-
-        progress_window.set_transient_for (application.get_active_window ());
-    }
-
     private void progress_info_finished_cb (Marlin.Progress.Info info) {
-        application.release ();
-
         if (active_infos > 0) {
             this.active_infos--;
             /* Only notify if application is not focussed. Add a delay
@@ -172,23 +151,26 @@
         } else {
             warning ("Attempt to decrement zero active infos");
         }
-        /* For rapid file transfers this can get called before progress window was been created */
-        if (active_infos < 1 && progress_window != null && progress_window.visible) {
-            (this.progress_window as Gtk.Window).hide ();
+
+        if (active_infos < 1) {
+            show_progress (false);
         }
 #if HAVE_UNITY
         update_unity_launcher (info, false);
 #endif
+        show_operation_complete_notification (info, active_infos < 1);
     }
 
     private void show_operation_complete_notification (Marlin.Progress.Info info, bool all_finished) {
+        /* Some operations may have been cancelled or not successful */
+        string result;
         if (info.get_cancellable ().is_cancelled ()) {
             return; /* No notification of cancellation action required */
+        } else {
+            /* TRANSLATORS: %s will be replaced by the title of the file operation */
+            result = (_("Completed %s")).printf (info.get_title ());
         }
 
-        /// TRANSLATORS: %s will be replaced by the title of the file operation
-        var result = (_("Completed %s")).printf (info.get_title ());
-
         if (all_finished) {
             result = result + "\n" + _("All file operations have ended");
         }
@@ -199,101 +181,48 @@
         application.send_notification ("Pantheon Files Operation", complete_notification);
     }
 
+    private void show_daemon_notification (string msg) {
+        var notification = new GLib.Notification (_("QuicklistHandler message"));
+        notification.set_body (msg);
+        notification.set_icon (new GLib.ThemedIcon (Marlin.ICON_APP_LOGO));
+        application.send_notification ("Pantheon Files Operation", notification);
+    }
+
 #if HAVE_UNITY
     private void update_unity_launcher (Marlin.Progress.Info info,
                                         bool added) {
 
-        if (this.quicklist_handler == null) {
-            this.quicklist_handler = QuicklistHandler.get_singleton ();
-
-            if (this.quicklist_handler == null)
-                return;
-
-            build_unity_quicklist ();
-        }
-
-        foreach (var marlin_lentry in this.quicklist_handler.launcher_entries)
-            update_unity_launcher_entry (info, marlin_lentry);
-
-        if (added)
-            info.progress_changed.connect (unity_progress_changed);
-    }
-
-    private void build_unity_quicklist () {
-        /* Create menu items for the quicklist */
-        foreach (var marlin_lentry in this.quicklist_handler.launcher_entries) {
-            /* Separator between bookmarks and progress items */
-            var separator = new Dbusmenu.Menuitem ();
-
-            separator.property_set (Dbusmenu.MENUITEM_PROP_TYPE,
-                                    Dbusmenu.CLIENT_TYPES_SEPARATOR);
-            separator.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
-                                    "Progress items separator");
-            marlin_lentry.progress_quicklists.append (separator);
-
-            /* "Show progress window" menu item */
-            var show_menuitem = new Dbusmenu.Menuitem ();
-
-            show_menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
-                                        _("Show Copy Dialog"));
-
-            show_menuitem.item_activated.connect (() => {
-                (this.progress_window as Gtk.Window).present ();
-            });
-
-            marlin_lentry.progress_quicklists.append (show_menuitem);
-
-            /* "Cancel in-progress operations" menu item */
-            var cancel_menuitem = new Dbusmenu.Menuitem ();
-
-            cancel_menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
-                                          _("Cancel All In-progress Actions"));
-
-            cancel_menuitem.item_activated.connect (() => {
-                unowned List<Marlin.Progress.Info> infos = this.manager.get_all_infos ();
-
-                foreach (var info in infos)
-                    info.cancel ();
-            });
-
-            marlin_lentry.progress_quicklists.append (cancel_menuitem);
-        }
-    }
-
-    private void update_unity_launcher_entry (Marlin.Progress.Info info,
-                                              Marlin.LauncherEntry marlin_lentry) {
-        Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
-
-        if (this.active_infos > 0) {
-            unity_lentry.progress_visible = true;
-            unity_progress_changed ();
-            show_unity_quicklist (marlin_lentry, true);
-        } else {
-            unity_lentry.progress_visible = false;
-            unity_lentry.progress = 0.0;
-            show_unity_quicklist (marlin_lentry, false);
-        }
-    }
-
-    private void show_unity_quicklist (Marlin.LauncherEntry marlin_lentry,
-                                       bool show) {
-
-        Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
-        Dbusmenu.Menuitem quicklist = unity_lentry.quicklist;
-
-        foreach (Dbusmenu.Menuitem menuitem in marlin_lentry.progress_quicklists) {
-            var parent = menuitem.get_parent ();
-            if (show) {
-                if (parent == null) {
-                    quicklist.child_add_position (menuitem, -1);
+        if (this.qldaemon == null) {
+            return;
+        }
+
+        /* Active_infos has already been decremented when info is finished or cancelled,
+         * or incremented when info has been added */
+        try {
+            if (qldaemon.build_unity_quicklist ()) {
+                qldaemon.update_unity_launcher_entries (this.active_infos > 0,
+                                                        info.get_cancellable ().is_cancelled ());
+                if (active_infos > 0) {
+                    update_overall_progress ();
                 }
-            } else if (parent != null && parent == quicklist) {
-                quicklist.child_delete (menuitem);
             }
+        } catch (IOError e) {
+            warning ("ProgressUIHandler unable to create quicklist - %s", e.message);
+        }
+
+        if (added) {
+            info.progress_changed.connect (update_overall_progress);
         }
     }
-
-    private void unity_progress_changed () {
+#endif
+
+    private void update_overall_progress () {
+        /* Prevent re-entry */
+        if (updating_overall_progress) {
+            return;
+        }
+        updating_overall_progress = true;
+
         double progress = 0;
         double current = 0;
         double total = 0;
@@ -319,11 +248,20 @@
         if (progress > 1.0)
             progress = 1.0;
 
-        foreach (Marlin.LauncherEntry marlin_lentry in this.quicklist_handler.launcher_entries) {
-            Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
-            unity_lentry.progress = progress;
+        overall_progress_changed (progress);
+
+        /* Unity launcher shows a single progress bar which shows the overall progress of all the
+         * active file operations.
+         */  
+
+#if HAVE_UNITY
+        try {
+            qldaemon.progress_changed (progress);
+        } catch (GLib.IOError e) {
+            warning ("ProgressUIHandler unable to update Unity Launcher progress - %s", e.message);
         }
+#endif
+
+        updating_overall_progress = false;
     }
-#endif
-
 }

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2016-09-21 18:27:17 +0000
+++ src/View/Slot.vala	2017-01-14 12:39:17 +0000
@@ -426,7 +426,7 @@
             }
 
             if (dir_view != null) {
-                dir_view.close ();
+                dir_view.close (); /* stop signal handlers running during destruction */
                 disconnect_dir_view_signals ();
             }
         }

=== added file 'src/View/Widgets/ProgressIndicator.vala'
--- src/View/Widgets/ProgressIndicator.vala	1970-01-01 00:00:00 +0000
+++ src/View/Widgets/ProgressIndicator.vala	2017-01-14 12:39:17 +0000
@@ -0,0 +1,105 @@
+/***
+    Copyright (C) 2015 ELementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+
+namespace Marlin.View.Chrome {
+    public class ProgressIndicator : Gtk.DrawingArea {
+        double fraction = 0.0;
+        double hole_fraction = 0.0;
+
+        public ProgressIndicator (int height) {
+            set_size_request (height ,height);
+            
+            draw.connect (on_draw);
+            show ();
+        }
+
+        public void set_fraction (double f) {
+            fraction = f.clamp (0.0, 1.0);
+            queue_draw ();
+        }
+
+        public void set_hole_fraction (double f) {
+            hole_fraction = f.clamp (0.0, 1.0);
+        }
+
+        public bool on_draw (Cairo.Context context) {
+            int height = get_allocated_height ();
+            int width = get_allocated_width ();
+
+            double xc = width / 2.0;
+            double yc = height / 2.0;
+
+            double outer_radius = yc - 1.0;
+
+            draw_doughnut (context, xc, yc, outer_radius);
+
+            return true;
+        }
+
+        private void draw_doughnut (Cairo.Context cr, double center_x, double center_y, double outer_radius) {
+
+                double hole_radius = outer_radius * hole_fraction;
+                double thickness = (outer_radius - hole_radius);
+                double middle_radius = hole_radius + thickness / 2.0; // middle radius
+
+                double angle1 = - Math.PI / 2.0; // 12 o'clock
+                double angle2 = angle1 + 2*Math.PI; // full circle
+                double angle3 = angle1 + 2 * Math.PI * fraction; // progress angle
+
+                Gdk.RGBA color = {};
+
+                cr.save ();
+
+                Cairo.Pattern pat;
+                /* Draw trough */
+                color = {0.96,0.96,0.96,1.0};  /* TODO Get color, gradient etc from gtk.css */
+                var shade1 = 0.9;
+                var shade2 = 1.0;
+                pat = new Cairo.Pattern.linear (0.0, 0.0, 0.0, 2 * center_y);
+                pat.add_color_stop_rgb (0.0, color.red * shade1, color.green * shade1, color.blue * shade1);
+                pat.add_color_stop_rgb (1.0, color.red * shade2, color.green * shade2, color.blue * shade2);
+                cr.set_source (pat);
+                cr.arc (center_x, center_y, middle_radius, angle1, angle2);
+                cr.set_line_width (thickness - 2.0);
+                cr.stroke ();
+
+
+                /* Draw progress */
+                color.parse ("#3d9bda");  /* TODO Get color, gradient etc from gtk.css */
+                shade1 = 1.3;
+                shade2 = 1.08;
+
+                pat = new Cairo.Pattern.linear (0.0, 0.0, 0.0, 2 * center_y);
+                pat.add_color_stop_rgb (0.0, 1.0, 1.0, 1.0);
+                pat.add_color_stop_rgb (0.1, color.red * shade1, color.green * shade1, color.blue * shade1);
+                pat.add_color_stop_rgb (1.0, color.red * shade2, color.green * shade2, color.blue * shade2);
+
+                cr.set_source (pat);
+                cr.arc (center_x, center_y, middle_radius, angle1, angle3);
+                cr.set_line_width (thickness);
+                cr.stroke ();
+
+                cr.restore ();
+
+        }
+    }
+
+
+    
+}

=== added file 'src/View/Widgets/ProgressIndicatorWithPopover.vala'
--- src/View/Widgets/ProgressIndicatorWithPopover.vala	1970-01-01 00:00:00 +0000
+++ src/View/Widgets/ProgressIndicatorWithPopover.vala	2017-01-14 12:39:17 +0000
@@ -0,0 +1,121 @@
+/***
+    Copyright (C) 2015 ELementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+
+namespace Marlin.View.Chrome {
+
+    public class ProgressIndicatorWithPopover : Gtk.EventBox {
+        ProgressIndicator progress_indicator;
+        Gtk.Popover popover;
+        Gtk.ListBox content_box;
+        GLib.Mutex info_count_mutex;
+
+        private uint _info_count = 0;
+        public uint info_count {
+            get {
+                return _info_count;
+            }
+            private set {
+                _info_count = value;
+                if (_info_count > 0) {
+                    string tip_format = ngettext (_("%u file operation in progress"), _("%u file operations in progress"), _info_count);
+                    set_tooltip_text (tip_format.printf (_info_count));
+                } else {
+                    set_tooltip_text (_("No operations in progress")); /* Should not be needed as widget hidden */
+                }
+            }
+        }
+
+        public ProgressIndicatorWithPopover () {
+            info_count_mutex = GLib.Mutex ();
+
+            progress_indicator = new ProgressIndicator (28);
+            progress_indicator.set_valign (Gtk.Align.CENTER);
+            progress_indicator.set_hole_fraction (0.4);
+
+            add (progress_indicator);
+
+            popover = new Gtk.Popover (progress_indicator);
+            popover.set_position (Gtk.PositionType.BOTTOM);
+
+            content_box = new Gtk.ListBox ();
+            content_box.margin_start = 6;
+            content_box.margin_end = 6;
+            content_box.margin_top = 6;
+            content_box.margin_bottom = 6;
+            popover.add (content_box);
+
+            connect_events ();
+
+            set_has_tooltip (true);
+            info_count = 0;
+        }
+
+        private void connect_events () {
+            set_events (Gdk.EventMask.BUTTON_PRESS_MASK);
+            button_press_event.connect (on_button_press_event);
+        }
+
+        private bool on_button_press_event () {
+            if (info_count > 0) {
+                popover.show_all ();
+            }
+            return true;
+        }
+
+        public void set_overall_progress (double progress) {
+            progress_indicator.set_fraction (progress);
+        }
+
+        public void add_progress_info (Marlin.Progress.Info info) {
+            var lbr = new Marlin.Progress.InfoListRow (info);
+            content_box.insert (lbr, -1);
+            
+            info_count_mutex.lock ();
+            info_count++;
+            info_count_mutex.unlock ();
+
+            info.finished.connect (() => {
+                content_box.remove (lbr);
+                lbr.destroy ();
+                info_count_mutex.lock ();
+                info_count--;
+                info_count_mutex.unlock ();
+            });
+        }
+
+        public void close () {
+            popover.hide ();
+            this.hide ();
+        }
+
+        public void hide_popover () {
+            popover.hide ();
+        }
+
+        public void open () {
+            assert (info_count > 0);
+            popover.hide ();
+            this.set_visible (true);
+        }
+
+        public void reset () {
+            progress_indicator.set_fraction (0.0);
+        }
+    }
+}

=== added file 'src/View/Widgets/ProgressInfoListRow.vala'
--- src/View/Widgets/ProgressInfoListRow.vala	1970-01-01 00:00:00 +0000
+++ src/View/Widgets/ProgressInfoListRow.vala	2017-01-14 12:39:17 +0000
@@ -0,0 +1,238 @@
+/***
+    Copyright (c) 2007, 2011 Red Hat, Inc.
+    Copyright (c) 2013-2017 elementary LLC (http://launchpad.net/elementary)
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors: Alexander Larsson <[e-mail]>
+             Cosimo Cecchi <[e-mail]>
+             Julián Unrrein <[e-mail]>
+***/
+public class Marlin.Progress.InfoListRow : Gtk.ListBoxRow {
+
+    private Marlin.Progress.Info info;
+
+    Gtk.Grid grid;
+    Gtk.Label status;
+    Gtk.Label details;
+    Gtk.ProgressBar progress_bar;
+    Gtk.Image progress_icon = null;
+    Gtk.Expander expander;
+    Gtk.TextView log;
+
+    private int previous_remaining_file_count;
+    private int remaining_file_count;
+    private int total_file_count;
+    private Marlin.FileOperationType operation = Marlin.FileOperationType.INVALID;
+    private string dest_dir = "";
+    private bool only_one_file = true;
+
+    public InfoListRow (Marlin.Progress.Info info) {
+        this.info = info;
+        this.set_selectable (false);
+        this.set_activatable (false);
+
+        operation = info.get_optype ();
+        dest_dir = PF.FileUtils.sanitize_path (info.get_destination_uri ());
+
+        total_file_count = info.get_total_file_count ();
+        only_one_file = total_file_count == 1;
+
+        remaining_file_count = total_file_count;
+        previous_remaining_file_count = total_file_count; /* Ensure first line of details output */
+
+        build_and_show_widget ();
+
+        update_data ();
+        update_progress ();
+
+        info.changed.connect (update_data);
+        info.progress_changed.connect (update_progress);
+    }
+
+    private void build_and_show_widget () {
+        grid = new Gtk.Grid ();
+        grid.set_column_spacing (6);
+        grid.set_row_spacing (6);
+        grid.set_column_homogeneous (false);
+        grid.set_row_homogeneous (false);
+        grid.margin_start = 6;
+        grid.margin_end = 6;
+        grid.margin_top = 6;
+        grid.margin_bottom = 6;
+
+        var content_type = info.get_ctype ();
+        progress_icon = new Gtk.Image.from_gicon (GLib.ContentType.get_icon ("text/plain"), Gtk.IconSize.DIALOG);
+        if (content_type != null && content_type.length > 0) {
+            progress_icon = new Gtk.Image.from_gicon (GLib.ContentType.get_icon (content_type), Gtk.IconSize.DIALOG);
+        }
+        progress_icon.expand = true;
+        grid.attach (progress_icon, 0, 0, 1, 3);
+
+        status = new Gtk.Label ("status");
+        (status as Gtk.Label).set_line_wrap (true);
+        (status as Gtk.Label).set_line_wrap_mode (Pango.WrapMode.WORD_CHAR);
+        (status as Gtk.Misc).set_alignment ((float) 0.0, (float) 0.5);
+        grid.attach (status, 1, 0, 2, 1);
+
+        progress_bar = new Gtk.ProgressBar ();
+        progress_bar.pulse_step = 0.05;
+        progress_bar.hexpand = true;
+        progress_bar.valign = Gtk.Align.CENTER;
+        progress_bar.set_size_request (700, -1);
+        grid.attach (progress_bar, 1, 1 , 1, 1);
+
+        var button = new Gtk.Button.from_icon_name ("process-stop", Gtk.IconSize.BUTTON);
+
+        /* Stop frame and dark background */
+        button.set_relief (Gtk.ReliefStyle.NONE);
+        button.set_can_focus (false);
+
+        button.valign = Gtk.Align.CENTER;
+        button.set_tooltip_text (_("Cancel this file operation"));
+        grid.attach (button, 3, 1, 1, 1);
+
+        button.clicked.connect (() => {
+            info.cancel ();
+            button.sensitive = false;
+        });
+
+        details = new Gtk.Label ("");
+        (details as Gtk.Label).set_line_wrap (true);
+        (details as Gtk.Misc).set_alignment ((float) 0.0, (float) 0.5);
+        grid.attach (details, 1, 2, 1, 1);
+
+        if (!only_one_file) {
+            expander = new Gtk.Expander ("<b>" + _("Details") + "</b>");
+            expander.set_use_markup (true);
+            expander.margin_top = 6;
+            expander.margin_bottom = 6;
+            log = new Gtk.TextView ();
+            var sw = new Gtk.ScrolledWindow (null, null);
+            sw.set_size_request (-1, int.min (96, total_file_count * 16 + 24));
+            sw.set_vexpand (false);
+            var exp_size = GLib.Value (typeof (int));
+            var exp_spacing = GLib.Value (typeof (int));
+            expander.style_get_property ("expander-size", ref exp_size);
+            expander.style_get_property ("expander-spacing", ref exp_spacing);
+            sw.margin_start = exp_size.get_int () + 2 * exp_spacing.get_int ();
+            sw.margin_bottom = 12;
+            sw.add (log);
+            expander.add (sw);
+            grid.attach (expander, 1,3, 1, 1);
+
+            hide.connect (() => {
+                expander.set_expanded (false);
+            });
+        }
+        add (grid);
+        show_all ();
+    }
+
+    private void update_data () {
+        string? txt = info.get_status ();
+        (status as Gtk.Label).set_text (txt);
+
+        txt = info.get_details ();
+        string markup = Markup.printf_escaped ("<span size='small'>%s</span>", txt);
+        (details as Gtk.Label).set_markup (markup);
+
+        if (only_one_file) {
+            return;
+        }
+
+        remaining_file_count = info.get_remaining_file_count ();
+        int diff = previous_remaining_file_count - remaining_file_count;
+        if (diff != 0) {
+            var buf = log.get_buffer ();
+            if (previous_remaining_file_count < total_file_count) { /* There was a previous line - complete it */
+                /* TRANSLATORS: This is to indicate the completion of a file operation detailed on the same line */
+                buf.insert_at_cursor (_(".... done") + "\n", -1);
+            }
+
+            buf.insert_at_cursor (get_doing_string (operation, dest_dir, diff - 1) + "\n", -1);
+
+            Gtk.TextMark mark = buf.get_insert ();
+            log.scroll_to_mark (mark, 0.0, true, 0.0, 0.0);
+            previous_remaining_file_count = remaining_file_count;
+        }
+    }
+
+    private void update_progress () {
+        double progress = info.get_progress ();
+
+        if (progress < 0)
+            (progress_bar as Gtk.ProgressBar).pulse ();
+        else
+            (progress_bar as Gtk.ProgressBar).set_fraction (progress);
+    }
+
+    private string get_doing_string (Marlin.FileOperationType optype, string dest, uint others) {
+        var filename = info.get_current_filename ();
+        if (others > 0) {
+            return get_doing_several_string (optype, filename, dest, others);
+        }
+
+        switch (optype) {
+            case Marlin.FileOperationType.COPY:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path */
+                return _("Copying %s to %s").printf (filename, dest);
+            case Marlin.FileOperationType.MOVE:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path */
+                return _("Moving %s to %s").printf (filename, dest);
+            case Marlin.FileOperationType.TRASH:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path */
+                return _("Moving %s to trash bin").printf (filename);
+            case Marlin.FileOperationType.DELETE:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path */
+                return _("Permanently deleting %s").printf (filename);
+            case Marlin.FileOperationType.LINK:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path */
+                return _("Linking %s to %s").printf (filename, dest);
+            default:
+                break;
+        }
+
+        /* TRANSLATORS: %s will be replaced by a filename and should not be translated */
+        return _("Operating on %s").printf (filename); /* Should not be reached */
+    }
+    private string get_doing_several_string (Marlin.FileOperationType optype, string filename, string dest, uint others) {
+        switch (optype) {
+            case Marlin.FileOperationType.COPY:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path.
+                                %i will be replaced by a number */
+                return _("Copying %s and %i more to %s").printf (filename, others, dest);
+            case Marlin.FileOperationType.MOVE:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path.
+                                %i will be replaced by a number */
+                return _("Moving %s and %i more to %s").printf (filename, others, dest);
+            case Marlin.FileOperationType.TRASH:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path.
+                                %i will be replaced by a number */
+                return _("Moving %s and %i more to trash bin").printf (filename, others);
+            case Marlin.FileOperationType.DELETE:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path.
+                                %i will be replaced by a number */
+                return _("Permanently deleting %s and %i more").printf (filename, others);
+            case Marlin.FileOperationType.LINK:
+                /* TRANSLATORS: the first %s will be replaced by a filename, the second by destination path.
+                                %i will be replaced by a number */
+                return _("Linking %s and %i more to %s").printf (filename, others, dest);
+            default:
+                break;
+        }
+
+        /* TRANSLATORS: %s will be replaced by a filename*/
+        return _("Operating on %s and % more").printf (filename, others); /* Should not be reached */
+    }
+}

=== removed file 'src/View/Widgets/ProgressInfoWidget.vala'
--- src/View/Widgets/ProgressInfoWidget.vala	2016-12-31 19:42:09 +0000
+++ src/View/Widgets/ProgressInfoWidget.vala	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/***
-    Copyright (c) 2007, 2011 Red Hat, Inc.
-    Copyright (c) 2013-2017 elementary LLC (http://launchpad.net/elementary)
-
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE. See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program. If not, see <http://www.gnu.org/licenses/>.
-
-    Authors: Alexander Larsson <[e-mail]>
-             Cosimo Cecchi <[e-mail]>
-             Julián Unrrein <[e-mail]>
-***/
-
-public class Marlin.Progress.InfoWidget : Gtk.Box {
-
-    private Marlin.Progress.Info info;
-
-    Gtk.Widget status;          /* Gtk.Label */
-    Gtk.Widget details;         /* Gtk.Label */
-    Gtk.Widget progress_bar;
-
-    public InfoWidget (Marlin.Progress.Info info) {
-        this.info = info;
-
-        build_and_show_widget ();
-
-        update_data ();
-        update_progress ();
-
-        this.info.changed.connect (update_data);
-        this.info.progress_changed.connect (update_progress);
-
-        this.info.finished.connect (() => {
-            destroy ();
-        });
-    }
-
-    private void build_and_show_widget () {
-        this.orientation = Gtk.Orientation.VERTICAL;
-        this.homogeneous = false;
-        this.spacing = 5;
-
-        this.status = new Gtk.Label ("status");
-        (this.status as Gtk.Label).set_size_request (500, -1);
-        (this.status as Gtk.Label).set_line_wrap (true);
-        (this.status as Gtk.Label).set_line_wrap_mode (Pango.WrapMode.WORD_CHAR);
-        (this.status as Gtk.Misc).set_alignment ((float) 0.0, (float) 0.5);
-        pack_start (status, true, false, 0);
-
-        var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
-        var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-
-        this.progress_bar = new Gtk.ProgressBar ();
-        (this.progress_bar as Gtk.ProgressBar).pulse_step = 0.05;
-        box.pack_start (this.progress_bar, true, false, 0);
-        hbox.pack_start (box, true, true, 0);
-
-        var button = new Gtk.Button.from_icon_name ("process-stop-symbolic", Gtk.IconSize.BUTTON);
-        button.get_style_context ().add_class ("flat");
-        button.clicked.connect (() => {
-            this.info.cancel ();
-            button.sensitive = false;
-        });
-
-        hbox.pack_start (button, false, false, 0);
-
-        pack_start (hbox, false, false, 0);
-
-        this.details = new Gtk.Label ("details");
-        (this.details as Gtk.Label).set_line_wrap (true);
-        (this.details as Gtk.Misc).set_alignment ((float) 0.0, (float) 0.5);
-        pack_start (details, true, false, 0);
-
-        show_all ();
-    }
-
-    private void update_data () {
-        string status = this.info.get_status ();
-        (this.status as Gtk.Label).set_text (status);
-
-        string details = this.info.get_details ();
-        string markup = Markup.printf_escaped ("<span size='small'>%s</span>", details);
-        (this.details as Gtk.Label).set_markup (markup);
-    }
-
-    private void update_progress () {
-        double progress = this.info.get_progress ();
-
-        if (progress < 0)
-            (this.progress_bar as Gtk.ProgressBar).pulse ();
-        else
-            (this.progress_bar as Gtk.ProgressBar).set_fraction (progress);
-    }
-}

=== modified file 'src/View/Widgets/TopMenu.vala'
--- src/View/Widgets/TopMenu.vala	2017-01-13 13:31:06 +0000
+++ src/View/Widgets/TopMenu.vala	2017-01-14 12:39:17 +0000
@@ -28,6 +28,7 @@
         public LocationBar? location_bar;
         public Chrome.ButtonWithMenu button_forward;
         public Chrome.ButtonWithMenu button_back;
+        private ProgressIndicatorWithPopover progress_indicator;
 
         public bool locked_focus {get; private set; default = false;}
 
@@ -88,6 +89,9 @@
             location_bar.show_all ();
             pack_start (location_bar);
 
+            progress_indicator = new ProgressIndicatorWithPopover ();
+            pack_start (progress_indicator);
+
             show ();
         }
 
@@ -167,5 +171,21 @@
         public void cancel () {
             location_bar.cancel ();
         }
+
+        public void update_overall_progress (double progress) {
+            progress_indicator.set_overall_progress (progress);
+        }
+
+        public void show_progress (bool show) {
+            if (show) {
+                progress_indicator.open ();
+            } else {
+                progress_indicator.close ();
+            }
+        }
+
+        public void add_progress_info (Marlin.Progress.Info info) {
+            progress_indicator.add_progress_info (info);
+        }
     }
 }

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2017-01-13 13:31:06 +0000
+++ src/View/Window.vala	2017-01-14 12:39:17 +0000
@@ -1094,5 +1094,17 @@
             application.set_accels_for_action ("win.info::HELP", {"F1"});
             application.set_accels_for_action ("win.info::ABOUT", {"F3"});
         }
+
+        public void overall_progress_changed (double progress) {
+            top_menu.update_overall_progress (progress);
+        }
+
+        public void show_progress (bool show) {
+            top_menu.show_progress (show);
+        }
+
+        public void add_progress_info (Marlin.Progress.Info info) {
+            top_menu.add_progress_info (info);
+        }
     }
 }