Merge lp://qastaging/~ahayzen/ubuntu-settings-components/extract-job-attributes into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 230 |
| Merged at revision: | 229 |
| Proposed branch: | lp://qastaging/~ahayzen/ubuntu-settings-components/extract-job-attributes |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
873 lines (+513/-11) 10 files modified
examples/PrinterQueue.qml (+5/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+80/-4) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp (+85/-0) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h (+1/-0) plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.cpp (+120/-2) plugins/Ubuntu/Settings/Printers/cups/cupspkhelper.h (+3/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp (+78/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.h (+15/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+94/-4) plugins/Ubuntu/Settings/Printers/printer/printerjob.h (+32/-1) |
| To merge this branch: | bzr merge lp://qastaging/~ahayzen/ubuntu-settings-components/extract-job-attributes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonas G. Drange (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Expose many more properties of PrinterJob to the JobModel
* Load PrinterJob properties from the ipp job attributes when loading for the JobModel
Description of the change
* Expose many more properties of PrinterJob to the JobModel
* Load PrinterJob properties from the ipp job attributes when loading for the JobModel
To post a comment you must log in.
Revision history for this message
| Andrew Hayzen (ahayzen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, thanks! One small comment.