Commit 3c9afa3d authored by Ronan Abhamon's avatar Ronan Abhamon

fix(app): fix font size on miscellaneous components

parent dd4b5859
...@@ -347,7 +347,7 @@ Url du serveur non configurée.</translation> ...@@ -347,7 +347,7 @@ Url du serveur non configurée.</translation>
</message> </message>
<message> <message>
<source>codecStatus</source> <source>codecStatus</source>
<translation>status</translation> <translation>Status</translation>
</message> </message>
</context> </context>
<context> <context>
......
...@@ -87,7 +87,7 @@ int main (int argc, char *argv[]) { ...@@ -87,7 +87,7 @@ int main (int argc, char *argv[]) {
if (info.suffix() == "ttf") { if (info.suffix() == "ttf") {
QString path = info.absoluteFilePath(); QString path = info.absoluteFilePath();
if (path.startsWith(":/assets/fonts/")) if (path.startsWith(":/assets/fonts/"))
qDebug() << QFontDatabase::addApplicationFont(path); QFontDatabase::addApplicationFont(path);
} }
} }
......
...@@ -30,6 +30,7 @@ CheckBox { ...@@ -30,6 +30,7 @@ CheckBox {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
font.pointSize: CheckBoxTextStyle.fontSize
hoverEnabled: true hoverEnabled: true
indicator: Rectangle { indicator: Rectangle {
......
...@@ -6,6 +6,7 @@ import Common 1.0 ...@@ -6,6 +6,7 @@ import Common 1.0
// ============================================================================= // =============================================================================
QtObject { QtObject {
property int fontSize: 10
property int radius: 3 property int radius: 3
property int size: 18 property int size: 18
......
...@@ -7,9 +7,9 @@ import Linphone 1.0 ...@@ -7,9 +7,9 @@ import Linphone 1.0
import App.Styles 1.0 import App.Styles 1.0
// ============================================================================ // ============================================================================
MenuBar { MenuBar {
id: container id: container
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
...@@ -44,6 +44,10 @@ import App.Styles 1.0 ...@@ -44,6 +44,10 @@ import App.Styles 1.0
} }
menuStyle: MenuStyle { menuStyle: MenuStyle {
id: menuStyle
font.pointSize: MainWindowMenuBarStyle.subMenu.text.fontSize
frame: Item {} frame: Item {}
itemDelegate { itemDelegate {
...@@ -57,6 +61,7 @@ import App.Styles 1.0 ...@@ -57,6 +61,7 @@ import App.Styles 1.0
color: styleData.selected color: styleData.selected
? MainWindowMenuBarStyle.subMenu.text.color.selected ? MainWindowMenuBarStyle.subMenu.text.color.selected
: MainWindowMenuBarStyle.subMenu.text.color.normal : MainWindowMenuBarStyle.subMenu.text.color.normal
font: menuStyle.font
text: styleData.text text: styleData.text
} }
...@@ -64,6 +69,7 @@ import App.Styles 1.0 ...@@ -64,6 +69,7 @@ import App.Styles 1.0
color: styleData.selected color: styleData.selected
? MainWindowMenuBarStyle.subMenu.text.color.selected ? MainWindowMenuBarStyle.subMenu.text.color.selected
: MainWindowMenuBarStyle.subMenu.text.color.normal : MainWindowMenuBarStyle.subMenu.text.color.normal
font: menuStyle.font
text: styleData.shortcut text: styleData.shortcut
} }
} }
...@@ -87,6 +93,7 @@ import App.Styles 1.0 ...@@ -87,6 +93,7 @@ import App.Styles 1.0
? MainWindowMenuBarStyle.menu.text.color.selected ? MainWindowMenuBarStyle.menu.text.color.selected
: MainWindowMenuBarStyle.menu.text.color.normal : MainWindowMenuBarStyle.menu.text.color.normal
font.pointSize: MainWindowMenuBarStyle.menu.text.fontSize
text: formatMnemonic(styleData.text, styleData.underlineMnemonic) text: formatMnemonic(styleData.text, styleData.underlineMnemonic)
} }
...@@ -163,4 +170,4 @@ import App.Styles 1.0 ...@@ -163,4 +170,4 @@ import App.Styles 1.0
text: qsTr('checkForUpdates') text: qsTr('checkForUpdates')
} }
} }
} }
...@@ -20,7 +20,7 @@ QtObject { ...@@ -20,7 +20,7 @@ QtObject {
property QtObject description: QtObject { property QtObject description: QtObject {
property color color: Colors.g property color color: Colors.g
property int fontSize: 10 property int fontSize: 11
} }
property QtObject title: QtObject { property QtObject title: QtObject {
......
...@@ -48,7 +48,7 @@ QtObject { ...@@ -48,7 +48,7 @@ QtObject {
property QtObject username: QtObject { property QtObject username: QtObject {
property color color: Colors.j property color color: Colors.j
property int fontSize: 9 property int fontSize: 10
property int width: 220 property int width: 220
} }
} }
......
...@@ -11,6 +11,7 @@ QtObject { ...@@ -11,6 +11,7 @@ QtObject {
property QtObject menu: QtObject { property QtObject menu: QtObject {
property QtObject text: QtObject { property QtObject text: QtObject {
property int fontSize: 10
property int horizontalMargins: 9 property int horizontalMargins: 9
property int verticalMargins: 4 property int verticalMargins: 4
...@@ -39,6 +40,8 @@ QtObject { ...@@ -39,6 +40,8 @@ QtObject {
} }
property QtObject text: QtObject { property QtObject text: QtObject {
property int fontSize: 10
property QtObject color: QtObject { property QtObject color: QtObject {
property color selected: Colors.k property color selected: Colors.k
property color normal: Colors.b property color normal: Colors.b
......
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