Merge lp:~grabli66-r/pantheon-files/inline-progress into lp:~elementary-apps/pantheon-files/trunk

[Grabli66]

Inline progress

[lp:~grabli66-r/pantheon-files/inline-progress]

2170. By Grabli66 on 2016-05-24

fix code style

2171. By Grabli66 on 2016-05-24

removed unused code

[Jeremy Wootten (jeremywootten)]

There is at least one missing file - src/ProgressRenderCell.vala. Please add to bzr.

Note that this branch may be delayed for merging by Loki feature freeze.

Thanks for your contribution!

[Grabli66 (grabli66-r)]

Hi. I think i forgot remove that file from CMakeLists
I'll fix it

2016-05-25 12:25 GMT+03:00 Jeremy Wootten <email address hidden>:

> There is at least one missing file - src/ProgressRenderCell.vala. Please
> add to bzr.
>
> Note that this branch may be delayed for merging by Loki feature freeze.
>
> Thanks for your contribution!
> --
>
> https://code.launchpad.net/~grabli66-r/pantheon-files/inline-progress/+merge/295618
> You are the owner of lp:~grabli66-r/pantheon-files/inline-progress.
>

[lp:~grabli66-r/pantheon-files/inline-progress]

2172. By Grabli66 on 2016-05-25

removed unused file from cmakelist

[Adam Bieńkowski (donadigo)]

Update the branch to the latest trunk.

review: Needs Fixing (code)

[lp:~grabli66-r/pantheon-files/inline-progress]

2173. By Grabli66 on 2016-07-24

po files

2174. By Grabli66 on 2016-07-24

fix merge

[Grabli66 (grabli66-r)]

Updated to current trunk

[Jeremy Wootten (jeremywootten)]

The branch compiles and runs but no inline progress bar appears now.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

Further to last comment - the progress bar does not appear when copying to an frp server. It appears when copying to a usb stick.

[lp:~grabli66-r/pantheon-files/inline-progress]

2175. By grabli66 <email address hidden> on 2016-09-12

merge with trunc

[Jeremy Wootten (jeremywootten)]

A. Pasting large files into local directory from another partition
   - Progress bars show nicely but the progress is not shown in blue (but white on grey). The inline progress bar should be themed the same as the other progress bars in Files. Needs fixing.

B. Pasting onto a remote folder (smb, ftp, afp)
 - No inline progress - file does not appear until transfer complete. However, the progress window shows the correct state of the transfer. This might be tricky to fix and could be left for another branch.

C. Pasting onto USB stick
 - The file appears immediately and the Inline progress bar appears briefly and rapidly proceeds to 100% although the file has not been completely transferred to the stick. However, the progress window displays until the transfer is complete (although the progress appears stuck at about 90%). Needs fixing.

However, the branch does provide the basic infrastructure for an inline progressbar - thanks.

I checked that this branch is does not conflict with the current trunk (r2374)

review: Needs Fixing (appearance)

[Grabli66 (grabli66-r)]

As you can see, need to fix many issues in "Files" to implement
inline-progress.
Sorry, but i don't want see the code of "Files" anymore. It's real mess of
C and Vala code.
Fix that code is a real pain.
I don't want bounty anymore.
You can use branch "inline-progress" as you wish.
Good luck.

2016-11-08 21:41 GMT+03:00 Jeremy Wootten <email address hidden>:

> Review: Needs Fixing appearance
>
> A. Pasting large files into local directory from another partition
> - Progress bars show nicely but the progress is not shown in blue (but
> white on grey). The inline progress bar should be themed the same as the
> other progress bars in Files. Needs fixing.
>
> B. Pasting onto a remote folder (smb, ftp, afp)
> - No inline progress - file does not appear until transfer complete.
> However, the progress window shows the correct state of the transfer. This
> might be tricky to fix and could be left for another branch.
>
> C. Pasting onto USB stick
> - The file appears immediately and the Inline progress bar appears
> briefly and rapidly proceeds to 100% although the file has not been
> completely transferred to the stick. However, the progress window displays
> until the transfer is complete (although the progress appears stuck at
> about 90%). Needs fixing.
>
> However, the branch does provide the basic infrastructure for an inline
> progressbar - thanks.
>
> I checked that this branch is does not conflict with the current trunk
> (r2374)
> --
> https://code.launchpad.net/~grabli66-r/pantheon-files/
> inline-progress/+merge/295618
> You are the owner of lp:~grabli66-r/pantheon-files/inline-progress.
>

