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

Use ColorModel instead of color for custom C++ featuring.

Browse source
This commit is contained in:
Julien Wadel 2022-12-27 16:37:59 +01:00
parent ea1fb992f2
commit bf6b0f565a
271 changed files with 2843 additions and 2706 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
linphone-app/src/components/other/colors/ColorListModel.cpp
View file

@ -106,30 +106,42 @@ QString ColorListModel::buildDescription(QString description){
return description;
}
ColorModel * ColorListModel::add(const QString& id, const QString& idLink, QString description, QString colorValue, const int& overrideAlpha, const ColorModel::ContextMode& context){
ColorModel * ColorListModel::add(const QString& id, const QString& idLink, QString description, QString colorValue, const int& overrideAlpha, ColorModel::ContextMode context){
ColorModel * color = getColor(id);
if( description == "")
description = buildDescription(id);
if(!color){
QColor colorToUse(colorValue);
QColor linkColor;
if(idLink != ""){
if( colorValue == ""){
auto linkColor = getColor(idLink);
if(linkColor){
colorValue = linkColor->getColor().name(QColor::HexArgb);
auto linkColorModel = getColor(idLink);
if(linkColorModel){
linkColor = linkColorModel->getOriginColor();
if( context == ColorModel::CONTEXT_FROMLINK){
context = linkColorModel->getContext();
colorToUse = linkColorModel->getColor();
}else
colorToUse = linkColorModel->getColor(context);
}
}
addLink(id, idLink);
}
auto colorShared = QSharedPointer<ColorModel>::create(id, colorValue, description);
if(overrideAlpha>=0)
if(overrideAlpha>0)
colorToUse.setAlpha(overrideAlpha* 255 / 100);
if( context == ColorModel::CONTEXT_FROMLINK)
context = ColorModel::CONTEXT_NORMAL;
auto colorShared = QSharedPointer<ColorModel>::create(id, colorToUse, linkColor, description, context);
if(!colorToUse.isValid() && overrideAlpha>0)
colorShared->setAlpha(overrideAlpha* 255 / 100);
colorShared->setContext(context);
add(colorShared);
color = colorShared.get();
emit colorChanged();
}else if( description != color->getDescription()) {
color->setDescription(description);
if(overrideAlpha>=0)
if(overrideAlpha>0)
color->setAlpha(overrideAlpha* 255 / 100);
emit colorChanged();
}
@ -291,7 +303,7 @@ void ColorListModel::handleUiColorChanged(const QString& id, const QColor& color
for(int i = 0 ; i < mColorLinks[index].size() ; ++i){
auto colorToUpdate = getColor(mColorLinks[index][i]);
if(colorToUpdate)
colorToUpdate->setInternalColor(color);
colorToUpdate->setOriginColor(color, false);
}
}
}

8
linphone-app/src/components/other/colors/ColorListModel.hpp
View file

@ -33,7 +33,7 @@
#include "app/proxyModel/ProxyListModel.hpp"
#define ADD_COLOR(COLOR, VALUE, DESCRIPTION) \
color = QSharedPointer<ColorModel>::create(COLOR, VALUE, DESCRIPTION); \
color = QSharedPointer<ColorModel>::create(COLOR, QColor(VALUE), QColor(), DESCRIPTION, ColorModel::CONTEXT_NORMAL); \
add(color);
#define ADD_COLOR_WITH_LINK(COLOR, VALUE, DESCRIPTION, LINK) \
@ -316,7 +316,7 @@ public:
// color : if empty, use the color from link
// description : describe the color
// idLink : link this color with another ID
Q_INVOKABLE ColorModel * add(const QString& id, const QString& idLink, QString description = "", QString color = "", const int& overrideAlpha = -1, const ColorModel::ContextMode& context = ColorModel::CONTEXT_NORMAL);
Q_INVOKABLE ColorModel * add(const QString& id, const QString& idLink, QString description = "", QString color = "", const int& overrideAlpha = -1, ColorModel::ContextMode context = ColorModel::CONTEXT_FROMLINK);
Q_INVOKABLE ColorModel * addImageColor(const QString& id, const QString& imageId, const QString& idLink, QString description = "", QString color = "");
void addLink(const QString& a, const QString& b);
@ -337,6 +337,10 @@ public slots:
signals:
void colorChanged();
// Internal mechanics
void uiResetColors();
void uiAddColor(ColorModel* colorModel);
private:
void add(QSharedPointer<ColorModel> imdn);
QString buildDescription(QString description); // return a description from id by splitting '_'

71
linphone-app/src/components/other/colors/ColorModel.cpp
View file

@ -29,11 +29,20 @@
// =============================================================================
ColorModel::ColorModel (const QString& name, const QColor& color, const QString& description, QObject * parent) : QObject(parent) {
ColorModel::ColorModel (const QString& name, const QColor& color, const QColor& originColor, const QString& description, const ContextMode& context, QObject * parent) : QObject(parent) {
App::getInstance()->getEngine()->setObjectOwnership(this, QQmlEngine::CppOwnership);// Avoid QML to destroy it when passing by Q_INVOKABLE
mName = name;
setColor(color);
setDescription(description) ;
mContextMode = context;
if( color.isValid() && originColor.isValid()){
mColor = color;
mOriginColor = originColor;
if(mColor.alpha() != mOriginColor.alpha() && mOriginColor.alpha() > 0)
mAlphaFactor = mColor.alpha() / (double)mOriginColor.alpha();
}else if( color.isValid())
setColor(color);
else
setOriginColor(originColor);
setDescription(description);
}
// -----------------------------------------------------------------------------
@ -45,6 +54,23 @@ QString ColorModel::getName() const{
QColor ColorModel::getColor() const{
return mColor;
}
QColor ColorModel::getColor(const ContextMode& context) const{
QColor color = mOriginColor;
if(mAlphaFactor>0)
color.setAlpha(std::min(255.0, mOriginColor.alpha() * mAlphaFactor));
switch(context){
case CONTEXT_FROMLINK : case CONTEXT_NORMAL : break;
case CONTEXT_PRESSED: color = color.lighter(140); break;
case CONTEXT_HOVERED: color = color.darker(140); break;
case CONTEXT_DEACTIVATED: color.setAlpha(60);break;
}
return color;
}
QColor ColorModel::getOriginColor() const{
return mOriginColor;
}
QString ColorModel::getDescription() const{
return mDescription;
}
@ -55,23 +81,34 @@ int ColorModel::getLinkIndex() const{
return mLinkIndex;
}
ColorModel::ContextMode ColorModel::getContext() const{
return mContextMode;
}
void ColorModel::setColor(const QColor& color){
if(color != mColor){
if(mAlphaFactor>=0 && mColor.isValid() && mOriginColor.isValid() && color.alpha() != mColor.alpha() && mOriginColor.alpha() != 0)
mAlphaFactor = color.alpha() / (double)mOriginColor.alpha();
mColor = color;
updateContextFromColor();
emit colorChanged();
emit uiColorChanged(mName, color);
emit uiColorChanged(mName, mOriginColor);
}
}
void ColorModel::setInternalColor(const QColor& color){
if(color != mColor){
mColor = color;
void ColorModel::setOriginColor(const QColor& color, const bool& emitEvents){
if(color != mOriginColor){
mOriginColor = color;
updateContext();
emit colorChanged();
if(emitEvents)
emit uiColorChanged(mName, mOriginColor);
}
}
void ColorModel::setAlpha(const int& alpha){
if(mOriginColor.alpha()>0)
mAlphaFactor = alpha / (double)mOriginColor.alpha();
mColor.setAlpha(alpha);
emit colorChanged();
}
@ -99,10 +136,20 @@ void ColorModel::setContext(const ContextMode& context){
}
void ColorModel::updateContext(){
//auto backup = mColor.alpha();
mColor = getColor(mContextMode);
emit colorChanged();
}
void ColorModel::updateContextFromColor(){
auto backup = mOriginColor.alpha();
mOriginColor = mColor;
if(mAlphaFactor>0)
mOriginColor.setAlpha(std::min(255.0, mColor.alpha() / mAlphaFactor));
switch(mContextMode){
case CONTEXT_NORMAL : break;
case CONTEXT_PRESSED: mColor = mColor.lighter(140); break;
case CONTEXT_HOVERED: mColor = mColor.darker(140); break;
case CONTEXT_DEACTIVATED: mColor.setAlpha(60);break;
case CONTEXT_FROMLINK : case CONTEXT_NORMAL : break;
case CONTEXT_PRESSED: mOriginColor = mOriginColor.darker(140); break;
case CONTEXT_HOVERED: mOriginColor = mOriginColor.lighter(140); break;
case CONTEXT_DEACTIVATED: mOriginColor.setAlpha(backup);break;
}
}

13
linphone-app/src/components/other/colors/ColorModel.hpp
View file

@ -34,33 +34,38 @@ class ColorModel : public QObject {
public:
typedef enum{
CONTEXT_FROMLINK = -1,
CONTEXT_NORMAL = 0,
CONTEXT_HOVERED,// More darker
CONTEXT_PRESSED,// More lighter
CONTEXT_DEACTIVATED// Alpha
}ContextMode;
ColorModel (const QString& name, const QColor& color, const QString& description, QObject * parent = nullptr);
ColorModel (const QString& name, const QColor& color, const QColor& originColor, const QString& description, const ContextMode& context, QObject * parent = nullptr);
Q_PROPERTY(QColor color MEMBER mColor WRITE setColor NOTIFY colorChanged)
Q_PROPERTY(QColor color READ getColor WRITE setColor NOTIFY colorChanged)
Q_PROPERTY(QString description MEMBER mDescription WRITE setDescription NOTIFY descriptionChanged)
Q_PROPERTY(QString name MEMBER mName CONSTANT)
Q_PROPERTY(int linkIndex MEMBER mLinkIndex WRITE setLinkIndex NOTIFY linkIndexChanged)
QColor getColor() const;
QColor getColor(const ContextMode& context) const;
QColor getOriginColor() const;
QString getDescription() const;
QString getName() const;
int getLinkIndex() const;
ContextMode getContext() const;
Q_INVOKABLE QString toString(){return getName();}
QString getLinkedToImage() const;
void setColor(const QColor& color);
void setInternalColor(const QColor& color);
void setOriginColor(const QColor& color, const bool& emitEvents = true);
void setAlpha(const int& alpha);
void setDescription(const QString& description);
void setLinkIndex(const int& index);
void setLinkedToImage(const QString& id);
void setContext(const ContextMode& context);
void updateContext();
void updateContextFromColor();
signals:
void colorChanged();
@ -71,6 +76,8 @@ signals:
private:
QString mName;
QColor mColor;
QColor mOriginColor;
double mAlphaFactor = -1.0;
QString mDescription;
QString mLinkedToImage;
int mLinkIndex = -1;

47
linphone-app/src/components/other/colors/ColorProxyModel.cpp
View file

@ -31,6 +31,9 @@
// =============================================================================
ColorProxyModel::ColorProxyModel (QObject *parent) : QSortFilterProxyModel(parent){
connect(App::getInstance()->getColorListModel(), &ColorListModel::uiResetColors, this, &ColorProxyModel::resetColors);
connect(App::getInstance()->getColorListModel(), &ColorListModel::uiAddColor, this, &ColorProxyModel::addColor);
setSourceModel(App::getInstance()->getColorListModel());
mSortMode = 0;
sort(0);
@ -63,12 +66,40 @@ void ColorProxyModel::updateLink(const QString& id, const QString& newLink){
invalidate();
}
void ColorProxyModel::viewLinks(const QString& id){
if(id != ""){
ColorListModel * listModel = static_cast<ColorListModel*>(sourceModel());
mLinksIndex = listModel->getLinkIndex(id);
}else{
mLinksIndex = -1;
}
invalidate();
}
void ColorProxyModel::filterText(const QString& text){
mFilterText = text;
invalidate();
}
void ColorProxyModel::changeSort(){
mSortMode = (mSortMode+1)%4;
invalidate();
emit sortChanged();
}
void ColorProxyModel::resetColors(){
mColors.clear();
invalidate();
}
void ColorProxyModel::addColor(ColorModel * colorModel){
auto listModel = qobject_cast<ProxyListModel*>(sourceModel());
auto colorListModel = App::getInstance()->getColorListModel();
auto internalColorModel = colorListModel->get(colorModel);
if( internalColorModel)
mColors << internalColorModel;
invalidate();
}
QString ColorProxyModel::getSortDescription() const{
switch(mSortMode){
case 0: return "Link name";
@ -89,6 +120,22 @@ bool ColorProxyModel::filterAcceptsRow (
Q_UNUSED(sourceParent)
const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
const ColorModel *model= index.data().value<ColorModel *>();
if(mLinksIndex>=0){
ColorListModel * listModel = static_cast<ColorListModel*>(sourceModel());
auto ids = listModel->getColorIdLinks()[mLinksIndex];
for(int i = 0 ; i < ids.size() ; ++i)
if(listModel->getColor(ids[i]) == model)
return true;
return false;
}
if(!mFilterText.isEmpty()){
return model->getName().contains(mFilterText, Qt::CaseInsensitive) || model->getDescription().contains(mFilterText, Qt::CaseInsensitive);
}
auto it = std::find_if(mColors.begin(), mColors.end(), [model](QSharedPointer<QObject> colorModel) {
return colorModel == model;
});
if( it == mColors.end())
return false;
//return model->getLinkedToImage() == "";// Remove linked to image from list
int currentPage = sourceRow / 50;
return mShowAll || currentPage == mShowPageIndex;

13
linphone-app/src/components/other/colors/ColorProxyModel.hpp
View file

@ -29,6 +29,7 @@
#include <QString>
#include <QSortFilterProxyModel>
class ColorModel;
class ColorListModel;
class ChatMessageModel;
@ -43,8 +44,12 @@ public:
Q_PROPERTY(bool showAll READ getShowAll WRITE setShowAll NOTIFY showAllChanged)
Q_INVOKABLE void updateLink(const QString& id, const QString& newLink);
Q_INVOKABLE void viewLinks(const QString& id);
Q_INVOKABLE void changeSort();
Q_INVOKABLE void filterText(const QString& text);
void resetColors();
void addColor(ColorModel * colorModel);
QString getSortDescription() const;
@ -66,8 +71,10 @@ protected:
private:
int mSortMode;
int mShowPageIndex = 0;
bool mShowAll = false;
bool mShowAll = true;
int mLinksIndex = -1;
QString mFilterText;
QList<QSharedPointer<QObject>> mColors;
};
#endif

2
linphone-app/ui/modules/Common/Animations/BusyIndicator.qml
View file

@ -10,7 +10,7 @@ BusyIndicator {
// ---------------------------------------------------------------------------
property color color: BusyIndicatorStyle.color
property color color: BusyIndicatorStyle.colorModel.color
readonly property int _rotation: 360
readonly property int _size: width < height ? width : height

2
linphone-app/ui/modules/Common/Dialog/DialogDescription.qml
View file

@ -25,7 +25,7 @@ Item {
rightMargin: DialogStyle.description.rightMargin
}
color: DialogStyle.description.color
color: DialogStyle.description.colorModel.color
font.pointSize: DialogStyle.description.pointSize
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter

2
linphone-app/ui/modules/Common/Dialog/DialogPlus.qml
View file

@ -53,7 +53,7 @@ Rectangle {
// ---------------------------------------------------------------------------
color: DialogStyle.color
color: DialogStyle.colorModel.color
layer {
enabled: !dialog.flat

6
linphone-app/ui/modules/Common/Dialog/DialogTitle.qml
View file

@ -24,8 +24,8 @@ Item {
Rectangle{
anchors.fill:parent
gradient: Gradient {
GradientStop { position: 0.0; color: DialogStyle.title.lowGradient }
GradientStop { position: 1.0; color: DialogStyle.title.highGradient }
GradientStop { position: 0.0; color: DialogStyle.title.lowGradient.color }
GradientStop { position: 1.0; color: DialogStyle.title.highGradient.color }
}
visible: showBar && !flat
}
@ -38,7 +38,7 @@ Item {
rightMargin: DialogStyle.description.rightMargin
}
color: DialogStyle.description.color
color: DialogStyle.description.colorModel.color
font.pointSize: !flat ? Units.dp * 10 : Units.dp * 14
font.weight: !flat ? Font.Normal : Font.Bold
horizontalAlignment: Text.AlignHCenter

94
linphone-app/ui/modules/Common/Form/ActionButton.qml
View file

@ -11,6 +11,8 @@ import Common 1.0
Item {
id: wrappedButton
objectName: '__internalActionButton'
property color defaultBackgroundColor: 'white'
property color defaultForegroundColor: 'black'
@ -18,17 +20,17 @@ Item {
readonly property QtObject defaultColorSet : QtObject {
property int iconSize: 30
property string icon : ''
property color backgroundNormalColor : defaultBackgroundColor
property color backgroundDisabledColor : defaultBackgroundColor
property color backgroundHoveredColor : defaultBackgroundColor
property color backgroundUpdatingColor : defaultBackgroundColor
property color backgroundPressedColor : defaultBackgroundColor
property var backgroundNormalColor : {'color' : defaultBackgroundColor}
property var backgroundDisabledColor : {'color' : defaultBackgroundColor}
property var backgroundHoveredColor : {'color' : defaultBackgroundColor}
property var backgroundUpdatingColor : {'color' : defaultBackgroundColor}
property var backgroundPressedColor : {'color' : defaultBackgroundColor}
// Color for shown part
property color foregroundNormalColor : defaultForegroundColor
property color foregroundDisabledColor : defaultForegroundColor
property color foregroundHoveredColor : defaultForegroundColor
property color foregroundUpdatingColor : defaultForegroundColor
property color foregroundPressedColor : defaultForegroundColor
property var foregroundNormalColor : {'color' : defaultForegroundColor}
property var foregroundDisabledColor : {'color' : defaultForegroundColor}
property var foregroundHoveredColor : {'color' : defaultForegroundColor}
property var foregroundUpdatingColor : {'color' : defaultForegroundColor}
property var foregroundPressedColor : {'color' : defaultForegroundColor}
}
property QtObject colorSet: defaultColorSet
onColorSetChanged: if(!colorSet) colorSet = defaultColorSet
@ -61,18 +63,18 @@ Item {
// Hidden part : transparent if not specified
property color backgroundHiddenPartNormalColor : colorSet.backgroundHiddenPartNormalColor ? colorSet.backgroundHiddenPartNormalColor : (colorSet.backgroundNormalColor ? colorSet.backgroundNormalColor : 'transparent')
property color backgroundHiddenPartDisabledColor : colorSet.backgroundHiddenPartDisabledColor ? colorSet.backgroundHiddenPartDisabledColor : (colorSet.backgroundDisabledColor ? colorSet.backgroundDisabledColor : 'transparent')
property color backgroundHiddenPartHoveredColor : colorSet.backgroundHiddenPartHoveredColor ? colorSet.backgroundHiddenPartHoveredColor : (colorSet.backgroundHoveredColor ? colorSet.backgroundHoveredColor : 'transparent')
property color backgroundHiddenPartUpdatingColor : colorSet.backgroundHiddenPartUpdatingColor ? colorSet.backgroundHiddenPartUpdatingColor : (colorSet.backgroundUpdatingColor ? colorSet.backgroundUpdatingColor : 'transparent')
property color backgroundHiddenPartPressedColor : colorSet.backgroundHiddenPartPressedColor ? colorSet.backgroundHiddenPartPressedColor : (colorSet.backgroundPressedColor ? colorSet.backgroundPressedColor : 'transparent')
property var backgroundHiddenPartNormalColor : colorSet.backgroundHiddenPartNormalColor ? colorSet.backgroundHiddenPartNormalColor.color : (colorSet.backgroundNormalColor ? colorSet.backgroundNormalColor.color : 'transparent')
property color backgroundHiddenPartDisabledColor : colorSet.backgroundHiddenPartDisabledColor ? colorSet.backgroundHiddenPartDisabledColor.color : (colorSet.backgroundDisabledColor ? colorSet.backgroundDisabledColor.color : 'transparent')
property var backgroundHiddenPartHoveredColor : colorSet.backgroundHiddenPartHoveredColor ? colorSet.backgroundHiddenPartHoveredColor.color : (colorSet.backgroundHoveredColor ? colorSet.backgroundHoveredColor.color : 'transparent')
property color backgroundHiddenPartUpdatingColor : colorSet.backgroundHiddenPartUpdatingColor ? colorSet.backgroundHiddenPartUpdatingColor.color : (colorSet.backgroundUpdatingColor ? colorSet.backgroundUpdatingColor.color : 'transparent')
property var backgroundHiddenPartPressedColor : colorSet.backgroundHiddenPartPressedColor ? colorSet.backgroundHiddenPartPressedColor.color : (colorSet.backgroundPressedColor ? colorSet.backgroundPressedColor.color : 'transparent')
// AutoColor : alpha /4 for foreground
property color foregroundHiddenPartNormalColor : colorSet.foregroundHiddenPartNormalColor ? colorSet.foregroundHiddenPartNormalColor : (colorSet.foregroundNormalColor ? Qt.rgba(colorSet.foregroundNormalColor.r, colorSet.foregroundNormalColor.g, colorSet.foregroundNormalColor.b, colorSet.foregroundNormalColor.a/4) : 'transparent')
property color foregroundHiddenPartDisabledColor : colorSet.foregroundHiddenPartDisabledColor ? colorSet.foregroundHiddenPartDisabledColor : (colorSet.foregroundDisabledColor ? Qt.rgba(colorSet.foregroundDisabledColor.r, colorSet.foregroundDisabledColor.g, colorSet.foregroundDisabledColor.b, colorSet.foregroundDisabledColor.a/4): 'transparent')
property color foregroundHiddenPartHoveredColor : colorSet.foregroundHiddenPartHoveredColor ? colorSet.foregroundHiddenPartHoveredColor : (colorSet.foregroundHoveredColor ? Qt.rgba(colorSet.foregroundHoveredColor.r, colorSet.foregroundHoveredColor.g, colorSet.foregroundHoveredColor.b, colorSet.foregroundHoveredColor.a/4): 'transparent')
property color foregroundHiddenPartUpdatingColor : colorSet.foregroundHiddenPartUpdatingColor ? colorSet.foregroundHiddenPartUpdatingColor : (colorSet.foregroundUpdatingColor ? Qt.rgba(colorSet.foregroundUpdatingColor.r, colorSet.foregroundUpdatingColor.g, colorSet.foregroundUpdatingColor.b, colorSet.foregroundUpdatingColor.a/4): 'transparent')
property color foregroundHiddenPartPressedColor : colorSet.foregroundHiddenPartPressedColor ? colorSet.foregroundHiddenPartPressedColor : (colorSet.foregroundPressedColor ? Qt.rgba(colorSet.foregroundPressedColor.r, colorSet.foregroundPressedColor.g, colorSet.foregroundPressedColor.b, colorSet.foregroundPressedColor.a/4): 'transparent')
property var foregroundHiddenPartNormalColor : colorSet.foregroundHiddenPartNormalColor ? colorSet.foregroundHiddenPartNormalColor.color : (colorSet.foregroundNormalColor ? Qt.rgba(colorSet.foregroundNormalColor.color.r, colorSet.foregroundNormalColor.color.g, colorSet.foregroundNormalColor.color.b, colorSet.foregroundNormalColor.color.a/4) : 'transparent')
property color foregroundHiddenPartDisabledColor : colorSet.foregroundHiddenPartDisabledColor ? colorSet.foregroundHiddenPartDisabledColor.color : (colorSet.foregroundDisabledColor ? Qt.rgba(colorSet.foregroundDisabledColor.color.r, colorSet.foregroundDisabledColor.color.g, colorSet.foregroundDisabledColor.color.b, colorSet.foregroundDisabledColor.color.a/4): 'transparent')
property var foregroundHiddenPartHoveredColor : colorSet.foregroundHiddenPartHoveredColor ? colorSet.foregroundHiddenPartHoveredColor.color : (colorSet.foregroundHoveredColor ? Qt.rgba(colorSet.foregroundHoveredColor.color.r, colorSet.foregroundHoveredColor.color.g, colorSet.foregroundHoveredColor.color.b, colorSet.foregroundHoveredColor.color.a/4): 'transparent')
property color foregroundHiddenPartUpdatingColor : colorSet.foregroundHiddenPartUpdatingColor ? colorSet.foregroundHiddenPartUpdatingColor.color : (colorSet.foregroundUpdatingColor ? Qt.rgba(colorSet.foregroundUpdatingColor.color.r, colorSet.foregroundUpdatingColor.color.g, colorSet.foregroundUpdatingColor.color.b, colorSet.foregroundUpdatingColor.color.a/4): 'transparent')
property var foregroundHiddenPartPressedColor : colorSet.foregroundHiddenPartPressedColor ? colorSet.foregroundHiddenPartPressedColor.color : (colorSet.foregroundPressedColor ? Qt.rgba(colorSet.foregroundPressedColor.color.r, colorSet.foregroundPressedColor.color.g, colorSet.foregroundPressedColor.color.b, colorSet.foregroundPressedColor.color.a/4): 'transparent')
//---------------------------------------------
property int percentageDisplayed : 100
@ -127,14 +129,14 @@ Item {
//if(wrappedButton.icon == '')
//return getColor(wrappedButton.colorSet.backgroundNormalColor, defaultColor, 'backgroundNormalColor')
if (wrappedButton.updating || wrappedButton.toggled)
return getColor(wrappedButton.colorSet.backgroundUpdatingColor, defaultColor, 'backgroundUpdatingColor')
return getColor(wrappedButton.colorSet.backgroundUpdatingColor.color, defaultColor, 'backgroundUpdatingColor')
if (!useStates)
return getColor(wrappedButton.colorSet.backgroundNormalColor, defaultColor, 'backgroundNormalColor')
return getColor(wrappedButton.colorSet.backgroundNormalColor.color, defaultColor, 'backgroundNormalColor')
if (!wrappedButton.enabled)
return getColor(wrappedButton.colorSet.backgroundDisabledColor, defaultColor, 'backgroundDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.backgroundPressedColor, defaultColor, 'backgroundPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.backgroundHoveredColor, defaultColor, 'backgroundHoveredColor')
: getColor(wrappedButton.colorSet.backgroundNormalColor, defaultColor, 'backgroundNormalColor'))
return getColor(wrappedButton.colorSet.backgroundDisabledColor.color, defaultColor, 'backgroundDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.backgroundPressedColor.color, defaultColor, 'backgroundPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.backgroundHoveredColor.color, defaultColor, 'backgroundHoveredColor')
: getColor(wrappedButton.colorSet.backgroundNormalColor.color, defaultColor, 'backgroundNormalColor'))
}else
return defaultColor
}
@ -142,16 +144,16 @@ Item {
var defaultColor = 'black'
if(isCustom){
//if(wrappedButton.icon == '')
//return getColor(wrappedButton.colorSet.foregroundNormalColor, defaultColor, 'foregroundNormalColor')
//return getColor(wrappedButton.colorSet.foregroundNormalColor.color, defaultColor, 'foregroundNormalColor')
if (wrappedButton.updating || wrappedButton.toggled)
return getColor(wrappedButton.colorSet.foregroundUpdatingColor, defaultColor, 'foregroundUpdatingColor')
return getColor(wrappedButton.colorSet.foregroundUpdatingColor.color, defaultColor, 'foregroundUpdatingColor')
if (!useStates)
return getColor(wrappedButton.colorSet.foregroundNormalColor, defaultColor, 'foregroundNormalColor')
return getColor(wrappedButton.colorSet.foregroundNormalColor.color, defaultColor, 'foregroundNormalColor')
if (!wrappedButton.enabled)
return getColor(wrappedButton.colorSet.foregroundDisabledColor, defaultColor, 'foregroundDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.foregroundPressedColor, defaultColor, 'foregroundPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.foregroundHoveredColor, defaultColor, 'foregroundHoveredColor')
: getColor(wrappedButton.colorSet.foregroundNormalColor, defaultColor, 'foregroundNormalColor'))
return getColor(wrappedButton.colorSet.foregroundDisabledColor.color, defaultColor, 'foregroundDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.foregroundPressedColor.color, defaultColor, 'foregroundPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.foregroundHoveredColor.color, defaultColor, 'foregroundHoveredColor')
: getColor(wrappedButton.colorSet.foregroundNormalColor.color, defaultColor, 'foregroundNormalColor'))
}else
return defaultColor
}
@ -161,14 +163,14 @@ Item {
//if(wrappedButton.icon == '')
//return getColor(wrappedButton.colorSet.backgroundHiddenPartNormalColor, defaultColor, 'backgroundHiddenPartNormalColor')
if (wrappedButton.updating || wrappedButton.toggled)
return getColor(wrappedButton.colorSet.backgroundHiddenPartUpdatingColor, defaultColor, 'backgroundHiddenPartUpdatingColor')
return getColor(wrappedButton.colorSet.backgroundHiddenPartUpdatingColor.color, defaultColor, 'backgroundHiddenPartUpdatingColor')
if (!useStates)
return getColor(wrappedButton.colorSet.backgroundHiddenPartNormalColor, defaultColor, 'backgroundHiddenPartNormalColor')
return getColor(wrappedButton.colorSet.backgroundHiddenPartNormalColor.color, defaultColor, 'backgroundHiddenPartNormalColor')
if (!wrappedButton.enabled)
return getColor(wrappedButton.colorSet.backgroundHiddenPartDisabledColor, defaultColor, 'backgroundHiddenPartDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.backgroundHiddenPartPressedColor, defaultColor, 'backgroundHiddenPartPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.backgroundHiddenPartHoveredColor, defaultColor, 'backgroundHiddenPartHoveredColor')
: getColor(wrappedButton.colorSet.backgroundHiddenPartNormalColor, defaultColor, 'backgroundHiddenPartNormalColor'))
return getColor(wrappedButton.colorSet.backgroundHiddenPartDisabledColor.color, defaultColor, 'backgroundHiddenPartDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.backgroundHiddenPartPressedColor.color, defaultColor, 'backgroundHiddenPartPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.backgroundHiddenPartHoveredColor.color, defaultColor, 'backgroundHiddenPartHoveredColor')
: getColor(wrappedButton.colorSet.backgroundHiddenPartNormalColor.color, defaultColor, 'backgroundHiddenPartNormalColor'))
}else
return defaultColor
}
@ -178,14 +180,14 @@ Item {
//if(wrappedButton.icon == '')
//return getColor(wrappedButton.colorSet.foregroundHiddenPartNormalColor, defaultColor, 'foregroundHiddenPartNormalColor')
if (wrappedButton.updating || wrappedButton.toggled)
return getColor(wrappedButton.colorSet.foregroundHiddenPartUpdatingColor, defaultColor, 'foregroundHiddenPartUpdatingColor')
return getColor(wrappedButton.colorSet.foregroundHiddenPartUpdatingColor.color, defaultColor, 'foregroundHiddenPartUpdatingColor')
if (!useStates)
return getColor(wrappedButton.colorSet.foregroundHiddenPartNormalColor, defaultColor, 'foregroundHiddenPartNormalColor')
return getColor(wrappedButton.colorSet.foregroundHiddenPartNormalColor.color, defaultColor, 'foregroundHiddenPartNormalColor')
if (!wrappedButton.enabled)
return getColor(wrappedButton.colorSet.foregroundHiddenPartDisabledColor, defaultColor, 'foregroundHiddenPartDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.foregroundHiddenPartPressedColor, defaultColor, 'foregroundHiddenPartPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.foregroundHiddenPartHoveredColor, defaultColor, 'foregroundHiddenPartHoveredColor')
: getColor(wrappedButton.colorSet.foregroundHiddenPartNormalColor, defaultColor, 'foregroundHiddenPartNormalColor'))
return getColor(wrappedButton.colorSet.foregroundHiddenPartDisabledColor.color, defaultColor, 'foregroundHiddenPartDisabledColor')
return button.down ? getColor(wrappedButton.colorSet.foregroundHiddenPartPressedColor.color, defaultColor, 'foregroundHiddenPartPressedColor')
: (button.hovered ? getColor(wrappedButton.colorSet.foregroundHiddenPartHoveredColor.color, defaultColor, 'foregroundHiddenPartHoveredColor')
: getColor(wrappedButton.colorSet.foregroundHiddenPartNormalColor.color, defaultColor, 'foregroundHiddenPartNormalColor'))
}else
return defaultColor
}
@ -199,6 +201,8 @@ Item {
Button {
id: button
property alias _colorSet: wrappedButton.colorSet // Make an alias here because parent item is not accessible directly from C++ events.
anchors.fill: parent
background: Row{
anchors.fill: parent

8
linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
View file

@ -48,12 +48,12 @@ Row {
anchors.verticalCenter: parent.verticalCenter
backgroundColor: item.style
? selectedButton === index
? item.style.button.color.selected
? item.style.button.color.selected.color
: (down
? item.style.button.color.pressed
? item.style.button.color.pressed.color
: (hovered
? item.style.button.color.hovered
: item.style.button.color.normal
? item.style.button.color.hovered.color
: item.style.button.color.normal.color
)
)
: ''

6
linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml
View file

@ -41,11 +41,11 @@ TextField {
}
color: mouseArea.pressed
? FileChooserButtonStyle.tools.button.color.pressed
? FileChooserButtonStyle.tools.button.color.pressed.color
: (
mouseArea.containsMouse
? FileChooserButtonStyle.tools.button.color.hovered
: FileChooserButtonStyle.tools.button.color.normal
? FileChooserButtonStyle.tools.button.color.hovered.color
: FileChooserButtonStyle.tools.button.color.normal.color
)
ActionButton {

8
linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml
View file

@ -17,16 +17,16 @@ Button {
id: background
color: button.down
? SmallButtonStyle.background.color.pressed
? SmallButtonStyle.background.color.pressed.color
: (button.hovered
? SmallButtonStyle.background.color.hovered
: SmallButtonStyle.background.color.normal
? SmallButtonStyle.background.color.hovered.color
: SmallButtonStyle.background.color.normal.color
)
implicitHeight: SmallButtonStyle.background.height
radius: SmallButtonStyle.background.radius
}
contentItem: Text {
color: SmallButtonStyle.text.color
color: SmallButtonStyle.text.colorModel.color
font.pointSize: SmallButtonStyle.text.pointSize
font.weight: Font.Bold
font.capitalization: button.capitalization

24
linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml
View file

@ -5,18 +5,18 @@ import Common.Styles 1.0
AbstractTextButton {
property var textButtonStyle : TextButtonAStyle
colorDisabled: textButtonStyle.backgroundColor.disabled
colorHovered: textButtonStyle.backgroundColor.hovered
colorNormal: textButtonStyle.backgroundColor.normal
colorPressed: textButtonStyle.backgroundColor.pressed
colorDisabled: textButtonStyle.backgroundColor.disabled.color
colorHovered: textButtonStyle.backgroundColor.hovered.color
colorNormal: textButtonStyle.backgroundColor.normal.color
colorPressed: textButtonStyle.backgroundColor.pressed.color
textColorDisabled: textButtonStyle.textColor.disabled
textColorHovered: textButtonStyle.textColor.hovered
textColorNormal: textButtonStyle.textColor.normal
textColorPressed: textButtonStyle.textColor.pressed
textColorDisabled: textButtonStyle.textColor.disabled.color
textColorHovered: textButtonStyle.textColor.hovered.color
textColorNormal: textButtonStyle.textColor.normal.color
textColorPressed: textButtonStyle.textColor.pressed.color
borderColorDisabled: textButtonStyle.borderColor.disabled
borderColorHovered: textButtonStyle.borderColor.hovered
borderColorNormal: textButtonStyle.borderColor.normal
borderColorPressed: textButtonStyle.borderColor.pressed
borderColorDisabled: textButtonStyle.borderColor.disabled.color
borderColorHovered: textButtonStyle.borderColor.hovered.color
borderColorNormal: textButtonStyle.borderColor.normal.color
borderColorPressed: textButtonStyle.borderColor.pressed.color
}

24
linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml
View file

@ -5,18 +5,18 @@ import Common.Styles 1.0
AbstractTextButton {
property var textButtonStyle : TextButtonBStyle
colorDisabled: textButtonStyle.backgroundColor.disabled
colorHovered: textButtonStyle.backgroundColor.hovered
colorNormal: textButtonStyle.backgroundColor.normal
colorPressed: textButtonStyle.backgroundColor.pressed
colorDisabled: textButtonStyle.backgroundColor.disabled.color
colorHovered: textButtonStyle.backgroundColor.hovered.color
colorNormal: textButtonStyle.backgroundColor.normal.color
colorPressed: textButtonStyle.backgroundColor.pressed.color
textColorDisabled: textButtonStyle.textColor.disabled
textColorHovered: textButtonStyle.textColor.hovered
textColorNormal: textButtonStyle.textColor.normal
textColorPressed: textButtonStyle.textColor.pressed
textColorDisabled: textButtonStyle.textColor.disabled.color
textColorHovered: textButtonStyle.textColor.hovered.color
textColorNormal: textButtonStyle.textColor.normal.color
textColorPressed: textButtonStyle.textColor.pressed.color
borderColorDisabled: (textButtonStyle.borderColor?textButtonStyle.borderColor.disabled:colorDisabled)
borderColorHovered: (textButtonStyle.borderColor?textButtonStyle.borderColor.hovered:colorHovered)
borderColorNormal: (textButtonStyle.borderColor?textButtonStyle.borderColor.normal:colorNormal)
borderColorPressed: (textButtonStyle.borderColor?textButtonStyle.borderColor.pressed:colorPressed)
borderColorDisabled: (textButtonStyle.borderColor?textButtonStyle.borderColor.disabled.color : colorDisabled)
borderColorHovered: (textButtonStyle.borderColor?textButtonStyle.borderColor.hovered.color : colorHovered)
borderColorNormal: (textButtonStyle.borderColor?textButtonStyle.borderColor.normal.color : colorNormal)
borderColorPressed: (textButtonStyle.borderColor?textButtonStyle.borderColor.pressed.color : colorPressed)
}

24
linphone-app/ui/modules/Common/Form/Buttons/TextButtonC.qml
View file

@ -5,18 +5,18 @@ import Common.Styles 1.0
AbstractTextButton {
property var textButtonStyle : TextButtonCStyle
colorDisabled: textButtonStyle.backgroundColor.disabled
colorHovered: textButtonStyle.backgroundColor.hovered
colorNormal: textButtonStyle.backgroundColor.normal
colorPressed: textButtonStyle.backgroundColor.pressed
colorDisabled: textButtonStyle.backgroundColor.disabled.color
colorHovered: textButtonStyle.backgroundColor.hovered.color
colorNormal: textButtonStyle.backgroundColor.normal.color
colorPressed: textButtonStyle.backgroundColor.pressed.color
textColorDisabled: textButtonStyle.textColor.disabled
textColorHovered: textButtonStyle.textColor.hovered
textColorNormal: textButtonStyle.textColor.normal
textColorPressed: textButtonStyle.textColor.pressed
textColorDisabled: textButtonStyle.textColor.disabled.color
textColorHovered: textButtonStyle.textColor.hovered.color
textColorNormal: textButtonStyle.textColor.normal.color
textColorPressed: textButtonStyle.textColor.pressed.color
borderColorDisabled: (textButtonStyle.borderColor?textButtonStyle.borderColor.disabled:colorDisabled)
borderColorHovered: (textButtonStyle.borderColor?textButtonStyle.borderColor.hovered:colorHovered)
borderColorNormal: (textButtonStyle.borderColor?textButtonStyle.borderColor.normal:colorNormal)
borderColorPressed: (textButtonStyle.borderColor?textButtonStyle.borderColor.pressed:colorPressed)
borderColorDisabled: (textButtonStyle.borderColor?textButtonStyle.borderColor.disabled.color:colorDisabled)
borderColorHovered: (textButtonStyle.borderColor?textButtonStyle.borderColor.hovered.color:colorHovered)
borderColorNormal: (textButtonStyle.borderColor?textButtonStyle.borderColor.normal.color:colorNormal)
borderColorPressed: (textButtonStyle.borderColor?textButtonStyle.borderColor.pressed.color:colorPressed)
}

36
linphone-app/ui/modules/Common/Form/CheckBoxText.qml
View file

@ -13,11 +13,11 @@ CheckBox {
contentItem: Text {
color: checkBox.down
? CheckBoxTextStyle.color.pressed
? CheckBoxTextStyle.color.pressed.color
: (
checkBox.hovered
? CheckBoxTextStyle.color.hovered
: CheckBoxTextStyle.color.normal
? CheckBoxTextStyle.color.hovered.color
: CheckBoxTextStyle.color.normal.color
)
elide: Text.ElideRight
@ -43,14 +43,14 @@ CheckBox {
indicator: Rectangle {
border.color: checkBox.down
? CheckBoxTextStyle.color.pressed
? CheckBoxTextStyle.color.pressed.color
: (
checkBox.hovered
? CheckBoxTextStyle.color.hovered
? CheckBoxTextStyle.color.hovered.color
: (
checkBox.checked
? CheckBoxTextStyle.color.selected
: CheckBoxTextStyle.color.normal
? CheckBoxTextStyle.color.selected.color
: CheckBoxTextStyle.color.normal.color
)
)
@ -64,13 +64,13 @@ CheckBox {
Rectangle {
color: checkBox.down
? CheckBoxTextStyle.color.pressed
? CheckBoxTextStyle.color.pressed.color
: (checkBox.hovered
? CheckBoxTextStyle.color.hovered
? CheckBoxTextStyle.color.hovered.color
: (
checkBox.checked
? CheckBoxTextStyle.color.selected
: CheckBoxTextStyle.color.normal
? CheckBoxTextStyle.color.selected.color
: CheckBoxTextStyle.color.normal.color
)
)
@ -89,13 +89,13 @@ CheckBox {
visible: checkBox.checkState == Qt.PartiallyChecked
ShapePath{
strokeColor: checkBox.down
? CheckBoxTextStyle.color.pressed
? CheckBoxTextStyle.color.pressed.color
: (checkBox.hovered
? CheckBoxTextStyle.color.hovered
? CheckBoxTextStyle.color.hovered.color
: (
checkBox.checked
? CheckBoxTextStyle.color.selected
: CheckBoxTextStyle.color.normal
? CheckBoxTextStyle.color.selected.color
: CheckBoxTextStyle.color.normal.color
)
)
strokeWidth: 2
@ -107,10 +107,10 @@ CheckBox {
}
ShapePath{
strokeColor: checkBox.down
? CheckBoxTextStyle.color.pressed
? CheckBoxTextStyle.color.pressed.color
: (checkBox.hovered
? CheckBoxTextStyle.color.hovered
: CheckBoxTextStyle.color.normal
? CheckBoxTextStyle.color.hovered.color
: CheckBoxTextStyle.color.normal.color
)
strokeWidth: 2
fillColor: 'transparent'

10
linphone-app/ui/modules/Common/Form/ComboBox.qml
View file

@ -17,8 +17,8 @@ Controls.ComboBox {
property var iconRole
property bool haveBorder: true
property bool haveMargin: true
property color backgroundColor: ComboBoxStyle.background.color.normal
property color foregroundColor: ComboBoxStyle.contentItem.text.color
property color backgroundColor: ComboBoxStyle.background.color.normal.color
property color foregroundColor: ComboBoxStyle.contentItem.text.colorModel.color
property var rootItem
property int yPopup: rootItem ? -mapToItem(rootItem,x,y).y : height + 1
@ -32,13 +32,13 @@ Controls.ComboBox {
background: Rectangle {
border {
color: ComboBoxStyle.background.border.color
color: ComboBoxStyle.background.border.colorModel.color
width: comboBox.haveBorder ? ComboBoxStyle.background.border.width : 0
}
color: comboBox.enabled
? comboBox.backgroundColor
: ComboBoxStyle.background.color.readOnly
: ComboBoxStyle.background.color.readOnly.color
radius: ComboBoxStyle.background.radius
@ -89,7 +89,7 @@ Controls.ComboBox {
indicator: Icon {
icon: ComboBoxStyle.indicator.dropDown.icon
iconSize: ComboBoxStyle.indicator.dropDown.iconSize
overwriteColor: ComboBoxStyle.indicator.dropDown.color
overwriteColor: ComboBoxStyle.indicator.dropDown.colorModel.color
x: comboBox.width - width - comboBox.rightPadding
y: comboBox.topPadding + (comboBox.availableHeight - height) / 2

10
linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml
View file

@ -19,11 +19,11 @@ Controls.ItemDelegate {
hoverEnabled: true
background: Rectangle {
color: item.hovered
? CommonItemDelegateStyle.color.hovered
: CommonItemDelegateStyle.color.normal
? CommonItemDelegateStyle.color.hovered.color
: CommonItemDelegateStyle.color.normal.color
Rectangle {
anchors.left: parent.left
color: CommonItemDelegateStyle.indicator.color
color: CommonItemDelegateStyle.indicator.colorModel.color
height: parent.height
width: CommonItemDelegateStyle.indicator.width
@ -33,7 +33,7 @@ Controls.ItemDelegate {
Rectangle {
anchors.bottom: parent.bottom
color: CommonItemDelegateStyle.separator.color
color: CommonItemDelegateStyle.separator.colorModel.color
height: CommonItemDelegateStyle.separator.height
width: parent.width
@ -56,7 +56,7 @@ Controls.ItemDelegate {
Text {
Layout.fillWidth: true
color: CommonItemDelegateStyle.contentItem.text.color
color: CommonItemDelegateStyle.contentItem.text.colorModel.color
elide: Text.ElideRight
font {

12
linphone-app/ui/modules/Common/Form/DroppableTextArea.qml
View file

@ -52,7 +52,7 @@ Item {
Rectangle{
anchors.fill: parent
color: DroppableTextAreaStyle.outsideBackgroundColor
color: DroppableTextAreaStyle.outsideBackgroundColor.color
// ---------------------------------------------------------------------------
RowLayout{
anchors.fill: parent
@ -148,12 +148,12 @@ Item {
}
background: Rectangle {
color: DroppableTextAreaStyle.backgroundColor
color: DroppableTextAreaStyle.backgroundColor.color
radius: 5
clip:true
}
color: DroppableTextAreaStyle.text.color
color: DroppableTextAreaStyle.text.colorModel.color
font.pointSize: DroppableTextAreaStyle.text.pointSize-1
rightPadding: fileChooserButton.width +
fileChooserButton.anchors.rightMargin +
@ -213,7 +213,7 @@ Item {
Icon{
visible: sendButton.visible && droppableTextArea.isEphemeral
icon: DroppableTextAreaStyle.ephemeralTimer.icon
overwriteColor: DroppableTextAreaStyle.ephemeralTimer.timerColor
overwriteColor: DroppableTextAreaStyle.ephemeralTimer.timerColor.color
iconSize: DroppableTextAreaStyle.ephemeralTimer.iconSize
anchors.right:parent.right
anchors.bottom : parent.bottom
@ -227,12 +227,12 @@ Item {
id: hoverContent
anchors.fill: parent
color: DroppableTextAreaStyle.hoverContent.backgroundColor
color: DroppableTextAreaStyle.hoverContent.backgroundColor.color
visible: false
Text {
anchors.centerIn: parent
color: DroppableTextAreaStyle.hoverContent.text.color
color: DroppableTextAreaStyle.hoverContent.text.colorModel.color
font.pointSize: DroppableTextAreaStyle.hoverContent.text.pointSize
text: qsTr('dropYourAttachment')
}

6
linphone-app/ui/modules/Common/Form/Fields/NumericField.qml
View file

@ -67,12 +67,12 @@ TextField {
background: Rectangle {
color: buttonInstance.down && !numericField.readOnly
? NumericFieldStyle.tools.button.color.pressed
: NumericFieldStyle.tools.button.color.normal
? NumericFieldStyle.tools.button.color.pressed.color
: NumericFieldStyle.tools.button.color.normal.color
}
contentItem: Text {
color: NumericFieldStyle.tools.button.text.color
color: NumericFieldStyle.tools.button.text.colorModel.color
text: buttonInstance.text
font.pointSize: NumericFieldStyle.tools.button.text.pointSize

6
linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
View file

@ -14,7 +14,7 @@ Rectangle {
property QtObject textFieldStyle : TextFieldStyle.normal
color: textFieldStyle ? textFieldStyle.background.color.normal : ''
color: textFieldStyle ? textFieldStyle.background.color.normal.color : ''
radius: textFieldStyle ? textFieldStyle.background.radius : 0
Item {
@ -27,7 +27,7 @@ Rectangle {
anchors.fill: parent
border {
color: textFieldStyle ? textFieldStyle.background.border.color.normal : ''
color: textFieldStyle ? textFieldStyle.background.border.color.normal.color : ''
width: textFieldStyle ? textFieldStyle.background.border.width : 0
}
@ -37,7 +37,7 @@ Rectangle {
Rectangle {
anchors.fill: parent
color: textFieldStyle ? textFieldStyle.background.color.readOnly : ''
color: textFieldStyle ? textFieldStyle.background.color.readOnly.color : ''
opacity: 0.8
visible: field.readOnly
}

8
linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml
View file

@ -22,13 +22,13 @@ Rectangle {
height: TextAreaFieldStyle.background.height
width: TextAreaFieldStyle.background.width
border {
color: TextAreaFieldStyle.background.border.color
color: TextAreaFieldStyle.background.border.colorModel.color
width: TextAreaFieldStyle.background.border.width
}
color: textArea.readOnly
? TextAreaFieldStyle.background.color.readOnly
: TextAreaFieldStyle.background.color.normal
? TextAreaFieldStyle.background.color.readOnly.color
: TextAreaFieldStyle.background.color.normal.color
radius: TextAreaFieldStyle.background.radius
// Fit Width computation
@ -65,7 +65,7 @@ Rectangle {
background: Item{}
color: TextAreaFieldStyle.text.color
color: TextAreaFieldStyle.text.colorModel.color
font.pointSize: TextAreaFieldStyle.text.pointSize
selectByMouse: true
wrapMode: TextArea.Wrap

20
linphone-app/ui/modules/Common/Form/Fields/TextField.qml
View file

@ -28,18 +28,18 @@ Controls.TextField {
background: Rectangle {
border {
color: textField.error.length > 0
? textFieldStyle.background.border.color.error
? textFieldStyle.background.border.color.error.color
: (
textField.activeFocus && !textField.readOnly
? textFieldStyle.background.border.color.selected
: textFieldStyle.background.border.color.normal
? textFieldStyle.background.border.color.selected.color
: textFieldStyle.background.border.color.normal.color
)
width: textFieldStyle.background.border.width
}
color: textField.readOnly
? textFieldStyle.background.color.readOnly
: textFieldStyle.background.color.normal
? textFieldStyle.background.color.readOnly.color
: textFieldStyle.background.color.normal.color
implicitHeight: textFieldStyle.background.height
implicitWidth: textFieldStyle.background.width
@ -57,8 +57,8 @@ Controls.TextField {
border {
color: textField.error.length > 0
? textFieldStyle.background.border.color.error
: textFieldStyle.background.border.color.normal
? textFieldStyle.background.border.color.error.color
: textFieldStyle.background.border.color.normal.color
width: textFieldStyle.background.border.width
}
@ -69,7 +69,7 @@ Controls.TextField {
}
}
color: textField.readOnly ? textFieldStyle.text.readOnly : textFieldStyle.text.normal
color: textField.readOnly ? textFieldStyle.text.readOnly.color : textFieldStyle.text.normal.color
font.pointSize: textFieldStyle.text.pointSize
rightPadding: textFieldStyle.text.rightPadding + toolsContainer.width + (icon.visible ? icon.iconSize + 10: 0)
selectByMouse: true
@ -94,7 +94,7 @@ Controls.TextField {
anchors.topMargin: 5
textFormat: Text.RichText
text : '<span style="color:red">*</span>'
color: textFieldStyle.background.mandatory.color
color: textFieldStyle.background.mandatory.colorModel.color
font.pointSize: textFieldStyle.background.mandatory.pointSize
visible: textField.isMandatory
}
@ -108,7 +108,7 @@ Controls.TextField {
id:statusItem
selectByMouse: true
readOnly:true
color: textFieldStyle.background.border.color.error
color: textFieldStyle.background.border.color.error.color
width:parent.width
anchors.bottom:parent.bottom
anchors.bottomMargin: 2

4
linphone-app/ui/modules/Common/Form/ListForm.qml
View file

@ -68,7 +68,7 @@ RowLayout {
id: text
Layout.preferredWidth: ListFormStyle.titleArea.text.width
color: ListFormStyle.titleArea.text.color
color: ListFormStyle.titleArea.text.colorModel.color
elide: Text.ElideRight
font {
@ -87,7 +87,7 @@ RowLayout {
Layout.fillWidth: true
Layout.preferredHeight: ListFormStyle.lineHeight
color: ListFormStyle.value.placeholder.color
color: ListFormStyle.value.placeholder.colorModel.color
font {
italic: true

4
linphone-app/ui/modules/Common/Form/Placements/Form.qml
View file

@ -31,7 +31,7 @@ Column {
id: title
anchors.verticalCenter: parent.verticalCenter
color: FormStyle.header.title.color
color: FormStyle.header.title.colorModel.color
font {
bold: true
pointSize: FormStyle.header.title.pointSize
@ -63,7 +63,7 @@ Column {
Layout.fillWidth: true
Layout.preferredHeight: FormStyle.header.separator.height
color: FormStyle.header.separator.color
color: FormStyle.header.separator.colorModel.color
}
Item {

2
linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml
View file

@ -25,7 +25,7 @@ RowLayout {
Layout.preferredHeight: FormHGroupStyle.legend.height
Layout.preferredWidth: fitLabel ? Math.min(label.fitWidth, FormHGroupStyle.legend.width) : FormHGroupStyle.legend.width
color: FormHGroupStyle.legend.color
color: FormHGroupStyle.legend.colorModel.color
elide: Text.ElideRight
font.pointSize: FormHGroupStyle.legend.pointSize

2
linphone-app/ui/modules/Common/Form/Placements/FormTable.qml
View file

@ -58,7 +58,7 @@ Column {
Text {
id: text
color: FormTableStyle.entry.text.color
color: FormTableStyle.entry.text.colorModel.color
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
text: modelData

2
linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml
View file

@ -21,7 +21,7 @@ Row {
Text {
id: title
color: FormTableStyle.entry.text.color
color: FormTableStyle.entry.text.colorModel.color
elide: Text.ElideRight
horizontalAlignment: Text.AlignRight

2
linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml
View file

@ -25,7 +25,7 @@ ColumnLayout {
Layout.fillWidth: true
color: FormVGroupStyle.legend.color
color: FormVGroupStyle.legend.colorModel.color
elide: Text.ElideRight
font.pointSize: FormVGroupStyle.legend.pointSize
verticalAlignment: Text.AlignVCenter

6
linphone-app/ui/modules/Common/Form/RadioButton.qml
View file

@ -31,7 +31,7 @@ Control.RadioButton{
x: parent.leftPadding
y: parent.height / 2 - height / 2
radius: width/2
border.color: RadioButtonStyle.color
border.color: RadioButtonStyle.colorModel.color
property bool checked: parent.checked
Rectangle {
width: parent.width - 8
@ -39,7 +39,7 @@ Control.RadioButton{
x: 4
y: 4
radius: width/2
color: RadioButtonStyle.color
color: RadioButtonStyle.colorModel.color
visible: parent.checked
}
}
@ -53,7 +53,7 @@ Control.RadioButton{
onYChanged: y = 0
onHeightChanged: height=implicitHeight
//---------------------------------------
color: RadioButtonStyle.color
color: RadioButtonStyle.colorModel.color
verticalAlignment: Text.AlignVCenter
leftPadding: parent.indicator.width + parent.spacing
wrapMode: Text.WordWrap

2
linphone-app/ui/modules/Common/Form/SearchBox.qml
View file

@ -77,7 +77,7 @@ Item {
id: searchField
icon: text == '' ? SearchBoxStyle.searchIcon : SearchBoxStyle.cancelIcon
overwriteColor: SearchBoxStyle.iconColor
overwriteColor: SearchBoxStyle.iconColor.color
iconSize: height
readOnly: !searchBox.enabled
width: parent.width

12
linphone-app/ui/modules/Common/Form/Slider.qml
View file

@ -15,7 +15,7 @@ Controls.Slider {
background: Rectangle {
id: backgroundItem
color: SliderStyle.background.color
color: SliderStyle.background.colorModel.color
x: slider.leftPadding
y: slider.topPadding + slider.availableHeight / 2 - height / 2
@ -29,7 +29,7 @@ Controls.Slider {
radius: SliderStyle.background.radius
Rectangle {
color: SliderStyle.background.content.color
color: SliderStyle.background.content.colorModel.color
height: parent.height
width: slider.visualPosition * parent.width
@ -41,12 +41,12 @@ Controls.Slider {
handle: Rectangle {
id: handleItem
border.color: slider.pressed
? SliderStyle.handle.border.color.pressed
: SliderStyle.handle.border.color.normal
? SliderStyle.handle.border.color.pressed.color
: SliderStyle.handle.border.color.normal.color
color: slider.pressed
? SliderStyle.handle.color.pressed
: SliderStyle.handle.color.normal
? SliderStyle.handle.color.pressed.color
: SliderStyle.handle.color.normal.color
x: slider.leftPadding + slider.visualPosition * (slider.availableWidth - width)
y: slider.topPadding + slider.availableHeight / 2 - height / 2

2
linphone-app/ui/modules/Common/Form/StaticListForm.qml
View file

@ -35,7 +35,7 @@ RowLayout {
Layout.preferredHeight: ListFormStyle.lineHeight
Layout.preferredWidth: ListFormStyle.titleArea.text.width
color: ListFormStyle.titleArea.text.color
color: ListFormStyle.titleArea.text.colorModel.color
elide: Text.ElideRight
font {

26
linphone-app/ui/modules/Common/Form/Switch.qml
View file

@ -30,16 +30,16 @@ Controls.Switch {
border.color: control.enabled
? (
control.checked
? indicatorStyle.indicator.border.color.checked
: indicatorStyle.indicator.border.color.normal
) : indicatorStyle.indicator.border.color.disabled
? indicatorStyle.indicator.border.color.checked.color
: indicatorStyle.indicator.border.color.normal.color
) : indicatorStyle.indicator.border.color.disabled.color
color: control.enabled
? (
control.checked
? indicatorStyle.indicator.color.checked
: indicatorStyle.indicator.color.normal
) : indicatorStyle.indicator.color.disabled
? indicatorStyle.indicator.color.checked.color
: indicatorStyle.indicator.color.normal.color
) : indicatorStyle.indicator.color.disabled.color
radius: indicatorStyle.indicator.radius
x: control.leftPadding
@ -59,18 +59,18 @@ Controls.Switch {
control.checked
? (
control.down
? indicatorStyle.sphere.border.color.pressed
: indicatorStyle.sphere.border.color.checked
) : indicatorStyle.sphere.border.color.normal
) : indicatorStyle.sphere.border.color.disabled
? indicatorStyle.sphere.border.color.pressed.color
: indicatorStyle.sphere.border.color.checked.color
) : indicatorStyle.sphere.border.color.normal.color
) : indicatorStyle.sphere.border.color.disabled.color
color: control.enabled
?
(
control.down
? indicatorStyle.sphere.color.pressed
: indicatorStyle.sphere.color.normal
) : indicatorStyle.sphere.color.disabled
? indicatorStyle.sphere.color.pressed.color
: indicatorStyle.sphere.color.normal.color
) : indicatorStyle.sphere.color.disabled.color
radius: width / 2

20
linphone-app/ui/modules/Common/Form/Tab/TabButton.qml
View file

@ -21,38 +21,38 @@ Controls.TabButton {
function _getBackgroundColor () {
if (_isSelected) {
return TabButtonStyle.backgroundColor.selected
return TabButtonStyle.backgroundColor.selected.color
}
return button.enabled
? (
button.down
? TabButtonStyle.backgroundColor.pressed
? TabButtonStyle.backgroundColor.pressed.color
: (
button.hovered
? TabButtonStyle.backgroundColor.hovered
: TabButtonStyle.backgroundColor.normal
? TabButtonStyle.backgroundColor.hovered.color
: TabButtonStyle.backgroundColor.normal.color
)
)
: TabButtonStyle.backgroundColor.disabled
: TabButtonStyle.backgroundColor.disabled.color
}
function _getTextColor () {
if (_isSelected) {
return TabButtonStyle.text.color.selected
return TabButtonStyle.text.color.selected.color
}
return button.enabled
? (
button.down
? TabButtonStyle.text.color.pressed
? TabButtonStyle.text.color.pressed.color
: (
button.hovered
? TabButtonStyle.text.color.hovered
: TabButtonStyle.text.color.normal
? TabButtonStyle.text.color.hovered.color
: TabButtonStyle.text.color.normal.color
)
)
: TabButtonStyle.text.color.disabled
: TabButtonStyle.text.color.disabled.color
}
// ---------------------------------------------------------------------------

4
linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml
View file

@ -11,7 +11,7 @@ import Utils 1.0
Rectangle {
default property alias _content: content.data
color: TabContainerStyle.color
color: TabContainerStyle.colorModel.color
ColumnLayout {
anchors.fill: parent
@ -50,7 +50,7 @@ Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: TabContainerStyle.separator.height
color: TabContainerStyle.separator.color
color: TabContainerStyle.separator.colorModel.color
visible: scrollBar.visible
}
}

8
linphone-app/ui/modules/Common/Form/TransparentTextInput.qml
View file

@ -34,7 +34,7 @@ Item {
id: background
color: (textInput.activeFocus || parent.forceFocus) && !textInput.readOnly
? TransparentTextInputStyle.backgroundColor
? TransparentTextInputStyle.backgroundColor.color
: // No Style constant, see component name.
// It's a `transparent` TextInput.
'transparent'
@ -66,7 +66,7 @@ Item {
id: placeholder
anchors.centerIn: parent
color: TransparentTextInputStyle.placeholder.color
color: TransparentTextInputStyle.placeholder.colorModel.color
elide: Text.ElideRight
font {
@ -90,8 +90,8 @@ Item {
clip: true
color: activeFocus && !readOnly
? TransparentTextInputStyle.text.color.focused
: TransparentTextInputStyle.text.color.normal
? TransparentTextInputStyle.text.color.focused.color
: TransparentTextInputStyle.text.color.normal.color
font.pointSize: TransparentTextInputStyle.text.pointSize
selectByMouse: true
verticalAlignment: TextInput.AlignVCenter

2
linphone-app/ui/modules/Common/Indicators/MediaProgressBar.qml
View file

@ -71,7 +71,7 @@ ProgressBar {
background: Rectangle {
id: backgroundArea
color: MediaProgressBarStyle.backgroundColor
color: MediaProgressBarStyle.backgroundColor.color
radius: 5
clip: false
}

8
linphone-app/ui/modules/Common/Indicators/RoundProgressBar.qml
View file

@ -15,7 +15,7 @@ ProgressBar{
to: 100
value: 0
background: Rectangle {
color: RoundProgressBarStyle.backgroundColor
color: RoundProgressBarStyle.backgroundColor.color
radius: width
}
Timer{
@ -40,7 +40,7 @@ ProgressBar{
ShapePath {
id: pathDial
strokeColor: RoundProgressBarStyle.progressRemainColor
strokeColor: RoundProgressBarStyle.progressRemainColor.color
fillColor: 'transparent'
strokeWidth: RoundProgressBarStyle.progressionWidth
capStyle: Qt.RoundCap
@ -57,7 +57,7 @@ ProgressBar{
ShapePath {
id: pathProgress
strokeColor: RoundProgressBarStyle.progressColor
strokeColor: RoundProgressBarStyle.progressColor.color
fillColor: 'transparent'
strokeWidth: RoundProgressBarStyle.progressionWidth
capStyle: Qt.RoundCap
@ -75,7 +75,7 @@ ProgressBar{
Text{
anchors.centerIn: parent
text: mainItem.text
color: RoundProgressBarStyle.progressRemainColor
color: RoundProgressBarStyle.progressRemainColor.color
font.pointSize: RoundProgressBarStyle.pointSize
font.bold: true
horizontalAlignment: Text.AlignHCenter

12
linphone-app/ui/modules/Common/Indicators/VuMeter.qml
View file

@ -29,15 +29,15 @@ Column {
background: Rectangle {
color: vuMeter.enabled
? VuMeterStyle.high.background.color.enabled
: VuMeterStyle.high.background.color.disabled
? VuMeterStyle.high.background.color.enabled.color
: VuMeterStyle.high.background.color.disabled.color
}
contentItem: Item {
Rectangle {
anchors.bottom: parent.bottom
color: VuMeterStyle.high.contentItem.color
color: VuMeterStyle.high.contentItem.colorModel.color
height: high.visualPosition * parent.height
width: parent.width
@ -59,15 +59,15 @@ Column {
background: Rectangle {
color: vuMeter.enabled
? VuMeterStyle.low.background.color.enabled
: VuMeterStyle.low.background.color.disabled
? VuMeterStyle.low.background.color.enabled.color
: VuMeterStyle.low.background.color.disabled.color
}
contentItem: Item {
Rectangle {
anchors.bottom: parent.bottom
color: VuMeterStyle.low.contentItem.color
color: VuMeterStyle.low.contentItem.colorModel.color
height: low.visualPosition * parent.height
width: parent.width

2
linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml
View file

@ -29,7 +29,7 @@ Rectangle {
// ---------------------------------------------------------------------------
color: ApplicationMenuStyle.backgroundColor
color: ApplicationMenuStyle.backgroundColor.color
implicitHeight: content.height
width: entryWidth

14
linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml
View file

@ -45,12 +45,12 @@ Rectangle {
// ---------------------------------------------------------------------------
color: mouseArea.pressed
? ApplicationMenuStyle.entry.color.pressed
? ApplicationMenuStyle.entry.color.pressed.color
: (isSelected
? ApplicationMenuStyle.entry.color.selected
? ApplicationMenuStyle.entry.color.selected.color
: (mouseArea.containsMouse
? ApplicationMenuStyle.entry.color.hovered
: ApplicationMenuStyle.entry.color.normal
? ApplicationMenuStyle.entry.color.hovered.color
: ApplicationMenuStyle.entry.color.normal.color
)
)
height: parent.parent.entryHeight
@ -78,8 +78,8 @@ Rectangle {
Layout.fillWidth: true
color: entry.isSelected
? ApplicationMenuStyle.entry.text.color.selected
: ApplicationMenuStyle.entry.text.color.normal
? ApplicationMenuStyle.entry.text.color.selected.color
: ApplicationMenuStyle.entry.text.color.normal.color
font.pointSize: ApplicationMenuStyle.entry.text.pointSize
font.weight: Font.DemiBold
height: parent.height
@ -95,7 +95,7 @@ Rectangle {
height: parent.height
color: entry.isSelected
? ApplicationMenuStyle.entry.indicator.color
? ApplicationMenuStyle.entry.indicator.colorModel.color
: 'transparent'
width: ApplicationMenuStyle.entry.indicator.width
}

8
linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml
View file

@ -13,10 +13,10 @@ Rectangle {
signal clicked
color: mouseArea.pressed
? DropDownStaticMenuStyle.entry.color.pressed
? DropDownStaticMenuStyle.entry.color.pressed.color
: (mouseArea.containsMouse
? DropDownStaticMenuStyle.entry.color.hovered
: DropDownStaticMenuStyle.entry.color.normal
? DropDownStaticMenuStyle.entry.color.hovered.color
: DropDownStaticMenuStyle.entry.color.normal.color
)
height: parent.entryHeight
width: parent.entryWidth
@ -32,7 +32,7 @@ Rectangle {
rightMargin: DropDownStaticMenuStyle.entry.rightMargin
}
color: DropDownStaticMenuStyle.entry.text.color
color: DropDownStaticMenuStyle.entry.text.colorModel.color
elide: Text.ElideRight
font.pointSize: DropDownStaticMenuStyle.entry.text.pointSize

4
linphone-app/ui/modules/Common/Menus/Menu.qml
View file

@ -12,11 +12,11 @@ Controls.Menu {
width: menuStyle.width ? menuStyle.width : parent.width
background: Rectangle {
implicitWidth: menu.width
color: menuStyle.color
color: menuStyle.colorModel.color
radius: menuStyle.radius
border{
color:menuStyle.border.color
color:menuStyle.border.colorModel.color
width: menuStyle.border.width
}

22
linphone-app/ui/modules/Common/Menus/MenuItem.qml
View file

@ -30,11 +30,11 @@ Controls.MenuItem {
background: Rectangle {
color: button.down
? menuItemStyle.background.color.pressed
? menuItemStyle.background.color.pressed.color
: (
button.hovered
? menuItemStyle.background.color.hovered
: menuItemStyle.background.color.normal
? menuItemStyle.background.color.hovered.color
: menuItemStyle.background.color.normal.color
)
implicitHeight: button.menuItemStyle.background.height
}
@ -53,13 +53,13 @@ Controls.MenuItem {
iconSize: rowText.lineCount > 0 ? rowText.contentHeight/rowText.lineCount + 2 : 0
overwriteColor: button.enabled
? (button.down
? menuItemStyle.text.color.pressed
? menuItemStyle.text.color.pressed.color
: (
button.hovered
? menuItemStyle.text.color.hovered
: menuItemStyle.text.color.normal
? menuItemStyle.text.color.hovered.color
: menuItemStyle.text.color.normal.color
))
: menuItemStyle.text.color.disabled
: menuItemStyle.text.color.disabled.color
}
}
Text {
@ -70,13 +70,13 @@ Controls.MenuItem {
Layout.rightMargin:(iconLayoutDirection == Qt.LeftToRight ? menuItemStyle.rightMargin : 0)
color: button.enabled
? (button.down
? menuItemStyle.text.color.pressed
? menuItemStyle.text.color.pressed.color
: (
button.hovered
? menuItemStyle.text.color.hovered
: menuItemStyle.text.color.normal
? menuItemStyle.text.color.hovered.color
: menuItemStyle.text.color.normal.color
))
: menuItemStyle.text.color.disabled
: menuItemStyle.text.color.disabled.color
elide: Text.ElideRight

8
linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml
View file

@ -27,15 +27,15 @@ ScrollBar {
background: Rectangle {
anchors.fill: parent
color: ForceScrollBarStyle.background.color
color: ForceScrollBarStyle.background.colorModel.color
radius: ForceScrollBarStyle.background.radius
}
contentItem: Rectangle {
color: scrollBar.pressed
? ForceScrollBarStyle.color.pressed
? ForceScrollBarStyle.color.pressed.color
: (scrollBar.hovered
? ForceScrollBarStyle.color.hovered
: ForceScrollBarStyle.color.normal
? ForceScrollBarStyle.color.hovered.color
: ForceScrollBarStyle.color.normal.color
)
implicitHeight: ForceScrollBarStyle.contentItem.implicitHeight
implicitWidth: ForceScrollBarStyle.contentItem.implicitWidth

4
linphone-app/ui/modules/Common/Misc/MessageBanner.qml
View file

@ -18,7 +18,7 @@ Rectangle{
onNoticeBannerTextChanged: if(noticeBannerText!='') mainItem.state = "showed"
color: MessageBannerStyle.color
color: MessageBannerStyle.colorModel.color
radius: 10
state: "hidden"
Timer{
@ -45,7 +45,7 @@ Rectangle{
font {
pointSize: MessageBannerStyle.pointSize
}
color: MessageBannerStyle.textColor
color: MessageBannerStyle.textColor.color
}
}
states: [

6
linphone-app/ui/modules/Common/Misc/Paned.qml
View file

@ -281,10 +281,10 @@ Item {
Rectangle {
anchors.fill: parent
color: parent.pressed
? PanedStyle.handle.color.pressed
? PanedStyle.handle.color.pressed.color
: (parent.containsMouse
? PanedStyle.handle.color.hovered
: PanedStyle.handle.color.normal
? PanedStyle.handle.color.hovered.color
: PanedStyle.handle.color.normal.color
)
}
}

6
linphone-app/ui/modules/Common/Picker/DatePicker.qml
View file

@ -37,7 +37,7 @@ Item{
Layout.alignment: Qt.AlignCenter
horizontalAlignment: Qt.AlignCenter
text: new Date(monthList.currentYear, monthList.currentMonth, 15).toLocaleString(App.locale, 'MMMM yyyy')// 15 because of timezones that can change the date for localeString
color: DatePickerStyle.title.color
color: DatePickerStyle.title.colorModel.color
font.pointSize: DatePickerStyle.title.pointSize
font.capitalization: Font.Capitalize
}
@ -124,7 +124,7 @@ Item{
height: width
//border.width: 0.3 * radius
border.width: 2
border.color: cellItem.selected ? DatePickerStyle.cell.selectedBorderColor : 'transparent' // selected
border.color: cellItem.selected ? DatePickerStyle.cell.selectedBorderColor.color : 'transparent' // selected
//radius: 0.02 * monthList.height
radius: width/2
opacity: !mouseArea.pressed? 1: 0.3 // pressed state
@ -133,7 +133,7 @@ Item{
id: text
anchors.centerIn: parent
color: DatePickerStyle.cell.color
color: DatePickerStyle.cell.colorModel.color
font.pixelSize: cellItem.selected
? DatePickerStyle.cell.selectedPointSize
: cellItem.day < 0

8
linphone-app/ui/modules/Common/Picker/TimePicker.qml
View file

@ -48,7 +48,7 @@ Item{
width: 30 * 1.5
height: width
radius: width / 2
border.color: TimePickerStyle.hoursColor
border.color: TimePickerStyle.hoursColor.color
border.width: 3
}
@ -64,7 +64,7 @@ Item{
font.pointSize: Units.dp * 11
font.bold: currentItem
text: index
color: currentItem ? TimePickerStyle.selectedItemColor : TimePickerStyle.unselectedItemColor
color: currentItem ? TimePickerStyle.selectedItemColor.color : TimePickerStyle.unselectedItemColor.color
}
MouseArea {
anchors.fill: parent
@ -108,7 +108,7 @@ Item{
width: 30 * 1.5
height: width
radius: width / 2
border.color: TimePickerStyle.minutesColor
border.color: TimePickerStyle.minutesColor.color
border.width: 3
}
@ -123,7 +123,7 @@ Item{
font.pointSize: Units.dp * 11
font.bold: currentItem
text: index * 5
color: currentItem ? TimePickerStyle.selectedItemColor : TimePickerStyle.unselectedItemColor
color: currentItem ? TimePickerStyle.selectedItemColor.color : TimePickerStyle.unselectedItemColor.color
}
MouseArea {

2
linphone-app/ui/modules/Common/Popup/Popup.qml
View file

@ -82,7 +82,7 @@ Item {
background: Rectangle {
id: backgroundPopup
color: PopupStyle.backgroundColor
color: PopupStyle.backgroundColor.color
height: popup.height
width: popup.width

2
linphone-app/ui/modules/Common/Popup/PopupShadow.qml
View file

@ -5,7 +5,7 @@ import Common.Styles 1.0
// =============================================================================
DropShadow {
color: PopupStyle.shadow.color
color: PopupStyle.shadow.colorModel.color
horizontalOffset: PopupStyle.shadow.horizontalOffset
radius: PopupStyle.shadow.radius
samples: PopupStyle.shadow.samples

4
linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml
View file

@ -5,8 +5,8 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Busy'
property color color: ColorsList.add(sectionName+'_indicator', 'q').color
property color alternateColor: ColorsList.add(sectionName+'_indicator_alt', 'i').color
property var colorModel: ColorsList.add(sectionName+'_indicator', 'q')
property var alternateColor: ColorsList.add(sectionName+'_indicator_alt', 'i')
property int duration: 1250
property int nSpheres: 8
}

20
linphone-app/ui/modules/Common/Styles/Dialog/DateTimeDialogStyle.qml
View file

@ -8,11 +8,11 @@ import ColorsList 1.0
QtObject {
property string sectionName : 'DateTimeDialog'
property color color: ColorsList.add(sectionName, 'k').color
property var colorModel: ColorsList.add(sectionName, 'k')
property QtObject title: QtObject {
property color lowGradient: ColorsList.add(sectionName+'_title_gradient_low', 'y').color
property color highGradient: ColorsList.add(sectionName+'_title_gradient_high', 'z').color
property var lowGradient: ColorsList.add(sectionName+'_title_gradient_low', 'y')
property var highGradient: ColorsList.add(sectionName+'_title_gradient_high', 'z')
}
property QtObject buttons: QtObject {
@ -36,7 +36,7 @@ QtObject {
}
property QtObject description: QtObject {
property color color: ColorsList.add(sectionName+'_description', 'j').color
property var colorModel: ColorsList.add(sectionName+'_description', 'j')
property int leftMargin: 50
property int pointSize: Units.dp * 11
property int rightMargin: 50
@ -46,11 +46,11 @@ QtObject {
property int iconSize: 20
property string name : 'close'
property string icon : 'close_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg')
}
}

20
linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml
View file

@ -8,11 +8,11 @@ import ColorsList 1.0
QtObject {
property string sectionName : 'Dialog'
property color color: ColorsList.add(sectionName, 'k').color
property var colorModel: ColorsList.add(sectionName, 'k')
property QtObject title: QtObject {
property color lowGradient: ColorsList.add(sectionName+'_title_gradient_low', 'y').color
property color highGradient: ColorsList.add(sectionName+'_title_gradient_high', 'z').color
property var lowGradient: ColorsList.add(sectionName+'_title_gradient_low', 'y')
property var highGradient: ColorsList.add(sectionName+'_title_gradient_high', 'z')
}
property QtObject buttons: QtObject {
@ -36,7 +36,7 @@ QtObject {
}
property QtObject description: QtObject {
property color color: ColorsList.add(sectionName+'_description', 'j').color
property var colorModel: ColorsList.add(sectionName+'_description', 'j')
property int leftMargin: 50
property int pointSize: Units.dp * 11
property int rightMargin: 50
@ -46,11 +46,11 @@ QtObject {
property int iconSize: 20
property string name : 'close'
property string icon : 'close_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg')
}
}

8
linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
View file

@ -10,10 +10,10 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_h', 'n').color
property color normal: ColorsList.add(sectionName+'_n', 'x').color
property color pressed: ColorsList.add(sectionName+'_p', 'i').color
property color selected: ColorsList.add(sectionName+'_c', 'g').color
property var hovered: ColorsList.add(sectionName+'_h', 'n')
property var normal: ColorsList.add(sectionName+'_n', 'x')
property var pressed: ColorsList.add(sectionName+'_p', 'i')
property var selected: ColorsList.add(sectionName+'_c', 'g')
}
}
}

30
linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml
View file

@ -13,9 +13,9 @@ QtObject {
property int iconSize: 16
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_h', 'c').color
property color normal: ColorsList.add(sectionName+'_n', 'f').color
property color pressed: ColorsList.add(sectionName+'_p', 'c').color
property var hovered: ColorsList.add(sectionName+'_h', 'c')
property var normal: ColorsList.add(sectionName+'_n', 'f')
property var pressed: ColorsList.add(sectionName+'_p', 'c')
}
}
}
@ -23,22 +23,22 @@ QtObject {
property int iconSize: 30
property string name : 'file'
property string icon : 'file_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg')
}
property QtObject folder: QtObject {
property int iconSize: 30
property string name : 'folder'
property string icon : 'folder_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg')
}
}

8
linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
View file

@ -16,14 +16,14 @@ QtObject {
property int radius: 20
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_bg_h', 'c').color
property color normal: ColorsList.add(sectionName+'_bg_n', 'f').color
property color pressed: ColorsList.add(sectionName+'_bg_p', 'i').color
property var hovered: ColorsList.add(sectionName+'_bg_h', 'c')
property var normal: ColorsList.add(sectionName+'_bg_n', 'f')
property var pressed: ColorsList.add(sectionName+'_bg_p', 'i')
}
}
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_text', 'q').color
property var colorModel: ColorsList.add(sectionName+'_text', 'q')
property int pointSize: Units.dp * 8
}
}

16
linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
View file

@ -8,17 +8,17 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'TextButtonA'
property QtObject backgroundColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_bg_d', 'o').color
property color hovered: ColorsList.add(sectionName+'_bg_h', 'j').color
property color normal: ColorsList.add(sectionName+'_bg_n', 'r').color
property color pressed: ColorsList.add(sectionName+'_bg_p', 'i').color
property var disabled: ColorsList.add(sectionName+'_bg_d', 'o')
property var hovered: ColorsList.add(sectionName+'_bg_h', 'j')
property var normal: ColorsList.add(sectionName+'_bg_n', 'r')
property var pressed: ColorsList.add(sectionName+'_bg_p', 'i')
}
property QtObject textColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color
property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color
property color normal: ColorsList.add(sectionName+'_text_n', 'q').color
property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color
property var disabled: ColorsList.add(sectionName+'_text_d', 'q')
property var hovered: ColorsList.add(sectionName+'_text_h', 'q')
property var normal: ColorsList.add(sectionName+'_text_n', 'q')
property var pressed: ColorsList.add(sectionName+'_text_p', 'q')
}
property QtObject borderColor : backgroundColor
}

16
linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml
View file

@ -7,17 +7,17 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'TextButtonB'
property QtObject backgroundColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_bg_d', 'i30').color
property color hovered: ColorsList.add(sectionName+'_bg_h', 'b').color
property color normal: ColorsList.add(sectionName+'_bg_n', 'i').color
property color pressed: ColorsList.add(sectionName+'_bg_p', 'm').color
property var disabled: ColorsList.add(sectionName+'_bg_d', 'i30')
property var hovered: ColorsList.add(sectionName+'_bg_h', 'b')
property var normal: ColorsList.add(sectionName+'_bg_n', 'i')
property var pressed: ColorsList.add(sectionName+'_bg_p', 'm')
}
property QtObject textColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color
property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color
property color normal: ColorsList.add(sectionName+'_text_n', 'q').color
property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color
property var disabled: ColorsList.add(sectionName+'_text_d', 'q')
property var hovered: ColorsList.add(sectionName+'_text_h', 'q')
property var normal: ColorsList.add(sectionName+'_text_n', 'q')
property var pressed: ColorsList.add(sectionName+'_text_p', 'q')
}
property QtObject borderColor : backgroundColor
}

16
linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonCStyle.qml
View file

@ -7,17 +7,17 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'TextButtonC'
property QtObject backgroundColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_bg_d', 'i30').color
property color hovered: ColorsList.add(sectionName+'_bg_h', 'validation_h').color
property color normal: ColorsList.add(sectionName+'_bg_n', 'validation').color
property color pressed: ColorsList.add(sectionName+'_bg_p', 'i').color
property var disabled: ColorsList.add(sectionName+'_bg_d', 'i30')
property var hovered: ColorsList.add(sectionName+'_bg_h', 'validation_h')
property var normal: ColorsList.add(sectionName+'_bg_n', 'validation')
property var pressed: ColorsList.add(sectionName+'_bg_p', 'i')
}
property QtObject textColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color
property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color
property color normal: ColorsList.add(sectionName+'_text_n', 'q').color
property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color
property var disabled: ColorsList.add(sectionName+'_text_d', 'q')
property var hovered: ColorsList.add(sectionName+'_text_h', 'q')
property var normal: ColorsList.add(sectionName+'_text_n', 'q')
property var pressed: ColorsList.add(sectionName+'_text_p', 'q')
}
property QtObject borderColor : backgroundColor
}

8
linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
View file

@ -13,9 +13,9 @@ QtObject {
property int size: 18
property QtObject color: QtObject {
property color pressed: ColorsList.add(sectionName+'_p', 'i').color
property color hovered: ColorsList.add(sectionName+'_h', 'h').color
property color normal: ColorsList.add(sectionName+'_n', 'g').color
property color selected: ColorsList.add(sectionName+'_u', 'i').color
property var pressed: ColorsList.add(sectionName+'_p', 'i')
property var hovered: ColorsList.add(sectionName+'_h', 'h')
property var normal: ColorsList.add(sectionName+'_n', 'g')
property var selected: ColorsList.add(sectionName+'_u', 'i')
}
}

10
linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml
View file

@ -11,7 +11,7 @@ QtObject {
property QtObject dropDown : QtObject{
property string icon: 'drop_down_custom'
property int iconSize: 20
property color color: ColorsList.addImageColor(sectionName+'_indicator', icon, 'l_n_b_fg').color
property var colorModel: ColorsList.addImageColor(sectionName+'_indicator', icon, 'l_n_b_fg')
}
}
property QtObject background: QtObject {
@ -21,13 +21,13 @@ QtObject {
property int width: 200
property QtObject border: QtObject {
property color color: ColorsList.add(sectionName+'_border_n', 'c').color
property var colorModel: ColorsList.add(sectionName+'_border_n', 'c')
property int width: 1
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_normal', 'q').color
property color readOnly: ColorsList.add(sectionName+'_readonly', 'e').color
property var normal: ColorsList.add(sectionName+'_normal', 'q')
property var readOnly: ColorsList.add(sectionName+'_readonly', 'e')
}
}
@ -37,7 +37,7 @@ QtObject {
property int spacing: 5
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_text_n', 'd').color
property var colorModel: ColorsList.add(sectionName+'_text_n', 'd')
property int pointSize: Units.dp * 10
}
}

10
linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml
View file

@ -9,8 +9,8 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'CommonItemDelegate'
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_h', 'o').color
property color normal: ColorsList.add(sectionName+'_n', 'q').color
property var hovered: ColorsList.add(sectionName+'_h', 'o')
property var normal: ColorsList.add(sectionName+'_n', 'q')
}
property QtObject contentItem: QtObject {
@ -18,18 +18,18 @@ QtObject {
property int spacing: 5
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_text', 'd').color
property var colorModel: ColorsList.add(sectionName+'_text', 'd')
property int pointSize: Units.dp * 10
}
}
property QtObject indicator: QtObject {
property color color: ColorsList.add(sectionName+'_indicator', 'i').color
property var colorModel: ColorsList.add(sectionName+'_indicator', 'i')
property int width: 5
}
property QtObject separator: QtObject {
property color color: ColorsList.add(sectionName+'_separator', 'c').color
property var colorModel: ColorsList.add(sectionName+'_separator', 'c')
property int height: 1
}
}

60
linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml
View file

@ -8,13 +8,13 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'DroppableTextArea'
property color backgroundColor: ColorsList.add(sectionName+'_Chat_bg', 'e').color
property color outsideBackgroundColor: ColorsList.add(sectionName+'_Chat_outsideBackground', 'aa').color
property var backgroundColor: ColorsList.add(sectionName+'_Chat_bg', 'e')
property var outsideBackgroundColor: ColorsList.add(sectionName+'_Chat_outsideBackground', 'aa')
property QtObject ephemeralTimer: QtObject{
property string icon: 'timer_custom'
property int iconSize : 30
property color timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad').color
property var timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad')
}
property QtObject fileChooserButton: QtObject {
@ -22,14 +22,14 @@ QtObject {
property int iconSize: 40
property string icon : 'attachment_custom'
property string name : 'attachment'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_h_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_n_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg')
property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_h_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_n_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg')
property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg')
}
property QtObject chatMicro: QtObject {
@ -37,17 +37,17 @@ QtObject {
property int iconSize: 40
property string name : 'micro'
property string icon : 'chat_micro_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'me_p_b_bg').color
property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg')
property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'me_p_b_bg')
property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg')
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_h_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_n_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'me_p_b_fg').color
property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_h_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_n_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg')
property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'me_p_b_fg')
property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg')
}
property QtObject send: QtObject {
@ -55,26 +55,26 @@ QtObject {
property int iconSize: 30
property string name : 'send'
property string icon : 'send_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_h_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_n_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_h_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_n_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg')
}
property QtObject hoverContent: QtObject {
property color backgroundColor: ColorsList.add(sectionName+'_Chat_hoverContent_bg', 'q').color
property var backgroundColor: ColorsList.add(sectionName+'_Chat_hoverContent_bg', 'q')
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_Chat_hoverContent_text', 'i').color
property var colorModel: ColorsList.add(sectionName+'_Chat_hoverContent_text', 'i')
property int pointSize: Units.dp * 11
}
}
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_Chat_text', 'd').color
property var colorModel: ColorsList.add(sectionName+'_Chat_text', 'd')
property int pointSize: Units.dp * 10
}
}

6
linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
View file

@ -13,12 +13,12 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_n', 'f').color
property color pressed: ColorsList.add(sectionName+'_p', 'c').color
property var normal: ColorsList.add(sectionName+'_n', 'f')
property var pressed: ColorsList.add(sectionName+'_p', 'c')
}
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_text', 'd').color
property var colorModel: ColorsList.add(sectionName+'_text', 'd')
property int pointSize: Units.dp * 9
}
}

8
linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml
View file

@ -15,18 +15,18 @@ QtObject {
property int radius: 4
property QtObject border: QtObject {
property color color: ColorsList.add(sectionName+'_bg_border', 'c').color
property var colorModel: ColorsList.add(sectionName+'_bg_border', 'c')
property int width: 1
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_bg_n', 'q').color
property color readOnly: ColorsList.add(sectionName+'_bg_readOnly', 'e').color
property var normal: ColorsList.add(sectionName+'_bg_n', 'q')
property var readOnly: ColorsList.add(sectionName+'_bg_readOnly', 'e')
}
}
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_text', 'd').color
property var colorModel: ColorsList.add(sectionName+'_text', 'd')
property int pointSize: Units.dp * 10
property int padding: 8
}

64
linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
View file

@ -16,27 +16,27 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: ColorsList.add(sectionName+'_n_bg_border_error', 'error').color
property color normal: ColorsList.add(sectionName+'_n_bg_border_n', 'c').color
property color selected: ColorsList.add(sectionName+'_n_bg_border_c', 'i').color
property var error: ColorsList.add(sectionName+'_n_bg_border_error', 'error')
property var normal: ColorsList.add(sectionName+'_n_bg_border_n', 'c')
property var selected: ColorsList.add(sectionName+'_n_bg_border_c', 'i')
}
property int width: 1
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_n_bg_n', 'q').color
property color readOnly: ColorsList.add(sectionName+'_n_bg_readonly', 'e').color
property var normal: ColorsList.add(sectionName+'_n_bg_n', 'q')
property var readOnly: ColorsList.add(sectionName+'_n_bg_readonly', 'e')
}
property QtObject mandatory: QtObject{
property color color: ColorsList.add(sectionName+'_required_text', 'g').color
property var colorModel: ColorsList.add(sectionName+'_required_text', 'g')
property real pointSize: Units.dp * 10
}
}
property QtObject text: QtObject {
property color normal: ColorsList.add(sectionName+'_n_text', 'd').color
property color readOnly: ColorsList.add(sectionName+'_n_text_readonly', 'd').color
property var normal: ColorsList.add(sectionName+'_n_text', 'd')
property var readOnly: ColorsList.add(sectionName+'_n_text_readonly', 'd')
property int pointSize: Units.dp * 10
property int rightPadding: 5
}
@ -50,27 +50,27 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: 'black'
property color normal: 'black'
property color selected: 'black'
property var error: {'color':'black'}
property var normal: {'color':'black'}
property var selected: {'color':'black'}
}
property int width: 0
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_unbordered_bg_n', 'q').color
property color readOnly: ColorsList.add(sectionName+'_unbordered_bg_readonly', 'e').color
property var normal: ColorsList.add(sectionName+'_unbordered_bg_n', 'q')
property var readOnly: ColorsList.add(sectionName+'_unbordered_bg_readonly', 'e')
}
property QtObject mandatory: QtObject{
property color color: ColorsList.add(sectionName+'_unbordered_required_text', 'g').color
property var colorModel: ColorsList.add(sectionName+'_unbordered_required_text', 'g')
property real pointSize: Units.dp * 10
}
}
property QtObject text: QtObject {
property color normal: ColorsList.add(sectionName+'_unbordered_text', 'd').color
property color readOnly: ColorsList.add(sectionName+'_unbordered_text_readonly', 'd').color
property var normal: ColorsList.add(sectionName+'_unbordered_text', 'd')
property var readOnly: ColorsList.add(sectionName+'_unbordered_text_readonly', 'd')
property int pointSize: Units.dp * 10
property int rightPadding: 5
}
@ -84,27 +84,27 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: 'black'
property color normal: 'black'
property color selected: 'black'
property var error: {'color':'black'}
property var normal: {'color':'black'}
property var selected: {'color':'black'}
}
property int width: 0
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_flat_bg_n', 'q').color
property color readOnly: ColorsList.add(sectionName+'_flat_bg_readonly', 'e').color
property var normal: ColorsList.add(sectionName+'_flat_bg_n', 'q')
property var readOnly: ColorsList.add(sectionName+'_flat_bg_readonly', 'e')
}
property QtObject mandatory: QtObject{
property color color: ColorsList.add(sectionName+'_flat_required_text', 'g').color
property var colorModel: ColorsList.add(sectionName+'_flat_required_text', 'g')
property real pointSize: Units.dp * 10
}
}
property QtObject text: QtObject {
property color normal: ColorsList.add(sectionName+'_flat_text', 'd').color
property color readonly: ColorsList.add(sectionName+'_flat_text_readonly', 'd').color
property var normal: ColorsList.add(sectionName+'_flat_text', 'd')
property var readonly: ColorsList.add(sectionName+'_flat_text_readonly', 'd')
property int pointSize: Units.dp * 10
property int rightPadding: 5
}
@ -118,27 +118,27 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color error: 'black'
property color normal: 'black'
property color selected: 'black'
property var error: {'color':'black'}
property var normal: {'color':'black'}
property var selected: {'color':'black'}
}
property int width: 0
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_flat_inv_bg_n', 'q').color
property color readOnly: ColorsList.add(sectionName+'_flat_inv_bg_readonly', 'q').color
property var normal: ColorsList.add(sectionName+'_flat_inv_bg_n', 'q')
property var readOnly: ColorsList.add(sectionName+'_flat_inv_bg_readonly', 'q')
}
property QtObject mandatory: QtObject{
property color color: ColorsList.add(sectionName+'_flat_inv_required_text', 'g').color
property var colorModel: ColorsList.add(sectionName+'_flat_inv_required_text', 'g')
property real pointSize: Units.dp * 10
}
}
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_flat_inv_text', 'd').color
property color readOnly: ColorsList.add(sectionName+'_flat_inv_readonly', 'readonly_fg').color
property var colorModel: ColorsList.add(sectionName+'_flat_inv_text', 'd')
property var readOnly: ColorsList.add(sectionName+'_flat_inv_readonly', 'readonly_fg')
property int pointSize: Units.dp * 10
property int rightPadding: 5
}

20
linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml
View file

@ -11,7 +11,7 @@ QtObject {
property string sectionName : 'ListForm'
property QtObject value: QtObject {
property QtObject placeholder: QtObject {
property color color: ColorsList.add(sectionName+'_placeholder', 'n').color
property var colorModel: ColorsList.add(sectionName+'_placeholder', 'n')
property int pointSize: Units.dp * 10
}
@ -25,7 +25,7 @@ QtObject {
property int iconSize: 18
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_text', 'j').color
property var colorModel: ColorsList.add(sectionName+'_text', 'j')
property int pointSize: Units.dp * 9
property int width: 130
}
@ -33,14 +33,14 @@ QtObject {
property int iconSize: 18
property string name : 'add'
property string icon : 'add_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color
property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'l_d_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg').color
property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'l_d_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg')
property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'l_d_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'l_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'l_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'l_n_b_fg')
property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'l_d_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'l_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'l_p_b_fg')
}
}

2
linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml
View file

@ -15,7 +15,7 @@ QtObject {
}
property QtObject legend: QtObject {
property color color: ColorsList.add(sectionName+'_legend', 'j').color
property var colorModel: ColorsList.add(sectionName+'_legend', 'j')
property int pointSize: Units.dp * 10
property int height: 36
property int width: 200

36
linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml
View file

@ -15,40 +15,40 @@ QtObject {
property int spacing: 5
property QtObject separator: QtObject {
property color color: ColorsList.add(sectionName+'_header_separator', 'i').color
property var colorModel: ColorsList.add(sectionName+'_header_separator', 'i')
property int height: 2
}
property QtObject title: QtObject {
property color color: ColorsList.add(sectionName+'_header_title', 'i').color
property var colorModel: ColorsList.add(sectionName+'_header_title', 'i')
property int pointSize: Units.dp * 12
}
property QtObject add: QtObject {
property int iconSize: 38
property string name : 'add'
property string icon : 'add_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color
property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color
property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg')
property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg')
property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg')
}
property QtObject deleteAction: QtObject {
property int iconSize: 38
property string name : 'delete'
property string icon : 'delete_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color
property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color
property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg')
property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'me_d_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg')
property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'me_d_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg')
}
}
}

2
linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml
View file

@ -16,7 +16,7 @@ QtObject {
property int maxWidth: 400
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_entry_text', 'j').color
property var colorModel: ColorsList.add(sectionName+'_entry_text', 'j')
property int pointSize: Units.dp * 10
}
}

4
linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml
View file

@ -15,13 +15,13 @@ QtObject {
}
property QtObject error: QtObject {
property color color: ColorsList.add(sectionName+'_error', 'error').color
property var colorModel: ColorsList.add(sectionName+'_error', 'error')
property int pointSize: Units.dp * 10
property int height: 11
}
property QtObject legend: QtObject {
property color color: ColorsList.add(sectionName+'_legend', 'j').color
property var colorModel: ColorsList.add(sectionName+'_legend', 'j')
property int pointSize: Units.dp * 10
}
}

4
linphone-app/ui/modules/Common/Styles/Form/RadioButtonStyle.qml
View file

@ -9,10 +9,10 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'RadioButton'
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'k')
property int height: 60
property color color: ColorsList.add(sectionName+'_fg', 'j').color
property var colorModel: ColorsList.add(sectionName+'_fg', 'j')
property int weight: Font.Normal
property int selectedWeight: Font.Bold
property int pointSize: Units.dp * 12

4
linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml
View file

@ -6,8 +6,8 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'SearchBox'
property color shadowColor: ColorsList.add(sectionName+'_shadow', 'l').color
property color iconColor: ColorsList.add(sectionName+'_icon', 'c').color
property var shadowColor: ColorsList.add(sectionName+'_shadow', 'l')
property var iconColor: ColorsList.add(sectionName+'_icon', 'c')
property string searchIcon: 'search_custom'
property string cancelIcon: 'close_custom'
}

12
linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml
View file

@ -7,13 +7,13 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Slider'
property QtObject background: QtObject {
property color color: ColorsList.add(sectionName+'_bg', 'c').color
property var colorModel: ColorsList.add(sectionName+'_bg', 'c')
property int height: 4
property int radius: 2
property int width: 200
property QtObject content: QtObject {
property color color: ColorsList.add(sectionName+'_content', 'm').color
property var colorModel: ColorsList.add(sectionName+'_content', 'm')
property int radius: 2
}
}
@ -25,14 +25,14 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_handle_border_n', 'c').color
property color pressed: ColorsList.add(sectionName+'_handle_border_p', 'c').color
property var normal: ColorsList.add(sectionName+'_handle_border_n', 'c')
property var pressed: ColorsList.add(sectionName+'_handle_border_p', 'c')
}
}
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_handle_n', 'e').color
property color pressed: ColorsList.add(sectionName+'_handle_p', 'f').color
property var normal: ColorsList.add(sectionName+'_handle_n', 'e')
property var pressed: ColorsList.add(sectionName+'_handle_p', 'f')
}
}
}

52
linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml
View file

@ -16,16 +16,16 @@ QtObject{
property int width: 48
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: ColorsList.add(sectionName+'_n_indicator_border_c', 'i').color
property color disabled: ColorsList.add(sectionName+'_n_indicator_border_d', 'c').color
property color normal: ColorsList.add(sectionName+'_n_indicator_border_n', 'c').color
property var checked: ColorsList.add(sectionName+'_n_indicator_border_c', 'i')
property var disabled: ColorsList.add(sectionName+'_n_indicator_border_d', 'c')
property var normal: ColorsList.add(sectionName+'_n_indicator_border_n', 'c')
}
}
property QtObject color: QtObject {
property color checked: ColorsList.add(sectionName+'_n_indicator_c', 'i').color
property color disabled: ColorsList.add(sectionName+'_n_indicator_d', 'e').color
property color normal: ColorsList.add(sectionName+'_n_indicator_n', 'q').color
property var checked: ColorsList.add(sectionName+'_n_indicator_c', 'i')
property var disabled: ColorsList.add(sectionName+'_n_indicator_d', 'e')
property var normal: ColorsList.add(sectionName+'_n_indicator_n', 'q')
}
}
@ -34,17 +34,17 @@ QtObject{
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: ColorsList.add(sectionName+'_n_sphere_border_c', 'i').color
property color disabled: ColorsList.add(sectionName+'_n_sphere_border_d', 'c').color
property color normal: ColorsList.add(sectionName+'_n_sphere_border_n', 'n').color
property color pressed: ColorsList.add(sectionName+'_n_sphere_border_p', 'n').color
property var checked: ColorsList.add(sectionName+'_n_sphere_border_c', 'i')
property var disabled: ColorsList.add(sectionName+'_n_sphere_border_d', 'c')
property var normal: ColorsList.add(sectionName+'_n_sphere_border_n', 'n')
property var pressed: ColorsList.add(sectionName+'_n_sphere_border_p', 'n')
}
}
property QtObject color: QtObject {
property color pressed: ColorsList.add(sectionName+'_n_sphere_p', 'c').color
property color disabled: ColorsList.add(sectionName+'_n_sphere_d', 'e').color
property color normal: ColorsList.add(sectionName+'_n_sphere_n', 'q').color
property var pressed: ColorsList.add(sectionName+'_n_sphere_p', 'c')
property var disabled: ColorsList.add(sectionName+'_n_sphere_d', 'e')
property var normal: ColorsList.add(sectionName+'_n_sphere_n', 'q')
}
}
}
@ -59,16 +59,16 @@ QtObject{
property int width: 48
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: ColorsList.add(sectionName+'_aux_indicator_border_c', 's').color
property color disabled: ColorsList.add(sectionName+'_aux_indicator_border_d', 'c').color
property color normal: ColorsList.add(sectionName+'_aux_indicator_border_n', 'c').color
property var checked: ColorsList.add(sectionName+'_aux_indicator_border_c', 's')
property var disabled: ColorsList.add(sectionName+'_aux_indicator_border_d', 'c')
property var normal: ColorsList.add(sectionName+'_aux_indicator_border_n', 'c')
}
}
property QtObject color: QtObject {
property color checked: ColorsList.add(sectionName+'_aux_indicator_c', 's').color
property color disabled: ColorsList.add(sectionName+'_aux_indicator_d', 'e').color
property color normal: ColorsList.add(sectionName+'_aux_indicator_n', 'q').color
property var checked: ColorsList.add(sectionName+'_aux_indicator_c', 's')
property var disabled: ColorsList.add(sectionName+'_aux_indicator_d', 'e')
property var normal: ColorsList.add(sectionName+'_aux_indicator_n', 'q')
}
}
@ -77,17 +77,17 @@ QtObject{
property QtObject border: QtObject {
property QtObject color: QtObject {
property color checked: ColorsList.add(sectionName+'_aux_sphere_border_c', 's').color
property color disabled: ColorsList.add(sectionName+'_aux_sphere_border_d', 'c').color
property color normal: ColorsList.add(sectionName+'_aux_sphere_border_n', 'n').color
property color pressed: ColorsList.add(sectionName+'_aux_sphere_border_p', 'n').color
property var checked: ColorsList.add(sectionName+'_aux_sphere_border_c', 's')
property var disabled: ColorsList.add(sectionName+'_aux_sphere_border_d', 'c')
property var normal: ColorsList.add(sectionName+'_aux_sphere_border_n', 'n')
property var pressed: ColorsList.add(sectionName+'_aux_sphere_border_p', 'n')
}
}
property QtObject color: QtObject {
property color pressed: ColorsList.add(sectionName+'_aux_sphere_p', 'c').color
property color disabled: ColorsList.add(sectionName+'_aux_sphere_d', 'e').color
property color normal: ColorsList.add(sectionName+'_aux_sphere_n', 'q').color
property var pressed: ColorsList.add(sectionName+'_aux_sphere_p', 'c')
property var disabled: ColorsList.add(sectionName+'_aux_sphere_d', 'e')
property var normal: ColorsList.add(sectionName+'_aux_sphere_n', 'q')
}
}
}

20
linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml
View file

@ -11,11 +11,11 @@ QtObject {
property int spacing: 8
property QtObject backgroundColor: QtObject {
property color disabled: ColorsList.add(sectionName+'_bg_d', 'i30').color
property color hovered: ColorsList.add(sectionName+'_bg_h', 'b').color
property color normal: ColorsList.add(sectionName+'_bg_n', 'i').color
property color pressed: ColorsList.add(sectionName+'_bg_p', 'm').color
property color selected: ColorsList.add(sectionName+'_bg_c', 'k').color
property var disabled: ColorsList.add(sectionName+'_bg_d', 'i30')
property var hovered: ColorsList.add(sectionName+'_bg_h', 'b')
property var normal: ColorsList.add(sectionName+'_bg_n', 'i')
property var pressed: ColorsList.add(sectionName+'_bg_p', 'm')
property var selected: ColorsList.add(sectionName+'_bg_c', 'k')
}
property QtObject icon: QtObject {
@ -35,11 +35,11 @@ QtObject {
property int rightPadding: 10
property QtObject color: QtObject {
property color disabled: ColorsList.add(sectionName+'_text_d', 'q').color
property color hovered: ColorsList.add(sectionName+'_text_h', 'q').color
property color normal: ColorsList.add(sectionName+'_text_n', 'q').color
property color pressed: ColorsList.add(sectionName+'_text_p', 'q').color
property color selected: ColorsList.add(sectionName+'_text_c', 'i').color
property var disabled: ColorsList.add(sectionName+'_text_d', 'q')
property var hovered: ColorsList.add(sectionName+'_text_h', 'q')
property var normal: ColorsList.add(sectionName+'_text_n', 'q')
property var pressed: ColorsList.add(sectionName+'_text_p', 'q')
property var selected: ColorsList.add(sectionName+'_text_c', 'i')
}
}
}

4
linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml
View file

@ -6,7 +6,7 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'TabContainer'
property color color: ColorsList.add(sectionName+'', 'k').color
property var colorModel: ColorsList.add(sectionName+'', 'k')
property int bottomMargin: 30
property int leftMargin: 30
property int rightMargin: 40
@ -14,6 +14,6 @@ QtObject {
property QtObject separator: QtObject {
property int height: 2
property color color: ColorsList.add(sectionName+'_separator', 'f').color
property var colorModel: ColorsList.add(sectionName+'_separator', 'f')
}
}

8
linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
View file

@ -8,12 +8,12 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'TransparentTextInput'
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'f').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'f')
property int iconSize: 12
property int padding: 10
property QtObject placeholder: QtObject {
property color color: ColorsList.add(sectionName+'_palceholder', 'n').color
property var colorModel: ColorsList.add(sectionName+'_palceholder', 'n')
property int pointSize: Units.dp * 10
}
@ -21,8 +21,8 @@ QtObject {
property int pointSize: Units.dp * 10
property QtObject color: QtObject {
property color focused: ColorsList.add(sectionName+'_text_focused', 'l').color
property color normal: ColorsList.add(sectionName+'_text_n', 'd').color
property var focused: ColorsList.add(sectionName+'_text_focused', 'l')
property var normal: ColorsList.add(sectionName+'_text_n', 'd')
}
}
}

26
linphone-app/ui/modules/Common/Styles/Indicators/MediaProgressBarStyle.qml
View file

@ -8,7 +8,7 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'MediaProgressBar'
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'k')
property string gaugeIcon: 'chat_audio_soundwave_custom'
property QtObject progressionWave: QtObject{
@ -17,20 +17,20 @@ QtObject {
property int iconWidth: 60
property string name : 'progression_soundwave'
property string icon : 'chat_audio_soundwave_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'a_n_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'a_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'a_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'a_n_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'a_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'a_p_b_fg')
property color backgroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_n', icon, 'l_n_b_bg').color
property color backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'l_h_b_bg').color
property color backgroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_p', icon, 'l_p_b_bg').color
property var backgroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_n', icon, 'l_n_b_bg')
property var backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'l_h_b_bg')
property var backgroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_p', icon, 'l_p_b_bg')
property color foregroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_n', icon, 'l_n_b_fg').color
property color foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'l_h_b_fg').color
property color foregroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_p', icon, 'l_p_b_fg').color
property var foregroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_n', icon, 'l_n_b_fg')
property var foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'l_h_b_fg')
property var foregroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_p', icon, 'l_p_b_fg')
}
}

6
linphone-app/ui/modules/Common/Styles/Indicators/RoundProgressBarStyle.qml
View file

@ -9,9 +9,9 @@ import Units 1.0
QtObject {
property string sectionName: 'RoundProgressBar'
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'progress_bg').color
property color progressRemainColor: ColorsList.add(sectionName+'_remaining_fg', 'progress_remaining_fg').color
property color progressColor: ColorsList.add(sectionName+'_fg', 'i').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'progress_bg')
property var progressRemainColor: ColorsList.add(sectionName+'_remaining_fg', 'progress_remaining_fg')
property var progressColor: ColorsList.add(sectionName+'_fg', 'i')
property int progressionWidth : 3
property int borderWidth: 2
property int pointSize: Units.dp * 7

12
linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml
View file

@ -13,26 +13,26 @@ QtObject {
property QtObject high: QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: ColorsList.add(sectionName+'_bg_d', 'o').color
property color enabled: ColorsList.add(sectionName+'_bg_enabled', 'n').color
property var disabled: ColorsList.add(sectionName+'_bg_d', 'o')
property var enabled: ColorsList.add(sectionName+'_bg_enabled', 'n')
}
}
property QtObject contentItem: QtObject {
property color color: ColorsList.add(sectionName+'_contentItem', 'b').color
property var colorModel: ColorsList.add(sectionName+'_contentItem', 'b')
}
}
property QtObject low: QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: ColorsList.add(sectionName+'_low_bg_d', 'o').color
property color enabled: ColorsList.add(sectionName+'_low_bg_enabled', 'n').color
property var disabled: ColorsList.add(sectionName+'_low_bg_d', 'o')
property var enabled: ColorsList.add(sectionName+'_low_bg_enabled', 'n')
}
}
property QtObject contentItem: QtObject {
property color color: ColorsList.add(sectionName+'_low_contentItem', 'j').color
property var colorModel: ColorsList.add(sectionName+'_low_contentItem', 'j')
}
}
}

16
linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
View file

@ -9,7 +9,7 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'ApplicationMenu'
property int spacing: 1
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'n').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'n')
property QtObject entry: QtObject {
property int iconSize: 24
@ -18,14 +18,14 @@ QtObject {
property int spacing: 18
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_entry_h', 'h').color
property color normal: ColorsList.add(sectionName+'_entry_n', 'g').color
property color pressed: ColorsList.add(sectionName+'_entry_p', 'i').color
property color selected: ColorsList.add(sectionName+'_entry_selected', 'j').color
property var hovered: ColorsList.add(sectionName+'_entry_h', 'h')
property var normal: ColorsList.add(sectionName+'_entry_n', 'g')
property var pressed: ColorsList.add(sectionName+'_entry_p', 'i')
property var selected: ColorsList.add(sectionName+'_entry_selected', 'j')
}
property QtObject indicator: QtObject {
property color color: ColorsList.add(sectionName+'_entry_indicator', 'i').color
property var colorModel: ColorsList.add(sectionName+'_entry_indicator', 'i')
property int width: 5
}
@ -33,8 +33,8 @@ QtObject {
property int pointSize: Units.dp * 10
property QtObject color: QtObject {
property color normal: ColorsList.add(sectionName+'_entry_text_n', 'q').color
property color selected: ColorsList.add(sectionName+'_entry_text_c', 'q').color
property var normal: ColorsList.add(sectionName+'_entry_text_n', 'q')
property var selected: ColorsList.add(sectionName+'_entry_text_c', 'q')
}
}
}

8
linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml
View file

@ -15,13 +15,13 @@ QtObject {
property int rightMargin: 8
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_entry_h', 'j').color
property color normal: ColorsList.add(sectionName+'_entry_n', 'g').color
property color pressed: ColorsList.add(sectionName+'_entry_p', 'i').color
property var hovered: ColorsList.add(sectionName+'_entry_h', 'j')
property var normal: ColorsList.add(sectionName+'_entry_n', 'g')
property var pressed: ColorsList.add(sectionName+'_entry_p', 'i')
}
property QtObject text: QtObject {
property color color: ColorsList.add(sectionName+'_entry_text', 'q').color
property var colorModel: ColorsList.add(sectionName+'_entry_text', 'q')
property int pointSize: Units.dp * 9
}
}

70
linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml
View file

@ -62,9 +62,9 @@ QtObject {
property int height: 30
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_normal_bg_h', 'o').color
property color normal: ColorsList.add(sectionName+'_normal_bg_n', 'q').color
property color pressed: ColorsList.add(sectionName+'_normal_bg_p', 'o').color
property var hovered: ColorsList.add(sectionName+'_normal_bg_h', 'o')
property var normal: ColorsList.add(sectionName+'_normal_bg_n', 'q')
property var pressed: ColorsList.add(sectionName+'_normal_bg_p', 'o')
}
}
@ -73,10 +73,10 @@ QtObject {
property int weight : Font.Bold
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_n_text_h', 'j').color
property color normal: ColorsList.add(sectionName+'_n_text_n', 'j').color
property color pressed: ColorsList.add(sectionName+'_n_text_p', 'j').color
property color disabled: ColorsList.add(sectionName+'_n_text_d', 'l50').color
property var hovered: ColorsList.add(sectionName+'_n_text_h', 'j')
property var normal: ColorsList.add(sectionName+'_n_text_n', 'j')
property var pressed: ColorsList.add(sectionName+'_n_text_p', 'j')
property var disabled: ColorsList.add(sectionName+'_n_text_d', 'l50')
}
}
}
@ -88,9 +88,9 @@ QtObject {
property int height: 40
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_aux_bg_h', 'v').color
property color normal: ColorsList.add(sectionName+'_aux_bg_n', 'a').color
property color pressed: ColorsList.add(sectionName+'_aux_bg_p', 'v').color
property var hovered: ColorsList.add(sectionName+'_aux_bg_h', 'v')
property var normal: ColorsList.add(sectionName+'_aux_bg_n', 'a')
property var pressed: ColorsList.add(sectionName+'_aux_bg_p', 'v')
}
}
@ -99,10 +99,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_aux_text_h', 'j').color
property color normal: ColorsList.add(sectionName+'_aux_text_n', 'j').color
property color pressed: ColorsList.add(sectionName+'_aux_text_p', 'j').color
property color disabled: ColorsList.add(sectionName+'_aux_text_d', 'l50').color
property var hovered: ColorsList.add(sectionName+'_aux_text_h', 'j')
property var normal: ColorsList.add(sectionName+'_aux_text_n', 'j')
property var pressed: ColorsList.add(sectionName+'_aux_text_p', 'j')
property var disabled: ColorsList.add(sectionName+'_aux_text_d', 'l50')
}
}
}
@ -114,9 +114,9 @@ QtObject {
property int height: 40
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_auxRed_bg_h', 'v').color
property color normal: ColorsList.add(sectionName+'_auxRed_bg_n', 'a').color
property color pressed: ColorsList.add(sectionName+'_auxRed_bg_p', 'v').color
property var hovered: ColorsList.add(sectionName+'_auxRed_bg_h', 'v')
property var normal: ColorsList.add(sectionName+'_auxRed_bg_n', 'a')
property var pressed: ColorsList.add(sectionName+'_auxRed_bg_p', 'v')
}
}
@ -125,10 +125,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_auxError_text_h', 'error').color
property color normal: ColorsList.add(sectionName+'_auxError_text_n', 'error').color
property color pressed: ColorsList.add(sectionName+'_auxError_text_p', 'error').color
property color disabled: ColorsList.add(sectionName+'_auxError_text_d', 'l50').color
property var hovered: ColorsList.add(sectionName+'_auxError_text_h', 'error')
property var normal: ColorsList.add(sectionName+'_auxError_text_n', 'error')
property var pressed: ColorsList.add(sectionName+'_auxError_text_p', 'error')
property var disabled: ColorsList.add(sectionName+'_auxError_text_d', 'l50')
}
}
}
@ -140,9 +140,9 @@ QtObject {
property int height: 50
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_aux2_bg_h', 'w').color
property color normal: ColorsList.add(sectionName+'_aux2_bg_n', 'w').color
property color pressed: ColorsList.add(sectionName+'_aux2_bg_p', 'v').color
property var hovered: ColorsList.add(sectionName+'_aux2_bg_h', 'w')
property var normal: ColorsList.add(sectionName+'_aux2_bg_n', 'w')
property var pressed: ColorsList.add(sectionName+'_aux2_bg_p', 'v')
}
}
@ -151,10 +151,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_aux2_text_h', 'm').color
property color normal: ColorsList.add(sectionName+'_aux2_text_n', 'j').color
property color pressed: ColorsList.add(sectionName+'_aux2_text_p', 'm').color
property color disabled: ColorsList.add(sectionName+'_aux2_text_d', 'l50').color
property var hovered: ColorsList.add(sectionName+'_aux2_text_h', 'm')
property var normal: ColorsList.add(sectionName+'_aux2_text_n', 'j')
property var pressed: ColorsList.add(sectionName+'_aux2_text_p', 'm')
property var disabled: ColorsList.add(sectionName+'_aux2_text_d', 'l50')
}
}
}
@ -166,9 +166,9 @@ QtObject {
property int height: 50
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_aux2Error_bg_h', 'w').color
property color normal: ColorsList.add(sectionName+'_aux2Error_bg_n', 'w').color
property color pressed: ColorsList.add(sectionName+'_aux2Error_bg_p', 'v').color
property var hovered: ColorsList.add(sectionName+'_aux2Error_bg_h', 'w')
property var normal: ColorsList.add(sectionName+'_aux2Error_bg_n', 'w')
property var pressed: ColorsList.add(sectionName+'_aux2Error_bg_p', 'v')
}
}
@ -177,10 +177,10 @@ QtObject {
property int weight : Font.Normal
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_aux2Error_text_h', 'error').color
property color normal: ColorsList.add(sectionName+'_aux2Error_text_n', 'error').color
property color pressed: ColorsList.add(sectionName+'_aux2Error_text_p', 'error').color
property color disabled: ColorsList.add(sectionName+'_aux2Error_text_d', 'l50').color
property var hovered: ColorsList.add(sectionName+'_aux2Error_text_h', 'error')
property var normal: ColorsList.add(sectionName+'_aux2Error_text_n', 'error')
property var pressed: ColorsList.add(sectionName+'_aux2Error_text_p', 'error')
property var disabled: ColorsList.add(sectionName+'_aux2Error_text_d', 'l50')
}
}
}

12
linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml
View file

@ -8,35 +8,35 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Menu'
property QtObject normal : QtObject {
property color color: ColorsList.add(sectionName+'_n', 'q').color
property var colorModel: ColorsList.add(sectionName+'_n', 'q')
property int width: 130
property bool shadowEnabled: true
property int radius : 0
property QtObject border : QtObject {
property color color: 'black'
property var colorModel: {'color': 'black'}
property int width: 0
}
}
property QtObject aux : QtObject {
property color color: ColorsList.add(sectionName+'_aux', 'q').color
property var colorModel: ColorsList.add(sectionName+'_aux', 'q')
property int width: 200
property bool shadowEnabled: false
property int radius : 5
property QtObject border : QtObject {
property color color: ColorsList.add(sectionName+'_aux_border', 'u').color
property var colorModel: ColorsList.add(sectionName+'_aux_border', 'u')
property int width: 1
}
}
property QtObject aux2 : QtObject {
property color color: ColorsList.add(sectionName+'_aux2', 'q').color
property var colorModel: ColorsList.add(sectionName+'_aux2', 'q')
property int width: 250
property bool shadowEnabled: false
property int radius : 0
property QtObject border : QtObject {
property color color: 'black'
property var colorModel: {'color':'black'}
property int width: 0
}
}

8
linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
View file

@ -7,7 +7,7 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'ForceScrollBar'
property QtObject background : QtObject {
property color color: ColorsList.add(sectionName+'_bg', 'g20').color
property var colorModel: ColorsList.add(sectionName+'_bg', 'g20')
property int radius : 10
}
@ -18,8 +18,8 @@ QtObject {
}
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_h', 'h').color
property color normal: ColorsList.add(sectionName+'_n', 'g20').color
property color pressed: ColorsList.add(sectionName+'_p', 'd').color
property var hovered: ColorsList.add(sectionName+'_h', 'h')
property var normal: ColorsList.add(sectionName+'_n', 'g20')
property var pressed: ColorsList.add(sectionName+'_p', 'd')
}
}

4
linphone-app/ui/modules/Common/Styles/Misc/MessageBannerStyle.qml
View file

@ -9,7 +9,7 @@ QtObject {
property string sectionName: 'MessageBanner'
property string copyTextIcon : 'menu_copy_text_custom'
property color color: ColorsList.add(sectionName+'_message_banner', 'message_banner_bg', 'Background of message banner').color
property color textColor: ColorsList.add(sectionName+'_message_banner_text', 'message_banner_fg', 'Text of message banner').color
property var colorModel: ColorsList.add(sectionName+'_message_banner', 'message_banner_bg', 'Background of message banner')
property var textColor: ColorsList.add(sectionName+'_message_banner_text', 'message_banner_fg', 'Text of message banner')
property int pointSize: Units.dp * 9
}

6
linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml
View file

@ -12,9 +12,9 @@ QtObject {
property int width: 5
property QtObject color: QtObject {
property color hovered: ColorsList.add(sectionName+'_hovered', 'h').color
property color normal: ColorsList.add(sectionName+'_normal', 'c').color
property color pressed: ColorsList.add(sectionName+'_pressed', 'd').color
property var hovered: ColorsList.add(sectionName+'_hovered', 'h')
property var normal: ColorsList.add(sectionName+'_normal', 'c')
property var pressed: ColorsList.add(sectionName+'_pressed', 'd')
}
}
}

18
linphone-app/ui/modules/Common/Styles/Picker/DatePickerStyle.qml
View file

@ -10,12 +10,12 @@ QtObject {
property string sectionName : 'DatePicker'
property QtObject title: QtObject{
property color color: ColorsList.add(sectionName+'_title_fg', 'g').color
property var colorModel: ColorsList.add(sectionName+'_title_fg', 'g')
property real pointSize: Units.dp * 11
}
property QtObject cell: QtObject{
property color color: ColorsList.add(sectionName+'_cell_fg', 'g').color
property color selectedBorderColor: ColorsList.add(sectionName+'_selected', 'i').color
property var colorModel: ColorsList.add(sectionName+'_cell_fg', 'g')
property var selectedBorderColor: ColorsList.add(sectionName+'_selected', 'i')
property real selectedPointSize: Units.dp * 14
property real dayHeaderPointSize: Units.dp * 12
property real dayPointSize: Units.dp * 11
@ -25,11 +25,11 @@ QtObject {
property int iconSize: 20
property string name : 'nextMonth'
property string icon : 'panel_arrow_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg').color
property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'l_n_b_bg')
property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'l_h_b_bg')
property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'l_p_b_bg')
property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'l_n_b_fg')
property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'l_h_b_fg')
property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'l_p_b_fg')
}
}

8
linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml
View file

@ -8,9 +8,9 @@ import ColorsList 1.0
QtObject {
property string sectionName : 'TimePicker'
property color hoursColor: ColorsList.add(sectionName+'_hours', 'i').color
property color minutesColor: ColorsList.add(sectionName+'_minutes', 'i').color
property color selectedItemColor: ColorsList.add(sectionName+'_selected', 'l').color
property color unselectedItemColor: ColorsList.add(sectionName+'_unselected', 'g').color
property var hoursColor: ColorsList.add(sectionName+'_hours', 'i')
property var minutesColor: ColorsList.add(sectionName+'_minutes', 'i')
property var selectedItemColor: ColorsList.add(sectionName+'_selected', 'l')
property var unselectedItemColor: ColorsList.add(sectionName+'_unselected', 'g')
}

4
linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml
View file

@ -7,10 +7,10 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Popup'
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'k')
property QtObject shadow: QtObject {
property color color: ColorsList.add(sectionName+'_shadow', 'l').color
property var colorModel: ColorsList.add(sectionName+'_shadow', 'l')
property int horizontalOffset: 2
property int radius: 10
property int samples: 15

4
linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml
View file

@ -8,8 +8,8 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Tooltip'
property color backgroundColor: ColorsList.add(sectionName+'_bg', 'g').color
property color color: ColorsList.add(sectionName, 'q').color
property var backgroundColor: ColorsList.add(sectionName+'_bg', 'g')
property var colorModel: ColorsList.add(sectionName, 'q')
property int arrowSize: 8
property int delay: 1000
property int pointSize: Units.dp * 9

2
linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml
View file

@ -8,6 +8,6 @@ import ColorsList 1.0
QtObject {
property string sectionName: 'Window'
property QtObject transientWindow: QtObject {
property color color: ColorsList.add(sectionName+'_transient', 'l80').color
property var colorModel: ColorsList.add(sectionName+'_transient', 'l80')
}
}

6
linphone-app/ui/modules/Common/Tooltip/Tooltip.qml
View file

@ -93,7 +93,7 @@ Core.ToolTip {
fill: parent
margins: TooltipStyle.margins
}
color: TooltipStyle.backgroundColor
color: TooltipStyle.backgroundColor.color
radius: TooltipStyle.radius
}
@ -112,7 +112,7 @@ Core.ToolTip {
layer {
enabled: true
effect: ColorOverlay {
color: TooltipStyle.backgroundColor
color: TooltipStyle.backgroundColor.color
}
}
visible: tooltip.visible && _edge
@ -125,7 +125,7 @@ Core.ToolTip {
contentItem: Core.Text {
id: text
color: TooltipStyle.color
color: TooltipStyle.colorModel.color
font.pointSize: TooltipStyle.pointSize
padding: TooltipStyle.padding + TooltipStyle.margins
text: tooltip.text

2
linphone-app/ui/modules/Common/Window/VirtualWindow.qml
View file

@ -65,7 +65,7 @@ StackView{
property alias contentLoader:contentLoader
anchors.fill: parent
color: WindowStyle.transientWindow.color
color: WindowStyle.transientWindow.colorModel.color
Loader{
id:contentLoader
anchors.centerIn: parent

6
linphone-app/ui/modules/Linphone/Account/AccountStatus.qml
View file

@ -52,7 +52,7 @@ Item {
BusyIndicator {
anchors.fill:parent
running: AccountSettingsModel.registrationState === AccountSettingsModel.RegistrationStateInProgress
color: AccountStatusStyle.busyColor
color: AccountStatusStyle.busyColor.color
}
Icon {
@ -68,7 +68,7 @@ Item {
Text {
id:username
Layout.alignment: Qt.AlignBottom | Qt.AlignLeft
color: AccountStatusStyle.username.color
color: AccountStatusStyle.username.colorModel.color
elide: Text.ElideRight
font.bold: true
font.pointSize: AccountStatusStyle.username.pointSize
@ -99,7 +99,7 @@ Item {
Text {
Layout.preferredHeight:parent.height / 2
Layout.preferredWidth:parent.width
color: AccountStatusStyle.sipAddress.color
color: AccountStatusStyle.sipAddress.colorModel.color
elide: Text.ElideRight
font.pointSize: AccountStatusStyle.sipAddress.pointSize
text: AccountSettingsModel.sipAddress

Some files were not shown because too many files have changed in this diff Show more