Merge lp://qastaging/~ahayzen/ubuntu-settings-components/add-job-model into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 227 |
| Merged at revision: | 224 |
| Proposed branch: | lp://qastaging/~ahayzen/ubuntu-settings-components/add-job-model |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Prerequisite: | lp://qastaging/~ahayzen/ubuntu-settings-components/add-cancel-method |
| Diff against target: |
823 lines (+527/-12) 16 files modified
examples/PrinterQueue.qml (+113/-0) plugins/Ubuntu/Settings/Printers/CMakeLists.txt (+1/-0) plugins/Ubuntu/Settings/Printers/backend/backend.cpp (+7/-0) plugins/Ubuntu/Settings/Printers/backend/backend.h (+1/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+17/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.h (+1/-0) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp (+18/-0) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h (+1/-0) plugins/Ubuntu/Settings/Printers/enums.h (+13/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp (+222/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.h (+75/-0) plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+17/-0) plugins/Ubuntu/Settings/Printers/models/printermodel.h (+3/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+24/-8) plugins/Ubuntu/Settings/Printers/printer/printerjob.h (+9/-4) tests/unittests/Printers/mockbackend.h (+5/-0) |
| To merge this branch: | bzr merge lp://qastaging/~ahayzen/ubuntu-settings-components/add-job-model |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonas G. Drange (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Add JobModel which lists the jobs for a certain printer
* Add JobRole to PrinterModel to access jobs
* Add JobState enum to track enums from cups
* Add example Queue which lists jobs for a printer with their name, id, status and allows you to cancel the job by clicking
Description of the change
* Add JobModel which lists the jobs for a certain printer
* Add JobRole to PrinterModel to access jobs
* Add JobState enum to track enums from cups
* Add example Queue which lists jobs for a printer with their name, id, status and allows you to cancel the job by clicking
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
Added a couple of comments.