mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(app): replace light/dark button by text button a/b

Browse source
This commit is contained in:
Ronan Abhamon 2016-09-27 16:39:20 +02:00
parent 805bdd718c
commit 8320f25d66
16 changed files with 149 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/resources.qrc
View file

@ -39,15 +39,16 @@
<file>ui/modules/Linphone/Dialog/DialogDescription.qml</file>
<file>ui/modules/Linphone/Dialog/DialogPlus.qml</file>
<file>ui/modules/Linphone/ForceScrollBar.qml</file>
<file>ui/modules/Linphone/Form/AbstractTextButton.qml</file>
<file>ui/modules/Linphone/Form/ActionBar.qml</file>
<file>ui/modules/Linphone/Form/ActionButton.qml</file>
<file>ui/modules/Linphone/Form/CheckBoxText.qml</file>
<file>ui/modules/Linphone/Form/DarkButton.qml</file>
<file>ui/modules/Linphone/Form/DropZone.qml</file>
<file>ui/modules/Linphone/Form/ExclusiveButtons.qml</file>
<file>ui/modules/Linphone/Form/LightButton.qml</file>
<file>ui/modules/Linphone/Form/ListForm.qml</file>
<file>ui/modules/Linphone/Form/SmallButton.qml</file>
<file>ui/modules/Linphone/Form/TextButtonA.qml</file>
<file>ui/modules/Linphone/Form/TextButtonB.qml</file>
<file>ui/modules/Linphone/Form/TransparentComboBox.qml</file>
<file>ui/modules/Linphone/Image/Icon.qml</file>
<file>ui/modules/Linphone/InvertedMouseArea.qml</file>
@ -60,8 +61,11 @@
<file>ui/modules/Linphone/Styles/CollapseStyle.qml</file>
<file>ui/modules/Linphone/Styles/DialogStyle.qml</file>
<file>ui/modules/Linphone/Styles/ForceScrollBarStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/ExclusiveButtonsStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/SmallButtonStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml</file>
<file>ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml</file>
<file>ui/modules/Linphone/Styles/MenuStyle.qml</file>
<file>ui/modules/Linphone/Styles/PopupStyle.qml</file>
<file>ui/modules/Linphone/Styles/qmldir</file>

4
tests/ui/modules/Linphone/Dialog/ConfirmDialog.qml
View file

