Merge lp://staging/~nikwen/ubuntu-terminal-app/uitk-update into lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Proposed by
Niklas Wenzel
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Alan Pope 🍺🐧🐱 🦄 | ||||
| Approved revision: | 106 | ||||
| Merged at revision: | 110 | ||||
| Proposed branch: | lp://staging/~nikwen/ubuntu-terminal-app/uitk-update | ||||
| Merge into: | lp://staging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot | ||||
| Diff against target: |
438 lines (+65/-81) 27 files modified
README.md (+1/-1) manifest.json.in (+1/-1) po/com.ubuntu.terminal.pot (+6/-6) src/app/qml/AlternateActionPopover.qml (+11/-26) src/app/qml/AuthenticationDialog.qml (+3/-3) src/app/qml/AuthenticationService.qml (+3/-3) src/app/qml/CircularTransparentButton.qml (+2/-2) src/app/qml/ExpandableButton.qml (+2/-2) src/app/qml/KeyboardBar.qml (+2/-2) src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml (+2/-2) src/app/qml/KeyboardRows/KeyModel.qml (+2/-2) src/app/qml/KeyboardRows/KeyboardButton.qml (+2/-2) src/app/qml/KeyboardRows/KeyboardLayout.qml (+4/-4) src/app/qml/KeyboardRows/KeyboardRow.qml (+2/-2) src/app/qml/LayoutsPage.qml (+2/-2) src/app/qml/ListItemWithActions.qml (+2/-2) src/app/qml/PressFeedback.qml (+1/-1) src/app/qml/SettingsPage.qml (+2/-2) src/app/qml/TabsModel.qml (+1/-1) src/app/qml/TabsPage.qml (+2/-2) src/app/qml/TerminalComponent.qml (+2/-2) src/app/qml/TerminalInputArea.qml (+1/-1) src/app/qml/TerminalKeyboardShortcutHandler.qml (+1/-1) src/app/qml/TerminalPage.qml (+3/-3) src/app/qml/TerminalSettings.qml (+1/-1) src/app/qml/ubuntu-terminal-app.qml (+2/-3) terminal.apparmor (+2/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~nikwen/ubuntu-terminal-app/uitk-update | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alan Pope 🍺🐧🐱 🦄 (community) | Approve | ||
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Update to the new UI Toolkit
Description of the change
Update to the new UI Toolkit
I decided not to switch to the new ListItem component this time as it does not seem to be ready yet. (Check out this thread: https:/
To post a comment you must log in.
Revision history for this message
| Niklas Wenzel (nikwen) wrote | # |
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Niklas Wenzel (nikwen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Should be ready for merging now. :)