Skip to content

L
linphone-desktop
Commit 865c595d authored by Ronan Abhamon's avatar Ronan Abhamon
Browse files
Options

feat(app): refactoring & provide Units module

parent 79e27ca6
Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 202 deletions
linphone-desktop/CMakeLists.txt
View file @ 865c595d
......@@ -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)
......
linphone-desktop/src/app/App.cpp
View file @ 865c595d
......@@ -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<class T>
void registerSingletonType (const char *name) {
qmlRegisterSingletonType<T>("Linphone", 1, 0, name, [](QQmlEngine *, QJSEngine *) -> QObject *{
return new T();
qmlRegisterSingletonType<T>("Linphone", 1, 0, name, [](QQmlEngine *engine, QJSEngine *) -> QObject *{
return new T(engine);
});
}
......@@ -342,6 +343,13 @@ void registerType (const char *name) {
qmlRegisterType<T>("Linphone", 1, 0, name);
}
template<class T>
void registerToolType (const char *name) {
qmlRegisterSingletonType<T>(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>("TelephoneNumbersModel");
registerSingletonType<AudioCodecsModel>("AudioCodecsModel");
registerSingletonType<Clipboard>("Clipboard");
registerSingletonType<OwnPresenceModel>("OwnPresenceModel");
registerSingletonType<Presence>("Presence");
registerSingletonType<TextToSpeech>("TextToSpeech");
registerSingletonType<TimelineModel>("TimelineModel");
registerSingletonType<VideoCodecsModel>("VideoCodecsModel");
......@@ -388,6 +394,14 @@ void App::registerSharedTypes () {
registerSharedSingletonType(ContactsListModel, "ContactsListModel", CoreManager::getInstance()->getContactsListModel);
}
void App::registerToolTypes () {
qInfo() << QStringLiteral("Registering tool types...");
registerToolType<Clipboard>("Clipboard");
registerToolType<TextToSpeech>("TextToSpeech");
registerToolType<Units>("Units");
}
#undef registerUncreatableType
#undef registerSharedSingletonType
......
linphone-desktop/src/app/App.hpp
View file @ 865c595d
......@@ -92,6 +92,8 @@ private:
void registerTypes ();
void registerSharedTypes ();
void registerToolTypes ();
void setTrayIcon ();
void createNotifier ();
......
linphone-desktop/src/app/cli/Cli.cpp
View file @ 865c595d
......@@ -22,10 +22,8 @@
#include <stdexcept>
#include <QObject>
#include "../../components/core/CoreManager.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../App.hpp"
#include "Cli.hpp"
......
linphone-desktop/src/app/cli/Cli.hpp
View file @ 865c595d
......@@ -29,6 +29,8 @@
// =============================================================================
class Cli : public QObject {
Q_OBJECT;
typedef void (*Function)(const QHash<QString, QString> &);
enum ArgumentType {
......
linphone-desktop/src/app/logger/Logger.cpp
View file @ 865c595d
......@@ -25,7 +25,7 @@
#include <QDateTime>
#include <QThread>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../paths/Paths.hpp"
#include "Logger.hpp"
......
linphone-desktop/src/app/paths/Paths.cpp
View file @ 865c595d
......@@ -27,7 +27,7 @@
#include <QStandardPaths>
#include <QtDebug>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "config.h"
#include "Paths.hpp"
......
linphone-desktop/src/app/providers/AvatarProvider.cpp
View file @ 865c595d
......@@ -20,7 +20,7 @@
* Author: Ronan Abhamon
*/
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../paths/Paths.hpp"
#include "AvatarProvider.hpp"
......
linphone-desktop/src/app/providers/ThumbnailProvider.cpp
View file @ 865c595d
......@@ -20,7 +20,7 @@
* Author: Ronan Abhamon
*/
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../paths/Paths.hpp"
#include "ThumbnailProvider.hpp"
......
linphone-desktop/src/components/Components.hpp
View file @ 865c595d
......@@ -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_
linphone-desktop/src/components/assistant/AssistantModel.cpp
View file @ 865c595d
......@@ -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"
......
linphone-desktop/src/components/authentication/AuthenticationNotifier.cpp
View file @ 865c595d
......@@ -20,7 +20,7 @@
* Author: Ronan Abhamon
*/
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "AuthenticationNotifier.hpp"
......
linphone-desktop/src/components/call/CallModel.cpp
View file @ 865c595d
......@@ -25,7 +25,7 @@
#include <QTimer>
#include "../../app/App.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "CallModel.hpp"
......
linphone-desktop/src/components/calls/CallsListModel.cpp
View file @ 865c595d
......@@ -24,7 +24,7 @@
#include <QTimer>
#include "../../app/App.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../conference/ConferenceHelperModel.hpp"
#include "../core/CoreManager.hpp"
......
linphone-desktop/src/components/chat/ChatModel.cpp
View file @ 865c595d
......@@ -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"
......
linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp
View file @ 865c595d
......@@ -20,7 +20,7 @@
* Author: Ronan Abhamon
*/
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "AbstractCodecsModel.hpp"
......
linphone-desktop/src/components/conference/ConferenceAddModel.cpp
View file @ 865c595d
......@@ -20,7 +20,7 @@
* Author: Ronan Abhamon
*/
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "ConferenceAddModel.hpp"
......
linphone-desktop/src/components/conference/ConferenceModel.cpp
View file @ 865c595d
......@@ -22,7 +22,7 @@
#include <QDateTime>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "ConferenceModel.hpp"
......
linphone-desktop/src/components/contact/VcardModel.cpp
View file @ 865c595d
......@@ -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"
......
linphone-desktop/src/components/contacts/ContactsListModel.cpp
View file @ 865c595d
......@@ -23,7 +23,7 @@
#include <QtDebug>
#include "../../app/App.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "ContactsListModel.hpp"
......
linphone-desktop/src/components/contacts/ContactsListProxyModel.cpp
View file @ 865c595d
......@@ -24,7 +24,7 @@
#include <QDebug>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "ContactsListProxyModel.hpp"
......
linphone-desktop/src/components/core/CoreHandlers.cpp
View file @ 865c595d
......@@ -26,7 +26,7 @@
#include <QTimer>
#include "../../app/App.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "CoreManager.hpp"
#include "CoreHandlers.hpp"
......
linphone-desktop/src/components/core/CoreManager.cpp
View file @ 865c595d
......@@ -25,7 +25,7 @@
#include <QTimer>
#include "../../app/paths/Paths.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "CoreManager.hpp"
......
linphone-desktop/src/components/notifier/Notifier.cpp
View file @ 865c595d
......@@ -27,7 +27,7 @@
#include <QTimer>
#include "../../app/App.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "Notifier.hpp"
......
linphone-desktop/src/components/other/units/Units.cpp 0 → 100644
View file @ 865c595d
/*
* 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;
}
linphone-desktop/src/components/other/units/Units.hpp 0 → 100644
View file @ 865c595d
/*
* 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 <QObject>
// =============================================================================
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_
linphone-desktop/src/components/presence/OwnPresenceModel.cpp
View file @ 865c595d
......@@ -22,7 +22,7 @@
#include <QtDebug>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "OwnPresenceModel.hpp"
......
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file @ 865c595d
......@@ -22,7 +22,7 @@
#include <QtDebug>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "AccountSettingsModel.hpp"
......
linphone-desktop/src/components/settings/SettingsModel.cpp
View file @ 865c595d
......@@ -23,7 +23,7 @@
#include <QDir>
#include "../../app/paths/Paths.hpp"
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "SettingsModel.hpp"
......
linphone-desktop/src/components/sip-addresses/SipAddressesModel.cpp
View file @ 865c595d
......@@ -24,8 +24,8 @@
#include <QSet>
#include <QtDebug>
#include "../../LinphoneUtils.hpp"
#include "../../Utils.hpp"
#include "../../utils/LinphoneUtils.hpp"
#include "../../utils/Utils.hpp"
#include "../chat/ChatModel.hpp"
#include "../core/CoreManager.hpp"
......
linphone-desktop/src/components/sound-player/SoundPlayer.cpp
View file @ 865c595d
......@@ -22,7 +22,7 @@
#include <QTimer>
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "../core/CoreManager.hpp"
#include "SoundPlayer.hpp"
......
linphone-desktop/src/externals/single-application/SingleApplication.cpp
View file @ 865c595d
......@@ -43,7 +43,7 @@
#include <lmcons.h>
#endif // ifdef Q_OS_WIN
#include "../../Utils.hpp"
#include "../../utils/Utils.hpp"
#include "SingleApplication.hpp"
#include "SingleApplicationPrivate.hpp"
......
linphone-desktop/ui/modules/Common/Dialog/DialogDescription.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml
View file @ 865c595d
......@@ -65,7 +65,7 @@ Item {
color: _getTextColor()
font {
bold: true
pointSize: AbstractTextButtonStyle.text.fontSize
pointSize: AbstractTextButtonStyle.text.pointSize
}
elide: Text.ElideRight
......
linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml
View file @ 865c595d
......@@ -30,7 +30,7 @@ CheckBox {
verticalAlignment: Text.AlignVCenter
}
font.pointSize: CheckBoxTextStyle.fontSize
font.pointSize: CheckBoxTextStyle.pointSize
hoverEnabled: true
indicator: Rectangle {
......
linphone-desktop/ui/modules/Common/Form/ComboBox.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml
View file @ 865c595d
......@@ -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')
}
}
......
linphone-desktop/ui/modules/Common/Form/Fields/NumericField.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/Fields/TextAreaField.qml
View file @ 865c595d
......@@ -35,7 +35,7 @@ Flickable {
}
color: TextAreaFieldStyle.text.color
font.pointSize: TextAreaFieldStyle.text.fontSize
font.pointSize: TextAreaFieldStyle.text.pointSize
selectByMouse: true
wrapMode: TextArea.Wrap
......
linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/ListForm.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/Placements/Form.qml
View file @ 865c595d
......@@ -27,7 +27,7 @@ Column {
color: FormStyle.header.title.color
font {
bold: true
pointSize: FormStyle.header.title.fontSize
pointSize: FormStyle.header.title.pointSize
}
}
......
linphone-desktop/ui/modules/Common/Form/Placements/FormHGroup.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Form/Placements/FormTable.qml
View file @ 865c595d
......@@ -54,7 +54,7 @@ Column {
font {
bold: true
pointSize: FormTableStyle.entry.text.fontSize
pointSize: FormTableStyle.entry.text.pointSize
}
}
}
......
linphone-desktop/ui/modules/Common/Form/Placements/FormTableLine.qml
View file @ 865c595d
......@@ -32,7 +32,7 @@ Row {
font {
bold: false
pointSize: FormTableStyle.entry.text.fontSize
pointSize: FormTableStyle.entry.text.pointSize
}
visible: !formTableLine.parent.disableLineTitle
......
linphone-desktop/ui/modules/Common/Form/Placements/FormVGroup.qml
View file @ 865c595d
......@@ -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 : ''
......
linphone-desktop/ui/modules/Common/Form/StaticListForm.qml
View file @ 865c595d
......@@ -39,7 +39,7 @@ RowLayout {
font {
bold: true
pointSize: ListFormStyle.titleArea.text.fontSize
pointSize: ListFormStyle.titleArea.text.pointSize
}
verticalAlignment: Text.AlignVCenter
......
linphone-desktop/ui/modules/Common/Form/Tab/TabButton.qml
View file @ 865c595d
......@@ -82,7 +82,7 @@ Controls.TabButton {
font {
bold: true
pointSize: TabButtonStyle.text.fontSize
pointSize: TabButtonStyle.text.pointSize
}
elide: Text.ElideRight
......
linphone-desktop/ui/modules/Common/Form/TransparentTextInput.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Menus/ApplicationMenu.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Menus/DropDownStaticMenuEntry.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Menus/MenuItem.qml
View file @ 865c595d
......@@ -28,7 +28,7 @@ MenuItem {
font {
bold: true
pointSize: MenuItemStyle.text.fontSize
pointSize: MenuItemStyle.text.pointSize
}
text: button.text
......
linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml
View file @ 865c595d
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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Styles/Form/ComboBoxStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
......
linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/ListFormStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormHGroupStyle.qml
View file @ 865c595d
......@@ -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
}
......
linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormTableStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Placements/FormVGroupStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Styles/Menus/DropDownStaticMenuStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/modules/Common/Styles/Menus/MenuItemStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Common/Tooltip/Tooltip.qml
View file @ 865c595d
......@@ -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
}
......
linphone-desktop/ui/modules/Linphone/Account/AccountStatus.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Blocks/CardBlock.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Blocks/RequestBlock.qml
View file @ 865c595d
......@@ -37,7 +37,7 @@ Item {
font {
italic: true
pointSize: RequestBlockStyle.error.fontSize
pointSize: RequestBlockStyle.error.pointSize
}
height: parent.height
......
linphone-desktop/ui/modules/Linphone/Calls/CallStatistics.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Chat/Chat.qml
View file @ 865c595d
......@@ -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),
......
linphone-desktop/ui/modules/Linphone/Chat/Event.qml
View file @ 865c595d
......@@ -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))
......
linphone-desktop/ui/modules/Linphone/Chat/FileMessage.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Chat/IncomingMessage.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Chat/Message.qml
View file @ 865c595d
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
......
linphone-desktop/ui/modules/Linphone/Chat/OutgoingMessage.qml
View file @ 865c595d
......@@ -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 {
......
linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml
View file @ 865c595d
......@@ -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
}
linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml
View file @ 865c595d
......@@ -10,6 +10,6 @@ Text {
font {
bold: true
pointSize: CodecsViewerStyle.legend.fontSize
pointSize: CodecsViewerStyle.legend.pointSize
}
}
linphone-desktop/ui/modules/Linphone/Contact/Avatar.qml
View file @ 865c595d
......@@ -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()
......
linphone-desktop/ui/modules/Linphone/Contact/ContactDescription.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Contact/MessagesCounter.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/modules/Linphone/Menus/SipAddressesMenu.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Notifications/NotificationNewVersionAvailable.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
View file @ 865c595d
......@@ -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)
}
......
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file @ 865c595d
......@@ -68,7 +68,7 @@ Notification {
font {
italic: true
pointSize: NotificationReceivedMessageStyle.messageContainer.text.fontSize
pointSize: NotificationReceivedMessageStyle.messageContainer.text.pointSize
}
verticalAlignment: Text.AlignVCenter
......
linphone-desktop/ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Blocks/CardBlockStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Blocks/RequestBlockStyle.qml
View file @ 865c595d
......@@ -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
}
......
linphone-desktop/ui/modules/Linphone/Styles/Calls/CallStatisticsStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Contact/MessagesCounterStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Menus/SipAddressesMenuStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationNewVersionAvailableStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedFileMessageStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/modules/Linphone/Styles/TelKeypad/TelKeypadStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/Styles/View/SipAddressesViewStyle.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/TelKeypad/TelKeypadButton.qml
View file @ 865c595d
......@@ -34,7 +34,7 @@ Item {
font {
bold: true
pointSize: TelKeypadStyle.button.text.fontSize
pointSize: TelKeypadStyle.button.text.pointSize
}
text: button.text
......
linphone-desktop/ui/modules/Linphone/Timeline/Timeline.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/modules/Linphone/View/SipAddressesView.qml
View file @ 865c595d
......@@ -137,7 +137,7 @@ ScrollableListView {
font {
bold: true
pointSize: SipAddressesViewStyle.header.text.fontSize
pointSize: SipAddressesViewStyle.header.text.pointSize
}
color: headerButton.pressed
......
linphone-desktop/ui/views/App/Calls/Conference.qml
View file @ 865c595d
......@@ -59,7 +59,7 @@ Rectangle {
font {
bold: true
pointSize: ConferenceStyle.description.fontSize
pointSize: ConferenceStyle.description.pointSize
}
height: parent.height
......
linphone-desktop/ui/views/App/Calls/EndedCall.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Calls/ZrtpTokenAuthentication.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithEmail.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumber.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Main/Assistant/AssistantAbstractView.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Main/Assistant/AssistantHome.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Main/ContactEdit.qml
View file @ 865c595d
......@@ -100,7 +100,7 @@ ColumnLayout {
font {
bold: true
pointSize: ContactEditStyle.bar.username.fontSize
pointSize: ContactEditStyle.bar.username.pointSize
}
forceFocus: true
readOnly: !_edition
......
linphone-desktop/ui/views/App/Main/Contacts.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Main/Dialogs/About.qml
View file @ 865c595d
......@@ -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: '<a href="https://www.linphone.org">https://www.linphone.org</a>'
......@@ -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')) +
......
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @ 865c595d
......@@ -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
......
linphone-desktop/ui/views/App/Styles/Calls/CallStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/views/App/Styles/Calls/ConferenceStyle.qml
View file @ 865c595d
......@@ -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
}
......
linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithEmailStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/views/App/Styles/Main/Assistant/ActivateLinphoneSipAccountWithPhoneNumberStyle.qml
View file @ 865c595d
......@@ -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
}
}
linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantHomeStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone-desktop/ui/views/App/Styles/Main/Dialogs/AboutStyle.qml
View file @ 865c595d
......@@ -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
}
}
}
linphone-desktop/ui/views/App/Styles/Main/MainWindowStyle.qml
View file @ 865c595d
......@@ -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
}
}
......
linphone @ f2a56412
Subproject commit a9b93af101b979145644424d8b9453333b547b1d
Subproject commit f2a56412ff684a52a2848856cd7aaaa5e9971e9b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023