[Merge] lp:~phablet-team/messaging-app/side_panel into lp:messaging-app

[Gustavo Pichorim Boiko]

Replied to comments

Diff comments:

> 
> === added file 'TODO.convergence'
> --- TODO.convergence	1970-01-01 00:00:00 +0000
> +++ TODO.convergence	2016-02-13 00:39:20 +0000
> @@ -0,0 +1,3 @@
> +- Right now if you call startChat() in the two panel layout, it won't match the

The item on the left side is not selected. Let me rephrase that.

> +  thread on the left side, and if you resize it to one panel, the conversation
> +  is closed.
> 
> === added file 'src/qml/InputInfo.qml'
> --- src/qml/InputInfo.qml	1970-01-01 00:00:00 +0000
> +++ src/qml/InputInfo.qml	2016-02-13 00:39:20 +0000
> @@ -0,0 +1,24 @@
> +import QtQuick 2.0
> +//import Unity.InputInfo 0.1

Yes: Unity API is private and subject to unadvertised changes which will break the app. The real fix for this is going to land in both Qt and in the UITK, so leave it broken for now.

> +
> +Item {
> +    // FIXME: implement correctly without relying on unity private stuff
> +    property bool hasMouse: mainView.dualPanel //miceModel.count > 0 || touchPadModel.count > 0
> +    property bool hasKeyboard: false //keyboardsModel.count > 0
> +
> +    /*InputDeviceModel {
> +        id: miceModel
> +        deviceFilter: InputInfo.Mouse
> +    }
> +
> +    InputDeviceModel {
> +        id: touchPadModel
> +        deviceFilter: InputInfo.TouchPad
> +    }
> +
> +    InputDeviceModel {
> +        id: keyboardsModel
> +        deviceFilter: InputInfo.Keyboard
> +    }*/
> +}
> +
> 
> === modified file 'src/qml/MMS/PreviewerImage.qml'
> --- src/qml/MMS/PreviewerImage.qml	2015-11-26 00:36:47 +0000
> +++ src/qml/MMS/PreviewerImage.qml	2016-02-13 00:39:20 +0000
> @@ -25,6 +25,7 @@
>  Previewer {
>      id: imagePreviewer
>  
> +    // FIXME: this won't work correctly in windowed mode

Yes, most probably. But I will leave the comment for now as it currently doesn't work :)

>      Component.onCompleted: application.fullscreen = true
>      Component.onDestruction: application.fullscreen = false
>  
> 
> === modified file 'src/qml/MainPage.qml'
> --- src/qml/MainPage.qml	2015-11-25 21:02:31 +0000
> +++ src/qml/MainPage.qml	2016-02-13 00:39:20 +0000
> @@ -60,11 +58,31 @@
>          }
>      }
>  
> +    flickable: pageHeader.flickable

We are only scrolling the header in single panel mode. That's because when in dual panel mode the compose action is accessible from the header, so better have it always visible. Also, when the compose view is showing, we add an extra item to the list view saying "New message" and scrolling that into the view without using a fixed header is a pain.

> +    header: PageHeader {
> +        id: pageHeader
> +
> +        property alias leadingActions: leadingBar.actions
> +        property alias trailingActions: trailingBar.actions
> +
> +        title: i18n.tr("Messages")
> +        flickable: dualPanel ? null : threadList
> +        leadingActionBar {
> +            id: leadingBar
> +        }
> +
> +        trailingActionBar {
> +            id: trailingBar
> +        }
> +    }
> +
>      states: [
> -        PageHeadState {
> +        State {
> +            id: defaultState
>              name: "default"
> -            head: mainPage.head
> -            actions: [
> +            when: !searching && !selectionMode
> +
> +            property list<QtObject> trailingActions: [
>                  Action {
>                      objectName: "searchAction"
>                      iconName: "search"


-- 
https://code.launchpad.net/~phablet-team/messaging-app/side_panel/+merge/285137
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/messaging-app/fix_swipe_to_cancel.