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

[Tiago Salem Herrmann]

Review: Needs Information

Looks good, but I have some questions.

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

What do you mean by "won't match"? Is this README still valid?

> +  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

Any reason why we are not using the Unity API?

> +
> +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

I think this is going to work once we land this MR: https://code.launchpad.net/~phablet-team/messaging-app/messaging_app-fullscreen_flag/+merge/285948

>      Component.onCompleted: application.fullscreen = true
>      Component.onDestruction: application.fullscreen = false
>  
> 
> === modified file 'src/qml/MMS/PreviewerVideo.qml'
> --- src/qml/MMS/PreviewerVideo.qml	2016-02-01 15:08:39 +0000
> +++ src/qml/MMS/PreviewerVideo.qml	2016-02-13 00:39:20 +0000
> @@ -32,6 +32,7 @@
>      title: i18n.tr("Video Preview")
>      clip: true
>  
> +    // FIXME: this won't work correctly in windowed mode

same as previous comment

>      Component.onCompleted: {
>          application.fullscreen = true
>          // Load Video player after toggling fullscreen to reduce flickering
> 
> === 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

Any reason we are allowing scrolling the view only on dual panel mode?

> +    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.