From a0ea030f963078c18645f92e5b197ea046cbc790 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 24 Oct 2016 12:10:38 +0200 Subject: [PATCH] feat(Calls/Calls): left panel in progress --- tests/languages/en.ts | 17 ++++++++-- tests/languages/fr.ts | 17 ++++++++-- .../Common/Form/AbstractTextButton.qml | 1 + tests/ui/views/Calls/Calls.qml | 32 ++++++++++++++++--- 4 files changed, 57 insertions(+), 10 deletions(-) diff --git a/tests/languages/en.ts b/tests/languages/en.ts index 858d4cfe6..83091afc3 100644 --- a/tests/languages/en.ts +++ b/tests/languages/en.ts @@ -1,11 +1,22 @@ + + Calls + + newCall + NEW CALL + + + newConference + NEW CONFERENCE + + Chat newMessagePlaceholder - Enter your message + Enter your message @@ -119,11 +130,11 @@ DroppableTextArea fileChooserTitle - Please choose one or many files + Please choose one or many files dropYourAttachment - + Drop your attachment diff --git a/tests/languages/fr.ts b/tests/languages/fr.ts index 909589c12..b92fed121 100644 --- a/tests/languages/fr.ts +++ b/tests/languages/fr.ts @@ -1,11 +1,22 @@ + + Calls + + newCall + NOUVEL APPEL + + + newConference + NOUVELLE CONFERENCE + + Chat newMessagePlaceholder - Entrer votre message. + Entrer votre message. @@ -119,11 +130,11 @@ DroppableTextArea fileChooserTitle - Merci de choisir un ou plusieurs fichiers + Merci de choisir un ou plusieurs fichiers dropYourAttachment - + Déposez votre pièce jointe diff --git a/tests/ui/modules/Common/Form/AbstractTextButton.qml b/tests/ui/modules/Common/Form/AbstractTextButton.qml index bbada380d..b8b397685 100644 --- a/tests/ui/modules/Common/Form/AbstractTextButton.qml +++ b/tests/ui/modules/Common/Form/AbstractTextButton.qml @@ -41,6 +41,7 @@ Button { pointSize: AbstractTextButtonStyle.text.fontSize } + elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter text: button.text verticalAlignment: Text.AlignVCenter diff --git a/tests/ui/views/Calls/Calls.qml b/tests/ui/views/Calls/Calls.qml index aa30db6a1..ae9277ab3 100644 --- a/tests/ui/views/Calls/Calls.qml +++ b/tests/ui/views/Calls/Calls.qml @@ -19,12 +19,36 @@ Window { minimumLeftLimit: 50 // Calls list. - childA: Rectangle { + childA: ColumnLayout { anchors.fill: parent - color: 'yellow' + spacing: 0 - Text { - text: 'calls' + Rectangle { + Layout.fillWidth: true + Layout.preferredHeight: 50 + color: '#FFFFFF' + + ActionBar { + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 10 + anchors.left: parent.left + iconSize: 30 + spacing: 16 + + ActionButton { + icon: 'call' + } + + ActionButton { + icon: 'conference' + } + } + } + + Rectangle { + Layout.fillWidth: true + Layout.fillHeight: true + color: 'red' } }