Commit 3839f917 authored by Ronan Abhamon's avatar Ronan Abhamon

feat(ui/views/App/MainWindow/ContactEdit): display contact addresses

parent 534c5f0a
...@@ -112,11 +112,11 @@ ...@@ -112,11 +112,11 @@
</message> </message>
<message> <message>
<source>sipAccountsInput</source> <source>sipAccountsInput</source>
<translation type="unfinished">SIP Address</translation> <translation type="obsolete">SIP Address</translation>
</message> </message>
<message> <message>
<source>address</source> <source>address</source>
<translation type="obsolete">ADDRESS</translation> <translation type="unfinished">ADDRESS</translation>
</message> </message>
<message> <message>
<source>addressInput</source> <source>addressInput</source>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</message> </message>
<message> <message>
<source>emailsInput</source> <source>emailsInput</source>
<translation type="unfinished">E-mail address</translation> <translation type="obsolete">E-mail address</translation>
</message> </message>
<message> <message>
<source>webSites</source> <source>webSites</source>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</message> </message>
<message> <message>
<source>webSitesInput</source> <source>webSitesInput</source>
<translation type="unfinished">URL</translation> <translation type="obsolete">URL</translation>
</message> </message>
<message> <message>
<source>avatarChooserTitle</source> <source>avatarChooserTitle</source>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</message> </message>
<message> <message>
<source>companiesInput</source> <source>companiesInput</source>
<translation>Company</translation> <translation type="vanished">Company</translation>
</message> </message>
<message> <message>
<source>companies</source> <source>companies</source>
...@@ -158,6 +158,38 @@ ...@@ -158,6 +158,38 @@
<source>cancel</source> <source>cancel</source>
<translation>CANCEL</translation> <translation>CANCEL</translation>
</message> </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>
<context> <context>
<name>Contacts</name> <name>Contacts</name>
......
...@@ -104,11 +104,11 @@ ...@@ -104,11 +104,11 @@
</message> </message>
<message> <message>
<source>sipAccountsInput</source> <source>sipAccountsInput</source>
<translation type="unfinished">Adresse SIP</translation> <translation type="obsolete">Adresse SIP</translation>
</message> </message>
<message> <message>
<source>address</source> <source>address</source>
<translation type="obsolete">ADRESSE(S)</translation> <translation type="unfinished">ADRESSE(S)</translation>
</message> </message>
<message> <message>
<source>addressInput</source> <source>addressInput</source>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</message> </message>
<message> <message>
<source>emailsInput</source> <source>emailsInput</source>
<translation type="unfinished">Adresse e-mail</translation> <translation type="obsolete">Adresse e-mail</translation>
</message> </message>
<message> <message>
<source>webSites</source> <source>webSites</source>
...@@ -128,16 +128,12 @@ ...@@ -128,16 +128,12 @@
</message> </message>
<message> <message>
<source>webSitesInput</source> <source>webSitesInput</source>
<translation type="unfinished">URL</translation> <translation type="obsolete">URL</translation>
</message> </message>
<message> <message>
<source>avatarChooserTitle</source> <source>avatarChooserTitle</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>companiesInput</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>companies</source> <source>companies</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
...@@ -150,6 +146,38 @@ ...@@ -150,6 +146,38 @@
<source>cancel</source> <source>cancel</source>
<translation type="unfinished">ANNULER</translation> <translation type="unfinished">ANNULER</translation>
</message> </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>
<context> <context>
<name>Contacts</name> <name>Contacts</name>
......
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
<file>ui/modules/Common/Form/ExclusiveButtons.qml</file> <file>ui/modules/Common/Form/ExclusiveButtons.qml</file>
<file>ui/modules/Common/Form/ListForm.qml</file> <file>ui/modules/Common/Form/ListForm.qml</file>
<file>ui/modules/Common/Form/SmallButton.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/TextButtonA.qml</file>
<file>ui/modules/Common/Form/TextButtonB.qml</file> <file>ui/modules/Common/Form/TextButtonB.qml</file>
<file>ui/modules/Common/Form/TextField.qml</file> <file>ui/modules/Common/Form/TextField.qml</file>
......
import QtQuick 2.7 import QtQuick 2.7
// =================================================================== // =============================================================================
Item { Item {
property alias useStates: actionButton.useStates property alias useStates: actionButton.useStates
...@@ -10,7 +10,7 @@ Item { ...@@ -10,7 +10,7 @@ Item {
signal clicked signal clicked
// ----------------------------------------------------------------- // ---------------------------------------------------------------------------
height: iconSize || parent.iconSize || parent.height height: iconSize || parent.iconSize || parent.height
width: iconSize || parent.iconSize || parent.height width: iconSize || parent.iconSize || parent.height
......
...@@ -2,7 +2,7 @@ import QtQuick 2.7 ...@@ -2,7 +2,7 @@ import QtQuick 2.7
import Common.Styles 1.0 import Common.Styles 1.0
// =================================================================== // =============================================================================
Row { Row {
id: item id: item
......
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 || ''
}
}
}
}
...@@ -11,6 +11,7 @@ Item { ...@@ -11,6 +11,7 @@ Item {
property alias color: textInput.color property alias color: textInput.color
property alias font: textInput.font property alias font: textInput.font
property alias inputMethodHints: textInput.inputMethodHints property alias inputMethodHints: textInput.inputMethodHints
property alias placeholder: placeholder.text
property alias readOnly: textInput.readOnly property alias readOnly: textInput.readOnly
property alias text: textInput.text property alias text: textInput.text
property bool forceFocus: false property bool forceFocus: false
...@@ -59,17 +60,37 @@ Item { ...@@ -59,17 +60,37 @@ Item {
visible: parent.isInvalid 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 { TextInput {
id: textInput id: textInput
anchors.centerIn: parent anchors.centerIn: parent
height: parent.height - parent.padding * 2 height: parent.height
width: parent.width - parent.padding * 2 width: parent.width - parent.padding * 2
clip: true clip: true
color: activeFocus && !readOnly color: activeFocus && !readOnly
? TransparentTextInputStyle.textColor.focused ? TransparentTextInputStyle.text.color.focused
: TransparentTextInputStyle.textColor.normal : TransparentTextInputStyle.text.color.normal
font.pointSize: TransparentTextInputStyle.text.fontSize
selectByMouse: true selectByMouse: true
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
......
...@@ -10,8 +10,17 @@ QtObject { ...@@ -10,8 +10,17 @@ QtObject {
property int iconSize: 12 property int iconSize: 12
property int padding: 10 property int padding: 10
property QtObject textColor: QtObject { property QtObject placeholder: QtObject {
property color focused: Colors.l property color color: Colors.w
property color normal: Colors.r 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
}
} }
} }
...@@ -38,6 +38,7 @@ CheckBoxText 1.0 Form/CheckBoxText.qml ...@@ -38,6 +38,7 @@ CheckBoxText 1.0 Form/CheckBoxText.qml
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
LightButton 1.0 Form/LightButton.qml LightButton 1.0 Form/LightButton.qml
ListForm 1.0 Form/ListForm.qml ListForm 1.0 Form/ListForm.qml
StaticListForm 1.0 Form/StaticListForm.qml
TextButtonA 1.0 Form/TextButtonA.qml TextButtonA 1.0 Form/TextButtonA.qml
TextButtonB 1.0 Form/TextButtonB.qml TextButtonB 1.0 Form/TextButtonB.qml
TextField 1.0 Form/TextField.qml TextField 1.0 Form/TextField.qml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment