diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt index 2043b0edb..878759896 100644 --- a/linphone-desktop/CMakeLists.txt +++ b/linphone-desktop/CMakeLists.txt @@ -109,7 +109,6 @@ set(SOURCES src/components/camera/MSFunctions.cpp src/components/chat/ChatModel.cpp src/components/chat/ChatProxyModel.cpp - src/components/clipboard/Clipboard.cpp src/components/codecs/AbstractCodecsModel.cpp src/components/codecs/AudioCodecsModel.cpp src/components/codecs/VideoCodecsModel.cpp @@ -123,6 +122,9 @@ set(SOURCES src/components/core/CoreHandlers.cpp src/components/core/CoreManager.cpp src/components/notifier/Notifier.cpp + src/components/other/clipboard/Clipboard.cpp + src/components/other/text-to-speech/TextToSpeech.cpp + src/components/other/units/Units.cpp src/components/presence/OwnPresenceModel.cpp src/components/presence/Presence.cpp src/components/settings/AccountSettingsModel.cpp @@ -132,12 +134,11 @@ set(SOURCES src/components/sip-addresses/SipAddressObserver.cpp src/components/sound-player/SoundPlayer.cpp src/components/telephone-numbers/TelephoneNumbersModel.cpp - src/components/text-to-speech/TextToSpeech.cpp src/components/timeline/TimelineModel.cpp src/externals/single-application/SingleApplication.cpp src/main.cpp - src/LinphoneUtils.cpp - src/Utils.cpp + src/utils/LinphoneUtils.cpp + src/utils/Utils.cpp ) set(HEADERS @@ -158,7 +159,6 @@ set(HEADERS src/components/camera/MSFunctions.hpp src/components/chat/ChatModel.hpp src/components/chat/ChatProxyModel.hpp - src/components/clipboard/Clipboard.cpp src/components/codecs/AbstractCodecsModel.hpp src/components/codecs/AudioCodecsModel.hpp src/components/codecs/VideoCodecsModel.hpp @@ -173,6 +173,9 @@ set(HEADERS src/components/core/CoreHandlers.hpp src/components/core/CoreManager.hpp src/components/notifier/Notifier.hpp + src/components/other/clipboard/Clipboard.cpp + src/components/other/text-to-speech/TextToSpeech.hpp + src/components/other/units/Units.hpp src/components/presence/OwnPresenceModel.hpp src/components/presence/Presence.hpp src/components/settings/AccountSettingsModel.hpp @@ -182,12 +185,11 @@ set(HEADERS src/components/sip-addresses/SipAddressObserver.hpp src/components/sound-player/SoundPlayer.hpp src/components/telephone-numbers/TelephoneNumbersModel.hpp - src/components/text-to-speech/TextToSpeech.hpp src/components/timeline/TimelineModel.hpp src/externals/single-application/SingleApplication.hpp src/externals/single-application/SingleApplicationPrivate.hpp - src/LinphoneUtils.hpp - src/Utils.hpp + src/utils/LinphoneUtils.hpp + src/utils/Utils.hpp ) set(QRC_RESOURCES resources.qrc) diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index fd64b83ef..3503aea2d 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -31,7 +31,7 @@ #include "gitversion.h" #include "../components/Components.hpp" -#include "../Utils.hpp" +#include "../utils/Utils.hpp" #include "cli/Cli.hpp" #include "logger/Logger.hpp" @@ -187,6 +187,7 @@ void App::initContentApp () { registerTypes(); registerSharedTypes(); + registerToolTypes(); // Enable notifications. createNotifier(); @@ -332,8 +333,8 @@ void registerMetaType (const char *name) { template void registerSingletonType (const char *name) { - qmlRegisterSingletonType("Linphone", 1, 0, name, [](QQmlEngine *, QJSEngine *) -> QObject *{ - return new T(); + qmlRegisterSingletonType("Linphone", 1, 0, name, [](QQmlEngine *engine, QJSEngine *) -> QObject *{ + return new T(engine); }); } @@ -342,6 +343,13 @@ void registerType (const char *name) { qmlRegisterType("Linphone", 1, 0, name); } +template +void registerToolType (const char *name) { + qmlRegisterSingletonType(name, 1, 0, name, [](QQmlEngine *engine, QJSEngine *) -> QObject *{ + return new T(engine); + }); +} + void App::registerTypes () { qInfo() << QStringLiteral("Registering types..."); @@ -360,10 +368,8 @@ void App::registerTypes () { registerType("TelephoneNumbersModel"); registerSingletonType("AudioCodecsModel"); - registerSingletonType("Clipboard"); registerSingletonType("OwnPresenceModel"); registerSingletonType("Presence"); - registerSingletonType("TextToSpeech"); registerSingletonType("TimelineModel"); registerSingletonType("VideoCodecsModel"); @@ -388,6 +394,14 @@ void App::registerSharedTypes () { registerSharedSingletonType(ContactsListModel, "ContactsListModel", CoreManager::getInstance()->getContactsListModel); } +void App::registerToolTypes () { + qInfo() << QStringLiteral("Registering tool types..."); + + registerToolType("Clipboard"); + registerToolType("TextToSpeech"); + registerToolType("Units"); +} + #undef registerUncreatableType #undef registerSharedSingletonType diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp index b817fc75e..d94455b8f 100644 --- a/linphone-desktop/src/app/App.hpp +++ b/linphone-desktop/src/app/App.hpp @@ -92,6 +92,8 @@ private: void registerTypes (); void registerSharedTypes (); + void registerToolTypes (); + void setTrayIcon (); void createNotifier (); diff --git a/linphone-desktop/src/app/cli/Cli.cpp b/linphone-desktop/src/app/cli/Cli.cpp index 5cc6a24a1..232c94a20 100644 --- a/linphone-desktop/src/app/cli/Cli.cpp +++ b/linphone-desktop/src/app/cli/Cli.cpp @@ -22,10 +22,8 @@ #include -#include - #include "../../components/core/CoreManager.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../App.hpp" #include "Cli.hpp" diff --git a/linphone-desktop/src/app/cli/Cli.hpp b/linphone-desktop/src/app/cli/Cli.hpp index ea68a55db..da3011884 100644 --- a/linphone-desktop/src/app/cli/Cli.hpp +++ b/linphone-desktop/src/app/cli/Cli.hpp @@ -29,6 +29,8 @@ // ============================================================================= class Cli : public QObject { + Q_OBJECT; + typedef void (*Function)(const QHash &); enum ArgumentType { diff --git a/linphone-desktop/src/app/logger/Logger.cpp b/linphone-desktop/src/app/logger/Logger.cpp index ccc32a339..9f3e2234b 100644 --- a/linphone-desktop/src/app/logger/Logger.cpp +++ b/linphone-desktop/src/app/logger/Logger.cpp @@ -25,7 +25,7 @@ #include #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../paths/Paths.hpp" #include "Logger.hpp" diff --git a/linphone-desktop/src/app/paths/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp index 48f832366..ba8968c8e 100644 --- a/linphone-desktop/src/app/paths/Paths.cpp +++ b/linphone-desktop/src/app/paths/Paths.cpp @@ -27,7 +27,7 @@ #include #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "config.h" #include "Paths.hpp" diff --git a/linphone-desktop/src/app/providers/AvatarProvider.cpp b/linphone-desktop/src/app/providers/AvatarProvider.cpp index e7a448d9a..ffa3a8036 100644 --- a/linphone-desktop/src/app/providers/AvatarProvider.cpp +++ b/linphone-desktop/src/app/providers/AvatarProvider.cpp @@ -20,7 +20,7 @@ * Author: Ronan Abhamon */ -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../paths/Paths.hpp" #include "AvatarProvider.hpp" diff --git a/linphone-desktop/src/app/providers/ThumbnailProvider.cpp b/linphone-desktop/src/app/providers/ThumbnailProvider.cpp index 74232e42f..f87ab5b7c 100644 --- a/linphone-desktop/src/app/providers/ThumbnailProvider.cpp +++ b/linphone-desktop/src/app/providers/ThumbnailProvider.cpp @@ -20,7 +20,7 @@ * Author: Ronan Abhamon */ -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../paths/Paths.hpp" #include "ThumbnailProvider.hpp" diff --git a/linphone-desktop/src/components/Components.hpp b/linphone-desktop/src/components/Components.hpp index c7a1ececc..57e107caa 100644 --- a/linphone-desktop/src/components/Components.hpp +++ b/linphone-desktop/src/components/Components.hpp @@ -30,7 +30,6 @@ #include "camera/Camera.hpp" #include "camera/CameraPreview.hpp" #include "chat/ChatProxyModel.hpp" -#include "clipboard/Clipboard.hpp" #include "codecs/AudioCodecsModel.hpp" #include "codecs/VideoCodecsModel.hpp" #include "conference/ConferenceAddModel.hpp" @@ -41,7 +40,10 @@ #include "sip-addresses/SipAddressesProxyModel.hpp" #include "sound-player/SoundPlayer.hpp" #include "telephone-numbers/TelephoneNumbersModel.hpp" -#include "text-to-speech/TextToSpeech.hpp" #include "timeline/TimelineModel.hpp" +#include "other/clipboard/Clipboard.hpp" +#include "other/text-to-speech/TextToSpeech.hpp" +#include "other/units/Units.hpp" + #endif // COMPONENTS_H_ diff --git a/linphone-desktop/src/components/assistant/AssistantModel.cpp b/linphone-desktop/src/components/assistant/AssistantModel.cpp index b80469b3e..01c04eb56 100644 --- a/linphone-desktop/src/components/assistant/AssistantModel.cpp +++ b/linphone-desktop/src/components/assistant/AssistantModel.cpp @@ -21,8 +21,8 @@ */ #include "../../app/paths/Paths.hpp" -#include "../../LinphoneUtils.hpp" -#include "../../Utils.hpp" +#include "../../utils/LinphoneUtils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "AssistantModel.hpp" diff --git a/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp b/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp index c5ec4d6fe..ca3701d78 100644 --- a/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp +++ b/linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp @@ -20,7 +20,7 @@ * Author: Ronan Abhamon */ -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "AuthenticationNotifier.hpp" diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp index 5bf42b88a..e6076ef56 100644 --- a/linphone-desktop/src/components/call/CallModel.cpp +++ b/linphone-desktop/src/components/call/CallModel.cpp @@ -25,7 +25,7 @@ #include #include "../../app/App.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "CallModel.hpp" diff --git a/linphone-desktop/src/components/calls/CallsListModel.cpp b/linphone-desktop/src/components/calls/CallsListModel.cpp index 269445c64..d905b504b 100644 --- a/linphone-desktop/src/components/calls/CallsListModel.cpp +++ b/linphone-desktop/src/components/calls/CallsListModel.cpp @@ -24,7 +24,7 @@ #include #include "../../app/App.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../conference/ConferenceHelperModel.hpp" #include "../core/CoreManager.hpp" diff --git a/linphone-desktop/src/components/chat/ChatModel.cpp b/linphone-desktop/src/components/chat/ChatModel.cpp index 4d830cc4d..ed53c13f0 100644 --- a/linphone-desktop/src/components/chat/ChatModel.cpp +++ b/linphone-desktop/src/components/chat/ChatModel.cpp @@ -33,7 +33,7 @@ #include "../../app/App.hpp" #include "../../app/paths/Paths.hpp" #include "../../app/providers/ThumbnailProvider.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "ChatModel.hpp" diff --git a/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp b/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp index af4b1ad5f..8cf86afc1 100644 --- a/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp +++ b/linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp @@ -20,7 +20,7 @@ * Author: Ronan Abhamon */ -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "AbstractCodecsModel.hpp" diff --git a/linphone-desktop/src/components/conference/ConferenceAddModel.cpp b/linphone-desktop/src/components/conference/ConferenceAddModel.cpp index d24c5b26b..8e4977fd1 100644 --- a/linphone-desktop/src/components/conference/ConferenceAddModel.cpp +++ b/linphone-desktop/src/components/conference/ConferenceAddModel.cpp @@ -20,7 +20,7 @@ * Author: Ronan Abhamon */ -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "ConferenceAddModel.hpp" diff --git a/linphone-desktop/src/components/conference/ConferenceModel.cpp b/linphone-desktop/src/components/conference/ConferenceModel.cpp index 6d32142a4..565a345a0 100644 --- a/linphone-desktop/src/components/conference/ConferenceModel.cpp +++ b/linphone-desktop/src/components/conference/ConferenceModel.cpp @@ -22,7 +22,7 @@ #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "ConferenceModel.hpp" diff --git a/linphone-desktop/src/components/contact/VcardModel.cpp b/linphone-desktop/src/components/contact/VcardModel.cpp index 5929e30b5..0e4b96b8e 100644 --- a/linphone-desktop/src/components/contact/VcardModel.cpp +++ b/linphone-desktop/src/components/contact/VcardModel.cpp @@ -29,7 +29,7 @@ #include "../../app/App.hpp" #include "../../app/paths/Paths.hpp" #include "../../app/providers/AvatarProvider.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "VcardModel.hpp" diff --git a/linphone-desktop/src/components/contacts/ContactsListModel.cpp b/linphone-desktop/src/components/contacts/ContactsListModel.cpp index 0ddc5e544..e470e9283 100644 --- a/linphone-desktop/src/components/contacts/ContactsListModel.cpp +++ b/linphone-desktop/src/components/contacts/ContactsListModel.cpp @@ -23,7 +23,7 @@ #include #include "../../app/App.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "ContactsListModel.hpp" diff --git a/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp b/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp index b35998b49..f2fac1b2b 100644 --- a/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp +++ b/linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp @@ -24,7 +24,7 @@ #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "ContactsListProxyModel.hpp" diff --git a/linphone-desktop/src/components/core/CoreHandlers.cpp b/linphone-desktop/src/components/core/CoreHandlers.cpp index 73cc15fe5..e14111b33 100644 --- a/linphone-desktop/src/components/core/CoreHandlers.cpp +++ b/linphone-desktop/src/components/core/CoreHandlers.cpp @@ -26,7 +26,7 @@ #include #include "../../app/App.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "CoreManager.hpp" #include "CoreHandlers.hpp" diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp index f47c075e4..7f26980b7 100644 --- a/linphone-desktop/src/components/core/CoreManager.cpp +++ b/linphone-desktop/src/components/core/CoreManager.cpp @@ -25,7 +25,7 @@ #include #include "../../app/paths/Paths.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "CoreManager.hpp" diff --git a/linphone-desktop/src/components/notifier/Notifier.cpp b/linphone-desktop/src/components/notifier/Notifier.cpp index e43486b33..a9b258ad8 100644 --- a/linphone-desktop/src/components/notifier/Notifier.cpp +++ b/linphone-desktop/src/components/notifier/Notifier.cpp @@ -27,7 +27,7 @@ #include #include "../../app/App.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "Notifier.hpp" diff --git a/linphone-desktop/src/components/clipboard/Clipboard.cpp b/linphone-desktop/src/components/other/clipboard/Clipboard.cpp similarity index 100% rename from linphone-desktop/src/components/clipboard/Clipboard.cpp rename to linphone-desktop/src/components/other/clipboard/Clipboard.cpp diff --git a/linphone-desktop/src/components/clipboard/Clipboard.hpp b/linphone-desktop/src/components/other/clipboard/Clipboard.hpp similarity index 100% rename from linphone-desktop/src/components/clipboard/Clipboard.hpp rename to linphone-desktop/src/components/other/clipboard/Clipboard.hpp diff --git a/linphone-desktop/src/components/text-to-speech/TextToSpeech.cpp b/linphone-desktop/src/components/other/text-to-speech/TextToSpeech.cpp similarity index 100% rename from linphone-desktop/src/components/text-to-speech/TextToSpeech.cpp rename to linphone-desktop/src/components/other/text-to-speech/TextToSpeech.cpp diff --git a/linphone-desktop/src/components/text-to-speech/TextToSpeech.hpp b/linphone-desktop/src/components/other/text-to-speech/TextToSpeech.hpp similarity index 100% rename from linphone-desktop/src/components/text-to-speech/TextToSpeech.hpp rename to linphone-desktop/src/components/other/text-to-speech/TextToSpeech.hpp diff --git a/linphone-desktop/src/components/other/units/Units.cpp b/linphone-desktop/src/components/other/units/Units.cpp new file mode 100644 index 000000000..a9e611583 --- /dev/null +++ b/linphone-desktop/src/components/other/units/Units.cpp @@ -0,0 +1,31 @@ +/* + * Units.cpp + * Copyright (C) 2017 Belledonne Communications, Grenoble, France + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Created on: June 8, 2017 + * Author: Ronan Abhamon + */ + +#include "Units.hpp" + +// ============================================================================= + +Units::Units (QObject *parent) : QObject(parent) {} + +float Units::getDp () const { + return 1.0; +} diff --git a/linphone-desktop/src/components/other/units/Units.hpp b/linphone-desktop/src/components/other/units/Units.hpp new file mode 100644 index 000000000..a6992dd0d --- /dev/null +++ b/linphone-desktop/src/components/other/units/Units.hpp @@ -0,0 +1,46 @@ +/* + * Units.hpp + * Copyright (C) 2017 Belledonne Communications, Grenoble, France + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Created on: June 8, 2017 + * Author: Ronan Abhamon + */ + +#ifndef UNITS_H_ +#define UNITS_H_ + +#include + +// ============================================================================= + +class Units : public QObject { + Q_OBJECT; + + Q_PROPERTY(float dp READ getDp NOTIFY dpChanged); + +public: + Units (QObject *parent = Q_NULLPTR); + ~Units () = default; + +signals: + void dpChanged (); + +private: + float getDp () const; +}; + +#endif // UNITS_H_ diff --git a/linphone-desktop/src/components/presence/OwnPresenceModel.cpp b/linphone-desktop/src/components/presence/OwnPresenceModel.cpp index 76fdcd2a0..6816057b1 100644 --- a/linphone-desktop/src/components/presence/OwnPresenceModel.cpp +++ b/linphone-desktop/src/components/presence/OwnPresenceModel.cpp @@ -22,7 +22,7 @@ #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "OwnPresenceModel.hpp" diff --git a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp index 769d609e6..1fca48f87 100644 --- a/linphone-desktop/src/components/settings/AccountSettingsModel.cpp +++ b/linphone-desktop/src/components/settings/AccountSettingsModel.cpp @@ -22,7 +22,7 @@ #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "AccountSettingsModel.hpp" diff --git a/linphone-desktop/src/components/settings/SettingsModel.cpp b/linphone-desktop/src/components/settings/SettingsModel.cpp index fc3b4ff0f..2e2c39615 100644 --- a/linphone-desktop/src/components/settings/SettingsModel.cpp +++ b/linphone-desktop/src/components/settings/SettingsModel.cpp @@ -23,7 +23,7 @@ #include #include "../../app/paths/Paths.hpp" -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "SettingsModel.hpp" diff --git a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp index 9452e93fc..51c212aa7 100644 --- a/linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp +++ b/linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp @@ -24,8 +24,8 @@ #include #include -#include "../../LinphoneUtils.hpp" -#include "../../Utils.hpp" +#include "../../utils/LinphoneUtils.hpp" +#include "../../utils/Utils.hpp" #include "../chat/ChatModel.hpp" #include "../core/CoreManager.hpp" diff --git a/linphone-desktop/src/components/sound-player/SoundPlayer.cpp b/linphone-desktop/src/components/sound-player/SoundPlayer.cpp index a93e6e589..77813bfa4 100644 --- a/linphone-desktop/src/components/sound-player/SoundPlayer.cpp +++ b/linphone-desktop/src/components/sound-player/SoundPlayer.cpp @@ -22,7 +22,7 @@ #include -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "../core/CoreManager.hpp" #include "SoundPlayer.hpp" diff --git a/linphone-desktop/src/externals/single-application/SingleApplication.cpp b/linphone-desktop/src/externals/single-application/SingleApplication.cpp index dc1591683..57e75a837 100644 --- a/linphone-desktop/src/externals/single-application/SingleApplication.cpp +++ b/linphone-desktop/src/externals/single-application/SingleApplication.cpp @@ -43,7 +43,7 @@ #include #endif // ifdef Q_OS_WIN -#include "../../Utils.hpp" +#include "../../utils/Utils.hpp" #include "SingleApplication.hpp" #include "SingleApplicationPrivate.hpp" diff --git a/linphone-desktop/src/LinphoneUtils.cpp b/linphone-desktop/src/utils/LinphoneUtils.cpp similarity index 100% rename from linphone-desktop/src/LinphoneUtils.cpp rename to linphone-desktop/src/utils/LinphoneUtils.cpp diff --git a/linphone-desktop/src/LinphoneUtils.hpp b/linphone-desktop/src/utils/LinphoneUtils.hpp similarity index 100% rename from linphone-desktop/src/LinphoneUtils.hpp rename to linphone-desktop/src/utils/LinphoneUtils.hpp diff --git a/linphone-desktop/src/Utils.cpp b/linphone-desktop/src/utils/Utils.cpp similarity index 100% rename from linphone-desktop/src/Utils.cpp rename to linphone-desktop/src/utils/Utils.cpp diff --git a/linphone-desktop/src/Utils.hpp b/linphone-desktop/src/utils/Utils.hpp similarity index 100% rename from linphone-desktop/src/Utils.hpp rename to linphone-desktop/src/utils/Utils.hpp diff --git a/linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml b/linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml index fb2aa2ada..b525b5e55 100644 --- a/linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml +++ b/linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml @@ -24,7 +24,7 @@ Item { } color: DialogStyle.description.color - font.pointSize: DialogStyle.description.fontSize + font.pointSize: DialogStyle.description.pointSize horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml index 83c6478e9..208539e66 100644 --- a/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml @@ -65,7 +65,7 @@ Item { color: _getTextColor() font { bold: true - pointSize: AbstractTextButtonStyle.text.fontSize + pointSize: AbstractTextButtonStyle.text.pointSize } elide: Text.ElideRight diff --git a/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml index e20fdd1b1..fba8e8a8c 100644 --- a/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml @@ -24,7 +24,7 @@ Button { } contentItem: Text { color: SmallButtonStyle.text.color - font.pointSize: SmallButtonStyle.text.fontSize + font.pointSize: SmallButtonStyle.text.pointSize horizontalAlignment: Text.AlignHCenter text: button.text verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml index 77ddadf92..a7eedb5a8 100644 --- a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml +++ b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml @@ -30,7 +30,7 @@ CheckBox { verticalAlignment: Text.AlignVCenter } - font.pointSize: CheckBoxTextStyle.fontSize + font.pointSize: CheckBoxTextStyle.pointSize hoverEnabled: true indicator: Rectangle { diff --git a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml index db1e2cd02..22a00bb0b 100644 --- a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml +++ b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml @@ -50,7 +50,7 @@ ComboBox { color: ComboBoxStyle.contentItem.text.color elide: Text.ElideRight - font.pointSize: ComboBoxStyle.contentItem.text.fontSize + font.pointSize: ComboBoxStyle.contentItem.text.pointSize rightPadding: comboBox.indicator.width + comboBox.spacing text: Logic.getSelectedEntryText() @@ -123,7 +123,7 @@ ComboBox { font { bold: comboBox.currentIndex === index - pointSize: ComboBoxStyle.delegate.contentItem.text.fontSize + pointSize: ComboBoxStyle.delegate.contentItem.text.pointSize } text: item.flattenedModel[textRole] || modelData diff --git a/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml index 5dec7703e..b1608fb28 100644 --- a/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml @@ -4,7 +4,6 @@ import QtQuick.Dialogs 1.2 import Common 1.0 import Common.Styles 1.0 - import Utils 1.0 // ============================================================================= @@ -65,7 +64,7 @@ Item { } color: DroppableTextAreaStyle.text.color - font.pointSize: DroppableTextAreaStyle.text.fontSize + font.pointSize: DroppableTextAreaStyle.text.pointSize rightPadding: fileChooserButton.width + fileChooserButton.anchors.rightMargin + DroppableTextAreaStyle.fileChooserButton.margins @@ -132,7 +131,7 @@ Item { Text { anchors.centerIn: parent color: DroppableTextAreaStyle.hoverContent.text.color - font.pointSize: DroppableTextAreaStyle.hoverContent.text.fontSize + font.pointSize: DroppableTextAreaStyle.hoverContent.text.pointSize text: qsTr('dropYourAttachment') } } diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml index d12a52080..ff21346e8 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml @@ -74,7 +74,7 @@ TextField { contentItem: Text { color: NumericFieldStyle.tools.button.text.color text: buttonInstance.text - font.pointSize: NumericFieldStyle.tools.button.text.fontSize + font.pointSize: NumericFieldStyle.tools.button.text.pointSize horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml index 48b255fb0..ad3d6ff67 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml @@ -35,7 +35,7 @@ Flickable { } color: TextAreaFieldStyle.text.color - font.pointSize: TextAreaFieldStyle.text.fontSize + font.pointSize: TextAreaFieldStyle.text.pointSize selectByMouse: true wrapMode: TextArea.Wrap diff --git a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml index c79ab587e..34e52c286 100644 --- a/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml +++ b/linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml @@ -60,7 +60,7 @@ Controls.TextField { } color: TextFieldStyle.text.color - font.pointSize: TextFieldStyle.text.fontSize + font.pointSize: TextFieldStyle.text.pointSize rightPadding: TextFieldStyle.text.rightPadding + toolsContainer.width selectByMouse: true diff --git a/linphone-desktop/ui/modules/Common/Form/ListForm.qml b/linphone-desktop/ui/modules/Common/Form/ListForm.qml index ea98080ce..6f08a2cf6 100644 --- a/linphone-desktop/ui/modules/Common/Form/ListForm.qml +++ b/linphone-desktop/ui/modules/Common/Form/ListForm.qml @@ -71,7 +71,7 @@ RowLayout { font { bold: true - pointSize: ListFormStyle.titleArea.text.fontSize + pointSize: ListFormStyle.titleArea.text.pointSize } } } @@ -89,7 +89,7 @@ RowLayout { font { italic: true - pointSize: ListFormStyle.value.placeholder.fontSize + pointSize: ListFormStyle.value.placeholder.pointSize } padding: ListFormStyle.value.text.padding diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/Form.qml b/linphone-desktop/ui/modules/Common/Form/Placements/Form.qml index 78da135eb..9cf99c976 100644 --- a/linphone-desktop/ui/modules/Common/Form/Placements/Form.qml +++ b/linphone-desktop/ui/modules/Common/Form/Placements/Form.qml @@ -27,7 +27,7 @@ Column { color: FormStyle.header.title.color font { bold: true - pointSize: FormStyle.header.title.fontSize + pointSize: FormStyle.header.title.pointSize } } diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml index ddf58c7be..fbe93ff2e 100644 --- a/linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml +++ b/linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml @@ -24,7 +24,7 @@ RowLayout { color: FormHGroupStyle.legend.color elide: Text.ElideRight - font.pointSize: FormHGroupStyle.legend.fontSize + font.pointSize: FormHGroupStyle.legend.pointSize horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml index b19f055b1..95c168de9 100644 --- a/linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml +++ b/linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml @@ -54,7 +54,7 @@ Column { font { bold: true - pointSize: FormTableStyle.entry.text.fontSize + pointSize: FormTableStyle.entry.text.pointSize } } } diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml index fcb8fca94..96bdd49ee 100644 --- a/linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml +++ b/linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml @@ -32,7 +32,7 @@ Row { font { bold: false - pointSize: FormTableStyle.entry.text.fontSize + pointSize: FormTableStyle.entry.text.pointSize } visible: !formTableLine.parent.disableLineTitle diff --git a/linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml b/linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml index ab59b91c1..91e49500f 100644 --- a/linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml +++ b/linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml @@ -24,7 +24,7 @@ ColumnLayout { color: FormVGroupStyle.legend.color elide: Text.ElideRight - font.pointSize: FormVGroupStyle.legend.fontSize + font.pointSize: FormVGroupStyle.legend.pointSize verticalAlignment: Text.AlignVCenter } @@ -64,7 +64,7 @@ ColumnLayout { font { italic: true - pointSize: FormVGroupStyle.error.fontSize + pointSize: FormVGroupStyle.error.pointSize } text: _content && _content.error && _content.error.length ? _content.error : '' diff --git a/linphone-desktop/ui/modules/Common/Form/StaticListForm.qml b/linphone-desktop/ui/modules/Common/Form/StaticListForm.qml index 07981fe2b..4b12615c3 100644 --- a/linphone-desktop/ui/modules/Common/Form/StaticListForm.qml +++ b/linphone-desktop/ui/modules/Common/Form/StaticListForm.qml @@ -39,7 +39,7 @@ RowLayout { font { bold: true - pointSize: ListFormStyle.titleArea.text.fontSize + pointSize: ListFormStyle.titleArea.text.pointSize } verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml index de836ca80..753c67098 100644 --- a/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml +++ b/linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml @@ -82,7 +82,7 @@ Controls.TabButton { font { bold: true - pointSize: TabButtonStyle.text.fontSize + pointSize: TabButtonStyle.text.pointSize } elide: Text.ElideRight diff --git a/linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml b/linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml index 322861b1b..ccd400a31 100644 --- a/linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml +++ b/linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml @@ -71,7 +71,7 @@ Item { font { italic: true - pointSize: TransparentTextInputStyle.placeholder.fontSize + pointSize: TransparentTextInputStyle.placeholder.pointSize } height: textInput.height @@ -92,7 +92,7 @@ Item { color: activeFocus && !readOnly ? TransparentTextInputStyle.text.color.focused : TransparentTextInputStyle.text.color.normal - font.pointSize: TransparentTextInputStyle.text.fontSize + font.pointSize: TransparentTextInputStyle.text.pointSize selectByMouse: true verticalAlignment: TextInput.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml b/linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml index 32a8c62f6..83288a9f8 100644 --- a/linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml +++ b/linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml @@ -86,7 +86,7 @@ Rectangle { color: _selectedEntry === index ? ApplicationMenuStyle.entry.text.color.selected : ApplicationMenuStyle.entry.text.color.normal - font.pointSize: ApplicationMenuStyle.entry.text.fontSize + font.pointSize: ApplicationMenuStyle.entry.text.pointSize height: parent.height text: modelData.entryName verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml b/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml index 98af81e4e..18e5a4f77 100644 --- a/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml +++ b/linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml @@ -32,7 +32,7 @@ Rectangle { color: DropDownStaticMenuStyle.entry.text.color elide: Text.ElideRight - font.pointSize: DropDownStaticMenuStyle.entry.text.fontSize + font.pointSize: DropDownStaticMenuStyle.entry.text.pointSize height: parent.height verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Common/Menus/MenuItem.qml b/linphone-desktop/ui/modules/Common/Menus/MenuItem.qml index e0946d21f..eefa91f04 100644 --- a/linphone-desktop/ui/modules/Common/Menus/MenuItem.qml +++ b/linphone-desktop/ui/modules/Common/Menus/MenuItem.qml @@ -28,7 +28,7 @@ MenuItem { font { bold: true - pointSize: MenuItemStyle.text.fontSize + pointSize: MenuItemStyle.text.pointSize } text: button.text diff --git a/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml index 687f161ec..8da6f9b9b 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -24,7 +25,7 @@ QtObject { property QtObject description: QtObject { property color color: Colors.j - property int fontSize: 11 + property int pointSize: Units.dp * 11 property int verticalMargin: 25 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml index 7b5337a52..03bed6566 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml @@ -1,6 +1,8 @@ pragma Singleton import QtQuick 2.7 +import Units 1.0 + // ============================================================================= QtObject { @@ -11,6 +13,6 @@ QtObject { } property QtObject text: QtObject { - property int fontSize: 8 + property int pointSize: Units.dp * 8 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml index b5e99c40c..4fa346aac 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -22,6 +23,6 @@ QtObject { property QtObject text: QtObject { property color color: Colors.k - property int fontSize: 8 + property int pointSize: Units.dp * 8 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml index 66aa09a0c..a63dd925e 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml @@ -2,11 +2,12 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= QtObject { - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int radius: 3 property int size: 18 diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml index fdaccdc55..2e801a3c1 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -25,7 +26,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } @@ -41,7 +42,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml index 3b2a4e73e..c1ea531cf 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -18,12 +19,12 @@ QtObject { property QtObject text: QtObject { property color color: Colors.i - property int fontSize: 11 + property int pointSize: Units.dp * 11 } } property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml index a5a4b558c..0e5a0216d 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -17,7 +18,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 9 + property int pointSize: Units.dp * 9 } } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml index e7c0f632d..abea42fde 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -25,7 +26,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int padding: 8 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml index 529c0f78f..ddc71d590 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -29,7 +30,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int rightPadding: 10 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml index 5801b06a4..b35335c58 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -11,7 +12,7 @@ QtObject { property QtObject value: QtObject { property QtObject placeholder: QtObject { property color color: Colors.w - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject text: QtObject { @@ -25,7 +26,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.j - property int fontSize: 9 + property int pointSize: Units.dp * 9 property int width: 130 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml index 030d8be3f..1dedd189c 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -14,7 +15,7 @@ QtObject { property QtObject legend: QtObject { property color color: Colors.j - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int height: 36 property int width: 200 } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml index f489e1592..a3a6a69e2 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -19,7 +20,7 @@ QtObject { property QtObject title: QtObject { property color color: Colors.i - property int fontSize: 12 + property int pointSize: Units.dp * 12 } } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml index eaaebf438..9127b7d32 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -15,7 +16,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.j - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml index 8cf9960d7..157e910f5 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -14,12 +15,12 @@ QtObject { property QtObject error: QtObject { property color color: Colors.error - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int height: 11 } property QtObject legend: QtObject { property color color: Colors.j - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml index 3cf21752c..41dadc443 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -20,7 +21,7 @@ QtObject { } property QtObject text: QtObject { - property int fontSize: 9 + property int pointSize: Units.dp * 9 property int height: 40 property int leftPadding: 10 property int rightPadding: 10 diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml index 401626bc7..a77885d32 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -12,11 +13,11 @@ QtObject { property QtObject placeholder: QtObject { property color color: Colors.w - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject text: QtObject { - property int fontSize: 10 + property int pointSize: Units.dp * 10 property QtObject color: QtObject { property color focused: Colors.l diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml index 2d228979d..a3616b848 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -28,7 +29,7 @@ QtObject { } property QtObject text: QtObject { - property int fontSize: 11 + property int pointSize: Units.dp * 11 property QtObject color: QtObject { property color normal: Colors.k50 diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml index 3aa9585cf..5844e8fe0 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -20,7 +21,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.k - property int fontSize: 9 + property int pointSize: Units.dp * 9 } } } diff --git a/linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml index aae4aac40..9fa8566f9 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -20,7 +21,7 @@ QtObject { } property QtObject text: QtObject { - property int fontSize: 10 + property int pointSize: Units.dp * 10 property QtObject color: QtObject { property color enabled: Colors.j diff --git a/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml index 96b9b0113..944f0b5d5 100644 --- a/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml +++ b/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -10,7 +11,7 @@ QtObject { property color color: Colors.k property int arrowSize: 8 property int delay: 1000 - property int fontSize: 9 + property int pointSize: Units.dp * 9 property int margins: 8 property int padding: 4 property int radius: 4 diff --git a/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml b/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml index bafc98fc5..4a03f10b7 100644 --- a/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml +++ b/linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml @@ -117,7 +117,7 @@ ToolTip { id: text color: TooltipStyle.color - font.pointSize: TooltipStyle.fontSize + font.pointSize: TooltipStyle.pointSize padding: TooltipStyle.padding + TooltipStyle.margins text: tooltip.text } diff --git a/linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml b/linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml index 4c522c9cc..ea3dae9fe 100644 --- a/linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml +++ b/linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml @@ -54,7 +54,7 @@ Item { color: AccountStatusStyle.username.color elide: Text.ElideRight font.bold: true - font.pointSize: AccountStatusStyle.username.fontSize + font.pointSize: AccountStatusStyle.username.pointSize text: AccountSettingsModel.username verticalAlignment: Text.AlignBottom } @@ -63,7 +63,7 @@ Item { Text { color: AccountStatusStyle.sipAddress.color elide: Text.ElideRight - font.pointSize: AccountStatusStyle.sipAddress.fontSize + font.pointSize: AccountStatusStyle.sipAddress.pointSize height: parent.height / 2 text: AccountSettingsModel.sipAddress verticalAlignment: Text.AlignTop diff --git a/linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml b/linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml index bc95fa8de..ab26c8d1e 100644 --- a/linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml +++ b/linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml @@ -38,7 +38,7 @@ Column { font { bold: true - pointSize: CardBlockStyle.title.fontSize + pointSize: CardBlockStyle.title.pointSize } height: CardBlockStyle.title.height @@ -50,7 +50,7 @@ Column { color: CardBlockStyle.description.color elide: Text.ElideRight - font.pointSize: CardBlockStyle.description.fontSize + font.pointSize: CardBlockStyle.description.pointSize horizontalAlignment: Text.AlignHCenter wrapMode: Text.WordWrap diff --git a/linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml b/linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml index a3f551de0..2b876f12f 100644 --- a/linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml +++ b/linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml @@ -37,7 +37,7 @@ Item { font { italic: true - pointSize: RequestBlockStyle.error.fontSize + pointSize: RequestBlockStyle.error.pointSize } height: parent.height diff --git a/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml b/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml index c5e64da29..e275a35a8 100644 --- a/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml +++ b/linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml @@ -62,7 +62,7 @@ Popup { elide: Text.ElideRight font { - pointSize: CallStatisticsStyle.key.fontSize + pointSize: CallStatisticsStyle.key.pointSize bold: true } @@ -77,7 +77,7 @@ Popup { color: CallStatisticsStyle.value.color elide: Text.ElideRight - font.pointSize: CallStatisticsStyle.value.fontSize + font.pointSize: CallStatisticsStyle.value.pointSize text: modelData.value } @@ -97,7 +97,7 @@ Popup { font { bold: true - pointSize: CallStatisticsStyle.title.fontSize + pointSize: CallStatisticsStyle.title.pointSize } elide: Text.ElideRight diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml index 43e09a180..92d45e16b 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/Chat.qml @@ -96,7 +96,7 @@ Rectangle { color: ChatStyle.sectionHeading.text.color font { bold: true - pointSize: ChatStyle.sectionHeading.text.fontSize + pointSize: ChatStyle.sectionHeading.text.pointSize } horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter @@ -163,7 +163,7 @@ Rectangle { Layout.preferredWidth: ChatStyle.entry.time.width color: ChatStyle.entry.time.color - font.pointSize: ChatStyle.entry.time.fontSize + font.pointSize: ChatStyle.entry.time.pointSize text: $chatEntry.timestamp.toLocaleString( Qt.locale(App.locale), diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Event.qml b/linphone-desktop/ui/modules/Linphone/Chat/Event.qml index 310110bbe..4026a6efd 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/Event.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/Event.qml @@ -57,7 +57,7 @@ Row { color: ChatStyle.entry.event.text.color font { bold: true - pointSize: ChatStyle.entry.event.text.fontSize + pointSize: ChatStyle.entry.event.text.pointSize } height: parent.height text: qsTr(Utils.snakeToCamel(_type)) diff --git a/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml index f73b26cec..bc3b56971 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml @@ -132,8 +132,8 @@ Row { font { bold: true pointSize: $chatEntry.isOutgoing - ? ChatStyle.entry.message.outgoing.text.fontSize - : ChatStyle.entry.message.incoming.text.fontSize + ? ChatStyle.entry.message.outgoing.text.pointSize + : ChatStyle.entry.message.incoming.text.pointSize } text: $chatEntry.fileName diff --git a/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml index dae1729fd..21f2141bb 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml @@ -56,7 +56,7 @@ RowLayout { backgroundColor: ChatStyle.entry.message.incoming.backgroundColor color: ChatStyle.entry.message.incoming.text.color - fontSize: ChatStyle.entry.message.incoming.text.fontSize + pointSize: ChatStyle.entry.message.incoming.text.pointSize ActionButton { height: ChatStyle.entry.lineHeight diff --git a/linphone-desktop/ui/modules/Linphone/Chat/Message.qml b/linphone-desktop/ui/modules/Linphone/Chat/Message.qml index f16d10a4a..a81e2590c 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/Message.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/Message.qml @@ -1,8 +1,9 @@ import QtQuick 2.7 +import Clipboard 1.0 import Common 1.0 -import Linphone 1.0 import Linphone.Styles 1.0 +import TextToSpeech 1.0 import Utils 1.0 import 'Message.js' as Logic @@ -16,7 +17,7 @@ Item { property alias backgroundColor: rectangle.color property alias color: message.color - property alias fontSize: message.font.pointSize + property alias pointSize: message.font.pointSize default property alias _content: content.data diff --git a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml index 19e95a579..44d482252 100644 --- a/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml @@ -23,7 +23,7 @@ Item { } backgroundColor: ChatStyle.entry.message.outgoing.backgroundColor color: ChatStyle.entry.message.outgoing.text.color - fontSize: ChatStyle.entry.message.outgoing.text.fontSize + pointSize: ChatStyle.entry.message.outgoing.text.pointSize width: parent.width Row { diff --git a/linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml b/linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml index d61fde274..7a633dc7e 100644 --- a/linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml +++ b/linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml @@ -7,5 +7,5 @@ import Linphone.Styles 1.0 Text { color: CodecsViewerStyle.attribute.text.color elide: Text.ElideRight - font.pointSize: CodecsViewerStyle.attribute.text.fontSize + font.pointSize: CodecsViewerStyle.attribute.text.pointSize } diff --git a/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml b/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml index a8a2a2d4b..7208c42c3 100644 --- a/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml +++ b/linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml @@ -10,6 +10,6 @@ Text { font { bold: true - pointSize: CodecsViewerStyle.legend.fontSize + pointSize: CodecsViewerStyle.legend.pointSize } } diff --git a/linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml b/linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml index cf5d4544c..f618770f6 100644 --- a/linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml +++ b/linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml @@ -60,7 +60,7 @@ Item { width = parent.width / AvatarStyle.initials.ratio } - return AvatarStyle.initials.fontSize * (width || 1) + return AvatarStyle.initials.pointSize * (width || 1) } text: _computeInitials() diff --git a/linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml b/linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml index 1c9875e6b..3e3e9305c 100644 --- a/linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml +++ b/linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml @@ -19,7 +19,7 @@ Column { color: usernameColor elide: Text.ElideRight font.bold: true - font.pointSize: ContactDescriptionStyle.username.fontSize + font.pointSize: ContactDescriptionStyle.username.pointSize height: parent.height / 2 horizontalAlignment: horizontalTextAlignment verticalAlignment: Text.AlignBottom @@ -31,7 +31,7 @@ Column { color: sipAddressColor elide: Text.ElideRight - font.pointSize: ContactDescriptionStyle.sipAddress.fontSize + font.pointSize: ContactDescriptionStyle.sipAddress.pointSize height: parent.height / 2 horizontalAlignment: horizontalTextAlignment verticalAlignment: Text.AlignTop diff --git a/linphone-desktop/ui/modules/Linphone/Contact/MessagesCounter.qml b/linphone-desktop/ui/modules/Linphone/Contact/MessagesCounter.qml index a29f97606..7463ae990 100644 --- a/linphone-desktop/ui/modules/Linphone/Contact/MessagesCounter.qml +++ b/linphone-desktop/ui/modules/Linphone/Contact/MessagesCounter.qml @@ -34,7 +34,7 @@ Item { Text { anchors.centerIn: parent color: MessagesCounterStyle.text.color - font.pointSize: MessagesCounterStyle.text.fontSize + font.pointSize: MessagesCounterStyle.text.pointSize text: messagesCounter.count } } diff --git a/linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml b/linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml index b35914bdb..448716d09 100644 --- a/linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml +++ b/linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml @@ -91,7 +91,7 @@ Item { color: SipAddressesMenuStyle.entry.text.color elide: Text.ElideRight - font.pointSize: SipAddressesMenuStyle.entry.text.fontSize + font.pointSize: SipAddressesMenuStyle.entry.text.pointSize height: parent.height text: $sipAddress verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml index 7b7a9fcb1..a93c3db77 100644 --- a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml +++ b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml @@ -49,7 +49,7 @@ Notification { color: NotificationNewVersionAvailableStyle.message.color elide: Text.ElideRight wrapMode: Text.Wrap - font.pointSize: NotificationNewVersionAvailableStyle.message.fontSize + font.pointSize: NotificationNewVersionAvailableStyle.message.pointSize text: notificationData.message } } diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml index d29eb9ec3..698fb55d2 100644 --- a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml @@ -50,7 +50,7 @@ Notification { color: NotificationReceivedFileMessageStyle.fileName.color elide: Text.ElideRight - font.pointSize: NotificationReceivedFileMessageStyle.fileName.fontSize + font.pointSize: NotificationReceivedFileMessageStyle.fileName.pointSize text: Utils.basename(notification._fileUri) } @@ -59,7 +59,7 @@ Notification { color: NotificationReceivedFileMessageStyle.fileSize.color elide: Text.ElideRight - font.pointSize: NotificationReceivedFileMessageStyle.fileSize.fontSize + font.pointSize: NotificationReceivedFileMessageStyle.fileSize.pointSize horizontalAlignment: Text.AlignRight text: Utils.formatSize(notification.notificationData.fileSize) } diff --git a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml index 2678868cf..0e063562b 100644 --- a/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml +++ b/linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml @@ -68,7 +68,7 @@ Notification { font { italic: true - pointSize: NotificationReceivedMessageStyle.messageContainer.text.fontSize + pointSize: NotificationReceivedMessageStyle.messageContainer.text.pointSize } verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml index 9354d6d6e..e083c8f06 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -15,11 +16,11 @@ QtObject { property QtObject sipAddress: QtObject { property color color: Colors.j75 - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject username: QtObject { property color color: Colors.j - property int fontSize: 11 + property int pointSize: Units.dp * 11 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml index 3d76cc9e2..5828b932c 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -15,7 +16,7 @@ QtObject { property QtObject description: QtObject { property color color: Colors.w - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int height: 40 } @@ -27,7 +28,7 @@ QtObject { property QtObject title: QtObject { property color color: Colors.j property int bottomMargin: 10 - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int height: 20 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml index 605468e67..3e4877ead 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -10,7 +11,7 @@ QtObject { property QtObject error: QtObject { property color color: Colors.error - property int fontSize: 11 + property int pointSize: Units.dp * 11 property int padding: 4 } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml index b1ca3a69c..a4fe797ac 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -16,17 +17,17 @@ QtObject { property QtObject title: QtObject { property color color: Colors.d property int bottomMargin: 20 - property int fontSize: 16 + property int pointSize: Units.dp * 16 } property QtObject key: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int width: 200 } property QtObject value: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml index 26cdbc253..0ed21ca6b 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -18,7 +19,7 @@ QtObject { } property QtObject text: QtObject { - property int fontSize: 10 + property int pointSize: Units.dp * 10 property color color: Colors.g } } @@ -44,7 +45,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.r - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } @@ -90,7 +91,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.r - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } @@ -100,14 +101,14 @@ QtObject { property QtObject text: QtObject { property color color: Colors.r - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } } property QtObject time: QtObject { property color color: Colors.x - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int width: 44 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml index dfc0bc966..d8d0dcd59 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -24,7 +25,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.j - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } @@ -39,7 +40,7 @@ QtObject { property QtObject legend: QtObject { property color color: Colors.j - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int height: 50 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml index 0b3cd8771..1151e5cef 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -10,7 +11,7 @@ QtObject { property QtObject initials: QtObject { property color color: Colors.k - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int ratio: 30 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml index fde951df4..6234b8c3c 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml @@ -2,17 +2,18 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= QtObject { property QtObject sipAddress: QtObject { property color color: Colors.w - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject username: QtObject { property color color: Colors.j - property int fontSize: 11 + property int pointSize: Units.dp * 11 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Contact/MessagesCounterStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Contact/MessagesCounterStyle.qml index ff0763df4..0523ad5bd 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Contact/MessagesCounterStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Contact/MessagesCounterStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -16,6 +17,6 @@ QtObject { property QtObject text: QtObject { property color color: Colors.k - property int fontSize: 7 + property int pointSize: Units.dp * 7 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml index 5b13ae58b..531acd63e 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -23,7 +24,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.k - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml index b3ffb617e..7864be284 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -16,7 +17,7 @@ QtObject { property QtObject message: QtObject { property color color: Colors.h - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int topPadding: 10 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml index f092c5595..e6ac583c1 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -16,12 +17,12 @@ QtObject { property QtObject fileName: QtObject { property color color: Colors.h - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject fileSize: QtObject { property color color: Colors.h - property int fontSize: 9 + property int pointSize: Units.dp * 9 property int width: 100 } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml index ba4fc35f9..67123931a 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -22,7 +23,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.l - property int fontSize: 9 + property int pointSize: Units.dp * 9 } } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml index 4e683a9b8..a152fe974 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -29,7 +30,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.d - property int fontSize: 11 + property int pointSize: Units.dp * 11 } } } diff --git a/linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml index 6dad8d582..dd14005e9 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -35,7 +36,7 @@ QtObject { property QtObject legend: QtObject { property color backgroundColor: Colors.u property color color: Colors.k - property int fontSize: 11 + property int pointSize: Units.dp * 11 property int height: 30 property int iconSize: 10 property int leftMargin: 17 diff --git a/linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml b/linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml index d0387a077..8e35a9271 100644 --- a/linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml +++ b/linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -42,7 +43,7 @@ QtObject { } property QtObject text: QtObject { - property int fontSize: 9 + property int pointSize: Units.dp * 9 property QtObject color: QtObject { property color normal: Colors.k diff --git a/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml b/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml index 751ce2b58..0b4d8d9e5 100644 --- a/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml +++ b/linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml @@ -34,7 +34,7 @@ Item { font { bold: true - pointSize: TelKeypadStyle.button.text.fontSize + pointSize: TelKeypadStyle.button.text.pointSize } text: button.text diff --git a/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml index aaf70a186..1dec35ca6 100644 --- a/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml +++ b/linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml @@ -78,7 +78,7 @@ ColumnLayout { Text { color: TimelineStyle.legend.color - font.pointSize: TimelineStyle.legend.fontSize + font.pointSize: TimelineStyle.legend.pointSize height: parent.height text: qsTr('timelineTitle') verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml b/linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml index 6860a64cb..17662409a 100644 --- a/linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml +++ b/linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml @@ -137,7 +137,7 @@ ScrollableListView { font { bold: true - pointSize: SipAddressesViewStyle.header.text.fontSize + pointSize: SipAddressesViewStyle.header.text.pointSize } color: headerButton.pressed diff --git a/linphone-desktop/ui/views/App/Calls/Conference.qml b/linphone-desktop/ui/views/App/Calls/Conference.qml index b6c24a42a..bea56b368 100644 --- a/linphone-desktop/ui/views/App/Calls/Conference.qml +++ b/linphone-desktop/ui/views/App/Calls/Conference.qml @@ -59,7 +59,7 @@ Rectangle { font { bold: true - pointSize: ConferenceStyle.description.fontSize + pointSize: ConferenceStyle.description.pointSize } height: parent.height diff --git a/linphone-desktop/ui/views/App/Calls/EndedCall.qml b/linphone-desktop/ui/views/App/Calls/EndedCall.qml index cb25813f8..7861a8865 100644 --- a/linphone-desktop/ui/views/App/Calls/EndedCall.qml +++ b/linphone-desktop/ui/views/App/Calls/EndedCall.qml @@ -45,7 +45,7 @@ Rectangle { Layout.fillWidth: true color: CallStyle.header.elapsedTime.color - font.pointSize: CallStyle.header.elapsedTime.fontSize + font.pointSize: CallStyle.header.elapsedTime.pointSize horizontalAlignment: Text.AlignHCenter text: { @@ -78,7 +78,7 @@ Rectangle { Text { color: CallStyle.actionArea.callError.color - font.pointSize: CallStyle.actionArea.callError.fontSize + font.pointSize: CallStyle.actionArea.callError.pointSize horizontalAlignment: Text.AlignHCenter width: parent.width diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml index 9c5d0cf38..cc91c9da6 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.qml +++ b/linphone-desktop/ui/views/App/Calls/Incall.qml @@ -172,7 +172,7 @@ Rectangle { Layout.fillWidth: true color: CallStyle.header.elapsedTime.color - font.pointSize: CallStyle.header.elapsedTime.fontSize + font.pointSize: CallStyle.header.elapsedTime.pointSize horizontalAlignment: Text.AlignHCenter Timer { @@ -215,7 +215,7 @@ Rectangle { color: CallStyle.container.pause.text.color // `|| 1` => `pointSize` must be greater than 0. - font.pointSize: (width / CallStyle.container.pause.text.fontSizeFactor) || 1 + font.pointSize: (width / CallStyle.container.pause.text.pointSizeFactor) || 1 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml b/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml index 422c5b907..c3e2f339a 100644 --- a/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml +++ b/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml @@ -172,7 +172,7 @@ Window { anchors.fill: parent - font.pointSize: CallStyle.header.elapsedTime.fullscreenFontSize + font.pointSize: CallStyle.header.elapsedTime.fullscreen.pointSize horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml b/linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml index aa7f77185..aed3c4a51 100644 --- a/linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml +++ b/linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml @@ -35,7 +35,7 @@ ColumnLayout { font { bold: true - pointSize: CallStyle.zrtpArea.text.fontSize + pointSize: CallStyle.zrtpArea.text.pointSize } } @@ -50,7 +50,7 @@ ColumnLayout { Text { color: CallStyle.zrtpArea.text.colorA - font.pointSize: CallStyle.zrtpArea.text.fontSize + font.pointSize: CallStyle.zrtpArea.text.pointSize text: qsTr('codeA') } @@ -59,7 +59,7 @@ ColumnLayout { font { bold: true - pointSize: CallStyle.zrtpArea.text.fontSize + pointSize: CallStyle.zrtpArea.text.pointSize } text: zrtp.call.localSas @@ -67,13 +67,13 @@ ColumnLayout { Text { color: CallStyle.zrtpArea.text.colorA - font.pointSize: CallStyle.zrtpArea.text.fontSize + font.pointSize: CallStyle.zrtpArea.text.pointSize text: '-' } Text { color: CallStyle.zrtpArea.text.colorA - font.pointSize: CallStyle.zrtpArea.text.fontSize + font.pointSize: CallStyle.zrtpArea.text.pointSize text: qsTr('codeB') } @@ -82,7 +82,7 @@ ColumnLayout { font { bold: true - pointSize: CallStyle.zrtpArea.text.fontSize + pointSize: CallStyle.zrtpArea.text.pointSize } text: zrtp.call.remoteSas diff --git a/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml b/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml index 93e9998e9..34aeed44b 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml @@ -25,7 +25,7 @@ AssistantAbstractView { Text { color: ActivateLinphoneSipAccountWithEmailStyle.activationSteps.color - font.pointSize: ActivateLinphoneSipAccountWithEmailStyle.activationSteps.fontSize + font.pointSize: ActivateLinphoneSipAccountWithEmailStyle.activationSteps.pointSize horizontalAlignment: Text.AlignHCenter text: qsTr('activationSteps').replace('%1', assistantModel.email) width: parent.width diff --git a/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml b/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml index 7dd189816..c996b3885 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml @@ -25,7 +25,7 @@ AssistantAbstractView { Text { color: ActivateLinphoneSipAccountWithPhoneNumberStyle.activationSteps.color - font.pointSize: ActivateLinphoneSipAccountWithPhoneNumberStyle.activationSteps.fontSize + font.pointSize: ActivateLinphoneSipAccountWithPhoneNumberStyle.activationSteps.pointSize horizontalAlignment: Text.AlignHCenter text: qsTr('activationSteps').replace('%1', assistantModel.phoneNumber) width: parent.width diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml index a90226be2..7c03b48f7 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml @@ -45,7 +45,7 @@ Item { elide: Text.ElideRight font { - pointSize: AssistantAbstractViewStyle.info.title.fontSize + pointSize: AssistantAbstractViewStyle.info.title.pointSize bold: true } @@ -59,7 +59,7 @@ Item { color: AssistantAbstractViewStyle.info.description.color elide: Text.ElideRight - font.pointSize: AssistantAbstractViewStyle.info.description.fontSize + font.pointSize: AssistantAbstractViewStyle.info.description.pointSize horizontalAlignment: Text.AlignHCenter width: parent.width diff --git a/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml index dec89a20f..ece1ad713 100644 --- a/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml +++ b/linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml @@ -43,7 +43,7 @@ ColumnLayout { font { bold: true - pointSize: AssistantHomeStyle.info.title.fontSize + pointSize: AssistantHomeStyle.info.title.pointSize } text: qsTr('homeTitle') @@ -55,7 +55,7 @@ ColumnLayout { color: AssistantHomeStyle.info.description.color elide: Text.ElideRight - font.pointSize: AssistantHomeStyle.info.description.fontSize + font.pointSize: AssistantHomeStyle.info.description.pointSize horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/linphone-desktop/ui/views/App/Main/ContactEdit.qml b/linphone-desktop/ui/views/App/Main/ContactEdit.qml index e2caa1abd..0cfe8f4da 100644 --- a/linphone-desktop/ui/views/App/Main/ContactEdit.qml +++ b/linphone-desktop/ui/views/App/Main/ContactEdit.qml @@ -100,7 +100,7 @@ ColumnLayout { font { bold: true - pointSize: ContactEditStyle.bar.username.fontSize + pointSize: ContactEditStyle.bar.username.pointSize } forceFocus: true readOnly: !_edition diff --git a/linphone-desktop/ui/views/App/Main/Contacts.qml b/linphone-desktop/ui/views/App/Main/Contacts.qml index 97894c2d3..3cd7cfcf7 100644 --- a/linphone-desktop/ui/views/App/Main/Contacts.qml +++ b/linphone-desktop/ui/views/App/Main/Contacts.qml @@ -113,7 +113,7 @@ ColumnLayout { Layout.fillWidth: true color: ContactsStyle.contact.presence.color elide: Text.ElideRight - font.pointSize: ContactsStyle.contact.presence.fontSize + font.pointSize: ContactsStyle.contact.presence.pointSize text: Presence.getPresenceStatusAsString($contact.presenceStatus) } } @@ -247,7 +247,7 @@ ColumnLayout { font { bold: true - pointSize: ContactsStyle.contact.username.fontSize + pointSize: ContactsStyle.contact.username.pointSize } text: $contact.vcard.username diff --git a/linphone-desktop/ui/views/App/Main/Dialogs/About.qml b/linphone-desktop/ui/views/App/Main/Dialogs/About.qml index 34420d752..235cb3057 100644 --- a/linphone-desktop/ui/views/App/Main/Dialogs/About.qml +++ b/linphone-desktop/ui/views/App/Main/Dialogs/About.qml @@ -51,7 +51,7 @@ DialogPlus { TextEdit { color: AboutStyle.versionsBlock.appVersion.color selectByMouse: true - font.pointSize: AboutStyle.versionsBlock.appVersion.fontSize + font.pointSize: AboutStyle.versionsBlock.appVersion.pointSize text: 'Desktop Qt' + App.qtVersion + ' - ' + Qt.application.version height: parent.height / 2 @@ -65,7 +65,7 @@ DialogPlus { TextEdit { color: AboutStyle.versionsBlock.coreVersion.color selectByMouse: true - font.pointSize: AboutStyle.versionsBlock.coreVersion.fontSize + font.pointSize: AboutStyle.versionsBlock.coreVersion.pointSize text: 'Core ' + CoreManager.version height: parent.heigth / 2 @@ -84,7 +84,7 @@ DialogPlus { Text { elide: Text.ElideRight - font.pointSize: AboutStyle.copyrightBlock.url.fontSize + font.pointSize: AboutStyle.copyrightBlock.url.pointSize linkColor: AboutStyle.copyrightBlock.url.color text: 'https://www.linphone.org' @@ -106,7 +106,7 @@ DialogPlus { Text { color: AboutStyle.copyrightBlock.license.color elide: Text.ElideRight - font.pointSize: AboutStyle.copyrightBlock.license.fontSize + font.pointSize: AboutStyle.copyrightBlock.license.pointSize text: 'GNU General Public License V2\n\u00A9 2010-' + (new Date().toLocaleDateString(Qt.locale(), 'yyyy')) + diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml index 89f9fc021..7ad160427 100644 --- a/linphone-desktop/ui/views/App/Main/MainWindow.qml +++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml @@ -138,7 +138,7 @@ ApplicationWindow { Text { clip: true color: MainWindowStyle.autoAnswerStatus.text.color - font.pointSize: MainWindowStyle.autoAnswerStatus.text.fontSize + font.pointSize: MainWindowStyle.autoAnswerStatus.text.pointSize text: qsTr('autoAnswerStatus') visible: SettingsModel.autoAnswerStatus width: parent.width diff --git a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml index 89846bb79..f7afe5a7e 100644 --- a/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -26,7 +27,7 @@ QtObject { property QtObject callError: QtObject { property color color: Colors.i - property int fontSize: 12 + property int pointSize: Units.dp * 12 } } @@ -43,7 +44,7 @@ QtObject { property QtObject text: QtObject { property color color: Colors.k - property int fontSizeFactor: 10 + property int pointSizeFactor: 10 } } } @@ -68,8 +69,11 @@ QtObject { property QtObject elapsedTime: QtObject { property color color: Colors.j - property int fontSize: 10 - property int fullscreenFontSize: 12 + property int pointSize: Units.dp * 10 + + property QtObject fullscreen: QtObject { + property int pointSize: Units.dp * 12 + } } property QtObject stats: QtObject { @@ -87,7 +91,7 @@ QtObject { property QtObject text: QtObject { property color colorA: Colors.j property color colorB: Colors.i - property int fontSize: 12 + property int pointSize: Units.dp * 12 property int wordsSpacing: 5 } } diff --git a/linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml b/linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml index bd8f12cb7..cb580290b 100644 --- a/linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml @@ -2,13 +2,14 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= QtObject { property QtObject description: QtObject { property color color: Colors.x - property int fontSize: 12 + property int pointSize: Units.dp * 12 property int height: 60 property int width: 150 } diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml index 3179749bd..4338544ec 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -10,6 +11,6 @@ QtObject { property QtObject activationSteps: QtObject { property color color: Colors.g - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumberStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumberStyle.qml index 3179749bd..4338544ec 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumberStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumberStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -10,6 +11,6 @@ QtObject { property QtObject activationSteps: QtObject { property color color: Colors.g - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml index d2c74be9a..f052ceebd 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -20,12 +21,12 @@ QtObject { property QtObject description: QtObject { property color color: Colors.g - property int fontSize: 11 + property int pointSize: Units.dp * 11 } property QtObject title: QtObject { property color color: Colors.g - property int fontSize: 11 + property int pointSize: Units.dp * 11 } } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml index d32b1915b..220fb4e07 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -12,13 +13,13 @@ QtObject { property QtObject description: QtObject { property color color: Colors.g - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int height: 40 } property QtObject title: QtObject { property color color: Colors.g - property int fontSize: 11 + property int pointSize: Units.dp * 11 property int height: 40 } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml index 9a3423b29..16ba90493 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -42,7 +43,7 @@ QtObject { property QtObject username: QtObject { property color color: Colors.j - property int fontSize: 13 + property int pointSize: Units.dp * 13 } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml index 0e9cdc3bd..f7d5b2fbb 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -42,13 +43,13 @@ QtObject { } property QtObject presence: QtObject { - property int fontSize: 10 + property int pointSize: Units.dp * 10 property color color: Colors.w } property QtObject username: QtObject { property color color: Colors.j - property int fontSize: 10 + property int pointSize: Units.dp * 10 property int width: 220 } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml index 07c483d51..b1714b386 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick 2.7 import Common 1.0 +import Units 1.0 // ============================================================================= @@ -17,12 +18,12 @@ QtObject { property QtObject license: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject url: QtObject { property color color: Colors.i - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } @@ -32,12 +33,12 @@ QtObject { property QtObject appVersion: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } property QtObject coreVersion: QtObject { property color color: Colors.d - property int fontSize: 10 + property int pointSize: Units.dp * 10 } } } diff --git a/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml index 15d9cb2bd..063f226b0 100644 --- a/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml +++ b/linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml @@ -3,6 +3,7 @@ import QtQuick 2.7 import Common 1.0 import Linphone.Styles 1.0 +import Units 1.0 // ============================================================================= @@ -23,7 +24,7 @@ QtObject { property int width: 24 property QtObject text: QtObject { - property int fontSize: 8 + property int pointSize: Units.dp * 8 property color color: Colors.j75 } } diff --git a/submodules/linphone b/submodules/linphone index a9b93af10..f2a56412f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a9b93af101b979145644424d8b9453333b547b1d +Subproject commit f2a56412ff684a52a2848856cd7aaaa5e9971e9b