Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/printer-add into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Merged at revision: | 221 |
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-settings-components/printer-add |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
1814 lines (+1229/-73) 21 files modified
examples/Printers.qml (+268/-3) plugins/Ubuntu/Settings/Printers/CMakeLists.txt (+3/-0) plugins/Ubuntu/Settings/Printers/backend/backend.cpp (+7/-3) plugins/Ubuntu/Settings/Printers/backend/backend.h (+11/-3) plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+15/-8) plugins/Ubuntu/Settings/Printers/backend/backend_cups.h (+4/-3) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp (+150/-14) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h (+54/-4) plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp (+153/-0) plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h (+31/-6) plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp (+181/-0) plugins/Ubuntu/Settings/Printers/models/drivermodel.h (+83/-0) plugins/Ubuntu/Settings/Printers/plugin.cpp (+4/-1) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+1/-0) plugins/Ubuntu/Settings/Printers/printers/printers.cpp (+57/-15) plugins/Ubuntu/Settings/Printers/printers/printers.h (+23/-10) plugins/Ubuntu/Settings/Printers/structs.h (+18/-0) tests/unittests/Printers/CMakeLists.txt (+4/-0) tests/unittests/Printers/mockbackend.h (+17/-3) tests/unittests/Printers/tst_drivermodel.cpp (+136/-0) tests/unittests/Printers/tst_printers.cpp (+9/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/printer-add |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hayzen (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* allows creation of printers in example qml, and by extension the API
* create printers by either providing a PPD file, or select a PPD from the database
* adds a DriverModel that holds printer drivers, which can be filtered
* adds testing of DriverModel
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This works by manually specifying the device URI, picking the right driver, setting a name.
In the future it'd be good to have network discovery, auto selection of drivers from an IP address etc