[Jeremy Wootten (jeremywootten)]

I understand that Files code is a PITA to work with. I'll discuss with the bounty backers what they are prepared to accept. It may be that just fixing the theming will be enough as your branch does work for local transfers.

[Jeremy Wootten (jeremywootten)]

On further investigation the colour of the inline progress bar is due to the focus being stolen from the view by the progress window. If you click on the view then the bar appears blue as required. It is likely that the progress window will be replaced in future by a header bar widget anyway.

[Jeremy Wootten (jeremywootten)]

Ignore the last comment - it is only true if you replace the custom progress bar with a Gtk.CellRendererProgress.

Unmerged revisions

2175. By grabli66 <email address hidden> on 2016-09-12

merge with trunc

2174. By Grabli66 on 2016-07-24

fix merge

2173. By Grabli66 on 2016-07-24

po files

2172. By Grabli66 on 2016-05-25

removed unused file from cmakelist

2171. By Grabli66 on 2016-05-24

removed unused code

2170. By Grabli66 on 2016-05-24

fix code style

2169. By Grabli66 on 2016-05-24

po file

2168. By Grabli66 on 2016-05-24

fix progress bar for icon view

2167. By Grabli66 on 2016-05-23

different text color then progress file

2166. By Grabli66 on 2016-05-22

progress finished

=== modified file '.bzrignore'
--- .bzrignore	2014-10-05 11:01:10 +0000
+++ .bzrignore	2016-09-12 18:13:21 +0000
@@ -1,1 +1,2 @@
 
+.vscode

=== modified file 'libcore/fm-list-model.c'
--- libcore/fm-list-model.c	2015-11-21 12:37:55 +0000
+++ libcore/fm-list-model.c	2016-09-12 18:13:21 +0000
@@ -85,6 +85,7 @@
     GSequence *files;
     GSequenceIter *ptr;
     guint loaded : 1;
+    guint progress;
 };
 
 G_DEFINE_TYPE_WITH_CODE (FMListModel, fm_list_model, G_TYPE_OBJECT,
@@ -131,6 +132,8 @@
         return GOF_TYPE_FILE;
     case FM_LIST_MODEL_PIXBUF:
         return GDK_TYPE_PIXBUF;
+    case FM_LIST_MODEL_PROGRESS:
+        return G_TYPE_UINT;
     default:
         if (index < FM_LIST_MODEL_NUM_COLUMNS) {
             return G_TYPE_STRING;
@@ -271,11 +274,16 @@
         if (file != NULL) {
             gof_file_update_icon (file, model->details->icon_size);
             if (file->pix != NULL)
-                g_value_set_object(value, file->pix);
+                g_value_set_object (value, file->pix);
         }
         break;
-
-    }
+        
+    case FM_LIST_MODEL_PROGRESS:
+        g_value_init (value, G_TYPE_UINT);
+        if (file != NULL)
+            g_value_set_uint (value, file_entry->progress);
+        break;
+    }        
 }
 
 static gboolean
@@ -675,6 +683,7 @@
     GtkTreeIter iter;
     GtkTreePath *path;
     dummy_file_entry = g_new0 (FileEntry, 1);
+    dummy_file_entry->progress = 0;
     dummy_file_entry->parent = parent_entry;
     dummy_file_entry->ptr = g_sequence_insert_sorted (parent_entry->files, dummy_file_entry,
                                                       fm_list_model_file_entry_compare_func, model);
@@ -715,6 +724,7 @@
     }
 
     file_entry = g_new0 (FileEntry, 1);
+    file_entry->progress = 0;
     file_entry->file = file; /* Does not increase reference count */
     file_entry->parent = NULL;
     file_entry->subdirectory = NULL;
@@ -1331,3 +1341,19 @@
 
     return GPOINTER_TO_INT (g_hash_table_lookup (hash, colstr));
 }
+
+void
+fm_list_model_set_progress (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, guint progress) {
+    FMListModel *model;
+    FileEntry *file_entry;    
+
+    model = (FMListModel *)tree_model;
+
+    g_assert (model->details->stamp == iter->stamp);
+    g_return_if_fail (!g_sequence_iter_is_end (iter->user_data));
+
+    file_entry = g_sequence_get (iter->user_data);
+    file_entry->progress = progress;    
+    
+    gtk_tree_model_row_changed (tree_model, path, iter);
+}
\ No newline at end of file

