diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index 942495ff2..7fcdfcd50 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -347,7 +347,7 @@ Url du serveur non configurée.
codecStatus
- status
+ Status
diff --git a/linphone-desktop/src/main.cpp b/linphone-desktop/src/main.cpp
index 72cd854b3..7ac4a00da 100644
--- a/linphone-desktop/src/main.cpp
+++ b/linphone-desktop/src/main.cpp
@@ -87,7 +87,7 @@ int main (int argc, char *argv[]) {
if (info.suffix() == "ttf") {
QString path = info.absoluteFilePath();
if (path.startsWith(":/assets/fonts/"))
- qDebug() << QFontDatabase::addApplicationFont(path);
+ QFontDatabase::addApplicationFont(path);
}
}
diff --git a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml
index 86143b90d..fda502575 100644
--- a/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml
+++ b/linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml
@@ -30,6 +30,7 @@ CheckBox {
verticalAlignment: Text.AlignVCenter
}
+ font.pointSize: CheckBoxTextStyle.fontSize
hoverEnabled: true
indicator: Rectangle {
diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
index 603143711..66aa09a0c 100644
--- a/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
+++ b/linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
@@ -6,6 +6,7 @@ import Common 1.0
// =============================================================================
QtObject {
+ property int fontSize: 10
property int radius: 3
property int size: 18
diff --git a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
index fd567f3d4..152efdbc5 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
@@ -7,160 +7,167 @@ import Linphone 1.0
import App.Styles 1.0
- // ============================================================================
+// ============================================================================
- MenuBar {
- id: container
+MenuBar {
+ id: container
- // --------------------------------------------------------------------------
+ // --------------------------------------------------------------------------
- property bool hide: false
+ property bool hide: false
- // --------------------------------------------------------------------------
+ // --------------------------------------------------------------------------
- // Workaround to hide toolbar.
- // Use private properties of MenuBar.
+ // Workaround to hide toolbar.
+ // Use private properties of MenuBar.
- __contentItem.height: hide
- ? 0
- : MainWindowMenuBarStyle.height
+ __contentItem.height: hide
+ ? 0
+ : MainWindowMenuBarStyle.height
- __contentItem.transform: Scale {
- yScale: Number(!hide)
- }
+ __contentItem.transform: Scale {
+ yScale: Number(!hide)
+ }
- // --------------------------------------------------------------------------
+ // --------------------------------------------------------------------------
- style: MenuBarStyle {
- background: Rectangle {
- color: MainWindowMenuBarStyle.color
+ style: MenuBarStyle {
+ background: Rectangle {
+ color: MainWindowMenuBarStyle.color
- Rectangle {
- anchors.bottom: parent.bottom
- color: MainWindowMenuBarStyle.separator.color
- height: MainWindowMenuBarStyle.separator.height
- width: parent.width
- }
- }
+ Rectangle {
+ anchors.bottom: parent.bottom
+ color: MainWindowMenuBarStyle.separator.color
+ height: MainWindowMenuBarStyle.separator.height
+ width: parent.width
+ }
+ }
- menuStyle: MenuStyle {
- frame: Item {}
+ menuStyle: MenuStyle {
+ id: menuStyle
- itemDelegate {
- background: Rectangle {
- color: (styleData.selected || styleData.open)
- ? MainWindowMenuBarStyle.subMenu.color.selected
- : MainWindowMenuBarStyle.subMenu.color.normal
- }
+ font.pointSize: MainWindowMenuBarStyle.subMenu.text.fontSize
- label: Label {
- color: styleData.selected
- ? MainWindowMenuBarStyle.subMenu.text.color.selected
- : MainWindowMenuBarStyle.subMenu.text.color.normal
- text: styleData.text
- }
+ frame: Item {}
- shortcut: Label {
- color: styleData.selected
- ? MainWindowMenuBarStyle.subMenu.text.color.selected
- : MainWindowMenuBarStyle.subMenu.text.color.normal
- text: styleData.shortcut
- }
- }
- }
+ itemDelegate {
+ background: Rectangle {
+ color: (styleData.selected || styleData.open)
+ ? MainWindowMenuBarStyle.subMenu.color.selected
+ : MainWindowMenuBarStyle.subMenu.color.normal
+ }
- itemDelegate: Item {
- implicitHeight: menuItem.height + MainWindowMenuBarStyle.separator.spacing
- implicitWidth: menuItem.width
+ label: Label {
+ color: styleData.selected
+ ? MainWindowMenuBarStyle.subMenu.text.color.selected
+ : MainWindowMenuBarStyle.subMenu.text.color.normal
+ font: menuStyle.font
+ text: styleData.text
+ }
- Item {
- id: menuItem
+ shortcut: Label {
+ color: styleData.selected
+ ? MainWindowMenuBarStyle.subMenu.text.color.selected
+ : MainWindowMenuBarStyle.subMenu.text.color.normal
+ font: menuStyle.font
+ text: styleData.shortcut
+ }
+ }
+ }
- implicitHeight: text.height + MainWindowMenuBarStyle.menu.text.verticalMargins * 2
- implicitWidth: text.width + MainWindowMenuBarStyle.menu.text.horizontalMargins * 2
+ itemDelegate: Item {
+ implicitHeight: menuItem.height + MainWindowMenuBarStyle.separator.spacing
+ implicitWidth: menuItem.width
- Text {
- id: text
+ Item {
+ id: menuItem
- anchors.centerIn: parent
- color: styleData.open
- ? MainWindowMenuBarStyle.menu.text.color.selected
- : MainWindowMenuBarStyle.menu.text.color.normal
+ implicitHeight: text.height + MainWindowMenuBarStyle.menu.text.verticalMargins * 2
+ implicitWidth: text.width + MainWindowMenuBarStyle.menu.text.horizontalMargins * 2
- text: formatMnemonic(styleData.text, styleData.underlineMnemonic)
- }
+ Text {
+ id: text
- Rectangle {
- anchors.bottom: parent.bottom
- color: MainWindowMenuBarStyle.menu.indicator.color
- visible: styleData.open
+ anchors.centerIn: parent
+ color: styleData.open
+ ? MainWindowMenuBarStyle.menu.text.color.selected
+ : MainWindowMenuBarStyle.menu.text.color.normal
- height: MainWindowMenuBarStyle.menu.indicator.height
- width: parent.width
- }
- }
- }
- }
+ font.pointSize: MainWindowMenuBarStyle.menu.text.fontSize
+ text: formatMnemonic(styleData.text, styleData.underlineMnemonic)
+ }
- // --------------------------------------------------------------------------
+ Rectangle {
+ anchors.bottom: parent.bottom
+ color: MainWindowMenuBarStyle.menu.indicator.color
+ visible: styleData.open
- Menu {
- title: qsTr('options')
+ height: MainWindowMenuBarStyle.menu.indicator.height
+ width: parent.width
+ }
+ }
+ }
+ }
- MenuItem {
- shortcut: 'Ctrl+P'
- text: qsTr('settings')
+ // --------------------------------------------------------------------------
- onTriggered: {
- var window = App.getSettingsWindow()
- if (window.visibility === Window.Minimized) {
- window.visibility = Window.AutomaticVisibility
- } else {
- window.setVisible(true)
- }
- }
- }
+ Menu {
+ title: qsTr('options')
- MenuSeparator {}
+ MenuItem {
+ shortcut: 'Ctrl+P'
+ text: qsTr('settings')
- MenuItem {
- shortcut: StandardKey.Quit
- text: qsTr('quit')
+ onTriggered: {
+ var window = App.getSettingsWindow()
+ if (window.visibility === Window.Minimized) {
+ window.visibility = Window.AutomaticVisibility
+ } else {
+ window.setVisible(true)
+ }
+ }
+ }
- onTriggered: Qt.quit()
- }
- }
+ MenuSeparator {}
- Menu {
- title: qsTr('tools')
+ MenuItem {
+ shortcut: StandardKey.Quit
+ text: qsTr('quit')
- MenuItem {
- text: qsTr('audioAssistant')
- }
+ onTriggered: Qt.quit()
+ }
+ }
- MenuSeparator {}
+ Menu {
+ title: qsTr('tools')
- MenuItem {
- text: qsTr('importContacts')
- }
+ MenuItem {
+ text: qsTr('audioAssistant')
+ }
- MenuItem {
- text: qsTr('exportContacts')
- }
- }
+ MenuSeparator {}
- Menu {
- title: qsTr('help')
+ MenuItem {
+ text: qsTr('importContacts')
+ }
- MenuItem {
- shortcut: StandardKey.HelpContents
- text: qsTr('about')
- }
+ MenuItem {
+ text: qsTr('exportContacts')
+ }
+ }
- MenuSeparator {}
+ Menu {
+ title: qsTr('help')
- MenuItem {
- text: qsTr('checkForUpdates')
- }
- }
- }
+ MenuItem {
+ shortcut: StandardKey.HelpContents
+ text: qsTr('about')
+ }
+
+ MenuSeparator {}
+
+ MenuItem {
+ text: qsTr('checkForUpdates')
+ }
+ }
+}
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 9a5430f4f..d2c74be9a 100644
--- a/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
+++ b/linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
@@ -20,7 +20,7 @@ QtObject {
property QtObject description: QtObject {
property color color: Colors.g
- property int fontSize: 10
+ property int fontSize: 11
}
property QtObject title: QtObject {
diff --git a/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
index 46178dba3..0e9cdc3bd 100644
--- a/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
+++ b/linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
@@ -48,7 +48,7 @@ QtObject {
property QtObject username: QtObject {
property color color: Colors.j
- property int fontSize: 9
+ property int fontSize: 10
property int width: 220
}
}
diff --git a/linphone-desktop/ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml b/linphone-desktop/ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml
index 22629552b..3d1bf8154 100644
--- a/linphone-desktop/ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml
+++ b/linphone-desktop/ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml
@@ -11,6 +11,7 @@ QtObject {
property QtObject menu: QtObject {
property QtObject text: QtObject {
+ property int fontSize: 10
property int horizontalMargins: 9
property int verticalMargins: 4
@@ -39,6 +40,8 @@ QtObject {
}
property QtObject text: QtObject {
+ property int fontSize: 10
+
property QtObject color: QtObject {
property color selected: Colors.k
property color normal: Colors.b