Merge lp://staging/~ahayzen/ubuntu-printing-app/page-range-ignore-sheets-count into lp://staging/ubuntu-printing-app
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Michael Sheldon |
| Approved revision: | 67 |
| Merged at revision: | 36 |
| Proposed branch: | lp://staging/~ahayzen/ubuntu-printing-app/page-range-ignore-sheets-count |
| Merge into: | lp://staging/ubuntu-printing-app |
| Prerequisite: | lp://staging/~ahayzen/ubuntu-printing-app/queue-dialog |
| Diff against target: |
156 lines (+50/-24) 4 files modified
po/ubuntu-printing-app.pot (+24/-22) ubuntu-printing-app/components/PrintRow.qml (+11/-1) ubuntu-printing-app/pages/PrintPage.qml (+9/-1) ubuntu-printing-app/tests/qmltests/tst_PrintPage.qml (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~ahayzen/ubuntu-printing-app/page-range-ignore-sheets-count |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Sheldon (community) | Approve | ||
|
Review via email:
|
|||
Commit message
* Only show sheets count in print button when we are not performing a print range for now.
* Fix sheets text so that it shows singular and plural
Description of the change
* Only show sheets count in print button when we are not performing a print range for now.
* Fix sheets text so that it shows singular and plural
To post a comment you must log in.
Revision history for this message
| Andrew Hayzen (ahayzen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
For phase 1, if there is a page range we won't show the amount of sheets it will result in.
In phase 2 there will be full validation of the copies/printRange fields at this point we'll calculate the number of sheets.