From bf6b0f565a596cbd233696f2ba38a24cb6a377f1 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 27 Dec 2022 16:37:59 +0100 Subject: [PATCH] Use ColorModel instead of color for custom C++ featuring. --- .../other/colors/ColorListModel.cpp | 30 +- .../other/colors/ColorListModel.hpp | 8 +- .../components/other/colors/ColorModel.cpp | 71 ++- .../components/other/colors/ColorModel.hpp | 13 +- .../other/colors/ColorProxyModel.cpp | 47 ++ .../other/colors/ColorProxyModel.hpp | 13 +- .../Common/Animations/BusyIndicator.qml | 2 +- .../Common/Dialog/DialogDescription.qml | 2 +- .../ui/modules/Common/Dialog/DialogPlus.qml | 2 +- .../ui/modules/Common/Dialog/DialogTitle.qml | 6 +- .../ui/modules/Common/Form/ActionButton.qml | 94 ++-- .../Common/Form/Buttons/ExclusiveButtons.qml | 8 +- .../Common/Form/Buttons/FileChooserButton.qml | 6 +- .../Common/Form/Buttons/SmallButton.qml | 8 +- .../Common/Form/Buttons/TextButtonA.qml | 24 +- .../Common/Form/Buttons/TextButtonB.qml | 24 +- .../Common/Form/Buttons/TextButtonC.qml | 24 +- .../ui/modules/Common/Form/CheckBoxText.qml | 36 +- .../ui/modules/Common/Form/ComboBox.qml | 10 +- .../Common/Form/CommonItemDelegate.qml | 10 +- .../modules/Common/Form/DroppableTextArea.qml | 12 +- .../Common/Form/Fields/NumericField.qml | 6 +- .../Form/Fields/ScrollableListViewField.qml | 6 +- .../Common/Form/Fields/TextAreaField.qml | 8 +- .../modules/Common/Form/Fields/TextField.qml | 20 +- .../ui/modules/Common/Form/ListForm.qml | 4 +- .../modules/Common/Form/Placements/Form.qml | 4 +- .../Common/Form/Placements/FormHGroup.qml | 2 +- .../Common/Form/Placements/FormTable.qml | 2 +- .../Common/Form/Placements/FormTableLine.qml | 2 +- .../Common/Form/Placements/FormVGroup.qml | 2 +- .../ui/modules/Common/Form/RadioButton.qml | 6 +- .../ui/modules/Common/Form/SearchBox.qml | 2 +- .../ui/modules/Common/Form/Slider.qml | 12 +- .../ui/modules/Common/Form/StaticListForm.qml | 2 +- .../ui/modules/Common/Form/Switch.qml | 26 +- .../ui/modules/Common/Form/Tab/TabButton.qml | 20 +- .../modules/Common/Form/Tab/TabContainer.qml | 4 +- .../Common/Form/TransparentTextInput.qml | 8 +- .../Common/Indicators/MediaProgressBar.qml | 2 +- .../Common/Indicators/RoundProgressBar.qml | 8 +- .../ui/modules/Common/Indicators/VuMeter.qml | 12 +- .../modules/Common/Menus/ApplicationMenu.qml | 2 +- .../Common/Menus/ApplicationMenuEntry.qml | 14 +- .../Common/Menus/DropDownStaticMenuEntry.qml | 8 +- linphone-app/ui/modules/Common/Menus/Menu.qml | 4 +- .../ui/modules/Common/Menus/MenuItem.qml | 22 +- .../ui/modules/Common/Misc/ForceScrollBar.qml | 8 +- .../ui/modules/Common/Misc/MessageBanner.qml | 4 +- linphone-app/ui/modules/Common/Misc/Paned.qml | 6 +- .../ui/modules/Common/Picker/DatePicker.qml | 6 +- .../ui/modules/Common/Picker/TimePicker.qml | 8 +- .../ui/modules/Common/Popup/Popup.qml | 2 +- .../ui/modules/Common/Popup/PopupShadow.qml | 2 +- .../Styles/Animations/BusyIndicatorStyle.qml | 4 +- .../Styles/Dialog/DateTimeDialogStyle.qml | 20 +- .../Common/Styles/Dialog/DialogStyle.qml | 20 +- .../Form/Buttons/ExclusiveButtonsStyle.qml | 8 +- .../Form/Buttons/FileChooserButtonStyle.qml | 30 +- .../Styles/Form/Buttons/SmallButtonStyle.qml | 8 +- .../Styles/Form/Buttons/TextButtonAStyle.qml | 16 +- .../Styles/Form/Buttons/TextButtonBStyle.qml | 16 +- .../Styles/Form/Buttons/TextButtonCStyle.qml | 16 +- .../Common/Styles/Form/CheckBoxTextStyle.qml | 8 +- .../Common/Styles/Form/ComboBoxStyle.qml | 10 +- .../Styles/Form/CommonItemDelegateStyle.qml | 10 +- .../Styles/Form/DroppableTextAreaStyle.qml | 60 +-- .../Styles/Form/Fields/NumericFieldStyle.qml | 6 +- .../Styles/Form/Fields/TextAreaFieldStyle.qml | 8 +- .../Styles/Form/Fields/TextFieldStyle.qml | 64 +-- .../Common/Styles/Form/ListFormStyle.qml | 20 +- .../Form/Placements/FormHGroupStyle.qml | 2 +- .../Styles/Form/Placements/FormStyle.qml | 36 +- .../Styles/Form/Placements/FormTableStyle.qml | 2 +- .../Form/Placements/FormVGroupStyle.qml | 4 +- .../Common/Styles/Form/RadioButtonStyle.qml | 4 +- .../Common/Styles/Form/SearchBoxStyle.qml | 4 +- .../Common/Styles/Form/SliderStyle.qml | 12 +- .../Common/Styles/Form/SwitchStyle.qml | 52 +-- .../Common/Styles/Form/Tab/TabButtonStyle.qml | 20 +- .../Styles/Form/Tab/TabContainerStyle.qml | 4 +- .../Styles/Form/TransparentTextInputStyle.qml | 8 +- .../Indicators/MediaProgressBarStyle.qml | 26 +- .../Indicators/RoundProgressBarStyle.qml | 6 +- .../Common/Styles/Indicators/VuMeterStyle.qml | 12 +- .../Styles/Menus/ApplicationMenuStyle.qml | 16 +- .../Styles/Menus/DropDownStaticMenuStyle.qml | 8 +- .../Common/Styles/Menus/MenuItemStyle.qml | 70 +-- .../modules/Common/Styles/Menus/MenuStyle.qml | 12 +- .../Styles/Misc/ForceScrollBarStyle.qml | 8 +- .../Common/Styles/Misc/MessageBannerStyle.qml | 4 +- .../modules/Common/Styles/Misc/PanedStyle.qml | 6 +- .../Common/Styles/Picker/DatePickerStyle.qml | 18 +- .../Common/Styles/Picker/TimePickerStyle.qml | 8 +- .../Common/Styles/Popup/PopupStyle.qml | 4 +- .../Common/Styles/Tooltip/TooltipStyle.qml | 4 +- .../Common/Styles/Window/WindowStyle.qml | 2 +- .../ui/modules/Common/Tooltip/Tooltip.qml | 6 +- .../modules/Common/Window/VirtualWindow.qml | 2 +- .../Linphone/Account/AccountStatus.qml | 6 +- .../ui/modules/Linphone/Blocks/CardBlock.qml | 4 +- .../modules/Linphone/Blocks/RequestBlock.qml | 2 +- .../modules/Linphone/Calls/CallControls.qml | 2 +- .../modules/Linphone/Calls/CallStatistics.qml | 10 +- .../ui/modules/Linphone/Calls/Calls.qml | 30 +- .../Linphone/Calls/ConferenceControls.qml | 2 +- .../modules/Linphone/Calls/IncallAvatar.qml | 4 +- .../ui/modules/Linphone/Camera/CameraView.qml | 18 +- .../ui/modules/Linphone/Chat/Chat.qml | 18 +- .../Linphone/Chat/ChatAudioMessage.qml | 4 +- .../Linphone/Chat/ChatAudioPreview.qml | 2 +- .../Linphone/Chat/ChatCalendarMessage.qml | 24 +- .../Chat/ChatConferenceInvitationMessage.qml | 28 +- .../ui/modules/Linphone/Chat/ChatContent.qml | 2 +- .../modules/Linphone/Chat/ChatDeliveries.qml | 2 +- .../modules/Linphone/Chat/ChatFileMessage.qml | 8 +- .../Linphone/Chat/ChatForwardMessage.qml | 4 +- .../Linphone/Chat/ChatReplyMessage.qml | 14 +- .../Linphone/Chat/ChatReplyPreview.qml | 8 +- .../ui/modules/Linphone/Chat/Event.qml | 4 +- .../modules/Linphone/Chat/IncomingMessage.qml | 2 +- .../ui/modules/Linphone/Chat/Message.qml | 10 +- .../ui/modules/Linphone/Chat/Notice.qml | 6 +- .../modules/Linphone/Chat/OutgoingMessage.qml | 2 +- .../Linphone/Codecs/CodecAttribute.qml | 2 +- .../modules/Linphone/Codecs/CodecLegend.qml | 2 +- .../modules/Linphone/Codecs/CodecsViewer.qml | 6 +- .../ui/modules/Linphone/Contact/Avatar.qml | 8 +- .../Linphone/Contact/ContactDescription.qml | 6 +- .../Dialog/MultimediaParametersDialog.qml | 10 +- .../Linphone/Dialog/OnlineInstallerDialog.qml | 8 +- .../Linphone/Dialog/SipAddressDialog.qml | 2 +- .../Dialog/ZrtpTokenAuthenticationDialog.qml | 12 +- .../ui/modules/Linphone/File/FileView.qml | 4 +- .../ui/modules/Linphone/History/Event.qml | 6 +- .../ui/modules/Linphone/History/History.qml | 10 +- .../ui/modules/Linphone/Menus/IncallMenu.qml | 16 +- .../Linphone/Menus/SipAddressesMenu.qml | 8 +- .../modules/Linphone/Misc/MessageCounter.qml | 2 +- .../Linphone/Notifications/Notification.qml | 4 +- .../Notifications/NotificationBasic.qml | 2 +- .../NotificationReceivedFileMessage.qml | 4 +- .../NotificationReceivedMessage.qml | 4 +- .../SmartSearchBar/SmartSearchBar.qml | 2 +- .../Linphone/Sticker/AvatarSticker.qml | 4 +- .../Linphone/Sticker/CameraSticker.qml | 2 +- .../Linphone/Sticker/DecorationSticker.qml | 14 +- .../Styles/Account/AccountStatusStyle.qml | 6 +- .../Linphone/Styles/Blocks/CardBlockStyle.qml | 4 +- .../Styles/Blocks/RequestBlockStyle.qml | 2 +- .../Styles/Calls/CallControlsStyle.qml | 2 +- .../Styles/Calls/CallStatisticsStyle.qml | 22 +- .../Linphone/Styles/Calls/CallsStyle.qml | 50 +- .../Styles/Calls/ConferenceControlsStyle.qml | 2 +- .../Styles/Camera/CameraViewStyle.qml | 40 +- .../Styles/Chat/ChatAudioMessageStyle.qml | 53 ++- .../Styles/Chat/ChatAudioPreviewStyle.qml | 110 ++--- .../Styles/Chat/ChatCalendarMessageStyle.qml | 108 ++--- .../Styles/Chat/ChatFilePreviewStyle.qml | 32 +- .../Styles/Chat/ChatForwardMessageStyle.qml | 4 +- .../Styles/Chat/ChatReplyMessageStyle.qml | 12 +- .../Linphone/Styles/Chat/ChatStyle.qml | 118 ++--- .../Styles/Codecs/CodecsViewerStyle.qml | 8 +- .../Linphone/Styles/Contact/AvatarStyle.qml | 8 +- .../Contact/ContactDescriptionStyle.qml | 6 +- .../Linphone/Styles/Contact/ContactStyle.qml | 6 +- .../MultimediaParametersDialogStyle.qml | 6 +- .../Dialog/OnlineInstallerDialogStyle.qml | 8 +- .../Styles/Dialog/SipAddressDialogStyle.qml | 16 +- .../ZrtpTokenAuthenticationDialogStyle.qml | 4 +- .../Linphone/Styles/History/HistoryStyle.qml | 38 +- .../Linphone/Styles/Menus/IncallMenuStyle.qml | 44 +- .../Styles/Menus/SipAddressesMenuStyle.qml | 8 +- .../Styles/Misc/MessageCounterStyle.qml | 2 +- .../Notifications/NotificationBasicStyle.qml | 2 +- .../NotificationReceivedCallStyle.qml | 36 +- .../NotificationReceivedFileMessageStyle.qml | 6 +- .../NotificationReceivedMessageStyle.qml | 6 +- .../Notifications/NotificationStyle.qml | 4 +- .../Styles/Sticker/AvatarStickerStyle.qml | 4 +- .../Styles/Sticker/CameraStickerStyle.qml | 2 +- .../Styles/Sticker/DecorationStickerStyle.qml | 28 +- .../Linphone/Styles/Sticker/StickerStyle.qml | 16 +- .../Styles/TelKeypad/TelKeypadStyle.qml | 24 +- .../Styles/Timeline/TimelineStyle.qml | 56 +-- .../Styles/View/ParticipantsListViewStyle.qml | 54 +-- .../Styles/View/ParticipantsViewStyle.qml | 2 +- .../Styles/View/SipAddressesViewStyle.qml | 66 +-- .../modules/Linphone/TelKeypad/TelKeypad.qml | 4 +- .../Linphone/TelKeypad/TelKeypadButton.qml | 6 +- .../ui/modules/Linphone/Timeline/Timeline.qml | 20 +- .../Linphone/Timeline/TimelineItem.qml | 22 +- .../Linphone/View/ParticipantsListView.qml | 4 +- .../Linphone/View/ParticipantsView.qml | 20 +- .../Linphone/View/SipAddressesView.qml | 18 +- .../views/App/Calls/AbstractStartingCall.qml | 4 +- .../ui/views/App/Calls/CallsWindow.qml | 6 +- .../ui/views/App/Calls/Conference.qml | 6 +- .../App/Calls/Dialogs/CallSipAddress.qml | 2 +- .../views/App/Calls/Dialogs/CallTransfer.qml | 2 +- .../App/Calls/Dialogs/ConferenceManager.qml | 4 +- linphone-app/ui/views/App/Calls/Incall.qml | 24 +- .../views/App/Calls/IncallActiveSpeaker.qml | 12 +- .../ui/views/App/Calls/IncallFullscreen.qml | 18 +- .../ui/views/App/Calls/IncallGrid.qml | 4 +- .../ui/views/App/Calls/WaitingRoom.qml | 18 +- .../ui/views/App/Dialog/NewConference.qml | 30 +- linphone-app/ui/views/App/Main/Assistant.qml | 2 +- .../ActivateAppSipAccountWithEmail.qml | 2 +- .../ActivateAppSipAccountWithPhoneNumber.qml | 2 +- .../Main/Assistant/AssistantAbstractView.qml | 4 +- .../App/Main/Assistant/AssistantHome.qml | 4 +- .../Assistant/FetchRemoteConfiguration.qml | 10 +- .../App/Main/Assistant/UseAppSipAccount.qml | 2 +- .../App/Main/Assistant/UseOtherSipAccount.qml | 8 +- .../ui/views/App/Main/Conferences.qml | 18 +- .../ui/views/App/Main/ContactEdit.qml | 14 +- linphone-app/ui/views/App/Main/Contacts.qml | 18 +- .../ui/views/App/Main/Conversation.qml | 24 +- .../ui/views/App/Main/Dialogs/About.qml | 8 +- .../App/Main/Dialogs/EphemeralChatRoom.qml | 4 +- .../views/App/Main/Dialogs/InfoChatRoom.qml | 4 +- .../views/App/Main/Dialogs/InfoEncryption.qml | 4 +- .../ui/views/App/Main/Dialogs/NewChatRoom.qml | 14 +- .../App/Main/Dialogs/ParticipantsDevices.qml | 6 +- .../ui/views/App/Main/HistoryView.qml | 2 +- linphone-app/ui/views/App/Main/Home.qml | 2 +- .../ui/views/App/Main/InviteFriends.qml | 2 +- linphone-app/ui/views/App/Main/MainWindow.qml | 9 +- .../views/App/Settings/SettingsAdvanced.qml | 4 +- .../ui/views/App/Settings/SettingsAudio.qml | 4 +- .../views/App/Settings/SettingsCallsChat.qml | 2 +- .../ui/views/App/Settings/SettingsLdap.qml | 2 +- .../ui/views/App/Settings/SettingsWindow.qml | 6 +- .../App/Styles/Calls/CallFullscreenStyle.qml | 328 ++++++------- .../ui/views/App/Styles/Calls/CallStyle.qml | 334 ++++++------- .../App/Styles/Calls/CallsWindowStyle.qml | 46 +- .../App/Styles/Calls/ConferenceStyle.qml | 2 +- .../Calls/Dialogs/CallSipAddressStyle.qml | 26 +- .../Calls/Dialogs/CallTransferStyle.qml | 14 +- .../Calls/Dialogs/ConferenceManagerStyle.qml | 28 +- .../Dialogs/MultimediaParametersStyle.qml | 6 +- .../ui/views/App/Styles/Calls/IncallStyle.qml | 442 +++++++++--------- .../App/Styles/Calls/WaitingRoomStyle.qml | 190 ++++---- .../App/Styles/Dialog/NewConferenceStyle.qml | 44 +- .../ActivateAppSipAccountWithEmailStyle.qml | 2 +- ...ivateAppSipAccountWithPhoneNumberStyle.qml | 2 +- .../Assistant/AssistantAbstractViewStyle.qml | 4 +- .../Main/Assistant/AssistantHomeStyle.qml | 4 +- .../FetchRemoteConfigurationStyle.qml | 10 +- .../Main/Assistant/UseAppSipAccountStyle.qml | 4 +- .../views/App/Styles/Main/AssistantStyle.qml | 2 +- .../App/Styles/Main/ConferencesStyle.qml | 100 ++-- .../App/Styles/Main/ContactEditStyle.qml | 104 ++--- .../views/App/Styles/Main/ContactsStyle.qml | 86 ++-- .../App/Styles/Main/ConversationStyle.qml | 128 ++--- .../App/Styles/Main/Dialogs/AboutStyle.qml | 8 +- .../Main/Dialogs/EphemeralChatRoomStyle.qml | 4 +- .../Styles/Main/Dialogs/InfoChatRoomStyle.qml | 54 +-- .../Main/Dialogs/InfoEncryptionStyle.qml | 18 +- .../Main/Dialogs/ManageAccountsStyle.qml | 12 +- .../Styles/Main/Dialogs/NewChatRoomStyle.qml | 38 +- .../Main/Dialogs/ParticipantsDevicesStyle.qml | 28 +- .../App/Styles/Main/HistoryViewStyle.qml | 58 +-- .../ui/views/App/Styles/Main/HomeStyle.qml | 2 +- .../App/Styles/Main/InviteFriendsStyle.qml | 2 +- .../views/App/Styles/Main/MainWindowStyle.qml | 93 ++-- .../Styles/Settings/SettingsAdvancedStyle.qml | 52 +-- .../Styles/Settings/SettingsAudioStyle.qml | 38 +- .../App/Styles/Settings/SettingsUiStyle.qml | 12 +- .../Styles/Settings/SettingsWindowStyle.qml | 62 +-- 271 files changed, 2843 insertions(+), 2706 deletions(-) diff --git a/linphone-app/src/components/other/colors/ColorListModel.cpp b/linphone-app/src/components/other/colors/ColorListModel.cpp index 96b814de7..a281b60fd 100644 --- a/linphone-app/src/components/other/colors/ColorListModel.cpp +++ b/linphone-app/src/components/other/colors/ColorListModel.cpp @@ -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::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::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); } } } diff --git a/linphone-app/src/components/other/colors/ColorListModel.hpp b/linphone-app/src/components/other/colors/ColorListModel.hpp index 5fb0df651..3fb99dc8a 100644 --- a/linphone-app/src/components/other/colors/ColorListModel.hpp +++ b/linphone-app/src/components/other/colors/ColorListModel.hpp @@ -33,7 +33,7 @@ #include "app/proxyModel/ProxyListModel.hpp" #define ADD_COLOR(COLOR, VALUE, DESCRIPTION) \ - color = QSharedPointer::create(COLOR, VALUE, DESCRIPTION); \ + color = QSharedPointer::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 imdn); QString buildDescription(QString description); // return a description from id by splitting '_' diff --git a/linphone-app/src/components/other/colors/ColorModel.cpp b/linphone-app/src/components/other/colors/ColorModel.cpp index 34a303ef5..68cf23a02 100644 --- a/linphone-app/src/components/other/colors/ColorModel.cpp +++ b/linphone-app/src/components/other/colors/ColorModel.cpp @@ -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; } } \ No newline at end of file diff --git a/linphone-app/src/components/other/colors/ColorModel.hpp b/linphone-app/src/components/other/colors/ColorModel.hpp index 6143ca06c..47cbd13b1 100644 --- a/linphone-app/src/components/other/colors/ColorModel.hpp +++ b/linphone-app/src/components/other/colors/ColorModel.hpp @@ -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; diff --git a/linphone-app/src/components/other/colors/ColorProxyModel.cpp b/linphone-app/src/components/other/colors/ColorProxyModel.cpp index 6c0777f7d..b55d2eaa6 100644 --- a/linphone-app/src/components/other/colors/ColorProxyModel.cpp +++ b/linphone-app/src/components/other/colors/ColorProxyModel.cpp @@ -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(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(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(); + if(mLinksIndex>=0){ + ColorListModel * listModel = static_cast(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 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; diff --git a/linphone-app/src/components/other/colors/ColorProxyModel.hpp b/linphone-app/src/components/other/colors/ColorProxyModel.hpp index 29965c984..b933171da 100644 --- a/linphone-app/src/components/other/colors/ColorProxyModel.hpp +++ b/linphone-app/src/components/other/colors/ColorProxyModel.hpp @@ -29,6 +29,7 @@ #include #include +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> mColors; }; #endif diff --git a/linphone-app/ui/modules/Common/Animations/BusyIndicator.qml b/linphone-app/ui/modules/Common/Animations/BusyIndicator.qml index 080a6aba4..1e060da0b 100644 --- a/linphone-app/ui/modules/Common/Animations/BusyIndicator.qml +++ b/linphone-app/ui/modules/Common/Animations/BusyIndicator.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Dialog/DialogDescription.qml b/linphone-app/ui/modules/Common/Dialog/DialogDescription.qml index 4f5a54c35..efe941c41 100644 --- a/linphone-app/ui/modules/Common/Dialog/DialogDescription.qml +++ b/linphone-app/ui/modules/Common/Dialog/DialogDescription.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml b/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml index d27dab5de..5fad468b3 100644 --- a/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml +++ b/linphone-app/ui/modules/Common/Dialog/DialogPlus.qml @@ -53,7 +53,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: DialogStyle.color + color: DialogStyle.colorModel.color layer { enabled: !dialog.flat diff --git a/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml b/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml index 797ffcd34..022f4ce8a 100644 --- a/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml +++ b/linphone-app/ui/modules/Common/Dialog/DialogTitle.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/ActionButton.qml b/linphone-app/ui/modules/Common/Form/ActionButton.qml index ba9856154..7abe0c588 100644 --- a/linphone-app/ui/modules/Common/Form/ActionButton.qml +++ b/linphone-app/ui/modules/Common/Form/ActionButton.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml index 0ddea681e..26036e755 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml @@ -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 ) ) : '' diff --git a/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml b/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml index 9285e7d43..e3354069f 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/FileChooserButton.qml @@ -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 { diff --git a/linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml b/linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml index 712ef75ac..7d20b3c17 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/SmallButton.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml index f798ad33a..0331cb866 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonA.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml index 37d5d32c9..47963db99 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonB.qml @@ -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) } diff --git a/linphone-app/ui/modules/Common/Form/Buttons/TextButtonC.qml b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonC.qml index 1dbf90208..a404f1e73 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/TextButtonC.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/TextButtonC.qml @@ -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) } diff --git a/linphone-app/ui/modules/Common/Form/CheckBoxText.qml b/linphone-app/ui/modules/Common/Form/CheckBoxText.qml index 6d1bb4455..180a57506 100644 --- a/linphone-app/ui/modules/Common/Form/CheckBoxText.qml +++ b/linphone-app/ui/modules/Common/Form/CheckBoxText.qml @@ -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' diff --git a/linphone-app/ui/modules/Common/Form/ComboBox.qml b/linphone-app/ui/modules/Common/Form/ComboBox.qml index d7f683f2c..ca0cb7834 100644 --- a/linphone-app/ui/modules/Common/Form/ComboBox.qml +++ b/linphone-app/ui/modules/Common/Form/ComboBox.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml b/linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml index b18e6c3cf..8442caae7 100644 --- a/linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml +++ b/linphone-app/ui/modules/Common/Form/CommonItemDelegate.qml @@ -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 { diff --git a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml index 8770cc78d..56dae77b7 100644 --- a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml @@ -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') } diff --git a/linphone-app/ui/modules/Common/Form/Fields/NumericField.qml b/linphone-app/ui/modules/Common/Form/Fields/NumericField.qml index 06f2a1b96..06c027fc4 100644 --- a/linphone-app/ui/modules/Common/Form/Fields/NumericField.qml +++ b/linphone-app/ui/modules/Common/Form/Fields/NumericField.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml b/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml index 550624f3a..f338a78ac 100644 --- a/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml +++ b/linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml b/linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml index 07ff17cbb..78994a747 100644 --- a/linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml +++ b/linphone-app/ui/modules/Common/Form/Fields/TextAreaField.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Fields/TextField.qml b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml index dc39e0b03..cbf530fe9 100644 --- a/linphone-app/ui/modules/Common/Form/Fields/TextField.qml +++ b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml @@ -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 : '*' - 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 diff --git a/linphone-app/ui/modules/Common/Form/ListForm.qml b/linphone-app/ui/modules/Common/Form/ListForm.qml index 65226f0a0..946118a92 100644 --- a/linphone-app/ui/modules/Common/Form/ListForm.qml +++ b/linphone-app/ui/modules/Common/Form/ListForm.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Placements/Form.qml b/linphone-app/ui/modules/Common/Form/Placements/Form.qml index 8b65d8f3d..7690ccbdb 100644 --- a/linphone-app/ui/modules/Common/Form/Placements/Form.qml +++ b/linphone-app/ui/modules/Common/Form/Placements/Form.qml @@ -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 { diff --git a/linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml b/linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml index 47ed4bea0..58de9ea70 100644 --- a/linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml +++ b/linphone-app/ui/modules/Common/Form/Placements/FormHGroup.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Placements/FormTable.qml b/linphone-app/ui/modules/Common/Form/Placements/FormTable.qml index c43490a0c..5f7a14b82 100644 --- a/linphone-app/ui/modules/Common/Form/Placements/FormTable.qml +++ b/linphone-app/ui/modules/Common/Form/Placements/FormTable.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml b/linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml index 96bdd49ee..6f51ec9ba 100644 --- a/linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml +++ b/linphone-app/ui/modules/Common/Form/Placements/FormTableLine.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml b/linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml index a33621d3a..e17ae5773 100644 --- a/linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml +++ b/linphone-app/ui/modules/Common/Form/Placements/FormVGroup.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/RadioButton.qml b/linphone-app/ui/modules/Common/Form/RadioButton.qml index 449df7852..33e015bcd 100644 --- a/linphone-app/ui/modules/Common/Form/RadioButton.qml +++ b/linphone-app/ui/modules/Common/Form/RadioButton.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/SearchBox.qml b/linphone-app/ui/modules/Common/Form/SearchBox.qml index 7e4efc027..2928f2234 100644 --- a/linphone-app/ui/modules/Common/Form/SearchBox.qml +++ b/linphone-app/ui/modules/Common/Form/SearchBox.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Slider.qml b/linphone-app/ui/modules/Common/Form/Slider.qml index f188bd744..ad0f969f1 100644 --- a/linphone-app/ui/modules/Common/Form/Slider.qml +++ b/linphone-app/ui/modules/Common/Form/Slider.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/StaticListForm.qml b/linphone-app/ui/modules/Common/Form/StaticListForm.qml index 5e215c27e..743e0bd5d 100644 --- a/linphone-app/ui/modules/Common/Form/StaticListForm.qml +++ b/linphone-app/ui/modules/Common/Form/StaticListForm.qml @@ -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 { diff --git a/linphone-app/ui/modules/Common/Form/Switch.qml b/linphone-app/ui/modules/Common/Form/Switch.qml index db5238588..94dfd790e 100644 --- a/linphone-app/ui/modules/Common/Form/Switch.qml +++ b/linphone-app/ui/modules/Common/Form/Switch.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml index ea218d718..e6a0510b3 100644 --- a/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml +++ b/linphone-app/ui/modules/Common/Form/Tab/TabButton.qml @@ -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 } // --------------------------------------------------------------------------- diff --git a/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml b/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml index 1706849ad..ce749b8b5 100644 --- a/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml +++ b/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml b/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml index 4a6ef3823..8ffd455f0 100644 --- a/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml +++ b/linphone-app/ui/modules/Common/Form/TransparentTextInput.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Indicators/MediaProgressBar.qml b/linphone-app/ui/modules/Common/Indicators/MediaProgressBar.qml index 5e13c5826..76b540ce4 100644 --- a/linphone-app/ui/modules/Common/Indicators/MediaProgressBar.qml +++ b/linphone-app/ui/modules/Common/Indicators/MediaProgressBar.qml @@ -71,7 +71,7 @@ ProgressBar { background: Rectangle { id: backgroundArea - color: MediaProgressBarStyle.backgroundColor + color: MediaProgressBarStyle.backgroundColor.color radius: 5 clip: false } diff --git a/linphone-app/ui/modules/Common/Indicators/RoundProgressBar.qml b/linphone-app/ui/modules/Common/Indicators/RoundProgressBar.qml index 10ccb17a6..d92552c09 100644 --- a/linphone-app/ui/modules/Common/Indicators/RoundProgressBar.qml +++ b/linphone-app/ui/modules/Common/Indicators/RoundProgressBar.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Indicators/VuMeter.qml b/linphone-app/ui/modules/Common/Indicators/VuMeter.qml index aeb9b5fbd..c86eac376 100644 --- a/linphone-app/ui/modules/Common/Indicators/VuMeter.qml +++ b/linphone-app/ui/modules/Common/Indicators/VuMeter.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml b/linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml index 2fee739b6..ee1407b76 100644 --- a/linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml +++ b/linphone-app/ui/modules/Common/Menus/ApplicationMenu.qml @@ -29,7 +29,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: ApplicationMenuStyle.backgroundColor + color: ApplicationMenuStyle.backgroundColor.color implicitHeight: content.height width: entryWidth diff --git a/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml b/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml index eb29511bb..e76335105 100644 --- a/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml +++ b/linphone-app/ui/modules/Common/Menus/ApplicationMenuEntry.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml b/linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml index b72369a89..a4f888151 100644 --- a/linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml +++ b/linphone-app/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Menus/Menu.qml b/linphone-app/ui/modules/Common/Menus/Menu.qml index d3a678cbd..71651a748 100644 --- a/linphone-app/ui/modules/Common/Menus/Menu.qml +++ b/linphone-app/ui/modules/Common/Menus/Menu.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Menus/MenuItem.qml b/linphone-app/ui/modules/Common/Menus/MenuItem.qml index 49645f7f0..4d07f3fc6 100644 --- a/linphone-app/ui/modules/Common/Menus/MenuItem.qml +++ b/linphone-app/ui/modules/Common/Menus/MenuItem.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml b/linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml index 4eb290338..7e4842422 100644 --- a/linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml +++ b/linphone-app/ui/modules/Common/Misc/ForceScrollBar.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Misc/MessageBanner.qml b/linphone-app/ui/modules/Common/Misc/MessageBanner.qml index 1336afd32..6d8e43e63 100644 --- a/linphone-app/ui/modules/Common/Misc/MessageBanner.qml +++ b/linphone-app/ui/modules/Common/Misc/MessageBanner.qml @@ -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: [ diff --git a/linphone-app/ui/modules/Common/Misc/Paned.qml b/linphone-app/ui/modules/Common/Misc/Paned.qml index 6052042a5..cc24e241f 100644 --- a/linphone-app/ui/modules/Common/Misc/Paned.qml +++ b/linphone-app/ui/modules/Common/Misc/Paned.qml @@ -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 ) } } diff --git a/linphone-app/ui/modules/Common/Picker/DatePicker.qml b/linphone-app/ui/modules/Common/Picker/DatePicker.qml index 6185067a2..17e826419 100644 --- a/linphone-app/ui/modules/Common/Picker/DatePicker.qml +++ b/linphone-app/ui/modules/Common/Picker/DatePicker.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Picker/TimePicker.qml b/linphone-app/ui/modules/Common/Picker/TimePicker.qml index a76af1607..dbfeed41a 100644 --- a/linphone-app/ui/modules/Common/Picker/TimePicker.qml +++ b/linphone-app/ui/modules/Common/Picker/TimePicker.qml @@ -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 { diff --git a/linphone-app/ui/modules/Common/Popup/Popup.qml b/linphone-app/ui/modules/Common/Popup/Popup.qml index 4b265f913..434b350bf 100644 --- a/linphone-app/ui/modules/Common/Popup/Popup.qml +++ b/linphone-app/ui/modules/Common/Popup/Popup.qml @@ -82,7 +82,7 @@ Item { background: Rectangle { id: backgroundPopup - color: PopupStyle.backgroundColor + color: PopupStyle.backgroundColor.color height: popup.height width: popup.width diff --git a/linphone-app/ui/modules/Common/Popup/PopupShadow.qml b/linphone-app/ui/modules/Common/Popup/PopupShadow.qml index cb6e994a3..8efb8d793 100644 --- a/linphone-app/ui/modules/Common/Popup/PopupShadow.qml +++ b/linphone-app/ui/modules/Common/Popup/PopupShadow.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml b/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml index 083f6d463..b574f90dd 100644 --- a/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Dialog/DateTimeDialogStyle.qml b/linphone-app/ui/modules/Common/Styles/Dialog/DateTimeDialogStyle.qml index 00358d965..7a3b64000 100644 --- a/linphone-app/ui/modules/Common/Styles/Dialog/DateTimeDialogStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Dialog/DateTimeDialogStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml index c4f16e5b4..ea4f2e54e 100644 --- a/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Dialog/DialogStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml index 0f48a97af..0c4f9b7ae 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml index 49b63c3bb..b641f6377 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml index 7224c1e81..9f5e058ef 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml index ac5babecb..5e4e40c08 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml index 96e940ed1..aa63c9138 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonCStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonCStyle.qml index fb1fc563e..4dae189d0 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonCStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Buttons/TextButtonCStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml index 84bf0cc8f..553eba479 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml index 769b6bcfa..19c9b4cb6 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/ComboBoxStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml index 0de4f88f3..9da241130 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/CommonItemDelegateStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml index 3f698cc9a..a8f131954 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml index df6a2bf66..ae3bd826f 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml index cdd004038..8546ec457 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml index 56616b14f..03dd3968c 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml index 22c9fcd6f..c190df57f 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/ListFormStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml index af1f9ed22..b758c8153 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml index 9297e615f..2be33a838 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml index 8ed4c0575..cf8a5102b 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml index 4a98eb8f3..8541f0ee0 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/RadioButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/RadioButtonStyle.qml index b84c3112d..40e0513f4 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/RadioButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/RadioButtonStyle.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml index ed5609bd7..ff3d99383 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/SearchBoxStyle.qml @@ -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' } diff --git a/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml index cdc48d136..41a022430 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/SliderStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml index 28c0a37d4..837d01337 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/SwitchStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml index 29f96518e..9936ec716 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml index 93b62988b..f32547a37 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml index 72aeb810b..5617ccd7b 100644 --- a/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Indicators/MediaProgressBarStyle.qml b/linphone-app/ui/modules/Common/Styles/Indicators/MediaProgressBarStyle.qml index 9417b2d68..c1b2bc528 100644 --- a/linphone-app/ui/modules/Common/Styles/Indicators/MediaProgressBarStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Indicators/MediaProgressBarStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Indicators/RoundProgressBarStyle.qml b/linphone-app/ui/modules/Common/Styles/Indicators/RoundProgressBarStyle.qml index 1acdd4b83..f8fe17da4 100644 --- a/linphone-app/ui/modules/Common/Styles/Indicators/RoundProgressBarStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Indicators/RoundProgressBarStyle.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml b/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml index 84e381479..e16900c3e 100644 --- a/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml index 46eb5b1c0..5f7f9189a 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml index 42d0d6ff2..4ee85ccc2 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml index b20229906..34163b43b 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/MenuItemStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml b/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml index 7a8e07ce0..4f3278493 100644 --- a/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Menus/MenuStyle.qml @@ -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 } } diff --git a/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml index a779fa7aa..d392da89a 100644 --- a/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Misc/MessageBannerStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/MessageBannerStyle.qml index c161a0136..6ed6d7650 100644 --- a/linphone-app/ui/modules/Common/Styles/Misc/MessageBannerStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Misc/MessageBannerStyle.qml @@ -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 } diff --git a/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml b/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml index 75c632500..8de0aa458 100644 --- a/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Misc/PanedStyle.qml @@ -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') } } } diff --git a/linphone-app/ui/modules/Common/Styles/Picker/DatePickerStyle.qml b/linphone-app/ui/modules/Common/Styles/Picker/DatePickerStyle.qml index b9b379cdd..8c39d9f38 100644 --- a/linphone-app/ui/modules/Common/Styles/Picker/DatePickerStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Picker/DatePickerStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml b/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml index 7aad4aeb4..ceec82063 100644 --- a/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml @@ -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') } diff --git a/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml b/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml index 562dd7328..d7456b7d4 100644 --- a/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Popup/PopupStyle.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml b/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml index 7ace5344d..d482c8afc 100644 --- a/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml b/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml index b5f96ae86..9fe28329f 100644 --- a/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Window/WindowStyle.qml @@ -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') } } diff --git a/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml index 4acc92f2b..dc9b9a298 100644 --- a/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml +++ b/linphone-app/ui/modules/Common/Tooltip/Tooltip.qml @@ -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 diff --git a/linphone-app/ui/modules/Common/Window/VirtualWindow.qml b/linphone-app/ui/modules/Common/Window/VirtualWindow.qml index 4666554e8..469176829 100644 --- a/linphone-app/ui/modules/Common/Window/VirtualWindow.qml +++ b/linphone-app/ui/modules/Common/Window/VirtualWindow.qml @@ -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 diff --git a/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml index 2de353996..c9c16314d 100644 --- a/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml +++ b/linphone-app/ui/modules/Linphone/Account/AccountStatus.qml @@ -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 diff --git a/linphone-app/ui/modules/Linphone/Blocks/CardBlock.qml b/linphone-app/ui/modules/Linphone/Blocks/CardBlock.qml index ab26c8d1e..8aa752acf 100644 --- a/linphone-app/ui/modules/Linphone/Blocks/CardBlock.qml +++ b/linphone-app/ui/modules/Linphone/Blocks/CardBlock.qml @@ -31,7 +31,7 @@ Column { Text { id: title - color: CardBlockStyle.title.color + color: CardBlockStyle.title.colorModel.color elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter wrapMode: Text.WordWrap @@ -48,7 +48,7 @@ Column { Text { id: description - color: CardBlockStyle.description.color + color: CardBlockStyle.description.colorModel.color elide: Text.ElideRight font.pointSize: CardBlockStyle.description.pointSize horizontalAlignment: Text.AlignHCenter diff --git a/linphone-app/ui/modules/Linphone/Blocks/RequestBlock.qml b/linphone-app/ui/modules/Linphone/Blocks/RequestBlock.qml index 18c4cca63..988b44dee 100644 --- a/linphone-app/ui/modules/Linphone/Blocks/RequestBlock.qml +++ b/linphone-app/ui/modules/Linphone/Blocks/RequestBlock.qml @@ -36,7 +36,7 @@ Column { readOnly: true selectByMouse: true - color: RequestBlockStyle.error.color + color: RequestBlockStyle.error.colorModel.color font { italic: true diff --git a/linphone-app/ui/modules/Linphone/Calls/CallControls.qml b/linphone-app/ui/modules/Linphone/Calls/CallControls.qml index 9687bdf4e..260207a14 100644 --- a/linphone-app/ui/modules/Linphone/Calls/CallControls.qml +++ b/linphone-app/ui/modules/Linphone/Calls/CallControls.qml @@ -32,7 +32,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: CallControlsStyle.color + color: CallControlsStyle.colorModel.color height: CallControlsStyle.height MouseArea { diff --git a/linphone-app/ui/modules/Linphone/Calls/CallStatistics.qml b/linphone-app/ui/modules/Linphone/Calls/CallStatistics.qml index 2eb9ba479..d1b01f2ae 100644 --- a/linphone-app/ui/modules/Linphone/Calls/CallStatistics.qml +++ b/linphone-app/ui/modules/Linphone/Calls/CallStatistics.qml @@ -11,7 +11,7 @@ Popup { id: callStatistics property var call - backgroundPopup: CallStatisticsStyle.outsideColor + backgroundPopup: CallStatisticsStyle.outsideColor.color showShadow: false // if true, we get a brownish/yollow color due to alphas // --------------------------------------------------------------------------- delayClosing: true @@ -23,7 +23,7 @@ Popup { onClicked: callStatistics.close() } Rectangle { - color: CallStatisticsStyle.color + color: CallStatisticsStyle.colorModel.color anchors.fill: parent anchors.topMargin: CallStatisticsStyle.popup.topMargin anchors.bottomMargin: CallStatisticsStyle.popup.bottomMargin @@ -103,7 +103,7 @@ Popup { Text { Layout.preferredWidth: CallStatisticsStyle.key.width - color: CallStatisticsStyle.key.color + color: CallStatisticsStyle.key.colorModel.color elide: Text.ElideRight font { @@ -120,7 +120,7 @@ Popup { Text { Layout.fillWidth: true - color: CallStatisticsStyle.value.color + color: CallStatisticsStyle.value.colorModel.color elide: Text.ElideRight font.pointSize: CallStatisticsStyle.value.pointSize @@ -139,7 +139,7 @@ Popup { Column{ width: parent.width Text { - color: CallStatisticsStyle.title.color + color: CallStatisticsStyle.title.colorModel.color font { bold: true diff --git a/linphone-app/ui/modules/Linphone/Calls/Calls.qml b/linphone-app/ui/modules/Linphone/Calls/Calls.qml index 5004e78d5..6e01b445c 100644 --- a/linphone-app/ui/modules/Linphone/Calls/Calls.qml +++ b/linphone-app/ui/modules/Linphone/Calls/Calls.qml @@ -125,12 +125,12 @@ ListView { visible: calls.conferenceModel.count > 0 color: isSelected - ? CallsStyle.entry.color.selected - : CallsStyle.entry.color.normal + ? CallsStyle.entry.color.selected.color + : CallsStyle.entry.color.normal.color textColor: isSelected - ? CallsStyle.entry.titleColor.selected - : CallsStyle.entry.titleColor.normal + ? CallsStyle.entry.titleColor.selected.color + : CallsStyle.entry.titleColor.normal.color onClicked: Logic.resetSelectedCall() onVisibleChanged: !visible && Logic.handleCountChanged(calls.count) @@ -147,16 +147,16 @@ ListView { isDarkMode: calls.currentIndex === index && $modelData!=undefined && $modelData.status!=undefined && $modelData.status !== CallModel.CallStatusEnded // ------------------------------------------------------------------------- - + property var entryColors: CallsStyle.entry.color color: isDarkMode - ? CallsStyle.entry.color.selected - : CallsStyle.entry.color.normal + ? entryColors.selected.color + : entryColors.normal.color subtitleColor: isDarkMode - ? CallsStyle.entry.subtitleColor.selected - : CallsStyle.entry.subtitleColor.normal + ? CallsStyle.entry.subtitleColor.selected.color + : CallsStyle.entry.subtitleColor.normal.color titleColor: isDarkMode - ? CallsStyle.entry.titleColor.selected - : CallsStyle.entry.titleColor.normal + ? CallsStyle.entry.titleColor.selected.color + : CallsStyle.entry.titleColor.normal.color signIcon: { var params = loader.params @@ -194,14 +194,14 @@ ListView { ColorAnimation { duration: CallsStyle.entry.endCallAnimation.duration - from: CallsStyle.entry.color.normal - to: CallsStyle.entry.endCallAnimation.blinkColor + from: CallsStyle.entry.color.normal.color + to: CallsStyle.entry.endCallAnimation.blinkColor.color } ColorAnimation { duration: CallsStyle.entry.endCallAnimation.duration - from: CallsStyle.entry.endCallAnimation.blinkColor - to: CallsStyle.entry.color.normal + from: CallsStyle.entry.endCallAnimation.blinkColor.color + to: CallsStyle.entry.color.normal.color } } } diff --git a/linphone-app/ui/modules/Linphone/Calls/ConferenceControls.qml b/linphone-app/ui/modules/Linphone/Calls/ConferenceControls.qml index 3159f0428..77b31d3a6 100644 --- a/linphone-app/ui/modules/Linphone/Calls/ConferenceControls.qml +++ b/linphone-app/ui/modules/Linphone/Calls/ConferenceControls.qml @@ -20,7 +20,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: ConferenceControlsStyle.color + color: ConferenceControlsStyle.colorModel.color height: ConferenceControlsStyle.height MouseArea { diff --git a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml index 239032312..4a8cd86c8 100644 --- a/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml +++ b/linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml @@ -31,7 +31,7 @@ Avatar { Component.onDestruction: _sipAddressObserver=null// Need to set it to null because of not calling destructor if not. - backgroundColor: CallStyle.container.avatar.backgroundColor + backgroundColor: CallStyle.container.avatar.backgroundColor.color foregroundColor: mainItem.isPaused ? CallStyle.container.pause.color : 'transparent' image: { @@ -45,7 +45,7 @@ Avatar { username: _username Text { anchors.fill: parent - color: CallStyle.container.pause.text.color + color: CallStyle.container.pause.text.colorModel.color // `|| 1` => `pointSize` must be greater than 0. font.pointSize: (width / CallStyle.container.pause.text.pointSizeFactor) || 1 diff --git a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml index 9d1e00139..b741772cf 100644 --- a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml +++ b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml @@ -22,7 +22,7 @@ Item{ property alias isCameraFromDevice: camera.isCameraFromDevice property bool showCloseButton: false property bool showActiveSpeakerOverlay: true - property color color : camera.isReady ? CameraViewStyle.cameraBackgroundColor : CameraViewStyle.outBackgroundColor + property color color : camera.isReady ? CameraViewStyle.cameraBackgroundColor.color : CameraViewStyle.outBackgroundColor.color property real avatarRatio : 2/3 signal closeRequested() @@ -37,13 +37,13 @@ Item{ anchors.fill: backgroundArea glowRadius: 4 spread: 0.9 - color: CameraViewStyle.border.color + color: CameraViewStyle.border.colorModel.color cornerRadius: backgroundArea.radius + glowRadius visible: mainItem.showActiveSpeakerOverlay && mainItem.currentDevice && mainItem.currentDevice.isSpeaking } Rectangle { id: backgroundArea - color: mainItem.color + color: mainItem.colorModel.color anchors.fill: parent radius: CameraViewStyle.radius Component { @@ -110,7 +110,7 @@ Item{ Rectangle{ id: hideView anchors.fill: parent - color: CameraViewStyle.pauseView.backgroundColor + color: CameraViewStyle.pauseView.backgroundColor.color radius: CameraViewStyle.radius visible: mainItem.isPaused Rectangle{ @@ -118,11 +118,11 @@ Item{ height: CameraViewStyle.pauseView.button.iconSize width: height radius: width/2 - color: CameraViewStyle.pauseView.button.backgroundNormalColor + color: CameraViewStyle.pauseView.button.backgroundNormalColor.colorModel.color Icon{ anchors.centerIn: parent icon: CameraViewStyle.pauseView.button.icon - overwriteColor: CameraViewStyle.pauseView.button.foregroundNormalColor + overwriteColor: CameraViewStyle.pauseView.button.foregroundNormalColor.color iconSize: CameraViewStyle.pauseView.button.iconSize } } @@ -139,7 +139,7 @@ Item{ text: mainItem.currentDevice && mainItem.currentDevice.displayName + (mainItem.isPaused ? ' (en pause)' : '') font.pointSize: CameraViewStyle.contactDescription.pointSize font.weight: CameraViewStyle.contactDescription.weight - color: CameraViewStyle.contactDescription.color + color: CameraViewStyle.contactDescription.colorModel.color } Glow { anchors.fill: username @@ -168,11 +168,11 @@ Item{ height: CameraViewStyle.isMuted.button.iconSize width: height radius: width/2 - color: CameraViewStyle.isMuted.button.backgroundNormalColor + color: CameraViewStyle.isMuted.button.backgroundNormalColor.colorModel.color Icon{ anchors.centerIn: parent icon: CameraViewStyle.isMuted.button.icon - overwriteColor: CameraViewStyle.isMuted.button.foregroundNormalColor + overwriteColor: CameraViewStyle.isMuted.button.foregroundNormalColor.color iconSize: CameraViewStyle.isMuted.button.iconSize } } diff --git a/linphone-app/ui/modules/Linphone/Chat/Chat.qml b/linphone-app/ui/modules/Linphone/Chat/Chat.qml index 1726da736..4501e3330 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Chat.qml @@ -31,7 +31,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: ChatStyle.color + color: ChatStyle.colorModel.color clip: true Timer{// Let some time to have a better cell sizes id: repositionerDelay @@ -135,7 +135,7 @@ Rectangle { Borders { id: container - borderColor: ChatStyle.sectionHeading.border.color + borderColor: ChatStyle.sectionHeading.border.colorModel.color bottomWidth: ChatStyle.sectionHeading.border.width implicitHeight: text.contentHeight + ChatStyle.sectionHeading.padding * 2 + @@ -147,7 +147,7 @@ Rectangle { id: text anchors.fill: parent - color: ChatStyle.sectionHeading.text.color + color: ChatStyle.sectionHeading.text.colorModel.color font { bold: true pointSize: ChatStyle.sectionHeading.text.pointSize @@ -192,7 +192,7 @@ Rectangle { ChatStyle.entry.message.outgoing.areaSize } - color: ChatStyle.color + color: ChatStyle.colorModel.color implicitHeight: layout.height + ChatStyle.entry.bottomMargin clip: false @@ -223,7 +223,7 @@ Rectangle { return null } - color: ChatStyle.entry.event.text.color + color: ChatStyle.entry.event.text.colorModel.color font.pointSize: ChatStyle.entry.event.text.pointSize visible: isMessage && $chatEntry != undefined @@ -246,7 +246,7 @@ Rectangle { Layout.preferredHeight: ChatStyle.entry.lineHeight Layout.preferredWidth: ChatStyle.entry.time.width - color: ChatStyle.entry.event.text.color + color: ChatStyle.entry.event.text.colorModel.color font.pointSize: ChatStyle.entry.time.pointSize text: UtilsCpp.toTimeString($chatEntry.timestamp, 'hh:mm') @@ -327,7 +327,7 @@ Rectangle { id: composersItem property var composers : container.proxyModel.chatRoomModel ? container.proxyModel.chatRoomModel.composers : undefined property int count : composers && composers.length ? composers.length : 0 - color: ChatStyle.composingText.color + color: ChatStyle.composingText.colorModel.color font.pointSize: ChatStyle.composingText.pointSize height: visible ? undefined : 0 leftPadding: ChatStyle.composingText.leftPadding @@ -383,7 +383,7 @@ Rectangle { id: bottomChatBackground Layout.fillWidth: true Layout.preferredHeight: textAreaBorders.height + chatMessagePreview.height+messageBlock.height - color: ChatStyle.sendArea.backgroundBorder.color + color: ChatStyle.sendArea.backgroundBorder.colorModel.color visible: proxyModel.chatRoomModel && !proxyModel.chatRoomModel.isReadOnly && (!proxyModel.chatRoomModel.haveEncryption && SettingsModel.standardChatEnabled || proxyModel.chatRoomModel.haveEncryption && SettingsModel.secureChatEnabled) ColumnLayout{ anchors.fill: parent @@ -415,7 +415,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: textArea.height Layout.leftMargin: ChatStyle.sendArea.backgroundBorder.width - borderColor: ChatStyle.sendArea.border.color + borderColor: ChatStyle.sendArea.border.colorModel.color topWidth: ChatStyle.sendArea.border.width DroppableTextArea { diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatAudioMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatAudioMessage.qml index 79eae26ab..019f16fca 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatAudioMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatAudioMessage.qml @@ -116,9 +116,9 @@ Loader{ value: 0 stopAtEnd: true resetAtEnd: false - backgroundColor: ChatAudioMessageStyle.backgroundColor + backgroundColor: ChatAudioMessageStyle.backgroundColor.color colorSet: ChatAudioMessageStyle.progressionWave - durationTextColor: mainItem.isOutgoing ? ChatStyle.entry.message.outgoing.text.color : ChatStyle.entry.message.incoming.text.color + durationTextColor: mainItem.isOutgoing ? ChatStyle.entry.message.outgoing.text.colorModel.color : ChatStyle.entry.message.incoming.text.colorModel.color function refresh(){ if( vocalPlayer.item){ progressPosition = vocalPlayer.item.getPosition() diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatAudioPreview.qml b/linphone-app/ui/modules/Linphone/Chat/ChatAudioPreview.qml index bc57cf5f8..09fd2b226 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatAudioPreview.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatAudioPreview.qml @@ -30,7 +30,7 @@ Rectangle{ Layout.preferredHeight: visible ? ChatAudioPreviewStyle.height : 0 - color: ChatAudioPreviewStyle.backgroundColor + color: ChatAudioPreviewStyle.backgroundColor.color radius: 0 state: haveRecorder ? 'showed' : 'hidden' clip: false diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml index 85373bb74..78ee5000c 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml @@ -97,7 +97,7 @@ Loader{ anchors.centerIn: parent icon: ChatCalendarMessageStyle.schedule.icon iconSize: ChatCalendarMessageStyle.schedule.iconSize - overwriteColor: ChatCalendarMessageStyle.schedule.color + overwriteColor: ChatCalendarMessageStyle.schedule.colorModel.color } } @@ -108,7 +108,7 @@ Loader{ Layout.minimumWidth: implicitWidth verticalAlignment: Qt.AlignVCenter - color: ChatCalendarMessageStyle.schedule.color + color: ChatCalendarMessageStyle.schedule.colorModel.color elide: Text.ElideRight font.pointSize: ChatCalendarMessageStyle.schedule.pointSize // Reminder: QML use locale time (not system). Use UTC from C++ => convert it into QML => pass QML => convert it into UTC and apply our timezone. @@ -123,7 +123,7 @@ Loader{ Layout.rightMargin: 15 horizontalAlignment: Qt.AlignRight verticalAlignment: Qt.AlignVCenter - color: ChatCalendarMessageStyle.schedule.color + color: ChatCalendarMessageStyle.schedule.colorModel.color elide: Text.ElideRight font.pointSize: ChatCalendarMessageStyle.schedule.pointSize //: 'Organizer' : Label Title for the organizer. @@ -141,7 +141,7 @@ Loader{ visible: mainItem.isCancelled elide: Text.ElideRight - color: ChatCalendarMessageStyle.type.cancelledColor + color: ChatCalendarMessageStyle.type.cancelledColor.color font.pointSize: ChatCalendarMessageStyle.type.pointSize font.weight: Font.Bold //: 'Meeting has been cancelled' : ICS Title for cancelled meetings @@ -156,7 +156,7 @@ Loader{ Layout.leftMargin: 10 elide: Text.ElideRight - color: ChatCalendarMessageStyle.subject.color + color: ChatCalendarMessageStyle.subject.colorModel.color font.pointSize: ChatCalendarMessageStyle.subject.pointSize font.weight: Font.Bold text: mainItem.conferenceInfoModel.subject @@ -187,7 +187,7 @@ Loader{ anchors.horizontalCenter: parent.horizontalCenter icon: ChatCalendarMessageStyle.participants.icon iconSize: ChatCalendarMessageStyle.participants.iconSize - overwriteColor: ChatCalendarMessageStyle.participants.color + overwriteColor: ChatCalendarMessageStyle.participants.colorModel.color } } @@ -198,7 +198,7 @@ Loader{ Layout.topMargin: 4 Layout.alignment: Qt.AlignTop visible: !mainItem.isExpanded - color: ChatCalendarMessageStyle.participants.color + color: ChatCalendarMessageStyle.participants.colorModel.color elide: Text.ElideRight font.pointSize: ChatCalendarMessageStyle.participants.pointSize text: mainItem.conferenceInfoModel.displayNamesToString @@ -226,7 +226,7 @@ Loader{ id: displayName height: participantsRow.participantLineHeight text: modelData.displayName - color: ChatCalendarMessageStyle.participants.color + color: ChatCalendarMessageStyle.participants.colorModel.color font.pointSize: ChatCalendarMessageStyle.participants.pointSize elide: Text.ElideRight } @@ -234,7 +234,7 @@ Loader{ height: participantsRow.participantLineHeight width: expandedParticipantsList.contentWidth - displayName.width - parent.spacing // parent.width is not enough. Force width text: '('+modelData.address+')' - color: ChatCalendarMessageStyle.participants.color + color: ChatCalendarMessageStyle.participants.colorModel.color font.pointSize: ChatCalendarMessageStyle.participants.pointSize elide: Text.ElideRight } @@ -275,7 +275,7 @@ Loader{ Layout.fillWidth: true Layout.leftMargin: 10 Layout.topMargin: 5 - color: ChatCalendarMessageStyle.subject.color + color: ChatCalendarMessageStyle.subject.colorModel.color font.pointSize: ChatCalendarMessageStyle.subject.pointSize font.weight: Font.Bold //: 'Description' : Title for the meeting description. @@ -292,7 +292,7 @@ Loader{ padding: 0 color: 'transparent' readOnly: true - textColor: ChatCalendarMessageStyle.description.color + textColor: ChatCalendarMessageStyle.description.colorModel.color font.pointSize: ChatCalendarMessageStyle.description.pointSize border.width: 0 visible: description.text != '' @@ -303,7 +303,7 @@ Loader{ Layout.fillWidth: true Layout.leftMargin: 10 Layout.topMargin: 5 - color: ChatCalendarMessageStyle.subject.color + color: ChatCalendarMessageStyle.subject.colorModel.color font.pointSize: ChatCalendarMessageStyle.subject.pointSize font.weight: Font.Bold visible: !mainItem.isCancelled diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml index f280f43a8..85d69a90b 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatConferenceInvitationMessage.qml @@ -79,10 +79,10 @@ Loader{ Layout.alignment: Qt.AlignRight elide: Text.ElideRight color: mainItem.conferenceInfoModel.state == LinphoneEnums.ConferenceInfoStateUpdated - ? ChatCalendarMessageStyle.type.updatedColor + ? ChatCalendarMessageStyle.type.updatedColor.color : mainItem.conferenceInfoModel.state == LinphoneEnums.ConferenceInfoStateCancelled - ? ChatCalendarMessageStyle.type.cancelledColor - : ChatCalendarMessageStyle.type.color + ? ChatCalendarMessageStyle.type.cancelledColor.color + : ChatCalendarMessageStyle.type.colorModel.color font.pointSize: ChatCalendarMessageStyle.type.pointSize font.weight: Font.Bold @@ -102,7 +102,7 @@ Loader{ Layout.leftMargin: 5 Layout.alignment: Qt.AlignRight elide: Text.ElideRight - color: ChatCalendarMessageStyle.subject.color + color: ChatCalendarMessageStyle.subject.colorModel.color font.pointSize: ChatCalendarMessageStyle.subject.pointSize font.weight: Font.Bold text: mainItem.conferenceInfoModel.subject @@ -121,13 +121,13 @@ Loader{ Icon{ icon: ChatCalendarMessageStyle.participants.icon iconSize: ChatCalendarMessageStyle.participants.iconSize - overwriteColor: ChatCalendarMessageStyle.participants.color + overwriteColor: ChatCalendarMessageStyle.participants.colorModel.color } Text { id: participantsList Layout.fillWidth: true - color: ChatCalendarMessageStyle.participants.color + color: ChatCalendarMessageStyle.participants.colorModel.color elide: Text.ElideRight font.pointSize: ChatCalendarMessageStyle.participants.pointSize //: '%1 participant' : number(=%1) of participant. @@ -148,7 +148,7 @@ Loader{ Icon{ icon: ChatCalendarMessageStyle.calendar.icon iconSize: ChatCalendarMessageStyle.calendar.iconSize-2 - overwriteColor: ChatCalendarMessageStyle.calendar.color + overwriteColor: ChatCalendarMessageStyle.calendar.colorModel.color } Text { @@ -156,7 +156,7 @@ Loader{ Layout.fillWidth: true Layout.minimumWidth: implicitWidth verticalAlignment: Qt.AlignVCenter - color: ChatCalendarMessageStyle.schedule.color + color: ChatCalendarMessageStyle.schedule.colorModel.color elide: Text.ElideRight font.pointSize: Units.dp * 8 text: UtilsCpp.toDateString(Utils.fromUTC(mainItem.conferenceInfoModel.dateTimeUtc), 'yyyy/MM/dd') @@ -172,7 +172,7 @@ Loader{ Icon{ icon: ChatCalendarMessageStyle.schedule.icon iconSize: ChatCalendarMessageStyle.schedule.iconSize-2 - overwriteColor: ChatCalendarMessageStyle.schedule.color + overwriteColor: ChatCalendarMessageStyle.schedule.colorModel.color } Text { @@ -180,7 +180,7 @@ Loader{ Layout.fillWidth: true Layout.minimumWidth: implicitWidth verticalAlignment: Qt.AlignVCenter - color: ChatCalendarMessageStyle.schedule.color + color: ChatCalendarMessageStyle.schedule.colorModel.color elide: Text.ElideRight font.pointSize: Units.dp * 8 // Reminder: QML use locale time (not system). Use UTC from C++ => convert it into QML => pass QML => convert it into UTC and apply our timezone. @@ -215,13 +215,13 @@ Loader{ width: expandedParticipantsList.width height: ChatCalendarMessageStyle.lineHeight Text{text: modelData.displayName - color: ChatCalendarMessageStyle.description.color + color: ChatCalendarMessageStyle.description.colorModel.color font.pointSize: ChatCalendarMessageStyle.description.pointSize elide: Text.ElideRight wrapMode: TextEdit.WordWrap } Text{text: '('+modelData.address+')' - color: ChatCalendarMessageStyle.description.color + color: ChatCalendarMessageStyle.description.colorModel.color font.pointSize: ChatCalendarMessageStyle.description.pointSize elide: Text.ElideRight wrapMode: TextEdit.WordWrap @@ -234,7 +234,7 @@ Loader{ Layout.fillWidth: true Layout.leftMargin: 5 Layout.topMargin: 5 - color: ChatCalendarMessageStyle.subject.color + color: ChatCalendarMessageStyle.subject.colorModel.color font.pointSize: ChatCalendarMessageStyle.subject.pointSize font.weight: Font.Bold //: 'Description' : Title for the meeting description. @@ -249,7 +249,7 @@ Loader{ padding: 0 color: 'transparent' readOnly: true - textColor: ChatCalendarMessageStyle.description.color + textColor: ChatCalendarMessageStyle.description.colorModel.color font.pointSize: ChatCalendarMessageStyle.description.pointSize border.width: 0 visible: description.text != '' diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml b/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml index 0d5445730..342adcc03 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatContent.qml @@ -67,7 +67,7 @@ Column{ id: message contentModel: mainItem.contentModel onLastTextSelectedChanged: mainItem.lastTextSelected = lastTextSelected - color: isOutgoing ? ChatStyle.entry.message.outgoing.text.color : ChatStyle.entry.message.incoming.text.color + color: isOutgoing ? ChatStyle.entry.message.outgoing.text.colorModel.color : ChatStyle.entry.message.incoming.text.colorModel.color onRightClicked: mainItem.rightClicked() } } diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatDeliveries.qml b/linphone-app/ui/modules/Linphone/Chat/ChatDeliveries.qml index c37e82192..2ea551d5f 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatDeliveries.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatDeliveries.qml @@ -62,7 +62,7 @@ Loader{ height: ChatStyle.composingText.height-5 width: GridView.width text: deliveryLayout.getText($modelData.state, $modelData.displayName, UtilsCpp.toDateTimeString($modelData.stateChangeTime)) - color: ChatStyle.entry.event.text.color + color: ChatStyle.entry.event.text.colorModel.color font.pointSize: Units.dp * 8 elide: Text.ElideMiddle } diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml index cca019aae..f2a22daed 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatFileMessage.qml @@ -123,7 +123,7 @@ Row { height: fitHeight width: fitWidth - color: ChatStyle.entry.message.file.extension.background.color + color: ChatStyle.entry.message.file.extension.background.colorModel.color radius: ChatStyle.entry.message.file.extension.radius ColumnLayout{ anchors.fill: parent @@ -143,7 +143,7 @@ Row { anchors.horizontalCenter: parent.horizontalCenter anchors.bottomMargin: ChatStyle.entry.message.file.spacing width: parent.width - 2*ChatStyle.entry.message.file.spacing - color: ChatStyle.entry.message.file.extension.text.color + color: ChatStyle.entry.message.file.extension.text.colorModel.color font.bold: true font.pointSize: ChatStyle.entry.message.file.extension.text.pointSize clip: true @@ -175,7 +175,7 @@ Row { Layout.fillHeight: true visible: mainRow.contentModel && !mainRow.isAnimatedImage && !mainRow.haveThumbnail - color: ChatStyle.entry.message.file.extension.text.color + color: ChatStyle.entry.message.file.extension.text.colorModel.color elide: Text.ElideRight font.pointSize: ChatStyle.entry.message.file.name.pointSize wrapMode: Text.WrapAnywhere @@ -195,7 +195,7 @@ Row { : '' font.underline: true font.pointSize: ChatStyle.entry.message.file.download.pointSize - color:ChatStyle.entry.message.file.extension.text.color + color:ChatStyle.entry.message.file.extension.text.colorModel.color visible: (mainRow.contentModel? (!mainItem.isOutgoing && !mainRow.contentModel.wasDownloaded) || rectangle.isTransferring : false) horizontalAlignment: Qt.AlignCenter verticalAlignment: Qt.AlignCenter diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatForwardMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatForwardMessage.qml index 5e68a4469..c7136b9e6 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatForwardMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatForwardMessage.qml @@ -44,7 +44,7 @@ Item { icon: ChatForwardMessageStyle.header.forwardIcon.icon iconSize: ChatForwardMessageStyle.header.forwardIcon.iconSize height: iconSize - overwriteColor: ChatForwardMessageStyle.header.color + overwriteColor: ChatForwardMessageStyle.header.colorModel.color } Text{ id: headerText @@ -56,7 +56,7 @@ Item { text: qsTr('Forwarded')// + (forwardInfo ? ' : ' +forwardInfo : '') font.family: mainItem.customFont.family font.pointSize: Units.dp * (mainItem.customFont.pointSize + ChatForwardMessageStyle.header.pointSizeOffset) - color: ChatForwardMessageStyle.header.color + color: ChatForwardMessageStyle.header.colorModel.color } } } diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatReplyMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatReplyMessage.qml index 6550b4787..a477aaa82 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatReplyMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatReplyMessage.qml @@ -51,7 +51,7 @@ Item { icon: ChatReplyMessageStyle.header.replyIcon.icon iconSize: ChatReplyMessageStyle.header.replyIcon.iconSize height: iconSize - overwriteColor: ChatReplyMessageStyle.header.color + overwriteColor: ChatReplyMessageStyle.header.colorModel.color MouseArea{ anchors.fill: parent onClicked: mainItem.goToMessage(mainItem.chatMessageModel) @@ -66,7 +66,7 @@ Item { + (chatMessageModel || !mainChatMessageModel? '' : ' - ' + mainChatMessageModel.fromDisplayNameReplyMessage) font.family: mainItem.customFont.family font.pointSize: Units.dp * (mainItem.customFont.pointSize + ChatReplyMessageStyle.header.pointSizeOffset) - color: ChatReplyMessageStyle.header.color + color: ChatReplyMessageStyle.header.colorModel.color MouseArea{ anchors.fill: parent onClicked: mainItem.goToMessage(mainItem.chatMessageModel) @@ -85,11 +85,11 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom width: 7 - color: chatMessageModel && chatMessageModel.isOutgoing ? ChatReplyMessageStyle.replyArea.outgoingMarkColor : ChatReplyMessageStyle.replyArea.incomingMarkColor + color: chatMessageModel && chatMessageModel.isOutgoing ? ChatReplyMessageStyle.replyArea.outgoingMarkColor.color : ChatReplyMessageStyle.replyArea.incomingMarkColor.color } radius: 5 - color: ChatReplyMessageStyle.replyArea.backgroundColor + color: ChatReplyMessageStyle.replyArea.backgroundColor.color visible: chatMessageModel != undefined Text{ id: usernameReplied @@ -106,7 +106,7 @@ Item { font.pointSize: Units.dp * (mainItem.customFont.pointSize + ChatReplyMessageStyle.replyArea.usernamePointSizeOffset) font.weight: Font.Bold - color: ChatReplyMessageStyle.replyArea.foregroundColor + color: ChatReplyMessageStyle.replyArea.foregroundColor.color } ScrollableListView { id: replyMessage @@ -138,14 +138,14 @@ Item { delegate: ChatContent{ contentModel: $modelData - textColor: ChatReplyMessageStyle.replyArea.foregroundColor + textColor: ChatReplyMessageStyle.replyArea.foregroundColor.color onFitWidthChanged:{ replyMessage.updateWidth() } Rectangle{ anchors.left: parent.left anchors.right: parent.right - color: ChatStyle.entry.separator.color + color: ChatStyle.entry.separator.colorModel.color height: visible ? ChatStyle.entry.separator.width : 0 visible: (index !== (replyMessage.count - 1)) } diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml b/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml index 7a096d0de..2999d1327 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatReplyPreview.qml @@ -22,7 +22,7 @@ Rectangle{ property int leftMargin: 10 property int rightMargin: 10 - color: ChatStyle.replyPreview.backgroundColor + color: ChatStyle.replyPreview.backgroundColor.color radius: 10 state: chatRoomModel && chatRoomModel.reply ? 'showed' : 'hidden' // Remove bottom corners @@ -54,7 +54,7 @@ Rectangle{ spacing: 5 Icon{ icon: ChatStyle.replyPreview.icon - overwriteColor: ChatStyle.replyPreview.iconColor + overwriteColor: ChatStyle.replyPreview.iconColor.color iconSize: 20 } Text{ @@ -65,7 +65,7 @@ Rectangle{ text: replyPreviewBlock.chatRoomModel && replyPreviewBlock.chatRoomModel.reply ? qsTr('titleReply').arg(replyPreviewBlock.chatRoomModel.reply.fromDisplayName) : '' font.pointSize: ChatStyle.replyPreview.headerPointSize font.weight: Font.Bold - color: ChatStyle.replyPreview.headerTextColor + color: ChatStyle.replyPreview.headerTextColor.color } } @@ -93,7 +93,7 @@ Rectangle{ Rectangle{ anchors.left: parent.left anchors.right: parent.right - color: ChatStyle.entry.separator.color + color: ChatStyle.entry.separator.colorModel.color height: visible ? ChatStyle.entry.separator.width : 0 visible: (index !== (messageContentsList.count - 1)) } diff --git a/linphone-app/ui/modules/Linphone/Chat/Event.qml b/linphone-app/ui/modules/Linphone/Chat/Event.qml index 30f1313b8..b56de58a6 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Event.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Event.qml @@ -92,7 +92,7 @@ Row { Icon { height: parent.height icon: mainItem.iconData ? mainItem.iconData.icon : null - overwriteColor: mainItem.iconData ? mainItem.iconData.color: null + overwriteColor: mainItem.iconData ? mainItem.iconData.colorModel.color: null iconSize: ChatStyle.entry.event.iconSize width: ChatStyle.entry.metaWidth } @@ -115,7 +115,7 @@ Row { } } - color: ChatStyle.entry.event.text.color + color: ChatStyle.entry.event.text.colorModel.color font { bold: true pointSize: ChatStyle.entry.event.text.pointSize diff --git a/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml index f5dc028bc..12da118b7 100644 --- a/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/IncomingMessage.qml @@ -77,6 +77,6 @@ RowLayout { // Arbitrary value. Layout.minimumWidth: 1 - backgroundColor: ChatStyle.entry.message.incoming.backgroundColor + backgroundColorModel: ChatStyle.entry.message.incoming.backgroundColor } } diff --git a/linphone-app/ui/modules/Linphone/Chat/Message.qml b/linphone-app/ui/modules/Linphone/Chat/Message.qml index 86ed51f9b..4efb2daf7 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Message.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Message.qml @@ -24,7 +24,7 @@ Item { // --------------------------------------------------------------------------- - property alias backgroundColor: rectangle.color + property alias backgroundColorModel: rectangle.colorModel default property alias _content: content.data @@ -46,6 +46,7 @@ Item { property int maxWidth: parent.width property int dataWidth: maxWidth property bool ephemeral : $chatEntry.isEphemeral + property var colorModel:{'color': 'transparent'} function updateWidth(){ var maxWidth = Math.max(forwardMessage.fitWidth, replyMessage.fitWidth) for(var child in messageContentsList.contentItem.children) { @@ -58,6 +59,7 @@ Item { height: parent.height - (deliveryLayout.visible? deliveryLayout.height : 0) radius: ChatStyle.entry.message.radius clip: false + color: colorModel.color width: ( ephemeralTimerRow.visible && dataWidth < ephemeralTimerRow.width + 2*ChatStyle.entry.message.padding ? ephemeralTimerRow.width + 2*ChatStyle.entry.message.padding @@ -119,7 +121,7 @@ Item { Rectangle{ anchors.left: parent.left anchors.right: parent.right - color: ChatStyle.entry.separator.color + color: ChatStyle.entry.separator.colorModel.color height: visible ? ChatStyle.entry.separator.width : 0 visible: (index !== (messageContentsList.count - 1)) } @@ -137,7 +139,7 @@ Item { anchors.bottom: parent.bottom anchors.bottomMargin: 5 text: $chatEntry.ephemeralExpireTime > 0 ? Utils.formatElapsedTime($chatEntry.ephemeralExpireTime) : Utils.formatElapsedTime($chatEntry.ephemeralLifetime) - color: ChatStyle.ephemeralTimer.timerColor + color: ChatStyle.ephemeralTimer.timerColor.color font.pointSize: Units.dp * 8 Timer{ running:parent.visible @@ -149,7 +151,7 @@ Item { Icon{ anchors.verticalCenter: ephemeralText.verticalCenter icon: ChatStyle.ephemeralTimer.icon - overwriteColor: ChatStyle.ephemeralTimer.timerColor + overwriteColor: ChatStyle.ephemeralTimer.timerColor.color iconSize: ChatStyle.ephemeralTimer.iconSize } } diff --git a/linphone-app/ui/modules/Linphone/Chat/Notice.qml b/linphone-app/ui/modules/Linphone/Chat/Notice.qml index bbe8d7699..2a0e845f3 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Notice.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Notice.qml @@ -92,9 +92,9 @@ RowLayout{ } property bool isImportant: $chatEntry.eventLogType == LinphoneEnums.EventLogTypeConferenceTerminated property bool isError: $chatEntry.status == ChatNoticeModel.NoticeError - property color eventColor : (isError ? ChatStyle.entry.event.notice.errorColor - : ( isImportant ? ChatStyle.entry.event.notice.importantColor - : ChatStyle.entry.event.notice.color )) + property color eventColor : (isError ? ChatStyle.entry.event.notice.errorColor.color + : ( isImportant ? ChatStyle.entry.event.notice.importantColor.color + : ChatStyle.entry.event.notice.colorModel.color )) Layout.preferredHeight: ChatStyle.entry.lineHeight spacing: ChatStyle.entry.message.extraContent.spacing diff --git a/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml index da6659b02..a727d707c 100644 --- a/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/OutgoingMessage.qml @@ -37,7 +37,7 @@ Item { leftMargin: ChatStyle.entry.metaWidth right: parent.right } - backgroundColor: ChatStyle.entry.message.outgoing.backgroundColor + backgroundColorModel: ChatStyle.entry.message.outgoing.backgroundColor width: parent.width Row { diff --git a/linphone-app/ui/modules/Linphone/Codecs/CodecAttribute.qml b/linphone-app/ui/modules/Linphone/Codecs/CodecAttribute.qml index 7a633dc7e..c21983419 100644 --- a/linphone-app/ui/modules/Linphone/Codecs/CodecAttribute.qml +++ b/linphone-app/ui/modules/Linphone/Codecs/CodecAttribute.qml @@ -5,7 +5,7 @@ import Linphone.Styles 1.0 // ============================================================================= Text { - color: CodecsViewerStyle.attribute.text.color + color: CodecsViewerStyle.attribute.text.colorModel.color elide: Text.ElideRight font.pointSize: CodecsViewerStyle.attribute.text.pointSize } diff --git a/linphone-app/ui/modules/Linphone/Codecs/CodecLegend.qml b/linphone-app/ui/modules/Linphone/Codecs/CodecLegend.qml index 7208c42c3..37614c5da 100644 --- a/linphone-app/ui/modules/Linphone/Codecs/CodecLegend.qml +++ b/linphone-app/ui/modules/Linphone/Codecs/CodecLegend.qml @@ -5,7 +5,7 @@ import Linphone.Styles 1.0 // ============================================================================= Text { - color: CodecsViewerStyle.legend.color + color: CodecsViewerStyle.legend.colorModel.color elide: Text.ElideRight font { diff --git a/linphone-app/ui/modules/Linphone/Codecs/CodecsViewer.qml b/linphone-app/ui/modules/Linphone/Codecs/CodecsViewer.qml index 5927aad2b..8754bca69 100644 --- a/linphone-app/ui/modules/Linphone/Codecs/CodecsViewer.qml +++ b/linphone-app/ui/modules/Linphone/Codecs/CodecsViewer.qml @@ -127,7 +127,7 @@ Column { right: parent.right } - color: CodecsViewerStyle.attribute.background.color.normal + color: CodecsViewerStyle.attribute.background.color.normal.color height: dragArea.height @@ -202,7 +202,7 @@ Column { PropertyChanges { target: content - color: CodecsViewerStyle.attribute.background.color.hovered + color: CodecsViewerStyle.attribute.background.color.hovered.color } }, @@ -212,7 +212,7 @@ Column { PropertyChanges { target: content - color: CodecsViewerStyle.attribute.background.color.hovered + color: CodecsViewerStyle.attribute.background.color.hovered.color } PropertyChanges { diff --git a/linphone-app/ui/modules/Linphone/Contact/Avatar.qml b/linphone-app/ui/modules/Linphone/Contact/Avatar.qml index a1a06c7a8..822f00e55 100644 --- a/linphone-app/ui/modules/Linphone/Contact/Avatar.qml +++ b/linphone-app/ui/modules/Linphone/Contact/Avatar.qml @@ -16,7 +16,7 @@ Item { property alias presenceLevel: presenceLevelIcon.level property bool isDarkMode: false - property color backgroundColor: isDarkMode ? AvatarStyle.backgroundDarkModeColor : AvatarStyle.backgroundColor + property color backgroundColor: isDarkMode ? AvatarStyle.backgroundDarkModeColor.color : AvatarStyle.backgroundColor.color property color foregroundColor: 'transparent' property string username property var image @@ -58,14 +58,14 @@ Item { anchors.fill: parent icon: AvatarStyle.personImage visible: parent.source == '' && avatar.isPhoneNumber - overwriteColor: AvatarStyle.initials.color + overwriteColor: AvatarStyle.initials.colorModel.color } } Text { id: initialsText anchors.centerIn: parent - color: isDarkMode ? AvatarStyle.initials.darkModeColor : AvatarStyle.initials.color + color: isDarkMode ? AvatarStyle.initials.darkModeColor.color : AvatarStyle.initials.colorModel.color font.pointSize: { var width @@ -83,7 +83,7 @@ Item { Icon { anchors.fill: parent icon: ContactStyle.groupChat.icon - overwriteColor: isDarkMode ? ContactStyle.groupChat.avatarDarkModeColor : ContactStyle.groupChat.avatarColor + overwriteColor: isDarkMode ? ContactStyle.groupChat.avatarDarkModeColor.color : ContactStyle.groupChat.avatarColor.color iconSize: avatar.width //visible: entry!=undefined && entry.isOneToOne!=undefined && !entry.isOneToOne visible: !avatar.isOneToOne diff --git a/linphone-app/ui/modules/Linphone/Contact/ContactDescription.qml b/linphone-app/ui/modules/Linphone/Contact/ContactDescription.qml index 1b5c71930..89e7cfcd3 100644 --- a/linphone-app/ui/modules/Linphone/Contact/ContactDescription.qml +++ b/linphone-app/ui/modules/Linphone/Contact/ContactDescription.qml @@ -16,8 +16,8 @@ Column { property var contactDescriptionStyle : ContactDescriptionStyle - property color subtitleColor: contactDescriptionStyle.subtitle.color - property color titleColor: contactDescriptionStyle.title.color + property color subtitleColor: contactDescriptionStyle.subtitle.colorModel.color + property color titleColor: contactDescriptionStyle.title.colorModel.color property int horizontalTextAlignment property int contentWidth : Math.max(titleImplicitWidthWorkaround.implicitWidth, subtitleImplicitWidthWorkaround.implicitWidth) +10 @@ -73,7 +73,7 @@ Column { verticalAlignment: Text.AlignVCenter visible: text != '' text : '' - color: contactDescriptionStyle.title.status.color + color: contactDescriptionStyle.title.status.colorModel.color font.pointSize: contactDescriptionStyle.title.status.pointSize font.italic : true } diff --git a/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml index 61d6a76dc..6eeb6d288 100644 --- a/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml +++ b/linphone-app/ui/modules/Linphone/Dialog/MultimediaParametersDialog.qml @@ -64,7 +64,7 @@ DialogPlus { Layout.preferredHeight: ComboBoxStyle.background.height icon: MultimediaParametersDialogStyle.column.entry.speaker.icon - overwriteColor: MultimediaParametersDialogStyle.column.entry.speaker.color + overwriteColor: MultimediaParametersDialogStyle.column.entry.speaker.colorModel.color iconSize: MultimediaParametersDialogStyle.column.entry.speaker.iconSize } @@ -117,7 +117,7 @@ DialogPlus { Layout.preferredHeight: ComboBoxStyle.background.height icon: MultimediaParametersDialogStyle.column.entry.micro.icon - overwriteColor: MultimediaParametersDialogStyle.column.entry.micro.color + overwriteColor: MultimediaParametersDialogStyle.column.entry.micro.colorModel.color iconSize: MultimediaParametersDialogStyle.column.entry.micro.iconSize } @@ -171,12 +171,12 @@ DialogPlus { width: audioTestSlider.availableWidth height: implicitHeight radius: 2 - color: SettingsAudioStyle.sliderBackgroundColor + color: SettingsAudioStyle.sliderBackgroundColor.color Rectangle { width: audioTestSlider.visualPosition * parent.width height: parent.height - color: audioTestSlider.value > 0.8 ? SettingsAudioStyle.sliderHighColor : SettingsAudioStyle.sliderLowColor + color: audioTestSlider.value > 0.8 ? SettingsAudioStyle.sliderHighColor.color : SettingsAudioStyle.sliderLowColor.color radius: 2 } } @@ -201,7 +201,7 @@ DialogPlus { Icon { icon: MultimediaParametersDialogStyle.column.entry.camera.icon - overwriteColor: MultimediaParametersDialogStyle.column.entry.camera.color + overwriteColor: MultimediaParametersDialogStyle.column.entry.camera.colorModel.color iconSize: MultimediaParametersDialogStyle.column.entry.speaker.iconSize } diff --git a/linphone-app/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml index de8315886..f0753843e 100644 --- a/linphone-app/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml +++ b/linphone-app/ui/modules/Linphone/Dialog/OnlineInstallerDialog.qml @@ -93,15 +93,15 @@ DialogPlus { indeterminate : target.totalBytes == 0 background: Rectangle { - color: OnlineInstallerDialogStyle.column.bar.background.color + color: OnlineInstallerDialogStyle.column.bar.background.colorModel.color radius: OnlineInstallerDialogStyle.column.bar.radius } contentItem: Item { Rectangle { color: dialog._exitStatus - ? OnlineInstallerDialogStyle.column.bar.contentItem.color.normal - : OnlineInstallerDialogStyle.column.bar.contentItem.color.failed + ? OnlineInstallerDialogStyle.column.bar.contentItem.color.normal.color + : OnlineInstallerDialogStyle.column.bar.contentItem.color.failed.color height: parent.height radius: OnlineInstallerDialogStyle.column.bar.radius width: progressBar.visualPosition * parent.width @@ -111,7 +111,7 @@ DialogPlus { Text { anchors.right: parent.right - color: OnlineInstallerDialogStyle.column.text.color + color: OnlineInstallerDialogStyle.column.text.colorModel.color font.pointSize: OnlineInstallerDialogStyle.column.text.pointSize text: { diff --git a/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml index a2a5d47f2..dc48b00f5 100644 --- a/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml +++ b/linphone-app/ui/modules/Linphone/Dialog/SipAddressDialog.qml @@ -74,7 +74,7 @@ DialogPlus { id: description Layout.fillWidth: true - color: SipAddressDialogStyle.list.color + color: SipAddressDialogStyle.list.colorModel.color font.pointSize: SipAddressDialogStyle.list.pointSize horizontalAlignment: Qt.AlignLeft verticalAlignment: Text.AlignVCenter diff --git a/linphone-app/ui/modules/Linphone/Dialog/ZrtpTokenAuthenticationDialog.qml b/linphone-app/ui/modules/Linphone/Dialog/ZrtpTokenAuthenticationDialog.qml index a0055accc..4d6a65552 100644 --- a/linphone-app/ui/modules/Linphone/Dialog/ZrtpTokenAuthenticationDialog.qml +++ b/linphone-app/ui/modules/Linphone/Dialog/ZrtpTokenAuthenticationDialog.qml @@ -75,7 +75,7 @@ DialogPlus { //: 'Communication security' : Title of popup for ZRTP confirmation. text: qsTr('title') - color: ZrtpTokenAuthenticationDialogStyle.text.colorA + color: ZrtpTokenAuthenticationDialogStyle.text.colorA.color wrapMode: Text.WordWrap font { @@ -91,7 +91,7 @@ DialogPlus { //: 'To raise the security level, you can check the following codes with your correspondent.' : Explanation to do a security check. text: qsTr('confirmSas') - color: ZrtpTokenAuthenticationDialogStyle.text.colorA + color: ZrtpTokenAuthenticationDialogStyle.text.colorA.color wrapMode: Text.WordWrap font.pointSize: ZrtpTokenAuthenticationDialogStyle.text.pointSize @@ -113,7 +113,7 @@ DialogPlus { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: ZrtpTokenAuthenticationDialogStyle.text.colorA + color: ZrtpTokenAuthenticationDialogStyle.text.colorA.color font.pointSize: ZrtpTokenAuthenticationDialogStyle.text.pointSize text: qsTr('codeA') } @@ -124,7 +124,7 @@ DialogPlus { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: ZrtpTokenAuthenticationDialogStyle.text.colorB + color: ZrtpTokenAuthenticationDialogStyle.text.colorB.color font { bold: true @@ -139,7 +139,7 @@ DialogPlus { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: ZrtpTokenAuthenticationDialogStyle.text.colorA + color: ZrtpTokenAuthenticationDialogStyle.text.colorA.color font.pointSize: ZrtpTokenAuthenticationDialogStyle.text.pointSize text: qsTr('codeB') } @@ -150,7 +150,7 @@ DialogPlus { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: ZrtpTokenAuthenticationDialogStyle.text.colorB + color: ZrtpTokenAuthenticationDialogStyle.text.colorB.color font { bold: true diff --git a/linphone-app/ui/modules/Linphone/File/FileView.qml b/linphone-app/ui/modules/Linphone/File/FileView.qml index 7637ef0f1..8e45c0bc7 100644 --- a/linphone-app/ui/modules/Linphone/File/FileView.qml +++ b/linphone-app/ui/modules/Linphone/File/FileView.qml @@ -41,12 +41,12 @@ Item { id: extension Rectangle { - color: ChatStyle.entry.message.file.extension.background.color + color: ChatStyle.entry.message.file.extension.background.colorModel.color Text { anchors.fill: parent - color: ChatStyle.entry.message.file.extension.text.color + color: ChatStyle.entry.message.file.extension.text.colorModel.color font.bold: true elide: Text.ElideRight text: Utils.getExtension(mainItem.name).toUpperCase() diff --git a/linphone-app/ui/modules/Linphone/History/Event.qml b/linphone-app/ui/modules/Linphone/History/Event.qml index 4f1d4418f..5e301380d 100644 --- a/linphone-app/ui/modules/Linphone/History/Event.qml +++ b/linphone-app/ui/modules/Linphone/History/Event.qml @@ -97,7 +97,7 @@ Row { Icon { height: parent.height icon: mainItem.iconData ? mainItem.iconData.icon : null - overwriteColor: mainItem.iconData ? mainItem.iconData.color: null + overwriteColor: mainItem.iconData ? mainItem.iconData.colorModel.color: null iconSize: HistoryStyle.entry.event.iconSize width: HistoryStyle.entry.metaWidth } @@ -119,7 +119,7 @@ Row { } } - color: HistoryStyle.entry.event.text.color + color: HistoryStyle.entry.event.text.colorModel.color font { bold: true pointSize: HistoryStyle.entry.event.text.pointSize @@ -133,7 +133,7 @@ Row { } } Text { - color: HistoryStyle.entry.event.text.color + color: HistoryStyle.entry.event.text.colorModel.color font { bold: true pointSize: HistoryStyle.entry.event.text.pointSize diff --git a/linphone-app/ui/modules/Linphone/History/History.qml b/linphone-app/ui/modules/Linphone/History/History.qml index 46c4a8663..8b3e8110d 100644 --- a/linphone-app/ui/modules/Linphone/History/History.qml +++ b/linphone-app/ui/modules/Linphone/History/History.qml @@ -20,7 +20,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: HistoryStyle.color + color: HistoryStyle.colorModel.color ColumnLayout { anchors.fill: parent @@ -81,7 +81,7 @@ Rectangle { Borders { id: container - borderColor: HistoryStyle.sectionHeading.border.color + borderColor: HistoryStyle.sectionHeading.border.colorModel.color bottomWidth: HistoryStyle.sectionHeading.border.width implicitHeight: text.contentHeight + HistoryStyle.sectionHeading.padding * 2 + @@ -93,7 +93,7 @@ Rectangle { id: text anchors.fill: parent - color: HistoryStyle.sectionHeading.text.color + color: HistoryStyle.sectionHeading.text.colorModel.color font { bold: true pointSize: HistoryStyle.sectionHeading.text.pointSize @@ -134,7 +134,7 @@ Rectangle { HistoryStyle.entry.message.extraContent.leftMargin } - color: HistoryStyle.color + color: HistoryStyle.colorModel.color implicitHeight: layout.height + HistoryStyle.entry.bottomMargin // --------------------------------------------------------------------- @@ -159,7 +159,7 @@ Rectangle { Layout.preferredHeight: HistoryStyle.entry.lineHeight Layout.preferredWidth: HistoryStyle.entry.time.width - color: HistoryStyle.entry.time.color + color: HistoryStyle.entry.time.colorModel.color font.pointSize: HistoryStyle.entry.time.pointSize text: UtilsCpp.toTimeString($historyEntry.timestamp, 'hh:mm') diff --git a/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml b/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml index 3a1bf0529..62eaec882 100644 --- a/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml +++ b/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml @@ -65,7 +65,7 @@ Rectangle{ Borders{ Layout.fillWidth: true Layout.preferredHeight: Math.max(IncallMenuStyle.header.height, titleMenu.implicitHeight+20) - bottomColor: IncallMenuStyle.list.border.color + bottomColor: IncallMenuStyle.list.border.colorModel.color bottomWidth: IncallMenuStyle.list.border.width RowLayout{ anchors.fill: parent @@ -82,7 +82,7 @@ Rectangle{ Layout.fillWidth: true Layout.preferredHeight: implicitHeight horizontalAlignment: Qt.AlignCenter - color: IncallMenuStyle.header.color + color: IncallMenuStyle.header.colorModel.color font.pointSize: IncallMenuStyle.header.pointSize font.weight: IncallMenuStyle.header.weight wrapMode: Text.WordWrap @@ -138,7 +138,7 @@ Rectangle{ ] delegate: Borders{ - bottomColor: IncallMenuStyle.list.border.color + bottomColor: IncallMenuStyle.list.border.colorModel.color bottomWidth: IncallMenuStyle.list.border.width Layout.preferredHeight: Math.max(settingIcon.height, settingsDescription.implicitHeight) + 20 Layout.fillWidth: true @@ -151,7 +151,7 @@ Rectangle{ Layout.leftMargin: 15 Layout.alignment: Qt.AlignVCenter icon: modelData.icon - overwriteColor: IncallMenuStyle.list.color + overwriteColor: IncallMenuStyle.list.colorModel.color iconWidth: IncallMenuStyle.settingsIcons.width iconHeight: IncallMenuStyle.settingsIcons.height } @@ -164,7 +164,7 @@ Rectangle{ text: mainItem.menuTitles[modelData.titleIndex] font.pointSize: IncallMenuStyle.list.pointSize - color: IncallMenuStyle.list.color + color: IncallMenuStyle.list.colorModel.color } Icon{ Layout.minimumWidth: iconWidth @@ -173,7 +173,7 @@ Rectangle{ //backgroundRadius: width/2 icon: IncallMenuStyle.buttons.next.icon - overwriteColor: IncallMenuStyle.buttons.next.backgroundNormalColor + overwriteColor: IncallMenuStyle.buttons.next.backgroundNormalColor.color iconWidth: IncallMenuStyle.buttons.next.iconSize iconHeight: IncallMenuStyle.buttons.next.iconSize } @@ -234,7 +234,7 @@ Rectangle{ ] delegate: Borders{ - bottomColor: IncallMenuStyle.list.border.color + bottomColor: IncallMenuStyle.list.border.colorModel.color bottomWidth: IncallMenuStyle.list.border.width Layout.preferredHeight: Math.max(layoutIcon.height, radio.contentItem.implicitHeight) + 20 Layout.fillWidth: true @@ -299,7 +299,7 @@ Rectangle{ text: qsTr('incallMenuParticipantsAlone') visible: parent.count <= 1 font.pointSize: IncallMenuStyle.list.pointSize - color: IncallMenuStyle.list.color + color: IncallMenuStyle.list.colorModel.color } } Item{// Spacer diff --git a/linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml b/linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml index ce716cdee..e4629914b 100644 --- a/linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml +++ b/linphone-app/ui/modules/Linphone/Menus/SipAddressesMenu.qml @@ -81,11 +81,11 @@ Item { width: list.width color: mouseArea.pressed - ? SipAddressesMenuStyle.entry.color.pressed + ? SipAddressesMenuStyle.entry.color.pressed.color : ( mouseArea.containsMouse - ? SipAddressesMenuStyle.entry.color.hovered - : SipAddressesMenuStyle.entry.color.normal + ? SipAddressesMenuStyle.entry.color.hovered.color + : SipAddressesMenuStyle.entry.color.normal.color ) Text { @@ -96,7 +96,7 @@ Item { rightMargin: SipAddressesMenuStyle.entry.rightMargin } - color: SipAddressesMenuStyle.entry.text.color + color: SipAddressesMenuStyle.entry.text.colorModel.color elide: Text.ElideRight font.pointSize: SipAddressesMenuStyle.entry.text.pointSize height: parent.height diff --git a/linphone-app/ui/modules/Linphone/Misc/MessageCounter.qml b/linphone-app/ui/modules/Linphone/Misc/MessageCounter.qml index ff04364ef..4a3d4a023 100644 --- a/linphone-app/ui/modules/Linphone/Misc/MessageCounter.qml +++ b/linphone-app/ui/modules/Linphone/Misc/MessageCounter.qml @@ -37,7 +37,7 @@ Item{ Text { anchors.centerIn: parent - color: MessageCounterStyle.text.color + color: MessageCounterStyle.text.colorModel.color font.pointSize: messageCounter.pointSize text: (messageCounter.count>99 ? '+' : messageCounter.count) } diff --git a/linphone-app/ui/modules/Linphone/Notifications/Notification.qml b/linphone-app/ui/modules/Linphone/Notifications/Notification.qml index 35bfa20b7..5f4826395 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/Notification.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/Notification.qml @@ -30,12 +30,12 @@ DesktopPopup { } Rectangle { - color: NotificationStyle.color + color: NotificationStyle.colorModel.color height: overrodeHeight || NotificationStyle.height width: NotificationStyle.width border { - color: NotificationStyle.border.color + color: NotificationStyle.border.colorModel.color width: NotificationStyle.border.width } diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationBasic.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationBasic.qml index 369b4cea0..6b6b6e19d 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/NotificationBasic.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationBasic.qml @@ -27,7 +27,7 @@ Notification { sourceComponent: Text { anchors.fill: parent - color: NotificationBasicStyle.message.color + color: NotificationBasicStyle.message.colorModel.color font.pointSize: NotificationBasicStyle.message.pointSize text: notification.message verticalAlignment: Text.AlignVCenter diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml index 2cc628768..5efdb6f35 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml @@ -40,7 +40,7 @@ Notification { Text { Layout.fillWidth: true - color: NotificationReceivedFileMessageStyle.fileName.color + color: NotificationReceivedFileMessageStyle.fileName.colorModel.color elide: Text.ElideRight font.pointSize: NotificationReceivedFileMessageStyle.fileName.pointSize text: Utils.basename(notification.fileUri) @@ -76,7 +76,7 @@ Notification { Text { Layout.preferredWidth: NotificationReceivedFileMessageStyle.fileSize.width - color: NotificationReceivedFileMessageStyle.fileSize.color + color: NotificationReceivedFileMessageStyle.fileSize.colorModel.color elide: Text.ElideRight font.pointSize: NotificationReceivedFileMessageStyle.fileSize.pointSize horizontalAlignment: Text.AlignRight diff --git a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml index f679679c1..e940d474d 100644 --- a/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml +++ b/linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml @@ -53,7 +53,7 @@ Notification { Layout.fillHeight: true Layout.fillWidth: true - color: NotificationReceivedMessageStyle.messageContainer.color + color: NotificationReceivedMessageStyle.messageContainer.colorModel.color radius: NotificationReceivedMessageStyle.messageContainer.radius Text { @@ -62,7 +62,7 @@ Notification { margins: NotificationReceivedMessageStyle.messageContainer.margins } - color: NotificationReceivedMessageStyle.messageContainer.text.color + color: NotificationReceivedMessageStyle.messageContainer.text.colorModel.color elide: Text.ElideRight font { diff --git a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml index 94daa624c..2c7a672c8 100644 --- a/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml +++ b/linphone-app/ui/modules/Linphone/SmartSearchBar/SmartSearchBar.qml @@ -103,7 +103,7 @@ SearchBox { headerButtonDescription: qsTr('addContact') headerButtonIcon: 'contact_add_custom' - headerButtonOverwriteColor: SipAddressesViewStyle.header.button.color + headerButtonOverwriteColor: SipAddressesViewStyle.header.button.colorModel.color headerButtonAction: SettingsModel.contactsEnabled && (function (sipAddress) { searchBox.closeMenu() searchBox.addContact(sipAddress) diff --git a/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml b/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml index 6ab7c46d4..c77c38ccb 100644 --- a/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml +++ b/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml @@ -22,7 +22,7 @@ DecorationSticker { property bool showCloseButton: false property bool showActiveSpeakerOverlay: true property real avatarRatio : 2/3 - property color color : AvatarStickerStyle.stickerBackgroundColor + property color color : AvatarStickerStyle.stickerBackgroundColor.color property alias image: avatar.image property alias avatarBackgroundColor: avatar.backgroundColor @@ -60,7 +60,7 @@ DecorationSticker { call: participantDeviceModel ? undefined : mainItem.callModel height: Utils.computeAvatarSize(mainItem, mainItem.width, avatarRatio) width: height - backgroundColor: AvatarStickerStyle.inBackgroundColor + backgroundColor: AvatarStickerStyle.inBackgroundColor.color } } } diff --git a/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml b/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml index 167cee8c5..ecf56ac25 100644 --- a/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml +++ b/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml @@ -25,7 +25,7 @@ DecorationSticker{ property alias isVideoEnabled: camera.isVideoEnabled property bool showCloseButton: false property bool showActiveSpeakerOverlay: true - property color color : CameraStickerStyle.cameraBackgroundColor + property color color : CameraStickerStyle.cameraBackgroundColor.color property alias showCustomButton: mainItem._showCustomButton property alias customButtonToggled: mainItem._customButtonToggled diff --git a/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml b/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml index f45b33449..405c500b9 100644 --- a/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml +++ b/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml @@ -48,7 +48,7 @@ Item{ anchors.fill: content glowRadius: 4 spread: 0.9 - color: DecorationStickerStyle.border.color + color: DecorationStickerStyle.border.colorModel.color cornerRadius: (mainItem.radius? mainItem.radius : 0) + glowRadius visible: mainItem._showActiveSpeakerOverlay && mainItem._currentDevice && mainItem._currentDevice.isSpeaking } @@ -60,7 +60,7 @@ Item{ Rectangle{ id: hideView anchors.fill: parent - color: DecorationStickerStyle.pauseView.backgroundColor + color: DecorationStickerStyle.pauseView.backgroundColor.color radius: DecorationStickerStyle.radius visible: mainItem._isPaused Rectangle{ @@ -68,11 +68,11 @@ Item{ height: DecorationStickerStyle.pauseView.button.iconSize width: height radius: width/2 - color: DecorationStickerStyle.pauseView.button.backgroundNormalColor + color: DecorationStickerStyle.pauseView.button.backgroundNormalColor.color Icon{ anchors.centerIn: parent icon: DecorationStickerStyle.pauseView.button.icon - overwriteColor: DecorationStickerStyle.pauseView.button.foregroundNormalColor + overwriteColor: DecorationStickerStyle.pauseView.button.foregroundNormalColor.color iconSize: DecorationStickerStyle.pauseView.button.iconSize } } @@ -90,7 +90,7 @@ Item{ text: mainItem.username + (mainItem._isPaused ? ' ('+qsTr('paused')+')' : '') font.pointSize: DecorationStickerStyle.contactDescription.pointSize font.weight: DecorationStickerStyle.contactDescription.weight - color: DecorationStickerStyle.contactDescription.color + color: DecorationStickerStyle.contactDescription.colorModel.color } Glow { anchors.fill: usernameItem @@ -134,11 +134,11 @@ Item{ Layout.preferredHeight: DecorationStickerStyle.isMuted.button.iconSize Layout.preferredWidth: DecorationStickerStyle.isMuted.button.iconSize radius: width/2 - color: DecorationStickerStyle.isMuted.button.backgroundNormalColor + color: DecorationStickerStyle.isMuted.button.backgroundNormalColor.color Icon{ anchors.centerIn: parent icon: DecorationStickerStyle.isMuted.button.icon - overwriteColor: DecorationStickerStyle.isMuted.button.foregroundNormalColor + overwriteColor: DecorationStickerStyle.isMuted.button.foregroundNormalColor.color iconSize: DecorationStickerStyle.isMuted.button.iconSize } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml index bd6b9fd35..fc31badaf 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml @@ -10,7 +10,7 @@ QtObject { property string sectionName: 'AccountStatus' property int horizontalSpacing: 8 property int verticalSpacing: 2 - property color busyColor: ColorsList.add(sectionName+'_spinner', 'i').color + property var busyColor: ColorsList.add(sectionName+'_spinner', 'i') property QtObject presenceLevel: QtObject { property int bottomMargin: 1 @@ -18,12 +18,12 @@ QtObject { } property QtObject sipAddress: QtObject { - property color color: ColorsList.add(sectionName+'_sipAddress', 'g').color + property var colorModel: ColorsList.add(sectionName+'_sipAddress', 'g') property int pointSize: Units.dp * 10 } property QtObject username: QtObject { - property color color: ColorsList.add(sectionName+'_username', 'j').color + property var colorModel: ColorsList.add(sectionName+'_username', 'j') property int pointSize: Units.dp * 11 } property QtObject messageCounter: QtObject { diff --git a/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml index a61d578e2..7a99322a0 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml @@ -16,7 +16,7 @@ QtObject { } property QtObject description: QtObject { - property color color: ColorsList.add(sectionName+'_description', 'n').color + property var colorModel: ColorsList.add(sectionName+'_description', 'n') property int pointSize: Units.dp * 10 property int height: 40 } @@ -27,7 +27,7 @@ QtObject { } property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_title', 'j') property int bottomMargin: 10 property int pointSize: Units.dp * 10 property int height: 20 diff --git a/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml index bb79ad9fd..212f182e6 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml @@ -11,7 +11,7 @@ QtObject { property int height: 80 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 * 11 property int padding: 4 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml index 168613ec7..7e7067e59 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/CallControlsStyle.qml @@ -7,7 +7,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'CallControl' - property color color: ColorsList.add(sectionName, 'e').color + property var colorModel: ColorsList.add(sectionName, 'e') property int height: 60 property int leftMargin: 12 property int rightMargin: 12 diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml index 0391a3bfd..8c5c9e30e 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml @@ -8,8 +8,8 @@ import ColorsList 1.0 QtObject { property string sectionName: 'CallStats' - property color outsideColor: ColorsList.add(sectionName+'_outside_bg', 'j50').color - property color color: ColorsList.add(sectionName+'_bg', 'j90').color + property var outsideColor: ColorsList.add(sectionName+'_outside_bg', 'j50') + property var colorModel: ColorsList.add(sectionName+'_bg', 'j90') property int height: 280 property int leftMargin: 12 property int rightMargin: 12 @@ -24,30 +24,30 @@ QtObject { } property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_title', 'q').color + property var colorModel: ColorsList.add(sectionName+'_title', 'q') property int bottomMargin: 20 property int pointSize: Units.dp * 16 } property QtObject key: QtObject { - property color color: ColorsList.add(sectionName+'_key', 'q').color + property var colorModel: ColorsList.add(sectionName+'_key', 'q') property int pointSize: Units.dp * 10 property int width: 200 } property QtObject value: QtObject { - property color color: ColorsList.add(sectionName+'_value', 'q').color + property var colorModel: ColorsList.add(sectionName+'_value', 'q') property int pointSize: Units.dp * 10 } property QtObject cancel: QtObject { property int iconSize: 40 property string icon : 'cancel_custom' property string name : 'cancel' - 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_inv_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_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml index 7056af056..788824268 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/CallsStyle.qml @@ -14,57 +14,57 @@ QtObject { property int width: 200 property QtObject color: QtObject { - property color normal: ColorsList.add('Calls_entry_n', 'e').color - property color selected: ColorsList.add('Calls_entry_c', 'j').color + property var normal: ColorsList.add('Calls_entry_n', 'e') + property var selected: ColorsList.add('Calls_entry_c', 'j') } property QtObject burgerMenu: QtObject { property string name : 'burgerMenu' property string icon : 'menu_vdots_custom' property int iconSize: 35 - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 selectedBurgerMenu: QtObject { property string name : 'selectedBurgerMenu' property string icon : 'menu_vdots_custom' property int iconSize: 35 - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') } property QtObject hangup: QtObject { property int iconSize: 35 property string icon : 'hangup_custom' property string name : 'hangup' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg') } property QtObject endCallAnimation: QtObject { - property color blinkColor: ColorsList.add('Calls_entry_end_blink', 'i').color + property var blinkColor: ColorsList.add('Calls_entry_end_blink', 'i') property int duration: 300 property int loops: 3 } property QtObject subtitleColor: QtObject { - property color normal: ColorsList.add('Calls_entry_subtitle_n', 'n').color - property color selected: ColorsList.add('Calls_entry_subtitle_selected', 'q').color + property var normal: ColorsList.add('Calls_entry_subtitle_n', 'n') + property var selected: ColorsList.add('Calls_entry_subtitle_selected', 'q') } property QtObject titleColor: QtObject { - property color normal: ColorsList.add('Calls_entry_title_n', 'j').color - property color selected: ColorsList.add('Calls_entry_title_selected', 'q').color + property var normal: ColorsList.add('Calls_entry_title_n', 'j') + property var selected: ColorsList.add('Calls_entry_title_selected', 'q') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml index fc1baf8d8..993b46074 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Calls/ConferenceControlsStyle.qml @@ -7,7 +7,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'ConferenceControls' - property color color: ColorsList.add(sectionName, 'e').color + property var colorModel: ColorsList.add(sectionName, 'e') property int height: 60 property int leftMargin: 12 property int rightMargin: 12 diff --git a/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml index 6aee2a9fc..53c9918c8 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Camera/CameraViewStyle.qml @@ -10,20 +10,20 @@ import ColorsList 1.0 QtObject { property string sectionName: 'CameraView' - property color outBackgroundColor: ColorsList.add(sectionName+'_out_bg', 'conference_out_avatar_bg').color - property color inAvatarBackgroundColor: ColorsList.add(sectionName+'_in_bg', 'conference_bg').color - property color cameraBackgroundColor: ColorsList.add(sectionName+'_camera_bg', 'fullscreen_conference_bg').color + property var outBackgroundColor: ColorsList.add(sectionName+'_out_bg', 'conference_out_avatar_bg') + property var inAvatarBackgroundColor: ColorsList.add(sectionName+'_in_bg', 'conference_bg') + property var cameraBackgroundColor: ColorsList.add(sectionName+'_camera_bg', 'fullscreen_conference_bg') property int radius : 10 property QtObject contactDescription: QtObject { - property color color: ColorsList.add(sectionName+'_username', 'q').color + property var colorModel: ColorsList.add(sectionName+'_username', 'q') property int pointSize: Units.dp * 12 property int weight: Font.Bold } property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_border', 'b').color + property var colorModel: ColorsList.add(sectionName+'_border', 'b') property int width: 2 } @@ -33,42 +33,42 @@ QtObject { property int iconSize: 40 property string icon : 'close_custom' property string name : 'close_preview' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') } //------------------------------------------------------------------------------ property QtObject pauseView: QtObject{ - property color backgroundColor : ColorsList.add(sectionName+'_pauseView_bg_n', 'l').color + property var backgroundColor : ColorsList.add(sectionName+'_pauseView_bg_n', 'l') property QtObject button: QtObject { property int iconSize: 80 property string icon : 'pause_custom' property string name : 'pause' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_n_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_n_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_n_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_n_b_fg') } } property QtObject isMuted: QtObject{ - property color backgroundColor : ColorsList.add(sectionName+'_isMuted_bg', 'j').color + property var backgroundColor : ColorsList.add(sectionName+'_isMuted_bg', 'j') property QtObject button: QtObject { property int iconSize: 30 property string icon : 'micro_off_custom' property string name : 'isMuted' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_d_b_fg') } } property QtObject isAudioOnly: QtObject{ - property color backgroundColor : ColorsList.add(sectionName+'_isAudioOnly_bg', 'j').color + property var backgroundColor : ColorsList.add(sectionName+'_isAudioOnly_bg', 'j') property QtObject button: QtObject { property int iconSize: 30 property string icon : 'conference_audio_only_custom' property string name : 'isAudioOnly' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_d_b_fg') } } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioMessageStyle.qml index aaccca315..7ddfa0296 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioMessageStyle.qml @@ -10,31 +10,30 @@ QtObject { property string sectionName : 'ChatAudioMessage' property int minWidth: 500 property int emptySpace: 10 - property color color: ColorsList.add(sectionName, 'q').color - - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'e').color + property var colorModel: ColorsList.add(sectionName, 'q') + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'a') property QtObject pauseAction: QtObject { property int iconSize: 25 property string name : 'pause' property string icon : 'chat_audio_pause_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'q').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'q').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'q').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, 'q') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'q') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'q') + 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 playAction: QtObject { property int iconSize: 25 property string name : 'play' property string icon : 'chat_audio_play_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'q').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'q').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'q').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, 'q') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'q') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'q') + 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 progressionWave: QtObject{ @@ -43,20 +42,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, 'w_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'w_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'w_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'w_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'w_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'w_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'w_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'w_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'w_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'w_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'w_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'w_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') } property int padding: 8 diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioPreviewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioPreviewStyle.qml index a45a84cd6..bd297e06b 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioPreviewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatAudioPreviewStyle.qml @@ -8,24 +8,24 @@ import ColorsList 1.0 QtObject { property string sectionName : 'ChatAudioPreview' - property color color: ColorsList.add(sectionName, 'q').color + property var colorModel: ColorsList.add(sectionName, 'q') property int height: 70 property QtObject header: QtObject{ - property color color: ColorsList.add(sectionName+'_header', 'h').color + property var colorModel: ColorsList.add(sectionName+'_header', 'h') property int pointSizeOffset: -3 property QtObject replyIcon: QtObject{ property string icon : 'menu_reply_custom' property int iconSize: 22 } } - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'aa').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'aa') property QtObject audioArea: QtObject{ - property color outgoingMarkColor: ColorsList.add(sectionName+'_reply_outgoing_mark', 'm').color - property color incomingMarkColor: ColorsList.add(sectionName+'_reply_incoming_mark', 'r').color - property color backgroundColor: ColorsList.add(sectionName+'_reply_bg', 'q').color - property color foregroundColor: ColorsList.add(sectionName+'_reply_fg', 'h').color + property var outgoingMarkColor: ColorsList.add(sectionName+'_reply_outgoing_mark', 'm') + property var incomingMarkColor: ColorsList.add(sectionName+'_reply_incoming_mark', 'r') + property var backgroundColor: ColorsList.add(sectionName+'_reply_bg', 'q') + property var foregroundColor: ColorsList.add(sectionName+'_reply_fg', 'h') property int usernamePointSizeOffset: -2 property int pointSizeOffset: -2 } @@ -33,45 +33,45 @@ QtObject { property int iconSize: 40 property string name : 'delete' property string icon : 'delete_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 stopAction: QtObject { property int iconSize: 30 property string name : 'stop' property string icon : 'chat_audio_preview_stop_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 pauseAction: QtObject { property int iconSize: 30 property string name : 'pause' property string icon : 'chat_audio_preview_pause_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 playAction: QtObject { property int iconSize: 30 property string name : 'play' property string icon : 'chat_audio_preview_play_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 progressionWave: QtObject{ @@ -80,20 +80,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_h_b_bg').color - property color backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'l_n_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_h_b_bg') + property var backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'l_n_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_h_b_fg').color - property color foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'l_n_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_h_b_fg') + property var foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'l_n_b_fg') + property var foregroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_p', icon, 'l_p_b_fg') } property QtObject recordingProgressionWave: QtObject{ @@ -103,21 +103,21 @@ QtObject { property string name : 'recording_progression_soundwave' property string icon : 'chat_audio_soundwave_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'wr_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'wr_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'wr_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'wr_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'wr_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'wr_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'wr_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'wr_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'wr_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'wr_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'wr_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'wr_p_b_fg') // Old color: l_n_b_bg - property color backgroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_n', icon, 'ai').color - property color backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'ai').color - property color backgroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_p', icon, 'ai').color + property var backgroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_n', icon, 'ai') + property var backgroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_h', icon, 'ai') + property var backgroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_bg_p', icon, 'ai') - property color foregroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_n', icon, 'ai').color - property color foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'ai').color - property color foregroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_p', icon, 'ai').color + property var foregroundHiddenPartNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_n', icon, 'ai') + property var foregroundHiddenPartHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_h', icon, 'ai') + property var foregroundHiddenPartPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_hidden_fg_p', icon, 'ai') } property int padding: 8 diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatCalendarMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatCalendarMessageStyle.qml index 2dda1513d..9811b509e 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatCalendarMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatCalendarMessageStyle.qml @@ -23,20 +23,20 @@ QtObject { property int spacing: 15 property int lineHeight: 20 - //property color : ColorsList.add(sectionName+'_conference_bg_n', 'conference_entry_bg').color + //property var : ColorsList.add(sectionName+'_conference_bg_n', 'conference_entry_bg') property QtObject backgroundColor: QtObject { - property color normal: ColorsList.add(sectionName+'_conference_bg_n', 'conference_entry_bg').color - property color hovered: ColorsList.add(sectionName+'_conference_bg_h', 'g10').color + property var normal: ColorsList.add(sectionName+'_conference_bg_n', 'conference_entry_bg') + property var hovered: ColorsList.add(sectionName+'_conference_bg_h', 'g10') } property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_conference_border', 'f').color + property var colorModel: ColorsList.add(sectionName+'_conference_border', 'f') property int width: 1 } property QtObject indicator: QtObject { - property color color: ColorsList.add(sectionName+'_conference_indicator', 'i').color + property var colorModel: ColorsList.add(sectionName+'_conference_indicator', 'i') property int width: 5 } property QtObject calendar: QtObject { @@ -44,69 +44,69 @@ QtObject { property int pointSize: Units.dp * 9 property string icon : 'calendar_custom' property int iconSize: 30 - property color color: ColorsList.add(sectionName+'_schedule', 'j').color + property var colorModel: ColorsList.add(sectionName+'_schedule', 'j') } property QtObject schedule: QtObject { property int spacing: 5 property int pointSize: Units.dp * 9 property string icon : 'schedule_custom' property int iconSize: 30 - property color color: ColorsList.add(sectionName+'_schedule', 'j').color + property var colorModel: ColorsList.add(sectionName+'_schedule', 'j') } property QtObject type: QtObject { property int spacing: 5 property int pointSize: Units.dp * 10 - property color updatedColor: ColorsList.add(sectionName+'_updated_subject', 'updated_ics_fg').color - property color cancelledColor: ColorsList.add(sectionName+'_cancelled_subject', 'cancelled_ics_fg').color - property color color: ColorsList.add(sectionName+'_subject', 'ics_fg').color + property var updatedColor: ColorsList.add(sectionName+'_updated_subject', 'updated_ics_fg') + property var cancelledColor: ColorsList.add(sectionName+'_cancelled_subject', 'cancelled_ics_fg') + property var colorModel: ColorsList.add(sectionName+'_subject', 'ics_fg') } property QtObject subject: QtObject { property int spacing: 5 property int pointSize: Units.dp * 11 - property color color: ColorsList.add(sectionName+'_subject', 'j').color + property var colorModel: ColorsList.add(sectionName+'_subject', 'j') } property QtObject description: QtObject { property int spacing: 5 property int pointSize: Units.dp * 9 - property color color: ColorsList.add(sectionName+'_description', 'j').color + property var colorModel: ColorsList.add(sectionName+'_description', 'j') } property QtObject participants: QtObject { property int spacing: 5 property int pointSize: Units.dp * 9 property string icon : 'calendar_participants_custom' property int iconSize: 25 - property color color: ColorsList.add(sectionName+'_participants', 'j').color + property var colorModel: ColorsList.add(sectionName+'_participants', 'j') } property QtObject gotoButton: QtObject{ property int iconSize: 20 property string name : 'goto' property string icon : 'transfer_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_c', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_c', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_c', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_c', icon, 's_p_b_fg') } property QtObject infoButton: QtObject{ property int iconSize: 25 property string name : 'info' property string icon : 'menu_info_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'me_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'me_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'me_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_c', icon, 'me_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'me_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'me_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'me_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_c', icon, 'me_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'me_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'me_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'me_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_c', icon, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'me_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'me_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'me_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_c', icon, 'me_p_b_fg') } property QtObject organizer: QtObject { - property color color: ColorsList.add(sectionName+'_conference_organizer', 'j').color + property var colorModel: ColorsList.add(sectionName+'_conference_organizer', 'j') property int pointSize: Units.dp * 9 property int width: 220 } @@ -114,23 +114,23 @@ QtObject { property int iconSize: 40 property string name : 'copy' property string icon : 'menu_copy_text_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg') } property QtObject shareButton: QtObject{ property int iconSize: 40 property string name : 'share' property string icon : 'settings_network_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'me_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'me_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'me_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'me_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'me_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'me_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 'me_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 'me_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 'me_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 'me_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 'me_p_b_fg') } @@ -138,23 +138,23 @@ QtObject { property int iconSize: 40 property string name : 'edit' property string icon : 'ics_edit_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg') } property QtObject deleteButton: QtObject{ property int iconSize: 40 property string name : 'delete' property string icon : 'delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatFilePreviewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatFilePreviewStyle.qml index 52813ca85..62cb2d7ff 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatFilePreviewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatFilePreviewStyle.qml @@ -17,33 +17,33 @@ QtObject { property string name: 'filePreview' property string icon: 'menu_reply_custom' - property color backgroundColor: ColorsList.add(sectionName+'_'+name+'_bg', 'e').color - property color headerTextColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i').color - property color iconColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i').color - property color textColor: ColorsList.add(sectionName+'_'+name+'_fg', 'd').color + property var backgroundColor: ColorsList.add(sectionName+'_'+name+'_bg', 'e') + property var headerTextColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i') + property var iconColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i') + property var textColor: ColorsList.add(sectionName+'_'+name+'_fg', 'd') property int pointSize: Units.dp * 9 property int headerPointSize: Units.dp * 9 property QtObject removeButton: QtObject{ property int iconSize: 30 property string name : 'remove' property string icon : 'close_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_p', icon, 's_p_b_fg') } property QtObject closeButton: QtObject{ property int iconSize: 30 property string name : 'close' property string icon : 'close_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_n', icon, 'l_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_h', icon, 'l_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_p', icon, 'l_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_n', icon, 'l_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_h', icon, 'l_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_p', icon, 'l_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_n', icon, 'l_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_h', icon, 'l_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_b_p', icon, 'l_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_n', icon, 'l_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_h', icon, 'l_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+filePreviewObject.name+'_'+name+'_f_p', icon, 'l_p_b_fg') } } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatForwardMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatForwardMessageStyle.qml index 2efe4c556..60dc5ffdc 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatForwardMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatForwardMessageStyle.qml @@ -8,9 +8,9 @@ import ColorsList 1.0 QtObject { property string sectionName : 'ChatReplyMessage' - property color color: ColorsList.add(sectionName, 'q').color + property var colorModel: ColorsList.add(sectionName, 'q') property QtObject header: QtObject{ - property color color: ColorsList.add(sectionName+'_header', 'h').color + property var colorModel: ColorsList.add(sectionName+'_header', 'h') property int pointSizeOffset: -3 property QtObject forwardIcon: QtObject{ property string icon : 'menu_forward_custom' diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatReplyMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatReplyMessageStyle.qml index 5a5b64bb5..da4dae88e 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatReplyMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatReplyMessageStyle.qml @@ -8,9 +8,9 @@ import ColorsList 1.0 QtObject { property string sectionName : 'ChatReplyMessage' - property color color: ColorsList.add(sectionName, 'q').color + property var colorModel: ColorsList.add(sectionName, 'q') property QtObject header: QtObject{ - property color color: ColorsList.add(sectionName+'_header', 'h').color + property var colorModel: ColorsList.add(sectionName+'_header', 'h') property int pointSizeOffset: -3 property QtObject replyIcon: QtObject{ property string icon : 'menu_reply_custom' @@ -18,10 +18,10 @@ QtObject { } } property QtObject replyArea: QtObject{ - property color outgoingMarkColor: ColorsList.add(sectionName+'_reply_outgoing_mark', 'm').color - property color incomingMarkColor: ColorsList.add(sectionName+'_reply_incoming_mark', 'r').color - property color backgroundColor: ColorsList.add(sectionName+'_reply_bg', 'q').color - property color foregroundColor: ColorsList.add(sectionName+'_reply_fg', 'h').color + property var outgoingMarkColor: ColorsList.add(sectionName+'_reply_outgoing_mark', 'm') + property var incomingMarkColor: ColorsList.add(sectionName+'_reply_incoming_mark', 'r') + property var backgroundColor: ColorsList.add(sectionName+'_reply_bg', 'q') + property var foregroundColor: ColorsList.add(sectionName+'_reply_fg', 'h') property int usernamePointSizeOffset: -2 property int pointSizeOffset: -2 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml index 07bda7f80..2c6a5b814 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Chat/ChatStyle.qml @@ -8,7 +8,7 @@ import ColorsList 1.0 QtObject { property string sectionName : 'Chat' - property color color: ColorsList.add(sectionName, 'q').color + property var colorModel: ColorsList.add(sectionName, 'q') property string copyTextIcon : 'menu_copy_text_custom' property int rightButtonMargin: 15 property int rightButtonSize: 30 @@ -20,13 +20,13 @@ QtObject { property int bottomMargin: 20 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_section_border', 'g10').color + property var colorModel: ColorsList.add(sectionName+'_section_border', 'g10') property int width: 1 } property QtObject text: QtObject { property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_section_text', 'ab').color + property var colorModel: ColorsList.add(sectionName+'_section_text', 'ab') } } @@ -34,29 +34,29 @@ QtObject { property string name: 'goToBottom' property string icon: 'move_to_bottom_custom' property int iconSize: 30 - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_b_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_f_p', icon, 's_p_b_fg') } property QtObject sendArea: QtObject { property int height: 80 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_send_border', 'f').color + property var colorModel: ColorsList.add(sectionName+'_send_border', 'f') property int width: 1 } property QtObject backgroundBorder: QtObject { - property color color: ColorsList.add(sectionName+'_send_background_border', 'ag').color + property var colorModel: ColorsList.add(sectionName+'_send_background_border', 'ag') property int width: 2 } } property QtObject composingText: QtObject { - property color color: ColorsList.add(sectionName+'_composing_text', 'd').color + property var colorModel: ColorsList.add(sectionName+'_composing_text', 'd') property int height: 25 property int leftPadding: 20 property int pointSize: Units.dp * 9 @@ -65,28 +65,28 @@ QtObject { id: replyPreviewObject property string name: 'replyPreview' property string icon: 'menu_reply_custom' - property color backgroundColor: ColorsList.add(sectionName+'_'+name+'_bg', 'e').color - property color headerTextColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i').color - property color iconColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i').color - property color textColor: ColorsList.add(sectionName+'_'+name+'_fg', 'd').color + property var backgroundColor: ColorsList.add(sectionName+'_'+name+'_bg', 'e') + property var headerTextColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i') + property var iconColor: ColorsList.add(sectionName+'_'+name+'_header_fg', 'i') + property var textColor: ColorsList.add(sectionName+'_'+name+'_fg', 'd') property int pointSize: Units.dp * 9 property int headerPointSize: Units.dp * 9 property QtObject closeButton: QtObject{ property int iconSize: rightButtonSize property string name : 'close' property string icon : 'close_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_b_n', icon, 'l_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_b_h', icon, 'l_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_b_p', icon, 'l_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_f_n', icon, 'l_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_f_h', icon, 'l_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_f_p', icon, 'l_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_b_n', icon, 'l_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_b_h', icon, 'l_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_b_p', icon, 'l_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_f_n', icon, 'l_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_f_h', icon, 'l_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+replyPreviewObject.name+'_'+name+'_f_p', icon, 'l_p_b_fg') } } property QtObject ephemeralTimer: QtObject{ property string icon: 'timer_custom' property int iconSize : 25 - property color timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad').color + property var timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad') } property QtObject entry: QtObject { @@ -98,7 +98,7 @@ QtObject { property int metaWidth: 40 property QtObject separator: QtObject { - property color color: ColorsList.add(sectionName+'_separator_border', 'g10').color + property var colorModel: ColorsList.add(sectionName+'_separator_border', 'g10') property int width: 2 } @@ -106,68 +106,68 @@ QtObject { property int iconSize: 22 property string name : 'menu' property string icon : 'chat_menu_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '','','#DEDEDE').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '','','#DEDEDE').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '','','#A1A1A1').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#595759').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#595759').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#595759').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '','','#DEDEDE') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '','','#DEDEDE') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '','','#A1A1A1') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#595759') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#595759') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#595759') } property QtObject deleteAction: QtObject { property int iconSize: 22 property string name : 'delete' property string icon : 'delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '','','#DEDEDE').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '','','#DEDEDE').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '','','#A1A1A1').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#595759').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#595759').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#595759').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '','','#DEDEDE') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '','','#DEDEDE') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '','','#A1A1A1') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#595759') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#595759') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#595759') } property QtObject event: QtObject { property int iconSize: 30 property QtObject notice: QtObject{ - property color color: ColorsList.add(sectionName+'_entry_notice', 'ab').color - property color errorColor: ColorsList.add(sectionName+'_entry_notice_error', 'error').color - property color importantColor: ColorsList.add(sectionName+'_entry_notice_important', 'ae').color + property var colorModel: ColorsList.add(sectionName+'_entry_notice', 'ab') + property var errorColor: ColorsList.add(sectionName+'_entry_notice_error', 'error') + property var importantColor: ColorsList.add(sectionName+'_entry_notice_important', 'ae') property int pointSize: Units.dp * 10 } property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_entry_text', 'ac').color + property var colorModel: ColorsList.add(sectionName+'_entry_text', 'ac') property int pointSize: Units.dp * 10 } property QtObject declinedIncomingCall: QtObject{ property string icon: 'declined_incoming_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_declinedIncomingCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_declinedIncomingCall', icon, 'event_bad') } property QtObject declinedOutgoingCall: QtObject{ property string icon: 'declined_outgoing_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_declinedOutgoingCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_declinedOutgoingCall', icon, 'event_bad') } property QtObject endedCall: QtObject{ property string icon: 'ended_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_endedCall', icon, 'event_neutral').color + property var colorModel: ColorsList.addImageColor(sectionName+'_endedCall', icon, 'event_neutral') } property QtObject incomingCall: QtObject{ property string icon: 'incoming_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_incomingCall', icon, 'event_in').color + property var colorModel: ColorsList.addImageColor(sectionName+'_incomingCall', icon, 'event_in') } property QtObject outgoingCall: QtObject{ property string icon: 'outgoing_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_outgoingCall', icon, 'event_out').color + property var colorModel: ColorsList.addImageColor(sectionName+'_outgoingCall', icon, 'event_out') } property QtObject missedIncomingCall: QtObject{ property string icon: 'missed_incoming_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_missedIncominCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_missedIncominCall', icon, 'event_bad') } property QtObject missedOutgoingCall: QtObject{ property string icon: 'missed_outgoing_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_missedOutgoingCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_missedOutgoingCall', icon, 'event_bad') } property QtObject unknownCallEvent: QtObject{ property string icon: 'unknown_call_event' - property color color: ColorsList.addImageColor(sectionName+'_unknownCallEvent', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_unknownCallEvent', icon, 'event_bad') } } @@ -198,8 +198,8 @@ QtObject { property int height: 20 property int pointSize: Units.dp * 8 property int iconSize: 30 - property color outgoingColor: ColorsList.addImageColor(sectionName+'_download_out', icon, 'g').color - property color incomingColor: ColorsList.addImageColor(sectionName+'_download_in', icon, 'q').color + property var outgoingColor: ColorsList.addImageColor(sectionName+'_download_out', icon, 'g') + property var incomingColor: ColorsList.addImageColor(sectionName+'_download_in', icon, 'q') } property QtObject animation: QtObject { @@ -215,11 +215,11 @@ QtObject { property int radius: 5 property QtObject background: QtObject { - property color color: ColorsList.add(sectionName+'_file_extension_bg', 'q').color + property var colorModel: ColorsList.add(sectionName+'_file_extension_bg', 'q') } property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_file_extension_text', 'd').color + property var colorModel: ColorsList.add(sectionName+'_file_extension_text', 'd') property int pointSize: Units.dp * 9 } } @@ -232,11 +232,11 @@ QtObject { property int radius: 3 property QtObject background: QtObject { - property color color: ColorsList.add(sectionName+'_file_statusbar_bg', 'f').color + property var colorModel: ColorsList.add(sectionName+'_file_statusbar_bg', 'f') } property QtObject contentItem: QtObject { - property color color: ColorsList.add(sectionName+'_file_statusbar_content', 'p').color + property var colorModel: ColorsList.add(sectionName+'_file_statusbar_content', 'p') } } } @@ -248,30 +248,30 @@ QtObject { } property QtObject incoming: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_incoming_bg', 'incoming_bg').color + property var backgroundColor: ColorsList.add(sectionName+'_incoming_bg', 'incoming_bg') property int avatarSize: 20 property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_incoming_text', 'd').color + property var colorModel: ColorsList.add(sectionName+'_incoming_text', 'd') property int pointSize: Units.dp * 10 } } property QtObject outgoing: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_outgoing_bg', 'outgoing_bg').color + property var backgroundColor: ColorsList.add(sectionName+'_outgoing_bg', 'outgoing_bg') property int areaSize: 12 property int busyIndicatorSize: 12 property int sendIconSize: 60 property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_outgoing_text', 'd').color + property var colorModel: ColorsList.add(sectionName+'_outgoing_text', 'd') property int pointSize: Units.dp * 10 } } } property QtObject time: QtObject { - property color color: ColorsList.add(sectionName+'_time', 'd').color + property var colorModel: ColorsList.add(sectionName+'_time', 'd') property int pointSize: Units.dp * 10 property int width: 44 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml index da2922d2a..4458409c0 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml @@ -15,8 +15,8 @@ QtObject { property QtObject background: QtObject { property QtObject color: QtObject { - property color normal: ColorsList.add(sectionName+'_n', 'a').color - property color hovered: ColorsList.add(sectionName+'_h', 'o').color + property var normal: ColorsList.add(sectionName+'_n', 'a') + property var hovered: ColorsList.add(sectionName+'_h', 'o') } } @@ -25,7 +25,7 @@ QtObject { } 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 * 10 } } @@ -40,7 +40,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: 50 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml index 8f8f9c1d6..c1cd6c205 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml @@ -8,15 +8,15 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Avatar' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'd').color - property color backgroundDarkModeColor: ColorsList.add(sectionName+'_dark_bg', 'q').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'd') + property var backgroundDarkModeColor: ColorsList.add(sectionName+'_dark_bg', 'q') property string personImage : 'contact_custom' property QtObject initials: QtObject { - property color color: ColorsList.add(sectionName+'_initials', 'q').color - property color darkModeColor: ColorsList.add(sectionName+'_dark_initials', 'd').color + property var colorModel: ColorsList.add(sectionName+'_initials', 'q') + property var darkModeColor: ColorsList.add(sectionName+'_dark_initials', 'd') property int pointSize: Units.dp * 10 property int ratio: 30 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml index 57ba1fd9d..719577376 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml @@ -10,17 +10,17 @@ import ColorsList 1.0 QtObject { property string sectionName: 'ContactDescription' property QtObject subtitle: QtObject { - property color color: ColorsList.add(sectionName+'_subtitle', 'n').color + property var colorModel: ColorsList.add(sectionName+'_subtitle', 'n') property int pointSize: Units.dp * 10 property int weight: Font.Normal } property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_title', 'j') property int pointSize: Units.dp * 11 property int weight: Font.Bold property QtObject status : QtObject{ - property color color : ColorsList.add(sectionName+'_status', 'g').color + property var colorModel : ColorsList.add(sectionName+'_status', 'g') property int pointSize : Units.dp * 9 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml index 29b751b5d..bc018214d 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Contact/ContactStyle.qml @@ -14,8 +14,8 @@ QtObject { property QtObject groupChat: QtObject { property string icon: 'chat_room_custom' - property color color: ColorsList.addImageColor(sectionName+'_groupChat', icon, 'g').color - property color avatarColor: ColorsList.addImageColor(sectionName+'_groupChat_onAvatar', icon, 'q').color - property color avatarDarkModeColor: ColorsList.addImageColor(sectionName+'_groupChat_dark_onAvatar', icon, 'd').color + property var colorModel: ColorsList.addImageColor(sectionName+'_groupChat', icon, 'g') + property var avatarColor: ColorsList.addImageColor(sectionName+'_groupChat_onAvatar', icon, 'q') + property var avatarDarkModeColor: ColorsList.addImageColor(sectionName+'_groupChat_dark_onAvatar', icon, 'd') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Dialog/MultimediaParametersDialogStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Dialog/MultimediaParametersDialogStyle.qml index c15bc2e61..f1d1893a4 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Dialog/MultimediaParametersDialogStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Dialog/MultimediaParametersDialogStyle.qml @@ -19,19 +19,19 @@ QtObject { property int iconSize: 30 property string icon : 'speaker_on_custom' property string name : 'speaker' - property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + property var colorModel : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g') } property QtObject micro: QtObject { property int iconSize: 30 property string icon : 'micro_on_custom' property string name : 'micro' - property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + property var colorModel : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g') } property QtObject camera: QtObject { property int iconSize: 30 property string icon : 'camera_on_custom' property string name : 'camera' - property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + property var colorModel : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g') } } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml index 4704b2d05..be4d9e3f2 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml @@ -19,19 +19,19 @@ QtObject { property int radius: 6 property QtObject background: QtObject { - property color color: ColorsList.add(sectionName+'_bar_bg', 'f').color + property var colorModel: ColorsList.add(sectionName+'_bar_bg', 'f') } property QtObject contentItem: QtObject { property QtObject color: QtObject { - property color failed: ColorsList.add(sectionName+'_bar_content_failed', 'error').color - property color normal: ColorsList.add(sectionName+'_bar_content_n', 'p').color + property var failed: ColorsList.add(sectionName+'_bar_content_failed', 'error') + property var normal: ColorsList.add(sectionName+'_bar_content_n', 'p') } } } 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 * 11 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Dialog/SipAddressDialogStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Dialog/SipAddressDialogStyle.qml index 00cd9a079..524f55622 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Dialog/SipAddressDialogStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Dialog/SipAddressDialogStyle.qml @@ -14,18 +14,18 @@ QtObject { property int iconSize: 36 property string icon : 'transfer_custom' property string name : 'select' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject searchField: QtObject { - property color color: ColorsList.add(sectionName+'_searchField', 'c').color + property var colorModel: ColorsList.add(sectionName+'_searchField', 'c') } property QtObject list: QtObject { - property color color: ColorsList.add(sectionName+'_list_title', 'g').color + property var colorModel: ColorsList.add(sectionName+'_list_title', 'g') property int pointSize: Units.dp * 11 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Dialog/ZrtpTokenAuthenticationDialogStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Dialog/ZrtpTokenAuthenticationDialogStyle.qml index bf9943a63..123c5a53f 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Dialog/ZrtpTokenAuthenticationDialogStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Dialog/ZrtpTokenAuthenticationDialogStyle.qml @@ -21,8 +21,8 @@ QtObject { } property QtObject text: QtObject { - property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color - property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 's').color + property var colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j') + property var colorB: ColorsList.add(sectionName+'_zrtp_text_b', 's') property int pointSize: Units.dp * 10 property int titlePointSize: Units.dp * 12 property int sasPointSize: Units.dp * 13 diff --git a/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml b/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml index 1eb537501..927188e95 100644 --- a/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/History/HistoryStyle.qml @@ -8,20 +8,20 @@ import ColorsList 1.0 QtObject { property string sectionName: 'History' - property color color: ColorsList.add(sectionName, 'q').color + property var colorModel: ColorsList.add(sectionName, 'q') property QtObject sectionHeading: QtObject { property int padding: 5 property int bottomMargin: 20 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_section_border', 'g10').color + property var colorModel: ColorsList.add(sectionName+'_section_border', 'g10') property int width: 1 } property QtObject text: QtObject { property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_section_text', 'g').color + property var colorModel: ColorsList.add(sectionName+'_section_text', 'g') } } @@ -36,53 +36,53 @@ QtObject { property int iconSize: 30 property string name : 'delete' property string icon : 'delete_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 event: QtObject { property int iconSize: 30 property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_event_text', 'd').color + property var colorModel: ColorsList.add(sectionName+'_event_text', 'd') property int pointSize: Units.dp * 10 } property QtObject declinedIncomingCall: QtObject{ property string icon: 'declined_incoming_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_declinedIncomingCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_declinedIncomingCall', icon, 'event_bad') } property QtObject declinedOutgoingCall: QtObject{ property string icon: 'declined_outgoing_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_declinedOutgoingCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_declinedOutgoingCall', icon, 'event_bad') } property QtObject endedCall: QtObject{ property string icon: 'ended_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_endedCall', icon, 'event_neutral').color + property var colorModel: ColorsList.addImageColor(sectionName+'_endedCall', icon, 'event_neutral') } property QtObject incomingCall: QtObject{ property string icon: 'incoming_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_incomingCall', icon, 'event_in').color + property var colorModel: ColorsList.addImageColor(sectionName+'_incomingCall', icon, 'event_in') } property QtObject outgoingCall: QtObject{ property string icon: 'outgoing_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_outgoingCall', icon, 'event_out').color + property var colorModel: ColorsList.addImageColor(sectionName+'_outgoingCall', icon, 'event_out') } property QtObject missedIncomingCall: QtObject{ property string icon: 'missed_incoming_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_missedIncominCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_missedIncominCall', icon, 'event_bad') } property QtObject missedOutgoingCall: QtObject{ property string icon: 'missed_outgoing_call_custom' - property color color: ColorsList.addImageColor(sectionName+'_missedOutgoingCall', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_missedOutgoingCall', icon, 'event_bad') } property QtObject unknownCallEvent: QtObject{ property string icon: 'unknown_call_event' - property color color: ColorsList.addImageColor(sectionName+'_unknownCallEvent', icon, 'event_bad').color + property var colorModel: ColorsList.addImageColor(sectionName+'_unknownCallEvent', icon, 'event_bad') } } @@ -98,7 +98,7 @@ QtObject { } property QtObject time: QtObject { - property color color: ColorsList.add(sectionName+'_time', 'd').color + property var colorModel: ColorsList.add(sectionName+'_time', 'd') property int pointSize: Units.dp * 10 property int width: 44 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml index 3737987b1..570f30792 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Menus/IncallMenuStyle.qml @@ -9,25 +9,25 @@ import ColorsList 1.0 QtObject { property string sectionName: 'IncallMenu' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'k') property int radius: 8 property QtObject header: QtObject{ property string name: 'header' property int height: 60 - property color color: ColorsList.add(sectionName+'_'+name+'_fg', 'j').color + property var colorModel: ColorsList.add(sectionName+'_'+name+'_fg', 'j') property int weight: Font.Bold property int pointSize: Units.dp * 14 } property QtObject list : QtObject{ property string name: 'list' property int height: 60 - property color color: ColorsList.add(sectionName+'_'+name+'_fg', 'j').color + property var colorModel: ColorsList.add(sectionName+'_'+name+'_fg', 'j') property int weight: Font.Normal property int selectedWeight: Font.Bold property int pointSize: Units.dp * 12 property QtObject border: QtObject{ - property color color: ColorsList.add(sectionName+'_list_border', 'f').color + property var colorModel: ColorsList.add(sectionName+'_list_border', 'f') property int width: 2 } } @@ -55,34 +55,34 @@ QtObject { property int iconSize: 40 property string icon : 'close_custom' property string name : 'close' - 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 back: QtObject { property int iconSize: 40 property string icon : 'back_custom' property string name : 'back' - 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 next: QtObject { property int iconSize: 40 property string icon : 'panel_arrow_custom' property string name : 'next' - 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') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml index e87f57c2e..f3cb15238 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml @@ -19,13 +19,13 @@ QtObject { property int width: 300 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 * 10 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml index 067443948..7eb1f2943 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Misc/MessageCounterStyle.qml @@ -15,7 +15,7 @@ QtObject { } 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 * 6 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml index 5369db52c..f3868401e 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationBasicStyle.qml @@ -13,7 +13,7 @@ QtObject { property int overrodeHeight: 55 property QtObject message: QtObject { - property color color: ColorsList.add(sectionName+'_message', 'h').color + property var colorModel: ColorsList.add(sectionName+'_message', 'h') property int pointSize: Units.dp * 10 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml index 2555eaa04..68090cfba 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedCallStyle.qml @@ -18,33 +18,33 @@ QtObject { property int iconSize: 40 property string icon : 'hangup_custom' property string name : 'hangup' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg') } property QtObject acceptVideoCall: QtObject { property int iconSize: 40 property string icon : 'video_call_accept_custom' property string name : 'videoCallAccept' - 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 QtObject acceptCall: QtObject { property int iconSize: 40 property string icon : 'call_accept_custom' property string name : 'callAccept' - 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') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml index dd68f7454..75e93a1e6 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml @@ -8,19 +8,19 @@ import ColorsList 1.0 QtObject { property string sectionName: 'NotificationReceived' - property color color: ColorsList.add(sectionName+'_file', 'k').color + property var colorModel: ColorsList.add(sectionName+'_file', 'k') property int leftMargin: 25 property int overrodeHeight: 55 property int rightMargin: 15 property int spacing: 10 property QtObject fileName: QtObject { - property color color: ColorsList.add(sectionName+'_file_name', 'h').color + property var colorModel: ColorsList.add(sectionName+'_file_name', 'h') property int pointSize: Units.dp * 10 } property QtObject fileSize: QtObject { - property color color: ColorsList.add(sectionName+'_file_size', 'h').color + property var colorModel: ColorsList.add(sectionName+'_file_size', 'h') property int pointSize: Units.dp * 9 property int width: 100 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml index 980269b85..c2009eb56 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml @@ -8,7 +8,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'NotificationReceivedMessage' - property color color: ColorsList.add(sectionName+'_message', 'k').color + property var colorModel: ColorsList.add(sectionName+'_message', 'k') property int bottomMargin: 15 property int leftMargin: 15 property int overrodeHeight: 55 @@ -16,12 +16,12 @@ QtObject { property int spacing: 0 property QtObject messageContainer: QtObject { - property color color: ColorsList.add(sectionName+'_message_container', 'o').color + property var colorModel: ColorsList.add(sectionName+'_message_container', 'o') property int radius: 6 property int margins: 10 property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_message_container_text', 'l').color + property var colorModel: ColorsList.add(sectionName+'_message_container_text', 'l') property int pointSize: Units.dp * 9 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml index 733acba29..001f7a0bb 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Notifications/NotificationStyle.qml @@ -7,13 +7,13 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Notification' - property color color: ColorsList.add(sectionName, 'k').color + property var colorModel: ColorsList.add(sectionName, 'k') property int height: 120 property int iconSize: 40 property int width: 300 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_border', 'n').color + property var colorModel: ColorsList.add(sectionName+'_border', 'n') property int width: 1 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Sticker/AvatarStickerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Sticker/AvatarStickerStyle.qml index f531a01db..3a0ffd7df 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Sticker/AvatarStickerStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Sticker/AvatarStickerStyle.qml @@ -10,7 +10,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'AvatarSticker' - property color stickerBackgroundColor: ColorsList.add(sectionName+'_out_bg', 'avatar_initials_sticker_bg').color - property color inBackgroundColor: ColorsList.add(sectionName+'_in_bg', 'avatar_initials_bg').color + property var stickerBackgroundColor: ColorsList.add(sectionName+'_out_bg', 'avatar_initials_sticker_bg') + property var inBackgroundColor: ColorsList.add(sectionName+'_in_bg', 'avatar_initials_bg') property int radius : 10 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Sticker/CameraStickerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Sticker/CameraStickerStyle.qml index 1e3edd194..38419d3e6 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Sticker/CameraStickerStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Sticker/CameraStickerStyle.qml @@ -10,6 +10,6 @@ import ColorsList 1.0 QtObject { property string sectionName: 'CameraSticker' - property color cameraBackgroundColor: ColorsList.add(sectionName+'_camera_bg', 'fullscreen_conference_bg').color + property var cameraBackgroundColor: ColorsList.add(sectionName+'_camera_bg', 'fullscreen_conference_bg') property int radius : 10 } diff --git a/linphone-app/ui/modules/Linphone/Styles/Sticker/DecorationStickerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Sticker/DecorationStickerStyle.qml index f65a05d52..e165716ea 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Sticker/DecorationStickerStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Sticker/DecorationStickerStyle.qml @@ -14,23 +14,23 @@ QtObject { property int radius : 10 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_border', 'b').color + property var colorModel: ColorsList.add(sectionName+'_border', 'b') property int width: 2 } property QtObject pauseView: QtObject{ - property color backgroundColor : ColorsList.add(sectionName+'_pauseView_bg_n', 'l').color + property var backgroundColor : ColorsList.add(sectionName+'_pauseView_bg_n', 'l') property QtObject button: QtObject { property int iconSize: 80 property string icon : 'pause_custom' property string name : 'pause' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_n_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_n_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_n_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_n_b_fg') } } property QtObject contactDescription: QtObject { - property color color: ColorsList.add(sectionName+'_username', 'q').color + property var colorModel: ColorsList.add(sectionName+'_username', 'q') property int pointSize: Units.dp * 12 property int weight: Font.Bold } @@ -39,22 +39,22 @@ QtObject { property int iconSize: 40 property string icon : 'close_custom' property string name : 'close_preview' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') } property QtObject isMuted: QtObject{ - property color backgroundColor : ColorsList.add(sectionName+'_isMuted_bg', 'j').color + property var backgroundColor : ColorsList.add(sectionName+'_isMuted_bg', 'j') property QtObject button: QtObject { property int iconSize: 30 property string icon : 'micro_off_custom' property string name : 'isMuted' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg', icon, 's_d_b_fg') } } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Sticker/StickerStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Sticker/StickerStyle.qml index 2d60a76b7..d26488183 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Sticker/StickerStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Sticker/StickerStyle.qml @@ -15,13 +15,13 @@ QtObject { property int iconSize: 40 property string icon : 'menu_vdots_custom' property string name : 'custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml b/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml index 908d13856..a92c9e623 100644 --- a/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml @@ -11,8 +11,8 @@ QtObject { property int height: 240 property int rowSpacing: 12 property int width: 240 - property color color: ColorsList.add(sectionName+'', 'telkeypad_bg').color - property color selectedColor : ColorsList.add(sectionName+'_c', 'm').color + property var colorModel: ColorsList.add(sectionName+'', 'telkeypad_bg') + property var selectedColor : ColorsList.add(sectionName+'_c', 'm') property int selectedBorderWidth: 2 property real radius : 20 @@ -26,18 +26,18 @@ QtObject { property int iconSize: 0 property string name : 'telButton' property string icon : '' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'telkeypad_fg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'telkeypad_h').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'i').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'i').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'transparent').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'transparent').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'transparent').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'transparent').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'telkeypad_fg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'telkeypad_h') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'i') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'i') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'transparent') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'transparent') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'transparent') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'transparent') } property QtObject line: QtObject { - property color color: ColorsList.add(sectionName+'_b_line', 'l50').color + property var colorModel: ColorsList.add(sectionName+'_b_line', 'l50') property int bottomMargin: 4 property int height: 2 property int leftMargin: 8 @@ -46,7 +46,7 @@ QtObject { } property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_b_text', 'telkeypad_bg').color + property var colorModel: ColorsList.add(sectionName+'_b_text', 'telkeypad_bg') property int pointSize: Units.dp * 14 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml index e21555316..1a4f5476a 100644 --- a/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml @@ -8,45 +8,45 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Timeline' - property color color: ColorsList.add(sectionName+'_bg', 'q').color + property var colorModel: ColorsList.add(sectionName+'_bg', 'q') property QtObject ephemeralTimer: QtObject{ property string icon: 'timer_custom' property int iconSize : 30 - property color timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad').color - property color selectedTimerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer_c', icon, 'q').color + property var timerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer', icon, 'ad') + property var selectedTimerColor: ColorsList.addImageColor(sectionName+'_ephemeralTimer_c', icon, 'q') } property QtObject contact: QtObject { property int height: 60 property QtObject backgroundColor: QtObject { - property color a: ColorsList.add(sectionName+'_contact_bg_a', 'timeline_bg_1').color - property color b: ColorsList.add(sectionName+'_contact_bg_b', 'timeline_bg_2').color - property color selected: ColorsList.add(sectionName+'_contact_bg_c', 'i').color + property var a: ColorsList.add(sectionName+'_contact_bg_a', 'timeline_bg_1') + property var b: ColorsList.add(sectionName+'_contact_bg_b', 'timeline_bg_2') + property var selected: ColorsList.add(sectionName+'_contact_bg_c', 'i') } property QtObject subtitle: QtObject { property QtObject color: QtObject { - property color normal: ColorsList.add(sectionName+'_contact_subtitle_n', 'n').color - property color selected: ColorsList.add(sectionName+'_contact_subtitle_c', 'q').color + property var normal: ColorsList.add(sectionName+'_contact_subtitle_n', 'n') + property var selected: ColorsList.add(sectionName+'_contact_subtitle_c', 'q') } } property QtObject title: QtObject { property QtObject color: QtObject { - property color normal: ColorsList.add(sectionName+'_contact_title_n', 'j').color - property color selected: ColorsList.add(sectionName+'_contact_title_c', 'q').color + property var normal: ColorsList.add(sectionName+'_contact_title_n', 'j') + property var selected: ColorsList.add(sectionName+'_contact_title_c', 'q') } } } property QtObject legend: QtObject { property QtObject backgroundColor: QtObject { - property color normal: ColorsList.add(sectionName+'_legend_bg_n', 'f').color - property color hovered: ColorsList.add(sectionName+'_legend_bg_h', 'c').color + property var normal: ColorsList.add(sectionName+'_legend_bg_n', 'f') + property var hovered: ColorsList.add(sectionName+'_legend_bg_h', 'c') } - property color color: ColorsList.add(sectionName+'_legend', 'd').color + property var colorModel: ColorsList.add(sectionName+'_legend', 'd') property int pointSize: Units.dp * 10 property int height: 30 property int iconSize: 28 @@ -56,12 +56,12 @@ QtObject { property int spacing: 1 } property QtObject filterField: QtObject { - property color borderColor: ColorsList.add(sectionName+'_filter_border', 'border').color + property var borderColor: ColorsList.add(sectionName+'_filter_border', 'border') } property QtObject searchField: QtObject { - property color color: ColorsList.add(sectionName+'_searchField', 'c').color - property color borderColor: ColorsList.add(sectionName+'_searchField_border', 'border').color + property var colorModel: ColorsList.add(sectionName+'_searchField', 'c') + property var borderColor: ColorsList.add(sectionName+'_searchField_border', 'border') property int pointSize: Units.dp * 9 } @@ -69,23 +69,23 @@ QtObject { property int iconSize: 40 property string name : 'delete_on_selected' property string icon : 'delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_h_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_n_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') } property QtObject deleteAction: QtObject { property int iconSize: 40 property string name : 'delete' property string icon : 'delete_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') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsListViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsListViewStyle.qml index e104e3352..cbeb8cb7c 100644 --- a/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsListViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsListViewStyle.qml @@ -24,17 +24,17 @@ QtObject { property QtObject results : QtObject{ property int topMargin : 10 - property color color : ColorsList.add(sectionName+'_results', 'g').color + property var colorModel : ColorsList.add(sectionName+'_results', 'g') property QtObject title : QtObject{ property int topMargin: 10 property int leftMargin: 20 - property color color: ColorsList.add(sectionName+'_results_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_results_title', 'j') property int pointSize : Units.dp * 11 property int weight : Font.DemiBold } property QtObject header: QtObject{ property int rightMargin: 55 - property color color: Colors.t.color + property var colorModel: ColorsList.add(sectionName+'_results_header', 'j') property int weight : Font.Light property int pointSize : Units.dp * 10 @@ -44,45 +44,45 @@ QtObject { property QtObject leaveButton : QtObject { property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add(sectionName+'_leave_bg_d', 'o').color - property color hovered: ColorsList.add(sectionName+'_leave_bg_h', 'j').color - property color normal: ColorsList.add(sectionName+'_leave_bg_n', 'k').color - property color pressed: ColorsList.add(sectionName+'_leave_bg_p', 'i').color + property var disabled: ColorsList.add(sectionName+'_leave_bg_d', 'o') + property var hovered: ColorsList.add(sectionName+'_leave_bg_h', 'j') + property var normal: ColorsList.add(sectionName+'_leave_bg_n', 'k') + property var pressed: ColorsList.add(sectionName+'_leave_bg_p', 'i') } property QtObject textColor: QtObject { - property color disabled: ColorsList.add(sectionName+'_leave_text_d', 'q').color - property color hovered: ColorsList.add(sectionName+'_leave_text_h', 'q').color - property color normal: ColorsList.add(sectionName+'_leave_text_n', 'i').color - property color pressed: ColorsList.add(sectionName+'_leave_text_p', 'q').color + property var disabled: ColorsList.add(sectionName+'_leave_text_d', 'q') + property var hovered: ColorsList.add(sectionName+'_leave_text_h', 'q') + property var normal: ColorsList.add(sectionName+'_leave_text_n', 'i') + property var pressed: ColorsList.add(sectionName+'_leave_text_p', 'q') } property QtObject borderColor : QtObject{ - property color disabled: ColorsList.add(sectionName+'_leave_border_d', 'q').color - property color hovered: ColorsList.add(sectionName+'_leave_border_h', 'q').color - property color normal: ColorsList.add(sectionName+'_leave_border_n', 'i').color - property color pressed: ColorsList.add(sectionName+'_leave_border_p', 'q').color + property var disabled: ColorsList.add(sectionName+'_leave_border_d', 'q') + property var hovered: ColorsList.add(sectionName+'_leave_border_h', 'q') + property var normal: ColorsList.add(sectionName+'_leave_border_n', 'i') + property var pressed: ColorsList.add(sectionName+'_leave_border_p', 'q') } } property QtObject addParticipant: QtObject { property int iconSize: 30 property string name : 'addParticipant' property string icon : 'add_participant_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 removeParticipant: QtObject { property int iconSize: 30 property string name : 'removeParticipant' property string icon : 'remove_participant_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') } } diff --git a/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml index 1a21e49e0..bab96c1f0 100644 --- a/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/View/ParticipantsViewStyle.qml @@ -11,7 +11,7 @@ QtObject { property QtObject entry: QtObject { property QtObject status: QtObject { - property color color : ColorsList.add(sectionName+'_entry_status', 'g').color + property var colorModel : ColorsList.add(sectionName+'_entry_status', 'g') property int pointSize : Units.dp * 8 } } diff --git a/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml b/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml index 3567631c6..6dcfc50cd 100644 --- a/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml +++ b/linphone-app/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml @@ -14,17 +14,17 @@ QtObject { property int rightMargin: 10 property QtObject color: QtObject { - property color hovered: ColorsList.add(sectionName+'_entry_h', 'o').color - property color normal: ColorsList.add(sectionName+'_entry_n', 'q').color + property var hovered: ColorsList.add(sectionName+'_entry_h', 'o') + property var normal: ColorsList.add(sectionName+'_entry_n', 'q') } 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 } property QtObject separator: QtObject { - property color color: ColorsList.add(sectionName+'_entry_separator', 'c').color + property var colorModel: ColorsList.add(sectionName+'_entry_separator', 'c') property int height: 1 } } @@ -36,20 +36,20 @@ QtObject { property QtObject button: QtObject { property int height: 40 - property color color: ColorsList.add(sectionName+'_header_button', 'q').color + property var colorModel: ColorsList.add(sectionName+'_header_button', 'q') } property QtObject color: QtObject { - property color normal: ColorsList.add(sectionName+'_header_n', 'j').color - property color pressed: ColorsList.add(sectionName+'_header_p', 'i').color + property var normal: ColorsList.add(sectionName+'_header_n', 'j') + property var pressed: ColorsList.add(sectionName+'_header_p', 'i') } property QtObject text: QtObject { property int pointSize: Units.dp * 9 property QtObject color: QtObject { - property color normal: ColorsList.add(sectionName+'_header_text_n', 'q').color - property color pressed: ColorsList.add(sectionName+'_header_text_p', 'q').color + property var normal: ColorsList.add(sectionName+'_header_text_n', 'q') + property var pressed: ColorsList.add(sectionName+'_header_text_p', 'q') } } } @@ -57,45 +57,45 @@ QtObject { property int iconSize: 36 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject call: QtObject { property int iconSize: 36 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 36 property string name : 'chat' property string icon : 'chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject history: QtObject { property int iconSize: 36 property string icon : 'history_custom' property string name : 'history' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.qml b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.qml index c04feaa4a..f65d9e6e8 100644 --- a/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.qml +++ b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypad.qml @@ -16,7 +16,7 @@ Rectangle { signal sendDtmf(var dtmf) signal keyPressed(var event) - color: TelKeypadStyle.color // useless as it is overridden by buttons color, but keep it if buttons are transparent + color: TelKeypadStyle.colorModel.color // useless as it is overridden by buttons color, but keep it if buttons are transparent onActiveFocusChanged: {if(activeFocus) selectedArea.border.width=TelKeypadStyle.selectedBorderWidth; else selectedArea.border.width=0} Keys.onPressed: keyPressed(event) layer { @@ -111,7 +111,7 @@ Rectangle { id: selectedArea anchors.fill:parent color:"transparent" - border.color:TelKeypadStyle.selectedColor + border.color:TelKeypadStyle.selectedColor.color border.width:0 focus:false enabled:false diff --git a/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml index 3dd2ddd4e..badfa4aef 100644 --- a/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml +++ b/linphone-app/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml @@ -74,7 +74,7 @@ Item { id: charText Layout.fillHeight: true Layout.fillWidth: true - color: TelKeypadStyle.button.text.color + color: TelKeypadStyle.button.text.colorModel.color elide: Text.ElideRight font { @@ -90,7 +90,7 @@ Item { Icon{ icon: TelKeypadStyle.voicemail.icon iconSize: charText.height/2 - overwriteColor: TelKeypadStyle.button.text.color + overwriteColor: TelKeypadStyle.button.text.colorModel.color visible: button.showVoicemail } } @@ -98,7 +98,7 @@ Item { visible: text != '' Layout.fillHeight: true Layout.fillWidth: true - color: TelKeypadStyle.button.text.color + color: TelKeypadStyle.button.text.colorModel.color elide: Text.ElideRight font { diff --git a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml index b243b0be6..94e87adf4 100644 --- a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml +++ b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml @@ -33,7 +33,7 @@ Rectangle { // --------------------------------------------------------------------------- property bool showFilterView : false - color: TimelineStyle.color + color: TimelineStyle.colorModel.color ColumnLayout { anchors.fill: parent @@ -61,7 +61,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: TimelineStyle.legend.height Layout.alignment: Qt.AlignTop - color: showHistory.containsMouse?TimelineStyle.legend.backgroundColor.hovered:TimelineStyle.legend.backgroundColor.normal + color: showHistory.containsMouse?TimelineStyle.legend.backgroundColor.hovered.color:TimelineStyle.legend.backgroundColor.normal.color visible: showHistoryButton || showFiltersButtons MouseArea{// no more showing history @@ -80,7 +80,7 @@ Rectangle { Layout.fillWidth: true Layout.leftMargin: TimelineStyle.legend.leftMargin visible: showFiltersButtons - color: TimelineStyle.legend.color + color: TimelineStyle.legend.colorModel.color font.pointSize: TimelineStyle.legend.pointSize //: A title for filtering mode. text: qsTr('timelineFilter')+' : ' @@ -97,7 +97,7 @@ Rectangle { Layout.alignment: Qt.AlignRight icon: 'filter_params_custom' iconSize: TimelineStyle.legend.iconSize - overwriteColor: TimelineStyle.legend.color + overwriteColor: TimelineStyle.legend.colorModel.color visible: showFiltersButtons MouseArea{ anchors.fill:parent @@ -122,7 +122,7 @@ Rectangle { property bool searching: searchView.visible icon: (searchView.visible? 'close_custom': 'search_custom') iconSize: TimelineStyle.legend.iconSize - overwriteColor: TimelineStyle.legend.color + overwriteColor: TimelineStyle.legend.colorModel.color } } MouseArea{ @@ -141,7 +141,7 @@ Rectangle { property bool searching: searchView.visible icon: 'call_history_custom' iconSize: TimelineStyle.legend.iconSize - overwriteColor: TimelineStyle.legend.color + overwriteColor: TimelineStyle.legend.colorModel.color } } } @@ -154,7 +154,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: filterChoices.height Layout.alignment: Qt.AlignCenter - border.color: TimelineStyle.filterField.borderColor + border.color: TimelineStyle.filterField.borderColor.color border.width: 2 visible: timeline.showFilterView && !SettingsModel.useMinimalTimelineFilter @@ -243,7 +243,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: minimalFilterChoices.height Layout.alignment: Qt.AlignCenter - border.color: TimelineStyle.filterField.borderColor + border.color: TimelineStyle.filterField.borderColor.color border.width: 2 visible: timeline.showFilterView && SettingsModel.useMinimalTimelineFilter @@ -315,7 +315,7 @@ Rectangle { Layout.fillWidth: true Layout.preferredHeight: 40 Layout.alignment: Qt.AlignCenter - border.color: TimelineStyle.searchField.borderColor + border.color: TimelineStyle.searchField.borderColor.color border.width: 2 visible:false onVisibleChanged: if(visible){ @@ -335,7 +335,7 @@ Rectangle { width: parent.width - 14 icon: text == '' ? 'search_custom' : 'close_custom' iconSize: 30 - overwriteColor: TimelineStyle.searchField.color + overwriteColor: TimelineStyle.searchField.colorModel.color //: 'Search in the list' : ths is a placeholder when searching something in the timeline list placeholderText: qsTr('timelineSearchPlaceholderText') diff --git a/linphone-app/ui/modules/Linphone/Timeline/TimelineItem.qml b/linphone-app/ui/modules/Linphone/Timeline/TimelineItem.qml index 1f0741eff..c0cbfc41c 100644 --- a/linphone-app/ui/modules/Linphone/Timeline/TimelineItem.qml +++ b/linphone-app/ui/modules/Linphone/Timeline/TimelineItem.qml @@ -54,20 +54,26 @@ Item { height: mainItem.height width: mainItem.width color: isSelected - ? TimelineStyle.contact.backgroundColor.selected + ? TimelineStyle.contact.backgroundColor.selected.color : ( mainItem.modelIndex % 2 == 0 - ? TimelineStyle.contact.backgroundColor.a - : TimelineStyle.contact.backgroundColor.b + ? TimelineStyle.contact.backgroundColor.a.color + : TimelineStyle.contact.backgroundColor.b.color ) displayUnreadMessageCount: SettingsModel.standardChatEnabled || SettingsModel.secureChatEnabled entry: mainItem.timelineModel && mainItem.timelineModel.chatRoomModel + + property var subtitleSelectedColors: TimelineStyle.contact.subtitle.color.selected + property var subtitleNormalColors: TimelineStyle.contact.subtitle.color.normal + property var titleSelectedColors: TimelineStyle.contact.title.color.selected + property var titleNormalColors: TimelineStyle.contact.title.color.normal + subtitleColor: isSelected - ? TimelineStyle.contact.subtitle.color.selected - : TimelineStyle.contact.subtitle.color.normal + ? subtitleSelectedColors.color + : subtitleNormalColors.color titleColor: isSelected - ? TimelineStyle.contact.title.color.selected - : TimelineStyle.contact.title.color.normal + ? titleSelectedColors.color + : titleNormalColors.color showSubtitle: mainItem.timelineModel && (mainItem.timelineModel.chatRoomModel && (mainItem.timelineModel.chatRoomModel.isOneToOne || !mainItem.timelineModel.chatRoomModel.isConference)) showBusyIndicator: mainItem.timelineModel && mainItem.timelineModel.updating TooltipArea { @@ -78,7 +84,7 @@ Item { Icon{ icon: TimelineStyle.ephemeralTimer.icon iconSize: TimelineStyle.ephemeralTimer.iconSize - overwriteColor: mainItem.timelineModel && mainItem.timelineModel.selected ? TimelineStyle.ephemeralTimer.selectedTimerColor : TimelineStyle.ephemeralTimer.timerColor + overwriteColor: mainItem.timelineModel && mainItem.timelineModel.selected ? TimelineStyle.ephemeralTimer.selectedTimerColor.color : TimelineStyle.ephemeralTimer.timerColor.color anchors.right:parent.right anchors.bottom:parent.bottom anchors.bottomMargin: 7 diff --git a/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml b/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml index d6cfbd9cd..7cf857eb3 100644 --- a/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml +++ b/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml @@ -77,7 +77,7 @@ ColumnLayout { Layout.leftMargin: ParticipantsListViewStyle.results.title.leftMargin //: 'Participant list' text:qsTr('participantList') - color: ParticipantsListViewStyle.results.title.color + color: ParticipantsListViewStyle.results.title.colorModel.color font.pointSize:ParticipantsListViewStyle.results.title.pointSize font.weight: ParticipantsListViewStyle.results.title.weight } @@ -90,7 +90,7 @@ ColumnLayout { //~ one word for admin status text : qsTr('adminStatus') - color: ParticipantsListViewStyle.results.header.color + color: ParticipantsListViewStyle.results.header.colorModel.color font.pointSize: ParticipantsListViewStyle.results.header.pointSize font.weight: ParticipantsListViewStyle.results.header.weight visible: mainLayout.isAdmin && participantView.count > 0 diff --git a/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml b/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml index 697114204..363db6a19 100644 --- a/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml +++ b/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml @@ -86,7 +86,7 @@ ScrollableListView { sourceComponent: Rectangle { anchors.fill: parent - color: SipAddressesViewStyle.entry.color.normal + color: SipAddressesViewStyle.entry.color.normal.color RowLayout { anchors { @@ -161,8 +161,8 @@ ScrollableListView { Rectangle { anchors.fill: parent color: parent.pressed - ? SipAddressesViewStyle.header.color.pressed - : SipAddressesViewStyle.header.color.normal + ? SipAddressesViewStyle.header.color.pressed.color + : SipAddressesViewStyle.header.color.normal.color Text { anchors { @@ -177,8 +177,8 @@ ScrollableListView { } color: headerButton.pressed - ? SipAddressesViewStyle.header.text.color.pressed - : SipAddressesViewStyle.header.text.color.normal + ? SipAddressesViewStyle.header.text.color.pressed.color + : SipAddressesViewStyle.header.text.color.normal.color text: sipAddressesView.headerButtonDescription } @@ -206,7 +206,7 @@ ScrollableListView { delegate: Rectangle { id: sipAddressEntry - color: SipAddressesViewStyle.entry.color.normal + color: SipAddressesViewStyle.entry.color.normal.color height: SipAddressesViewStyle.entry.height width: parent ? parent.width : 0 @@ -322,7 +322,7 @@ ScrollableListView { sourceComponent: Component{ BusyIndicator{ - color: BusyIndicatorStyle.alternateColor + color: BusyIndicatorStyle.alternateColor.color running: true } } @@ -336,7 +336,7 @@ ScrollableListView { // Separator. Rectangle { - color: SipAddressesViewStyle.entry.separator.color + color: SipAddressesViewStyle.entry.separator.colorModel.color height: SipAddressesViewStyle.entry.separator.height width: parent.width visible: sipAddressesView.showSeparator @@ -348,12 +348,12 @@ ScrollableListView { when: mouseArea.containsMouse && sipAddressesView.isSelectable PropertyChanges { - color: SipAddressesViewStyle.entry.color.hovered + color: SipAddressesViewStyle.entry.color.hovered.color target: sipAddressEntry } PropertyChanges { - color: SipAddressesViewStyle.entry.indicator.color + color: SipAddressesViewStyle.entry.indicator.colorModel.color target: indicator } } diff --git a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml index ea5665d5f..c8d566e58 100644 --- a/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml +++ b/linphone-app/ui/modules/Linphone/View/SipAddressesView.qml @@ -86,7 +86,7 @@ ScrollableListView { sourceComponent: Rectangle { anchors.fill: parent - color: SipAddressesViewStyle.entry.color.normal + color: SipAddressesViewStyle.entry.color.normal.color RowLayout { anchors { @@ -162,8 +162,8 @@ ScrollableListView { Rectangle { anchors.fill: parent color: parent.pressed - ? SipAddressesViewStyle.header.color.pressed - : SipAddressesViewStyle.header.color.normal + ? SipAddressesViewStyle.header.color.pressed.color + : SipAddressesViewStyle.header.color.normal.color Text { anchors { @@ -178,8 +178,8 @@ ScrollableListView { } color: headerButton.pressed - ? SipAddressesViewStyle.header.text.color.pressed - : SipAddressesViewStyle.header.text.color.normal + ? SipAddressesViewStyle.header.text.color.pressed.color + : SipAddressesViewStyle.header.text.color.normal.color text: sipAddressesView.headerButtonDescription } @@ -211,7 +211,7 @@ ScrollableListView { property var entry: $modelData - color: SipAddressesViewStyle.entry.color.normal + color: SipAddressesViewStyle.entry.color.normal.color height: SipAddressesViewStyle.entry.height width: parent ? parent.width : 0 @@ -315,7 +315,7 @@ ScrollableListView { // Separator. Rectangle { - color: SipAddressesViewStyle.entry.separator.color + color: SipAddressesViewStyle.entry.separator.colorModel.color height: SipAddressesViewStyle.entry.separator.height width: parent.width visible: sipAddressesView.showSeparator @@ -327,12 +327,12 @@ ScrollableListView { when: mouseArea.containsMouse && sipAddressesView.isSelectable PropertyChanges { - color: SipAddressesViewStyle.entry.color.hovered + color: SipAddressesViewStyle.entry.color.hovered.color target: sipAddressEntry } PropertyChanges { - color: SipAddressesViewStyle.entry.indicator.color + color: SipAddressesViewStyle.entry.indicator.colorModel.color target: indicator } } diff --git a/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml b/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml index 53afc0f04..4e3a446eb 100644 --- a/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml +++ b/linphone-app/ui/views/App/Calls/AbstractStartingCall.qml @@ -20,7 +20,7 @@ Rectangle { Component.onDestruction: _sipAddressObserver=null// Need to set it to null because of not calling destructor if not. // --------------------------------------------------------------------------- - color: CallStyle.backgroundColor + color: CallStyle.backgroundColor.color ColumnLayout { anchors { @@ -50,7 +50,7 @@ Rectangle { BusyIndicator { anchors.horizontalCenter: parent.horizontalCenter - color: CallStyle.header.busyIndicator.color + color: CallStyle.header.busyIndicator.colorModel.color height: CallStyle.header.busyIndicator.height width: CallStyle.header.busyIndicator.width diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.qml b/linphone-app/ui/views/App/Calls/CallsWindow.qml index 5a2b81b69..965191e0f 100644 --- a/linphone-app/ui/views/App/Calls/CallsWindow.qml +++ b/linphone-app/ui/views/App/Calls/CallsWindow.qml @@ -97,7 +97,7 @@ Window { childA: Rectangle { id: leftPaned anchors.fill: parent - color: CallsWindowStyle.callsList.color + color: CallsWindowStyle.callsList.colorModel.color ColumnLayout { anchors.fill: parent @@ -116,8 +116,8 @@ Window { end: Qt.point(0, height) gradient: Gradient { - GradientStop { position: 0.0; color: CallsWindowStyle.callsList.header.color1 } - GradientStop { position: 1.0; color: CallsWindowStyle.callsList.header.color2 } + GradientStop { position: 0.0; color: CallsWindowStyle.callsList.header.color1.color } + GradientStop { position: 1.0; color: CallsWindowStyle.callsList.header.color2.color } } } RowLayout{ diff --git a/linphone-app/ui/views/App/Calls/Conference.qml b/linphone-app/ui/views/App/Calls/Conference.qml index 5ab5d4b29..e6653659d 100644 --- a/linphone-app/ui/views/App/Calls/Conference.qml +++ b/linphone-app/ui/views/App/Calls/Conference.qml @@ -18,7 +18,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: CallStyle.backgroundColor + color: CallStyle.backgroundColor.color // --------------------------------------------------------------------------- @@ -57,7 +57,7 @@ Rectangle { horizontalAlignment: Text.AlignHCenter text: qsTr('conferenceTitle') - color: ConferenceStyle.description.color + color: ConferenceStyle.description.colorModel.color font { bold: true @@ -160,7 +160,7 @@ Rectangle { verticalCenter: parent.verticalCenter } - color: CallStyle.header.busyIndicator.color + color: CallStyle.header.busyIndicator.colorModel.color height: CallStyle.header.busyIndicator.height width: CallStyle.header.busyIndicator.width diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml index 74b5921b6..ff52d08d2 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/CallSipAddress.qml @@ -47,7 +47,7 @@ DialogPlus { Layout.fillWidth: true icon: text == '' ? 'search_custom' : 'close_custom' - overwriteColor: CallSipAddressStyle.searchField.color + overwriteColor: CallSipAddressStyle.searchField.colorModel.color onTextChanged: sipAddressesModel.setFilter(text) } diff --git a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml index e4a914ecb..32b945680 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/CallTransfer.qml @@ -69,7 +69,7 @@ DialogPlus { Layout.fillWidth: true icon: text == '' ? 'search_custom' : 'close_custom' - overwriteColor: CallTransferStyle.searchField.color + overwriteColor: CallTransferStyle.searchField.colorModel.color onTextChanged: sipAddressesModel.setFilter(text) } diff --git a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml index 076893695..37b911f5e 100644 --- a/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml +++ b/linphone-app/ui/views/App/Calls/Dialogs/ConferenceManager.qml @@ -79,7 +79,7 @@ DialogPlus { Layout.fillWidth: true icon: text == '' ? 'search_custom' : 'close_custom' - overwriteColor: ConferenceManagerStyle.searchField.color + overwriteColor: ConferenceManagerStyle.searchField.colorModel.color onTextChanged: conferenceHelperModel.setFilter(text) } @@ -131,7 +131,7 @@ DialogPlus { Layout.preferredWidth: ConferenceManagerStyle.columns.separator.width Layout.rightMargin: ConferenceManagerStyle.columns.separator.rightMargin - color: ConferenceManagerStyle.columns.separator.color + color: ConferenceManagerStyle.columns.separator.colorModel.color } // ------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml index 9b0bec8f0..96cca8a9a 100644 --- a/linphone-app/ui/views/App/Calls/Incall.qml +++ b/linphone-app/ui/views/App/Calls/Incall.qml @@ -61,7 +61,7 @@ Rectangle { // --------------------------------------------------------------------------- - color: IncallStyle.backgroundColor + color: IncallStyle.backgroundColor.color Connections { target: callModel @@ -82,7 +82,7 @@ Rectangle { } anchors.fill: parent visible: callModel.pausedByUser - color: IncallStyle.pauseArea.backgroundColor + color: IncallStyle.pauseArea.backgroundColor.color z: 1 ColumnLayout{ anchors.fill: parent @@ -104,7 +104,7 @@ Rectangle { text: qsTr('incallPauseWarning') font.pointSize: IncallStyle.pauseArea.title.pointSize font.weight: IncallStyle.pauseArea.title.weight - color: IncallStyle.pauseArea.title.color + color: IncallStyle.pauseArea.title.colorModel.color } Text{ Layout.topMargin: 10 @@ -113,7 +113,7 @@ Rectangle { text: qsTr('incallPauseHint') font.pointSize: IncallStyle.pauseArea.description.pointSize font.weight: IncallStyle.pauseArea.description.weight - color: IncallStyle.pauseArea.description.color + color: IncallStyle.pauseArea.description.colorModel.color } Item{ Layout.fillWidth: true @@ -217,7 +217,7 @@ Rectangle { : callModel ? elaspedTime : '' - color: IncallStyle.title.color + color: IncallStyle.title.colorModel.color font.pointSize: IncallStyle.title.pointSize } Text{ @@ -228,7 +228,7 @@ Rectangle { text: !conferenceModel && callModel ? SipAddressesModel.cleanSipAddress(callModel.peerAddress) : '' - color: IncallStyle.title.color + color: IncallStyle.title.colorModel.color font.pointSize: IncallStyle.title.addressPointSize } @@ -237,8 +237,8 @@ Rectangle { id: messageBanner anchors.fill: parent - textColor: IncallStyle.header.messageBanner.textColor - color: IncallStyle.header.messageBanner.color + textColor: IncallStyle.header.messageBanner.textColor.color + color: IncallStyle.header.messageBanner.colorModel.color showIcon: false pointSize: IncallStyle.header.messageBanner.pointSize } @@ -388,7 +388,7 @@ Rectangle { active: parent.visible sourceComponent: Component{ BusyIndicator{ - color: IncallStyle.buzyColor + color: IncallStyle.buzyColor.color } } } @@ -400,7 +400,7 @@ Rectangle { ? qsTr('incallWaitParticipantMessage') //: 'The meeting is not ready. Please Wait...' : Waiting message for starting a meeting. : qsTr('incallWaitMessage') - color: IncallStyle.buzyColor + color: IncallStyle.buzyColor.color } } } @@ -461,13 +461,13 @@ Rectangle { Icon{ icon: IncallStyle.recordWarning.icon iconSize: IncallStyle.recordWarning.iconSize - overwriteColor: IncallStyle.recordWarning.iconColor + overwriteColor: IncallStyle.recordWarning.iconColor.color } Text{ Layout.fillWidth: true //: 'This call is being recorded.' : Warn the user that the remote is currently recording the call. text: qsTr('callWarningRecord') - color: IncallStyle.recordWarning.color + color: IncallStyle.recordWarning.colorModel.color font.italic: true font.pointSize: IncallStyle.recordWarning.pointSize wrapMode: Text.WordWrap diff --git a/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml index 3a0e10a68..1ef293152 100644 --- a/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml +++ b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml @@ -71,8 +71,8 @@ Item { showCloseButton: false showActiveSpeakerOverlay: false // This is an active speaker. We don't need to show the indicator. showCustomButton: false - avatarStickerBackgroundColor: isPreview ? IncallStyle.container.avatar.stickerPreviewBackgroundColor : IncallStyle.container.avatar.stickerBackgroundColor - avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: isPreview ? IncallStyle.container.avatar.stickerPreviewBackgroundColor.color : IncallStyle.container.avatar.stickerBackgroundColor.color + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor.color } Item{// Need an item to not override Sticker internal states. States are needed for changing anchors. id: preview @@ -101,8 +101,8 @@ Item { showCloseButton: false showCustomButton: false showAvatarBorder: true - avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerPreviewBackgroundColor - avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerPreviewBackgroundColor.color + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor.color } active: parent.visible } @@ -157,8 +157,8 @@ Item { showCloseButton: false showCustomButton: false showAvatarBorder: true - avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor - avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerBackgroundColor.color + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor.color } } } diff --git a/linphone-app/ui/views/App/Calls/IncallFullscreen.qml b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml index b7dffe107..d5ddd951f 100644 --- a/linphone-app/ui/views/App/Calls/IncallFullscreen.qml +++ b/linphone-app/ui/views/App/Calls/IncallFullscreen.qml @@ -78,7 +78,7 @@ Window { focus: true Keys.onEscapePressed: window.exit() - color: hideButtons ? IncallStyle.fullBackgroundColor : IncallStyle.backgroundColor + color: hideButtons ? IncallStyle.fullBackgroundColor.color : IncallStyle.backgroundColor.color Connections { target: callModel @@ -95,7 +95,7 @@ Window { Rectangle{ anchors.fill: parent visible: callModel && callModel.pausedByUser - color: IncallStyle.pauseArea.backgroundColor + color: IncallStyle.pauseArea.backgroundColor.color z: 1 ColumnLayout{ anchors.fill: parent @@ -118,7 +118,7 @@ Window { text: qsTr('incallPauseWarning') font.pointSize: IncallStyle.pauseArea.title.pointSize font.weight: IncallStyle.pauseArea.title.weight - color: IncallStyle.pauseArea.title.color + color: IncallStyle.pauseArea.title.colorModel.color } Text{ Layout.topMargin: 10 @@ -127,7 +127,7 @@ Window { text: qsTr('incallPauseHint') font.pointSize: IncallStyle.pauseArea.description.pointSize font.weight: IncallStyle.pauseArea.description.weight - color: IncallStyle.pauseArea.description.color + color: IncallStyle.pauseArea.description.colorModel.color } Item{ Layout.fillWidth: true @@ -208,7 +208,7 @@ Window { horizontalAlignment: Qt.AlignHCenter Layout.fillWidth: true text: conference.conferenceModel ? conference.conferenceModel.subject+ elaspedTime : '' - color: IncallStyle.title.color + color: IncallStyle.title.colorModel.color font.pointSize: IncallStyle.title.pointSize } // Mode buttons @@ -353,13 +353,13 @@ Window { Layout.preferredWidth: 50 Layout.alignment: Qt.AlignCenter running: parent.visible - color: IncallStyle.buzyColor + color: IncallStyle.buzyColor.color } Text{ Layout.alignment: Qt.AlignCenter //: 'The meeting is not ready. Please Wait...' : Waiting message for starting a meeting. text: qsTr('incallWaitMessage') - color: IncallStyle.buzyColor + color: IncallStyle.buzyColor.color } } } @@ -420,13 +420,13 @@ Window { Icon{ icon: IncallStyle.recordWarning.icon iconSize: IncallStyle.recordWarning.iconSize - overwriteColor: IncallStyle.recordWarning.iconColor + overwriteColor: IncallStyle.recordWarning.iconColor.color } Text{ Layout.fillWidth: true //: 'This call is being recorded.' : Warn the user that the remote is currently recording the call. text: qsTr('callWarningRecord') - color: IncallStyle.recordWarning.color + color: IncallStyle.recordWarning.colorModel.color font.italic: true font.pointSize: IncallStyle.recordWarning.pointSize wrapMode: Text.WordWrap diff --git a/linphone-app/ui/views/App/Calls/IncallGrid.qml b/linphone-app/ui/views/App/Calls/IncallGrid.qml index 56685c608..d8f78e6c5 100644 --- a/linphone-app/ui/views/App/Calls/IncallGrid.qml +++ b/linphone-app/ui/views/App/Calls/IncallGrid.qml @@ -56,8 +56,8 @@ Mosaic { isPaused: !isPreview && avatarCell.currentDevice && avatarCell.currentDevice.isPaused showCloseButton: false showCustomButton: false - avatarStickerBackgroundColor: isPreview? IncallStyle.container.avatar.stickerPreviewBackgroundColor : IncallStyle.container.avatar.stickerBackgroundColor - avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor + avatarStickerBackgroundColor: isPreview? IncallStyle.container.avatar.stickerPreviewBackgroundColor.color : IncallStyle.container.avatar.stickerBackgroundColor.color + avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor.color //onCloseRequested: participantDevices.showMe = false } diff --git a/linphone-app/ui/views/App/Calls/WaitingRoom.qml b/linphone-app/ui/views/App/Calls/WaitingRoom.qml index eafe22ec0..c162a447b 100644 --- a/linphone-app/ui/views/App/Calls/WaitingRoom.qml +++ b/linphone-app/ui/views/App/Calls/WaitingRoom.qml @@ -17,7 +17,7 @@ import 'qrc:/ui/scripts/Utils/utils.js' as Utils Rectangle { id: mainItem - color: WaitingRoomStyle.backgroundColor + color: WaitingRoomStyle.backgroundColor.color property ConferenceInfoModel conferenceInfoModel property CallModel callModel // Store the call for processing calling. property bool previewLoaderEnabled: callModel ? callModel.videoEnabled : true @@ -58,7 +58,7 @@ Rectangle { Layout.preferredHeight: WaitingRoomStyle.header.busyIndicator.height Layout.preferredWidth: WaitingRoomStyle.header.busyIndicator.width Layout.topMargin: 30 - color: WaitingRoomStyle.header.busyIndicator.color + color: WaitingRoomStyle.header.busyIndicator.colorModel.color visible: mainItem.callModel && mainItem.callModel.status !== CallModel.CallStatusConnected && !mainItem.isEnded } @@ -75,7 +75,7 @@ Rectangle { //: "Incoming call" : status of the call in waiting room when user receive a call. : qsTr("incomingCallStatus") : '' - color: WaitingRoomStyle.title.color + color: WaitingRoomStyle.title.colorModel.color font.pointSize: WaitingRoomStyle.title.pointSize horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter @@ -84,7 +84,7 @@ Rectangle { Text { id: elapsedTime Layout.alignment: Qt.AlignCenter - color: WaitingRoomStyle.elapsedTime.color + color: WaitingRoomStyle.elapsedTime.colorModel.color font.pointSize: WaitingRoomStyle.elapsedTime.pointSize horizontalAlignment: Text.AlignHCenter width: parent.width @@ -107,7 +107,7 @@ Rectangle { Layout.topMargin: mainItem.callModel ? 0 : 40 text: mainItem.conferenceInfoModel ? mainItem.conferenceInfoModel.subject : (mainItem._sipAddressObserver ? UtilsCpp.getDisplayName(mainItem._sipAddressObserver.peerAddress) : '') - color: WaitingRoomStyle.title.color + color: WaitingRoomStyle.title.colorModel.color font.pointSize: WaitingRoomStyle.title.pointSize horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter @@ -122,7 +122,7 @@ Rectangle { horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter - color: WaitingRoomStyle.callError.color + color: WaitingRoomStyle.callError.colorModel.color font.pointSize: WaitingRoomStyle.callError.pointSize width: parent.width visible: mainItem.callModel && mainItem.callModel.callError @@ -209,7 +209,7 @@ Rectangle { Text{ Layout.alignment: Qt.AlignCenter text: mainItem._sipAddressObserver ? UtilsCpp.getDisplayName(mainItem._sipAddressObserver.peerAddress) : '' - color: WaitingRoomStyle.callee.color + color: WaitingRoomStyle.callee.colorModel.color font.pointSize: WaitingRoomStyle.callee.displayNamePointSize horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -218,7 +218,7 @@ Rectangle { Text{ Layout.fillWidth: true text: mainItem.callModel && SipAddressesModel.cleanSipAddress(mainItem.callModel.peerAddress) - color: WaitingRoomStyle.callee.color + color: WaitingRoomStyle.callee.colorModel.color font.pointSize: WaitingRoomStyle.callee.addressPointSize horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -365,7 +365,7 @@ Rectangle { width: parent.width + 10 visible: false - color: WaitingRoomStyle.menuColor + color: WaitingRoomStyle.menuColor.color radius: 5 ColumnLayout{ diff --git a/linphone-app/ui/views/App/Dialog/NewConference.qml b/linphone-app/ui/views/App/Dialog/NewConference.qml index 93ae199e3..5efe9c5dc 100644 --- a/linphone-app/ui/views/App/Dialog/NewConference.qml +++ b/linphone-app/ui/views/App/Dialog/NewConference.qml @@ -56,7 +56,7 @@ DialogPlus { Layout.fillWidth: true //: 'Would you like to encrypt your meeting ?' : Ask about setting the meeting as secured. text:qsTr('askEncryption') - color: NewConferenceStyle.askEncryptionColor + color: NewConferenceStyle.askEncryptionColor.color font.pointSize: NewConferenceStyle.titles.pointSize font.weight: Font.DemiBold } @@ -207,7 +207,7 @@ DialogPlus { textFormat: Text.RichText //: 'Subject' : Label of a text field about the subject of the conference text :qsTr('subjectLabel') +'*' - color: NewConferenceStyle.titles.textColor + color: NewConferenceStyle.titles.textColor.color font.pointSize: NewConferenceStyle.titles.pointSize font.weight: NewConferenceStyle.titles.weight } @@ -257,7 +257,7 @@ DialogPlus { Layout.rightMargin: 15 //: 'Would you like to schedule your meeting?' : Ask about setting the meeting as scheduled. text: qsTr('newConferenceScheduleTitle') - color: NewConferenceStyle.titles.textColor + color: NewConferenceStyle.titles.textColor.color font.pointSize: NewConferenceStyle.titles.pointSize font.weight: NewConferenceStyle.titles.weight wrapMode: Text.WordWrap @@ -278,21 +278,21 @@ DialogPlus { Text{textFormat: Text.RichText; //: 'Date' : Date label. text: qsTr('newConferenceDate')+'*' - Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } + Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor.color; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } Text{textFormat: Text.RichText //: 'Time' : Time label. text: qsTr('newConferenceTimeTitle')+'*' - Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } + Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor.color; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } Text{textFormat: Text.RichText //: 'Duration' : Duration label. text: qsTr('newConferenceDurationTitle') - Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } + Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor.color; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } Text{textFormat: Text.RichText //: 'Timezone' : Timezone label. text: qsTr('newConferenceTimezoneTitle') - Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } + Layout.preferredWidth: parent.cellWidth; wrapMode: Text.WordWrap; color: NewConferenceStyle.titles.textColor.color; font.weight: NewConferenceStyle.titles.weight; font.pointSize: NewConferenceStyle.titles.pointSize } TextField{id: dateField; Layout.preferredWidth: parent.cellWidth - color: NewConferenceStyle.fields.textColor; font.weight: NewConferenceStyle.fields.weight; font.pointSize: NewConferenceStyle.fields.pointSize + color: NewConferenceStyle.fields.textColor.color; font.weight: NewConferenceStyle.fields.weight; font.pointSize: NewConferenceStyle.fields.pointSize property date currentDate: new Date() function getDate(){ return currentDate @@ -317,7 +317,7 @@ DialogPlus { } } TextField{id: timeField; Layout.preferredWidth: parent.cellWidth - color: NewConferenceStyle.fields.textColor; font.weight: NewConferenceStyle.fields.weight; font.pointSize: NewConferenceStyle.fields.pointSize + color: NewConferenceStyle.fields.textColor.color; font.weight: NewConferenceStyle.fields.weight; font.pointSize: NewConferenceStyle.fields.pointSize function getTime(){ return Date.fromLocaleTimeString(scheduleForm.locale, timeField._text, 'hh:mm') } @@ -415,7 +415,7 @@ DialogPlus { textFormat: Text.RichText //: 'Add a description' : Label of a text field about the description of the conference text : qsTr('newConferenceDescriptionTitle') - color: NewConferenceStyle.titles.textColor + color: NewConferenceStyle.titles.textColor.color font.pointSize: NewConferenceStyle.titles.pointSize font.weight: NewConferenceStyle.titles.weight } @@ -477,7 +477,7 @@ DialogPlus { Layout.fillHeight: true Layout.fillWidth: true border.width: 1 - border.color: NewConferenceStyle.addressesBorderColor + border.color: NewConferenceStyle.addressesBorderColor.color ColumnLayout { anchors.fill: parent @@ -532,7 +532,7 @@ DialogPlus { //~ one word for admin status text : qsTr('adminStatus') - color: NewConferenceStyle.addressesAdminColor + color: NewConferenceStyle.addressesAdminColor.color font.pointSize: Units.dp * 11 font.weight: Font.Light visible: participantView.count > 0 @@ -591,7 +591,7 @@ DialogPlus { textFormat: Text.RichText //: 'Required' : Word relative to a star to explain that it is a requirement (Field form) text : '* '+qsTr('requiredField') - color: NewConferenceStyle.requiredColor + color: NewConferenceStyle.requiredColor.color font.pointSize: Units.dp * 8 } } @@ -631,11 +631,11 @@ DialogPlus { Layout.preferredHeight: 20 Layout.preferredWidth: 20 Layout.alignment: Qt.AlignCenter - color: NewConferenceStyle.busy.color + color: NewConferenceStyle.busy.colorModel.color } Text{ Layout.fillWidth: true - color: NewConferenceStyle.busy.color + color: NewConferenceStyle.busy.colorModel.color //: 'Operations in progress, please wait' : Waiting message till the end of operations when creating a conference. text: qsTr('busyOperations') font.pointSize: NewConferenceStyle.busy.pointSize diff --git a/linphone-app/ui/views/App/Main/Assistant.qml b/linphone-app/ui/views/App/Main/Assistant.qml index 07f3cb7c2..a9e338e3a 100644 --- a/linphone-app/ui/views/App/Main/Assistant.qml +++ b/linphone-app/ui/views/App/Main/Assistant.qml @@ -14,7 +14,7 @@ Item { Rectangle { anchors.fill: parent - color: AssistantStyle.color + color: AssistantStyle.colorModel.color } function pushView (view, properties) { stack.pushView(view, properties) diff --git a/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml b/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml index 5adb3aed6..6e4beb68c 100644 --- a/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml +++ b/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithEmail.qml @@ -25,7 +25,7 @@ AssistantAbstractView { width: parent.width Text { - color: ActivateAppSipAccountWithEmailStyle.activationSteps.color + color: ActivateAppSipAccountWithEmailStyle.activationSteps.colorModel.color font.pointSize: ActivateAppSipAccountWithEmailStyle.activationSteps.pointSize horizontalAlignment: Text.AlignHCenter text: qsTr('activationSteps').replace('%1', assistantModel.email) diff --git a/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml b/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml index e6a7816b2..99e4f5290 100644 --- a/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml +++ b/linphone-app/ui/views/App/Main/Assistant/ActivateAppSipAccountWithPhoneNumber.qml @@ -25,7 +25,7 @@ AssistantAbstractView { width: parent.width Text { - color: ActivateAppSipAccountWithPhoneNumberStyle.activationSteps.color + color: ActivateAppSipAccountWithPhoneNumberStyle.activationSteps.colorModel.color font.pointSize: ActivateAppSipAccountWithPhoneNumberStyle.activationSteps.pointSize horizontalAlignment: Text.AlignHCenter text: qsTr('activationSteps').replace('%1', assistantModel.phoneNumber) diff --git a/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml index 5f4c7b19c..9dd70a17e 100644 --- a/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml +++ b/linphone-app/ui/views/App/Main/Assistant/AssistantAbstractView.qml @@ -45,7 +45,7 @@ Item { anchors.top:parent.top anchors.topMargin:(visible?AssistantAbstractViewStyle.info.spacing:0) anchors.horizontalCenter: parent.horizontalCenter - color: AssistantAbstractViewStyle.info.title.color + color: AssistantAbstractViewStyle.info.title.colorModel.color elide: Text.ElideRight font { @@ -65,7 +65,7 @@ Item { anchors.topMargin:(visible?AssistantAbstractViewStyle.info.spacing:0) anchors.horizontalCenter: parent.horizontalCenter - color: AssistantAbstractViewStyle.info.description.color + color: AssistantAbstractViewStyle.info.description.colorModel.color elide: Text.ElideRight font.pointSize: AssistantAbstractViewStyle.info.description.pointSize diff --git a/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml index 1352c6693..4f37ff765 100644 --- a/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml +++ b/linphone-app/ui/views/App/Main/Assistant/AssistantHome.qml @@ -40,7 +40,7 @@ ColumnLayout { height: AssistantHomeStyle.info.title.height Layout.fillWidth: true - color: AssistantHomeStyle.info.title.color + color: AssistantHomeStyle.info.title.colorModel.color elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter @@ -59,7 +59,7 @@ ColumnLayout { Layout.fillWidth: true //width: parent.width - color: AssistantHomeStyle.info.description.color + color: AssistantHomeStyle.info.description.colorModel.color elide: Text.ElideRight font.pointSize: AssistantHomeStyle.info.description.pointSize horizontalAlignment: Text.AlignHCenter diff --git a/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml b/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml index 319e19139..360bef520 100644 --- a/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml +++ b/linphone-app/ui/views/App/Main/Assistant/FetchRemoteConfiguration.qml @@ -73,7 +73,7 @@ Item{ font.pointSize: FetchRemoteConfigurationStyle.fieldTitles.pointSize font.weight: Font.Bold - color: FetchRemoteConfigurationStyle.fieldTitles.color + color: FetchRemoteConfigurationStyle.fieldTitles.colorModel.color text: qsTr('urlLabel') @@ -127,7 +127,7 @@ Item{ font.pointSize: FetchRemoteConfigurationStyle.fieldTitles.pointSize font.weight: Font.Bold font.capitalization: Font.Capitalize - color: FetchRemoteConfigurationStyle.fieldTitles.color + color: FetchRemoteConfigurationStyle.fieldTitles.colorModel.color //: 'or' : conjunction to choose between options. text: qsTr('or') } @@ -142,7 +142,7 @@ Item{ Layout.fillHeight: true Layout.preferredWidth: height Layout.alignment: Qt.AlignCenter - border.color: FetchRemoteConfigurationStyle.qRCode.borderColor + border.color: FetchRemoteConfigurationStyle.qRCode.borderColor.color radius: 20 border.width: 1 Text{ @@ -156,7 +156,7 @@ Item{ visible: assistantModel.qrcode == '' wrapMode: Text.WordWrap font.pointSize: FetchRemoteConfigurationStyle.explanationQRCode.pointSize - color: FetchRemoteConfigurationStyle.explanationQRCode.color + color: FetchRemoteConfigurationStyle.explanationQRCode.colorModel.color //: 'Click on %1 to obtain your remote provisioning QR code' : Describe how to get a remote provisioning QR code by clicking on %1 button (1% is the text in button) text : qsTr('remoteProvisioningHow').arg(mainItem.generateButtonText) } @@ -179,7 +179,7 @@ Item{ visible: assistantModel.qrcode != '' wrapMode: Text.WordWrap font.pointSize: FetchRemoteConfigurationStyle.explanationQRCode.pointSize - color: FetchRemoteConfigurationStyle.explanationQRCode.color + color: FetchRemoteConfigurationStyle.explanationQRCode.colorModel.color //: 'Scan the QR code with your phone' : Explain how to use the QRCode by flasing it. text: qsTr('scanQRCode') + '\n' //: 'In your app go in assistant - QR code provisioning' : Describe where to flash the QRCode in the mobile application. diff --git a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml index 4870c8155..e0db7e87f 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml @@ -55,7 +55,7 @@ AssistantAbstractView { visible: ConstantsCpp.PasswordRecoveryUrl elide: Text.ElideRight font.pointSize: AboutStyle.copyrightBlock.url.pointSize - linkColor: AboutStyle.copyrightBlock.url.color + linkColor: AboutStyle.copyrightBlock.url.colorModel.color //: 'Forgotten password?' : text for an url shortcut to change the password text: ''+qsTr("passwordRecovery")+'' diff --git a/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml index 8266bb0b4..9056319bf 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseOtherSipAccount.qml @@ -49,7 +49,7 @@ Item{ width: parent.width horizontalAlignment: Text.AlignLeft - color: UseAppSipAccountStyle.warningBlock.color + color: UseAppSipAccountStyle.warningBlock.colorModel.color wrapMode: Text.WordWrap //: 'Some features require a %1 account, such as group messaging or ephemeral messaging.' : Warning text about features. %1 is the application name text: qsTr('warningFeatures').arg(applicationName) @@ -60,7 +60,7 @@ Item{ width: parent.width horizontalAlignment: Text.AlignLeft - color: UseAppSipAccountStyle.warningBlock.color + color: UseAppSipAccountStyle.warningBlock.colorModel.color wrapMode: Text.WordWrap //: 'These features are hidden when you register with a third party SIP account.' : Warning text for using third party account. text: qsTr('warningThirdParty') @@ -71,7 +71,7 @@ Item{ width: parent.width horizontalAlignment: Text.AlignLeft - color: UseAppSipAccountStyle.warningBlock.color + color: UseAppSipAccountStyle.warningBlock.colorModel.color wrapMode: Text.WordWrap //: 'To enable it in a commercial project, please contact us.' : Warning text for contacting about enabling features. text: qsTr('warningContact') @@ -83,7 +83,7 @@ Item{ width: parent.width horizontalAlignment: Text.AlignHCenter wrapMode: Text.WordWrap - color: UseAppSipAccountStyle.warningBlock.color + color: UseAppSipAccountStyle.warningBlock.colorModel.color linkColor: UseAppSipAccountStyle.warningBlock.contactUrl.color text: ''+ConstantsCpp.ContactUrl+'' diff --git a/linphone-app/ui/views/App/Main/Conferences.qml b/linphone-app/ui/views/App/Main/Conferences.qml index 9df4c5472..2d67cf24d 100644 --- a/linphone-app/ui/views/App/Main/Conferences.qml +++ b/linphone-app/ui/views/App/Main/Conferences.qml @@ -27,14 +27,14 @@ Item{ Layout.fillWidth: true Layout.preferredHeight: ConferencesStyle.bar.height - color: ConferencesStyle.bar.backgroundColor + color: ConferencesStyle.bar.backgroundColor.color Text{ anchors.fill: parent verticalAlignment: Qt.AlignVCenter anchors.leftMargin: 40 - color: ConferencesStyle.bar.text.color + color: ConferencesStyle.bar.text.colorModel.color font { bold: true pointSize: ConferencesStyle.bar.text.pointSize @@ -83,7 +83,7 @@ Item{ Rectangle { Layout.fillWidth: true Layout.fillHeight: true - color: ConferencesStyle.backgroundColor + color: ConferencesStyle.backgroundColor.color ScrollableListView { id: conferenceList @@ -119,7 +119,7 @@ Item{ Borders { id: container - borderColor: ConferencesStyle.sectionHeading.border.color + borderColor: ConferencesStyle.sectionHeading.border.colorModel.color bottomWidth: ConferencesStyle.sectionHeading.border.width implicitHeight: text.contentHeight + ConferencesStyle.sectionHeading.padding * 2 + @@ -131,7 +131,7 @@ Item{ id: text anchors.fill: parent - color: ConferencesStyle.sectionHeading.text.color + color: ConferencesStyle.sectionHeading.text.colorModel.color font { bold: true pointSize: ConferencesStyle.sectionHeading.text.pointSize @@ -164,11 +164,11 @@ Item{ height: calendarMessage.height radius: 6 color: calendarMessage.isCancelled - ? ConferencesStyle.conference.backgroundColor.cancelled + ? ConferencesStyle.conference.backgroundColor.cancelled.color : mainItem.filterType == ConferenceInfoProxyModel.Ended - ? ConferencesStyle.conference.backgroundColor.ended - : ConferencesStyle.conference.backgroundColor.scheduled - border.color: calendarMessage.containsMouse || calendarMessage.isExpanded ? ConferencesStyle.conference.selectedBorder.color : 'transparent' + ? ConferencesStyle.conference.backgroundColor.ended.color + : ConferencesStyle.conference.backgroundColor.scheduled.color + border.color: calendarMessage.containsMouse || calendarMessage.isExpanded ? ConferencesStyle.conference.selectedBorder.colorModel.color : 'transparent' border.width: ConferencesStyle.conference.selectedBorder.width ChatCalendarMessage{ id: calendarMessage diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml index d150abf6b..3be929f7d 100644 --- a/linphone-app/ui/views/App/Main/ContactEdit.qml +++ b/linphone-app/ui/views/App/Main/ContactEdit.qml @@ -87,7 +87,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: ContactEditStyle.bar.height - color: ContactEditStyle.bar.color + color: ContactEditStyle.bar.colorModel.color RowLayout { anchors { @@ -123,7 +123,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: ContactEditStyle.bar.buttons.size - color: ContactEditStyle.bar.username.color + color: ContactEditStyle.bar.username.colorModel.color font { bold: true @@ -274,7 +274,7 @@ ColumnLayout { Layout.fillHeight: true Layout.fillWidth: true - color: ContactEditStyle.content.color + color: ContactEditStyle.content.colorModel.color Flickable { id: flick @@ -315,7 +315,7 @@ ColumnLayout { Rectangle { Layout.fillWidth: true Layout.preferredHeight: ContactEditStyle.values.separator.height - color: ContactEditStyle.values.separator.color + color: ContactEditStyle.values.separator.colorModel.color } ListForm { @@ -335,7 +335,7 @@ ColumnLayout { Rectangle { Layout.fillWidth: true Layout.preferredHeight: ContactEditStyle.values.separator.height - color: ContactEditStyle.values.separator.color + color: ContactEditStyle.values.separator.colorModel.color } ListForm { @@ -355,7 +355,7 @@ ColumnLayout { Rectangle { Layout.fillWidth: true Layout.preferredHeight: ContactEditStyle.values.separator.height - color: ContactEditStyle.values.separator.color + color: ContactEditStyle.values.separator.colorModel.color } ListForm { @@ -375,7 +375,7 @@ ColumnLayout { Rectangle { Layout.fillWidth: true Layout.preferredHeight: ContactEditStyle.values.separator.height - color: ContactEditStyle.values.separator.color + color: ContactEditStyle.values.separator.colorModel.color } StaticListForm { diff --git a/linphone-app/ui/views/App/Main/Contacts.qml b/linphone-app/ui/views/App/Main/Contacts.qml index 136f005dd..44d9083ac 100644 --- a/linphone-app/ui/views/App/Main/Contacts.qml +++ b/linphone-app/ui/views/App/Main/Contacts.qml @@ -32,7 +32,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: ContactsStyle.bar.height - color: ContactsStyle.bar.backgroundColor + color: ContactsStyle.bar.backgroundColor.color RowLayout { anchors { @@ -45,7 +45,7 @@ ColumnLayout { TextField { Layout.fillWidth: true icon: ContactsStyle.filter.icon - overwriteColor: ContactsStyle.filter.color + overwriteColor: ContactsStyle.filter.colorModel.color placeholderText: qsTr('searchContactPlaceholder') onTextChanged: contacts.setFilter(text) @@ -75,7 +75,7 @@ ColumnLayout { Rectangle { Layout.fillWidth: true Layout.fillHeight: true - color: ContactsStyle.backgroundColor + color: ContactsStyle.backgroundColor.color ScrollableListView { anchors.fill: parent @@ -86,7 +86,7 @@ ColumnLayout { } delegate: Borders { - bottomColor: ContactsStyle.contact.border.color + bottomColor: ContactsStyle.contact.border.colorModel.color bottomWidth: ContactsStyle.contact.border.width height: ContactsStyle.contact.height width: parent ? parent.width : 0 @@ -97,7 +97,7 @@ ColumnLayout { id: contact anchors.fill: parent - color: ContactsStyle.contact.backgroundColor.normal + color: ContactsStyle.contact.backgroundColor.normal.color // ------------------------------------------------------------------- @@ -115,7 +115,7 @@ ColumnLayout { Text { Layout.fillWidth: true - color: ContactsStyle.contact.presence.color + color: ContactsStyle.contact.presence.colorModel.color elide: Text.ElideRight font.pointSize: ContactsStyle.contact.presence.pointSize text: Presence.getPresenceStatusAsString($modelData.presenceStatus) @@ -282,7 +282,7 @@ ColumnLayout { Layout.fillHeight: true Layout.preferredWidth: ContactsStyle.contact.username.width - color: ContactsStyle.contact.username.color + color: ContactsStyle.contact.username.colorModel.color elide: Text.ElideRight font { @@ -311,12 +311,12 @@ ColumnLayout { when: mouseArea.containsMouse PropertyChanges { - color: ContactsStyle.contact.backgroundColor.hovered + color: ContactsStyle.contact.backgroundColor.hovered.color target: contact } PropertyChanges { - color: ContactsStyle.contact.indicator.color + color: ContactsStyle.contact.indicator.colorModel.color target: indicator } diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml index 40fa59185..5e6c611e8 100644 --- a/linphone-app/ui/views/App/Main/Conversation.qml +++ b/linphone-app/ui/views/App/Main/Conversation.qml @@ -80,7 +80,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: ConversationStyle.bar.height - color: ConversationStyle.bar.backgroundColor + color: ConversationStyle.bar.backgroundColor.color clip:false RowLayout { @@ -133,7 +133,7 @@ ColumnLayout { Icon{ id:adminIcon icon : ConversationStyle.bar.status.adminStatusIcon - overwriteColor: ConversationStyle.bar.status.adminStatusColor + overwriteColor: ConversationStyle.bar.status.adminStatusColor.color iconSize: ConversationStyle.bar.status.adminStatusIconSize } Text{ @@ -141,7 +141,7 @@ ColumnLayout { //: 'Admin' : Admin(istrator) //~ Context One word title for describing the current admin status text: qsTr('adminStatus') - color: ConversationStyle.bar.status.adminTextColor + color: ConversationStyle.bar.status.adminTextColor.color font.pointSize: Units.dp * 8 } } @@ -413,7 +413,7 @@ ColumnLayout { Rectangle{ height:visible ? 1 : 0 width:parent.width - color: ConversationStyle.menu.separatorColor + color: ConversationStyle.menu.separatorColor.color visible: groupInfoMenu.visible && contactMenu.visible } MenuItem{ @@ -433,7 +433,7 @@ ColumnLayout { Rectangle{ height:visible ? 1 : 0 width:parent.width - color: ConversationStyle.menu.separatorColor + color: ConversationStyle.menu.separatorColor.color visible: devicesMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible) } MenuItem{ @@ -453,7 +453,7 @@ ColumnLayout { Rectangle{ height:visible ? 1 : 0 width:parent.width - color: ConversationStyle.menu.separatorColor + color: ConversationStyle.menu.separatorColor.color visible: ephemeralMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible || devicesMenuItem.visible) } MenuItem{ @@ -473,7 +473,7 @@ ColumnLayout { Rectangle{ height:visible ? 1 : 0 width:parent.width - color: ConversationStyle.menu.separatorColor + color: ConversationStyle.menu.separatorColor.color visible: scheduleMeetingMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible || devicesMenuItem.visible || ephemeralMenuItem.visible) } MenuItem{ @@ -506,7 +506,7 @@ ColumnLayout { Rectangle{ height:visible ? 1 : 0 width:parent.width - color: ConversationStyle.menu.separatorColor + color: ConversationStyle.menu.separatorColor.color visible: deleteMenuItem.visible && (contactMenu.visible || groupInfoMenu.visible || devicesMenuItem.visible || ephemeralMenuItem.visible || scheduleMeetingMenuItem.visible) } MenuItem{ @@ -540,9 +540,9 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: active ? ConversationStyle.filters.height : 0 - borderColor: ConversationStyle.filters.border.color + borderColor: ConversationStyle.filters.border.colorModel.color bottomWidth: ConversationStyle.filters.border.bottomWidth - color: ConversationStyle.filters.backgroundColor + color: ConversationStyle.filters.backgroundColor.color topWidth: ConversationStyle.filters.border.topWidth visible: chatRoomModel && (!chatRoomModel.haveEncryption && SettingsModel.standardChatEnabled || chatRoomModel.haveEncryption && SettingsModel.secureChatEnabled) @@ -588,7 +588,7 @@ ColumnLayout { anchors.horizontalCenter: parent.horizontalCenter icon: (searchView.visible? 'close_custom': 'search_custom') iconSize: 30 - overwriteColor: ConversationStyle.bar.searchIconColor + overwriteColor: ConversationStyle.bar.searchIconColor.color } onClicked: { searchView.visible = !searchView.visible @@ -616,7 +616,7 @@ ColumnLayout { } width: parent.width-14 icon: text != '' ? 'close_custom' : 'search_custom' - overwriteColor: ConversationStyle.filters.iconColor + overwriteColor: ConversationStyle.filters.iconColor.color //: 'Search in messages' : this is a placeholder when searching something in the timeline list placeholderText: qsTr('searchMessagesPlaceholder') diff --git a/linphone-app/ui/views/App/Main/Dialogs/About.qml b/linphone-app/ui/views/App/Main/Dialogs/About.qml index da45c7e0a..a37fa4618 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/About.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/About.qml @@ -50,7 +50,7 @@ DialogPlus { TextEdit { id: appVersion - color: AboutStyle.versionsBlock.appVersion.color + color: AboutStyle.versionsBlock.appVersion.colorModel.color selectByMouse: true font.pointSize: AboutStyle.versionsBlock.appVersion.pointSize text: 'Desktop ' + Qt.application.version + ' - Qt' + App.qtVersion +'\nCore ' + CoreManager.version @@ -91,7 +91,7 @@ DialogPlus { } Text { - color: AboutStyle.copyrightBlock.license.color + color: AboutStyle.copyrightBlock.license.colorModel.color elide: Text.ElideRight font.pointSize: AboutStyle.copyrightBlock.license.pointSize visible: applicationVendor != '' @@ -105,8 +105,8 @@ DialogPlus { Text { elide: Text.ElideRight font.pointSize: AboutStyle.copyrightBlock.url.pointSize - color: AboutStyle.copyrightBlock.url.color - linkColor: AboutStyle.copyrightBlock.url.color + color: AboutStyle.copyrightBlock.url.colorModel.color + linkColor: AboutStyle.copyrightBlock.url.colorModel.color //: 'Help us translate %1' : %1 is the application name text: ''+qsTr('aboutTranslation').arg(applicationName)+'' textFormat: Text.RichText diff --git a/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml index bd20a6f17..d5dc9918d 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/EphemeralChatRoom.qml @@ -63,7 +63,7 @@ DialogPlus { Icon{ icon: EphemeralChatRoomStyle.timer.icon iconSize: EphemeralChatRoomStyle.timer.iconSize - overwriteColor: EphemeralChatRoomStyle.timer.timerColor + overwriteColor: EphemeralChatRoomStyle.timer.timerColor.color Layout.preferredHeight: EphemeralChatRoomStyle.timer.preferredHeight Layout.preferredWidth: EphemeralChatRoomStyle.timer.preferredWidth Layout.alignment: Qt.AlignCenter @@ -84,7 +84,7 @@ DialogPlus { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter font.pointSize: EphemeralChatRoomStyle.descriptionText.pointSize - color: EphemeralChatRoomStyle.descriptionText.color + color: EphemeralChatRoomStyle.descriptionText.colorModel.color } ComboBox{ Layout.alignment: Qt.AlignCenter diff --git a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml index 1097334e2..9dad2e21d 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml @@ -117,7 +117,7 @@ DialogPlus { Layout.leftMargin: InfoChatRoomStyle.results.title.leftMargin //: 'Participant list' text:qsTr('participantList') - color: InfoChatRoomStyle.results.title.color + color: InfoChatRoomStyle.results.title.colorModel.color font.pointSize:InfoChatRoomStyle.results.title.pointSize font.weight: InfoChatRoomStyle.results.title.weight } @@ -129,7 +129,7 @@ DialogPlus { //~ one word for admin status text : qsTr('adminStatus') - color: InfoChatRoomStyle.results.header.color + color: InfoChatRoomStyle.results.header.colorModel.color font.pointSize: InfoChatRoomStyle.results.header.pointSize font.weight: InfoChatRoomStyle.results.header.weight visible: dialog.adminMode && participantView.count > 0 diff --git a/linphone-app/ui/views/App/Main/Dialogs/InfoEncryption.qml b/linphone-app/ui/views/App/Main/Dialogs/InfoEncryption.qml index 295c7641d..68581b57a 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/InfoEncryption.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/InfoEncryption.qml @@ -76,7 +76,7 @@ DialogPlus { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter font.pointSize: InfoEncryptionStyle.descriptionText.pointSize - color: InfoEncryptionStyle.descriptionText.color + color: InfoEncryptionStyle.descriptionText.colorModel.color wrapMode: Text.Wrap //: "Instant messages are end-to-end encrypted in secured conversations. It is possible to upgrade the security level of a conversation by authentificating participants." @@ -92,7 +92,7 @@ DialogPlus { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter font.pointSize: InfoEncryptionStyle.descriptionText.pointSize - color: InfoEncryptionStyle.descriptionText.color + color: InfoEncryptionStyle.descriptionText.colorModel.color wrapMode: Text.Wrap //: "To do so, call the contact and follow the authentification process." diff --git a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml index c3c0c44fe..2b541563c 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml @@ -95,7 +95,7 @@ DialogPlus { Layout.fillWidth: true //: 'Would you like to encrypt your chat?' : Ask about setting the chat room as secured. text:qsTr('askEncryption') - color: NewChatRoomStyle.askEncryptionColor + color: NewChatRoomStyle.askEncryptionColor.color font.pointSize: Units.dp * 11 font.weight: Font.DemiBold } @@ -171,7 +171,7 @@ DialogPlus { textFormat: Text.RichText //: 'Subject' : Label of a text field about the subject of the chat room text :qsTr('subjectLabel') +'*' - color: NewChatRoomStyle.subjectTitleColor + color: NewChatRoomStyle.subjectTitleColor.color font.pointSize: Units.dp * 11 font.weight: Font.DemiBold } @@ -203,7 +203,7 @@ DialogPlus { Text{ //: 'Last contacts' : Header for showing last contacts text : qsTr('LastContactsTitle') - color: NewChatRoomStyle.recentContactTitleColor + color: NewChatRoomStyle.recentContactTitleColor.color font.pointSize: Units.dp * 11 font.weight: Font.DemiBold } @@ -251,7 +251,7 @@ DialogPlus { font.weight: Font.DemiBold lineHeight: 0.8 - color: NewChatRoomStyle.recentContactUsernameColor + color: NewChatRoomStyle.recentContactUsernameColor.color font.pointSize: Units.dp * 9 clip:false } @@ -302,7 +302,7 @@ DialogPlus { Layout.fillHeight: true Layout.fillWidth: true border.width: 1 - border.color: NewChatRoomStyle.addressesBorderColor + border.color: NewChatRoomStyle.addressesBorderColor.color ColumnLayout { anchors.fill: parent @@ -354,7 +354,7 @@ DialogPlus { //~ one word for admin status text : qsTr('adminStatus') - color: NewChatRoomStyle.addressesAdminColor + color: NewChatRoomStyle.addressesAdminColor.color font.pointSize: Units.dp * 11 font.weight: Font.Light visible: participantView.count > 0 @@ -416,7 +416,7 @@ DialogPlus { textFormat: Text.RichText //: 'Required' : Word relative to a star to explain that it is a requirement (Field form) text : '* '+qsTr('requiredField') - color: NewChatRoomStyle.requiredColor + color: NewChatRoomStyle.requiredColor.color font.pointSize: Units.dp * 8 } } diff --git a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml index 32d07973f..cd7c32f91 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml @@ -132,7 +132,7 @@ DialogPlus { } } Rectangle { - color: ParticipantsDevicesStyle.lineSeparatorColor + color: ParticipantsDevicesStyle.lineSeparatorColor.color Layout.preferredHeight: 1 Layout.fillWidth: true } @@ -159,7 +159,7 @@ DialogPlus { width:parent.width height:50 - color: ParticipantsDevicesStyle.lineBackgroundColor + color: ParticipantsDevicesStyle.lineBackgroundColor.color RowLayout{ anchors.fill:parent Text{ @@ -200,7 +200,7 @@ DialogPlus { } } Rectangle { - color: ParticipantsDevicesStyle.lineSeparatorColor + color: ParticipantsDevicesStyle.lineSeparatorColor.color anchors.left : parent.left anchors.right :parent.right anchors.bottom: parent.bottom diff --git a/linphone-app/ui/views/App/Main/HistoryView.qml b/linphone-app/ui/views/App/Main/HistoryView.qml index 5361edba4..a3ff4b115 100644 --- a/linphone-app/ui/views/App/Main/HistoryView.qml +++ b/linphone-app/ui/views/App/Main/HistoryView.qml @@ -34,7 +34,7 @@ ColumnLayout { Layout.fillWidth: true Layout.preferredHeight: peerAddress?HistoryViewStyle.bar.height:HistoryViewStyle.bar.height/2 - color: HistoryViewStyle.bar.backgroundColor + color: HistoryViewStyle.bar.backgroundColor.color RowLayout { anchors { diff --git a/linphone-app/ui/views/App/Main/Home.qml b/linphone-app/ui/views/App/Main/Home.qml index 31d2487d2..8ab01ef8e 100644 --- a/linphone-app/ui/views/App/Main/Home.qml +++ b/linphone-app/ui/views/App/Main/Home.qml @@ -10,7 +10,7 @@ import App.Styles 1.0 // ============================================================================= Rectangle { - color: HomeStyle.color + color: HomeStyle.colorModel.color // TODO: Remove me when smart tooltip will be available. Component { diff --git a/linphone-app/ui/views/App/Main/InviteFriends.qml b/linphone-app/ui/views/App/Main/InviteFriends.qml index 95b71fb03..d5dcd49ee 100644 --- a/linphone-app/ui/views/App/Main/InviteFriends.qml +++ b/linphone-app/ui/views/App/Main/InviteFriends.qml @@ -10,7 +10,7 @@ import App.Styles 1.0 // ============================================================================= Rectangle { - color: InviteFriendsStyle.color + color: InviteFriendsStyle.colorModel.color ColumnLayout { anchors.fill: parent diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml index b60cc6661..d55f835e7 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.qml +++ b/linphone-app/ui/views/App/Main/MainWindow.qml @@ -122,6 +122,7 @@ ApplicationWindow { onClicked: leftPanel.visible = !leftPanel.visible } ActionButton { + id: home isCustom: true backgroundRadius: 4 colorSet: MainWindowStyle.buttons.home @@ -158,12 +159,12 @@ ApplicationWindow { ? 'auto_answer_custom' : '' iconSize: MainWindowStyle.autoAnswerStatus.iconSize - overwriteColor: MainWindowStyle.autoAnswerStatus.text.color + overwriteColor: MainWindowStyle.autoAnswerStatus.text.colorModel.color } Text { clip: true - color: MainWindowStyle.autoAnswerStatus.text.color + color: MainWindowStyle.autoAnswerStatus.text.colorModel.color font { bold: true pointSize: MainWindowStyle.autoAnswerStatus.text.pointSize @@ -302,7 +303,7 @@ ApplicationWindow { icon: MainWindowStyle.menu.contacts.icon iconSize: MainWindowStyle.menu.contacts.iconSize - overwriteColor: isSelected ? MainWindowStyle.menu.contacts.selectedColor : MainWindowStyle.menu.contacts.color + overwriteColor: isSelected ? MainWindowStyle.menu.contacts.selectedColor.color : MainWindowStyle.menu.contacts.colorModel.color name: qsTr('contactsEntry') visible: SettingsModel.contactsEnabled @@ -330,7 +331,7 @@ ApplicationWindow { icon: MainWindowStyle.menu.conferences.icon iconSize: MainWindowStyle.menu.conferences.iconSize - overwriteColor: isSelected ? MainWindowStyle.menu.conferences.selectedColor : MainWindowStyle.menu.conferences.color + overwriteColor: isSelected ? MainWindowStyle.menu.conferences.selectedColor.color : MainWindowStyle.menu.conferences.colorModel.color //: 'Meetings' : Meeting title for main window. name: qsTr('mainWindowConferencesTitle').toUpperCase() visible: SettingsModel.videoConferenceEnabled && SettingsModel.conferenceEnabled diff --git a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml index faeae5e41..6cdcc97a9 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml +++ b/linphone-app/ui/views/App/Settings/SettingsAdvanced.qml @@ -205,7 +205,7 @@ TabContainer { Component{ id: textComponent Text { - color: FormTableStyle.entry.text.color + color: FormTableStyle.entry.text.colorModel.color elide: Text.ElideRight horizontalAlignment: Text.AlignHCenter text: importerLine.fields[$modelData['fieldId']]?importerLine.fields[$modelData['fieldId']]:'' @@ -261,7 +261,7 @@ TabContainer { property bool isError:false selectByMouse: true readOnly:true - color: (isError?SettingsAdvancedStyle.error.color:SettingsAdvancedStyle.info.color) + color: (isError?SettingsAdvancedStyle.error.colorModel.color : SettingsAdvancedStyle.info.colorModel.color) width:parent.width horizontalAlignment:Text.AlignRight font { diff --git a/linphone-app/ui/views/App/Settings/SettingsAudio.qml b/linphone-app/ui/views/App/Settings/SettingsAudio.qml index cd1fb94c4..8e1d8829b 100644 --- a/linphone-app/ui/views/App/Settings/SettingsAudio.qml +++ b/linphone-app/ui/views/App/Settings/SettingsAudio.qml @@ -142,12 +142,12 @@ TabContainer { width: audioTestSlider.availableWidth height: implicitHeight radius: 2 - color: SettingsAudioStyle.sliderBackgroundColor + color: SettingsAudioStyle.sliderBackgroundColor.color Rectangle { width: audioTestSlider.visualPosition * parent.width height: parent.height - color: audioTestSlider.value > 0.8 ? SettingsAudioStyle.sliderHighColor : SettingsAudioStyle.sliderLowColor + color: audioTestSlider.value > 0.8 ? SettingsAudioStyle.sliderHighColor.color : SettingsAudioStyle.sliderLowColor.color radius: 2 } } diff --git a/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml b/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml index dc933268f..085633611 100644 --- a/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml +++ b/linphone-app/ui/views/App/Settings/SettingsCallsChat.qml @@ -366,7 +366,7 @@ TabContainer { id: autoDownloadText property int preferredWidth : 0 Layout.preferredWidth: preferredWidth - color: FormHGroupStyle.legend.color + color: FormHGroupStyle.legend.colorModel.color font.pointSize: FormHGroupStyle.legend.pointSize function updateText(value){ diff --git a/linphone-app/ui/views/App/Settings/SettingsLdap.qml b/linphone-app/ui/views/App/Settings/SettingsLdap.qml index 021c00f87..f22e14625 100644 --- a/linphone-app/ui/views/App/Settings/SettingsLdap.qml +++ b/linphone-app/ui/views/App/Settings/SettingsLdap.qml @@ -42,7 +42,7 @@ Column { spacing:SettingsAdvancedStyle.lists.spacing Text { id: summaryTitle - color: FormStyle.header.title.color + color: FormStyle.header.title.colorModel.color text: (modelData.displayName?modelData.displayName:(modelData.server?modelData.server:qsTr('newServer')))//'New server')) font { bold: true diff --git a/linphone-app/ui/views/App/Settings/SettingsWindow.qml b/linphone-app/ui/views/App/Settings/SettingsWindow.qml index 5ecf418a3..fdd68d616 100644 --- a/linphone-app/ui/views/App/Settings/SettingsWindow.qml +++ b/linphone-app/ui/views/App/Settings/SettingsWindow.qml @@ -37,7 +37,7 @@ ApplicationWindow { Rectangle { anchors.fill: parent - color: SettingsWindowStyle.color + color: SettingsWindowStyle.colorModel.color } ColumnLayout { @@ -116,7 +116,7 @@ ApplicationWindow { Layout.fillWidth: true Layout.preferredHeight: TabButtonStyle.text.height - color: TabButtonStyle.backgroundColor.normal + color: TabButtonStyle.backgroundColor.normal.color MouseArea { anchors.fill: parent @@ -134,7 +134,7 @@ ApplicationWindow { Rectangle{ id: hideBar anchors.fill: parent - color: TabButtonStyle.backgroundColor.normal + color: TabButtonStyle.backgroundColor.normal.color visible: logViewer.active } } diff --git a/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml index 80cb591d0..aa4dfb331 100644 --- a/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/CallFullscreenStyle.qml @@ -8,7 +8,7 @@ import ColorsList 1.0 QtObject { property string sectionName : 'CallFullscreen' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'f').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'f') property QtObject actionArea: QtObject { property int height: 100 @@ -29,7 +29,7 @@ QtObject { } property QtObject callError: QtObject { - property color color: ColorsList.add(sectionName+'_action_error', 'i').color + property var colorModel: ColorsList.add(sectionName+'_action_error', 'i') property int pointSize: Units.dp * 12 } } @@ -38,15 +38,15 @@ QtObject { property int margins: 15 property QtObject avatar: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n').color + property var backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n') property int maxSize: 300 } property QtObject pause: QtObject { - property color color: ColorsList.add(sectionName+'_container_pause', 'g90').color + property var colorModel: ColorsList.add(sectionName+'_container_pause', 'g90') property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_container_pause_text', 'q').color + property var colorModel: ColorsList.add(sectionName+'_container_pause_text', 'q') property int pointSizeFactor: 5 } } @@ -66,7 +66,7 @@ QtObject { } property QtObject elapsedTime: QtObject { - property color color: ColorsList.add(sectionName+'_header_elapsed_time', 'j').color + property var colorModel: ColorsList.add(sectionName+'_header_elapsed_time', 'j') property int pointSize: Units.dp * 10 property QtObject fullscreen: QtObject { @@ -87,8 +87,8 @@ QtObject { } property QtObject text: QtObject { - property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color - property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i').color + property var colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j') + property var colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i') property int pointSize: Units.dp * 10 property int wordsSpacing: 5 } @@ -103,268 +103,268 @@ QtObject { property string icon_2 : 'call_quality_2_custom' property string icon_3 : 'call_quality_3_custom' property string icon_4 : 'call_quality_4_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon_2, 'me_n_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon_2, 'me_d_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon_2, 'me_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon_2, 'me_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon_2, 'me_n_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon_2, 'me_d_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon_2, 'me_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon_2, 'me_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon_2, 'me_n_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon_2, 'me_d_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon_2, 'me_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon_2, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon_2, 'me_n_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon_2, 'me_d_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon_2, 'me_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon_2, 'me_p_b_fg') } property QtObject telKeyad: QtObject { property int iconSize: 30 property string name : 'telKeypad' property string icon : 'dialpad_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 secure: QtObject { property int iconSize: 16 property string icon : 'call_chat_secure_custom' property string name : 'secure' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#5a585b').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#5a585b').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#5a585b').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#5a585b') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#5a585b') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#5a585b') } property QtObject unsecure: QtObject { property int iconSize: 16 property string icon : 'call_chat_unsecure_custom' property string name : 'unsecure' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#ff0000').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#ff0000').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#ff0000').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#ff0000') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#ff0000') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#ff0000') } property QtObject screenshot: QtObject { property int iconSize: 40 property string icon : 'screenshot_custom' property string name : 'screenshot' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject record: QtObject { property int iconSize: 40 property string icon : 'record_custom' property string name : 'record' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg') } property QtObject fullscreen: QtObject { property int iconSize: 40 property string icon : 'fullscreen_custom' property string name : 'fullscreen' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 stopFullscreen: QtObject { property int iconSize: 40 property string icon : 'stop_fullscreen_custom' property string name : 'stopFullscreen' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject microOn: QtObject { property int iconSize: 40 property string icon : 'micro_on_custom' property string name : 'microOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject microOff: QtObject { property int iconSize: 40 property string icon : 'micro_off_custom' property string name : 'microOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject speakerOn: QtObject { property int iconSize: 40 property string icon : 'speaker_on_custom' property string name : 'speakerOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject speakerOff: QtObject { property int iconSize: 40 property string icon : 'speaker_off_custom' property string name : 'speakerOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject cameraOn: QtObject { property int iconSize: 40 property string icon : 'camera_on_custom' property string name : 'cameraOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject cameraOff: QtObject { property int iconSize: 40 property string icon : 'camera_off_custom' property string name : 'cameraOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject options: QtObject { property int iconSize: 40 property string icon : 'menu_vdots_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject pause: QtObject { property int iconSize: 40 property string icon : 'pause_custom' property string name : 'pause' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject play: QtObject { property int iconSize: 40 property string icon : 'play_custom' property string name : 'play' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 40 property string icon : 'chat_custom' property string name : 'chat' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject history: QtObject { property int iconSize: 40 property string icon : 'history_custom' property string name : 'history' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject hangup: QtObject { property int iconSize: 40 property string icon : 'hangup_custom' property string name : 'hangup' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg') } property QtObject acceptVideoCall: QtObject { property int iconSize: 40 property string icon : 'video_call_accept_custom' property string name : 'videoCallAccept' - 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 QtObject acceptCall: QtObject { property int iconSize: 40 property string icon : 'call_accept_custom' property string name : 'callAccept' - 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') } } } diff --git a/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml index 76fe0550b..b6cba586b 100644 --- a/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/CallStyle.qml @@ -8,7 +8,7 @@ import ColorsList 1.0 QtObject { property string sectionName : 'Call' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'f').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'f') property QtObject actionArea: QtObject { property int height: 100 @@ -29,7 +29,7 @@ QtObject { } property QtObject callError: QtObject { - property color color: ColorsList.add(sectionName+'_action_error', 'i').color + property var colorModel: ColorsList.add(sectionName+'_action_error', 'i') property int pointSize: Units.dp * 12 } } @@ -38,15 +38,15 @@ QtObject { property int margins: 15 property QtObject avatar: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n').color + property var backgroundColor: ColorsList.add(sectionName+'_container_avatar_bg', 'n') property int maxSize: 300 } property QtObject pause: QtObject { - property color color: ColorsList.add(sectionName+'_container_pause', 'g90').color + property var colorModel: ColorsList.add(sectionName+'_container_pause', 'g90') property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_container_pause_text', 'q').color + property var colorModel: ColorsList.add(sectionName+'_container_pause_text', 'q') property int pointSizeFactor: 5 } } @@ -61,7 +61,7 @@ QtObject { property int topMargin: 26 property QtObject busyIndicator: QtObject { - property color color: ColorsList.add(sectionName+'_header_busy', 'q').color + property var colorModel: ColorsList.add(sectionName+'_header_busy', 'q') property int height: 30 property int width: 30 } @@ -72,7 +72,7 @@ QtObject { } property QtObject elapsedTime: QtObject { - property color color: ColorsList.add(sectionName+'_header_elapsed_time', 'j').color + property var colorModel: ColorsList.add(sectionName+'_header_elapsed_time', 'j') property int pointSize: Units.dp * 10 property QtObject fullscreen: QtObject { @@ -95,8 +95,8 @@ QtObject { } property QtObject text: QtObject { - property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color - property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i').color + property var colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j') + property var colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i') property int pointSize: Units.dp * 10 property int wordsSpacing: 5 } @@ -111,270 +111,270 @@ QtObject { property string icon_2 : 'call_quality_2_custom' property string icon_3 : 'call_quality_3_custom' property string icon_4 : 'call_quality_4_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon_2, 'me_n_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon_2, 'me_d_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon_2, 'me_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon_2, 'me_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon_2, 'me_n_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon_2, 'me_d_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon_2, 'me_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon_2, 'me_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon_2, 'me_n_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon_2, 'me_d_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon_2, 'me_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon_2, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon_2, 'me_n_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon_2, 'me_d_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon_2, 'me_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon_2, 'me_p_b_fg') } property QtObject telKeyad: QtObject { property int iconSize: 30 property string name : 'telKeypad' property string icon : 'dialpad_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'me_u_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_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 color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'me_u_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'me_u_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_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 var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'me_u_b_fg') } property QtObject secure: QtObject { property int iconSize: 16 property string icon : 'call_chat_secure_custom' property string name : 'secure' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#5a585b').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#5a585b').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#5a585b').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#5a585b') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#5a585b') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#5a585b') } property QtObject unsecure: QtObject { property int iconSize: 16 property string icon : 'call_chat_unsecure_custom' property string name : 'unsecure' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#ff0000').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#ff0000').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#ff0000').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', 'transparent') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', 'transparent') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', 'transparent') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, '', '', '#ff0000') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, '', '', '#ff0000') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, '', '', '#ff0000') } property QtObject screenshot: QtObject { property int iconSize: 40 property string icon : 'screenshot_custom' property string name : 'screenshot' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 record: QtObject { property int iconSize: 40 property string icon : 'record_custom' property string name : 'record' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_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 color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_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 var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_p_b_fg') } property QtObject fullscreen: QtObject { property int iconSize: 40 property string icon : 'fullscreen_custom' property string name : 'fullscreen' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 stopFullscreen: QtObject { property int iconSize: 40 property string icon : 'stop_fullscreen_custom' property string name : 'stopFullscreen' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 microOn: QtObject { property int iconSize: 40 property string icon : 'micro_on_custom' property string name : 'microOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject microOff: QtObject { property int iconSize: 40 property string icon : 'micro_off_custom' property string name : 'microOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject speakerOn: QtObject { property int iconSize: 40 property string icon : 'speaker_on_custom' property string name : 'speakerOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject speakerOff: QtObject { property int iconSize: 40 property string icon : 'speaker_off_custom' property string name : 'speakerOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject cameraOn: QtObject { property int iconSize: 40 property string icon : 'camera_on_custom' property string name : 'cameraOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject cameraOff: QtObject { property int iconSize: 40 property string icon : 'camera_off_custom' property string name : 'cameraOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject options: QtObject { property int iconSize: 40 property string icon : 'menu_vdots_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject pause: QtObject { property int iconSize: 40 property string icon : 'pause_custom' property string name : 'pause' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject play: QtObject { property int iconSize: 40 property string icon : 'play_custom' property string name : 'play' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 40 property string icon : 'chat_custom' property string name : 'chat' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject history: QtObject { property int iconSize: 40 property string icon : 'history_custom' property string name : 'history' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject hangup: QtObject { property int iconSize: 40 property string icon : 'hangup_custom' property string name : 'hangup' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg') } property QtObject acceptVideoCall: QtObject { property int iconSize: 40 property string icon : 'video_call_accept_custom' property string name : 'videoCallAccept' - 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 QtObject acceptCall: QtObject { property int iconSize: 40 property string icon : 'call_accept_custom' property string name : 'callAccept' - 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') } } } diff --git a/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml b/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml index d02d535fa..e809dbf7c 100644 --- a/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/CallsWindowStyle.qml @@ -14,14 +14,14 @@ QtObject { } property QtObject callsList: QtObject { - property color color: ColorsList.add(sectionName+'_list_bg', 'q').color + property var colorModel: ColorsList.add(sectionName+'_list_bg', 'q') property int defaultWidth: 250 property int maximumWidth: 300 property int minimumWidth: 200 property QtObject header: QtObject { - property color color1: ColorsList.add(sectionName+'_list_header_a', 'q').color - property color color2: ColorsList.add(sectionName+'_list_header_b', 'f').color + property var color1: ColorsList.add(sectionName+'_list_header_a', 'q') + property var color2: ColorsList.add(sectionName+'_list_header_b', 'f') property int height: 60 property int iconSize: 40 property int leftMargin: 10 @@ -30,37 +30,37 @@ QtObject { property int iconSize: 40 property string name : 'newCall' property string icon : 'new_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg') } property QtObject mergeConference: QtObject { property int iconSize: 40 property string name : 'mergeConference' property string icon : 'conference_merge_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'ma_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'ma_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'ma_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'ma_d_b_fg') } property QtObject closeButton: QtObject{ property int iconSize: 40 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') } } diff --git a/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml index 4b7ab4ee1..a219d080d 100644 --- a/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/ConferenceStyle.qml @@ -9,7 +9,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Conference' property QtObject description: QtObject { - property color color: ColorsList.add(sectionName+'_description', 'j').color + property var colorModel: ColorsList.add(sectionName+'_description', 'j') property int pointSize: Units.dp * 12 property int height: 60 property int width: 150 diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml index 577c6c6ca..b02b23784 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallSipAddressStyle.qml @@ -14,25 +14,25 @@ QtObject { property int iconSize: 36 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject call: QtObject { property int iconSize: 36 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject searchField: QtObject { - property color color: ColorsList.add(sectionName+'_searchField', 'c').color + property var colorModel: ColorsList.add(sectionName+'_searchField', 'c') } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml index f9df761e3..0793cacce 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/CallTransferStyle.qml @@ -13,14 +13,14 @@ QtObject { property int iconSize: 36 property string icon : 'transfer_custom' property string name : 'transfer' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject searchField: QtObject { - property color color: ColorsList.add(sectionName+'_searchField', 'c').color + property var colorModel: ColorsList.add(sectionName+'_searchField', 'c') } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml index a195dbd87..d971dc45a 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/ConferenceManagerStyle.qml @@ -16,7 +16,7 @@ QtObject { } property QtObject separator: QtObject { - property color color: ColorsList.add(sectionName+'_separator', 'c').color + property var colorModel: ColorsList.add(sectionName+'_separator', 'c') property int leftMargin: 25 property int rightMargin: 25 property int width: 1 @@ -26,25 +26,25 @@ QtObject { property int iconSize: 36 property string icon : 'transfer_custom' property string name : 'transfer' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject cancel: QtObject { property int iconSize: 36 property string icon : 'cancel_custom' property string name : 'cancel' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject searchField: QtObject { - property color color: ColorsList.add(sectionName+'_searchField', 'c').color + property var colorModel: ColorsList.add(sectionName+'_searchField', 'c') } } diff --git a/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml b/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml index 42d19ed30..93f88eeed 100644 --- a/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/Dialogs/MultimediaParametersStyle.qml @@ -19,19 +19,19 @@ QtObject { property int iconSize: 30 property string icon : 'speaker_on_custom' property string name : 'speaker' - property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + property var colorModel : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g') } property QtObject micro: QtObject { property int iconSize: 30 property string icon : 'micro_on_custom' property string name : 'micro' - property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + property var colorModel : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g') } property QtObject camera: QtObject { property int iconSize: 30 property string icon : 'camera_on_custom' property string name : 'camera' - property color color : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g').color + property var colorModel : ColorsList.addImageColor(sectionName+'_'+name, icon, 'g') } } } diff --git a/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml index 04564049d..d02291e3c 100644 --- a/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml @@ -9,20 +9,20 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Incall' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'conference_bg').color - property color fullBackgroundColor: ColorsList.add(sectionName+'_fullscreen_bg', 'fullscreen_conference_bg').color - property color buzyColor: ColorsList.add(sectionName+'_indicator', 'q').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'conference_bg') + property var fullBackgroundColor: ColorsList.add(sectionName+'_fullscreen_bg', 'fullscreen_conference_bg') + property var buzyColor: ColorsList.add(sectionName+'_indicator', 'q') property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_title', 'q').color + property var colorModel: ColorsList.add(sectionName+'_title', 'q') property int pointSize: Units.dp * 12 property int addressPointSize: Units.dp * 10 } property QtObject recordWarning: QtObject{ property string icon: 'record_custom' - property color iconColor: ColorsList.add(sectionName+'_warning', 'i').color + property var iconColor: ColorsList.add(sectionName+'_warning', 'i') property int iconSize: 30 - property color color: ColorsList.add(sectionName+'_warning_fg', 'q').color + property var colorModel: ColorsList.add(sectionName+'_warning_fg', 'q') property int pointSize: Units.dp * 9 } property QtObject grid: QtObject { @@ -34,21 +34,21 @@ QtObject { property int width: 154 property QtObject contactDescription: QtObject { - property color color: ColorsList.add(sectionName+'_username', 'q').color + property var colorModel: ColorsList.add(sectionName+'_username', 'q') property int pointSize: Units.dp * 12 property int weight: Font.Bold } } } property QtObject pauseArea: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_paused_bg', 'l50').color + property var backgroundColor: ColorsList.add(sectionName+'_paused_bg', 'l50') property QtObject title: QtObject{ - property color color: ColorsList.add(sectionName+'_paused_title', 'q').color + property var colorModel: ColorsList.add(sectionName+'_paused_title', 'q') property int pointSize: Units.dp * 12 property int weight: Font.Bold } property QtObject description: QtObject{ - property color color: ColorsList.add(sectionName+'_paused_description', 'q').color + property var colorModel: ColorsList.add(sectionName+'_paused_description', 'q') property int pointSize: Units.dp * 9 property int weight: Font.Medium } @@ -56,14 +56,14 @@ QtObject { property int iconSize: 240 property string icon : 'play_custom' property string name : 'paused_play' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_p_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_n_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_p_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_n_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_p_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_n_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_p_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_n_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } } property QtObject actionArea: QtObject { @@ -85,7 +85,7 @@ QtObject { } property QtObject callError: QtObject { - property color color: ColorsList.add(sectionName+'_action_error', 'i').color + property var colorModel: ColorsList.add(sectionName+'_action_error', 'i') property int pointSize: Units.dp * 12 } } @@ -94,18 +94,18 @@ QtObject { property int margins: 15 property QtObject avatar: QtObject { - property color stickerBackgroundColor: ColorsList.add(sectionName+'_container_avatar_sticker_bg', 'conference_avatar_sticker_bg').color - property color stickerPreviewBackgroundColor: ColorsList.add(sectionName+'_container_avatar_preview_sticker_bg', 'conference_avatar_preview_sticker_bg').color - property color backgroundColor: ColorsList.add(sectionName+'_container_avatar_initials_bg', 'conference_avatar_initials_bg').color + property var stickerBackgroundColor: ColorsList.add(sectionName+'_container_avatar_sticker_bg', 'conference_avatar_sticker_bg') + property var stickerPreviewBackgroundColor: ColorsList.add(sectionName+'_container_avatar_preview_sticker_bg', 'conference_avatar_preview_sticker_bg') + property var backgroundColor: ColorsList.add(sectionName+'_container_avatar_initials_bg', 'conference_avatar_initials_bg') property int maxSize: 300 } property QtObject pause: QtObject { - property color color: ColorsList.add(sectionName+'_container_pause', 'g90').color + property var colorModel: ColorsList.add(sectionName+'_container_pause', 'g90') property QtObject text: QtObject { - property color color: ColorsList.add(sectionName+'_container_pause_text', 'q').color + property var colorModel: ColorsList.add(sectionName+'_container_pause_text', 'q') property int pointSizeFactor: 5 } } @@ -125,7 +125,7 @@ QtObject { } property QtObject elapsedTime: QtObject { - property color color: ColorsList.add(sectionName+'_header_elapsed_time', 'j').color + property var colorModel: ColorsList.add(sectionName+'_header_elapsed_time', 'j') property int pointSize: Units.dp * 10 property QtObject fullscreen: QtObject { @@ -138,8 +138,8 @@ QtObject { } property QtObject messageBanner: QtObject{ - property color color: ColorsList.add(sectionName+'_message_bg', 'incall_message_banner_bg').color - property color textColor: ColorsList.add(sectionName+'_message_fg', 'incall_message_banner_fg').color + property var colorModel: ColorsList.add(sectionName+'_message_bg', 'incall_message_banner_bg') + property var textColor: ColorsList.add(sectionName+'_message_fg', 'incall_message_banner_fg') property int pointSize: Units.dp * 10 } } @@ -152,8 +152,8 @@ QtObject { } property QtObject text: QtObject { - property color colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j').color - property color colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i').color + property var colorA: ColorsList.add(sectionName+'_zrtp_text_a', 'j') + property var colorB: ColorsList.add(sectionName+'_zrtp_text_b', 'i') property int pointSize: Units.dp * 10 property int wordsSpacing: 5 } @@ -164,25 +164,25 @@ QtObject { property int iconSize: 40 property string name : 'callsList' property string icon : 'call_menu_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject dialpad: QtObject { property int iconSize: 40 property string name : 'dialpad' property string icon : 'dialpad_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg') } property QtObject callQuality: QtObject { property int iconSize: 40 @@ -193,71 +193,71 @@ QtObject { property string icon_3 : 'call_quality_3_custom' property string icon_4 : 'call_quality_4_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon_2, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon_2, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon_2, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon_2, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon_2, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon_2, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon_2, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon_2, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon_2, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon_2, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon_2, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon_2, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon_2, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon_2, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon_2, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon_2, 's_p_b_fg') } property QtObject screenSharing: QtObject { property int iconSize: 40 property string icon : 'screen_sharing_custom' property string name : 'screenSharing' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject record: QtObject { property int iconSize: 40 property string icon : 'record_custom' property string name : 'record' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg') } property QtObject screenshot: QtObject { property int iconSize: 40 property string icon : 'screenshot_custom' property string name : 'screenshot' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject fullscreen: QtObject { property int iconSize: 40 property string icon : 'fullscreen_custom' property string name : 'fullscreen' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject stopFullscreen: QtObject { property int iconSize: 40 property string icon : 'stop_fullscreen_custom' property string name : 'stopFullscreen' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } //------------------------------------------------------------------------------ property QtObject secure: QtObject { @@ -266,14 +266,14 @@ QtObject { property string icon : 'secure_on' property string name : 'secure' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', '#66727B').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', '#66727B').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', '#66727B').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, '', '', '#66727B').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', '#66727B') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', '#66727B') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', '#66727B') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, '', '', '#66727B') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's') } property QtObject postQuantumSecure: QtObject { property int buttonSize: 40 @@ -281,193 +281,193 @@ QtObject { property string icon : 'secure_pq_zrtp' property string name : 'secure_pq_zrtp' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', '#66727B').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', '#66727B').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', '#66727B').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, '', '', '#66727B').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, '', '', '#66727B') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, '', '', '#66727B') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, '', '', '#66727B') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, '', '', '#66727B') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's') } property QtObject unsecure: QtObject { property int buttonSize: 40 property int iconSize: 20 property string icon : 'call_chat_unsecure_custom' property string name : 'unsecure' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'unsecure').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'unsecure').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'unsecure').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'unsecure').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'unsecure') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'unsecure') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'unsecure') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'unsecure') } property QtObject microOn: QtObject { property int iconSize: 40 property string icon : 'micro_on_custom' property string name : 'microOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject microOff: QtObject { property int iconSize: 40 property string icon : 'micro_off_custom' property string name : 'microOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject speakerOn: QtObject { property int iconSize: 40 property string icon : 'speaker_on_custom' property string name : 'speakerOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject speakerOff: QtObject { property int iconSize: 40 property string icon : 'speaker_off_custom' property string name : 'speakerOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject cameraOn: QtObject { property int iconSize: 40 property string icon : 'camera_on_custom' property string name : 'cameraOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject cameraOff: QtObject { property int iconSize: 40 property string icon : 'camera_off_custom' property string name : 'cameraOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject pause: QtObject { property int iconSize: 40 property string icon : 'pause_custom' property string name : 'pause' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject play: QtObject { property int iconSize: 40 property string icon : 'play_custom' property string name : 'play' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject hangup: QtObject { property int iconSize: 40 property string icon : 'hangup_custom' property string name : 'hangup' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg') } //------------------------------------------------------------------------------ property QtObject chat: QtObject { property int iconSize: 40 property string icon : 'chat_custom' property string name : 'chat' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_c_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_c_b_inv_fg') } property QtObject participants: QtObject { property int iconSize: 40 property string icon : 'participants_custom' property string name : 'participants' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_c_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_c_b_inv_fg') } property QtObject options: QtObject { property int iconSize: 40 property string icon : 'menu_vdots_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_c_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 'me_c_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 'me_c_b_inv_fg') } //------------------------------------------------------------------------------ property QtObject closePreview: QtObject { property int iconSize: 40 property string icon : 'close_custom' property string name : 'close_preview' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_inv_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_inv_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_inv_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_inv_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_inv_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_inv_fg') } //------------------------------------------------------------------------------ @@ -476,12 +476,12 @@ QtObject { property int iconSize: 40 property string icon : 'history_custom' property string name : 'history' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } @@ -489,23 +489,23 @@ QtObject { property int iconSize: 40 property string icon : 'video_call_accept_custom' property string name : 'videoCallAccept' - 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 QtObject acceptCall: QtObject { property int iconSize: 40 property string icon : 'call_accept_custom' property string name : 'callAccept' - 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') } } } diff --git a/linphone-app/ui/views/App/Styles/Calls/WaitingRoomStyle.qml b/linphone-app/ui/views/App/Styles/Calls/WaitingRoomStyle.qml index a33a719a5..5e5d96503 100644 --- a/linphone-app/ui/views/App/Styles/Calls/WaitingRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/WaitingRoomStyle.qml @@ -8,29 +8,29 @@ import ColorsList 1.0 QtObject { property string sectionName: 'WaitingRoom' - property color backgroundColor: ColorsList.add(sectionName+'_description', '', '', '#798791').color - property color menuColor: ColorsList.add(sectionName+'_menu', 'r').color + property var backgroundColor: ColorsList.add(sectionName+'_description', '', '', '#798791') + property var menuColor: ColorsList.add(sectionName+'_menu', 'r') property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_title', 'q').color + property var colorModel: ColorsList.add(sectionName+'_title', 'q') property int pointSize: Units.dp * 10 } property QtObject elapsedTime: QtObject { - property color color: ColorsList.add(sectionName+'_elapsed_time', 'q').color + property var colorModel: ColorsList.add(sectionName+'_elapsed_time', 'q') property int pointSize: Units.dp * 10 } property QtObject callee: QtObject { - property color color: ColorsList.add(sectionName+'_callee', 'q').color + property var colorModel: ColorsList.add(sectionName+'_callee', 'q') property int displayNamePointSize: Units.dp * 10 property int addressPointSize: Units.dp * 8 } property QtObject callError: QtObject { - property color color: ColorsList.add(sectionName+'_action_error', 'q').color + property var colorModel: ColorsList.add(sectionName+'_action_error', 'q') property int pointSize: Units.dp * 12 } property QtObject header: QtObject { property QtObject busyIndicator: QtObject { - property color color: ColorsList.add(sectionName+'_header_busy', 'q').color + property var colorModel: ColorsList.add(sectionName+'_header_busy', 'q') property int height: 20 property int width: 20 } @@ -44,149 +44,149 @@ QtObject { property int iconSize: 40 property string icon : 'micro_on_custom' property string name : 'microOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject microOff: QtObject { property int iconSize: 40 property string icon : 'micro_off_custom' property string name : 'microOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject speakerOn: QtObject { property int iconSize: 40 property string icon : 'speaker_on_custom' property string name : 'speakerOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject speakerOff: QtObject { property int iconSize: 40 property string icon : 'speaker_off_custom' property string name : 'speakerOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject cameraOn: QtObject { property int iconSize: 40 property string icon : 'camera_on_custom' property string name : 'cameraOn' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject cameraOff: QtObject { property int iconSize: 40 property string icon : 'camera_off_custom' property string name : 'cameraOff' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject gridLayout: QtObject { property int iconSize: 40 property string icon : 'conference_layout_grid_custom' property string name : 'gridLayout' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject activeSpeakerLayout: QtObject { property int iconSize: 40 property string icon : 'conference_layout_active_speaker_custom' property string name : 'activeSpeakerLayout' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject audioOnly: QtObject { property int iconSize: 40 property string icon : 'conference_audio_only_custom' property string name : 'audioOnly' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject options: QtObject { property int iconSize: 40 property string icon : 'menu_vdots_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_c', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_c', icon, 's_p_b_fg') } property QtObject hangup: QtObject { property int iconSize: 40 property string icon : 'hangup_custom' property string name : 'hangup' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'r_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'r_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'r_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'r_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'r_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'r_p_b_fg') } property QtObject call: QtObject { property int iconSize: 40 property string icon : 'call_accept_custom' property string name : 'call' - 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') } } } diff --git a/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml index c885786bb..1a125f253 100644 --- a/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml +++ b/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml @@ -9,26 +9,26 @@ import ColorsList 1.0 QtObject { property string sectionName: 'NewConference' - property color askEncryptionColor: ColorsList.add(sectionName+'_ask_encryption', 'g').color - property color subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g').color - property color recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g').color - property color recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g').color - property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'border_light').color - property color addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g').color - property color requiredColor: ColorsList.add(sectionName+'_required_text', 'g').color + property var askEncryptionColor: ColorsList.add(sectionName+'_ask_encryption', 'g') + property var subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g') + property var recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g') + property var recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g') + property var addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'border_light') + property var addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g') + property var requiredColor: ColorsList.add(sectionName+'_required_text', 'g') property QtObject busy: QtObject{ - property color color: ColorsList.add(sectionName+'_busy', 'i').color + property var colorModel: ColorsList.add(sectionName+'_busy', 'i') property real pointSize: Units.dp * 10 } property QtObject titles: QtObject{ - property color textColor: ColorsList.add(sectionName+'_schedule_titles', 'g').color + property var textColor: ColorsList.add(sectionName+'_schedule_titles', 'g') property int weight: Font.DemiBold property real pointSize: Units.dp * 10 } property QtObject fields: QtObject{ - property color textColor: ColorsList.add(sectionName+'_schedule_fields', 'g').color + property var textColor: ColorsList.add(sectionName+'_schedule_fields', 'g') property int weight: Font.Medium property real pointSize: Units.dp * 9 } @@ -38,22 +38,22 @@ QtObject { property int iconSize: 30 property string name : 'addParticipant' property string icon : 'add_participant_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 removeParticipant: QtObject { property int iconSize: 30 property string name : 'removeParticipant' property string icon : 'remove_participant_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') } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml index 9ec53e2b6..f9414c912 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithEmailStyle.qml @@ -11,7 +11,7 @@ QtObject { property int spacing: 20 property QtObject activationSteps: QtObject { - property color color: ColorsList.add(sectionName+'_email_steps', 'g').color + property var colorModel: ColorsList.add(sectionName+'_email_steps', 'g') property int pointSize: Units.dp * 10 } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml index fc8e857cc..eae2e41c5 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/ActivateAppSipAccountWithPhoneNumberStyle.qml @@ -11,7 +11,7 @@ QtObject { property int spacing: 20 property QtObject activationSteps: QtObject { - property color color: ColorsList.add(sectionName+'_phone_steps', 'g').color + property var colorModel: ColorsList.add(sectionName+'_phone_steps', 'g') property int pointSize: Units.dp * 10 } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml index dae7e1fce..9e115de56 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml @@ -21,12 +21,12 @@ QtObject { property int spacing: 20 property QtObject description: QtObject { - property color color: ColorsList.add(sectionName+'_info_description', 'g').color + property var colorModel: ColorsList.add(sectionName+'_info_description', 'g') property int pointSize: Units.dp * 11 } property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_info_title', 'g').color + property var colorModel: ColorsList.add(sectionName+'_info_title', 'g') property int pointSize: Units.dp * 11 } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml index ce4886150..f4d665b4d 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml @@ -13,13 +13,13 @@ QtObject { property int iconSize: 150 property QtObject description: QtObject { - property color color: ColorsList.add(sectionName+'_home_description', 'g').color + property var colorModel: ColorsList.add(sectionName+'_home_description', 'g') property int pointSize: Units.dp * 10 property int height: 40 } property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_home_title', 'g').color + property var colorModel: ColorsList.add(sectionName+'_home_title', 'g') property int pointSize: Units.dp * 11 property int height: 40 } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/FetchRemoteConfigurationStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/FetchRemoteConfigurationStyle.qml index c900030ea..167c35189 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/FetchRemoteConfigurationStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/FetchRemoteConfigurationStyle.qml @@ -10,14 +10,14 @@ QtObject { property QtObject fieldTitles: QtObject{ property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_url_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_url_title', 'j') } property QtObject qRCode : QtObject{ - property color borderColor: ColorsList.add(sectionName+'_qrcode_border', 'border_light').color + property var borderColor: ColorsList.add(sectionName+'_qrcode_border', 'border_light') } property QtObject explanationQRCode : QtObject{ property int pointSize: Units.dp * 9 - property color color: ColorsList.add(sectionName+'_qrcode_text', 'j').color + property var colorModel: ColorsList.add(sectionName+'_qrcode_text', 'j') } property QtObject checkBox: QtObject { @@ -26,10 +26,10 @@ QtObject { property QtObject warningBlock: QtObject { property int spacing: 10 property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_description', 'g').color + property var colorModel: ColorsList.add(sectionName+'_description', 'g') property QtObject contactUrl: QtObject { - property color color: ColorsList.add(sectionName+'_url', 'i').color + property var colorModel: ColorsList.add(sectionName+'_url', 'i') property int pointSize: Units.dp * 9 } } diff --git a/linphone-app/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml b/linphone-app/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml index 5091e2e07..312b17041 100644 --- a/linphone-app/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Assistant/UseAppSipAccountStyle.qml @@ -13,10 +13,10 @@ QtObject { property QtObject warningBlock: QtObject { property int spacing: 10 property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_description', 'g').color + property var colorModel: ColorsList.add(sectionName+'_description', 'g') property QtObject contactUrl: QtObject { - property color color: ColorsList.add(sectionName+'_url', 'i').color + property var colorModel: ColorsList.add(sectionName+'_url', 'i') property int pointSize: Units.dp * 9 } } diff --git a/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml b/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml index 58317fb4a..3391800ee 100644 --- a/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/AssistantStyle.qml @@ -7,7 +7,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Assistant' - property color color: ColorsList.add(sectionName, 'k').color + property var colorModel: ColorsList.add(sectionName, 'k') property int bottomMargin: 35 property int leftMargin: 90 property int rightMargin: 90 diff --git a/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml b/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml index 2b921c935..4b5acfafb 100644 --- a/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml @@ -8,36 +8,36 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Conferences' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'k') property int spacing: 20 property QtObject filter: QtObject { property string icon: 'filter_custom' - property color color: ColorsList.add(sectionName+'_filter_icon', 'c').color + property var colorModel: ColorsList.add(sectionName+'_filter_icon', 'c') property QtObject buttons: QtObject{ property int buttonsSpacing: 8 property QtObject button: QtObject { property QtObject color: QtObject { - property color hovered: ColorsList.add(sectionName+'_button_h', 'n').color - property color normal: ColorsList.add(sectionName+'_button_n', 'x').color - property color pressed: ColorsList.add(sectionName+'_button_p', 'g').color - property color selected: ColorsList.add(sectionName+'_button_c', 'i').color + property var hovered: ColorsList.add(sectionName+'_button_h', 'n') + property var normal: ColorsList.add(sectionName+'_button_n', 'x') + property var pressed: ColorsList.add(sectionName+'_button_p', 'g') + property var selected: ColorsList.add(sectionName+'_button_c', 'i') } } } } property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color + property var backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e') property int height: 60 property int leftMargin: 18 property int rightMargin: 18 property QtObject text: QtObject { property int pointSize: Units.dp * 11 - property color color: ColorsList.add(sectionName+'_bar_text', 'j').color + property var colorModel: ColorsList.add(sectionName+'_bar_text', 'j') } } @@ -54,23 +54,23 @@ QtObject { property int spacing: 15 property QtObject backgroundColor: QtObject { - property color ended: ColorsList.add(sectionName+'_conference_ended_bg', 'conference_entry_bg').color - property color scheduled: ColorsList.add(sectionName+'_conference_scheduled_bg', 'e').color - property color hovered: ColorsList.add(sectionName+'_conference_bg_h', 'g10').color - property color cancelled: ColorsList.add(sectionName+'_conference_cancelled_bg', 'cancelled_ics_bg').color + property var ended: ColorsList.add(sectionName+'_conference_ended_bg', 'conference_entry_bg') + property var scheduled: ColorsList.add(sectionName+'_conference_scheduled_bg', 'e') + property var hovered: ColorsList.add(sectionName+'_conference_bg_h', 'g10') + property var cancelled: ColorsList.add(sectionName+'_conference_cancelled_bg', 'cancelled_ics_bg') } property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_conference_border', 'f').color + property var colorModel: ColorsList.add(sectionName+'_conference_border', 'f') property int width: 1 } property QtObject selectedBorder: QtObject{ - property color color: ColorsList.add(sectionName+'_conference_selected_border', 'm').color + property var colorModel: ColorsList.add(sectionName+'_conference_selected_border', 'm') property int width: 2 } property QtObject indicator: QtObject { - property color color: ColorsList.add(sectionName+'_conference_indicator', 'i').color + property var colorModel: ColorsList.add(sectionName+'_conference_indicator', 'i') property int width: 5 } @@ -78,17 +78,17 @@ QtObject { property int pointSize: Units.dp * 10 property string icon : 'schedule_custom' property int iconSize: 30 - property color color: ColorsList.add(sectionName+'_schedule', 'j').color + property var colorModel: ColorsList.add(sectionName+'_schedule', 'j') } property QtObject participants: QtObject { property int pointSize: Units.dp * 10 property string icon : 'contact_custom' property int iconSize: 30 - property color color: ColorsList.add(sectionName+'_participants', 'j').color + property var colorModel: ColorsList.add(sectionName+'_participants', 'j') } property QtObject organizer: QtObject { - property color color: ColorsList.add(sectionName+'_conference_organizer', 'j').color + property var colorModel: ColorsList.add(sectionName+'_conference_organizer', 'j') property int pointSize: Units.dp * 10 property int width: 220 } @@ -99,13 +99,13 @@ QtObject { property int bottomMargin: 20 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_sectionHeading_border', 'g10').color + property var colorModel: ColorsList.add(sectionName+'_sectionHeading_border', 'g10') property int width: 1 } property QtObject text: QtObject { property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_sectionHeading_text', 'ab').color + property var colorModel: ColorsList.add(sectionName+'_sectionHeading_text', 'ab') } } /* @@ -113,12 +113,12 @@ QtObject { property int iconSize: 36 property string icon : 'schedule_custom' property string name : 'schedule' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') }*/ //---------------------------------------------------------------------------------- @@ -127,45 +127,45 @@ QtObject { property int iconSize: 36 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject call: QtObject { property int iconSize: 36 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 36 property string name : 'chat' property string icon : 'chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject deleteAction: QtObject { property int iconSize: 36 property string name : 'delete' property string icon : 'contact_delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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') } } diff --git a/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml index 680929600..c66a654cf 100644 --- a/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ContactEditStyle.qml @@ -14,7 +14,7 @@ QtObject { } property QtObject bar: QtObject { - property color color: ColorsList.add(sectionName+'_bar', 'e').color + property var colorModel: ColorsList.add(sectionName+'_bar', 'e') property int avatarSize: 60 property int height: 80 property int leftMargin: 40 @@ -30,12 +30,12 @@ QtObject { property int iconSize: 36 property string name : 'delete' property string icon : 'contact_delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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') } } @@ -45,12 +45,12 @@ QtObject { property int iconSize: 36 property string name : 'edit' property string icon : 'contact_edit_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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') } } @@ -62,14 +62,14 @@ QtObject { property int iconSize: 60 property string icon : 'contact_card_photo_custom' property string name : 'avatarTakePicture' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_h_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_n_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_h_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject buttons: QtObject { @@ -78,13 +78,13 @@ QtObject { } property QtObject username: QtObject { - property color color: ColorsList.add(sectionName+'_username', 'j').color + property var colorModel: ColorsList.add(sectionName+'_username', 'j') property int pointSize: Units.dp * 13 } } property QtObject content: QtObject { - property color color: ColorsList.add(sectionName+'_content', 'k').color + property var colorModel: ColorsList.add(sectionName+'_content', 'k') } property QtObject values: QtObject { @@ -94,7 +94,7 @@ QtObject { property int topMargin: 20 property QtObject separator: QtObject { - property color color: ColorsList.add(sectionName+'_separator', 'f').color + property var colorModel: ColorsList.add(sectionName+'_separator', 'f') property int height: 1 } } @@ -102,49 +102,49 @@ QtObject { property int iconSize: 40 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject videoCall: QtObject { property int iconSize: 40 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 40 property string name : 'chat' property string icon : 'chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject history: QtObject { property int iconSize: 40 property string icon : 'history_custom' property string name : 'history' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } } diff --git a/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml b/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml index 26866b1d9..b0b4c5b14 100644 --- a/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ContactsStyle.qml @@ -8,15 +8,15 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Contacts' - property color backgroundColor: ColorsList.add(sectionName+'_bg', 'k').color + property var backgroundColor: ColorsList.add(sectionName+'_bg', 'k') property int spacing: 20 property QtObject filter: QtObject { property string icon: 'filter_custom' - property color color: ColorsList.add(sectionName+'_filter_icon', 'c').color + property var colorModel: ColorsList.add(sectionName+'_filter_icon', 'c') } property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color + property var backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e') property int height: 60 property int leftMargin: 18 property int rightMargin: 18 @@ -33,27 +33,27 @@ QtObject { property int spacing: 15 property QtObject backgroundColor: QtObject { - property color normal: ColorsList.add(sectionName+'_contact_bg_n', 'k').color - property color hovered: ColorsList.add(sectionName+'_contact_bg_h', 'g10').color + property var normal: ColorsList.add(sectionName+'_contact_bg_n', 'k') + property var hovered: ColorsList.add(sectionName+'_contact_bg_h', 'g10') } property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_contact_border', 'f').color + property var colorModel: ColorsList.add(sectionName+'_contact_border', 'f') property int width: 1 } property QtObject indicator: QtObject { - property color color: ColorsList.add(sectionName+'_contact_indicator', 'i').color + property var colorModel: ColorsList.add(sectionName+'_contact_indicator', 'i') property int width: 5 } property QtObject presence: QtObject { property int pointSize: Units.dp * 10 - property color color: ColorsList.add(sectionName+'_contact_presence', 'n').color + property var colorModel: ColorsList.add(sectionName+'_contact_presence', 'n') } property QtObject username: QtObject { - property color color: ColorsList.add(sectionName+'_contact_username', 'j').color + property var colorModel: ColorsList.add(sectionName+'_contact_username', 'j') property int pointSize: Units.dp * 10 property int width: 220 } @@ -62,59 +62,59 @@ QtObject { property int iconSize: 36 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject call: QtObject { property int iconSize: 36 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 36 property string name : 'chat' property string icon : 'chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject history: QtObject { property int iconSize: 36 property string icon : 'history_custom' property string name : 'history' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') } property QtObject deleteAction: QtObject { property int iconSize: 36 property string name : 'delete' property string icon : 'contact_delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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') } } diff --git a/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml index 56cbf2722..e004ed5c9 100644 --- a/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml @@ -10,12 +10,12 @@ import ColorsList 1.0 QtObject { property string sectionName : 'Conversation' property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color - property color searchIconColor: ColorsList.add(sectionName+'_bar_search', 'c').color + property var backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e') + property var searchIconColor: ColorsList.add(sectionName+'_bar_search', 'c') property int avatarSize: 60 property int groupChatSize: 80 property string groupChatIcon: 'chat_room_custom' - property color groupChatColor: ColorsList.add(sectionName+'_bar_groupChat', 'g').color + property var groupChatColor: ColorsList.add(sectionName+'_bar_groupChat', 'g') property int height: 80 property int leftMargin: 40 @@ -25,8 +25,8 @@ QtObject { property QtObject status: QtObject { property string adminStatusIcon: 'admin_selected_custom' property int adminStatusIconSize: 24 - property color adminStatusColor: ColorsList.add(sectionName+'_bar_status', 's').color - property color adminTextColor : ColorsList.add(sectionName+'_description_admin_status', 'af').color + property var adminStatusColor: ColorsList.add(sectionName+'_bar_status', 's') + property var adminTextColor : ColorsList.add(sectionName+'_description_admin_status', 'af') } property QtObject actions: QtObject { @@ -36,50 +36,50 @@ QtObject { property int iconSize: 40 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject chat: QtObject { property int iconSize: 40 property string name : 'chat' property string icon : 'chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject groupChat: QtObject { property int iconSize: 40 property string name : 'groupChat' property string icon : 'group_chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject videoCall: QtObject { property int iconSize: 40 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject del: QtObject { @@ -88,12 +88,12 @@ QtObject { property int iconSize: 40 property string name : 'deleteHistory' property string icon : 'delete_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') } } @@ -103,53 +103,53 @@ QtObject { property int iconSize: 40 property string name : 'addContact' property string icon : 'contact_add_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 viewContact: QtObject { property int iconSize: 40 property string name : 'viewContact' property string icon : 'contact_view_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 openMenu: QtObject { property int iconSize: 40 property string name : 'other' property string icon : 'menu_vdots_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_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 color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_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 var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_b_fg') } } property QtObject contactDescription : QtObject { property QtObject subtitle: QtObject { - property color color: ColorsList.add(sectionName+'_description_subtitle', 'n').color + property var colorModel: ColorsList.add(sectionName+'_description_subtitle', 'n') property int pointSize: Units.dp * 10 property int weight: Font.Light } property QtObject title: QtObject { - property color color: ColorsList.add(sectionName+'_description_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_description_title', 'j') property int pointSize: Units.dp * 11 property int weight: Font.Normal property QtObject status : QtObject{ - property color color : ColorsList.add(sectionName+'_description_title_status', 'g').color + property var colorModel : ColorsList.add(sectionName+'_description_title_status', 'g') property int pointSize : Units.dp * 9 } } @@ -157,20 +157,20 @@ QtObject { } property QtObject filters: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_filters_bg', 'q').color - property color iconColor: ColorsList.add(sectionName+'_filters_icon', 'c').color + property var backgroundColor: ColorsList.add(sectionName+'_filters_bg', 'q') + property var iconColor: ColorsList.add(sectionName+'_filters_icon', 'c') property int height: 51 property int leftMargin: 40 property int pointSize: Units.dp * 9 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_filters_border', 'g10').color + property var colorModel: ColorsList.add(sectionName+'_filters_border', 'g10') property int bottomWidth: 1 property int topWidth: 0 } } property QtObject menu: QtObject{ - property color separatorColor: ColorsList.add(sectionName+'_separator', 'u').color + property var separatorColor: ColorsList.add(sectionName+'_separator', 'u') } } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml index 7d5172901..cd7d2fdfa 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml @@ -16,12 +16,12 @@ QtObject { property int spacing: 10 property QtObject license: QtObject { - property color color: ColorsList.add(sectionName+'_license', 'd').color + property var colorModel: ColorsList.add(sectionName+'_license', 'd') property int pointSize: Units.dp * 10 } property QtObject url: QtObject { - property color color: ColorsList.add(sectionName+'_url', 'i').color + property var colorModel: ColorsList.add(sectionName+'_url', 'i') property int pointSize: Units.dp * 10 } } @@ -31,12 +31,12 @@ QtObject { property int spacing: 10 property QtObject appVersion: QtObject { - property color color: ColorsList.add(sectionName+'_appVersion', 'd').color + property var colorModel: ColorsList.add(sectionName+'_appVersion', 'd') property int pointSize: Units.dp * 10 } property QtObject coreVersion: QtObject { - property color color: ColorsList.add(sectionName+'_coreVersion', 'd').color + property var colorModel: ColorsList.add(sectionName+'_coreVersion', 'd') property int pointSize: Units.dp * 10 } } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml index a285e3a68..5447dc174 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/EphemeralChatRoomStyle.qml @@ -23,14 +23,14 @@ QtObject { property int preferredHeight: 60 property int preferredWidth: 60 property string icon: 'timer_custom' - property color timerColor: ColorsList.addImageColor(sectionName+'_timer', icon, 'ad').color + property var timerColor: ColorsList.addImageColor(sectionName+'_timer', icon, 'ad') } property QtObject descriptionText: QtObject { property int preferredWidth: 200 property int leftMargin: 10 property int rightMargin: 10 property real pointSize: Units.dp * 11 - property color color: ColorsList.add(sectionName+'_popup_description', 'd').color + property var colorModel: ColorsList.add(sectionName+'_popup_description', 'd') } property QtObject timerPicker: QtObject { property int preferredWidth: 150 diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml index 5e6898d7f..a5ac080cc 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoChatRoomStyle.qml @@ -24,17 +24,17 @@ QtObject { property QtObject results : QtObject{ property int topMargin : 10 - property color color : ColorsList.add(sectionName+'_results', 'g').color + property var colorModel : ColorsList.add(sectionName+'_results', 'g') property QtObject title : QtObject{ property int topMargin: 10 property int leftMargin: 20 - property color color: ColorsList.add(sectionName+'_results_title', 'j').color + property var colorModel: ColorsList.add(sectionName+'_results_title', 'j') property int pointSize : Units.dp * 11 property int weight : Font.DemiBold } property QtObject header: QtObject{ property int rightMargin: 55 - property color color: Colors.t.color + property var colorModel: ColorsList.add(sectionName+'_results_header', 'j') property int weight : Font.Light property int pointSize : Units.dp * 10 @@ -44,45 +44,45 @@ QtObject { property QtObject leaveButton : QtObject { property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add(sectionName+'_leave_bg_d', 'o').color - property color hovered: ColorsList.add(sectionName+'_leave_bg_h', 'j').color - property color normal: ColorsList.add(sectionName+'_leave_bg_n', 'k').color - property color pressed: ColorsList.add(sectionName+'_leave_bg_p', 'i').color + property var disabled: ColorsList.add(sectionName+'_leave_bg_d', 'o') + property var hovered: ColorsList.add(sectionName+'_leave_bg_h', 'j') + property var normal: ColorsList.add(sectionName+'_leave_bg_n', 'k') + property var pressed: ColorsList.add(sectionName+'_leave_bg_p', 'i') } property QtObject textColor: QtObject { - property color disabled: ColorsList.add(sectionName+'_leave_text_d', 'q').color - property color hovered: ColorsList.add(sectionName+'_leave_text_h', 'q').color - property color normal: ColorsList.add(sectionName+'_leave_text_n', 'i').color - property color pressed: ColorsList.add(sectionName+'_leave_text_p', 'q').color + property var disabled: ColorsList.add(sectionName+'_leave_text_d', 'q') + property var hovered: ColorsList.add(sectionName+'_leave_text_h', 'q') + property var normal: ColorsList.add(sectionName+'_leave_text_n', 'i') + property var pressed: ColorsList.add(sectionName+'_leave_text_p', 'q') } property QtObject borderColor : QtObject{ - property color disabled: ColorsList.add(sectionName+'_leave_border_d', 'q').color - property color hovered: ColorsList.add(sectionName+'_leave_border_h', 'q').color - property color normal: ColorsList.add(sectionName+'_leave_border_n', 'i').color - property color pressed: ColorsList.add(sectionName+'_leave_border_p', 'q').color + property var disabled: ColorsList.add(sectionName+'_leave_border_d', 'q') + property var hovered: ColorsList.add(sectionName+'_leave_border_h', 'q') + property var normal: ColorsList.add(sectionName+'_leave_border_n', 'i') + property var pressed: ColorsList.add(sectionName+'_leave_border_p', 'q') } } property QtObject addParticipant: QtObject { property int iconSize: 30 property string name : 'addParticipant' property string icon : 'add_participant_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 removeParticipant: QtObject { property int iconSize: 30 property string name : 'removeParticipant' property string icon : 'remove_participant_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') } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml index 96a3c6b8c..c49bfc793 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/InfoEncryptionStyle.qml @@ -22,17 +22,17 @@ QtObject { property QtObject okButton : QtObject{ property QtObject backgroundColor: QtObject { - property color disabled: ColorsList.add(sectionName+'_ok_bg_d', 'i30').color - property color hovered: ColorsList.add(sectionName+'_ok_bg_h', 'b').color - property color normal: ColorsList.add(sectionName+'_ok_bg_n', 's').color - property color pressed: ColorsList.add(sectionName+'_ok_bg_p', 'm').color + property var disabled: ColorsList.add(sectionName+'_ok_bg_d', 'i30') + property var hovered: ColorsList.add(sectionName+'_ok_bg_h', 'b') + property var normal: ColorsList.add(sectionName+'_ok_bg_n', 's') + property var pressed: ColorsList.add(sectionName+'_ok_bg_p', 'm') } property QtObject textColor: QtObject { - property color disabled: ColorsList.add(sectionName+'_ok_text_d', 'q').color - property color hovered: ColorsList.add(sectionName+'_ok_text_h', 'q').color - property color normal: ColorsList.add(sectionName+'_ok_text_n', 'q').color - property color pressed: ColorsList.add(sectionName+'_ok_text_p', 'q').color + property var disabled: ColorsList.add(sectionName+'_ok_text_d', 'q') + property var hovered: ColorsList.add(sectionName+'_ok_text_h', 'q') + property var normal: ColorsList.add(sectionName+'_ok_text_n', 'q') + property var pressed: ColorsList.add(sectionName+'_ok_text_p', 'q') } } @@ -46,6 +46,6 @@ QtObject { property int leftMargin: 10 property int rightMargin: 10 property real pointSize: Units.dp * 11 - property color color: ColorsList.add(sectionName+'_description', 'd').color + property var colorModel: ColorsList.add(sectionName+'_description', 'd') } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml index d0949fe5b..c5b4cf85a 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/ManageAccountsStyle.qml @@ -17,11 +17,11 @@ QtObject { property int iconSize: 30 property string icon : 'options_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml index 2e9ad8159..24abad77b 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/NewChatRoomStyle.qml @@ -9,35 +9,35 @@ import ColorsList 1.0 QtObject { property string sectionName: 'NewChatRoom' - property color askEncryptionColor: ColorsList.add(sectionName+'_ask_encryption', 'g').color - property color subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g').color - property color recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g').color - property color recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g').color - property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'border_light').color - property color addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g').color - property color requiredColor: ColorsList.add(sectionName+'_required_text', 'g').color + property var askEncryptionColor: ColorsList.add(sectionName+'_ask_encryption', 'g') + property var subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g') + property var recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g') + property var recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g') + property var addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'border_light') + property var addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g') + property var requiredColor: ColorsList.add(sectionName+'_required_text', 'g') property QtObject addParticipant: QtObject { property int iconSize: 30 property string name : 'addParticipant' property string icon : 'add_participant_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 removeParticipant: QtObject { property int iconSize: 30 property string name : 'removeParticipant' property string icon : 'remove_participant_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') } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml b/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml index a35e3085a..0d497e104 100644 --- a/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/Dialogs/ParticipantsDevicesStyle.qml @@ -8,29 +8,29 @@ import ColorsList 1.0 // ============================================================================= QtObject { property string sectionName: 'ParticipantsDevices' - property color lineBackgroundColor: ColorsList.add(sectionName+'_line_bg', 'ah').color - property color lineSeparatorColor: ColorsList.add(sectionName+'_separator', 'ag').color + property var lineBackgroundColor: ColorsList.add(sectionName+'_line_bg', 'ah') + property var lineSeparatorColor: ColorsList.add(sectionName+'_separator', 'ag') property QtObject collapsed: QtObject { property int iconSize: 30 property string name : 'collapsed' property string icon : 'collapsed_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 expanded: QtObject { property int iconSize: 30 property string name : 'expanded' property string icon : 'expanded_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') } } \ No newline at end of file diff --git a/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml b/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml index d44f5134c..d2db37ba7 100644 --- a/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/HistoryViewStyle.qml @@ -7,7 +7,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'HistoryView' property QtObject bar: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color + property var backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e') property int avatarSize: 60 property int height: 80 property int leftMargin: 40 @@ -31,18 +31,18 @@ QtObject { } property QtObject description: QtObject { - property color subtitleColor: ColorsList.add(sectionName+'_bar_description_subtitle', 'g').color - property color titleColor: ColorsList.add(sectionName+'_bar_description_title', 'j').color + property var subtitleColor: ColorsList.add(sectionName+'_bar_description_subtitle', 'g') + property var titleColor: ColorsList.add(sectionName+'_bar_description_title', 'j') } } property QtObject filters: QtObject { - property color backgroundColor: ColorsList.add(sectionName+'_filters_bg', 'q').color + property var backgroundColor: ColorsList.add(sectionName+'_filters_bg', 'q') property int height: 51 property int leftMargin: 40 property QtObject border: QtObject { - property color color: ColorsList.add(sectionName+'_filters_border', 'g10').color + property var colorModel: ColorsList.add(sectionName+'_filters_border', 'g10') property int bottomWidth: 1 property int topWidth: 0 } @@ -51,44 +51,44 @@ QtObject { property int iconSize: 40 property string name : 'videoCall' property string icon : 'video_call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject call: QtObject { property int iconSize: 40 property string name : 'call' property string icon : 'call_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject deleteAction: QtObject { property int iconSize: 40 property string name : 'delete' property string icon : 'delete_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 chat: QtObject { property int iconSize: 40 property string name : 'chat' property string icon : 'chat_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml b/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml index 746c47472..7207e1bcb 100644 --- a/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/HomeStyle.qml @@ -6,6 +6,6 @@ import ColorsList 1.0 QtObject { property string sectionName: 'Home' - property color color: ColorsList.add(sectionName+'_bg', 'k').color + property var colorModel: ColorsList.add(sectionName+'_bg', 'k') property int spacing: 20 } diff --git a/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml b/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml index 77f92cf55..3595583c2 100644 --- a/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/InviteFriendsStyle.qml @@ -7,7 +7,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'InviteFriends' - property color color: ColorsList.add(sectionName+'_bg', 'k').color + property var colorModel: ColorsList.add(sectionName+'_bg', 'k') property int width: 400 property QtObject message: QtObject { diff --git a/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml index 655779f01..1b1fb7109 100644 --- a/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml @@ -26,7 +26,7 @@ QtObject { property QtObject text: QtObject { property int pointSize: Units.dp * 8 - property color color: ColorsList.add(sectionName+'_auto_answer_text', 'i').color + property var colorModel: ColorsList.add(sectionName+'_auto_answer_text', 'i') } } @@ -41,19 +41,19 @@ QtObject { property QtObject contacts: QtObject { property string icon: 'contact_custom' property int iconSize: 50 - property color color: ColorsList.add(sectionName+'_me_contacts', 'me_n_b_inv_fg').color - property color selectedColor: ColorsList.add(sectionName+'_me_contacts_c', 'me_p_b_inv_fg').color + property var colorModel: ColorsList.add(sectionName+'_me_contacts', 'me_n_b_inv_fg') + property var selectedColor: ColorsList.add(sectionName+'_me_contacts_c', 'me_p_b_inv_fg') } property QtObject conferences: QtObject { property string icon: 'meetings_custom' property int iconSize: 50 - property color color: ColorsList.add(sectionName+'_me_conferences', 'me_n_b_inv_fg').color - property color selectedColor: ColorsList.add(sectionName+'_me_conferences_c', 'me_p_b_inv_fg').color + property var colorModel: ColorsList.add(sectionName+'_me_conferences', 'me_n_b_inv_fg') + property var selectedColor: ColorsList.add(sectionName+'_me_conferences_c', 'me_p_b_inv_fg') } /* property string conferencesIcon: 'conference' - property color conferencesColor: ColorsList.add(sectionName+'_me_confs', 'me_n_b_inv_fg').color - property color conferencesSelectedColor: ColorsList.add(sectionName+'_me_confs_selected', 'me_p_b_inv_fg').color*/ + property var conferencesColor: ColorsList.add(sectionName+'_me_confs', 'me_n_b_inv_fg') + property var conferencesSelectedColor: ColorsList.add(sectionName+'_me_confs_selected', 'me_p_b_inv_fg')*/ } @@ -68,7 +68,8 @@ QtObject { property int spacing: 16 property var background: Rectangle { - color: ColorsList.add(sectionName+'_toolbar_bg', 'f').color + property var colorModel: ColorsList.add(sectionName+'_toolbar_bg', 'f') + color: colorModel.color } } property QtObject buttons: QtObject { @@ -76,64 +77,64 @@ QtObject { property int iconSize: 40 property string name : 'home' property string icon : 'home_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color + property var backgroundNormalColor: ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg') + property var backgroundHoveredColor: ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg') + property var backgroundPressedColor: ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg') + property var foregroundNormalColor: ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg') + property var foregroundHoveredColor: ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg') + property var foregroundPressedColor: ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg') } property QtObject telKeyad: QtObject { property int iconSize: 40 property string name : 'telKeypad' property string icon : 'dialpad_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_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 color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_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 var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_b_fg') } property QtObject newChatGroup: QtObject { property int iconSize: 40 property string name : 'newChatGroup' property string icon : 'new_chat_group_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'ma_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'ma_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'ma_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'ma_d_b_fg') } property QtObject newConference: QtObject { property int iconSize: 40 property string name : 'newConference' property string icon : 'conference_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'ma_d_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'ma_d_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'ma_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'ma_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'ma_p_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 'ma_d_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'ma_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'ma_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'ma_p_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 'ma_d_b_fg') } property QtObject burgerMenu: QtObject { property int iconSize: 40 property string name : 'burgerMenu' property string icon : 'burger_menu_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'l_n_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_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 foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'l_u_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 foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_u_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') } } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml index c97256186..2e8c5bcfc 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsAdvancedStyle.qml @@ -12,10 +12,10 @@ QtObject { } property QtObject error: QtObject { - property color color: ColorsList.add(sectionName+'_error', 'error').color + property var colorModel: ColorsList.add(sectionName+'_error', 'error') } property QtObject info: QtObject { - property color color: ColorsList.add(sectionName+'_info', 'j').color + property var colorModel: ColorsList.add(sectionName+'_info', 'j') property int pointSize: Units.dp * 11 } property QtObject lists: QtObject { @@ -27,39 +27,39 @@ QtObject { property int iconSize: 35 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 cancel: QtObject { property int iconSize: 35 property string icon : 'cancel_custom' property string name : 'cancel' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject options: QtObject { property int iconSize: 35 property string icon : 'options_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml index 90ad0f672..3ab518206 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsAudioStyle.qml @@ -6,9 +6,9 @@ import ColorsList 1.0 QtObject { property string sectionName: 'SettingsAudio' - property color sliderBackgroundColor: ColorsList.add(sectionName+'_slider_bg', 'slider_bg').color - property color sliderHighColor: ColorsList.add(sectionName+'_slider_high', 'slider_high').color - property color sliderLowColor: ColorsList.add(sectionName+'_slider_low', 'slider_low').color + property var sliderBackgroundColor: ColorsList.add(sectionName+'_slider_bg', 'slider_bg') + property var sliderHighColor: ColorsList.add(sectionName+'_slider_high', 'slider_high') + property var sliderLowColor: ColorsList.add(sectionName+'_slider_low', 'slider_low') property QtObject ringPlayer: QtObject { property int leftMargin: 10 @@ -20,26 +20,26 @@ QtObject { property int iconSize: 40 property string icon : 'pause_custom' property string name : 'pause' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } property QtObject play: QtObject { property int iconSize: 40 property string icon : 'play_custom' property string name : 'play' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color - property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_n_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml index 75fdeaf01..9907f8fc9 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsUiStyle.qml @@ -11,11 +11,11 @@ QtObject { property int iconSize: 25 property string icon : 'options_custom' property string name : 'options' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } } diff --git a/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml b/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml index 6a850b450..2a8b38e28 100644 --- a/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml +++ b/linphone-app/ui/views/App/Styles/Settings/SettingsWindowStyle.qml @@ -7,7 +7,7 @@ import ColorsList 1.0 QtObject { property string sectionName: 'SettingsWindow' - property color color: ColorsList.add(sectionName+'_bg', 'k').color + property var colorModel: ColorsList.add(sectionName+'_bg', 'k') property int height: 640 property int width: 1024 @@ -36,51 +36,51 @@ QtObject { property int iconSize: 36 property string name : 'editProxy' property string icon : 'edit_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 deleteProxy: QtObject { property int iconSize: 36 property string name : 'deleteProxy' property string icon : 'delete_custom' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_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 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 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 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 back: QtObject { property int iconSize: 35 property string icon : 'back_custom' property string name : 'back' - property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg').color - property color backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg').color - property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg').color - property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg').color - property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg').color - property color foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg').color - property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg').color - property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg').color + property var backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 's_n_b_bg') + property var backgroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_d', icon, 's_d_b_bg') + property var backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 's_h_b_bg') + property var backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 's_p_b_bg') + property var foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 's_n_b_fg') + property var foregroundDisabledColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_d', icon, 's_d_b_fg') + property var foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 's_h_b_fg') + property var foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 's_p_b_fg') } property QtObject copy: QtObject { property int iconSize: 30 property string icon : 'menu_copy_text_custom' property string name : 'copy' - 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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', 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 color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', 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 backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', 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') + property var foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'l_p_b_fg') } } }