Lang

Merge lp://qastaging/~ibelieve/lang/layout_improvements into lp://qastaging/lang

  1. layout_improvements
  2. Merge into trunk
Proposed by Michael Spencer
Status: Merged
Approved by: Bogdan
Approved revision: 13
Merged at revision: 11
Proposed branch: lp://qastaging/~ibelieve/lang/layout_improvements
Merge into: lp://qastaging/lang
Diff against target: 959 lines (+310/-575)
9 files modified
.bzrignore (+1/-0)
Lang.qmlproject (+2/-2)
Lang.qmlproject.user (+0/-407)
QML/AddCollectionDialog.qml (+83/-0)
QML/CollectionsPage.qml (+77/-0)
QML/DeleteCollectionDialog.qml (+28/-0)
QML/Lang.qml (+5/-166)
components/ConfirmDialog.qml (+47/-0)
components/DialogButtonRow.qml (+67/-0)
To merge this branch: bzr merge lp://qastaging/~ibelieve/lang/layout_improvements
Reviewer Review Type Date Requested Status
Bogdan Approve
Review via email: mp+233090@code.qastaging.launchpad.net

Commit message

Improve the layout of the collections page and some of the dialogs

Description of the change

Improve the layout of the collections page and some of the dialogs

- Use a grid view on the collections page with auto-resizing cells so the padding is always even on all sides
- Add an empty placeholder label to the colections page when there are no vocabulary collections
- Move the collections page into a separate file
- Move the add collection dialog into a separate file and improve the layout
- Move the delete collection into a separate file and improve the layout

To post a comment you must log in.
Revision history for this message
Bogdan (boghison) wrote :

Thank you very much.

review: Approve
Revision history for this message
Michael Spencer (ibelieve) wrote :

I'm not entirely sure of the process outside of the Ubuntu core apps, but since you don't have a ubuntu bot running Jenkins and automatically doing the merges, I think you're going to have to merge my branch from the command line, push the new commit to Launchpad, and then mark the Status as Merged.

See the "Making the Merge" section here: https://help.launchpad.net/Code/Review

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: