Commit 7c7b59a6 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(Calls/Calls): add `Chat` in right panel (Note: Binding loop detected on...

feat(Calls/Calls): add `Chat` in right panel (Note: Binding loop detected on `implicitHeight` of `IncomingMessage` line 8)
parent 5b310315
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1"> <TS version="2.1">
<context>
<name>Chat</name>
<message>
<source>newMessagePlaceholder</source>
<translation type="unfinished">Enter your message</translation>
</message>
</context>
<context> <context>
<name>ConfirmDialog</name> <name>ConfirmDialog</name>
<message> <message>
...@@ -98,7 +105,7 @@ ...@@ -98,7 +105,7 @@
</message> </message>
<message> <message>
<source>newMessagePlaceholder</source> <source>newMessagePlaceholder</source>
<translation>Enter your message</translation> <translation type="vanished">Enter your message</translation>
</message> </message>
</context> </context>
<context> <context>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.1"> <TS version="2.1">
<context>
<name>Chat</name>
<message>
<source>newMessagePlaceholder</source>
<translation type="unfinished">Entrer votre message.</translation>
</message>
</context>
<context> <context>
<name>ConfirmDialog</name> <name>ConfirmDialog</name>
<message> <message>
...@@ -98,7 +105,7 @@ ...@@ -98,7 +105,7 @@
</message> </message>
<message> <message>
<source>newMessagePlaceholder</source> <source>newMessagePlaceholder</source>
<translation>Entrer votre message.</translation> <translation type="vanished">Entrer votre message.</translation>
</message> </message>
</context> </context>
<context> <context>
......
...@@ -5,9 +5,14 @@ import QtQuick.Layouts 1.3 ...@@ -5,9 +5,14 @@ import QtQuick.Layouts 1.3
import Common 1.0 import Common 1.0
import Linphone 1.0 import Linphone 1.0
ScrollableListView { ColumnLayout {
spacing: 0
ScrollableListView {
id: chat id: chat
Layout.fillHeight: true
Layout.fillWidth: true
model: ListModel { model: ListModel {
ListElement { $dateSection: 1465389121000; $outgoing: true; $timestamp: 1465389121000; $type: 'message'; $content: 'This is it: fefe efzzzzzzzzzz aaaaaaaaa erfeezffeefzfzefzefzezfefez wfef efef e efeffefe fee efefefeefef fefefefefe eff fefefe fefeffww.linphone.org' } ListElement { $dateSection: 1465389121000; $outgoing: true; $timestamp: 1465389121000; $type: 'message'; $content: 'This is it: fefe efzzzzzzzzzz aaaaaaaaa erfeezffeefzfzefzefzezfefez wfef efef e efeffefe fee efefefeefef fefefefefe eff fefefe fefeffww.linphone.org' }
ListElement { $dateSection: 1465389121000; $timestamp: 1465389133000; $type: 'event'; $content: 'incoming_call' } ListElement { $dateSection: 1465389121000; $timestamp: 1465389133000; $type: 'event'; $content: 'incoming_call' }
...@@ -133,4 +138,17 @@ ScrollableListView { ...@@ -133,4 +138,17 @@ ScrollableListView {
PropertyChanges { target: removeAction; visible: true } PropertyChanges { target: removeAction; visible: true }
} }
} }
}
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 80
color: '#E2E9EF'
DroppableTextArea {
anchors.fill: parent
anchors.margins: 10
placeholderText: qsTr('newMessagePlaceholder')
}
}
} }
...@@ -44,13 +44,8 @@ Window { ...@@ -44,13 +44,8 @@ Window {
} }
// Chat. // Chat.
childB: Rectangle { childB: Chat {
anchors.fill: parent anchors.fill: parent
color: 'green'
Text {
text: 'hello2'
}
} }
} }
} }
......
...@@ -110,25 +110,11 @@ ColumnLayout { ...@@ -110,25 +110,11 @@ ColumnLayout {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
borderColor: '#C7C7C7' borderColor: '#C7C7C7'
bottomWidth: 1
leftWidth: 1 leftWidth: 1
topWidth: 1 topWidth: 1
Chat { Chat {
ScrollBar.vertical: ForceScrollBar { }
anchors.fill: parent anchors.fill: parent
} }
} }
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 80
color: '#E2E9EF'
DroppableTextArea {
anchors.fill: parent
anchors.margins: 10
placeholderText: qsTr('newMessagePlaceholder')
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment