mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 03:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct typo weight #LINQT-2078

Browse source
This commit is contained in:
Alexandre Jörgensen 2025-10-21 15:22:40 +02:00 • committed by Alexandre Jorgensen
parent a7c8e8db90
commit f2e49f21b0
9 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/view/Control/Button/CalendarComboBox.qml
View file

@ -21,7 +21,7 @@ ComboBox {
verticalAlignment: Text.AlignVCenter
font {
pixelSize: Utils.getSizeWithScreenRatio(14)
weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
weight: Font.Bold
}
}
popup: Control.Popup {

2
Linphone/view/Control/Button/ComboBox.qml
View file

@ -223,7 +223,7 @@ Control.ComboBox {
font {
family: DefaultStyle.defaultFont
pixelSize: Utils.getSizeWithScreenRatio(15)
weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
weight: Font.Normal
}
}
}

2
Linphone/view/Control/Tool/Helper/utils.js
View file

@ -876,4 +876,4 @@ function getSizeWithScreenRatio(size){
: size > 0
? Math.max(Math.round(size * Linphone.DefaultStyle.dp), 1)
: Math.min(Math.round(size * Linphone.DefaultStyle.dp), -1);
}
}

6
Linphone/view/Page/Form/Meeting/MeetingForm.qml
View file

@ -108,7 +108,7 @@ FocusScope {
id: startDate
background.visible: mainItem.isCreation
indicator.visible: mainItem.isCreation
contentText.font.weight: Math.min(Utils.getSizeWithScreenRatio(isCreation ? 700 : 400), 1000)
contentText.font.weight: isCreation ? Font.Bold : Font.Normal
Layout.fillWidth: true
Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
KeyNavigation.up: confTitle
@ -134,7 +134,7 @@ FocusScope {
Layout.preferredWidth: Utils.getSizeWithScreenRatio(94)
Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
background.visible: mainItem.isCreation
contentText.font.weight: Math.min(Utils.getSizeWithScreenRatio(isCreation ? 700 : 400), 1000)
contentText.font.weight: isCreation ? Font.Bold : Font.Normal
KeyNavigation.up: startDate
KeyNavigation.down: timeZoneCbox
KeyNavigation.left: endHour
@ -154,7 +154,7 @@ FocusScope {
Layout.preferredWidth: Utils.getSizeWithScreenRatio(94)
Layout.preferredHeight: Utils.getSizeWithScreenRatio(30)
background.visible: mainItem.isCreation
contentText.font.weight: Math.min(Utils.getSizeWithScreenRatio(isCreation ? 700 : 400), 1000)
contentText.font.weight: isCreation ? Font.Bold : Font.Normal
onSelectedDateTimeChanged: mainItem.conferenceInfoGui.core.endDateTime = selectedDateTime
KeyNavigation.up: startDate
KeyNavigation.down: timeZoneCbox

12
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -138,9 +138,13 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
spacing: 0
RowLayout {
FlexboxLayout {
id: titleCallLayout
spacing: Utils.getSizeWithScreenRatio(16)
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
Layout.fillHeight: false
Text {
Layout.fillWidth: true
//: "Appels"
@ -149,9 +153,6 @@ AbstractMainPage {
font.pixelSize: Typography.h2.pixelSize
font.weight: Typography.h2.weight
}
Item {
Layout.fillWidth: true
}
PopupButton {
id: removeHistory
icon.width: Utils.getSizeWithScreenRatio(24)
@ -190,7 +191,6 @@ AbstractMainPage {
icon.source: AppIcons.newCall
Layout.preferredWidth: Utils.getSizeWithScreenRatio(34)
Layout.preferredHeight: Utils.getSizeWithScreenRatio(34)
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
icon.width: Utils.getSizeWithScreenRatio(28)
icon.height: Utils.getSizeWithScreenRatio(28)
KeyNavigation.left: removeHistory

12
Linphone/view/Page/Main/Chat/ChatPage.qml
View file

@ -96,8 +96,12 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
spacing: 0
RowLayout {
spacing: Utils.getSizeWithScreenRatio(16)
FlexboxLayout {
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
Layout.fillHeight: false
Text {
Layout.fillWidth: true
//: "Conversations"
@ -106,9 +110,6 @@ AbstractMainPage {
font.pixelSize: Typography.h2.pixelSize
font.weight: Typography.h2.weight
}
Item {
Layout.fillWidth: true
}
PopupButton {
id: chatListMenu
width: Utils.getSizeWithScreenRatio(24)
@ -137,7 +138,6 @@ AbstractMainPage {
icon.source: AppIcons.plusCircle
Layout.preferredWidth: Utils.getSizeWithScreenRatio(28)
Layout.preferredHeight: Utils.getSizeWithScreenRatio(28)
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
icon.width: Utils.getSizeWithScreenRatio(28)
icon.height: Utils.getSizeWithScreenRatio(28)
KeyNavigation.down: searchBar

12
Linphone/view/Page/Main/Contact/ContactPage.qml
View file

@ -213,25 +213,25 @@ FriendGui{
Layout.fillHeight: true
Layout.fillWidth: true
RowLayout {
FlexboxLayout {
id: title
spacing: 0
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
anchors.top: leftPanel.top
anchors.right: leftPanel.right
anchors.left: leftPanel.left
anchors.leftMargin: leftPanel.leftMargin
anchors.rightMargin: leftPanel.rightMargin
Layout.fillHeight: false
Text {
Layout.fillWidth: true
//: "Contacts"
text: qsTr("bottom_navigation_contacts_label")
color: DefaultStyle.main2_700
font.pixelSize: Typography.h2.pixelSize
font.weight: Typography.h2.weight
}
Item {
Layout.fillWidth: true
}
Button {
id: createContactButton
visible: !rightPanelStackView.currentItem

11
Linphone/view/Page/Main/Meeting/MeetingPage.qml
View file

@ -177,11 +177,13 @@ AbstractMainPage {
ColumnLayout {
anchors.fill: parent
spacing: 0
RowLayout {
Layout.rightMargin: Utils.getSizeWithScreenRatio(38)
FlexboxLayout {
direction: FlexboxLayout.Row
gap: Utils.getSizeWithScreenRatio(16)
alignItems: FlexboxLayout.AlignCenter
Layout.rightMargin: Utils.getSizeWithScreenRatio(39)
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
spacing: 0
Layout.fillHeight: false
Text {
Layout.fillWidth: true
//: Réunions
@ -190,7 +192,6 @@ AbstractMainPage {
font.pixelSize: Typography.h2.pixelSize
font.weight: Typography.h2.weight
}
Item{Layout.fillWidth: true}
Button {
id: newConfButton
style: ButtonStyle.noBackground

38
Linphone/view/Style/Typography.qml
View file

@ -8,132 +8,132 @@ QtObject {
property font h4: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(16),
weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
weight: Font.ExtraBold
})
// Title/H3M - Bloc title
property font h3m: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(16),
weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
weight: Font.Bold
})
// Title/H3 - Bloc title
property font h3: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(22),
weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
weight: Font.ExtraBold
})
// Title/H2M - Large bloc title
property font h2m: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(20),
weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
weight: Font.ExtraBold
})
// Title/H2 - Large bloc title
property font h2: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(29),
weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
weight: Font.ExtraBold
})
// Title/H1 - Large bloc title
property font h1: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(36),
weight: Math.min(Utils.getSizeWithScreenRatio(800), 1000)
weight: Font.ExtraBold
})
// Text/P4 - Xsmall paragraph text
property font p4: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(10),
weight: Math.min(Utils.getSizeWithScreenRatio(300), 1000)
weight: Font.Light
})
// Text/P3 - Reduced paragraph text
property font p3: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(12),
weight: Math.min(Utils.getSizeWithScreenRatio(300), 1000)
weight: Font.Light
})
// Text/P2 - Bold, reduced paragraph text
property font p2: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(13),
weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
weight: Font.Bold
})
// Text/P2l - Large Bold, reduced paragraph text
property font p2l: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(14),
weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
weight: Font.Bold
})
// Text/P1 - Paragraph text
property font p1: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(14),
weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
weight: Font.Normal
})
// Text/P1s - Paragraph text
property font p1s: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(13),
weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
weight: Font.Normal
})
// Text/P1 - Paragraph text
property font p1b: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(15),
weight: Math.min(Utils.getSizeWithScreenRatio(400), 1000)
weight: Font.Normal
})
// Button/B1 - Big Button
property font b1: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(18),
weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
weight: Font.DemiBold
})
// Button/B2 - Medium Button
property font b2: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(15),
weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
weight: Font.DemiBold
})
// Button/B3 - Small Button
property font b3: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(13),
weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
weight: Font.DemiBold
})
// FileView/F1 - File View name text
property font f1: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(11),
weight: Math.min(Utils.getSizeWithScreenRatio(700), 1000)
weight: Font.Bold
})
// FileView/F1light - File View size text
property font f1l: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(10),
weight: Math.min(Utils.getSizeWithScreenRatio(500), 1000)
weight: Font.Medium
})
// FileView/F1light - Duration text
property font d1: Qt.font( {
family: DefaultStyle.defaultFont,
pixelSize: Utils.getSizeWithScreenRatio(8),
weight: Math.min(Utils.getSizeWithScreenRatio(600), 1000)
weight: Font.DemiBold
})
}