lp:~jonas-drange/ubuntu-ui-extras/fix-enabled

Branch merges

Propose for merging

No branches dependent on this one.

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

Andrew Hayzen (community): Approve on 2017-03-22

Diff: 10 lines (+1/-0)

1 file modified

modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp (+1/-0)

api

Superseded for merging into lp:ubuntu-ui-extras

Ubuntu Phablet Team: Pending requested 2017-03-21

Diff: 6398 lines (+3881/-590)

45 files modified

modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml (+0/-117)
modules/Ubuntu/Components/Extras/Example/Printers.qml (+232/-75)
modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt (+4/-1)
modules/Ubuntu/Components/Extras/Printers/backend/backend.cpp (+48/-0)
modules/Ubuntu/Components/Extras/Printers/backend/backend.h (+13/-0)
modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp (+225/-44)
modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.h (+25/-1)
modules/Ubuntu/Components/Extras/Printers/backend/backend_pdf.cpp (+10/-0)
modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.cpp (+70/-0)
modules/Ubuntu/Components/Extras/Printers/cups/devicesearcher.h (+57/-0)
modules/Ubuntu/Components/Extras/Printers/cups/ippclient.cpp (+163/-9)
modules/Ubuntu/Components/Extras/Printers/cups/ippclient.h (+13/-1)
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/cups/printerloader.cpp (+3/-0)
modules/Ubuntu/Components/Extras/Printers/enums.h (+23/-0)
modules/Ubuntu/Components/Extras/Printers/models/devicemodel.cpp (+149/-0)
modules/Ubuntu/Components/Extras/Printers/models/devicemodel.h (+78/-0)
modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp (+267/-126)
modules/Ubuntu/Components/Extras/Printers/models/jobmodel.h (+53/-11)
modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp (+70/-30)
modules/Ubuntu/Components/Extras/Printers/models/printermodel.h (+13/-4)
modules/Ubuntu/Components/Extras/Printers/plugin.cpp (+2/-0)
modules/Ubuntu/Components/Extras/Printers/printer/printer.cpp (+150/-24)
modules/Ubuntu/Components/Extras/Printers/printer/printer.h (+29/-3)
modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp (+108/-60)
modules/Ubuntu/Components/Extras/Printers/printer/printerjob.h (+14/-11)
modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.cpp (+28/-6)
modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.h (+8/-6)
modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp (+132/-7)
modules/Ubuntu/Components/Extras/Printers/printers/printers.h (+18/-0)
modules/Ubuntu/Components/Extras/Printers/structs.h (+84/-0)
po/ubuntu-ui-extras.pot (+26/-2)
tests/unittests/Printers/CMakeLists.txt (+13/-3)
tests/unittests/Printers/mockbackend.h (+127/-4)
tests/unittests/Printers/tst_jobfilter.cpp (+4/-2)
tests/unittests/Printers/tst_jobmodel.cpp (+446/-29)
tests/unittests/Printers/tst_printer.cpp (+96/-0)
tests/unittests/Printers/tst_printerdevice.cpp (+131/-0)
tests/unittests/Printers/tst_printerdevicemodel.cpp (+162/-0)
tests/unittests/Printers/tst_printerfilter.cpp (+30/-0)
tests/unittests/Printers/tst_printerjob.cpp (+53/-0)
tests/unittests/Printers/tst_printermodel.cpp (+489/-1)
tests/unittests/Printers/tst_printers.cpp (+92/-7)
tests/unittests/Printers/tst_signalratelimiter.cpp (+26/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

155. By Jonas G. Drange on 2017-03-21

makes sure the backend is refreshed on enable/disable

154. By Jonas G. Drange on 2017-03-20

syncs with trunk

153. By Andrew Hayzen on 2017-03-20

* If printerAdded is called ensure there is always a proxy printer

152. By Jonas G. Drange on 2017-03-20

      corrects thread affinity for printerloaded printers, as well as any qobject children it might have

151. By Andrew Hayzen on 2017-03-20

* Remove PrinterQueue.qml example and add missing job methods to Printers.qml example, so we have only one example

150. By Jonas G. Drange on 2017-03-20

improves the deviceName by dropping the CMD (note that the full string remains accessible from device.id)

149. By Andrew Hayzen on 2017-03-16

* Connect job-impressions-completed from cups to PrinterJob::impressionsCompleted()
* In the job model listen to printerStateChanged as changes t job-impressions-completed causes that signal
* Improve the PrinterSignalHandler to limit the maximum wait time of unprocessed signals to four times the timeout
* Add unit test for SignalRateLimiter to check it does perform a flush
* Rename PrinterSignalHandler to SignalRateLimiter

148. By Andrew Hayzen on 2017-03-16

* Add a JobLoader for loading a specific jobId for a printer and loading the extended attributes
* Move the loading of creationTime, completedTime, processingTime, size and user to extended attributes as signals don't give us those
* Add method for PrinterBackend for getting a specific job
* Split up JobModel::update so there is jobCreated, jobState and jobCompleted which then call addJob, removeJob and updateJob
* Improve Printer::updateFrom to not call loadAttributes as this results in a possible UI block
* Add missing comparisions for PrinterJob deepCompare and updateFrom
* Change PrinterJob::setPrinter to not call loadDefaults and instead explicitly call it
* Change Printers to trigger requestJobExtendedAttributes which triggers a background thread rather than doing in foreground

147. By Jonas G. Drange on 2017-03-14

* exposes copies attribute on the printer

146. By Jonas G. Drange on 2017-03-13

includes cups/adminutils.h into which the cups device callback was moved in >= libcups2-dev 2.2.2