diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index a0585892e..a55c0c549 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -817,7 +817,12 @@ Server url ikke konfigureret. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index ce313d9b1..086d9ddb2 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -817,7 +817,12 @@ Server URL ist nicht konfiguriert. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 21ec8ba24..83b9147dd 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -817,9 +817,14 @@ Server URL not configured. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. Conference URL has been copied + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. + + ConfirmDialog diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index dadf886c6..46054561e 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -817,7 +817,12 @@ URL del servidor no configurada. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index f918a11b1..acd4b545c 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -817,7 +817,12 @@ URL du serveur non configurée. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 8ede3ed7c..03f161483 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -811,7 +811,12 @@ A kiszolgáló URL-je nincs konfigurálva. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 5f8a40bd2..4a7ec1fc9 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -817,9 +817,14 @@ URL del server non configurato. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. L'URL della conferenze è stato copiato + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. + + ConfirmDialog diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 0320e7c4c..55e98abc5 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -811,7 +811,12 @@ conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index 13d2acd68..27ea67e9a 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -823,7 +823,12 @@ Nesukonfigūruotas serverio url. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 5bdc493df..172f94417 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -817,7 +817,12 @@ URL do servidor não configurado. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index c9b125677..f6a9a0a6d 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -823,9 +823,14 @@ conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. URL конференции скопирован + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. + + ConfirmDialog diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index 15b67ba58..64a50a977 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -817,7 +817,12 @@ Serverwebbadressen är inte konfigurerad. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index dc4eb019f..702efc2f6 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -811,7 +811,12 @@ Sunucu url'si yapılandırılmadı. conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index 5df47dd74..ba19b67fd 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -823,7 +823,12 @@ conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 6288eb334..5968edabc 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -811,7 +811,12 @@ conferencesCopiedURL - 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. + + + + conferencesDeleted + 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp index 5e88f7075..bcbdbcd32 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.cpp @@ -38,7 +38,9 @@ // ============================================================================= ConferenceInfoListModel::ConferenceInfoListModel (QObject *parent) : ProxyListModel(parent) { - auto conferenceInfos = CoreManager::getInstance()->getCore()->getConferenceInformationList(); + auto coreManager = CoreManager::getInstance(); + connect(coreManager->getHandlers().get(), &CoreHandlers::conferenceInfoReceived, this, &ConferenceInfoListModel::onConferenceInfoReceived); + auto conferenceInfos = coreManager->getCore()->getConferenceInformationList(); QList > items; for(auto conferenceInfo : conferenceInfos){ auto item = build(conferenceInfo); @@ -87,4 +89,30 @@ QVariant ConferenceInfoListModel::data (const QModelIndex &index, int role ) con else if (role == Qt::DisplayRole +1 ) return QVariant::fromValue(mList[row].objectCast()->getDateTimeUtc().date()); return QVariant(); - } \ No newline at end of file +} + +QSharedPointer ConferenceInfoListModel::get(std::shared_ptr conferenceInfo) const{ + auto uri = conferenceInfo->getUri(); + for(auto item : mList){ + auto model = item.objectCast(); + auto dbConferenceInfo = model->getConferenceInfo(); + if(dbConferenceInfo == conferenceInfo + || dbConferenceInfo->getUri()->weakEqual(uri)) + return model; + } + return nullptr; +} + +void ConferenceInfoListModel::onConferenceInfoReceived(const std::shared_ptr & conferenceInfo){ + auto realConferenceInfo = ConferenceInfoModel::findConferenceInfo(conferenceInfo); + if( realConferenceInfo){ + auto model = get(realConferenceInfo); + if(model) + model->setConferenceInfo(realConferenceInfo); + else + add(realConferenceInfo); + }else + qWarning() << "No ConferenceInfo have beend found for " << conferenceInfo->getUri()->asString().c_str(); +} + + \ No newline at end of file diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp index f4918f218..e10d3e7d5 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoListModel.hpp @@ -43,6 +43,9 @@ public: QHash roleNames () const override; virtual QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const override; + QSharedPointer get(std::shared_ptr conferenceInfo) const; + + void onConferenceInfoReceived(const std::shared_ptr & conferenceInfo); signals: void filterTypeChanged(int filterType); diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp index 7765dd990..7c7b6fde0 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.cpp @@ -93,6 +93,16 @@ ConferenceInfoModel::ConferenceInfoModel (QObject * parent) : QObject(parent){ cleanedClonedAddress->clean(); mConferenceInfo->setOrganizer(cleanedClonedAddress); } + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::timeZoneModelChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::dateTimeChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::durationChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::organizerChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::subjectChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::descriptionChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::participantsChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::uriChanged);// Useless but just in case. + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::isScheduledChanged); + connect(this, &ConferenceInfoModel::conferenceInfoChanged, this, &ConferenceInfoModel::inviteModeChanged); } // Callable from C++ @@ -262,6 +272,12 @@ void ConferenceInfoModel::setInviteMode(const int& mode){ } } +void ConferenceInfoModel::setConferenceInfo(std::shared_ptr conferenceInfo){ + mConferenceInfo = conferenceInfo; + mIsScheduled = (mConferenceInfo->getDateTime() != 0 || mConferenceInfo->getDuration() != 0); + emit conferenceInfoChanged(); +} + //------------------------------------------------------------------------------------------------- void ConferenceInfoModel::createConference(const int& securityLevel) { @@ -284,7 +300,7 @@ void ConferenceInfoModel::createConference(const int& securityLevel) { void ConferenceInfoModel::deleteConferenceInfo(){ if(mConferenceInfo) { CoreManager::getInstance()->getCore()->deleteConferenceInformation(mConferenceInfo); - emit removed(); + emit removed(true); } } diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.hpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.hpp index 0aae5b8fa..916087983 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.hpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoModel.hpp @@ -83,6 +83,7 @@ public: Q_INVOKABLE void setParticipants(ParticipantListModel * participants); Q_INVOKABLE void setTimeZoneModel(TimeZoneModel * model); + void setConferenceInfo(std::shared_ptr conferenceInfo); // Tools Q_INVOKABLE void createConference(const int& securityLevel); @@ -108,8 +109,9 @@ signals: void conferenceCreated(); void conferenceCreationFailed(); + void conferenceInfoChanged(); void invitationsSent(); - void removed(); + void removed(bool byUser); private: std::shared_ptr mConferenceInfo; @@ -118,6 +120,7 @@ private: bool mIsScheduled = true; int mInviteMode = 0; + bool mRemoveRequested = false;// true if user has request its deletion from DB }; Q_DECLARE_METATYPE(QSharedPointer) diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.cpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.cpp index c0ab02c9c..885b8c058 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.cpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.cpp @@ -37,7 +37,6 @@ using namespace std; ConferenceInfoProxyModel::ConferenceInfoProxyModel (QObject *parent) : SortFilterAbstractProxyModel(new ConferenceInfoListModel(parent), parent) { connect(CoreManager::getInstance()->getAccountSettingsModel(), &AccountSettingsModel::primarySipAddressChanged, this, &ConferenceInfoProxyModel::update); //connect(this, &ConferenceInfoProxyModel::filterTypeChanged, qobject_cast(sourceModel()), &ConferenceInfoListModel); - connect(CoreManager::getInstance()->getHandlers().get(), &CoreHandlers::conferenceInfoReceived, this, &ConferenceInfoProxyModel::onConferenceInfoReceived); setFilterType((int)Scheduled); } @@ -75,11 +74,3 @@ bool ConferenceInfoProxyModel::lessThan (const QModelIndex &left, const QModelIn return a->getDateTimeUtc() < b->getDateTimeUtc(); } -void ConferenceInfoProxyModel::onConferenceInfoReceived(const std::shared_ptr & conferenceInfo){ - auto realConferenceInfo = ConferenceInfoModel::findConferenceInfo(conferenceInfo); - if( realConferenceInfo ){ - auto model = qobject_cast(sourceModel()); - model->add(realConferenceInfo); - }else - qWarning() << "No conferenceInfo have beend found for " << conferenceInfo->getUri()->asString().c_str(); -} diff --git a/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.hpp b/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.hpp index 819d02c19..0f4c7ce8d 100644 --- a/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.hpp +++ b/linphone-app/src/components/conferenceInfo/ConferenceInfoProxyModel.hpp @@ -49,8 +49,6 @@ public: ConferenceInfoProxyModel (QObject *parent = Q_NULLPTR); Q_INVOKABLE void update(); - - void onConferenceInfoReceived(const std::shared_ptr & conferenceInfo); protected: bool filterAcceptsRow (int sourceRow, const QModelIndex &sourceParent) const override; diff --git a/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml index 05a7f1eee..cdf207d94 100644 --- a/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml +++ b/linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml @@ -12,6 +12,7 @@ Row { property int selectedButton: 0 property var texts property int capitalization + property QtObject style: ExclusiveButtonsStyle // --------------------------------------------------------------------------- @@ -46,12 +47,12 @@ Row { capitalization: item.capitalization anchors.verticalCenter: parent.verticalCenter backgroundColor: selectedButton === index - ? ExclusiveButtonsStyle.button.color.selected + ? item.style.button.color.selected : (down - ? ExclusiveButtonsStyle.button.color.pressed + ? item.style.button.color.pressed : (hovered - ? ExclusiveButtonsStyle.button.color.hovered - : ExclusiveButtonsStyle.button.color.normal + ? item.style.button.color.hovered + : item.style.button.color.normal ) ) text: modelData diff --git a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml index 824cc5904..6e1d2f94a 100644 --- a/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml +++ b/linphone-app/ui/modules/Linphone/Chat/ChatCalendarMessage.qml @@ -34,6 +34,7 @@ Loader{ signal expandToggle() signal conferenceUriCopied() + signal conferenceRemoved() width: parent.width height: parent.height @@ -352,5 +353,9 @@ Loader{ } } } + Connections{ + target: conferenceInfoModel + onRemoved: if(byUser) mainItem.conferenceRemoved() + } } diff --git a/linphone-app/ui/views/App/Calls/Incall.qml b/linphone-app/ui/views/App/Calls/Incall.qml index 4495a8c61..6f959ffcc 100644 --- a/linphone-app/ui/views/App/Calls/Incall.qml +++ b/linphone-app/ui/views/App/Calls/Incall.qml @@ -27,6 +27,7 @@ Rectangle { property bool cameraIsReady : false property bool previewIsReady : false property bool isFullScreen: false // Use this variable to test if we are in fullscreen. Do not test _fullscreen : we need to clean memory before having the window (see .js file) + property bool isAudioOnly: callModel && callModel.isConference && conferenceLayout.sourceComponent == gridComponent && !callModel.videoEnabled property var _fullscreen: null on_FullscreenChanged: if( !_fullscreen) isFullScreen = false @@ -452,7 +453,7 @@ Rectangle { backgroundRadius: 90 colorSet: callModel && callModel.cameraEnabled ? IncallStyle.buttons.cameraOn : IncallStyle.buttons.cameraOff updating: callModel.videoEnabled && callModel.updating - visible: callModel && (!callModel.isConference || callModel.localVideoEnabled) + enabled: !conference.isAudioOnly onClicked: if(callModel){ if( callModel.isConference){// Only deactivate camera in conference. callModel.cameraEnabled = !callModel.cameraEnabled diff --git a/linphone-app/ui/views/App/Main/Conferences.qml b/linphone-app/ui/views/App/Main/Conferences.qml index 03e8f2198..999601dcc 100644 --- a/linphone-app/ui/views/App/Main/Conferences.qml +++ b/linphone-app/ui/views/App/Main/Conferences.qml @@ -67,6 +67,7 @@ Item{ ] capitalization: Font.AllUppercase selectedButton: mainItem.filterType + style: ConferencesStyle.filter.buttons onClicked: { if(button <= 1) mainItem.filterType = (button === 0 ? ConferenceInfoProxyModel.Ended : ConferenceInfoProxyModel.Scheduled); @@ -180,8 +181,10 @@ Item{ : 0 onExpandToggle: isExpanded = !isExpanded //isExpanded: calendarGrid.expanded - //: 'Conference URL has been copied' : Message text in a banner to warn the user that the µURL have been copied to the clipboard. + //: 'Conference URL has been copied' : Message text in a banner to warn the user that the URL have been copied to the clipboard. onConferenceUriCopied: messageBanner.noticeBannerText = qsTr('conferencesCopiedURL') + //: 'Conference has been deleted' : Message text in a banner to warn the user that the conference has been deleted. + onConferenceRemoved: messageBanner.noticeBannerText = qsTr('conferencesDeleted') } } } diff --git a/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml index fe37c6212..9b39a1616 100644 --- a/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml +++ b/linphone-app/ui/views/App/Styles/Calls/IncallStyle.qml @@ -335,10 +335,12 @@ QtObject { 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 QtObject cameraOff: QtObject { property int iconSize: 40 @@ -348,10 +350,12 @@ QtObject { 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 QtObject pause: QtObject { property int iconSize: 40 diff --git a/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml b/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml index 81d0ff58d..d127cf593 100644 --- a/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml +++ b/linphone-app/ui/views/App/Styles/Main/ConferencesStyle.qml @@ -14,6 +14,20 @@ QtObject { property QtObject filter: QtObject { property string icon: 'filter_custom' property color color: ColorsList.add(sectionName+'_filter_icon', 'c').color + + 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 QtObject bar: QtObject { property color backgroundColor: ColorsList.add(sectionName+'_bar_bg', 'e').color