Commit b8c168ac authored by Ronan Abhamon's avatar Ronan Abhamon

unstable

parent d59c34d2
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
<file>ui/views/App/ManageAccounts.qml</file> <file>ui/views/App/ManageAccounts.qml</file>
<file>ui/views/App/NewCall.qml</file> <file>ui/views/App/NewCall.qml</file>
<file>ui/views/App/qmldir</file> <file>ui/views/App/qmldir</file>
<file>ui/views/App/Styles/Calls/CallsStyle.qml</file>
<file>ui/views/App/Styles/MainWindow/ContactsStyle.qml</file> <file>ui/views/App/Styles/MainWindow/ContactsStyle.qml</file>
<file>ui/views/App/Styles/MainWindow/ConversationStyle.qml</file> <file>ui/views/App/Styles/MainWindow/ConversationStyle.qml</file>
<file>ui/views/App/Styles/MainWindow/MainWindowStyle.qml</file> <file>ui/views/App/Styles/MainWindow/MainWindowStyle.qml</file>
......
...@@ -5,14 +5,23 @@ import QtQuick.Controls 2.0 ...@@ -5,14 +5,23 @@ import QtQuick.Controls 2.0
import Linphone 1.0 import Linphone 1.0
import Common 1.0 import Common 1.0
// ===================================================================
RowLayout { RowLayout {
property string sipAddress
// TODO.
property var contact: ContactsListModel.mapSipAddressToContact(
sipAddress
)
implicitHeight: contact.height implicitHeight: contact.height
spacing: 1 spacing: 1
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
color: '#434343' color: '#434343'
implicitHeight: contact.height implicitHeight: _contact.height
Contact { Contact {
id: contact id: contact
......
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Controls 2.0
import Common 1.0 import Common 1.0
import Linphone 1.0 import Linphone 1.0
import App.Styles 1.0
// ===================================================================
Window { Window {
id: window id: window
...@@ -18,7 +22,10 @@ Window { ...@@ -18,7 +22,10 @@ Window {
maximumLeftLimit: 300 maximumLeftLimit: 300
minimumLeftLimit: 150 minimumLeftLimit: 150
// ---------------------------------------------------------------
// Calls list. // Calls list.
// ---------------------------------------------------------------
childA: ColumnLayout { childA: ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
...@@ -53,7 +60,42 @@ Window { ...@@ -53,7 +60,42 @@ Window {
width: parent.width width: parent.width
} }
model: ListModel { model: callsList
}
}
// ---------------------------------------------------------------
// Content.
// ---------------------------------------------------------------
childB: Paned {
anchors.fill: parent
closingEdge: Qt.RightEdge
defaultChildAWidth: 300
defaultClosed: true
minimumLeftLimit: 250
minimumRightLimit: 350
resizeAInPriority: true
// Call.
childA: Rectangle {
anchors.fill: parent
}
// Chat.
childB: Chat {
anchors.fill: parent
}
}
}
// -----------------------------------------------------------------
// TMP
// -----------------------------------------------------------------
ListModel {
id: callsList
ListElement { ListElement {
$presence: 'do_not_disturb' $presence: 'do_not_disturb'
$sipAddress: 'charles.henri.sip.linphone.org' $sipAddress: 'charles.henri.sip.linphone.org'
...@@ -77,7 +119,8 @@ Window { ...@@ -77,7 +119,8 @@ Window {
ListElement { ListElement {
$presence: 'connected' $presence: 'connected'
$sipAddress: 'nsa.sip.linphone.org' $sipAddress: 'nsa.sip.linphone.org'
} ListElement { }
ListElement {
$presence: 'do_not_disturb' $presence: 'do_not_disturb'
$sipAddress: 'charles.henri.sip.linphone.org' $sipAddress: 'charles.henri.sip.linphone.org'
} }
...@@ -88,7 +131,8 @@ Window { ...@@ -88,7 +131,8 @@ Window {
ListElement { ListElement {
$presence: 'connected' $presence: 'connected'
$sipAddress: 'nsa.sip.linphone.org' $sipAddress: 'nsa.sip.linphone.org'
} ListElement { }
ListElement {
$presence: 'do_not_disturb' $presence: 'do_not_disturb'
$sipAddress: 'charles.henri.sip.linphone.org' $sipAddress: 'charles.henri.sip.linphone.org'
} }
...@@ -99,7 +143,8 @@ Window { ...@@ -99,7 +143,8 @@ Window {
ListElement { ListElement {
$presence: 'connected' $presence: 'connected'
$sipAddress: 'nsa.sip.linphone.org' $sipAddress: 'nsa.sip.linphone.org'
} ListElement { }
ListElement {
$presence: 'do_not_disturb' $presence: 'do_not_disturb'
$sipAddress: 'charles.henri.sip.linphone.org' $sipAddress: 'charles.henri.sip.linphone.org'
} }
...@@ -110,7 +155,8 @@ Window { ...@@ -110,7 +155,8 @@ Window {
ListElement { ListElement {
$presence: 'connected' $presence: 'connected'
$sipAddress: 'nsa.sip.linphone.org' $sipAddress: 'nsa.sip.linphone.org'
} ListElement { }
ListElement {
$presence: 'do_not_disturb' $presence: 'do_not_disturb'
$sipAddress: 'charles.henri.sip.linphone.org' $sipAddress: 'charles.henri.sip.linphone.org'
} }
...@@ -121,7 +167,8 @@ Window { ...@@ -121,7 +167,8 @@ Window {
ListElement { ListElement {
$presence: 'connected' $presence: 'connected'
$sipAddress: 'nsa.sip.linphone.org' $sipAddress: 'nsa.sip.linphone.org'
} ListElement { }
ListElement {
$presence: 'do_not_disturb' $presence: 'do_not_disturb'
$sipAddress: 'charles.henri.sip.linphone.org' $sipAddress: 'charles.henri.sip.linphone.org'
} }
...@@ -134,28 +181,4 @@ Window { ...@@ -134,28 +181,4 @@ Window {
$sipAddress: 'nsa.sip.linphone.org' $sipAddress: 'nsa.sip.linphone.org'
} }
} }
}
}
// Call / Chat.
childB: Paned {
anchors.fill: parent
closingEdge: Qt.RightEdge
defaultChildAWidth: 300
defaultClosed: true
minimumLeftLimit: 250
minimumRightLimit: 350
resizeAInPriority: true
// Call.
childA: StartingOutgoingCall {
anchors.fill: parent
}
// Chat.
childB: Chat {
anchors.fill: parent
}
}
}
} }
pragma Singleton
import QtQuick 2.7
import Common 1.0
// ===================================================================
QtObject {
}
...@@ -4,6 +4,8 @@ module App.Styles ...@@ -4,6 +4,8 @@ module App.Styles
# Views styles ------------------------------------------------------- # Views styles -------------------------------------------------------
singleton CallsStyle 1.0 Calls/CallsStyle.qml
singleton ContactsStyle 1.0 MainWindow/ContactsStyle.qml singleton ContactsStyle 1.0 MainWindow/ContactsStyle.qml
singleton ConversationStyle 1.0 MainWindow/ConversationStyle.qml singleton ConversationStyle 1.0 MainWindow/ConversationStyle.qml
singleton MainWindowStyle 1.0 MainWindow/MainWindowStyle.qml singleton MainWindowStyle 1.0 MainWindow/MainWindowStyle.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