Commit b1349b02 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(mainWindow/home): better code

parent 11f9ecdf
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<file>ui/views/mainWindow/mainWindow.qml</file> <file>ui/views/mainWindow/mainWindow.qml</file>
<file>ui/views/mainWindow/contacts.qml</file> <file>ui/views/mainWindow/contacts.qml</file>
<file>ui/views/mainWindow/home.qml</file> <file>ui/views/mainWindow/home.qml</file>
<file>ui/views/mainWindow/contact.qml</file>
<file>ui/views/mainWindow/conversation.qml</file> <file>ui/views/mainWindow/conversation.qml</file>
<file>imgs/lost_outgoing_call.svg</file> <file>imgs/lost_outgoing_call.svg</file>
<file>imgs/led_disconnected.svg</file> <file>imgs/led_disconnected.svg</file>
......
...@@ -9,7 +9,6 @@ CheckBox { ...@@ -9,7 +9,6 @@ CheckBox {
contentItem: Text { contentItem: Text {
color: checkBox.down ? '#FE5E00' : '#8E8E8E' color: checkBox.down ? '#FE5E00' : '#8E8E8E'
font: checkBox.font font: checkBox.font
horizontalAlignment: Text.AlignHCenter
leftPadding: checkBox.indicator.width + checkBox.spacing leftPadding: checkBox.indicator.width + checkBox.spacing
text: checkBox.text text: checkBox.text
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
......
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import 'qrc:/ui/components/form' import 'qrc:/ui/components/form'
// ===================================================================
ColumnLayout { ColumnLayout {
spacing: 0 spacing: 0
Item { ColumnLayout {
Layout.fillWidth: true Layout.alignment: Qt.AlignTop
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true
Item { Layout.leftMargin: 50
anchors.fill: parent Layout.topMargin: 50
anchors.leftMargin: 50
anchors.topMargin: 50
Column {
spacing: 30 spacing: 30
// Invit friends. // Invit friends.
...@@ -24,10 +21,10 @@ ColumnLayout { ...@@ -24,10 +21,10 @@ ColumnLayout {
spacing: 8 spacing: 8
Text { Text {
text: qsTr('invitContactQuestion')
font.weight: Font.DemiBold
color: '#5A585B' color: '#5A585B'
font.bold: true
font.pointSize: 11 font.pointSize: 11
text: qsTr('invitContactQuestion')
} }
LightButton { LightButton {
...@@ -40,10 +37,10 @@ ColumnLayout { ...@@ -40,10 +37,10 @@ ColumnLayout {
spacing: 8 spacing: 8
Text { Text {
text: qsTr('addContactQuestion')
font.weight: Font.DemiBold
color: '#5A585B' color: '#5A585B'
font.bold: true
font.pointSize: 11 font.pointSize: 11
text: qsTr('addContactQuestion')
} }
LightButton { LightButton {
...@@ -51,19 +48,14 @@ ColumnLayout { ...@@ -51,19 +48,14 @@ ColumnLayout {
} }
} }
} }
}
}
// Tooltip checkbox area. // Tooltip checkbox area.
Item { CheckBoxText {
Layout.alignment: Qt.AlignBottom
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 50
Layout.preferredHeight: 70 Layout.preferredHeight: 70
CheckBoxText {
anchors.left: parent.left
anchors.leftMargin: 50
anchors.verticalCenter: parent.verticalCenter
text: qsTr('displayTooltip') text: qsTr('displayTooltip')
} }
}
} }
...@@ -121,7 +121,7 @@ ApplicationWindow { ...@@ -121,7 +121,7 @@ ApplicationWindow {
Loader { Loader {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
source: 'qrc:/ui/views/mainWindow/conversation.qml' source: 'qrc:/ui/views/mainWindow/home.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