Merge lp://qastaging/~3v1n0/ubuntu/oneiric/nautilus/unity-launcher-support into lp://qastaging/ubuntu/oneiric/nautilus
| Status: | Merged |
|---|---|
| Merge reported by: | Ken VanDine |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~3v1n0/ubuntu/oneiric/nautilus/unity-launcher-support |
| Merge into: | lp://qastaging/ubuntu/oneiric/nautilus |
| Prerequisite: | lp://qastaging/~3v1n0/ubuntu/oneiric/nautilus/progress-indicator-support |
| Diff against target: |
1438 lines (+989/-7) 26 files modified
.pc/applied-patches (+1/-0) Makefile.in (+2/-0) config.h.in (+3/-0) configure (+158/-1) configure.in (+26/-1) cut-n-paste-code/Makefile.in (+2/-0) cut-n-paste-code/libegg/Makefile.in (+2/-0) data/Makefile.in (+2/-0) data/icons/Makefile.in (+2/-0) debian/changelog (+6/-1) debian/patches/12_unity_launcher_support.patch (+455/-0) debian/patches/series (+1/-0) docs/Makefile.in (+2/-0) docs/reference/Makefile.in (+2/-0) docs/reference/libnautilus-extension/Makefile.in (+2/-0) eel/Makefile.in (+2/-0) icons/Makefile.in (+2/-0) libnautilus-extension/Makefile.in (+2/-0) libnautilus-private/Makefile.in (+2/-0) libnautilus-private/nautilus-progress-info.c (+40/-0) libnautilus-private/nautilus-progress-info.h (+2/-0) nautilus-sendto-extension/Makefile.in (+2/-0) src/Makefile.am (+2/-0) src/Makefile.in (+8/-4) src/nautilus-progress-ui-handler.c (+259/-0) test/Makefile.in (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/ubuntu/oneiric/nautilus/unity-launcher-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
As discussed in the merge request of lp:~3v1n0/ubuntu/oneiric/nautilus/progress-indicator-support the nautilus file operation progress could be shown also using its unity launcher icon.
So, I've added some kind of Nautilus / Unity integration trough libunity facilities. Basically a progress bar is shown to indicate the effective progress of all the pending operations (to get this I had to edit also libnautilus-
Plus I've added two quicklist items that are enabled only during the transfer time which allows to show the progress window and to cancel all the pending operations (as requested by bug #784804).
You can see a screencast to show how it works here: http://
The quicklist and progress bar are applied both to "nautilus.desktop" and "nautilus-
I've not reverted or disabled the patch at lp:~3v1n0/ubuntu/oneiric/nautilus/progress-indicator-support however I guess that if you prefer not to have both the indicator and the unity launcher progress bar, the faster way is to just compile the deb package with the --disable-
| Matthew Paul Thomas (mpt) wrote | # |
| Matthew Paul Thomas (mpt) wrote | # |
| Ken VanDine (ken-vandine) wrote | # |
| Marco Trevisan (Treviño) (3v1n0) wrote | # |
| Noitidart (noitidart) wrote | # |
| Marco Trevisan (Treviño) (3v1n0) wrote | # |
The use of a progress bar on the Unity launcher item looks good to me.
For the badge, I suggest showing it only if there are any tasks queued after the current one. (That is, the badge should never say "1".) That way you can tell at a glance whether the progress bar represents everything that you need to wait for before logging out etc, or whether there's more after that.