diff --git a/Linphone/core/account/AccountCore.cpp b/Linphone/core/account/AccountCore.cpp index 1c8dc5d27..cbc68afd5 100644 --- a/Linphone/core/account/AccountCore.cpp +++ b/Linphone/core/account/AccountCore.cpp @@ -35,6 +35,13 @@ QSharedPointer AccountCore::create(const std::shared_ptr &account) : QObject(nullptr) { App::getInstance()->mEngine->setObjectOwnership(this, QQmlEngine::CppOwnership); // Should be call from model Thread @@ -87,12 +94,14 @@ AccountCore::AccountCore(const std::shared_ptr &account) : QO mAccountModel = Utils::makeQObject_ptr(account); // OK mAccountModel->setSelf(mAccountModel); mNotificationsAllowed = mAccountModel->getNotificationsAllowed(); - mDialPlan = " "; + mDialPlan = createDialPlanVariant("", " "); mDialPlans << mDialPlan; for (auto dialPlan : linphone::Factory::get()->getDialPlans()) { - mDialPlans << mAccountModel->dialPlanAsString(dialPlan); + mDialPlans << createDialPlanVariant( + Utils::coreStringToAppString(dialPlan->getFlag()), + Utils::coreStringToAppString(dialPlan->getCountry() + " | +" + dialPlan->getCountryCallingCode())); if (dialPlan->getCountryCallingCode() == account->getParams()->getInternationalPrefix()) { - mDialPlan = mAccountModel->dialPlanAsString(dialPlan); + mDialPlan = mDialPlans.last().toMap(); } } mVoicemailAddress = @@ -136,7 +145,7 @@ void AccountCore::setSelf(QSharedPointer me) { mAccountModelConnection->invokeToCore([this, displayName]() { onDisplayNameChanged(displayName); }); }); mAccountModelConnection->makeConnectToModel(&AccountModel::dialPlanChanged, [this](int index) { - auto dialPlan = mDialPlans[index + 1]; + auto dialPlan = mDialPlans[index + 1].toMap(); mAccountModelConnection->invokeToCore([this, dialPlan]() { onDialPlanChanged(dialPlan); }); }); mAccountModelConnection->makeConnectToModel(&AccountModel::registerEnabledChanged, [this](bool enabled) { @@ -215,7 +224,7 @@ void AccountCore::setSelf(QSharedPointer me) { mAccountModelConnection->makeConnectToCore(&AccountCore::lSetDisplayName, [this](QString displayName) { mAccountModelConnection->invokeToModel([this, displayName]() { mAccountModel->setDisplayName(displayName); }); }); - mAccountModelConnection->makeConnectToCore(&AccountCore::lSetDialPlan, [this](QString dialPlan) { + mAccountModelConnection->makeConnectToCore(&AccountCore::lSetDialPlan, [this](QVariantMap dialPlan) { auto dialPlanIndex = getDialPlanIndex(dialPlan); mAccountModelConnection->invokeToModel( [this, dialPlanIndex]() { mAccountModel->setDialPlan(dialPlanIndex - 1); }); @@ -367,22 +376,22 @@ void AccountCore::onDisplayNameChanged(QString displayName) { } } -QStringList AccountCore::getDialPlans() { +QVariantList AccountCore::getDialPlans() { return mDialPlans; } -QString AccountCore::getDialPlan() const { +QVariantMap AccountCore::getDialPlan() const { return mDialPlan; } -void AccountCore::onDialPlanChanged(QString dialPlan) { +void AccountCore::onDialPlanChanged(QVariantMap dialPlan) { if (dialPlan != mDialPlan) { mDialPlan = dialPlan; emit dialPlanChanged(); } } -int AccountCore::getDialPlanIndex(QString dialPlanString) { +int AccountCore::getDialPlanIndex(QVariantMap dialPlanString) { return mDialPlans.indexOf(dialPlanString); } diff --git a/Linphone/core/account/AccountCore.hpp b/Linphone/core/account/AccountCore.hpp index 8006cf9f5..1c9fcb335 100644 --- a/Linphone/core/account/AccountCore.hpp +++ b/Linphone/core/account/AccountCore.hpp @@ -42,8 +42,8 @@ class AccountCore : public QObject, public AbstractObject { Q_PROPERTY( int unreadMessageNotifications READ getUnreadMessageNotifications NOTIFY unreadMessageNotificationsChanged) Q_PROPERTY(QString displayName READ getDisplayName WRITE lSetDisplayName NOTIFY displayNameChanged) - Q_PROPERTY(QStringList dialPlans READ getDialPlans CONSTANT) - Q_PROPERTY(QString dialPlan READ getDialPlan WRITE lSetDialPlan NOTIFY dialPlanChanged) + Q_PROPERTY(QVariantList dialPlans READ getDialPlans CONSTANT) + Q_PROPERTY(QVariantMap dialPlan READ getDialPlan WRITE lSetDialPlan NOTIFY dialPlanChanged) Q_PROPERTY( QString humaneReadableRegistrationState READ getHumanReadableRegistrationState NOTIFY registrationStateChanged) Q_PROPERTY(QString humaneReadableRegistrationStateExplained READ getHumanReadableRegistrationStateExplained NOTIFY @@ -104,10 +104,10 @@ public: Q_INVOKABLE void removeAccount(); QString getDisplayName() const; void onDisplayNameChanged(QString displayName); - QStringList getDialPlans(); - int getDialPlanIndex(QString dialPlanString); - QString getDialPlan() const; - void onDialPlanChanged(QString internationalPrefix); + QVariantList getDialPlans(); + int getDialPlanIndex(QVariantMap dialPlanString); + QVariantMap getDialPlan() const; + void onDialPlanChanged(QVariantMap internationalPrefix); QString getHumanReadableRegistrationState() const; QString getHumanReadableRegistrationStateExplained() const; bool getRegisterEnabled() const; @@ -177,7 +177,7 @@ signals: void lResetMissedCalls(); void lRefreshNotifications(); void lSetDisplayName(QString displayName); - void lSetDialPlan(QString internationalPrefix); + void lSetDialPlan(QVariantMap internationalPrefix); void lSetRegisterEnabled(bool enabled); void lSetNotificationsAllowed(bool value); void lSetMwiServerAddress(QString value); @@ -198,8 +198,8 @@ private: QString mIdentityAddress; QString mPictureUri; QString mDisplayName; - QStringList mDialPlans; - QString mDialPlan; + QVariantList mDialPlans; + QVariantMap mDialPlan; bool mRegisterEnabled; bool mIsDefaultAccount = false; LinphoneEnums::RegistrationState mRegistrationState; diff --git a/Linphone/data/font/EmojiTwoCOLRv0.ttf b/Linphone/data/font/EmojiTwoCOLRv0.ttf new file mode 100644 index 000000000..24d503467 Binary files /dev/null and b/Linphone/data/font/EmojiTwoCOLRv0.ttf differ diff --git a/Linphone/data/font/NotoColorEmoji_WindowsCompatible.ttf b/Linphone/data/font/NotoColorEmoji_WindowsCompatible.ttf deleted file mode 100644 index 2a9ea7041..000000000 Binary files a/Linphone/data/font/NotoColorEmoji_WindowsCompatible.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Black.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Black.ttf new file mode 100644 index 000000000..d5a6e0d15 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Black.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-BlackItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-BlackItalic.ttf new file mode 100644 index 000000000..dfc640c36 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-BlackItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Bold.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Bold.ttf new file mode 100644 index 000000000..506f7d842 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Bold.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-BoldItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-BoldItalic.ttf new file mode 100644 index 000000000..0e8fa4bde Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-BoldItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-ExtraBold.ttf b/Linphone/data/font/Noto_Sans/NotoSans-ExtraBold.ttf new file mode 100644 index 000000000..58684467b Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-ExtraBold.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-ExtraBoldItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-ExtraBoldItalic.ttf new file mode 100644 index 000000000..68abd4c0e Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-ExtraBoldItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-ExtraLight.ttf b/Linphone/data/font/Noto_Sans/NotoSans-ExtraLight.ttf new file mode 100644 index 000000000..078f8dc87 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-ExtraLight.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-ExtraLightItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-ExtraLightItalic.ttf new file mode 100644 index 000000000..acaa4664f Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-ExtraLightItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Italic-VariableFont_wdth,wght.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Italic-VariableFont_wdth,wght.ttf deleted file mode 100644 index 4e962ee86..000000000 Binary files a/Linphone/data/font/Noto_Sans/NotoSans-Italic-VariableFont_wdth,wght.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Italic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Italic.ttf new file mode 100644 index 000000000..d9b9e148c Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Italic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Light.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Light.ttf new file mode 100644 index 000000000..8d8a67895 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Light.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-LightItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-LightItalic.ttf new file mode 100644 index 000000000..0ab65c0d4 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-LightItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Medium.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Medium.ttf new file mode 100644 index 000000000..a44124bb3 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Medium.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-MediumItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-MediumItalic.ttf new file mode 100644 index 000000000..467af1b3a Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-MediumItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Regular.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Regular.ttf new file mode 100644 index 000000000..4bac02f2f Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Regular.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-SemiBold.ttf b/Linphone/data/font/Noto_Sans/NotoSans-SemiBold.ttf new file mode 100644 index 000000000..e84674901 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-SemiBold.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-SemiBoldItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-SemiBoldItalic.ttf new file mode 100644 index 000000000..cacc7ecea Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-SemiBoldItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-Thin.ttf b/Linphone/data/font/Noto_Sans/NotoSans-Thin.ttf new file mode 100644 index 000000000..04335a5bb Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-Thin.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-ThinItalic.ttf b/Linphone/data/font/Noto_Sans/NotoSans-ThinItalic.ttf new file mode 100644 index 000000000..910dfc746 Binary files /dev/null and b/Linphone/data/font/Noto_Sans/NotoSans-ThinItalic.ttf differ diff --git a/Linphone/data/font/Noto_Sans/NotoSans-VariableFont_wdth,wght.ttf b/Linphone/data/font/Noto_Sans/NotoSans-VariableFont_wdth,wght.ttf deleted file mode 100644 index f7d0d78ed..000000000 Binary files a/Linphone/data/font/Noto_Sans/NotoSans-VariableFont_wdth,wght.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Black.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Black.ttf deleted file mode 100644 index e52bac282..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Black.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-BlackItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-BlackItalic.ttf deleted file mode 100644 index 8a430ec93..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-BlackItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Bold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Bold.ttf deleted file mode 100644 index d84248ed1..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Bold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-BoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-BoldItalic.ttf deleted file mode 100644 index 3a34c4c34..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-BoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraBold.ttf deleted file mode 100644 index b416f0bfa..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraBoldItalic.ttf deleted file mode 100644 index 181846ff4..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraLight.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraLight.ttf deleted file mode 100644 index 81f09586e..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraLight.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraLightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraLightItalic.ttf deleted file mode 100644 index 0d7c13aa1..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-ExtraLightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Italic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Italic.ttf deleted file mode 100644 index c40c3562c..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Italic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Light.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Light.ttf deleted file mode 100644 index f7a67d7a1..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Light.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-LightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-LightItalic.ttf deleted file mode 100644 index d51fb252e..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-LightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Medium.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Medium.ttf deleted file mode 100644 index a799b74da..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Medium.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-MediumItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-MediumItalic.ttf deleted file mode 100644 index 2ccbc5b03..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-MediumItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Regular.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Regular.ttf deleted file mode 100644 index fa4cff505..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Regular.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-SemiBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-SemiBold.ttf deleted file mode 100644 index d3ed423e1..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-SemiBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-SemiBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-SemiBoldItalic.ttf deleted file mode 100644 index c83e750e2..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-SemiBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-Thin.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-Thin.ttf deleted file mode 100644 index 1459e795d..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-Thin.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans-ThinItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans-ThinItalic.ttf deleted file mode 100644 index 14deac866..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans-ThinItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Black.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Black.ttf deleted file mode 100644 index 0e1f611a5..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Black.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-BlackItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-BlackItalic.ttf deleted file mode 100644 index 99f7a211e..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-BlackItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Bold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Bold.ttf deleted file mode 100644 index 71e739616..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Bold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-BoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-BoldItalic.ttf deleted file mode 100644 index e948404b4..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-BoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraBold.ttf deleted file mode 100644 index 38520d955..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraBoldItalic.ttf deleted file mode 100644 index e4421afdf..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraLight.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraLight.ttf deleted file mode 100644 index f47e49eaa..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraLight.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraLightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraLightItalic.ttf deleted file mode 100644 index f13c880f4..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ExtraLightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Italic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Italic.ttf deleted file mode 100644 index 8e5c0f7c6..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Italic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Light.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Light.ttf deleted file mode 100644 index 0b5c4f696..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Light.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-LightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-LightItalic.ttf deleted file mode 100644 index a88fe4d80..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-LightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Medium.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Medium.ttf deleted file mode 100644 index 582b88abd..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Medium.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-MediumItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-MediumItalic.ttf deleted file mode 100644 index a88217932..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-MediumItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Regular.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Regular.ttf deleted file mode 100644 index 78cc2f578..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Regular.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-SemiBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-SemiBold.ttf deleted file mode 100644 index f724bf733..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-SemiBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-SemiBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-SemiBoldItalic.ttf deleted file mode 100644 index c7b50d264..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-SemiBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Thin.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Thin.ttf deleted file mode 100644 index fb4744786..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-Thin.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ThinItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ThinItalic.ttf deleted file mode 100644 index 0fcffa55d..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_Condensed-ThinItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Black.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Black.ttf deleted file mode 100644 index 32a879355..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Black.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-BlackItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-BlackItalic.ttf deleted file mode 100644 index d3769cc98..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-BlackItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Bold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Bold.ttf deleted file mode 100644 index 32d50e7b5..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Bold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-BoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-BoldItalic.ttf deleted file mode 100644 index 92599d27f..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-BoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBold.ttf deleted file mode 100644 index 07e8a8c02..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBoldItalic.ttf deleted file mode 100644 index b4fd5dec9..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLight.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLight.ttf deleted file mode 100644 index 7bd15ad5b..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLight.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLightItalic.ttf deleted file mode 100644 index 8d7dac17e..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Italic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Italic.ttf deleted file mode 100644 index e264b8b6b..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Italic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Light.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Light.ttf deleted file mode 100644 index 5e960dab1..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Light.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-LightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-LightItalic.ttf deleted file mode 100644 index ca4f813e3..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-LightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Medium.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Medium.ttf deleted file mode 100644 index 3be216e42..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Medium.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-MediumItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-MediumItalic.ttf deleted file mode 100644 index a02277771..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-MediumItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Regular.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Regular.ttf deleted file mode 100644 index e805601da..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Regular.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBold.ttf deleted file mode 100644 index 930d29e22..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBoldItalic.ttf deleted file mode 100644 index 1f9d8d44c..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Thin.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Thin.ttf deleted file mode 100644 index f31235b64..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-Thin.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ThinItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ThinItalic.ttf deleted file mode 100644 index b79d61426..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_ExtraCondensed-ThinItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Black.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Black.ttf deleted file mode 100644 index 215e6b545..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Black.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-BlackItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-BlackItalic.ttf deleted file mode 100644 index a7413455b..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-BlackItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Bold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Bold.ttf deleted file mode 100644 index 1cad8500d..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Bold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-BoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-BoldItalic.ttf deleted file mode 100644 index aa925bba8..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-BoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBold.ttf deleted file mode 100644 index 369bcb245..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBoldItalic.ttf deleted file mode 100644 index 0f029d2d3..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLight.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLight.ttf deleted file mode 100644 index 5ddd58908..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLight.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLightItalic.ttf deleted file mode 100644 index 777c9a0ac..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Italic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Italic.ttf deleted file mode 100644 index 705a14424..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Italic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Light.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Light.ttf deleted file mode 100644 index a276aa49e..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Light.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-LightItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-LightItalic.ttf deleted file mode 100644 index da4ffea14..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-LightItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Medium.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Medium.ttf deleted file mode 100644 index 13774a423..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Medium.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-MediumItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-MediumItalic.ttf deleted file mode 100644 index 8188ae3bb..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-MediumItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Regular.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Regular.ttf deleted file mode 100644 index a2d0fd4f4..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Regular.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBold.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBold.ttf deleted file mode 100644 index edb001830..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBold.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBoldItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBoldItalic.ttf deleted file mode 100644 index bf96c72e9..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBoldItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Thin.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Thin.ttf deleted file mode 100644 index 1591087f1..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-Thin.ttf and /dev/null differ diff --git a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ThinItalic.ttf b/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ThinItalic.ttf deleted file mode 100644 index 1f2cfae30..000000000 Binary files a/Linphone/data/font/Noto_Sans/static/NotoSans_SemiCondensed-ThinItalic.ttf and /dev/null differ diff --git a/Linphone/data/font/OFL.txt b/Linphone/data/font/OFL.txt new file mode 100644 index 000000000..04e112f22 --- /dev/null +++ b/Linphone/data/font/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2021 Google Inc. All Rights Reserved. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Linphone/data/fonts.qrc b/Linphone/data/fonts.qrc index 1c11264e7..0382e5ac7 100644 --- a/Linphone/data/fonts.qrc +++ b/Linphone/data/fonts.qrc @@ -1,77 +1,23 @@ - font/NotoColorEmoji_WindowsCompatible.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-LightItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-ThinItalic.ttf - font/Noto_Sans/static/NotoSans-SemiBoldItalic.ttf - font/Noto_Sans/static/NotoSans-Italic.ttf - font/Noto_Sans/static/NotoSans-MediumItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-BoldItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-ExtraBoldItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-BlackItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-MediumItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-BoldItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-ExtraLightItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-Medium.ttf - font/Noto_Sans/static/NotoSans_Condensed-SemiBold.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Black.ttf - font/Noto_Sans/static/NotoSans-Medium.ttf - font/Noto_Sans/static/NotoSans_Condensed-Bold.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBold.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Regular.ttf - font/Noto_Sans/static/NotoSans-SemiBold.ttf - font/Noto_Sans/static/NotoSans-ExtraBoldItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Medium.ttf - font/Noto_Sans/static/NotoSans-BlackItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-MediumItalic.ttf - font/Noto_Sans/static/NotoSans-BoldItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBoldItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraBoldItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-SemiBoldItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-LightItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-MediumItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBoldItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLightItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Italic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-ThinItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Italic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBoldItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-BlackItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-Italic.ttf - font/Noto_Sans/static/NotoSans-ExtraLight.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Thin.ttf - font/Noto_Sans/static/NotoSans-Regular.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Light.ttf - font/Noto_Sans/static/NotoSans_Condensed-ExtraBold.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-ExtraLight.ttf - font/Noto_Sans/static/NotoSans_Condensed-ExtraLight.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-SemiBold.ttf - font/Noto_Sans/static/NotoSans-Thin.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-Bold.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLightItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Black.ttf - font/Noto_Sans/static/NotoSans-ExtraBold.ttf - font/Noto_Sans/static/NotoSans_Condensed-Light.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-ThinItalic.ttf - font/Noto_Sans/static/NotoSans-Black.ttf - font/Noto_Sans/static/NotoSans-LightItalic.ttf - font/Noto_Sans/static/NotoSans-ThinItalic.ttf - font/Noto_Sans/static/NotoSans_SemiCondensed-BoldItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-SemiBold.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Light.ttf - font/Noto_Sans/static/NotoSans_Condensed-LightItalic.ttf - font/Noto_Sans/static/NotoSans_Condensed-BlackItalic.ttf - font/Noto_Sans/static/NotoSans-Bold.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraBold.ttf - font/Noto_Sans/static/NotoSans_Condensed-Thin.ttf - font/Noto_Sans/static/NotoSans_Condensed-Regular.ttf - font/Noto_Sans/static/NotoSans_Condensed-Black.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Bold.ttf - font/Noto_Sans/static/NotoSans-Light.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Medium.ttf - font/Noto_Sans/static/NotoSans-ExtraLightItalic.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Regular.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-ExtraLight.ttf - font/Noto_Sans/static/NotoSans_ExtraCondensed-Thin.ttf + font/EmojiTwoCOLRv0.ttf + font/Noto_Sans/NotoSans-Black.ttf + font/Noto_Sans/NotoSans-BlackItalic.ttf + font/Noto_Sans/NotoSans-Bold.ttf + font/Noto_Sans/NotoSans-BoldItalic.ttf + font/Noto_Sans/NotoSans-ExtraBold.ttf + font/Noto_Sans/NotoSans-ExtraBoldItalic.ttf + font/Noto_Sans/NotoSans-ExtraLight.ttf + font/Noto_Sans/NotoSans-ExtraLightItalic.ttf + font/Noto_Sans/NotoSans-Italic.ttf + font/Noto_Sans/NotoSans-Light.ttf + font/Noto_Sans/NotoSans-LightItalic.ttf + font/Noto_Sans/NotoSans-Medium.ttf + font/Noto_Sans/NotoSans-MediumItalic.ttf + font/Noto_Sans/NotoSans-Regular.ttf + font/Noto_Sans/NotoSans-SemiBold.ttf + font/Noto_Sans/NotoSans-SemiBoldItalic.ttf + font/Noto_Sans/NotoSans-Thin.ttf + font/Noto_Sans/NotoSans-ThinItalic.ttf diff --git a/Linphone/view/Control/Button/ComboBox.qml b/Linphone/view/Control/Button/ComboBox.qml index e97c9d2d5..e1cfa2d93 100644 --- a/Linphone/view/Control/Button/ComboBox.qml +++ b/Linphone/view/Control/Button/ComboBox.qml @@ -16,6 +16,7 @@ Control.ComboBox { property int leftMargin: 10 * DefaultStyle.dp property bool oneLine: false property bool shadowEnabled: mainItem.activeFocus || mainItem.hovered + property string flagRole// Specific case if flag is shown (special font) onConstantImageSourceChanged: if (constantImageSource) selectedItemImg.source = constantImageSource onCurrentIndexChanged: { @@ -29,6 +30,7 @@ Control.ComboBox { : item ? item : "" + if(mainItem.flagRole) selectedItemFlag.text = item[mainItem.flagRole] selectedItemImg.source = constantImageSource ? constantImageSource : item.img @@ -67,37 +69,47 @@ Control.ComboBox { shadowOpacity: mainItem.shadowEnabled ? 0.1 : 0.0 } } - contentItem: Item { + contentItem: RowLayout { anchors.fill: parent anchors.leftMargin: 10 * DefaultStyle.dp anchors.rightMargin: indicImage.width + 10 * DefaultStyle.dp + spacing: 5 * DefaultStyle.dp Image { id: selectedItemImg + Layout.preferredWidth: visible ? 24 * DefaultStyle.dp : 0 + Layout.leftMargin: mainItem.leftMargin source: mainItem.constantImageSource ? mainItem.constantImageSource : "" visible: source != "" sourceSize.width: 24 * DefaultStyle.dp - width: visible ? 24 * DefaultStyle.dp : 0 fillMode: Image.PreserveAspectFit - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: visible ? mainItem.leftMargin : 0 } - + Text { + id: selectedItemFlag + Layout.preferredWidth: implicitWidth + Layout.leftMargin: selectedItemImg.visible ? 0 : 5 * DefaultStyle.dp + Layout.alignment: Qt.AlignCenter + color: mainItem.enabled ? DefaultStyle.main2_600 : DefaultStyle.grey_400 + font { + family: DefaultStyle.flagFont + pixelSize: mainItem.pixelSize + weight: mainItem.weight + } + } Text { id: selectedItemText + Layout.fillWidth: true + Layout.leftMargin: selectedItemImg.visible ? 0 : 5 * DefaultStyle.dp + Layout.rightMargin: 20 * DefaultStyle.dp + Layout.alignment: Qt.AlignCenter color: mainItem.enabled ? DefaultStyle.main2_600 : DefaultStyle.grey_400 elide: Text.ElideRight maximumLineCount: oneLine ? 1 : 2 wrapMode: Text.WrapAnywhere font { + family: DefaultStyle.defaultFont pixelSize: mainItem.pixelSize weight: mainItem.weight } - anchors.left: selectedItemImg.right - anchors.leftMargin: selectedItemImg.visible ? 5 * DefaultStyle.dp : 10 * DefaultStyle.dp - anchors.right: parent.right - anchors.rightMargin: 20 * DefaultStyle.dp - anchors.verticalCenter: parent.verticalCenter } } @@ -117,7 +129,7 @@ Control.ComboBox { id: popup y: mainItem.height - 1 width: mainItem.width - implicitHeight: contentItem.implicitHeight + implicitHeight: Math.min(contentItem.implicitHeight, mainWindow.height) padding: 1 * DefaultStyle.dp //height: Math.min(implicitHeight, 300) @@ -129,7 +141,7 @@ Control.ComboBox { id: listView clip: true implicitHeight: contentHeight - height: contentHeight + height: popup.height model: visible? mainItem.model : [] currentIndex: mainItem.highlightedIndex >= 0 ? mainItem.highlightedIndex : 0 highlightFollowsCurrentItem: true @@ -155,43 +167,59 @@ Control.ComboBox { height: mainItem.height // anchors.left: listView.left // anchors.right: listView.right - - Image { - id: delegateImg - visible: source != "" - width: visible ? 20 * DefaultStyle.dp : 0 - sourceSize.width: 20 * DefaultStyle.dp - source: typeof(modelData) != "undefined" && modelData.img ? modelData.img : "" - fillMode: Image.PreserveAspectFit - anchors.left: parent.left - anchors.leftMargin: visible ? 10 * DefaultStyle.dp : 0 - anchors.verticalCenter: parent.verticalCenter - } - - Text { - text: typeof(modelData) != "undefined" - ? mainItem.textRole - ? modelData[mainItem.textRole] - : modelData.text - ? modelData.text - : modelData - : $modelData - ? mainItem.textRole - ? $modelData[mainItem.textRole] - : $modelData - : "" - elide: Text.ElideRight - maximumLineCount: 1 - wrapMode: Text.WrapAnywhere - font { - pixelSize: 14 * DefaultStyle.dp - weight: 400 * DefaultStyle.dp + RowLayout{ + anchors.fill: parent + Image { + id: delegateImg + Layout.preferredWidth: visible ? 20 * DefaultStyle.dp : 0 + Layout.leftMargin: 10 * DefaultStyle.dp + visible: source != "" + sourceSize.width: 20 * DefaultStyle.dp + source: typeof(modelData) != "undefined" && modelData.img ? modelData.img : "" + fillMode: Image.PreserveAspectFit + } + + Text { + Layout.preferredWidth: implicitWidth + Layout.leftMargin: delegateImg.visible ? 0 : 5 * DefaultStyle.dp + Layout.alignment: Qt.AlignCenter + visible: mainItem.flagRole + font { + family: DefaultStyle.flagFont + pixelSize: mainItem.pixelSize + weight: mainItem.weight + } + text: mainItem.flagRole + ? typeof(modelData) != "undefined" + ? modelData[mainItem.flagRole] + : $modelData[mainItem.flagRole] + : "" + } + Text { + Layout.fillWidth: true + Layout.leftMargin: delegateImg.visible ? 0 : 5 * DefaultStyle.dp + Layout.rightMargin: 20 * DefaultStyle.dp + Layout.alignment: Qt.AlignCenter + text: typeof(modelData) != "undefined" + ? mainItem.textRole + ? modelData[mainItem.textRole] + : modelData.text + ? modelData.text + : modelData + : $modelData + ? mainItem.textRole + ? $modelData[mainItem.textRole] + : $modelData + : "" + elide: Text.ElideRight + maximumLineCount: 1 + wrapMode: Text.WrapAnywhere + font { + family: DefaultStyle.defaultFont + pixelSize: 14 * DefaultStyle.dp + weight: 400 * DefaultStyle.dp + } } - anchors.verticalCenter: parent.verticalCenter - anchors.left: delegateImg.right - anchors.leftMargin: delegateImg.visible ? 5 * DefaultStyle.dp : 10 * DefaultStyle.dp - anchors.right: parent.right - anchors.rightMargin: 20 * DefaultStyle.dp } MouseArea { diff --git a/Linphone/view/Control/Button/CountryIndicatorCombobox.qml b/Linphone/view/Control/Button/CountryIndicatorCombobox.qml index 131aaaf04..079ebab98 100644 --- a/Linphone/view/Control/Button/CountryIndicatorCombobox.qml +++ b/Linphone/view/Control/Button/CountryIndicatorCombobox.qml @@ -51,7 +51,7 @@ ColumnLayout { visible: text.length > 0 font.pixelSize: 21 * DefaultStyle.dp text: parent.currentItem ? parent.currentItem.flag : "" - font.family: DefaultStyle.emojiFont + font.family: DefaultStyle.flagFont anchors.rightMargin: 5 * DefaultStyle.dp anchors.verticalCenter: parent.verticalCenter } @@ -122,17 +122,20 @@ ColumnLayout { delegate: Item { width: listView.width - height: combobox.height + height: contentLayout.implicitHeight RowLayout { + id: contentLayout anchors.fill: parent anchors.leftMargin: 20 * DefaultStyle.dp + spacing: 0 + Text { id: delegateImg visible: text.length > 0 text: $modelData.flag font { pixelSize: 28 * DefaultStyle.dp - family: DefaultStyle.emojiFont + family: DefaultStyle.flagFont } } diff --git a/Linphone/view/Control/Button/PopupButton.qml b/Linphone/view/Control/Button/PopupButton.qml index 9328c418e..1c1d4f0c5 100644 --- a/Linphone/view/Control/Button/PopupButton.qml +++ b/Linphone/view/Control/Button/PopupButton.qml @@ -76,7 +76,7 @@ Button { if (!visible) return var popupHeight = popup.height + popup.padding var popupWidth = popup.width + popup.padding - var winPosition = mainItem.Window.contentItem.mapToItem(mainItem,0 , 0) + var winPosition = mainItem.Window.contentItem ? mainItem.Window.contentItem.mapToItem(mainItem,0 , 0) : {x:0,y:0} y = Math.max( Math.min( winPosition.y + mainItem.Window.height - popupHeight, mainItem.height), winPosition.y) x = Math.max( Math.min( winPosition.x + mainItem.Window.width - popupWidth, 0), winPosition.x) diff --git a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml index 58ea74e7f..bf26994b2 100644 --- a/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AccountSettingsGeneralLayout.qml @@ -151,6 +151,8 @@ AbstractSettingsLayout { entries: account.core.dialPlans propertyName: "dialPlan" propertyOwner: account.core + textRole: 'text' + flagRole: 'flag' } SwitchSetting { titleText: account?.core.humaneReadableRegistrationState diff --git a/Linphone/view/Page/Window/AbstractWindow.qml b/Linphone/view/Page/Window/AbstractWindow.qml index d8b74227d..abfacc9b1 100644 --- a/Linphone/view/Page/Window/AbstractWindow.qml +++ b/Linphone/view/Page/Window/AbstractWindow.qml @@ -1,6 +1,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls.Basic +import QtQuick.Dialogs import Linphone import UtilsCpp import SettingsCpp diff --git a/Linphone/view/Style/DefaultStyle.qml b/Linphone/view/Style/DefaultStyle.qml index a05efa6d2..79f24e3b4 100644 --- a/Linphone/view/Style/DefaultStyle.qml +++ b/Linphone/view/Style/DefaultStyle.qml @@ -37,7 +37,9 @@ QtObject { property double dp: 1 - property string emojiFont: "Noto Color Emoji" + // Warning: Qt 6.8.1 (current version) and previous versions, Qt only support COLRv0 fonts. Don't try to use v1. + property string emojiFont: "EmojiTwo COLRv0" + property string flagFont: "EmojiTwo COLRv0" property string defaultFont: "Noto Sans" property color numericPadPressedButtonColor: "#EEF7F8"