Merge lp://staging/~charlesk/indicator-transfer/indicator-transfer into lp://staging/indicator-transfer/14.04
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~charlesk/indicator-transfer/indicator-transfer |
| Merge into: | lp://staging/indicator-transfer/14.04 |
| Diff against target: |
4422 lines (+4161/-1) 50 files modified
CMakeLists.txt (+82/-0) HACKING (+41/-0) MERGE-REVIEW (+32/-0) README (+57/-1) TODO (+8/-0) cmake/FindGMock.cmake (+10/-0) cmake/GCov.cmake (+51/-0) cmake/GdbusCodegen.cmake (+36/-0) cmake/Translations.cmake (+41/-0) data/CMakeLists.txt (+75/-0) data/com.canonical.indicator.transfer (+13/-0) data/indicator-transfer.conf.in (+9/-0) data/indicator-transfer.desktop.in (+9/-0) data/indicator-transfer.upstart.desktop.in (+9/-0) debian/compat (+1/-0) debian/control (+34/-0) debian/copyright (+23/-0) debian/rules (+11/-0) debian/source/format (+1/-0) debian/watch (+2/-0) include/CMakeLists.txt (+1/-0) include/transfer/CMakeLists.txt (+2/-0) include/transfer/controller.h (+63/-0) include/transfer/dbus-shared.h (+23/-0) include/transfer/model.h (+74/-0) include/transfer/transfer.h (+79/-0) include/transfer/view-console.h (+56/-0) include/transfer/view-gmenu.h (+51/-0) include/transfer/view.h (+47/-0) include/transfer/world-dbus.h (+69/-0) include/transfer/world.h (+52/-0) po/CMakeLists.txt (+3/-0) src/CMakeLists.txt (+33/-0) src/controller.cpp (+120/-0) src/main.cpp (+57/-0) src/model.cpp (+113/-0) src/view-console.cpp (+94/-0) src/view-gmenu.cpp (+875/-0) src/view.cpp (+40/-0) src/world-dbus.cpp (+634/-0) src/world.cpp (+41/-0) tests/CMakeLists.txt (+42/-0) tests/controller-mock.h (+54/-0) tests/glib-fixture.h (+141/-0) tests/manual-tests/simple-download.py (+75/-0) tests/manual-tests/simple-download.txt (+33/-0) tests/test-controller.cpp (+344/-0) tests/test-view-gmenu.cpp (+298/-0) tests/world-mock.h (+49/-0) trim-lcov.py (+53/-0) |
| To merge this branch: | bzr merge lp://staging/~charlesk/indicator-transfer/indicator-transfer |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-06-18.
Commit message
This sets up the code layout, menu, indicator, unit tests, code coverage rules, etc... what you'd expect from an indicator.
Description of the change
This sets up the code layout, menu, indicator, unit tests, code coverage rules, etc... what you'd expect from an indicator. Still work to be done on this but I wanted to put it out for visibility & comments/feedback.
Needs a TransferController subclass that discovers new Transfers as they appear on the bus, but the pieces that are here all work & are well tested.
Important note, Jenkins may not be happy with this: bzr bd fails for lack of an upstream tarball. Not sure how to bootstrap the initial build...
| Michael Sheldon (michael-sheldon) wrote | # |
| Ted Gould (ted) | # |
| Ted Gould (ted) | # |
| Ted Gould (ted) wrote | # |
| Charles Kerr (charlesk) wrote | # |
Unmerged revisions
- 21. By Charles Kerr
-
tweak manual test formatting
- 20. By Charles Kerr
-
make manual tests follow the common format as per https:/
/wiki.ubuntu. com/QATeam/ ContributingTes tcases/ ManualStyleGuid e - 19. By Charles Kerr
-
in the simple-download manual test, update the script to use python3 rather than python2
- 18. By Charles Kerr
-
in debian/control, recommend content-hub and ubuntu-
download- manager. - 17. By Charles Kerr
-
in debian/control, remove depends/recommends that were added by cut-and-paste error
- 16. By Charles Kerr
-
add phone_greeter mode
- 15. By Charles Kerr
-
when world-dbus.cpp hears started/
paused/ resumed/ cancled signals from com.canonical. applications. Download, check their 'success' parameter before updating the states of our model's Transfers. - 14. By Charles Kerr
-
tell simple-download.py to use python2
- 13. By Charles Kerr
-
don't show the 'Clear all', 'Pause all', 'Resume all' bulk action buttons if there's nothing for them to operate on
- 12. By Charles Kerr
-
add a custom x-canonical-type for the 'bulk actions' menubuttons as a hint to the renderer
Just noticed that the debian changelog currently has the package name as "indicator-