Merge lp://qastaging/~ahayzen/ubuntu-settings-components/model-update-printer-printerjob into lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Jonas G. Drange |
| Approved revision: | 230 |
| Merged at revision: | 226 |
| Proposed branch: | lp://qastaging/~ahayzen/ubuntu-settings-components/model-update-printer-printerjob |
| Merge into: | lp://qastaging/~phablet-team/ubuntu-settings-components/printer-components |
| Diff against target: |
262 lines (+111/-12) 8 files modified
plugins/Ubuntu/Settings/Printers/backend/backend_cups.cpp (+2/-0) plugins/Ubuntu/Settings/Printers/models/jobmodel.cpp (+8/-1) plugins/Ubuntu/Settings/Printers/models/printermodel.cpp (+17/-1) plugins/Ubuntu/Settings/Printers/printer/printer.cpp (+37/-10) plugins/Ubuntu/Settings/Printers/printer/printer.h (+3/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.cpp (+36/-0) plugins/Ubuntu/Settings/Printers/printer/printerjob.h (+4/-0) plugins/Ubuntu/Settings/Printers/structs.h (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~ahayzen/ubuntu-settings-components/model-update-printer-printerjob |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jonas G. Drange (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* 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
* Ensure sorting is done by name last
Description of the change
* 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
* Ensure sorting is done by name last
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
two minor comments