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
fbcbb7e1
Commit
fbcbb7e1
authored
Sep 28, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): add many links between components
parent
6fa3026c
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
501 additions
and
485 deletions
+501
-485
en.ts
tests/languages/en.ts
+1
-1
fr.ts
tests/languages/fr.ts
+1
-1
Chat.qml
tests/ui/modules/Linphone/Chat/Chat.qml
+2
-2
Menu.qml
tests/ui/modules/Linphone/Menu.qml
+6
-8
Contact.qml
tests/ui/views/MainWindow/Contact.qml
+66
-66
Contacts.qml
tests/ui/views/MainWindow/Contacts.qml
+231
-226
Conversation.qml
tests/ui/views/MainWindow/Conversation.qml
+127
-127
Home.qml
tests/ui/views/MainWindow/Home.qml
+48
-48
MainWindow.qml
tests/ui/views/MainWindow/MainWindow.qml
+19
-6
No files found.
tests/languages/en.ts
View file @
fbcbb7e1
...
...
@@ -119,7 +119,7 @@
<
/message
>
<
message
>
<
source
>
addContact
<
/source
>
<
translation
><
/translation
>
<
translation
>
ADD
CONTACTS
<
/translation
>
<
/message
>
<
message
>
<
source
>
displayTooltip
<
/source
>
...
...
tests/languages/fr.ts
View file @
fbcbb7e1
...
...
@@ -119,7 +119,7 @@
<
/message
>
<
message
>
<
source
>
addContact
<
/source
>
<
translation
><
/translation
>
<
translation
>
AJOUTER
CONTACTS
<
/translation
>
<
/message
>
<
message
>
<
source
>
displayTooltip
<
/source
>
...
...
tests/ui/modules/Linphone/Chat/Chat.qml
View file @
fbcbb7e1
...
...
@@ -118,10 +118,10 @@ ScrollableListView {
id
:
loader
source
:
$type
===
'
message
'
?
(
'
qrc:/ui/Linphone/Chat/
'
+
'
qrc:/ui/
modules/
Linphone/Chat/
'
+
(
$outgoing
?
'
Outgoing
'
:
'
Incoming
'
)
+
'
Message.qml
'
)
:
'
qrc:/ui/Linphone/Chat/Event.qml
'
)
:
'
qrc:/ui/
modules/
Linphone/Chat/Event.qml
'
}
}
...
...
tests/ui/modules/Linphone/Menu.qml
View file @
fbcbb7e1
...
...
@@ -24,10 +24,10 @@ ColumnLayout {
model
:
entries
Rectangle
{
color
:
_selectedEntry
===
index
?
MenuStyle
.
entry
.
color
.
selected
:
(
mouseArea
.
pressed
color
:
mouseArea
.
pressed
?
MenuStyle
.
entry
.
color
.
pressed
:
(
_selectedEntry
===
index
?
MenuStyle
.
entry
.
color
.
selected
:
(
mouseArea
.
containsMouse
?
MenuStyle
.
entry
.
color
.
hovered
:
MenuStyle
.
entry
.
color
.
normal
...
...
@@ -76,12 +76,10 @@ ColumnLayout {
hoverEnabled
:
true
onClicked
:
{
if
(
_selectedEntry
!==
index
)
{
_selectedEntry
=
index
entrySelected
(
index
)
}
}
}
}
}
}
tests/ui/views/MainWindow/Contact.qml
View file @
fbcbb7e1
...
...
@@ -43,12 +43,12 @@ ColumnLayout {
Layout.alignment
:
Qt
.
AlignBottom
|
Qt
.
AlignRight
ActionButton
{
icon
:
'
delete
'
onClicked
:
console
.
log
(
'
clicked!!!
'
)
icon
:
'
history
'
onClicked
:
window
.
setView
(
'
Conversation
'
)
}
ActionButton
{
icon
:
'
contact
'
icon
:
'
delete
'
onClicked
:
console
.
log
(
'
clicked!!!
'
)
}
}
...
...
tests/ui/views/MainWindow/Contacts.qml
View file @
fbcbb7e1
...
...
@@ -43,6 +43,8 @@ ColumnLayout {
TextButtonB
{
text
:
qsTr
(
'
addContact
'
)
onClicked
:
window
.
setView
(
'
Contact
'
)
}
}
}
...
...
@@ -224,12 +226,15 @@ ColumnLayout {
ActionButton
{
icon
:
'
chat
'
onClicked
:
window
.
setView
(
'
Conversation
'
)
}
}
ActionButton
{
iconSize
:
parent
.
height
icon
:
'
delete
'
onClicked
:
Utils
.
openConfirmDialog
(
contact
,
{
descriptionText
:
qsTr
(
'
removeContactDescription
'
),
exitHandler
:
function
(
status
)
{
...
...
tests/ui/views/MainWindow/Conversation.qml
View file @
fbcbb7e1
...
...
@@ -74,7 +74,7 @@ ColumnLayout {
ActionButton
{
icon
:
'
contact
'
onClicked
:
console
.
log
(
'
clicked!!!
'
)
onClicked
:
window
.
setView
(
'
Contact
'
)
}
}
}
...
...
tests/ui/views/MainWindow/Home.qml
View file @
fbcbb7e1
tests/ui/views/MainWindow/MainWindow.qml
View file @
fbcbb7e1
...
...
@@ -7,7 +7,12 @@ import Linphone 1.0
import
'
qrc:/ui/scripts/utils.js
'
as
Utils
ApplicationWindow
{
id
:
mainWindow
id
:
window
function
setView
(
view
)
{
loaderContent
.
source
=
'
qrc:/ui/views/MainWindow/
'
+
view
+
'
.qml
'
}
maximumHeight
:
70
minimumHeight
:
70
minimumWidth
:
780
...
...
@@ -32,7 +37,7 @@ ApplicationWindow {
Layout.fillHeight
:
parent
.
height
id
:
collapse
onCollapsed
:
mainW
indowStates
.
state
=
isCollapsed
()
onCollapsed
:
w
indowStates
.
state
=
isCollapsed
()
?
'
collapsed
'
:
''
}
...
...
@@ -48,12 +53,12 @@ ApplicationWindow {
// User actions.
ActionButton
{
Layout.preferredWidth
:
16
onClicked
:
Utils
.
openWindow
(
'
ManageAccounts
'
,
mainW
indow
)
onClicked
:
Utils
.
openWindow
(
'
ManageAccounts
'
,
w
indow
)
}
ActionButton
{
Layout.preferredWidth
:
16
onClicked
:
Utils
.
openWindow
(
'
NewCall
'
,
mainW
indow
)
onClicked
:
Utils
.
openWindow
(
'
NewCall
'
,
w
indow
)
}
// Search.
...
...
@@ -212,6 +217,12 @@ ApplicationWindow {
onEntrySelected
:
{
console
.
log
(
'
entry
'
,
entry
)
if
(
entry
===
0
)
{
setView
(
'
Home
'
)
}
else
if
(
entry
===
1
)
{
setView
(
'
Contacts
'
)
}
}
}
...
...
@@ -273,6 +284,8 @@ ApplicationWindow {
// Main content.
Loader
{
id
:
loaderContent
Layout.fillHeight
:
true
Layout.fillWidth
:
true
source
:
'
qrc:/ui/views/MainWindow/Home.qml
'
...
...
@@ -280,7 +293,7 @@ ApplicationWindow {
}
StateGroup
{
id
:
mainW
indowStates
id
:
w
indowStates
states
:
State
{
name
:
'
collapsed
'
...
...
@@ -290,7 +303,7 @@ ApplicationWindow {
maximumHeight
:
99999
maximumWidth
:
99999
minimumHeight
:
480
target
:
mainW
indow
target
:
w
indow
}
}
}
...
...
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