Merge lp://qastaging/~verzegnassi-stefano/ubuntu-terminal-app/uitk13-migration into lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Alan Pope 🍺🐧🐱 🦄 | ||||
| Approved revision: | 153 | ||||
| Merged at revision: | 154 | ||||
| Proposed branch: | lp://qastaging/~verzegnassi-stefano/ubuntu-terminal-app/uitk13-migration | ||||
| Merge into: | lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot | ||||
| Diff against target: |
1040 lines (+225/-573) 22 files modified
manifest.json.in (+1/-1) src/app/qml/AlternateActionPopover.qml (+2/-2) src/app/qml/AuthenticationDialog.qml (+2/-2) src/app/qml/AuthenticationService.qml (+2/-2) src/app/qml/CircularTransparentButton.qml (+1/-1) src/app/qml/ColorSchemePage.qml (+59/-0) src/app/qml/ExpandableButton.qml (+1/-1) src/app/qml/KeyboardBar.qml (+1/-1) src/app/qml/KeyboardRows/ExpandableKeyboardButton.qml (+1/-1) src/app/qml/KeyboardRows/JsonTranslator.qml (+1/-1) src/app/qml/KeyboardRows/KeyModel.qml (+1/-1) src/app/qml/KeyboardRows/KeyboardButton.qml (+1/-1) src/app/qml/KeyboardRows/KeyboardLayout.qml (+2/-2) src/app/qml/KeyboardRows/KeyboardRow.qml (+1/-1) src/app/qml/LayoutsPage.qml (+15/-11) src/app/qml/ListItemWithActions.qml (+0/-454) src/app/qml/SettingsPage.qml (+113/-84) src/app/qml/TabsPage.qml (+1/-2) src/app/qml/TerminalComponent.qml (+1/-1) src/app/qml/TerminalPage.qml (+8/-2) src/app/qml/ubuntu-terminal-app.qml (+10/-1) terminal.apparmor (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~verzegnassi-stefano/ubuntu-terminal-app/uitk13-migration | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alan Pope 🍺🐧🐱 🦄 (community) | Approve | ||
| Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
* Updated imports to Ubuntu.Components 1.3
* Use 'ubuntu-
* Migrated all the list items to ListItemLayout
* Added a Flickable in the settings page, so that the content can be scrolled on small screens
* Moved the 'color scheme' setting into a separate page, as per UITK 1.3 design specs (see section "List items", "Examples and best practice" for three slot layout)
Description of the change
* Updated imports to Ubuntu.Components 1.3
* Use 'ubuntu-
* Migrated all the list items to ListItemLayout
* Added a Flickable in the settings page, so that the content can be scrolled on small screens
* Moved the 'color scheme' setting into a separate page, as per UITK 1.3 design specs (see section "List items", "Examples and best practice" for three slot layout)
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
PASSED: Continuous integration, rev:153
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/