@ -9,12 +9,12 @@ DialogPlus {
id: dialog
buttons: [
DarkButton {
TextButtonA {
text: qsTr('cancel')
onClicked: exit(0)
},
DarkButton {
TextButtonA {
text: qsTr('confirm')
onClicked: exit(1)

45
tests/ui/modules/Linphone/Form/AbstractTextButton.qml Normal file
View file

@ -0,0 +1,45 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import Linphone.Styles 1.0
// ===================================================================
Button {
id: button
property color colorHovered
property color colorNormal
property color colorPressed
// By default textColorNormal is the hovered/pressed text color.
property color textColorHovered: textColorNormal
property color textColorNormal
property color textColorPressed: textColorNormal
background: Rectangle {
color: button.down
? colorPressed
: (button.hovered
? colorHovered
: colorNormal
)
implicitHeight: AbstractTextButtonStyle.background.height
implicitWidth: AbstractTextButtonStyle.background.width
radius: AbstractTextButtonStyle.background.radius
}
contentItem: Text {
color: button.down
? textColorPressed
: (button.hovered
? textColorHovered
: textColorNormal
)
font.bold: true
font.pointSize: AbstractTextButtonStyle.text.fontSize
horizontalAlignment: Text.AlignHCenter
text: button.text
verticalAlignment: Text.AlignVCenter
}
hoverEnabled: true
}

26
tests/ui/modules/Linphone/Form/DarkButton.qml
View file

@ -1,26 +0,0 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
// ===================================================================
Button {
property string backgroundColor: '#434343'
property string textColor: '#FFFFFF'
background: Rectangle {
color: button.down ? '#FE5E00' : backgroundColor
implicitHeight: 30
implicitWidth: 160
radius: 4
}
contentItem: Text {
color: button.down ? '#FFFFFF' : textColor
font.pointSize: 8
font.weight: Font.DemiBold
horizontalAlignment: Text.AlignHCenter
id: text
text: button.text
verticalAlignment: Text.AlignVCenter
}
id: button
}

8
tests/ui/modules/Linphone/Form/LightButton.qml
View file

@ -1,8 +0,0 @@
import QtQuick 2.7
// ===================================================================
DarkButton {
backgroundColor: '#D1D1D1'
textColor: '#5A585B'
}

13
tests/ui/modules/Linphone/Form/TextButtonA.qml Normal file
View file

@ -0,0 +1,13 @@
import Linphone.Styles 1.0
// ===================================================================
AbstractTextButton {
colorHovered: TextButtonAStyle.backgroundColor.hovered
colorNormal: TextButtonAStyle.backgroundColor.normal
colorPressed: TextButtonAStyle.backgroundColor.pressed
textColorHovered: TextButtonAStyle.textColor.hovered
textColorNormal: TextButtonAStyle.textColor.normal
textColorPressed: TextButtonAStyle.textColor.pressed
}

13
tests/ui/modules/Linphone/Form/TextButtonB.qml Normal file
View file

@ -0,0 +1,13 @@
import Linphone.Styles 1.0
// ===================================================================
AbstractTextButton {
colorHovered: TextButtonBStyle.backgroundColor.hovered
colorNormal: TextButtonBStyle.backgroundColor.normal
colorPressed: TextButtonBStyle.backgroundColor.pressed
textColorHovered: TextButtonBStyle.textColor.hovered
textColorNormal: TextButtonBStyle.textColor.normal
textColorPressed: TextButtonBStyle.textColor.pressed
}

14
tests/ui/modules/Linphone/Styles/Form/AbstractTextButtonStyle.qml Normal file
View file

@ -0,0 +1,14 @@
pragma Singleton
import QtQuick 2.7
QtObject {
property QtObject background: QtObject {
property int height: 30
property int width: 160
property int radius: 4
}
property QtObject text: QtObject {
property int fontSize: 8
}
}

18
tests/ui/modules/Linphone/Styles/Form/TextButtonAStyle.qml Normal file
View file

@ -0,0 +1,18 @@
pragma Singleton
import QtQuick 2.7
import Linphone 1.0
QtObject {
property QtObject backgroundColor: QtObject {
property color hovered: '#232323'
property color pressed: '#FE5E00'
property color normal: '#434343'
}
property QtObject textColor: QtObject {
property color hovered: '#FFFFFF'
property color pressed: '#FFFFFF'
property color normal: '#FFFFFF'
}
}

18
tests/ui/modules/Linphone/Styles/Form/TextButtonBStyle.qml Normal file
View file

@ -0,0 +1,18 @@
pragma Singleton
import QtQuick 2.7
import Linphone 1.0
QtObject {
property QtObject backgroundColor: QtObject {
property color hovered: '#B1B1B1'
property color pressed: '#FE5E00'
property color normal: '#D1D1D1'
}
property QtObject textColor: QtObject {
property color hovered: '#5A585B'
property color pressed: '#FFFFFF'
property color normal: '#5A585B'
}
}

21
tests/ui/modules/Linphone/Styles/qmldir
View file

@ -3,13 +3,16 @@
module Linphone.Style
# Components styles.
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml
singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton MenuStyle 1.0 MenuStyle.qml
singleton PopupStyle 1.0 PopupStyle.qml
singleton SearchBoxStyle 1.0 SearchBoxStyle.qml
singleton TimelineStyle 1.0 TimelineStyle.qml
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml
singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton MenuStyle 1.0 MenuStyle.qml
singleton PopupStyle 1.0 PopupStyle.qml
singleton SearchBoxStyle 1.0 SearchBoxStyle.qml
singleton TimelineStyle 1.0 TimelineStyle.qml
singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton AbstractTextButtonStyle 1.0 Form/AbstractTextButtonStyle.qml
singleton ExclusiveButtonsStyle 1.0 Form/ExclusiveButtonsStyle.qml
singleton SmallButtonStyle 1.0 Form/SmallButtonStyle.qml
singleton TextButtonAStyle 1.0 Form/TextButtonAStyle.qml
singleton TextButtonBStyle 1.0 Form/TextButtonBStyle.qml

3
tests/ui/modules/Linphone/qmldir
View file

@ -28,11 +28,12 @@ ForceScrollBar 1.0 ForceScrollBar.qml
ActionBar 1.0 Form/ActionBar.qml
ActionButton 1.0 Form/ActionButton.qml
CheckBoxText 1.0 Form/CheckBoxText.qml
DarkButton 1.0 Form/DarkButton.qml
DropZone 1.0 Form/DropZone.qml
ExclusiveButtons 1.0 Form/ExclusiveButtons.qml
LightButton 1.0 Form/LightButton.qml
ListForm 1.0 Form/ListForm.qml
TextButtonA 1.0 Form/TextButtonA.qml
TextButtonB 1.0 Form/TextButtonB.qml
TransparentComboBox 1.0 Form/TransparentComboBox.qml
# Image

4
tests/ui/views/MainWindow/Contacts.qml
View file

@ -41,7 +41,7 @@ ColumnLayout {
]
}
LightButton {
TextButtonB {
text: qsTr('addContact')
}
}
@ -198,7 +198,7 @@ ColumnLayout {
anchors.fill: parent
clip: true
color: '#5A585B'
font.weight: Font.DemiBold
font.bold: true
text: $username
verticalAlignment: Text.AlignVCenter
}

4
tests/ui/views/MainWindow/Home.qml
View file

@ -27,7 +27,7 @@ ColumnLayout {
text: qsTr('invitContactQuestion')
}
LightButton {
TextButtonB {
text: qsTr('invitContact')
}
}
@ -43,7 +43,7 @@ ColumnLayout {
text: qsTr('addContactQuestion')
}
LightButton {
TextButtonB {
text: qsTr('addContact')
}
}

2
tests/ui/views/ManageAccounts.qml
View file

@ -10,7 +10,7 @@ DialogPlus {
minimumWidth: 480
title: qsTr('manageAccountsTitle')
buttons: DarkButton {
buttons: TextButtonA {
text: qsTr('validate')
}

2
tests/ui/views/NewCall.qml
View file

@ -9,7 +9,7 @@ DialogPlus {
minimumWidth: 420
title: qsTr('newCallTitle')
buttons: DarkButton {
buttons: TextButtonA {
text: qsTr('cancel')
}