Merge lp://staging/~jeremywootten/pantheon-files/transfer-popover-with-pie-progress into lp://staging/~elementary-apps/pantheon-files/trunk
Status: | Superseded | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp://staging/~jeremywootten/pantheon-files/transfer-popover-with-pie-progress | ||||||||||||
Merge into: | lp://staging/~elementary-apps/pantheon-files/trunk | ||||||||||||
Diff against target: |
2642 lines (+1397/-452) 28 files modified
CMakeLists.txt (+3/-2) data/CMakeLists.txt (+5/-2) data/pantheon-files.db.service.cmake (+4/-0) data/pantheon-files.ql.service.cmake (+4/-0) data/pantheon-files.service.cmake (+1/-0) libcore/Enums.vala (+9/-0) libcore/gof-directory-async.vala (+1/-0) libcore/marlin-file-operations.c (+89/-34) libcore/marlin-progress-info.c (+190/-2) libcore/marlin-progress-info.h (+18/-0) libcore/pantheon-files-core-C.vapi (+7/-0) libwidgets/CMakeLists.txt (+3/-0) pantheon-files-daemon/CMakeLists.txt (+48/-17) pantheon-files-daemon/ProgressHandlerQuicklistInterface.vala (+31/-0) pantheon-files-daemon/QuicklistHandler.vala (+217/-43) pantheon-files-daemon/main.vala (+68/-0) pantheon-files-daemon/marlind-tagging.vala (+0/-58) pantheon-files-daemon/pantheon-files-daemon.vapi (+28/-0) src/Application.vala (+57/-9) src/CMakeLists.txt (+10/-13) src/ProgressUIHandler.vala (+107/-169) src/View/Slot.vala (+1/-1) src/View/Widgets/ProgressIndicator.vala (+105/-0) src/View/Widgets/ProgressIndicatorWithPopover.vala (+121/-0) src/View/Widgets/ProgressInfoListRow.vala (+238/-0) src/View/Widgets/ProgressInfoWidget.vala (+0/-102) src/View/Widgets/TopMenu.vala (+20/-0) src/View/Window.vala (+12/-0) |
||||||||||||
To merge this branch: | bzr merge lp://staging/~jeremywootten/pantheon-files/transfer-popover-with-pie-progress | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zisu Andrei | Pending | ||
Danielle Foré | Pending | ||
Review via email: mp+311349@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-03-10.
Description of the change
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.
Unmerged revisions
- 2047. By Jeremy Wootten
-
Merge trunk to r2470
- 2046. By Jeremy Wootten
-
Define MarlinFileOpera
tionType in marlin- progress- info.h not Enums.vala to avoid conflicts with testing branches - 2045. By Jeremy Wootten
-
Move Progress widgets to src/View/Widgets
- 2044. By Jeremy Wootten
-
Merge trunk to r2444 and resolve conflicts
- 2043. By Jeremy Wootten
-
Merge trunk to r2382 and resolve conflicts
- 2042. By Jeremy Wootten
-
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
-
Change total_files to total_file_count
- 2040. By Jeremy Wootten
-
Change remaining_files to remaining_
file_count - 2039. By Jeremy Wootten
-
Rename info->no_files
- 2038. By Jeremy Wootten
-
Initialise info->current_
filename; return empty string if null
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.