Commit 03d0b5d9 authored by Ronan Abhamon's avatar Ronan Abhamon

chore(app): rename `ShortContactDescription` in `ContactDescription`

parent 2f1d0288
...@@ -38,6 +38,13 @@ ...@@ -38,6 +38,13 @@
<translation>Lost outgoing call</translation> <translation>Lost outgoing call</translation>
</message> </message>
</context> </context>
<context>
<name>ListForm</name>
<message>
<source>fillPlaceholder</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>SelectContact</name> <name>SelectContact</name>
<message> <message>
......
...@@ -38,6 +38,13 @@ ...@@ -38,6 +38,13 @@
<translation>Appel sortant manqué</translation> <translation>Appel sortant manqué</translation>
</message> </message>
</context> </context>
<context>
<name>ListForm</name>
<message>
<source>fillPlaceholder</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>SelectContact</name> <name>SelectContact</name>
<message> <message>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<file>ui/components/chat/Event.qml</file> <file>ui/components/chat/Event.qml</file>
<file>ui/components/chat/Message.qml</file> <file>ui/components/chat/Message.qml</file>
<file>ui/components/contact/Contact.qml</file> <file>ui/components/contact/Contact.qml</file>
<file>ui/components/contact/ShortContactDescription.qml</file> <file>ui/components/contact/ContactDescription.qml</file>
<file>ui/components/contact/Avatar.qml</file> <file>ui/components/contact/Avatar.qml</file>
<file>ui/components/dialog/ConfirmDialog.qml</file> <file>ui/components/dialog/ConfirmDialog.qml</file>
<file>ui/components/dialog/DialogDescription.qml</file> <file>ui/components/dialog/DialogDescription.qml</file>
......
...@@ -5,7 +5,6 @@ import 'qrc:/ui/components/image' ...@@ -5,7 +5,6 @@ import 'qrc:/ui/components/image'
Message { Message {
backgroundColor: '#E4E4E4' backgroundColor: '#E4E4E4'
id: message
Item { Item {
height: 30 height: 30
......
...@@ -28,7 +28,7 @@ Item { ...@@ -28,7 +28,7 @@ Item {
username: contact.username username: contact.username
} }
ShortContactDescription { ContactDescription {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
id: contactDescription id: contactDescription
......
...@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0 ...@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import 'qrc:/ui/components/contact' import 'qrc:/ui/components/contact'
import 'qrc:/ui/components/image'
import 'qrc:/ui/components/scrollBar' import 'qrc:/ui/components/scrollBar'
ColumnLayout { ColumnLayout {
...@@ -10,10 +11,8 @@ ColumnLayout { ...@@ -10,10 +11,8 @@ ColumnLayout {
Layout.preferredHeight: 35 Layout.preferredHeight: 35
spacing: 30 spacing: 30
Image { Icon {
fillMode: Image.PreserveAspectFit iconSize: 20
height: parent.height
width: 20
} }
Text { Text {
...@@ -26,9 +25,9 @@ ColumnLayout { ...@@ -26,9 +25,9 @@ ColumnLayout {
} }
Rectangle { Rectangle {
color: '#DEDEDE'
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: '#DEDEDE'
} }
ListView { ListView {
......
...@@ -33,8 +33,8 @@ ColumnLayout { ...@@ -33,8 +33,8 @@ ColumnLayout {
} }
// TODO: Replace by text edit. // TODO: Replace by text edit.
// Component: EditableShortContactDescription. // Component: EditableContactDescription.
ShortContactDescription { ContactDescription {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
username: 'Cameron Andrews' // TODO: Use C++. username: 'Cameron Andrews' // TODO: Use C++.
......
...@@ -38,7 +38,7 @@ ColumnLayout { ...@@ -38,7 +38,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
// Contact description. // Contact description.
ShortContactDescription { ContactDescription {
height: parent.height * 0.60 height: parent.height * 0.60
sipAddress: 'cam.andrews@sip.linphone.org' // TODO: Use C++. sipAddress: 'cam.andrews@sip.linphone.org' // TODO: Use C++.
username: 'Cameron Andrews' // TODO: Use C++. username: 'Cameron Andrews' // TODO: Use C++.
......
...@@ -42,7 +42,7 @@ ApplicationWindow { ...@@ -42,7 +42,7 @@ ApplicationWindow {
} }
// User info. // User info.
ShortContactDescription { ContactDescription {
Layout.fillHeight: parent.height Layout.fillHeight: parent.height
Layout.preferredWidth: 200 Layout.preferredWidth: 200
sipAddress: 'e.miller@sip-linphone.org' sipAddress: 'e.miller@sip-linphone.org'
...@@ -124,7 +124,7 @@ ApplicationWindow { ...@@ -124,7 +124,7 @@ ApplicationWindow {
Loader { Loader {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
source: 'qrc:/ui/views/mainWindow/contact.qml' source: 'qrc:/ui/views/mainWindow/conversation.qml'
} }
} }
......
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