diff --git a/src/components/other/colors/Colors.hpp b/src/components/other/colors/Colors.hpp index bc29f52ba..af368d65e 100644 --- a/src/components/other/colors/Colors.hpp +++ b/src/components/other/colors/Colors.hpp @@ -59,6 +59,7 @@ class Colors : public QObject { Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT); ADD_COLOR(a, "transparent"); + ADD_COLOR(b, "#D64D00"); ADD_COLOR(c, "#CBCBCB"); ADD_COLOR(d, "#5A585B"); ADD_COLOR(e, "#F3F3F3"); @@ -69,11 +70,10 @@ class Colors : public QObject { ADD_COLOR(j, "#4B5964"); ADD_COLOR(k, "#FFFFFF"); ADD_COLOR(l, "#000000"); - ADD_COLOR(s, "#D64D00"); - ADD_COLOR(t, "#FF8600"); - ADD_COLOR(w, "#A1A1A1"); - ADD_COLOR(y, "#D0D8DE"); - ADD_COLOR(z, "#17A81A"); + ADD_COLOR(m, "#FF8600"); + ADD_COLOR(n, "#A1A1A1"); + ADD_COLOR(o, "#D0D8DE"); + ADD_COLOR(p, "#17A81A"); ADD_COLOR(error, "#FF0000"); @@ -81,7 +81,6 @@ class Colors : public QObject { ADD_COLOR_WITH_ALPHA(g, 20); ADD_COLOR_WITH_ALPHA(g, 90); ADD_COLOR_WITH_ALPHA(i, 30); - ADD_COLOR_WITH_ALPHA(j, 75); ADD_COLOR_WITH_ALPHA(k, 50); ADD_COLOR_WITH_ALPHA(l, 50); ADD_COLOR_WITH_ALPHA(l, 80); @@ -108,16 +107,6 @@ signals: void colorTnChanged (const QColor &color); void colorToChanged (const QColor &color); void colorTpChanged (const QColor &color); - void colorTqChanged (const QColor &color); - void colorTrChanged (const QColor &color); - void colorTsChanged (const QColor &color); - void colorTtChanged (const QColor &color); - void colorTuChanged (const QColor &color); - void colorTvChanged (const QColor &color); - void colorTwChanged (const QColor &color); - void colorTxChanged (const QColor &color); - void colorTyChanged (const QColor &color); - void colorTzChanged (const QColor &color); void colorTerrorChanged (const QColor &color); diff --git a/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml b/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml index f619a62ea..d28e7e5a0 100644 --- a/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml +++ b/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml @@ -10,7 +10,7 @@ QtObject { property QtObject button: QtObject { property QtObject color: QtObject { - property color hovered: Colors.w + property color hovered: Colors.n property color normal: Colors.c property color pressed: Colors.i property color selected: Colors.g diff --git a/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml b/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml index 2fb505972..7233ed8a2 100644 --- a/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml +++ b/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml @@ -7,7 +7,7 @@ import Colors 1.0 QtObject { property QtObject backgroundColor: QtObject { - property color disabled: Colors.y + property color disabled: Colors.o property color hovered: Colors.j property color normal: Colors.g property color pressed: Colors.i diff --git a/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml b/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml index 36fa8446a..9c703d374 100644 --- a/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml +++ b/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml @@ -8,9 +8,9 @@ import Colors 1.0 QtObject { property QtObject backgroundColor: QtObject { property color disabled: Colors.i30 - property color hovered: Colors.s + property color hovered: Colors.b property color normal: Colors.i - property color pressed: Colors.t + property color pressed: Colors.m } property QtObject textColor: QtObject { diff --git a/ui/modules/Common/Styles/Form/ComboBoxStyle.qml b/ui/modules/Common/Styles/Form/ComboBoxStyle.qml index e2567976b..131a8306d 100644 --- a/ui/modules/Common/Styles/Form/ComboBoxStyle.qml +++ b/ui/modules/Common/Styles/Form/ComboBoxStyle.qml @@ -37,7 +37,7 @@ QtObject { property QtObject delegate: QtObject { property QtObject color: QtObject { - property color hovered: Colors.y + property color hovered: Colors.o property color normal: Colors.k } diff --git a/ui/modules/Common/Styles/Form/ListFormStyle.qml b/ui/modules/Common/Styles/Form/ListFormStyle.qml index 4b9f654dd..088fc1199 100644 --- a/ui/modules/Common/Styles/Form/ListFormStyle.qml +++ b/ui/modules/Common/Styles/Form/ListFormStyle.qml @@ -11,7 +11,7 @@ QtObject { property QtObject value: QtObject { property QtObject placeholder: QtObject { - property color color: Colors.w + property color color: Colors.n property int pointSize: Units.dp * 10 } diff --git a/ui/modules/Common/Styles/Form/SliderStyle.qml b/ui/modules/Common/Styles/Form/SliderStyle.qml index 816daaa8f..7e0316e0a 100644 --- a/ui/modules/Common/Styles/Form/SliderStyle.qml +++ b/ui/modules/Common/Styles/Form/SliderStyle.qml @@ -13,7 +13,7 @@ QtObject { property int width: 200 property QtObject content: QtObject { - property color color: Colors.t + property color color: Colors.m property int radius: 2 } } diff --git a/ui/modules/Common/Styles/Form/SwitchStyle.qml b/ui/modules/Common/Styles/Form/SwitchStyle.qml index 609b68a3d..fb86364c1 100644 --- a/ui/modules/Common/Styles/Form/SwitchStyle.qml +++ b/ui/modules/Common/Styles/Form/SwitchStyle.qml @@ -36,8 +36,8 @@ QtObject { property QtObject color: QtObject { property color checked: Colors.i property color disabled: Colors.c - property color normal: Colors.w - property color pressed: Colors.w + property color normal: Colors.n + property color pressed: Colors.n } } diff --git a/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml b/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml index e4badee9d..ec5ae1b19 100644 --- a/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml +++ b/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml @@ -11,9 +11,9 @@ QtObject { property QtObject backgroundColor: QtObject { property color disabled: Colors.i30 - property color hovered: Colors.s + property color hovered: Colors.b property color normal: Colors.i - property color pressed: Colors.t + property color pressed: Colors.m property color selected: Colors.k } diff --git a/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml index 9c8402b12..6b0fec317 100644 --- a/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml +++ b/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml @@ -12,7 +12,7 @@ QtObject { property int padding: 10 property QtObject placeholder: QtObject { - property color color: Colors.w + property color color: Colors.n property int pointSize: Units.dp * 10 } diff --git a/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml b/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml index 784739f68..4d7574a0f 100644 --- a/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml +++ b/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml @@ -12,21 +12,21 @@ QtObject { property QtObject high: QtObject { property QtObject background: QtObject { property QtObject color: QtObject { - property color disabled: Colors.y - property color enabled: Colors.w + property color disabled: Colors.o + property color enabled: Colors.n } } property QtObject contentItem: QtObject { - property color color: Colors.s + property color color: Colors.b } } property QtObject low: QtObject { property QtObject background: QtObject { property QtObject color: QtObject { - property color disabled: Colors.y - property color enabled: Colors.w + property color disabled: Colors.o + property color enabled: Colors.n } } diff --git a/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml index 7314d1782..f1e65c990 100644 --- a/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml +++ b/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml @@ -8,7 +8,7 @@ import Units 1.0 QtObject { property int spacing: 1 - property color backgroundColor: Colors.w + property color backgroundColor: Colors.n property QtObject entry: QtObject { property int iconSize: 24 diff --git a/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/ui/modules/Common/Styles/Menus/MenuItemStyle.qml index 27054537f..69e8e25b8 100644 --- a/ui/modules/Common/Styles/Menus/MenuItemStyle.qml +++ b/ui/modules/Common/Styles/Menus/MenuItemStyle.qml @@ -14,9 +14,9 @@ QtObject { property int height: 30 property QtObject color: QtObject { - property color hovered: Colors.y + property color hovered: Colors.o property color normal: Colors.k - property color pressed: Colors.y + property color pressed: Colors.o } } diff --git a/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml b/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml index a60411bc6..3f75b36a1 100644 --- a/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml +++ b/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml @@ -15,7 +15,7 @@ QtObject { } property QtObject sipAddress: QtObject { - property color color: Colors.j75 + property color color: Colors.g property int pointSize: Units.dp * 10 } diff --git a/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml b/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml index 4a37948ff..6f0200ce8 100644 --- a/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml +++ b/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml @@ -15,7 +15,7 @@ QtObject { } property QtObject description: QtObject { - property color color: Colors.w + property color color: Colors.n property int pointSize: Units.dp * 10 property int height: 40 } diff --git a/ui/modules/Linphone/Styles/Calls/CallsStyle.qml b/ui/modules/Linphone/Styles/Calls/CallsStyle.qml index 4ff277819..c9001c799 100644 --- a/ui/modules/Linphone/Styles/Calls/CallsStyle.qml +++ b/ui/modules/Linphone/Styles/Calls/CallsStyle.qml @@ -24,7 +24,7 @@ QtObject { } property QtObject sipAddressColor: QtObject { - property color normal: Colors.w + property color normal: Colors.n property color selected: Colors.k } diff --git a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/ui/modules/Linphone/Styles/Chat/ChatStyle.qml index 09cb030ba..b19bf155b 100644 --- a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml +++ b/ui/modules/Linphone/Styles/Chat/ChatStyle.qml @@ -100,7 +100,7 @@ QtObject { } property QtObject contentItem: QtObject { - property color color: Colors.z + property color color: Colors.p } } } @@ -111,7 +111,7 @@ QtObject { } property QtObject incoming: QtObject { - property color backgroundColor: Colors.y + property color backgroundColor: Colors.o property int avatarSize: 20 property QtObject text: QtObject { diff --git a/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml b/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml index ea403c6e2..250a7779b 100644 --- a/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml +++ b/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml @@ -15,7 +15,7 @@ QtObject { property QtObject background: QtObject { property QtObject color: QtObject { property color normal: Colors.a - property color hovered: Colors.y + property color hovered: Colors.o } } diff --git a/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml index 72c9184cc..be43d67cb 100644 --- a/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml +++ b/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml @@ -8,7 +8,7 @@ import Units 1.0 QtObject { property QtObject sipAddress: QtObject { - property color color: Colors.w + property color color: Colors.n property int pointSize: Units.dp * 10 } diff --git a/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml b/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml index 1dd61f945..8d975cbc6 100644 --- a/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml +++ b/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml @@ -24,7 +24,7 @@ QtObject { property QtObject contentItem: QtObject { property QtObject color: QtObject { property color failed: Colors.error - property color normal: Colors.z + property color normal: Colors.p } } } diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml index e070a1fd8..df081addf 100644 --- a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml +++ b/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml @@ -15,7 +15,7 @@ QtObject { property int spacing: 0 property QtObject messageContainer: QtObject { - property color color: Colors.y + property color color: Colors.o property int radius: 6 property int margins: 10 diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml b/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml index 17c4fd55a..8a17b30f1 100644 --- a/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml +++ b/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml @@ -12,7 +12,7 @@ QtObject { property int width: 300 property QtObject border: QtObject { - property color color: Colors.w + property color color: Colors.n property int width: 1 } } diff --git a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml index 4bec7ddfd..53c9b3dfe 100644 --- a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml +++ b/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml @@ -20,7 +20,7 @@ QtObject { property QtObject sipAddress: QtObject { property QtObject color: QtObject { - property color normal: Colors.w + property color normal: Colors.n property color selected: Colors.k } } diff --git a/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml b/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml index da6ebb12a..25a6ecde1 100644 --- a/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml +++ b/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml @@ -13,7 +13,7 @@ QtObject { property int rightMargin: 10 property QtObject color: QtObject { - property color hovered: Colors.y + property color hovered: Colors.o property color normal: Colors.k } diff --git a/ui/views/App/Styles/Calls/CallStyle.qml b/ui/views/App/Styles/Calls/CallStyle.qml index 23292b3ac..efedd5205 100644 --- a/ui/views/App/Styles/Calls/CallStyle.qml +++ b/ui/views/App/Styles/Calls/CallStyle.qml @@ -35,7 +35,7 @@ QtObject { property int margins: 15 property QtObject avatar: QtObject { - property color backgroundColor: Colors.w + property color backgroundColor: Colors.n property int maxSize: 300 } diff --git a/ui/views/App/Styles/Main/ContactsStyle.qml b/ui/views/App/Styles/Main/ContactsStyle.qml index 879cca26f..09c1349f7 100644 --- a/ui/views/App/Styles/Main/ContactsStyle.qml +++ b/ui/views/App/Styles/Main/ContactsStyle.qml @@ -44,7 +44,7 @@ QtObject { property QtObject presence: QtObject { property int pointSize: Units.dp * 10 - property color color: Colors.w + property color color: Colors.n } property QtObject username: QtObject { diff --git a/ui/views/App/Styles/Main/MainWindowStyle.qml b/ui/views/App/Styles/Main/MainWindowStyle.qml index b1ec59c6c..293e3153e 100644 --- a/ui/views/App/Styles/Main/MainWindowStyle.qml +++ b/ui/views/App/Styles/Main/MainWindowStyle.qml @@ -24,7 +24,7 @@ QtObject { property QtObject text: QtObject { property int pointSize: Units.dp * 8 - property color color: Colors.j75 + property color color: Colors.g } }