=== modified file 'libcore/fm-list-model.h'
--- libcore/fm-list-model.h	2015-11-21 12:37:55 +0000
+++ libcore/fm-list-model.h	2016-09-12 18:13:21 +0000
@@ -49,11 +49,12 @@
     FM_LIST_MODEL_FILE_COLUMN,
     FM_LIST_MODEL_COLOR,
     FM_LIST_MODEL_PIXBUF,
-    FM_LIST_MODEL_FILENAME,
+    FM_LIST_MODEL_FILENAME,    
     FM_LIST_MODEL_SIZE,
     FM_LIST_MODEL_TYPE,
     FM_LIST_MODEL_MODIFIED,
-    FM_LIST_MODEL_NUM_COLUMNS
+    FM_LIST_MODEL_NUM_COLUMNS,
+    FM_LIST_MODEL_PROGRESS    
 };
 
 typedef struct FMListModelDetails FMListModelDetails;
@@ -97,4 +98,6 @@
 const gchar     *fm_list_model_get_string_from_column_id (gint id);
 gint            fm_list_model_get_column_id_from_string (const gchar *colstr);
 
+void            fm_list_model_set_progress (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, guint progress);
+
 #endif /* FM_LIST_MODEL_H */

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2016-07-31 17:59:58 +0000
+++ libcore/marlin-file-operations.c	2016-09-12 18:13:21 +0000
@@ -92,14 +92,14 @@
 typedef struct {
     CommonJob common;
     gboolean is_move;
-    GList *files;
+    GList *files;    
     GFile *destination;
     //GFile *desktop_location;
     GdkPoint *icon_positions;
     int n_icon_positions;
     GHashTable *debuting_files;
     MarlinCopyCallback  done_callback;
-    gpointer done_callback_data;
+    gpointer done_callback_data;    
 } CopyMoveJob;
 
 typedef struct {
@@ -3084,8 +3084,8 @@
     guint64 now;
     gchar *s = NULL;
 
-    job = (CommonJob *)copy_job;
-
+    job = (CommonJob *)copy_job;            
+    
     is_move = copy_job->is_move;
 
     now = g_thread_gettime ();
@@ -3114,10 +3114,10 @@
                 s = f (is_move ? _("Moving \"%B\" to \"%B\"") :
                        _("Copying \"%B\" to \"%B\""),
                        (GFile *)copy_job->files->data,
-                       copy_job->destination);
+                       copy_job->destination);                
             } else {
                 s = f (_("Duplicating \"%B\""), (GFile *)copy_job->files->data);
-            }
+            }            
         } 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\"",
@@ -3135,7 +3135,7 @@
                                  files_left),
                        files_left,
                        (GFile *)copy_job->files->data);
-            }
+            }            
         } else {
             if (copy_job->destination != NULL) {
                 s = f (is_move?
@@ -3152,11 +3152,11 @@
                                  "Duplicating %'d files",
                                  files_left),
                        files_left);
-            }
+            }            
         }
-    }
+    }        
 
-#ifdef ENABLE_TASKVIEW
+#ifdef ENABLE_TASKVIEW    
     g_object_set (job->tv_io,
                   "state", TASKVIEW_RUNNING,
                   "processed-items", (guint64) transfer_info->num_files,
@@ -3171,7 +3171,7 @@
         taskview_generic_set_description (TASKVIEW_GENERIC (job->tv_io), s);
         g_free (s);
     }
-
+    
     // FIXME: current-file?
     if (copy_job->destination != NULL) {
         gchar *current_item = g_file_get_uri (copy_job->destination);
@@ -3180,7 +3180,7 @@
                       NULL);
         g_free (current_item);
     }
