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

Proposed by Grabli66
Status: Work in progress
Proposed branch: lp://staging/~grabli66-r/pantheon-files/inline-progress
Merge into: lp://staging/~elementary-apps/pantheon-files/trunk
Diff against target: 797 lines (+269/-57)
17 files modified
.bzrignore (+1/-0)
libcore/fm-list-model.c (+29/-3)
libcore/fm-list-model.h (+5/-2)
libcore/marlin-file-operations.c (+25/-17)
libcore/marlin-progress-info.c (+29/-0)
libcore/marlin-progress-info.h (+9/-0)
libcore/pantheon-files-core-C.vapi (+10/-4)
src/Application.vala (+3/-4)
src/CMakeLists.txt (+1/-1)
src/ProgressUIHandler.vala (+15/-2)
src/TextRenderer.vala (+77/-14)
src/View/AbstractDirectoryView.vala (+35/-1)
src/View/AbstractTreeView.vala (+2/-1)
src/View/ColumnView.vala (+1/-1)
src/View/IconView.vala (+4/-3)
src/View/ListView.vala (+3/-4)
src/View/Window.vala (+20/-0)
To merge this branch: bzr merge lp://staging/~grabli66-r/pantheon-files/inline-progress
Reviewer Review Type Date Requested Status
Jeremy Wootten appearance Needs Fixing
Adam Bieńkowski (community) code Needs Fixing
elementary Apps team Pending
Review via email: mp+295618@code.staging.launchpad.net

Description of the change

Inline progress

To post a comment you must log in.
2170. By Grabli66

fix code style

2171. By Grabli66

removed unused code

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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!

Revision history for this message
Grabli66 (grabli66-r) wrote :

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.
>

2172. By Grabli66

removed unused file from cmakelist

Revision history for this message
Adam Bieńkowski (donadigo) wrote :

Update the branch to the latest trunk.

review: Needs Fixing (code)
2173. By Grabli66

po files

2174. By Grabli66

fix merge

Revision history for this message
Grabli66 (grabli66-r) wrote :

Updated to current trunk

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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

review: Needs Fixing
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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

2175. By grabli66 <email address hidden>

merge with trunc

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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)
Revision history for this message
Grabli66 (grabli66-r) wrote :

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.
>

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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>

merge with trunc

2174. By Grabli66

fix merge

2173. By Grabli66

po files

2172. By Grabli66

removed unused file from cmakelist

2171. By Grabli66

removed unused code

2170. By Grabli66

fix code style

2169. By Grabli66

po file

2168. By Grabli66

fix progress bar for icon view

2167. By Grabli66

different text color then progress file

2166. By Grabli66

progress finished

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: