Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-desktop
Commits
b1349b02
Commit
b1349b02
authored
Sep 19, 2016
by
Ronan
Browse files
fix(mainWindow/home): better code
parent
11f9ecdf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
48 deletions
+40
-48
tests/resources.qrc
tests/resources.qrc
+1
-0
tests/ui/components/form/CheckBoxText.qml
tests/ui/components/form/CheckBoxText.qml
+0
-1
tests/ui/views/mainWindow/home.qml
tests/ui/views/mainWindow/home.qml
+38
-46
tests/ui/views/mainWindow/mainWindow.qml
tests/ui/views/mainWindow/mainWindow.qml
+1
-1
No files found.
tests/resources.qrc
View file @
b1349b02
...
...
@@ -34,6 +34,7 @@
<file>
ui/views/mainWindow/mainWindow.qml
</file>
<file>
ui/views/mainWindow/contacts.qml
</file>
<file>
ui/views/mainWindow/home.qml
</file>
<file>
ui/views/mainWindow/contact.qml
</file>
<file>
ui/views/mainWindow/conversation.qml
</file>
<file>
imgs/lost_outgoing_call.svg
</file>
<file>
imgs/led_disconnected.svg
</file>
...
...
tests/ui/components/form/CheckBoxText.qml
View file @
b1349b02
...
...
@@ -9,7 +9,6 @@ CheckBox {
contentItem
:
Text
{
color
:
checkBox
.
down
?
'
#FE5E00
'
:
'
#8E8E8E
'
font
:
checkBox
.
font
horizontalAlignment
:
Text
.
AlignHCenter
leftPadding
:
checkBox
.
indicator
.
width
+
checkBox
.
spacing
text
:
checkBox
.
text
verticalAlignment
:
Text
.
AlignVCenter
...
...
tests/ui/views/mainWindow/home.qml
View file @
b1349b02
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/form
'
// ===================================================================
ColumnLayout
{
spacing
:
0
Item
{
Layout.
fillWidth
:
true
ColumnLayout
{
Layout.
alignment
:
Qt
.
AlignTop
Layout.fillHeight
:
true
Layout.fillWidth
:
true
Layout.leftMargin
:
50
Layout.topMargin
:
50
spacing
:
30
// Invit friends.
Column
{
spacing
:
8
Text
{
color
:
'
#5A585B
'
font.bold
:
true
font.pointSize
:
11
text
:
qsTr
(
'
invitContactQuestion
'
)
}
Item
{
anchors.fill
:
parent
anchors.leftMargin
:
50
anchors.topMargin
:
50
Column
{
spacing
:
30
// Invit friends.
Column
{
spacing
:
8
Text
{
text
:
qsTr
(
'
invitContactQuestion
'
)
font.weight
:
Font
.
DemiBold
color
:
'
#5A585B
'
font.pointSize
:
11
}
LightButton
{
text
:
qsTr
(
'
invitContact
'
)
}
}
LightButton
{
text
:
qsTr
(
'
invitContact
'
)
}
}
// Add contacts.
Column
{
spacing
:
8
// Add contacts.
Column
{
spacing
:
8
Text
{
text
:
qsTr
(
'
addContactQuestion
'
)
font.weight
:
Font
.
DemiBold
color
:
'
#5A585B
'
font.pointSize
:
11
}
Text
{
color
:
'
#5A585B
'
font.bold
:
true
font.pointSize
:
11
text
:
qsTr
(
'
addContactQuestion
'
)
}
LightButton
{
text
:
qsTr
(
'
addContact
'
)
}
}
LightButton
{
text
:
qsTr
(
'
addContact
'
)
}
}
}
// Tooltip checkbox area.
Item
{
CheckBoxText
{
Layout.alignment
:
Qt
.
AlignBottom
Layout.fillWidth
:
true
Layout.leftMargin
:
50
Layout.preferredHeight
:
70
CheckBoxText
{
anchors.left
:
parent
.
left
anchors.leftMargin
:
50
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
qsTr
(
'
displayTooltip
'
)
}
text
:
qsTr
(
'
displayTooltip
'
)
}
}
tests/ui/views/mainWindow/mainWindow.qml
View file @
b1349b02
...
...
@@ -121,7 +121,7 @@ ApplicationWindow {
Loader
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
source
:
'
qrc:/ui/views/mainWindow/
conversation
.qml
'
source
:
'
qrc:/ui/views/mainWindow/
home
.qml
'
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment