1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 03:53:23 +02:00

qt6: fix misplacements and some warnings

Change-Id: I4ff37c5dd109ed51de3946d9a6337273e1812c64
This commit is contained in:
Sébastien Blin 2023-05-05 11:33:25 -04:00
parent 9207dfcd5b
commit 2ce880670d
3 changed files with 91 additions and 89 deletions

View file

@ -74,6 +74,8 @@ Rectangle {
id: messagingHeaderRectRowLayout id: messagingHeaderRectRowLayout
anchors.fill: parent anchors.fill: parent
anchors.rightMargin: 8
spacing: 16
PushButton { PushButton {
id: backToWelcomeViewButton id: backToWelcomeViewButton
@ -146,19 +148,13 @@ Rectangle {
} }
} }
RowLayout {
id: headerButtons
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: 8
spacing: 16
Layout.fillWidth: true
Searchbar { Searchbar {
id: rowSearchBar id: rowSearchBar
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
spacing: headerButtons.spacing Layout.preferredHeight: 30
Layout.preferredWidth: 30 + (isOpen? JamiTheme.searchbarSize : 0)
visible: root.swarmDetailsVisibility visible: root.swarmDetailsVisibility
Shortcut { Shortcut {
@ -256,7 +252,6 @@ Rectangle {
onClicked: showDetailsClicked() onClicked: showDetailsClicked()
} }
} }
}
CustomBorder { CustomBorder {
commonBorder: false commonBorder: false

View file

@ -28,11 +28,15 @@ RowLayout {
property string currentConversationId: CurrentConversation.id property string currentConversationId: CurrentConversation.id
property bool isOpen: extrasPanel.isOpen(ChatView.MessagesResearchPanel) property bool isOpen: extrasPanel.isOpen(ChatView.MessagesResearchPanel)
onIsOpenChanged: if (isOpen) onIsOpenChanged: {
if (isOpen)
textArea.forceActiveFocus() textArea.forceActiveFocus()
}
PushButton { PushButton {
id: startSearchMessages id: startSearchMessages
Layout.preferredHeight: 30
Layout.preferredWidth: 30
source: JamiResources.search_svg source: JamiResources.search_svg
normalColor: JamiTheme.chatviewBgColor normalColor: JamiTheme.chatviewBgColor
@ -60,7 +64,7 @@ RowLayout {
} }
} }
Layout.preferredWidth: isOpen ? JamiTheme.searchbarSize : 0 width: isOpen ? JamiTheme.searchbarSize : 0
Behavior on Layout.preferredWidth { Behavior on Layout.preferredWidth {
NumberAnimation { NumberAnimation {
duration: 150 duration: 150

View file

@ -34,6 +34,7 @@ Rectangle {
property bool showTab: false property bool showTab: false
property bool showAlreadyHave: false property bool showAlreadyHave: false
property bool showAdvanced: false property bool showAdvanced: false
property int buttonSize: JamiTheme.wizardButtonWidth
signal showThisPage signal showThisPage
@ -58,6 +59,8 @@ Rectangle {
KeyNavigation.up: newAccountButton KeyNavigation.up: newAccountButton
KeyNavigation.down: KeyNavigation.tab KeyNavigation.down: KeyNavigation.tab
onWidthChanged: root.buttonSize = Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
ColumnLayout { ColumnLayout {
id: welcomePageColumnLayout id: welcomePageColumnLayout
@ -65,7 +68,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: Math.max(508, root.width - 100) width: 800
Item { Item {
@ -163,7 +166,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.wizardViewBlocMarginSize Layout.topMargin: JamiTheme.wizardViewBlocMarginSize
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
text: JamiStrings.joinJami text: JamiStrings.joinJami
toolTipText: JamiStrings.createNewJamiAccount toolTipText: JamiStrings.createNewJamiAccount
@ -181,7 +184,7 @@ Rectangle {
objectName: "alreadyHaveAccount" objectName: "alreadyHaveAccount"
primary: true primary: true
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
@ -219,7 +222,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
visible: false visible: false
@ -244,7 +247,7 @@ Rectangle {
visible: false visible: false
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
text: JamiStrings.importAccountFromBackup text: JamiStrings.importAccountFromBackup
toolTipText: JamiStrings.connectFromBackup toolTipText: JamiStrings.connectFromBackup
@ -266,7 +269,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.bottomMargin: newSIPAccountButton.visible ? 0 : JamiTheme.wizardViewPageBackButtonMargins Layout.bottomMargin: newSIPAccountButton.visible ? 0 : JamiTheme.wizardViewPageBackButtonMargins
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
text: JamiStrings.advancedFeatures text: JamiStrings.advancedFeatures
toolTipText: showAdvanced ? JamiStrings.hideAdvancedFeatures : JamiStrings.showAdvancedFeatures toolTipText: showAdvanced ? JamiStrings.hideAdvancedFeatures : JamiStrings.showAdvancedFeatures
@ -296,7 +299,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
visible: false visible: false
text: JamiStrings.createNewRV text: JamiStrings.createNewRV
@ -319,7 +322,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
visible: false visible: false
text: JamiStrings.connectJAMSServer text: JamiStrings.connectJAMSServer
@ -344,7 +347,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.bottomMargin: JamiTheme.wizardViewPageBackButtonMargins Layout.bottomMargin: JamiTheme.wizardViewPageBackButtonMargins
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2) preferredWidth: root.buttonSize
visible: false visible: false
text: JamiStrings.addSIPAccount text: JamiStrings.addSIPAccount