[Merge] lp:~phablet-team/messaging-app/shortcuts-and-focus into lp:messaging-app/staging

[Tiago Salem Herrmann]

Review: Needs Fixing

just remove the mentioned lines and we are good to go.

Diff comments:

> 
> === modified file 'src/qml/SettingsPage.qml'
> --- src/qml/SettingsPage.qml	2017-03-08 22:03:58 +0000
> +++ src/qml/SettingsPage.qml	2017-03-08 22:03:58 +0000
> @@ -54,84 +60,73 @@
>      header: PageHeader {
>          id: pageHeader
>          title: settingsPage.title
> -        leadingActionBar {
> -            id: leadingBar
> +        leadingActionBar.actions: [
> +            Action {
> +               iconName: "back"
> +               text: i18n.tr("Back")
> +               shortcut: "Esc"
> +               onTriggered: mainView.emptyStack(true)
> +            }
> +        ]
> +        flickable: settingsList
> +    }
> +
> +    onActiveChanged: {
> +        if (active) {
> +            settingsList.forceActiveFocus()
>          }
>      }
>  
> +
>      Component {
>          id: settingDelegate
> -        Item {
> -            anchors.left: parent.left
> -            anchors.right: parent.right
> -            height: units.gu(6)
> -            Label {
> -                id: descriptionLabel
> -                text: modelData.description
> -                anchors.left: parent.left
> -                anchors.right: checkbox.left
> -                anchors.verticalCenter: parent.verticalCenter
> -                anchors.leftMargin: units.gu(2)
> +        ListItem {
> +            onClicked: {
> +                if (checkbox.visible) {
> +                    checkbox.checked = !checkbox.checked
> +                } else {
> +                    settingsPage[modelData.onActivated]()
> +                }
>              }
> -            Switch {
> -                id: checkbox
> -                objectName: modelData.name
> -                anchors.right: parent.right
> -                anchors.rightMargin: units.gu(2)
> -                anchors.verticalCenter: parent.verticalCenter
> -                checked: modelData.property
> -                onCheckedChanged: {
> -                    if (checked != modelData.property) {
> -                        settingsPage.setMethods[modelData.name](checked)
> +            ListItemLayout {
> +                title.text: modelData.description
> +
> +                CheckBox {
> +                    id: checkbox
> +                    objectName: modelData.name
> +
> +                    visible: modelData.property !== null
> +                    SlotsLayout.position: SlotsLayout.trailing
> +                    checked: modelData.property
> +                    onCheckedChanged: {
> +                        if (checked != modelData.property) {
> +                            settingsPage.setMethods[modelData.name](checked)
> +                        }
>                      }
>                  }
> -            }
> -            ListItem.ThinDivider {
> -                anchors {
> -                    left: parent.left
> -                    right: parent.right
> -                    bottom: parent.bottom
> +
> +                ProgressionSlot {
> +                    visible: modelData.property === null
>                  }
>              }
>          }
>      }
>  
> -    Column {
> +    UbuntuListView {
> +        id: settingsList
> +
>          anchors {
> -            top: pageHeader.bottom
> -            left: parent.left
> -            right: parent.right
> -        }
> -        height: childrenRect.height
> -
> -        Repeater {
> -            anchors {
> -                left: parent.left
> -                right: parent.right
> -            }
> -            model: settingsModel
> -            delegate: settingDelegate
> -        }
> -
> -        ListItem.Standard {
> -            id: addAccount
> -
> -            anchors {
> -                left: parent.left
> -                right: parent.right
> -            }
> -
> -            text: i18n.tr("Add an online account")
> -            progression: true
> -            onClicked: onlineAccountHelper.item.run()
> -            enabled: onlineAccountHelper.status == Loader.Ready
> -        }
> +            //topMargin: mainPage.header.flickable ? 0 : mainPage.header.height

Please remove the line.

> +            fill: parent
> +        }
> +        model: settingsModel
> +        delegate: settingDelegate
>      }
>  
>      Loader {
>          id: messagesBottomEdgeLoader
>          active: mainView.dualPanel
> -        asynchronous: true
> +        //asynchronous: true

Please remove the line.

>          /* FIXME: would be even more efficient to use setSource() to
>             delay the compilation step but a bug in Qt prevents us.
>             Ref.: https://bugreports.qt.io/browse/QTBUG-54657
> 
> === modified file 'src/qml/TransparentButton.qml'
> --- src/qml/TransparentButton.qml	2016-06-27 11:59:26 +0000
> +++ src/qml/TransparentButton.qml	2017-03-08 22:03:58 +0000
> @@ -45,10 +45,14 @@
>      signal pressed()
>      signal released()
>  
> +    Keys.onEnterPressed: clicked()
> +    Keys.onReturnPressed: clicked()
> +
>      Item {
>          id: iconShape
>          height: iconSize
>          width: iconSize
> +        //visible: false

Please remove the line.

>          anchors {
>              left: parent.left
>              right: sideBySide ? undefined : parent.right


-- 
https://code.launchpad.net/~phablet-team/messaging-app/shortcuts-and-focus/+merge/315353
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/messaging-app/leave-rooms-on-close.