Merge lp://qastaging/~ahayzen/ubuntu-settings-components/add-fake-pdf-mode-and-other-fixes into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 212 |
| Merged at revision: | 209 |
| Proposed branch: | lp://qastaging/~ahayzen/ubuntu-settings-components/add-fake-pdf-mode-and-other-fixes |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
716 lines (+365/-31) 19 files modified
examples/Printers.qml (+6/-2) plugins/Ubuntu/Settings/Printers/CMakeLists.txt (+3/-0) plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+28/-3) plugins/Ubuntu/Settings/Printers/models/printermodel.h (+4/-0) plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+27/-14) plugins/Ubuntu/Settings/Printers/printer/printer.h (+1/-1) plugins/Ubuntu/Settings/Printers/printer/printerinfo.h (+2/-0) plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.cpp (+39/-0) plugins/Ubuntu/Settings/Printers/printer/printerinfo_allimpl.h (+58/-0) plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.cpp (+5/-0) plugins/Ubuntu/Settings/Printers/printer/printerinfo_impl.h (+2/-0) plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.cpp (+91/-0) plugins/Ubuntu/Settings/Printers/printer/printerinfo_pdfimpl.h (+55/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+17/-5) plugins/Ubuntu/Settings/Printers/printers/printers.cpp (+15/-2) plugins/Ubuntu/Settings/Printers/printers/printers.h (+2/-0) plugins/Ubuntu/Settings/Printers/printers/printers_p.h (+1/-0) plugins/Ubuntu/Settings/Printers/utils.h (+4/-4) tests/unittests/Printers/mockprinterinfo.h (+5/-0) |
| To merge this branch: | bzr merge lp://qastaging/~ahayzen/ubuntu-settings-components/add-fake-pdf-mode-and-other-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonas G. Drange (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Fix colorModelType not emitting when it may have changed, causing QML to get out of sync
* Add a Printers:
* Add a PrinterInfoAllImpl which combines PrinterInfoPdfImpl and PrinterInfoImpl for listing
* Add a PrinterInfoPdfImpl which implements a fake pdf printer (just a name in the list)
* Add isPdf role to PrinterModel
* Add filterOnPdf to PrinterModel to allow for only showing pdf printers
* Force pdf printers to bottom of the PrinterModel
* Inject a fake ColorModel in PrinterPrivate:
* Change PrinterJob:
* Improve the UI names for the Duplex modes
* Improve detection of color models so that "black" is a greyscale type
* In the example disable duplex mode when there is only None
Description of the change
* Fix colorModelType not emitting when it may have changed, causing QML to get out of sync
* Add a Printers:
* Add a PrinterInfoAllImpl which combines PrinterInfoPdfImpl and PrinterInfoImpl for listing
* Add a PrinterInfoPdfImpl which implements a fake pdf printer (just a name in the list)
* Add isPdf role to PrinterModel
* Add filterOnPdf to PrinterModel to allow for only showing pdf printers
* Force pdf printers to bottom of the PrinterModel
* Inject a fake ColorModel in PrinterPrivate:
* Change PrinterJob:
* Improve the UI names for the Duplex modes
* Improve detection of color models so that "black" is a greyscale type
* In the example disable duplex mode when there is only None
looks good, minor comment!