mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-19 12:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change button design

Browse source
This commit is contained in:
Julien Wadel 2021-08-25 17:30:37 +02:00
parent b8665c1b6b
commit d444375ea4
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-app/src/components/other/colors/ColorListModel.hpp
View file

@ -55,8 +55,8 @@ class ColorListModel : public QAbstractListModel {
ADD_COLOR("c", "#CBCBCB", "Button pressed, separatos, fields.")
ADD_COLOR("d", "#5A585B", "")
ADD_COLOR("e", "#F3F3F3", "")
ADD_COLOR("f", "#E8E8E8", "")
ADD_COLOR("g", "#6B7A86", "SIP Address, Contact Text.")
ADD_COLOR("f", "#E8E8E8", "Border color")
ADD_COLOR("g", "#6B7A86", "SIP Address, Contact Text, Selected button.")
ADD_COLOR("h", "#687680", "")
// Primary color.
@ -72,7 +72,7 @@ class ColorListModel : public QAbstractListModel {
// Primary color for clicked items.
ADD_COLOR("m", "#FF8600", "Primary color for clicked items.")
ADD_COLOR("n", "#A1A1A1", "")
ADD_COLOR("n", "#A1A1A1", "Pressed button")
ADD_COLOR("o", "#D0D8DE", "Disabled button")
ADD_COLOR("p", "#17A81A", "Progress bar.")
@ -88,6 +88,8 @@ class ColorListModel : public QAbstractListModel {
ADD_COLOR("v", "#E7E7E7", "Menu pressed (message)")
ADD_COLOR("w", "#EDEDED", "Menu background (conversation)")
ADD_COLOR("x", "#D0D8DE", "Background unselected round button")
// Field error.
ADD_COLOR("error", "#FF0000", "Error Generic button.")

1
linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
View file

@ -53,6 +53,7 @@ Row {
)
)
text: modelData
radius: height/2
onClicked: {
if (selectedButton !== index) {

3
linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml
View file

@ -10,6 +10,7 @@ Button {
id: button
property alias backgroundColor: background.color
property alias radius: background.radius
background: Rectangle {
id: background
@ -26,11 +27,13 @@ Button {
contentItem: Text {
color: SmallButtonStyle.text.color
font.pointSize: SmallButtonStyle.text.pointSize
font.weight: Font.Bold
horizontalAlignment: Text.AlignHCenter
text: button.text
verticalAlignment: Text.AlignVCenter
leftPadding: SmallButtonStyle.leftPadding
rightPadding: SmallButtonStyle.rightPadding
}
hoverEnabled: true
MouseArea {

2
linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
View file

@ -10,7 +10,7 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color hovered: Colors.n.color
property color normal: Colors.c.color
property color normal: Colors.x.color
property color pressed: Colors.i.color
property color selected: Colors.g.color
}

2
linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
View file

@ -11,7 +11,7 @@ QtObject {
property QtObject background: QtObject {
property int height: 22
property int radius: 10
property int radius: 20
property QtObject color: QtObject {
property color hovered: Colors.c.color

4
linphone-app/ui/views/App/Main/Conversation.qml
View file

@ -410,12 +410,14 @@ ColumnLayout {
anchors.left : filterButtons.right
anchors.rightMargin: 10
anchors.leftMargin: 80
anchors.topMargin: 10
anchors.bottomMargin: 10
TextField {
id:searchBar
anchors {
fill: parent
margins: 7
margins: 1
}
width: parent.width-14
icon: 'search'