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
03d0b5d9
Commit
03d0b5d9
authored
Sep 20, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(app): rename `ShortContactDescription` in `ContactDescription`
parent
2f1d0288
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
25 additions
and
13 deletions
+25
-13
en.ts
tests/languages/en.ts
+7
-0
fr.ts
tests/languages/fr.ts
+7
-0
resources.qrc
tests/resources.qrc
+1
-1
OutgoingMessage.qml
tests/ui/components/chat/OutgoingMessage.qml
+0
-1
Contact.qml
tests/ui/components/contact/Contact.qml
+1
-1
ContactDescription.qml
tests/ui/components/contact/ContactDescription.qml
+0
-0
Timeline.qml
tests/ui/components/timeline/Timeline.qml
+4
-5
contact.qml
tests/ui/views/mainWindow/contact.qml
+2
-2
conversation.qml
tests/ui/views/mainWindow/conversation.qml
+1
-1
mainWindow.qml
tests/ui/views/mainWindow/mainWindow.qml
+2
-2
No files found.
tests/languages/en.ts
View file @
03d0b5d9
...
...
@@ -38,6 +38,13 @@
<
translation
>
Lost
outgoing
call
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ListForm
<
/name
>
<
message
>
<
source
>
fillPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
SelectContact
<
/name
>
<
message
>
...
...
tests/languages/fr.ts
View file @
03d0b5d9
...
...
@@ -38,6 +38,13 @@
<
translation
>
Appel
sortant
manqu
é
<
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
ListForm
<
/name
>
<
message
>
<
source
>
fillPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
SelectContact
<
/name
>
<
message
>
...
...
tests/resources.qrc
View file @
03d0b5d9
...
...
@@ -14,7 +14,7 @@
<file>
ui/components/chat/Event.qml
</file>
<file>
ui/components/chat/Message.qml
</file>
<file>
ui/components/contact/Contact.qml
</file>
<file>
ui/components/contact/
Short
ContactDescription.qml
</file>
<file>
ui/components/contact/ContactDescription.qml
</file>
<file>
ui/components/contact/Avatar.qml
</file>
<file>
ui/components/dialog/ConfirmDialog.qml
</file>
<file>
ui/components/dialog/DialogDescription.qml
</file>
...
...
tests/ui/components/chat/OutgoingMessage.qml
View file @
03d0b5d9
...
...
@@ -5,7 +5,6 @@ import 'qrc:/ui/components/image'
Message
{
backgroundColor
:
'
#E4E4E4
'
id
:
message
Item
{
height
:
30
...
...
tests/ui/components/contact/Contact.qml
View file @
03d0b5d9
...
...
@@ -28,7 +28,7 @@ Item {
username
:
contact
.
username
}
Short
ContactDescription
{
ContactDescription
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
id
:
contactDescription
...
...
tests/ui/components/contact/
Short
ContactDescription.qml
→
tests/ui/components/contact/ContactDescription.qml
View file @
03d0b5d9
File moved
tests/ui/components/timeline/Timeline.qml
View file @
03d0b5d9
...
...
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/contact
'
import
'
qrc:/ui/components/image
'
import
'
qrc:/ui/components/scrollBar
'
ColumnLayout
{
...
...
@@ -10,10 +11,8 @@ ColumnLayout {
Layout.preferredHeight
:
35
spacing
:
30
Image
{
fillMode
:
Image
.
PreserveAspectFit
height
:
parent
.
height
width
:
20
Icon
{
iconSize
:
20
}
Text
{
...
...
@@ -26,9 +25,9 @@ ColumnLayout {
}
Rectangle
{
color
:
'
#DEDEDE
'
Layout.fillWidth
:
true
Layout.preferredHeight
:
1
color
:
'
#DEDEDE
'
}
ListView
{
...
...
tests/ui/views/mainWindow/contact.qml
View file @
03d0b5d9
...
...
@@ -33,8 +33,8 @@ ColumnLayout {
}
// TODO: Replace by text edit.
// Component: Editable
Short
ContactDescription.
Short
ContactDescription
{
// Component: EditableContactDescription.
ContactDescription
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
username
:
'
Cameron Andrews
'
// TODO: Use C++.
...
...
tests/ui/views/mainWindow/conversation.qml
View file @
03d0b5d9
...
...
@@ -38,7 +38,7 @@ ColumnLayout {
Layout.fillWidth
:
true
// Contact description.
Short
ContactDescription
{
ContactDescription
{
height
:
parent
.
height
*
0.60
sipAddress
:
'
cam.andrews@sip.linphone.org
'
// TODO: Use C++.
username
:
'
Cameron Andrews
'
// TODO: Use C++.
...
...
tests/ui/views/mainWindow/mainWindow.qml
View file @
03d0b5d9
...
...
@@ -42,7 +42,7 @@ ApplicationWindow {
}
// User info.
Short
ContactDescription
{
ContactDescription
{
Layout.fillHeight
:
parent
.
height
Layout.preferredWidth
:
200
sipAddress
:
'
e.miller@sip-linphone.org
'
...
...
@@ -124,7 +124,7 @@ ApplicationWindow {
Loader
{
Layout.fillHeight
:
true
Layout.fillWidth
:
true
source
:
'
qrc:/ui/views/mainWindow/con
tact
.qml
'
source
:
'
qrc:/ui/views/mainWindow/con
versation
.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