lp:~ahayzen/ubuntu-ui-extras/job-model-split-update

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~phablet-team/ubuntu-ui-extras/printer-staging at revision 148

Jonas G. Drange (community): Approve on 2017-03-16

Diff: 1894 lines (+750/-311)

23 files modified

modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt (+1/-0)
modules/Ubuntu/Components/Extras/Printers/backend/backend.cpp (+15/-0)
modules/Ubuntu/Components/Extras/Printers/backend/backend.h (+5/-0)
modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp (+103/-24)
modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.h (+10/-1)
modules/Ubuntu/Components/Extras/Printers/cups/ippclient.cpp (+13/-2)
modules/Ubuntu/Components/Extras/Printers/cups/ippclient.h (+2/-0)
modules/Ubuntu/Components/Extras/Printers/cups/jobloader.cpp (+50/-0)
modules/Ubuntu/Components/Extras/Printers/cups/jobloader.h (+47/-0)
modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp (+156/-100)
modules/Ubuntu/Components/Extras/Printers/models/jobmodel.h (+31/-9)
modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp (+0/-16)
modules/Ubuntu/Components/Extras/Printers/models/printermodel.h (+0/-1)
modules/Ubuntu/Components/Extras/Printers/plugin.cpp (+1/-0)
modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp (+12/-2)
modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp (+80/-56)
modules/Ubuntu/Components/Extras/Printers/printer/printerjob.h (+2/-1)
modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp (+34/-6)
tests/unittests/Printers/mockbackend.h (+82/-25)
tests/unittests/Printers/tst_jobfilter.cpp (+4/-2)
tests/unittests/Printers/tst_jobmodel.cpp (+77/-51)
tests/unittests/Printers/tst_printerjob.cpp (+2/-0)
tests/unittests/Printers/tst_printers.cpp (+23/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

158. By Andrew Hayzen on 2017-03-16

* Set timezone after time_t

157. By Andrew Hayzen on 2017-03-16

* Fix timezones, internally use UTC then when exposing to QML set as local timezone

156. By Andrew Hayzen on 2017-03-15

* Set timezone for completedTime, creationTime, processingTime in PrinterJob

155. By Andrew Hayzen on 2017-03-15

* Change JobLoader to only respond with a QMap of attributes and not a PrinterJob
* Change Printers to directly call JobModel::updateJobPrinter
* Remove headers we don't need in JobLoader
* Change FIXME to TODO
* Update tests

154. By Andrew Hayzen on 2017-03-14

* Use tryLock instead of lock and print a warning

153. By Andrew Hayzen on 2017-03-14

* Fix missed renames
* Fix failing tests
* Actually set the printer from JobLoader to the PrinterJob in JobModel, even if it isn't loaded to keep the reference up to date
* Improve emulation to be closer to real

152. By Andrew Hayzen on 2017-03-14

* Pull of upstream

151. By Andrew Hayzen on 2017-03-14

* Rename m_activeRequests to m_activePrinterRequests
* Update JobModel::updateJob description

150. By Andrew Hayzen on 2017-03-14

* Remove MockPrinters and use Printers directly

149. By Andrew Hayzen on 2017-03-14

* Resolve failing tests with new JobLoader changes
* Add comments