fix crash on clearSingletons due to ButtonStyle nested components
This commit is contained in:
parent
39564ed708
commit
549866b48f
55 changed files with 378 additions and 356 deletions
|
|
@ -145,7 +145,7 @@ list(APPEND _LINPHONEAPP_QML_FILES
|
||||||
|
|
||||||
list(APPEND _LINPHONEAPP_QML_SINGLETONS
|
list(APPEND _LINPHONEAPP_QML_SINGLETONS
|
||||||
view/Style/AppIcons.qml
|
view/Style/AppIcons.qml
|
||||||
view/Style/ButtonStyle.qml
|
view/Style/buttonStyle.js
|
||||||
view/Style/DefaultStyle.qml
|
view/Style/DefaultStyle.qml
|
||||||
view/Style/Typography.qml
|
view/Style/Typography.qml
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,12 @@ import QtQuick.Effects
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQml
|
import QtQml
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Control.Button {
|
Control.Button {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
property int capitalization
|
property int capitalization
|
||||||
property QtObject style
|
property var style
|
||||||
property color color: style?.color?.normal || DefaultStyle.main1_500_main
|
property color color: style?.color?.normal || DefaultStyle.main1_500_main
|
||||||
property color hoveredColor: style?.color?.hovered || Qt.darker(color, 1.05)
|
property color hoveredColor: style?.color?.hovered || Qt.darker(color, 1.05)
|
||||||
property color pressedColor: style?.color?.pressed || Qt.darker(color, 1.1)
|
property color pressedColor: style?.color?.pressed || Qt.darker(color, 1.1)
|
||||||
|
|
@ -35,7 +36,7 @@ Control.Button {
|
||||||
spacing: 5 * DefaultStyle.dp
|
spacing: 5 * DefaultStyle.dp
|
||||||
hoverEnabled: enabled
|
hoverEnabled: enabled
|
||||||
activeFocusOnTab: true
|
activeFocusOnTab: true
|
||||||
icon.source: style?.iconSource
|
icon.source: style?.iconSource || ""
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: mouseArea
|
id: mouseArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -13,9 +14,7 @@ Button {
|
||||||
: hovered
|
: hovered
|
||||||
? hoveredColor
|
? hoveredColor
|
||||||
: color
|
: color
|
||||||
color: style?.color?.normal || "transparent"
|
style: ButtonStyle.popupButton
|
||||||
hoveredColor: style?.color?.hovered || DefaultStyle.grey_100
|
|
||||||
pressedColor: style?.color?.pressed || DefaultStyle.main2_300
|
|
||||||
checked: popup.visible
|
checked: popup.visible
|
||||||
implicitWidth: 24 * DefaultStyle.dp
|
implicitWidth: 24 * DefaultStyle.dp
|
||||||
implicitHeight: 24 * DefaultStyle.dp
|
implicitHeight: 24 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Effects
|
||||||
import Linphone
|
import Linphone
|
||||||
import QtQml
|
import QtQml
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,8 @@ import Linphone
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
import ConstantsCpp 1.0
|
import ConstantsCpp 1.0
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
FocusScope {
|
FocusScope {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
implicitHeight: visible ? 56 * DefaultStyle.dp : 0
|
implicitHeight: visible ? 56 * DefaultStyle.dp : 0
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import UtilsCpp 1.0
|
||||||
import ConstantsCpp 1.0
|
import ConstantsCpp 1.0
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import QtQuick.Layouts
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import ConstantsCpp 1.0
|
import ConstantsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Linphone
|
import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Effects
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import QtQuick.Effects
|
||||||
import Linphone
|
import Linphone
|
||||||
import ConstantsCpp 1.0
|
import ConstantsCpp 1.0
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Layouts as Layout
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
FocusScope{
|
FocusScope{
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -154,7 +155,7 @@ FocusScope{
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
Text {
|
Text {
|
||||||
id: pressText
|
id: pressText
|
||||||
color: digitButton.pressed ? digitButton.style.text.pressed : digitButton.style.text.normal
|
color: digitButton.pressed ? digitButton.pressedTextColor : digitButton.textColor
|
||||||
height: contentHeight
|
height: contentHeight
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
@ -168,7 +169,7 @@ FocusScope{
|
||||||
height: contentHeight
|
height: contentHeight
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
color: digitButton.pressed ? digitButton.style.text.pressed : digitButton.style.text.normal
|
color: digitButton.pressed ? digitButton.pressedTextColor : digitButton.textColor
|
||||||
y: digitButton.height/2
|
y: digitButton.height/2
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
visible: modelData.longPressText ? modelData.longPressText.length > 0 : false
|
visible: modelData.longPressText ? modelData.longPressText.length > 0 : false
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
FocusScope {
|
FocusScope {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@ Control.TextField {
|
||||||
z: 1
|
z: 1
|
||||||
visible: mainItem.hidden
|
visible: mainItem.hidden
|
||||||
checkable: true
|
checkable: true
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: eyeButton.checked ? AppIcons.eyeShow : AppIcons.eyeHide
|
icon.source: eyeButton.checked ? AppIcons.eyeShow : AppIcons.eyeHide
|
||||||
width: 20 * DefaultStyle.dp
|
width: 20 * DefaultStyle.dp
|
||||||
height: 20 * DefaultStyle.dp
|
height: 20 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import QtQuick.Dialogs
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Dialog {
|
Dialog {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@ import QtQuick.Controls.Basic as Control
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Popup {
|
Popup {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
modal: true
|
modal: true
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Effects
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
Dialog {
|
Dialog {
|
||||||
|
|
@ -75,17 +76,17 @@ Dialog {
|
||||||
}
|
}
|
||||||
Item{Layout.Layout.fillHeight: true}
|
Item{Layout.Layout.fillHeight: true}
|
||||||
}
|
}
|
||||||
Button {
|
SmallButton {
|
||||||
visible: !mainItem.securityError
|
visible: !mainItem.securityError
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.topMargin: 10 * DefaultStyle.dp
|
anchors.topMargin: 10 * DefaultStyle.dp
|
||||||
anchors.rightMargin: 17 * DefaultStyle.dp
|
anchors.rightMargin: 17 * DefaultStyle.dp
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
textSize: 13 * DefaultStyle.dp
|
|
||||||
textWeight: 600 * DefaultStyle.dp
|
|
||||||
text: qsTr("Passer")
|
text: qsTr("Passer")
|
||||||
textColor: DefaultStyle.grey_0
|
textColor: DefaultStyle.grey_0
|
||||||
|
hoveredTextColor: DefaultStyle.grey_100
|
||||||
|
pressedTextColor: DefaultStyle.grey_200
|
||||||
underline: true
|
underline: true
|
||||||
onClicked: {
|
onClicked: {
|
||||||
call.core.lSkipZrtpAuthentication()
|
call.core.lSkipZrtpAuthentication()
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ Popup {
|
||||||
icon.height: 20 * DefaultStyle.dp
|
icon.height: 20 * DefaultStyle.dp
|
||||||
Layout.alignment: Qt.AlignTop | Qt.AlignRight
|
Layout.alignment: Qt.AlignTop | Qt.AlignRight
|
||||||
visible: mainItem.hovered || hovered
|
visible: mainItem.hovered || hovered
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.closeX
|
icon.source: AppIcons.closeX
|
||||||
onClicked: mainItem.close()
|
onClicked: mainItem.close()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic
|
import QtQuick.Controls.Basic
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Popup {
|
Popup {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@ import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
|
|
||||||
Notification {
|
Notification {
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Layouts as Layout
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Control.Popup {
|
Control.Popup {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ MainRightPanel {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Button {
|
Button {
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.rightMargin: 41 * DefaultStyle.dp
|
anchors.rightMargin: 41 * DefaultStyle.dp
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
@ -270,12 +270,10 @@ MainRightPanel {
|
||||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
Layout.preferredWidth: 24 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
Layout.preferredHeight: 24 * DefaultStyle.dp
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
width: 24 * DefaultStyle.dp
|
|
||||||
height: 24 * DefaultStyle.dp
|
|
||||||
icon.source: AppIcons.closeX
|
icon.source: AppIcons.closeX
|
||||||
icon.width: 24 * DefaultStyle.dp
|
icon.width: 24 * DefaultStyle.dp
|
||||||
icon.height: 24 * DefaultStyle.dp
|
icon.height: 24 * DefaultStyle.dp
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
KeyNavigation.left: addressTextField
|
KeyNavigation.left: addressTextField
|
||||||
Keys.onPressed: (event) => addressLayout.updateFocus(event)
|
Keys.onPressed: (event) => addressLayout.updateFocus(event)
|
||||||
onClicked: mainItem.contact.core.removeAddress(index)
|
onClicked: mainItem.contact.core.removeAddress(index)
|
||||||
|
|
@ -355,9 +353,7 @@ MainRightPanel {
|
||||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
Layout.preferredWidth: 24 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
Layout.preferredHeight: 24 * DefaultStyle.dp
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
width: 24 * DefaultStyle.dp
|
style: ButtonStyle.noBackground
|
||||||
height: 24 * DefaultStyle.dp
|
|
||||||
background: Item{}
|
|
||||||
icon.source: AppIcons.closeX
|
icon.source: AppIcons.closeX
|
||||||
icon.width: 24 * DefaultStyle.dp
|
icon.width: 24 * DefaultStyle.dp
|
||||||
icon.height: 24 * DefaultStyle.dp
|
icon.height: 24 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
LoginLayout {
|
LoginLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import Linphone
|
||||||
import ConstantsCpp
|
import ConstantsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
LoginLayout {
|
LoginLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -62,12 +62,11 @@ FocusScope{
|
||||||
Button {
|
Button {
|
||||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
Layout.preferredWidth: 24 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
Layout.preferredHeight: 24 * DefaultStyle.dp
|
||||||
background: Item{}
|
style: ButtonStyle.noBackgroundOrange
|
||||||
icon.source: AppIcons.closeX
|
icon.source: AppIcons.closeX
|
||||||
icon.width: 24 * DefaultStyle.dp
|
icon.width: 24 * DefaultStyle.dp
|
||||||
icon.height: 24 * DefaultStyle.dp
|
icon.height: 24 * DefaultStyle.dp
|
||||||
focus: true
|
focus: true
|
||||||
contentImageColor: DefaultStyle.main1_500_main
|
|
||||||
onClicked: contactList.removeSelectedContactByAddress(modelData)
|
onClicked: contactList.removeSelectedContactByAddress(modelData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
FocusScope {
|
FocusScope {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -299,9 +300,8 @@ FocusScope {
|
||||||
icon.width: 24 * DefaultStyle.dp
|
icon.width: 24 * DefaultStyle.dp
|
||||||
icon.height: 24 * DefaultStyle.dp
|
icon.height: 24 * DefaultStyle.dp
|
||||||
Layout.rightMargin: 10 * DefaultStyle.dp
|
Layout.rightMargin: 10 * DefaultStyle.dp
|
||||||
background: Item{}
|
|
||||||
icon.source: AppIcons.closeX
|
icon.source: AppIcons.closeX
|
||||||
contentImageColor: DefaultStyle.main1_500_main
|
style: ButtonStyle.noBackgroundOrange
|
||||||
onClicked: mainItem.conferenceInfoGui.core.removeParticipant(index)
|
onClicked: mainItem.conferenceInfoGui.core.removeParticipant(index)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
LoginLayout {
|
LoginLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
import ConstantsCpp 1.0
|
import ConstantsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
LoginLayout {
|
LoginLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
LoginLayout {
|
LoginLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractMainPage {
|
AbstractMainPage {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
import ConstantsCpp
|
import ConstantsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import QtQuick.Dialogs
|
||||||
import Linphone
|
import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractSettingsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import SettingsCpp 1.0
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
import Linphone
|
import Linphone
|
||||||
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractSettingsLayout {
|
AbstractSettingsLayout {
|
||||||
width: parent?.width
|
width: parent?.width
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import QtQuick.Dialogs
|
||||||
import Linphone
|
import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractSettingsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -48,11 +49,10 @@ RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.pencil
|
icon.source: AppIcons.pencil
|
||||||
icon.width: 24 * DefaultStyle.dp
|
icon.width: 24 * DefaultStyle.dp
|
||||||
icon.height: 24 * DefaultStyle.dp
|
icon.height: 24 * DefaultStyle.dp
|
||||||
contentImageColor: DefaultStyle.main2_600
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainItem.owner.container.push(mainItem.settingsLayout, {
|
mainItem.owner.container.push(mainItem.settingsLayout, {
|
||||||
titleText: mainItem.editText,
|
titleText: mainItem.editText,
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractSettingsLayout {
|
AbstractSettingsLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import QtQuick.Dialogs
|
||||||
import Linphone
|
import Linphone
|
||||||
import SettingsCpp 1.0
|
import SettingsCpp 1.0
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractSettingsLayout {
|
AbstractSettingsLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
FocusScope {
|
FocusScope {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractMainPage {
|
AbstractMainPage {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -175,14 +176,13 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
Button {
|
Button {
|
||||||
id: newCallButton
|
id: newCallButton
|
||||||
background: Item {}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.newCall
|
icon.source: AppIcons.newCall
|
||||||
Layout.preferredWidth: 28 * DefaultStyle.dp
|
Layout.preferredWidth: 28 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 28 * DefaultStyle.dp
|
Layout.preferredHeight: 28 * DefaultStyle.dp
|
||||||
Layout.rightMargin: 39 * DefaultStyle.dp
|
Layout.rightMargin: 39 * DefaultStyle.dp
|
||||||
icon.width: 28 * DefaultStyle.dp
|
icon.width: 28 * DefaultStyle.dp
|
||||||
icon.height: 28 * DefaultStyle.dp
|
icon.height: 28 * DefaultStyle.dp
|
||||||
contentImageColor: DefaultStyle.main2_600
|
|
||||||
KeyNavigation.left: removeHistory
|
KeyNavigation.left: removeHistory
|
||||||
KeyNavigation.down: listStackView
|
KeyNavigation.down: listStackView
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
Control.Page {
|
Control.Page {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -71,9 +72,7 @@ Control.Page {
|
||||||
RoundButton {
|
RoundButton {
|
||||||
id: closeButton
|
id: closeButton
|
||||||
visible: mainItem.closeButtonVisible
|
visible: mainItem.closeButtonVisible
|
||||||
background: Item {
|
style: ButtonStyle.noBackground
|
||||||
visible: false
|
|
||||||
}
|
|
||||||
icon.source: AppIcons.closeX
|
icon.source: AppIcons.closeX
|
||||||
onClicked: mainItem.visible = false
|
onClicked: mainItem.visible = false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Effects
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -44,8 +45,6 @@ RowLayout {
|
||||||
iconUrl: AppIcons.videoCamera
|
iconUrl: AppIcons.videoCamera
|
||||||
checkedIconUrl: AppIcons.videoCameraSlash
|
checkedIconUrl: AppIcons.videoCameraSlash
|
||||||
checked: !mainItem.localVideoEnabled
|
checked: !mainItem.localVideoEnabled
|
||||||
color: DefaultStyle.grey_500
|
|
||||||
contentImageColor: DefaultStyle.main2_0
|
|
||||||
Layout.preferredWidth: 55 * DefaultStyle.dp
|
Layout.preferredWidth: 55 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 55 * DefaultStyle.dp
|
Layout.preferredHeight: 55 * DefaultStyle.dp
|
||||||
icon.width: 32 * DefaultStyle.dp
|
icon.width: 32 * DefaultStyle.dp
|
||||||
|
|
@ -56,8 +55,6 @@ RowLayout {
|
||||||
id: microButton
|
id: microButton
|
||||||
iconUrl: AppIcons.microphone
|
iconUrl: AppIcons.microphone
|
||||||
checkedIconUrl: AppIcons.microphoneSlash
|
checkedIconUrl: AppIcons.microphoneSlash
|
||||||
color: DefaultStyle.grey_500
|
|
||||||
contentImageColor: DefaultStyle.main2_0
|
|
||||||
Layout.preferredWidth: 55 * DefaultStyle.dp
|
Layout.preferredWidth: 55 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 55 * DefaultStyle.dp
|
Layout.preferredHeight: 55 * DefaultStyle.dp
|
||||||
icon.width: 32 * DefaultStyle.dp
|
icon.width: 32 * DefaultStyle.dp
|
||||||
|
|
@ -78,8 +75,6 @@ RowLayout {
|
||||||
visible: stackLayout.currentIndex === 1
|
visible: stackLayout.currentIndex === 1
|
||||||
iconUrl: AppIcons.speaker
|
iconUrl: AppIcons.speaker
|
||||||
checkedIconUrl: AppIcons.speakerSlash
|
checkedIconUrl: AppIcons.speakerSlash
|
||||||
color: DefaultStyle.grey_500
|
|
||||||
contentImageColor: DefaultStyle.main2_0
|
|
||||||
Layout.preferredWidth: 55 * DefaultStyle.dp
|
Layout.preferredWidth: 55 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 55 * DefaultStyle.dp
|
Layout.preferredHeight: 55 * DefaultStyle.dp
|
||||||
icon.width: 32 * DefaultStyle.dp
|
icon.width: 32 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import EnumsToStringCpp
|
import EnumsToStringCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractMainPage {
|
AbstractMainPage {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
@ -179,8 +180,7 @@ AbstractMainPage {
|
||||||
Button {
|
Button {
|
||||||
id: createContactButton
|
id: createContactButton
|
||||||
visible: !rightPanelStackView.currentItem || rightPanelStackView.currentItem.objectName !== "contactEdition"
|
visible: !rightPanelStackView.currentItem || rightPanelStackView.currentItem.objectName !== "contactEdition"
|
||||||
background: Item {
|
style: ButtonStyle.noBackground
|
||||||
}
|
|
||||||
icon.source: AppIcons.plusCircle
|
icon.source: AppIcons.plusCircle
|
||||||
Layout.preferredWidth: 28 * DefaultStyle.dp
|
Layout.preferredWidth: 28 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 28 * DefaultStyle.dp
|
Layout.preferredHeight: 28 * DefaultStyle.dp
|
||||||
|
|
@ -274,8 +274,7 @@ AbstractMainPage {
|
||||||
RoundButton {
|
RoundButton {
|
||||||
visible: contactDetailLayout.icon != undefined
|
visible: contactDetailLayout.icon != undefined
|
||||||
icon.source: contactDetailLayout.icon
|
icon.source: contactDetailLayout.icon
|
||||||
contentImageColor: DefaultStyle.main1_500_main
|
style: ButtonStyle.noBackgroundOrange
|
||||||
background: Item{}
|
|
||||||
onClicked: contactDetailLayout.titleIconClicked()
|
onClicked: contactDetailLayout.titleIconClicked()
|
||||||
}
|
}
|
||||||
Item{Layout.fillWidth: true}
|
Item{Layout.fillWidth: true}
|
||||||
|
|
@ -468,7 +467,7 @@ AbstractMainPage {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
}
|
}
|
||||||
RoundButton {
|
RoundButton {
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.phone
|
icon.source: AppIcons.phone
|
||||||
onClicked: {
|
onClicked: {
|
||||||
UtilsCpp.createCall(listViewModelData.address)
|
UtilsCpp.createCall(listViewModelData.address)
|
||||||
|
|
@ -544,7 +543,7 @@ AbstractMainPage {
|
||||||
label: qsTr("Medias")
|
label: qsTr("Medias")
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
content: Button {
|
content: Button {
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
contentItem: RowLayout {
|
contentItem: RowLayout {
|
||||||
EffectImage {
|
EffectImage {
|
||||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
Layout.preferredWidth: 24 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp 1.0
|
import UtilsCpp 1.0
|
||||||
import ConstantsCpp 1.0
|
import ConstantsCpp 1.0
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractMainPage {
|
AbstractMainPage {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
import Linphone
|
import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
// TODO : spacing
|
// TODO : spacing
|
||||||
AbstractMainPage {
|
AbstractMainPage {
|
||||||
|
|
@ -142,7 +143,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
Item{Layout.fillWidth: true}
|
Item{Layout.fillWidth: true}
|
||||||
Button {
|
Button {
|
||||||
background: Item {}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.plusCircle
|
icon.source: AppIcons.plusCircle
|
||||||
Layout.preferredWidth: 28 * DefaultStyle.dp
|
Layout.preferredWidth: 28 * DefaultStyle.dp
|
||||||
Layout.preferredHeight: 28 * DefaultStyle.dp
|
Layout.preferredHeight: 28 * DefaultStyle.dp
|
||||||
|
|
@ -556,12 +557,11 @@ AbstractMainPage {
|
||||||
property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core?.organizerAddress)
|
property var isMeObj: UtilsCpp.isMe(mainItem.selectedConference?.core?.organizerAddress)
|
||||||
visible: mainItem.selectedConference && isMeObj && isMeObj.value || false
|
visible: mainItem.selectedConference && isMeObj && isMeObj.value || false
|
||||||
icon.source: AppIcons.pencil
|
icon.source: AppIcons.pencil
|
||||||
contentImageColor: DefaultStyle.main1_500_main
|
style: ButtonStyle.noBackgroundOrange
|
||||||
KeyNavigation.left: leftPanelStackView.currentItem
|
KeyNavigation.left: leftPanelStackView.currentItem
|
||||||
KeyNavigation.right: deletePopup
|
KeyNavigation.right: deletePopup
|
||||||
KeyNavigation.up: joinButton
|
KeyNavigation.up: joinButton
|
||||||
KeyNavigation.down: shareNetworkButton
|
KeyNavigation.down: shareNetworkButton
|
||||||
background: Item{}
|
|
||||||
onClicked: mainItem.editConference(mainItem.selectedConference)
|
onClicked: mainItem.editConference(mainItem.selectedConference)
|
||||||
}
|
}
|
||||||
PopupButton {
|
PopupButton {
|
||||||
|
|
@ -640,7 +640,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
RoundButton {
|
RoundButton {
|
||||||
id: shareNetworkButton
|
id: shareNetworkButton
|
||||||
background: Item{}
|
style: ButtonStyle.noBackground
|
||||||
icon.source: AppIcons.shareNetwork
|
icon.source: AppIcons.shareNetwork
|
||||||
KeyNavigation.left: linkButton
|
KeyNavigation.left: linkButton
|
||||||
KeyNavigation.right: linkButton
|
KeyNavigation.right: linkButton
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import QtQuick.Layouts
|
||||||
import QtQuick.Controls.Basic as Control
|
import QtQuick.Controls.Basic as Control
|
||||||
|
|
||||||
import Linphone
|
import Linphone
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
LoginLayout {
|
LoginLayout {
|
||||||
id: mainItem
|
id: mainItem
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import Linphone
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
import DesktopToolsCpp
|
import DesktopToolsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
ApplicationWindow {
|
ApplicationWindow {
|
||||||
id: mainWindow
|
id: mainWindow
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import EnumsToStringCpp
|
||||||
import UtilsCpp
|
import UtilsCpp
|
||||||
import SettingsCpp
|
import SettingsCpp
|
||||||
import DesktopToolsCpp
|
import DesktopToolsCpp
|
||||||
|
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||||
|
|
||||||
AbstractWindow {
|
AbstractWindow {
|
||||||
id: mainWindow
|
id: mainWindow
|
||||||
|
|
@ -746,21 +747,12 @@ AbstractWindow {
|
||||||
PopupButton {
|
PopupButton {
|
||||||
visible: callsModel.count >= 2
|
visible: callsModel.count >= 2
|
||||||
id: popupbutton
|
id: popupbutton
|
||||||
popup.contentItem: Button {
|
popup.contentItem: IconLabelButton {
|
||||||
background: Item{}
|
icon.source: AppIcons.arrowsMerge
|
||||||
contentItem: RowLayout {
|
icon.width: 32 * DefaultStyle.dp
|
||||||
spacing: 5 * DefaultStyle.dp
|
icon.height: 32 * DefaultStyle.dp
|
||||||
EffectImage {
|
text: qsTr("Merger tous les appels")
|
||||||
colorizationColor: DefaultStyle.main2_600
|
textSize: 14 * DefaultStyle.dp
|
||||||
imageSource: AppIcons.arrowsMerge
|
|
||||||
Layout.preferredWidth: 32 * DefaultStyle.dp
|
|
||||||
Layout.preferredHeight: 32 * DefaultStyle.dp
|
|
||||||
}
|
|
||||||
Text {
|
|
||||||
text: qsTr("Merger tous les appels")
|
|
||||||
font.pixelSize: 14 * DefaultStyle.dp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
callsModel.lMergeAll()
|
callsModel.lMergeAll()
|
||||||
popupbutton.close()
|
popupbutton.close()
|
||||||
|
|
@ -860,21 +852,9 @@ AbstractWindow {
|
||||||
Component {
|
Component {
|
||||||
id: headerbutton
|
id: headerbutton
|
||||||
PopupButton {
|
PopupButton {
|
||||||
popup.contentItem: Button {
|
popup.contentItem: IconLabelButton {
|
||||||
background: Item{}
|
icon.source: AppIcons.shareNetwork
|
||||||
contentItem: RowLayout {
|
text: qsTr("Partager le lien de la réunion")
|
||||||
spacing: 0
|
|
||||||
EffectImage {
|
|
||||||
colorizationColor: DefaultStyle.main2_600
|
|
||||||
imageSource: AppIcons.shareNetwork
|
|
||||||
Layout.preferredWidth: 24 * DefaultStyle.dp
|
|
||||||
Layout.preferredHeight: 24 * DefaultStyle.dp
|
|
||||||
}
|
|
||||||
Text {
|
|
||||||
text: qsTr("Partager le lien de la réunion")
|
|
||||||
font.pixelSize: 14 * DefaultStyle.dp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
UtilsCpp.copyToClipboard(mainWindow.call.core.remoteAddress)
|
UtilsCpp.copyToClipboard(mainWindow.call.core.remoteAddress)
|
||||||
showInformationPopup(qsTr("Copié"), qsTr("Le lien de la réunion a été copié dans le presse-papier"), true)
|
showInformationPopup(qsTr("Copié"), qsTr("Le lien de la réunion a été copié dans le presse-papier"), true)
|
||||||
|
|
|
||||||
|
|
@ -1,276 +0,0 @@
|
||||||
pragma Singleton
|
|
||||||
import QtQuick
|
|
||||||
import Linphone
|
|
||||||
import QtQuick.Effects
|
|
||||||
|
|
||||||
QtObject {
|
|
||||||
|
|
||||||
// Orange
|
|
||||||
property QtObject main: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color hovered: DefaultStyle.main1_600
|
|
||||||
property color pressed: DefaultStyle.main1_700
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// White with orange border
|
|
||||||
property QtObject secondary: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color hovered: DefaultStyle.main1_100
|
|
||||||
property color pressed: DefaultStyle.main1_500_main
|
|
||||||
}
|
|
||||||
property color borderColor: DefaultStyle.main1_500_main
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Light orange
|
|
||||||
property QtObject tertiary: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_100
|
|
||||||
property color hovered: DefaultStyle.main1_200
|
|
||||||
property color pressed: DefaultStyle.main1_300
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color pressed: DefaultStyle.main1_500_main
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color pressed: DefaultStyle.main1_500_main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Blue-grey
|
|
||||||
property QtObject grey: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_200
|
|
||||||
property color hovered: DefaultStyle.main2_300
|
|
||||||
property color pressed: DefaultStyle.main2_400
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_500main
|
|
||||||
property color pressed: DefaultStyle.main2_700
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_500main
|
|
||||||
property color pressed: DefaultStyle.main2_700
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Red phone
|
|
||||||
property QtObject phoneRed: QtObject {
|
|
||||||
property var iconSource: AppIcons.endCall
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.danger_500main
|
|
||||||
property color hovered: DefaultStyle.danger_700
|
|
||||||
property color pressed: DefaultStyle.danger_900
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Green phone
|
|
||||||
property QtObject phoneGreen: QtObject {
|
|
||||||
property var iconSource: AppIcons.phone
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.success_500main
|
|
||||||
property color hovered: DefaultStyle.success_700
|
|
||||||
property color pressed: DefaultStyle.success_900
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checkable
|
|
||||||
property QtObject checkable: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_500
|
|
||||||
property color hovered: DefaultStyle.grey_600
|
|
||||||
property color pressed: DefaultStyle.main2_400
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// No background
|
|
||||||
property QtObject noBackground: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: "transparent"
|
|
||||||
property color hovered: "transparent"
|
|
||||||
property color pressed: "transparent"
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_600
|
|
||||||
property color hovered: DefaultStyle.main2_700
|
|
||||||
property color pressed: DefaultStyle.main2_800
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_600
|
|
||||||
property color hovered: DefaultStyle.main2_700
|
|
||||||
property color pressed: DefaultStyle.main2_800
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// No background red
|
|
||||||
property QtObject noBackgroundRed: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: "transparent"
|
|
||||||
property color hovered: "transparent"
|
|
||||||
property color pressed: "transparent"
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.danger_500main
|
|
||||||
property color hovered: DefaultStyle.danger_700
|
|
||||||
property color pressed: DefaultStyle.danger_900
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.danger_500main
|
|
||||||
property color hovered: DefaultStyle.danger_700
|
|
||||||
property color pressed: DefaultStyle.danger_900
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// No background orange
|
|
||||||
property QtObject noBackgroundOrange: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: "transparent"
|
|
||||||
property color hovered: "transparent"
|
|
||||||
property color pressed: "transparent"
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color hovered: DefaultStyle.main1_600
|
|
||||||
property color pressed: DefaultStyle.main1_700
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.main1_500_main
|
|
||||||
property color hovered: DefaultStyle.main1_600
|
|
||||||
property color pressed: DefaultStyle.main1_700
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Icon + label button
|
|
||||||
property QtObject hoveredBackground: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: "transparent"
|
|
||||||
property color hovered: DefaultStyle.main2_100
|
|
||||||
property color pressed: DefaultStyle.main2_100
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_500main
|
|
||||||
property color hovered: DefaultStyle.main2_500main
|
|
||||||
property color pressed: DefaultStyle.main2_500main
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_500main
|
|
||||||
property color hovered: DefaultStyle.main2_500main
|
|
||||||
property color pressed: DefaultStyle.main2_500main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject hoveredBackgroundRed: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: "transparent"
|
|
||||||
property color hovered: DefaultStyle.main2_100
|
|
||||||
property color pressed: DefaultStyle.main2_100
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.danger_500main
|
|
||||||
property color hovered: DefaultStyle.danger_700
|
|
||||||
property color pressed: DefaultStyle.danger_900
|
|
||||||
}
|
|
||||||
property QtObject image: QtObject {
|
|
||||||
property color normal: DefaultStyle.danger_500main
|
|
||||||
property color hovered: DefaultStyle.danger_700
|
|
||||||
property color pressed: DefaultStyle.danger_900
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Numpad
|
|
||||||
property QtObject numericPad: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color hovered: DefaultStyle.grey_200
|
|
||||||
property color pressed: DefaultStyle.grey_300
|
|
||||||
}
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.main2_600
|
|
||||||
property color pressed: DefaultStyle.main2_700
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Green toast
|
|
||||||
property QtObject toast: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color hovered: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
property color borderColor: DefaultStyle.success_500main
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.success_500main
|
|
||||||
property color pressed: DefaultStyle.success_700
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Security blue toast
|
|
||||||
property QtObject securityToast: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color hovered: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
property color borderColor: DefaultStyle.info_500_main
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.info_500_main
|
|
||||||
property color pressed: DefaultStyle.info_500_main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Security red toast
|
|
||||||
property QtObject securityToastError: QtObject {
|
|
||||||
property QtObject color: QtObject {
|
|
||||||
property color normal: DefaultStyle.grey_0
|
|
||||||
property color hovered: DefaultStyle.grey_0
|
|
||||||
property color pressed: DefaultStyle.grey_0
|
|
||||||
}
|
|
||||||
property color borderColor: DefaultStyle.danger_500main
|
|
||||||
property QtObject text: QtObject {
|
|
||||||
property color normal: DefaultStyle.danger_500main
|
|
||||||
property color pressed: DefaultStyle.danger_500main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
291
Linphone/view/Style/buttonStyle.js
Normal file
291
Linphone/view/Style/buttonStyle.js
Normal file
|
|
@ -0,0 +1,291 @@
|
||||||
|
.pragma library
|
||||||
|
.import QtQuick as QtQuick
|
||||||
|
.import Linphone as Linphone
|
||||||
|
|
||||||
|
|
||||||
|
// Orange
|
||||||
|
var main = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
hovered: Linphone.DefaultStyle.main1_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_700
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// White with orange border
|
||||||
|
var secondary = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
hovered: Linphone.DefaultStyle.main1_100,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_500_main
|
||||||
|
},
|
||||||
|
borderColor: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Light orange
|
||||||
|
var tertiary = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_100,
|
||||||
|
hovered: Linphone.DefaultStyle.main1_200,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_300
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_500_main
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_500_main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Blue-grey
|
||||||
|
var grey = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_200,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_300,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_400
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_500main,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_700
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_500main,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_700
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Red phone
|
||||||
|
var phoneRed = {
|
||||||
|
iconSource: Linphone.AppIcons.endCall,
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.danger_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.danger_700,
|
||||||
|
pressed: Linphone.DefaultStyle.danger_900
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Green phone
|
||||||
|
var phoneGreen = {
|
||||||
|
iconSource: Linphone.AppIcons.phone,
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.success_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.success_700,
|
||||||
|
pressed: Linphone.DefaultStyle.success_900
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checkable
|
||||||
|
var checkable = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_500,
|
||||||
|
hovered: Linphone.DefaultStyle.grey_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_400
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// No background
|
||||||
|
var noBackground = {
|
||||||
|
color: {
|
||||||
|
normal: "#00000000",
|
||||||
|
hovered: "#00000000",
|
||||||
|
pressed: "#00000000"
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_600,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_700,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_800
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_600,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_700,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_800
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// No background red
|
||||||
|
var noBackgroundRed = {
|
||||||
|
color: {
|
||||||
|
normal: "#00000000",
|
||||||
|
hovered: "#00000000",
|
||||||
|
pressed: "#00000000"
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.danger_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.danger_700,
|
||||||
|
pressed: Linphone.DefaultStyle.danger_900
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.danger_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.danger_700,
|
||||||
|
pressed: Linphone.DefaultStyle.danger_900
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// No background orange
|
||||||
|
var noBackgroundOrange = {
|
||||||
|
color: {
|
||||||
|
normal: "#00000000",
|
||||||
|
hovered: "#00000000",
|
||||||
|
pressed: "#00000000"
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
hovered: Linphone.DefaultStyle.main1_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_700
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main1_500_main,
|
||||||
|
hovered: Linphone.DefaultStyle.main1_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main1_700
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Popup button
|
||||||
|
var popupButton = {
|
||||||
|
color: {
|
||||||
|
normal: "#00000000",
|
||||||
|
hovered: Linphone.DefaultStyle.grey_100,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_300
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_600,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_600
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_600,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_600
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Icon + label button
|
||||||
|
var hoveredBackground = {
|
||||||
|
color: {
|
||||||
|
normal: "#00000000",
|
||||||
|
hovered: Linphone.DefaultStyle.main2_100,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_100
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_500main,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_500main
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.main2_500main,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_500main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Icon + label red button
|
||||||
|
var hoveredBackgroundRed = {
|
||||||
|
color: {
|
||||||
|
normal: "#00000000",
|
||||||
|
hovered: Linphone.DefaultStyle.main2_100,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_100
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.danger_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.danger_700,
|
||||||
|
pressed: Linphone.DefaultStyle.danger_900
|
||||||
|
},
|
||||||
|
image: {
|
||||||
|
normal: Linphone.DefaultStyle.danger_500main,
|
||||||
|
hovered: Linphone.DefaultStyle.danger_700,
|
||||||
|
pressed: Linphone.DefaultStyle.danger_900
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Numpad
|
||||||
|
var numericPad = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
hovered: Linphone.DefaultStyle.grey_200,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_300
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.main2_600,
|
||||||
|
pressed: Linphone.DefaultStyle.main2_700
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Green toast
|
||||||
|
var toast = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
hovered: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
borderColor: Linphone.DefaultStyle.success_500main,
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.success_500main,
|
||||||
|
pressed: Linphone.DefaultStyle.success_700
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Security blue toast
|
||||||
|
var securityToast = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
hovered: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
borderColor: Linphone.DefaultStyle.info_500_main,
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.info_500_main,
|
||||||
|
pressed: Linphone.DefaultStyle.info_500_main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Security red toast
|
||||||
|
var securityToastError = {
|
||||||
|
color: {
|
||||||
|
normal: Linphone.DefaultStyle.grey_0,
|
||||||
|
hovered: Linphone.DefaultStyle.grey_0,
|
||||||
|
pressed: Linphone.DefaultStyle.grey_0
|
||||||
|
},
|
||||||
|
borderColor: Linphone.DefaultStyle.danger_500main,
|
||||||
|
text: {
|
||||||
|
normal: Linphone.DefaultStyle.danger_500main,
|
||||||
|
pressed: Linphone.DefaultStyle.danger_500main
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue