Commit 2509d01c authored by Ronan Abhamon's avatar Ronan Abhamon

fix(app): fix all qml linphone components (style, indentation, ...)

parent 8320f25d
import QtQuick 2.7
import Linphone 1.0
import Linphone.Styles 1.0
// ===================================================================
......
......@@ -2,24 +2,27 @@ pragma Singleton
import QtQuick 2.7
QtObject {
property string a: 'transparent'
property string b: '#5E5E5F' // Pressed toolbar.
property string c: '#C5C5C5' // Released toolbar.
property color a: 'transparent'
property color b: '#5E5E5F' // Pressed toolbar.
property color c: '#C5C5C5' // Released toolbar.
property string d: '#5A585B' // Text color.
property color d: '#5A585B' // Text color.
property string e: '#DEDEDE' // Timeline separator
property color e: '#DEDEDE' // Timeline separator
property string f: '#808080' // Popup shadow.
property color f: '#808080' // Popup shadow.
property string g: '#8E8E8E' // MenuEntry Normal.
property string h: '#707070' // MenuEntry Hovered.
property string i: '#FE5E00' // MenuEntry Pressed.
property string j: '#434343' // MenuEntry Selected.
property color g: '#8E8E8E' // MenuEntry Normal.
property color h: '#707070' // MenuEntry Hovered.
property color i: '#FE5E00' // MenuEntry Pressed.
property color j: '#434343' // MenuEntry Selected.
property string k: '#FFFFFF' // Text color.
property string l: '#000000' // Text color.
property color k: '#FFFFFF' // Text color.
property color l: '#000000' // Text color.
property string m: '#D1D1D1' // SmallButton Normal.
property string n: '#C0C0C0' // SmallButton Hovered.
property color m: '#D1D1D1' // SmallButton Normal.
property color n: '#C0C0C0' // SmallButton Hovered.
property color o: '#232323' // TextButtonA Hovered.
property color p: '#B1B1B1' // TextButtonB text Hovered.
}
......@@ -6,11 +6,13 @@ import Linphone.Styles 1.0
// ===================================================================
ScrollBar {
id: scrollBar
background: ForceScrollBarStyle.background
contentItem: Rectangle {
color: pressed
color: scrollBar.pressed
? ForceScrollBarStyle.color.pressed
: (hovered
: (scrollBar.hovered
? ForceScrollBarStyle.color.hovered
: ForceScrollBarStyle.color.normal
)
......
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Linphone 1.0
import Linphone.Styles 1.0
// ===================================================================
......@@ -9,7 +8,7 @@ import Linphone.Styles 1.0
// ===================================================================
ColumnLayout {
id: item
id: menu
property int entryHeight
property int entryWidth
......@@ -34,8 +33,8 @@ ColumnLayout {
: MenuStyle.entry.color.normal
)
)
height: item.entryHeight
width: item.entryWidth
height: menu.entryHeight
width: menu.entryWidth
RowLayout {
anchors.left: parent.left
......
......@@ -22,6 +22,6 @@ QtObject {
property int fontSize: 12
property int verticalMargin: 25
property string color: Colors.l
property color color: Colors.l
}
}
......@@ -15,8 +15,8 @@ QtObject {
}
property QtObject color: QtObject {
property string hovered: Colors.h
property string normal: Colors.c
property string pressed: Colors.b
property color hovered: Colors.h
property color normal: Colors.c
property color pressed: Colors.b
}
}
......@@ -8,10 +8,10 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property string hovered: Colors.n
property string normal: Colors.m
property string pressed: Colors.i
property string selected: Colors.g
property color hovered: Colors.n
property color normal: Colors.m
property color pressed: Colors.i
property color selected: Colors.g
}
}
}
......@@ -9,15 +9,15 @@ QtObject {
property int radius: 10
property QtObject color: QtObject {
property string hovered: Colors.n
property string normal: Colors.m
property string pressed: Colors.i
property color hovered: Colors.n
property color normal: Colors.m
property color pressed: Colors.i
}
}
property QtObject text: QtObject {
property int fontSize: 8
property color color: Colors.k
property string color: Colors.k
property int fontSize: 8
}
}
......@@ -5,14 +5,14 @@ import Linphone 1.0
QtObject {
property QtObject backgroundColor: QtObject {
property color hovered: '#232323'
property color pressed: '#FE5E00'
property color normal: '#434343'
property color hovered: Colors.o
property color pressed: Colors.i
property color normal: Colors.j
}
property QtObject textColor: QtObject {
property color hovered: '#FFFFFF'
property color pressed: '#FFFFFF'
property color normal: '#FFFFFF'
property color hovered: Colors.k
property color pressed: Colors.k
property color normal: Colors.k
}
}
......@@ -5,14 +5,14 @@ import Linphone 1.0
QtObject {
property QtObject backgroundColor: QtObject {
property color hovered: '#B1B1B1'
property color pressed: '#FE5E00'
property color normal: '#D1D1D1'
property color hovered: Colors.p
property color pressed: Colors.i
property color normal: Colors.m
}
property QtObject textColor: QtObject {
property color hovered: '#5A585B'
property color pressed: '#FFFFFF'
property color normal: '#5A585B'
property color hovered: Colors.d
property color pressed: Colors.k
property color normal: Colors.d
}
}
......@@ -16,16 +16,16 @@ QtObject {
property string selectionIcon: 'right_arrow'
property QtObject color: QtObject {
property string normal: Colors.g
property string hovered: Colors.h
property string pressed: Colors.i
property string selected: Colors.j
property color normal: Colors.g
property color hovered: Colors.h
property color pressed: Colors.i
property color selected: Colors.j
}
property QtObject text: QtObject {
property int fontSize: 13
property color color: Colors.k
property string color: Colors.k
property int fontSize: 13
}
}
}
......@@ -4,14 +4,14 @@ import QtQuick 2.7
import Linphone 1.0
QtObject {
property string backgroundColor: Colors.k
property color backgroundColor: Colors.k
property QtObject shadow: QtObject {
property color color: Colors.f
property int horizontalOffset: 0
property int radius: 8
property int samples: 15
property int verticalOffset: 2
property string color: Colors.f
}
}
......@@ -4,7 +4,7 @@ import QtQuick 2.7
import Linphone 1.0
QtObject {
property string shadowColor: Colors.f
property color shadowColor: Colors.f
property Rectangle searchFieldBackground: Rectangle {
implicitHeight: 30
......
......@@ -5,6 +5,8 @@ import Linphone 1.0
QtObject {
property QtObject legend: QtObject {
property color color: Colors.d
property int bottomMargin: 10
property int fontSize: 13
property int iconSize: 26
......@@ -12,13 +14,12 @@ QtObject {
property int spacing: 16
property int topMargin: 10
property string color: Colors.d
property string icon: 'history'
}
property QtObject separator: QtObject {
property int height: 1
property color color: Colors.e
property string color: Colors.e
property int height: 1
}
}
import QtQuick 2.7
import QtQuick.Layouts 1.3
import Linphone 1.0
import Linphone.Styles 1.0
// ===================================================================
ColumnLayout {
id: item
property var model
property alias model: view.model
// Legend.
Row {
......@@ -41,11 +38,11 @@ ColumnLayout {
// History.
ScrollableListView {
id: view
Layout.fillHeight: true
Layout.fillWidth: true
model: item.model
delegate: Contact {
presence: $presence
sipAddress: $sipAddress
......
# ====================================================================
# Linphone's components to export.
# ====================================================================
module Linphone
# Constants ----------------------------------------------------------
......
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