Merge lp://staging/~phablet-team/ubuntu-settings-components/printer-components into lp://staging/ubuntu-settings-components
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~phablet-team/ubuntu-settings-components/printer-components |
Merge into: | lp://staging/ubuntu-settings-components |
Diff against target: |
9826 lines (+9462/-1) 59 files modified
CMakeLists.txt (+7/-0) debian/changelog (+7/-0) debian/control (+3/-0) debian/qml-module-ubuntu-settings-components.install (+1/-0) examples/PrinterQueue.qml (+118/-0) examples/Printers.qml (+604/-0) plugins/Ubuntu/Settings/CMakeLists.txt (+1/-0) plugins/Ubuntu/Settings/Printers/CMakeLists.txt (+53/-0) plugins/Ubuntu/Settings/Printers/backend/backend.cpp (+350/-0) plugins/Ubuntu/Settings/Printers/backend/backend.h (+223/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+787/-0) plugins/Ubuntu/Settings/Printers/backend/backend_cups.h (+152/-0) plugins/Ubuntu/Settings/Printers/backend/backend_pdf.cpp (+119/-0) plugins/Ubuntu/Settings/Printers/backend/backend_pdf.h (+47/-0) plugins/Ubuntu/Settings/Printers/cups/ippclient.cpp (+988/-0) plugins/Ubuntu/Settings/Printers/cups/ippclient.h (+121/-0) plugins/Ubuntu/Settings/Printers/cups/printerdriverloader.cpp (+128/-0) plugins/Ubuntu/Settings/Printers/cups/printerdriverloader.h (+61/-0) plugins/Ubuntu/Settings/Printers/cups/printerloader.cpp (+53/-0) plugins/Ubuntu/Settings/Printers/cups/printerloader.h (+49/-0) plugins/Ubuntu/Settings/Printers/enums.h (+141/-0) plugins/Ubuntu/Settings/Printers/i18n.cpp (+44/-0) plugins/Ubuntu/Settings/Printers/i18n.h (+29/-0) plugins/Ubuntu/Settings/Printers/models/drivermodel.cpp (+175/-0) plugins/Ubuntu/Settings/Printers/models/drivermodel.h (+82/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp (+391/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.h (+125/-0) plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+533/-0) plugins/Ubuntu/Settings/Printers/models/printermodel.h (+161/-0) plugins/Ubuntu/Settings/Printers/org.cups.cupsd.Notifier.xml (+146/-0) plugins/Ubuntu/Settings/Printers/plugin.cpp (+58/-0) plugins/Ubuntu/Settings/Printers/plugin.h (+33/-0) plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+358/-0) plugins/Ubuntu/Settings/Printers/printer/printer.h (+109/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+514/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.h (+174/-0) plugins/Ubuntu/Settings/Printers/printer/printersignalhandler.cpp (+69/-0) plugins/Ubuntu/Settings/Printers/printer/printersignalhandler.h (+55/-0) plugins/Ubuntu/Settings/Printers/printers/printers.cpp (+251/-0) plugins/Ubuntu/Settings/Printers/printers/printers.h (+107/-0) plugins/Ubuntu/Settings/Printers/printers_global.h (+23/-0) plugins/Ubuntu/Settings/Printers/qmldir (+2/-0) plugins/Ubuntu/Settings/Printers/structs.h (+103/-0) plugins/Ubuntu/Settings/Printers/utils.h (+110/-0) po/ubuntu-settings-components.pot (+25/-1) po/update-usc-pot (+1/-0) tests/CMakeLists.txt (+1/-0) tests/unittests/CMakeLists.txt (+1/-0) tests/unittests/Printers/CMakeLists.txt (+46/-0) tests/unittests/Printers/mockbackend.h (+443/-0) tests/unittests/Printers/tst_drivermodel.cpp (+136/-0) tests/unittests/Printers/tst_jobfilter.cpp (+55/-0) tests/unittests/Printers/tst_jobmodel.cpp (+120/-0) tests/unittests/Printers/tst_printer.cpp (+284/-0) tests/unittests/Printers/tst_printerfilter.cpp (+117/-0) tests/unittests/Printers/tst_printerjob.cpp (+207/-0) tests/unittests/Printers/tst_printermodel.cpp (+161/-0) tests/unittests/Printers/tst_printers.cpp (+156/-0) tests/unittests/Printers/tst_signalhandler.cpp (+44/-0) |
To merge this branch: | bzr merge lp://staging/~phablet-team/ubuntu-settings-components/printer-components |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity Team | Pending | ||
Review via email: mp+314435@code.staging.launchpad.net |
Commit message
* packaging: suggest cups, depend on libcups2-dev
* adds cups bindings for printer/job management
Unmerged revisions
- 232. By Jonas G. Drange
-
* adds PrinterSignalHa
ndler that is responsible for handling (some) printer signals.
* uses PrinterSignalHandler in PrinterModel so that i only will update printers a minimum number of times - 231. By Jonas G. Drange
-
frees all the jobs which works fine
- 230. By Jonas G. Drange
-
merges ~jonas-
drange/ ubuntu- settings- components/ asyncness/ - 229. By Andrew Hayzen
-
* Expose many more properties of PrinterJob to the JobModel
* Load PrinterJob properties from the ipp job attributes when loading for the JobModel - 228. By Andrew Hayzen
-
* Resolve console warnings - add TODOs in methods that should be implemented where I've put a fake return value for now
* Set a default for switches that compiler thinks it can reach the end of the control without
* Add return values for methods that are not implemented yet
* Add Q_UNUSED for parameters that aren't used - 227. By Andrew Hayzen
-
* Link notifications to JobModel - removing polling
* Fix compiler errors that appeared from the previous branch
* Fix logic change in last branch that was wrong way around - 226. By Andrew Hayzen
-
* Add updateFrom to Printer and PrinterJob
* Call updateFrom in PrinterModel and JobModel when printers are the same
* Emit dataChanged signal in models when updateFrom returns a change
* Add deepCompare to Printer and PrinterJob - 225. By Jonas G. Drange
-
* Deprecate QTimer based update()
* Replace with cups subscription based update()
* Fixes tests. - 224. By Andrew Hayzen
-
* Add JobModel which lists the jobs for a certain printer
* Add JobRole to PrinterModel to access jobs
* Add JobState enum to track enums from cups
* Add example Queue which lists jobs for a printer with their name, id, status and allows you to cancel the job by clicking - 223. By Andrew Hayzen
-
* Add cancel method to Printers