Merge lp://staging/~jonas-drange/ubuntu-settings-components/buffer-printer-state-events into lp://staging/ubuntu-settings-components
Proposed by
Jonas G. Drange
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~jonas-drange/ubuntu-settings-components/buffer-printer-state-events |
| Merge into: | lp://staging/ubuntu-settings-components |
| Diff against target: |
9821 lines (+9457/-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 (+782/-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/~jonas-drange/ubuntu-settings-components/buffer-printer-state-events |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
* adds PrinterSignalHa
* uses PrinterSignalHa
To post a comment you must log in.
Unmerged revisions
- 254. By Jonas G. Drange
-
undoes spurious change
- 253. By Jonas G. Drange
-
adds signalhandler to buffer printer change signals
- 252. By Jonas G. Drange
-
reverts changes to instance, and removes ownerrole
- 251. By Jonas G. Drange
-
fix printers falling through
- 250. By Jonas G. Drange
-
addresses andrews comments
- 249. By Jonas G. Drange
-
fixes jobs on each printer, removes setname, but emits signal when it changes
- 248. By Jonas G. Drange
-
do some debugging
- 247. By Jonas G. Drange
-
adds some bells and whistles to jobmodel
- 246. By Jonas G. Drange
-
adds jobmodel and jobfilter tests
- 245. By Jonas G. Drange
-
updates printer tests
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
