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
3839f917
Commit
3839f917
authored
Dec 16, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/MainWindow/ContactEdit): display contact addresses
parent
534c5f0a
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
343 additions
and
151 deletions
+343
-151
en.ts
tests/assets/languages/en.ts
+37
-5
fr.ts
tests/assets/languages/fr.ts
+36
-8
resources.qrc
tests/resources.qrc
+1
-0
ActionSwitch.qml
tests/ui/modules/Common/Form/ActionSwitch.qml
+2
-2
ExclusiveButtons.qml
tests/ui/modules/Common/Form/ExclusiveButtons.qml
+1
-1
StaticListForm.qml
tests/ui/modules/Common/Form/StaticListForm.qml
+54
-0
TransparentTextInput.qml
tests/ui/modules/Common/Form/TransparentTextInput.qml
+24
-3
TransparentTextInputStyle.qml
.../modules/Common/Styles/Form/TransparentTextInputStyle.qml
+12
-3
qmldir
tests/ui/modules/Common/qmldir
+1
-0
ContactEdit.qml
tests/ui/views/App/MainWindow/ContactEdit.qml
+175
-129
No files found.
tests/assets/languages/en.ts
View file @
3839f917
...
...
@@ -112,11 +112,11 @@
<
/message
>
<
message
>
<
source
>
sipAccountsInput
<
/source
>
<
translation
type
=
"
unfinished
"
>
SIP
Address
<
/translation
>
<
translation
type
=
"
obsolete
"
>
SIP
Address
<
/translation
>
<
/message
>
<
message
>
<
source
>
address
<
/source
>
<
translation
type
=
"
obsolete
"
>
ADDRESS
<
/translation
>
<
translation
type
=
"
unfinished
"
>
ADDRESS
<
/translation
>
<
/message
>
<
message
>
<
source
>
addressInput
<
/source
>
...
...
@@ -128,7 +128,7 @@
<
/message
>
<
message
>
<
source
>
emailsInput
<
/source
>
<
translation
type
=
"
unfinished
"
>
E
-
mail
address
<
/translation
>
<
translation
type
=
"
obsolete
"
>
E
-
mail
address
<
/translation
>
<
/message
>
<
message
>
<
source
>
webSites
<
/source
>
...
...
@@ -136,7 +136,7 @@
<
/message
>
<
message
>
<
source
>
webSitesInput
<
/source
>
<
translation
type
=
"
unfinished
"
>
URL
<
/translation
>
<
translation
type
=
"
obsolete
"
>
URL
<
/translation
>
<
/message
>
<
message
>
<
source
>
avatarChooserTitle
<
/source
>
...
...
@@ -144,7 +144,7 @@
<
/message
>
<
message
>
<
source
>
companiesInput
<
/source
>
<
translation
>
Company
<
/translation
>
<
translation
type
=
"
vanished
"
>
Company
<
/translation
>
<
/message
>
<
message
>
<
source
>
companies
<
/source
>
...
...
@@ -158,6 +158,38 @@
<
source
>
cancel
<
/source
>
<
translation
>
CANCEL
<
/translation
>
<
/message
>
<
message
>
<
source
>
sipAccountsPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
companiesPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
emailsPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
webSitesPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
street
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
postalCode
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
country
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
locality
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
Contacts
<
/name
>
...
...
tests/assets/languages/fr.ts
View file @
3839f917
...
...
@@ -104,11 +104,11 @@
<
/message
>
<
message
>
<
source
>
sipAccountsInput
<
/source
>
<
translation
type
=
"
unfinished
"
>
Adresse
SIP
<
/translation
>
<
translation
type
=
"
obsolete
"
>
Adresse
SIP
<
/translation
>
<
/message
>
<
message
>
<
source
>
address
<
/source
>
<
translation
type
=
"
obsolete
"
>
ADRESSE
(
S
)
<
/translation
>
<
translation
type
=
"
unfinished
"
>
ADRESSE
(
S
)
<
/translation
>
<
/message
>
<
message
>
<
source
>
addressInput
<
/source
>
...
...
@@ -120,7 +120,7 @@
<
/message
>
<
message
>
<
source
>
emailsInput
<
/source
>
<
translation
type
=
"
unfinished
"
>
Adresse
e
-
mail
<
/translation
>
<
translation
type
=
"
obsolete
"
>
Adresse
e
-
mail
<
/translation
>
<
/message
>
<
message
>
<
source
>
webSites
<
/source
>
...
...
@@ -128,16 +128,12 @@
<
/message
>
<
message
>
<
source
>
webSitesInput
<
/source
>
<
translation
type
=
"
unfinished
"
>
URL
<
/translation
>
<
translation
type
=
"
obsolete
"
>
URL
<
/translation
>
<
/message
>
<
message
>
<
source
>
avatarChooserTitle
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
companiesInput
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
companies
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
...
...
@@ -150,6 +146,38 @@
<
source
>
cancel
<
/source
>
<
translation
type
=
"
unfinished
"
>
ANNULER
<
/translation
>
<
/message
>
<
message
>
<
source
>
sipAccountsPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
companiesPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
emailsPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
webSitesPlaceholder
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
street
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
postalCode
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
country
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
message
>
<
source
>
locality
<
/source
>
<
translation
type
=
"
unfinished
"
><
/translation
>
<
/message
>
<
/context
>
<
context
>
<
name
>
Contacts
<
/name
>
...
...
tests/resources.qrc
View file @
3839f917
...
...
@@ -143,6 +143,7 @@
<file>
ui/modules/Common/Form/ExclusiveButtons.qml
</file>
<file>
ui/modules/Common/Form/ListForm.qml
</file>
<file>
ui/modules/Common/Form/SmallButton.qml
</file>
<file>
ui/modules/Common/Form/StaticListForm.qml
</file>
<file>
ui/modules/Common/Form/TextButtonA.qml
</file>
<file>
ui/modules/Common/Form/TextButtonB.qml
</file>
<file>
ui/modules/Common/Form/TextField.qml
</file>
...
...
tests/ui/modules/Common/Form/ActionSwitch.qml
View file @
3839f917
import
QtQuick
2.7
// ===================================================================
// ===================================================================
==========
Item
{
property
alias
useStates
:
actionButton
.
useStates
...
...
@@ -10,7 +10,7 @@ Item {
signal
clicked
// -----------------------------------------------------------------
// -----------------------------------------------------------------
----------
height
:
iconSize
||
parent
.
iconSize
||
parent
.
height
width
:
iconSize
||
parent
.
iconSize
||
parent
.
height
...
...
tests/ui/modules/Common/Form/ExclusiveButtons.qml
View file @
3839f917
...
...
@@ -2,7 +2,7 @@ import QtQuick 2.7
import
Common
.
Styles
1.0
// ===================================================================
// ===================================================================
==========
Row
{
id
:
item
...
...
tests/ui/modules/Common/Form/StaticListForm.qml
0 → 100644
View file @
3839f917
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
Common
.
Styles
1.0
// =============================================================================
RowLayout
{
id
:
form
property
alias
title
:
text
.
text
property
bool
readOnly
:
false
property
var
fields
// ---------------------------------------------------------------------------
spacing
:
0
Text
{
id
:
text
Layout.leftMargin
:
ListFormStyle
.
titleArea
.
iconSize
+
ListFormStyle
.
titleArea
.
spacing
Layout.preferredHeight
:
ListFormStyle
.
lineHeight
Layout.preferredWidth
:
ListFormStyle
.
titleArea
.
text
.
width
Layout.alignment
:
Qt
.
AlignTop
color
:
ListFormStyle
.
titleArea
.
text
.
color
elide
:
Text
.
ElideRight
font
{
bold
:
true
pointSize
:
ListFormStyle
.
titleArea
.
text
.
fontSize
}
verticalAlignment
:
Text
.
AlignVCenter
}
ColumnLayout
{
Layout.fillWidth
:
true
spacing
:
0
Repeater
{
model
:
form
.
fields
TransparentTextInput
{
Layout.fillWidth
:
true
Layout.preferredHeight
:
ListFormStyle
.
lineHeight
placeholder
:
modelData
.
placeholder
||
''
readOnly
:
form
.
readOnly
text
:
modelData
.
text
||
''
}
}
}
}
tests/ui/modules/Common/Form/TransparentTextInput.qml
View file @
3839f917
...
...
@@ -11,6 +11,7 @@ Item {
property
alias
color
:
textInput
.
color
property
alias
font
:
textInput
.
font
property
alias
inputMethodHints
:
textInput
.
inputMethodHints
property
alias
placeholder
:
placeholder
.
text
property
alias
readOnly
:
textInput
.
readOnly
property
alias
text
:
textInput
.
text
property
bool
forceFocus
:
false
...
...
@@ -59,17 +60,37 @@ Item {
visible
:
parent
.
isInvalid
}
Text
{
id
:
placeholder
anchors.centerIn
:
parent
color
:
TransparentTextInputStyle
.
placeholder
.
color
elide
:
Text
.
ElideRight
font
{
italic
:
true
pointSize
:
TransparentTextInputStyle
.
placeholder
.
fontSize
}
height
:
textInput
.
height
width
:
textInput
.
width
verticalAlignment
:
Text
.
AlignVCenter
visible
:
textInput
.
text
.
length
===
0
&&
!
textInput
.
activeFocus
&&
!
textInput
.
readOnly
}
TextInput
{
id
:
textInput
anchors.centerIn
:
parent
height
:
parent
.
height
-
parent
.
padding
*
2
height
:
parent
.
height
width
:
parent
.
width
-
parent
.
padding
*
2
clip
:
true
color
:
activeFocus
&&
!
readOnly
?
TransparentTextInputStyle
.
textColor
.
focused
:
TransparentTextInputStyle
.
textColor
.
normal
?
TransparentTextInputStyle
.
text
.
color
.
focused
:
TransparentTextInputStyle
.
text
.
color
.
normal
font.pointSize
:
TransparentTextInputStyle
.
text
.
fontSize
selectByMouse
:
true
verticalAlignment
:
TextInput
.
AlignVCenter
...
...
tests/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
View file @
3839f917
...
...
@@ -10,8 +10,17 @@ QtObject {
property
int
iconSize
:
12
property
int
padding
:
10
property
QtObject
textColor
:
QtObject
{
property
color
focused
:
Colors
.
l
property
color
normal
:
Colors
.
r
property
QtObject
placeholder
:
QtObject
{
property
color
color
:
Colors
.
w
property
int
fontSize
:
10
}
property
QtObject
text
:
QtObject
{
property
int
fontSize
:
10
property
QtObject
color
:
QtObject
{
property
color
focused
:
Colors
.
l
property
color
normal
:
Colors
.
r
}
}
}
tests/ui/modules/Common/qmldir
View file @
3839f917
...
...
@@ -38,6 +38,7 @@ CheckBoxText 1.0 Form/CheckBoxText.qml
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
LightButton 1.0 Form/LightButton.qml
ListForm 1.0 Form/ListForm.qml
StaticListForm 1.0 Form/StaticListForm.qml
TextButtonA 1.0 Form/TextButtonA.qml
TextButtonB 1.0 Form/TextButtonB.qml
TextField 1.0 Form/TextField.qml
...
...
tests/ui/views/App/MainWindow/ContactEdit.qml
View file @
3839f917
This diff is collapsed.
Click to expand it.
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