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

feat(Colors): add a color for field backgrounds

Browse source
This commit is contained in:
Ronan Abhamon 2018-07-24 14:15:48 +02:00
parent 3df5342ae5
commit 42375e9db8
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/other/colors/Colors.hpp
View file

@ -59,6 +59,8 @@ class Colors : public QObject {
Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT);
ADD_COLOR(a, "transparent");
// Primary color.
ADD_COLOR(b, "#D64D00");
ADD_COLOR(c, "#CBCBCB");
ADD_COLOR(d, "#5A585B");
@ -66,15 +68,27 @@ class Colors : public QObject {
ADD_COLOR(f, "#E8E8E8");
ADD_COLOR(g, "#6B7A86");
ADD_COLOR(h, "#687680");
// Primary color for hovered items.
ADD_COLOR(i, "#FE5E00");
ADD_COLOR(j, "#4B5964");
ADD_COLOR(k, "#FFFFFF");
ADD_COLOR(l, "#000000");
// Primary color for clicked items.
ADD_COLOR(m, "#FF8600");
ADD_COLOR(n, "#A1A1A1");
ADD_COLOR(o, "#D0D8DE");
// Progress bar.
ADD_COLOR(p, "#17A81A");
// Field background.
ADD_COLOR(q, "#FFFFFF");
// Field error.
ADD_COLOR(error, "#FF0000");
ADD_COLOR_WITH_ALPHA(g, 10);
@ -107,6 +121,7 @@ signals:
void colorTnChanged (const QColor &color);
void colorToChanged (const QColor &color);
void colorTpChanged (const QColor &color);
void colorTqChanged (const QColor &color);
void colorTerrorChanged (const QColor &color);

2
ui/modules/Common/Styles/Form/ComboBoxStyle.qml
View file

@ -19,7 +19,7 @@ QtObject {
}
property QtObject color: QtObject {
property color normal: Colors.k
property color normal: Colors.q
property color readOnly: Colors.e
}
}

2
ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml
View file

@ -19,7 +19,7 @@ QtObject {
}
property QtObject color: QtObject {
property color normal: Colors.k
property color normal: Colors.q
property color readOnly: Colors.e
}
}

2
ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
View file

@ -24,7 +24,7 @@ QtObject {
}
property QtObject color: QtObject {
property color normal: Colors.k
property color normal: Colors.q
property color readOnly: Colors.e
}
}