-#else
+#else    
     if (s != NULL)
     {
         marlin_progress_info_take_status (job->progress, s);
@@ -3975,6 +3975,7 @@
 
 typedef struct {
     CopyMoveJob *job;
+    GFile *current_file;
     goffset last_size;
     SourceInfo *source_info;
     TransferInfo *transfer_info;
@@ -3987,11 +3988,17 @@
 {
     ProgressData *pdata;
     goffset new_size;
+    CommonJob* job;
+    uint progress;
 
     pdata = user_data;
 
     new_size = current_num_bytes - pdata->last_size;
-
+    progress = lround (((double)current_num_bytes / (double)total_num_bytes) * 100);    
+    job = (CommonJob *) pdata->job; 
+    marlin_progress_info_set_current_file (job->progress, pdata->current_file);
+    marlin_progress_info_set_current_file_progress (job->progress, progress); 
+    
     if (new_size > 0) {
         pdata->transfer_info->num_bytes += new_size;
         pdata->last_size = current_num_bytes;
@@ -4237,8 +4244,8 @@
     int unique_name_nr;
     gboolean handled_invalid_filename;
 
-    job = (CommonJob *)copy_job;
-
+    job = (CommonJob *)copy_job;       
+    
     if (should_skip_file (job, src)) {
         *skipped_file = TRUE;
         return;
@@ -4337,11 +4344,12 @@
     if (readonly_source_fs) {
         flags |= G_FILE_COPY_TARGET_DEFAULT_PERMS;
     }
-
+    
     pdata.job = copy_job;
     pdata.last_size = 0;
     pdata.source_info = source_info;
     pdata.transfer_info = transfer_info;
+    pdata.current_file = dest;
 
     if (copy_job->is_move) {
         res = g_file_move (src, dest,
@@ -4662,7 +4670,7 @@
     for (l = job->files;
          l != NULL && !job_aborted (common);
          l = l->next) {
-        src = l->data;
+        src = l->data;        
 
         if (i < job->n_icon_positions) {
             point = &job->icon_positions[i];

=== modified file 'libcore/marlin-progress-info.c'
--- libcore/marlin-progress-info.c	2016-06-24 18:59:29 +0000
+++ libcore/marlin-progress-info.c	2016-09-12 18:13:21 +0000
@@ -64,6 +64,9 @@
     gboolean finish_at_idle;
     gboolean changed_at_idle;
     gboolean progress_at_idle;
+    
+    GFile* current_file;
+    uint current_file_progress; 
 };
 
 struct _MarlinProgressInfoClass
@@ -631,3 +634,29 @@
 
     G_UNLOCK (progress_info);
 }
+
+/*
+*   Sets current file
+*/
+void
+marlin_progress_info_set_current_file (MarlinProgressInfo *info, GFile *current_file)
+{
+    info->current_file = current_file;
+}
+
+/*
+*   Gets current file
+*/
+GFile *       
+marlin_progress_info_get_current_file (MarlinProgressInfo *info) {
+    return info->current_file;
+}
+
+void
+marlin_progress_info_set_current_file_progress (MarlinProgressInfo *info, uint progress) {
+    info->current_file_progress = progress;
+}
+
+uint marlin_progress_info_get_current_file_progress (MarlinProgressInfo *info) {
+    return info->current_file_progress;
+}
\ No newline at end of file

=== modified file 'libcore/marlin-progress-info.h'
--- libcore/marlin-progress-info.h	2016-06-24 18:59:29 +0000
+++ libcore/marlin-progress-info.h	2016-09-12 18:13:21 +0000
@@ -83,6 +83,15 @@
                                                     double             total);
 void          marlin_progress_info_pulse_progress  (MarlinProgressInfo *info);
 
+void          marlin_progress_info_set_current_file (MarlinProgressInfo *info, 
+                                                     GFile *current_file);
+
+GFile *       marlin_progress_info_get_current_file (MarlinProgressInfo *info);
+
+void          marlin_progress_info_set_current_file_progress (MarlinProgressInfo *info, uint progress);
+
+uint          marlin_progress_info_get_current_file_progress (MarlinProgressInfo *info);
+
 
 
 #endif /* MARLIN_PROGRESS_INFO_H */

=== modified file 'libcore/pantheon-files-core-C.vapi'
--- libcore/pantheon-files-core-C.vapi	2016-06-24 18:59:29 +0000
+++ libcore/pantheon-files-core-C.vapi	2016-09-12 18:13:21 +0000
@@ -23,12 +23,13 @@
             SIZE,
             TYPE,
             MODIFIED,
-            NUM_COLUMNS
+            NUM_COLUMNS,
+            PROGRESS
         }
 
-        public bool load_subdirectory(Gtk.TreePath path, out GOF.Directory.Async dir);
-        public bool unload_subdirectory(Gtk.TreeIter iter);
-        public void add_file(GOF.File file, GOF.Directory.Async dir);
+        public bool load_subdirectory (Gtk.TreePath path, out GOF.Directory.Async dir);
+        public bool unload_subdirectory (Gtk.TreeIter iter);
+        public void add_file (GOF.File file, GOF.Directory.Async dir);
         public bool remove_file (GOF.File file, GOF.Directory.Async dir);
         public void file_changed (GOF.File file, GOF.Directory.Async dir);
         public GOF.File? file_for_path (Gtk.TreePath path);
@@ -39,6 +40,7 @@
         public GOF.File file_for_iter (Gtk.TreeIter iter);
         public void clear ();
         public signal void subdirectory_unloaded (GOF.Directory.Async directory);
+        public void set_progress (Gtk.TreePath path, Gtk.TreeIter iter, uint progress);
     }
 }
 
@@ -205,6 +207,10 @@
         public bool get_is_finished ();
         public bool get_is_paused ();
         public GLib.Cancellable get_cancellable ();
+        public void set_current_file (GLib.File current_file);
+        public unowned GLib.File get_current_file ();
+        public void set_current_file_progress (uint progress);
+        public uint get_current_file_progress ();
     }
 
     [CCode (cheader_filename = "marlin-progress-info-manager.h")]

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-06-29 18:56:26 +0000
+++ src/Application.vala	2016-09-12 18:13:21 +0000
@@ -25,8 +25,7 @@
 
 public class Marlin.Application : Granite.Application {
 
-    private VolumeMonitor volume_monitor;
-    private Marlin.Progress.UIHandler progress_handler;
+    private VolumeMonitor volume_monitor;        
     private Marlin.ClipboardManager clipboard;
     private Marlin.Thumbnailer thumbnailer;
     private Gtk.RecentManager recent;
@@ -35,6 +34,7 @@
     private const uint MAX_WINDOWS = 25;
 
     public int window_count { get; private set; }
+    public Marlin.Progress.UIHandler progress_handler;
 
     bool quitting = false;
 
@@ -87,9 +87,8 @@
         Gtk.IconTheme.get_default ().changed.connect (() => {
             Marlin.IconInfo.clear_caches ();
         });
-
+                
         progress_handler = new Marlin.Progress.UIHandler (this);
-
         this.clipboard = new Marlin.ClipboardManager.get_for_display (Gdk.Display.get_default ());
         this.thumbnailer = Marlin.Thumbnailer.get ();
         this.recent = new Gtk.RecentManager ();

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-07-25 19:49:17 +0000
+++ src/CMakeLists.txt	2016-09-12 18:13:21 +0000
@@ -82,7 +82,7 @@
         marlin-deep-count.vala
         ProgressInfoWidget.vala
         ProgressUIHandler.vala
-        TextRenderer.vala
+        TextRenderer.vala        
         QuicklistHandler.vala
         View/AbstractPropertiesDialog.vala
         View/ColumnView.vala

=== modified file 'src/ProgressUIHandler.vala'
--- src/ProgressUIHandler.vala	2016-08-03 19:01:55 +0000
+++ src/ProgressUIHandler.vala	2016-09-12 18:13:21 +0000
@@ -26,7 +26,10 @@
  *   completion of the operation unless it was cancelled by the user. 
 ***/ 
 public class Marlin.Progress.UIHandler : Object {
-
+            
+    public signal void progress_changed (GLib.File current_file, uint progress);
+    public signal void progress_finished ();
+    
     private Marlin.Progress.InfoManager manager = null;
 #if HAVE_UNITY
     private Marlin.QuicklistHandler quicklist_handler = null;
@@ -50,8 +53,18 @@
         this.manager = new Marlin.Progress.InfoManager ();
         this.application = app;
 
-        manager.new_progress_info.connect ((info) => {
+        manager.new_progress_info.connect ((info) => {            
             info.started.connect (progress_info_started_cb);
+            info.progress_changed.connect (() => {
+                var current_file = info.get_current_file ();
+                var curren_progress = info.get_current_file_progress ();
+                if (current_file != null) {                    
+                    progress_changed (current_file, curren_progress);
+                }
+            });
+            info.finished.connect (() => {
+                progress_finished ();
+            });
         });
 
         var theme = Gtk.IconTheme.get_default ();

=== modified file 'src/TextRenderer.vala'
--- src/TextRenderer.vala	2016-05-06 10:36:16 +0000
+++ src/TextRenderer.vala	2016-09-12 18:13:21 +0000
@@ -18,7 +18,8 @@
 
 namespace Marlin {
     public class TextRenderer: Gtk.CellRendererText {
-
+        const string PROGRESS_TEXT_COLOR = "#777777";
+        const string NORMAL_TEXT_COLOR = "#000000";
         const int MAX_LINES = 5;
         const uint BORDER_RADIUS = 6;
 
@@ -28,6 +29,9 @@
         public GOF.File? file {set; private get;}
         public int text_width;
         public int text_height;
+        
+        // For progress bar
+        public uint progress { set; private get; }        
 
         int char_width;
         int char_height;
@@ -35,9 +39,11 @@
         Pango.Layout layout;
         Gtk.Widget widget;
         public Marlin.AbstractEditableLabel entry;
+        Marlin.ViewMode viewmode;
 
         public TextRenderer (Marlin.ViewMode viewmode) {
             this.mode = Gtk.CellRendererMode.EDITABLE;
+            this.viewmode = viewmode;
 
             if (viewmode == Marlin.ViewMode.ICON)
                 entry = new Marlin.MultiLineEditableLabel ();
@@ -55,17 +61,17 @@
                                      Gdk.Rectangle cell_area,
                                      Gtk.CellRendererState flags) {
             set_widget (widget);
-            Gtk.StateFlags state = widget.get_state_flags ();
-
+            Gtk.StateFlags state = widget.get_state_flags ();                        
+            
             if ((flags & Gtk.CellRendererState.SELECTED) == Gtk.CellRendererState.SELECTED)
                 state |= Gtk.StateFlags.SELECTED;
             else if ((flags & Gtk.CellRendererState.PRELIT) == Gtk.CellRendererState.PRELIT)
                 state = Gtk.StateFlags.PRELIGHT;
             else
-                state = widget.get_sensitive () ? Gtk.StateFlags.NORMAL : Gtk.StateFlags.INSENSITIVE;
-
-            set_up_layout (text, cell_area);
-
+                state = widget.get_sensitive () ? Gtk.StateFlags.NORMAL : Gtk.StateFlags.INSENSITIVE;                        
+            
+            set_up_layout (text, cell_area);            
+            
             var style_context = widget.get_parent ().get_style_context ();
             style_context.save ();
             style_context.set_state (state);
@@ -84,13 +90,16 @@
                 x_offset += focus_border_width + 2 * (int)xpad;
                 y_offset += focus_border_width;
             }
-
+            
             style_context.render_layout (cr,
                                          cell_area.x + x_offset,
                                          cell_area.y + y_offset,
                                          layout);
-
-            style_context.restore ();
+                                     
+            // Draws progress bar
+            draw_progress (cr, cell_area);                         
+                                                           
+            style_context.restore ();                                                
 
             /* The render call should always be preceded by a set_property call
                from GTK. It should be safe to unreference or free the allocated
@@ -99,9 +108,9 @@
         }
 
         public void set_up_layout (string? text, Gdk.Rectangle cell_area) {
-            /* render small/normal text depending on the zoom_level */
+            /* render small/normal text depending on the zoom_level */                       
             if (text == null)
-                text= " ";
+                text= " ";                           
 
             bool small = this.zoom_level < Marlin.ZoomLevel.NORMAL;
             if (small)
@@ -122,8 +131,12 @@
 
             if (xalign == 0.5f)
                 layout.set_alignment (Pango.Alignment.CENTER);
-
-            layout.set_text (text, -1);
+            
+            if ((progress > 0) && (progress < 100)) {
+                layout.set_markup ("<span foreground=\"" + PROGRESS_TEXT_COLOR + "\">" + text + "</span>", -1);
+            } else {
+                layout.set_markup ("<span foreground=\"" + NORMAL_TEXT_COLOR + "\">" + text + "</span>", -1);                
+            }
 
             /* calculate the real text dimension */
             int width, height;
@@ -238,6 +251,56 @@
             on_entry_editing_done ();
             return false;
         }
+        
+        /*
+        *   Draws rounded path
+        */
+        private void draw_rounded_path(Cairo.Context ctx, double x, double y,
+            double width, double height, double radius) {
+                
+            double degrees = 3.14 / 180.0;
+            ctx.new_sub_path ();
+            ctx.arc(x + width - radius, y + radius, radius, -90 * degrees, 0 * degrees);
+            ctx.arc(x + width - radius, y + height - radius, radius, 0 * degrees, 90 * degrees);
+            ctx.arc(x + radius, y + height - radius, radius, 90 * degrees, 180 * degrees);
+            ctx.arc(x + radius, y + radius, radius, 180 * degrees, 270 * degrees);
+            ctx.close_path();
+        }
+        
+        /*
+        *   Draws progress bar
+        */
+        private void draw_progress (Cairo.Context cr, Gdk.Rectangle cell_area) {
+            if (progress == 0 || progress >= 100) return;
+            
+            var bar_height = 6;            
+            var bar_width = 70;
+            var padd_right = 2;
+            
+            long center_y = 0;
+            long x = 0;
+            
+            if (viewmode == Marlin.ViewMode.ICON) {
+                center_y = Math.lround (cell_area.y + cell_area.height / 2.0f) - bar_height + ypad;
+                x = Math.lround (cell_area.x + cell_area.width / 2.0f - bar_width / 2.0f - xpad);
+            } else {
+                center_y = Math.lround ((cell_area.y + cell_area.height / 2.0f)) - bar_height + ypad;
+                x = cell_area.x + cell_area.width - bar_width - xpad - padd_right;
+            }                        
+                         
+            var progress_size = Math.lround(bar_width / (100.0 / progress));
+            
+            cr.set_source_rgb (0.65f, 0.65f, 0.65f);                        
+            draw_rounded_path (cr, x, center_y, bar_width, bar_height, 3);
+            cr.stroke();
+            cr.set_source_rgb (0.83f, 0.83f, 0.83f);
+            draw_rounded_path (cr, x, center_y, bar_width, bar_height, 3);
+            cr.fill();
+            cr.set_source_rgb (1, 1, 1);
+            draw_rounded_path (cr, x, center_y, progress_size, bar_height, 3);            
+            cr.fill();                        
+        }
+        
 
         private void draw_focus (Cairo.Context cr,
                                  Gdk.Rectangle cell_area,

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-09-09 09:42:09 +0000
+++ src/View/AbstractDirectoryView.vala	2016-09-12 18:13:21 +0000
@@ -240,6 +240,9 @@
         protected static Marlin.DndHandler dnd_handler = new Marlin.DndHandler ();
 
         protected unowned Gtk.RecentManager recent;
+        
+        // For inline progress, last changed file
+        protected GOF.File last_current_file = null;
 
         public signal void path_change_request (GLib.File location, int flag = 0, bool new_root = true);
         public signal void item_hovered (GOF.File? file);
@@ -881,7 +884,7 @@
             }
         }
 
-        private void add_file (GOF.File file, GOF.Directory.Async dir) {
+        private void add_file (GOF.File file, GOF.Directory.Async dir) {                       
             model.add_file (file, dir);
 
             if (select_added_files)
@@ -3510,6 +3513,7 @@
                                          bool start_editing,
                                          bool select,
                                          bool scroll_to_top);
+                                         
         protected abstract Gtk.Widget? create_view ();
         protected abstract Marlin.ZoomLevel get_set_up_zoom_level ();
         protected abstract Marlin.ZoomLevel get_normal_zoom_level ();
@@ -3528,6 +3532,36 @@
         protected abstract void thaw_tree ();
         protected new abstract void freeze_child_notify ();
         protected new abstract void thaw_child_notify ();
+        
+        // Sets progress to file
+        public virtual void process_progress(GLib.File current_file, uint progress) {
+            if (current_file == null) return;            
+            var gof_file = GOF.File.@get(current_file);
+            
+            // Resets last file progress
+            if ((last_current_file != null) && (last_current_file.uri != gof_file.uri)) {
+                reset_progress();
+            }
+            
+            Gtk.TreeIter iter;
+            if (model.get_first_iter_for_file(gof_file, out iter)) {                
+                var path = model.get_path(iter);
+                model.set_progress (path, iter, progress);
+            }
+            
+            last_current_file = gof_file;                       
+        }
+        
+        // Resets progress
+        public virtual void reset_progress() {
+            if (last_current_file != null) {
+                Gtk.TreeIter iter;
+                if (model.get_first_iter_for_file(last_current_file, out iter)) {                
+                    var path = model.get_path(iter);
+                    model.set_progress (path, iter, 0);
+                }
+            }
+        }
 
 /** Unimplemented methods
  *  fm_directory_view_parent_set ()  - purpose unclear

=== modified file 'src/View/AbstractTreeView.vala'
--- src/View/AbstractTreeView.vala	2016-06-27 12:08:16 +0000
+++ src/View/AbstractTreeView.vala	2016-09-12 18:13:21 +0000
@@ -52,7 +52,8 @@
             name_column.set_attributes (name_renderer,
                                         "text", FM.ListModel.ColumnID.FILENAME,
                                         "file", FM.ListModel.ColumnID.FILE_COLUMN,
-                                        "background", FM.ListModel.ColumnID.COLOR);
+                                        "background", FM.ListModel.ColumnID.COLOR,
+                                        "progress", FM.ListModel.ColumnID.PROGRESS);          
 
             tree.append_column (name_column);
         }

=== modified file 'src/View/ColumnView.vala'
--- src/View/ColumnView.vala	2016-06-26 14:13:58 +0000
+++ src/View/ColumnView.vala	2016-09-12 18:13:21 +0000
@@ -168,6 +168,6 @@
         public override void cancel () {
             base.cancel ();
             cancel_await_double_click ();
-        }
+        }      
     }
 }

=== modified file 'src/View/IconView.vala'
--- src/View/IconView.vala	2016-06-27 12:08:16 +0000
+++ src/View/IconView.vala	2016-09-12 18:13:21 +0000
@@ -18,8 +18,8 @@
 
 namespace FM {
     public class IconView : AbstractDirectoryView {
-        protected new Gtk.IconView tree;
-
+        protected new Gtk.IconView tree;        
+        
         public IconView (Marlin.View.Slot _slot) {
             assert (_slot != null);
             base (_slot);
@@ -45,6 +45,7 @@
             (tree as Gtk.CellLayout).add_attribute (name_renderer, "file", FM.ListModel.ColumnID.FILE_COLUMN);
             (tree as Gtk.CellLayout).add_attribute (name_renderer, "background", FM.ListModel.ColumnID.COLOR);
             (tree as Gtk.CellLayout).add_attribute (icon_renderer, "file", FM.ListModel.ColumnID.FILE_COLUMN);
+            (tree as Gtk.CellLayout).add_attribute (name_renderer, "progress", FM.ListModel.ColumnID.PROGRESS);
 
             connect_tree_signals ();
         }
@@ -448,6 +449,6 @@
                 path.next ();
             }
             return index;
-        }
+        }               
     }
 }

=== modified file 'src/View/ListView.vala'
--- src/View/ListView.vala	2016-06-09 08:48:35 +0000
+++ src/View/ListView.vala	2016-09-12 18:13:21 +0000
@@ -32,8 +32,8 @@
         /* ListView manages the loading and unloading of subdirectories displayed */
         private uint unload_file_timeout_id = 0;
         private GLib.List<Gtk.TreeRowReference> subdirectories_to_unload = null;
-        private GLib.List<GOF.Directory.Async> loaded_subdirectories = null;
-
+        private GLib.List<GOF.Directory.Async> loaded_subdirectories = null;                
+        
         public ListView (Marlin.View.Slot _slot) {
             base (_slot);
         }
@@ -185,7 +185,6 @@
             tree.set_rubber_banding (true);
             append_extra_tree_columns ();
             connect_additional_signals ();
-
             return tree as Gtk.Widget;
         }
 
@@ -278,6 +277,6 @@
             loaded_subdirectories.@foreach ((dir) => {
                 remove_subdirectory (dir);
             });
-        }
+        }                
     }
 }

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-08-23 18:52:01 +0000
+++ src/View/Window.vala	2016-09-12 18:13:21 +0000
@@ -339,6 +339,26 @@
             sidebar.sync_needed.connect (() => {
                 loading_uri (current_tab.uri);
             });
+            
+            // Connects progress signals
+            connect_progress_signals();
+        }
+        
+        // Connects progress signals
+        private void connect_progress_signals() {
+            var ui_handler = ((Marlin.Application) application).progress_handler;
+            ui_handler.progress_changed.connect ((current_file, progress)=> {                                               
+               var dir_view = ((Slot)get_active_slot()).get_directory_view ();               
+               dir_view.process_progress (current_file, progress);      
+            });
+            
+            ui_handler.progress_finished.connect (() => {
+                foreach (var tab in tabs.tabs) {
+                    var view_container = (tab.page as ViewContainer);                                     
+                    var dir_view = ((Slot)view_container.slot).get_directory_view ();
+                    dir_view.reset_progress ();
+                }
+            });
         }
 
         private void make_bindings () {