diff --git a/linphone-desktop/assets/images/edit_hovered.svg b/linphone-desktop/assets/images/edit_hovered.svg index 573854bd0..661fd06b7 100644 --- a/linphone-desktop/assets/images/edit_hovered.svg +++ b/linphone-desktop/assets/images/edit_hovered.svg @@ -1,13 +1,12 @@ - - - options_over + + + settings_edit_default Created with Sketch. - - - - + + + - \ No newline at end of file + diff --git a/linphone-desktop/assets/images/edit_normal.svg b/linphone-desktop/assets/images/edit_normal.svg index c3b080307..5daa978ad 100644 --- a/linphone-desktop/assets/images/edit_normal.svg +++ b/linphone-desktop/assets/images/edit_normal.svg @@ -1,13 +1,12 @@ - - - options_default + + + settings_edit_default Created with Sketch. - - - - + + + \ No newline at end of file diff --git a/linphone-desktop/assets/images/edit_pressed.svg b/linphone-desktop/assets/images/edit_pressed.svg index 7046014e8..5c72f4816 100644 --- a/linphone-desktop/assets/images/edit_pressed.svg +++ b/linphone-desktop/assets/images/edit_pressed.svg @@ -1,13 +1,12 @@ - - - options_clic + + + settings_edit_default Created with Sketch. - - - - + + + - \ No newline at end of file + diff --git a/linphone-desktop/ui/views/App/Main/ContactEdit.qml b/linphone-desktop/ui/views/App/Main/ContactEdit.qml index 1d4080907..31d184368 100644 --- a/linphone-desktop/ui/views/App/Main/ContactEdit.qml +++ b/linphone-desktop/ui/views/App/Main/ContactEdit.qml @@ -121,22 +121,22 @@ ColumnLayout { Rectangle { Layout.fillWidth: true - Layout.preferredHeight: ContactEditStyle.infoBar.height - color: ContactEditStyle.infoBar.color + Layout.preferredHeight: ContactEditStyle.bar.height + color: ContactEditStyle.bar.color RowLayout { anchors { fill: parent - leftMargin: ContactEditStyle.infoBar.leftMargin - rightMargin: ContactEditStyle.infoBar.rightMargin + leftMargin: ContactEditStyle.bar.leftMargin + rightMargin: ContactEditStyle.bar.rightMargin } - spacing: ContactEditStyle.infoBar.spacing + spacing: ContactEditStyle.bar.spacing ActionButton { enabled: _edition icon: 'contact_card_photo' - iconSize: ContactEditStyle.infoBar.avatarSize + iconSize: ContactEditStyle.bar.avatarSize onClicked: avatarChooser.open() @@ -154,13 +154,13 @@ ColumnLayout { id: usernameInput Layout.fillWidth: true - Layout.preferredHeight: ContactEditStyle.infoBar.buttons.size + Layout.preferredHeight: ContactEditStyle.bar.buttons.size - color: ContactEditStyle.infoBar.username.color + color: ContactEditStyle.bar.username.color font { bold: true - pointSize: ContactEditStyle.infoBar.username.fontSize + pointSize: ContactEditStyle.bar.username.fontSize } forceFocus: true readOnly: !_edition @@ -169,30 +169,43 @@ ColumnLayout { onEditingFinished: _setUsername(text) } - ActionBar { + Row { Layout.alignment: Qt.AlignRight - iconSize: ContactEditStyle.infoBar.buttons.size - spacing: ContactEditStyle.infoBar.buttons.spacing + Layout.fillHeight: true + + spacing: ContactEditStyle.bar.actions.spacing visible: _contact != null - ActionButton { - icon: 'history' + ActionBar { + anchors.verticalCenter: parent.verticalCenter + iconSize: ContactEditStyle.bar.actions.history.iconSize - onClicked: window.setView('Conversation', { - sipAddress: contactEdit.sipAddress - }) + ActionButton { + icon: 'history' + + onClicked: window.setView('Conversation', { + sipAddress: contactEdit.sipAddress + }) + } } - ActionButton { - icon: 'edit' - visible: !_edition - onClicked: _editContact() - } + ActionBar { + anchors.verticalCenter: parent.verticalCenter - ActionButton { - icon: 'delete' + ActionButton { + icon: 'edit' + iconSize: ContactEditStyle.bar.actions.edit.iconSize - onClicked: _removeContact() + visible: !_edition + onClicked: _editContact() + } + + ActionButton { + icon: 'delete' + iconSize: ContactEditStyle.bar.actions.del.iconSize + + onClicked: _removeContact() + } } } } diff --git a/linphone-desktop/ui/views/App/Main/Conversation.qml b/linphone-desktop/ui/views/App/Main/Conversation.qml index 03f77b91b..1c097f5da 100644 --- a/linphone-desktop/ui/views/App/Main/Conversation.qml +++ b/linphone-desktop/ui/views/App/Main/Conversation.qml @@ -93,7 +93,7 @@ ColumnLayout { ActionButton { icon: !_contact ? 'contact_add' : 'contact_edit' - iconSize: ConversationStyle.bar.actions.edit.iconSize + iconSize: ConversationStyle.bar.actions.del.iconSize onClicked: window.setView('ContactEdit', { sipAddress: conversation.sipAddress diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml index cd425f4ca..9a3423b29 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml @@ -11,7 +11,7 @@ QtObject { property int topMargin: 20 } - property QtObject infoBar: QtObject { + property QtObject bar: QtObject { property color color: Colors.e property int avatarSize: 60 property int height: 80 @@ -19,6 +19,22 @@ QtObject { property int rightMargin: 20 property int spacing: 20 + property QtObject actions: QtObject { + property int spacing: 40 + + property QtObject del: QtObject { + property int iconSize: 22 + } + + property QtObject edit: QtObject { + property int iconSize: 22 + } + + property QtObject history: QtObject { + property int iconSize: 40 + } + } + property QtObject buttons: QtObject { property int size: 40 property int spacing: 20 diff --git a/linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml index bbefd2413..412a150b1 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml @@ -21,6 +21,10 @@ QtObject { property int iconSize: 40 } + property QtObject del: QtObject { + property int iconSize: 22 + } + property QtObject edit: QtObject { property int iconSize: 22 }