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

ui fixes

Browse source 
meeting creation/ sip login page margins, typography
This commit is contained in:
gaelle.braud 2025-09-17 11:17:31 +02:00 • committed by Gaelle Braud
parent 4541ee3079
commit 77da7183f4
6 changed files with 1357 additions and 1307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

743
Linphone/data/languages/de.ts
View file

File diff suppressed because it is too large Load diff

743
Linphone/data/languages/en.ts
View file

File diff suppressed because it is too large Load diff

743
Linphone/data/languages/fr_FR.ts
View file

File diff suppressed because it is too large Load diff

101
Linphone/view/Page/Form/Login/SIPLoginPage.qml
View file

@ -79,7 +79,7 @@ LoginLayout {
Component {
id: firstItem
Flickable {
width: parent.width
width: Math.round(361 * DefaultStyle.dp)
contentWidth: content.implicitWidth
contentHeight: content.implicitHeight
clip: true
@ -107,28 +107,7 @@ LoginLayout {
}
text: qsTr("Certaines fonctionnalités telles que les conversations de groupe, les vidéo-conférences, etc… nécessitent un compte %1.\n\nCes fonctionnalités seront masquées si vous utilisez un compte SIP tiers.\n\nPour les activer dans un projet commercial, merci de nous contacter.").arg(applicationName)
}
// Text {
// Layout.fillWidth: true
// Layout.preferredWidth: rootStackView.width
// wrapMode: Text.WordWrap
// color: DefaultStyle.main2_900
// font {
// pixelSize: Typography.p1.pixelSize
// weight: Typography.p1.weight
// }
// text:"Ces fonctionnalités sont cachées lorsque vous vous enregistrez avec un compte SIP tiers."
// }
// Text {
// Layout.fillWidth: true
// Layout.preferredWidth: rootStackView.width
// wrapMode: Text.WordWrap
// color: DefaultStyle.main2_900
// font {
// pixelSize: Typography.p1.pixelSize
// weight: Typography.p1.weight
// }
// text: "Pour les activer dans un projet commercial, veuillez nous contacter. "
// }
}
SmallButton {
id: openLinkButton
@ -180,7 +159,7 @@ LoginLayout {
id: secondItem
Flickable {
id: formFlickable
width: parent.width
width: Math.round(770 * DefaultStyle.dp)
contentWidth: content.implicitWidth
contentHeight: content.implicitHeight
clip: true
@ -188,11 +167,13 @@ LoginLayout {
Control.ScrollBar.vertical: scrollbar
ColumnLayout {
RowLayout {
id: content
spacing: Math.round(2 * DefaultStyle.dp)
width: formFlickable.width - scrollbar.width*2
ColumnLayout {
spacing: Math.round(2 * DefaultStyle.dp)
Layout.preferredWidth: Math.round(360 * DefaultStyle.dp)
Layout.fillHeight: true
ColumnLayout {
spacing: Math.round(8 * DefaultStyle.dp)
FormItemLayout {
@ -367,33 +348,71 @@ LoginLayout {
Layout.fillHeight: true
}
}
ColumnLayout {
Layout.preferredWidth: Math.round(360 * DefaultStyle.dp)
Layout.fillHeight: true
spacing: Math.round(8 * DefaultStyle.dp)
FormItemLayout {
id: serverAddress
//: "URL du serveur mandataire"
label: qsTr("login_server_address")
Layout.fillWidth: true
contentItem: TextField {
id: serverAddressEdit
Layout.preferredWidth: Math.round(360 * DefaultStyle.dp)
KeyNavigation.down: connectionIdEdit
}
}
FormItemLayout {
id: connectionId
//: "Identifiant de connexion (si différent)"
label: qsTr("login_server_address")
Layout.fillWidth: true
contentItem: TextField {
id: connectionIdEdit
Layout.preferredWidth: Math.round(360 * DefaultStyle.dp)
KeyNavigation.up: serverAddressEdit
}
}
Item{Layout.fillHeight: true}
}
}
}
}
centerContent: [
Item {
anchors.fill: parent
Control.StackView {
id: rootStackView
initialItem: SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin ? secondItem : firstItem
anchors.top: parent.top
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.leftMargin: Math.round(127 * DefaultStyle.dp)
width: Math.round(361 * DefaultStyle.dp)
}
ScrollBar {
id: scrollbar
z: 1
active: true
interactive: true
parent: rootStackView.currentItem
visible: parent.contentHeight > parent.height
// visible: parent.contentHeight > parent.height
policy: Control.ScrollBar.AsNeeded
anchors.rightMargin: -8 * DefaultStyle.dp
}
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: parent.left
// Layout.leftMargin: Math.round(119 * DefaultStyle.dp)
// anchors.leftMargin: Math.round(119 * DefaultStyle.dp)
// anchors.rightMargin: -8 * DefaultStyle.dp
},
Control.StackView {
id: rootStackView
initialItem: SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin ? secondItem : firstItem
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.leftMargin: Math.round(127 * DefaultStyle.dp)
width: currentItem ? currentItem.width : 0
},
// Item {
// id: sipItem
// // spacing: Math.round(8 * Defaultstyle.dp)
// anchors.fill: parent
// anchors.rightMargin: Math.round(50 * DefaultStyle.dp) + image.width
// },
Image {
id: image
z: -1
anchors.top: parent.top
anchors.right: parent.right

4
Linphone/view/Page/Layout/Chat/MessageInfosLayout.qml
View file

@ -53,8 +53,8 @@ ColumnLayout {
Layout.fillWidth: true
Layout.preferredWidth: implicitWidth
model: mainItem.tabbarModel
pixelSize: Typography.h3m.pixelSize
textWeight: Typography.h3m.weight
pixelSize: Typography.h4.pixelSize
textWeight: Typography.h4.weight
spacing: Math.round(10 * DefaultStyle.dp)
}

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

@ -287,8 +287,8 @@ AbstractMainPage {
spacing: Math.round(33 * DefaultStyle.dp)
anchors.fill: parent
RowLayout {
Layout.rightMargin: Math.round(35 * DefaultStyle.dp)
spacing: Math.round(5 * DefaultStyle.dp)
Layout.rightMargin: Math.round(35 * DefaultStyle.dp)
Button {
id: backButton
style: ButtonStyle.noBackground
@ -345,15 +345,19 @@ AbstractMainPage {
Layout.fillWidth: true
contentHeight: meetingSetup.height
Control.ScrollBar.vertical: ScrollBar {
id: meetingScrollBar
visible: parent.contentHeight > parent.height
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.rightMargin: Math.round(8 * DefaultStyle.dp)
}
contentChildren: MeetingForm {
MeetingForm {
id: meetingSetup
conferenceInfoGui: createConfLayout.conferenceInfoGui
isCreation: true
anchors.left: parent.left
anchors.right: parent.right
anchors.rightMargin: Math.round(35 * DefaultStyle.dp)
Connections {
target: meetingSetup.conferenceInfoGui ? meetingSetup.conferenceInfoGui.core : null