Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
6a730dd6
Commit
6a730dd6
authored
Sep 12, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(mainWindow): home view implemented
parent
a9f2a407
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
178 additions
and
12 deletions
+178
-12
en.ts
tests/languages/en.ts
+23
-0
fr.ts
tests/languages/fr.ts
+23
-0
linphone.pro
tests/linphone.pro
+1
-1
resources.qrc
tests/resources.qrc
+3
-1
main.cpp
tests/src/main.cpp
+1
-1
DialogButton.qml
tests/ui/components/form/DialogButton.qml
+11
-4
DialogCheckBox.qml
tests/ui/components/form/DialogCheckBox.qml
+34
-0
home.qml
tests/ui/views/mainWindow/home.qml
+75
-0
mainWindow.qml
tests/ui/views/mainWindow/mainWindow.qml
+7
-5
No files found.
tests/languages/en.ts
View file @
6a730dd6
...
@@ -10,6 +10,29 @@
...
@@ -10,6 +10,29 @@
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
home
<
/name
>
<
name
>
home
<
/name
>
<
message
>
<
source
>
displayTooltip
<
/source
>
<
translation
>
Display
tooltips
to
discover
Linphone
Desktop
<
/translation
>
<
/message
>
<
message
>
<
source
>
invitContactQuestion
<
/source
>
<
translation
>
Are
your
friends
already
know
Linphone
?
<
/translation
>
<
/message
>
<
message
>
<
source
>
invitContact
<
/source
>
<
translation
>
INVIT
YOUR
FRIENDS
<
/translation
>
<
/message
>
<
message
>
<
source
>
addContactQuestion
<
/source
>
<
translation
>
Quickly
add
your
contacts
in
your
notebook
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
addContact
<
/source
>
<
translation
>
ADD
CONTACTS
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
mainWindow
<
/name
>
<
message
>
<
message
>
<
source
>
mainSearchBarPlaceholder
<
/source
>
<
source
>
mainSearchBarPlaceholder
<
/source
>
<
translation
>
Search
contact
,
start
call
,
start
chat
...
<
/translation
>
<
translation
>
Search
contact
,
start
call
,
start
chat
...
<
/translation
>
...
...
tests/languages/fr.ts
View file @
6a730dd6
...
@@ -10,6 +10,29 @@
...
@@ -10,6 +10,29 @@
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
home
<
/name
>
<
name
>
home
<
/name
>
<
message
>
<
source
>
displayTooltip
<
/source
>
<
translation
>
Afficher
les
tooltips
pour
d
é
couvrir
Linphone
Desktop
<
/translation
>
<
/message
>
<
message
>
<
source
>
invitContactQuestion
<
/source
>
<
translation
>
Vos
amis
connaissent
-
ils
d
é
j
à
Linphone
?
<
/translation
>
<
/message
>
<
message
>
<
source
>
invitContact
<
/source
>
<
translation
>
INVITER
VOS
AMIS
<
/translation
>
<
/message
>
<
message
>
<
source
>
addContactQuestion
<
/source
>
<
translation
>
Ajouter
vos
contacts
dans
votre
carnet
d
&
apos
;
adresses
.
<
/translation
>
<
/message
>
<
message
>
<
source
>
addContact
<
/source
>
<
translation
>
AJOUTER
CONTACTS
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
mainWindow
<
/name
>
<
message
>
<
message
>
<
source
>
mainSearchBarPlaceholder
<
/source
>
<
source
>
mainSearchBarPlaceholder
<
/source
>
<
translation
>
Chercher
contact
,
commencer
appel
ou
chat
...
<
/translation
>
<
translation
>
Chercher
contact
,
commencer
appel
ou
chat
...
<
/translation
>
...
...
tests/linphone.pro
View file @
6a730dd6
...
@@ -26,7 +26,7 @@ lupdate_only{
...
@@ -26,7 +26,7 @@ lupdate_only{
ui/components/misc
/*
.qml \
ui/components/misc
/*
.qml \
ui/components/select
/*
.qml \
ui/components/select
/*
.qml \
ui/views
/*
.qml \
ui/views
/*
.qml \
ui/views/
home
/*
.qml
ui/views/
mainWindow
/*
.qml
}
}
RESOURCES += \
RESOURCES += \
...
...
tests/resources.qrc
View file @
6a730dd6
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
<file>
ui/components/dialog/DialogPlus.qml
</file>
<file>
ui/components/dialog/DialogPlus.qml
</file>
<file>
ui/components/form/Collapse.qml
</file>
<file>
ui/components/form/Collapse.qml
</file>
<file>
ui/components/form/DialogButton.qml
</file>
<file>
ui/components/form/DialogButton.qml
</file>
<file>
ui/components/form/DialogCheckBox.qml
</file>
<file>
ui/components/form/ToolBarButton.qml
</file>
<file>
ui/components/form/ToolBarButton.qml
</file>
<file>
ui/components/form/TransparentComboBox.qml
</file>
<file>
ui/components/form/TransparentComboBox.qml
</file>
<file>
ui/components/misc/Contact.qml
</file>
<file>
ui/components/misc/Contact.qml
</file>
...
@@ -16,7 +17,8 @@
...
@@ -16,7 +17,8 @@
<file>
ui/components/select/SelectContact.qml
</file>
<file>
ui/components/select/SelectContact.qml
</file>
<!-- UI: Views. -->
<!-- UI: Views. -->
<file>
ui/views/home/home.qml
</file>
<file>
ui/views/mainWindow/home.qml
</file>
<file>
ui/views/mainWindow/mainWindow.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/newCall.qml
</file>
<file>
ui/views/newCall.qml
</file>
...
...
tests/src/main.cpp
View file @
6a730dd6
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
int
main
(
int
argc
,
char
*
argv
[])
{
int
main
(
int
argc
,
char
*
argv
[])
{
App
app
(
argc
,
argv
);
App
app
(
argc
,
argv
);
QQmlApplicationEngine
engine
(
QUrl
(
"qrc:/ui/views/
home/home
.qml"
));
QQmlApplicationEngine
engine
(
QUrl
(
"qrc:/ui/views/
mainWindow/mainWindow
.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
if
(
engine
.
rootObjects
().
isEmpty
())
return
EXIT_FAILURE
;
return
EXIT_FAILURE
;
...
...
tests/ui/components/form/DialogButton.qml
View file @
6a730dd6
...
@@ -4,15 +4,22 @@ import QtQuick.Controls 2.0
...
@@ -4,15 +4,22 @@ import QtQuick.Controls 2.0
// ===================================================================
// ===================================================================
Button
{
Button
{
property
string
backgroundColor
:
'
#434343
'
property
string
textColor
:
'
#FFFFFF
'
background
:
Rectangle
{
background
:
Rectangle
{
color
:
button
.
down
?
'
#FE5E00
'
:
'
#434343
'
color
:
button
.
down
?
'
#FE5E00
'
:
backgroundColor
implicitWidth
:
120
implicitHeight
:
30
implicitWidth
:
160
radius
:
4
radius
:
4
}
}
contentItem
:
Text
{
contentItem
:
Text
{
color
:
'
#FFFFFF
'
color
:
button
.
down
?
'
#FFFFFF
'
:
textColor
text
:
button
.
text
font.pointSize
:
8
font.weight
:
Font
.
DemiBold
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
id
:
text
text
:
button
.
text
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
}
}
id
:
button
id
:
button
...
...
tests/ui/components/form/DialogCheckBox.qml
0 → 100644
View file @
6a730dd6
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
// ===================================================================
CheckBox
{
id
:
checkBox
indicator
:
Rectangle
{
border.color
:
checkBox
.
down
?
'
#FE5E00
'
:
'
#8E8E8E
'
implicitHeight
:
18
implicitWidth
:
18
radius
:
3
x
:
checkBox
.
leftPadding
y
:
parent
.
height
/
2
-
height
/
2
Rectangle
{
color
:
checkBox
.
down
?
'
#FE5E00
'
:
'
#8E8E8E
'
height
:
10
radius
:
2
visible
:
checkBox
.
checked
width
:
10
x
:
4
y
:
4
}
}
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
0 → 100644
View file @
6a730dd6
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
Layout.fillHeight
:
true
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
}
DialogButton
{
backgroundColor
:
'
#D1D1D1
'
text
:
qsTr
(
'
invitContact
'
)
textColor
:
'
#5A585B
'
}
}
// Add contacts.
Column
{
spacing
:
8
Text
{
text
:
qsTr
(
'
addContactQuestion
'
)
font.weight
:
Font
.
DemiBold
color
:
'
#5A585B
'
font.pointSize
:
11
}
DialogButton
{
backgroundColor
:
'
#D1D1D1
'
text
:
qsTr
(
'
addContact
'
)
textColor
:
'
#5A585B
'
}
}
}
}
}
// Tooltip checkbox area.
Item
{
Layout.fillWidth
:
true
Layout.preferredHeight
:
70
DialogCheckBox
{
anchors.left
:
parent
.
left
anchors.leftMargin
:
50
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
qsTr
(
'
displayTooltip
'
)
}
}
}
tests/ui/views/
home/home
.qml
→
tests/ui/views/
mainWindow/mainWindow
.qml
View file @
6a730dd6
...
@@ -24,7 +24,7 @@ ApplicationWindow {
...
@@ -24,7 +24,7 @@ ApplicationWindow {
Layout.fillHeight
:
parent
.
height
Layout.fillHeight
:
parent
.
height
image
:
'
qrc:/imgs/collapse.svg
'
image
:
'
qrc:/imgs/collapse.svg
'
onCollapsed
:
{
onCollapsed
:
{
mainWindow
.
height
=
collapsed
?
48
0
:
70
mainWindow
.
height
=
collapsed
?
50
0
:
70
}
}
}
}
...
@@ -95,7 +95,7 @@ ApplicationWindow {
...
@@ -95,7 +95,7 @@ ApplicationWindow {
}
}
id
:
mainWindow
id
:
mainWindow
minimumHeight
:
70
minimumHeight
:
70
minimumWidth
:
64
0
minimumWidth
:
78
0
title
:
'
Linphone
'
title
:
'
Linphone
'
visible
:
true
visible
:
true
...
@@ -123,11 +123,13 @@ ApplicationWindow {
...
@@ -123,11 +123,13 @@ ApplicationWindow {
entryName
:
qsTr
(
'
contactsEntry
'
)
entryName
:
qsTr
(
'
contactsEntry
'
)
}
}
Rectangle
{
// History.
Item
{
Layout.fillHeight
:
true
Layout.fillHeight
:
true
Layout.preferredWidth
:
parent
.
width
Layout.preferredWidth
:
parent
.
width
}
}
// Logo.
Rectangle
{
Rectangle
{
Layout.preferredWidth
:
250
Layout.preferredWidth
:
250
Layout.preferredHeight
:
70
Layout.preferredHeight
:
70
...
@@ -136,10 +138,10 @@ ApplicationWindow {
...
@@ -136,10 +138,10 @@ ApplicationWindow {
}
}
// Main content.
// Main content.
Rectangle
{
Loader
{
Layout.fillHeight
:
true
Layout.fillHeight
:
true
Layout.fillWidth
:
true
Layout.fillWidth
:
true
color
:
'
blue
'
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