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 | ||||
Related bugs: |
|
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.
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
There is at least one missing file - src/ProgressRen derCell. vala. Please add to bzr.
Note that this branch may be delayed for merging by Loki feature freeze.
Thanks for your contribution!