Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/quality-read-write into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components

Proposed by Jonas G. Drange
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 214
Merged at revision: 210
Proposed branch: lp://qastaging/~jonas-drange/ubuntu-settings-components/quality-read-write
Merge into: lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Diff against target: 862 lines (+247/-213)
16 files modified
examples/Printers.qml (+15/-1)
plugins/Ubuntu/Settings/Printers/cups/cupsfacade.h (+2/-0)
plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.cpp (+58/-31)
plugins/Ubuntu/Settings/Printers/cups/cupsfacade_impl.h (+6/-1)
plugins/Ubuntu/Settings/Printers/enums.h (+0/-9)
plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+21/-5)
plugins/Ubuntu/Settings/Printers/models/printermodel.h (+2/-1)
plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+48/-12)
plugins/Ubuntu/Settings/Printers/printer/printer.h (+3/-3)
plugins/Ubuntu/Settings/Printers/printer/printer_p.h (+5/-0)
plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+17/-8)
plugins/Ubuntu/Settings/Printers/printer/printerjob.h (+5/-4)
plugins/Ubuntu/Settings/Printers/structs.h (+23/-14)
plugins/Ubuntu/Settings/Printers/utils.h (+13/-119)
tests/unittests/Printers/mockcupsfacade.h (+6/-0)
tests/unittests/Printers/tst_printer.cpp (+23/-5)
To merge this branch: bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/quality-read-write
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) Approve
Review via email: mp+315176@code.qastaging.launchpad.net

Commit message

* Implements read/write of select Quality ppd settings
* Updates PrinterJob to use the correct quality setting
* Fixes broken ColorModel system, now reflects most ppds, and leaves the ppd implementation details in the ppd (colorspace, organization, etc)

To post a comment you must log in.
212. By Jonas G. Drange

reloads qualities

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

For my HP printers I don't get any Quality values from them. I had to add "OutputMode" to the list of opts in CupsFacadeImpl::printerGetSupportedQualities. See a grep of my ppd file http://pastebin.ubuntu.com/23832630/ which shows that OutputMode and DefaultOutputMode should probably be used.

review: Needs Fixing
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Also can the list of quality opts in CupsFacadeImpl::printerGetSupportedQualities and CupsFacadeImpl::printerGetOptions be combined so we don't have two repeated lists to maintain?

213. By Jonas G. Drange

addresses comments from Andrew

214. By Jonas G. Drange

fixes warnings

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM, thanks for the fixes :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches