Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/printerbackend into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Jonas G. Drange
| Status: | Merged |
|---|---|
| Approved by: | Andrew Hayzen |
| Approved revision: | 221 |
| Merged at revision: | 212 |
| Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-settings-components/printerbackend |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
4434 lines (+1938/-1352) 36 files modified
examples/Printers.qml (+1/-1) plugins/Ubuntu/Settings/Printers/CMakeLists.txt (+5/-6) plugins/Ubuntu/Settings/Printers/backend/backend.cpp (+291/-0) plugins/Ubuntu/Settings/Printers/backend/backend.h (+153/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+317/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.h (+130/-0) plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp (+124/-0) plugins/Ubuntu/Settings/Printers/backend/backend_pdf.h (+53/-0) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.cpp (+82/-86) plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h (+59/-61) plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.h (+0/-98) plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+52/-62) plugins/Ubuntu/Settings/Printers/models/printermodel.h (+10/-7) plugins/Ubuntu/Settings/Printers/models/printermodel_p.h (+0/-35) plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+49/-113) plugins/Ubuntu/Settings/Printers/printer/printer.h (+13/-22) plugins/Ubuntu/Settings/Printers/printer/printer_p.h (+0/-41) plugins/Ubuntu/Settings/Printers/printer/printerinfo.h (+0/-67) plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.cpp (+0/-39) plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.h (+0/-58) plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.cpp (+0/-152) plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.h (+0/-62) plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.cpp (+0/-91) plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.h (+0/-55) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+27/-40) plugins/Ubuntu/Settings/Printers/printer/printerjob.h (+5/-3) plugins/Ubuntu/Settings/Printers/printers/printers.cpp (+19/-42) plugins/Ubuntu/Settings/Printers/printers/printers.h (+9/-7) plugins/Ubuntu/Settings/Printers/printers/printers_p.h (+0/-39) tests/unittests/Printers/CMakeLists.txt (+1/-2) tests/unittests/Printers/mockbackend.h (+375/-0) tests/unittests/Printers/tst_printer.cpp (+52/-43) tests/unittests/Printers/tst_printerfilter.cpp (+22/-23) tests/unittests/Printers/tst_printerjob.cpp (+11/-14) tests/unittests/Printers/tst_printermodel.cpp (+46/-47) tests/unittests/Printers/tst_printers.cpp (+32/-36) |
| To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/printerbackend |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hayzen (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Rewrites Printer, PrinterJob, PrinterModel to all use a new backend.
* Adds new backend that bridges PDF and Cups implementations.
* Drops PIMPL idiom since we're not going to export C++ headers anyway.
* Drops most bridge patterns in classes that are now implementation details (QPrinterInfo, CupsFacade).
* Tries to deal with some RAII issues.
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
Seems the ColorModelType in PrinterJob was broken in a previous branch.
Could you update PrinterJob:
Other than this, I've not found any other regressions in the printing-app yet.