ashley/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2024-10-28 08:49:35 +01:00
Code Activity

createAccount: resolve display issue

Browse source 
GitLab: #1448

Change-Id: I3e0edddfa70c0a59ab01d5c1359d93b27bea0824
This commit is contained in:
cberthet 2023-12-07 09:52:43 -05:00 committed by Sébastien Blin
parent 9d7eae0af8
commit f2424f4968
5 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/app/commoncomponents/InfoBox.qml
View file

@ -21,7 +21,7 @@ import QtQuick.Controls
import net.jami.Models 1.1
import net.jami.Constants 1.1
Rectangle {
Control {
id: root
property string icoSource: ""
@ -32,9 +32,7 @@ Rectangle {
width: 190
height: infos.implicitHeight
color: JamiTheme.transparentColor
ColumnLayout {
contentItem: ColumnLayout {
id: infos
anchors.fill: parent
@ -79,6 +77,7 @@ Rectangle {
color: JamiTheme.textColor
wrapMode: Text.WordWrap
text: description
lineHeight: 1.3
}
}
}

8
src/app/wizardview/components/CreateAccountPage.qml
View file

@ -289,9 +289,9 @@ Rectangle {
text: !enabled ? JamiStrings.creatingAccount : root.isRendezVous ? JamiStrings.chooseName : JamiStrings.joinJami
enabled: usernameEdit.nameRegistrationState === UsernameTextEdit.NameRegistrationState.FREE || usernameEdit.nameRegistrationState === UsernameTextEdit.NameRegistrationState.BLANK
KeyNavigation.tab: customizeButton
KeyNavigation.tab: encryptButton
KeyNavigation.up: usernameEdit
KeyNavigation.down: customizeButton
KeyNavigation.down: encryptButton
onClicked: {
WizardViewStepModel.accountCreationInfo = JamiQmlUtils.setUpAccountCreationInputPara({
@ -340,6 +340,7 @@ Rectangle {
KeyNavigation.tab: customizeButton
KeyNavigation.up: chooseUsernameButton
KeyNavigation.down: backButton
KeyNavigation.right: customizeButton
onClicked: {
var dlg = viewCoordinator.presentDialog(appWindow, "wizardview/components/EncryptAccountPopup.qml");
@ -347,6 +348,8 @@ Rectangle {
advancedButtons.chosenPassword = password;
});
}
}
MaterialButton {
@ -369,6 +372,7 @@ Rectangle {
KeyNavigation.tab: backButton
KeyNavigation.up: chooseUsernameButton
KeyNavigation.left: encryptButton
KeyNavigation.down: backButton
onClicked: {

21
src/app/wizardview/components/EncryptAccountPopup.qml
View file

@ -18,6 +18,7 @@
import QtQuick
import net.jami.Adapters 1.1
import net.jami.Constants 1.1
import QtQuick.Controls
import QtQuick.Layouts
import "../../commoncomponents"
@ -92,18 +93,19 @@ BaseModalDialog {
}
}
Rectangle {
radius: 5
color: JamiTheme.infoRectangleColor
Layout.fillWidth: true
Layout.minimumHeight: infoLayout.height + 35
Control {
Layout.preferredWidth: 400 - 2 * popupMargins
Layout.topMargin: 20
padding: 14
RowLayout {
background: Rectangle {
radius: 5
color: JamiTheme.infoRectangleColor
}
contentItem: RowLayout {
id: infoLayout
anchors.centerIn: parent
width: parent.width - 35
anchors.margins: 14
spacing: 10
ResponsiveImage{
@ -121,7 +123,8 @@ BaseModalDialog {
color: JamiTheme.textColor
wrapMode: Text.WordWrap
text: JamiStrings.encryptWarning
font.pixelSize: JamiTheme.headerFontSize
font.pixelSize: JamiTheme.menuFontSize
lineHeight: 1.3
}
}
}

3
src/app/wizardview/components/GoodToKnowPopup.qml
View file

@ -30,7 +30,8 @@ BaseModalDialog {
onClosed: accepted()
popupContent: Column {
spacing: 20
spacing: 5
width: 400 - 2 * root.popupMargins
InfoBox {
id: info

6
src/app/wizardview/components/WelcomePage.qml
View file

@ -382,11 +382,15 @@ Rectangle {
}
}
BackButton {
JamiPushButton {
id: backButton
objectName: "welcomePageBackButton"
preferredSize: 36
imageContainerWidth: 20
source: JamiResources.ic_arrow_back_24dp_svg
anchors.left: parent.left
anchors.top: parent.top
anchors.margins: JamiTheme.wizardViewPageBackButtonMargins