Skip to content
Snippets Groups Projects
Commit 2ce88067 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

qt6: fix misplacements and some warnings 

Change-Id: I4ff37c5dd109ed51de3946d9a6337273e1812c64
parent 9207dfcd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/mainview/components/ChatViewHeader.qml
+ 68
− 73
View file @ 2ce88067
......@@ -74,6 +74,8 @@ Rectangle {
id: messagingHeaderRectRowLayout
anchors.fill: parent
anchors.rightMargin: 8
spacing: 16
PushButton {
id: backToWelcomeViewButton
......@@ -146,115 +148,108 @@ Rectangle {
}
}
RowLayout {
id: headerButtons
Searchbar {
id: rowSearchBar
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.rightMargin: 8
spacing: 16
Layout.fillWidth: true
Searchbar {
id: rowSearchBar
Layout.preferredHeight: 30
Layout.preferredWidth: 30 + (isOpen? JamiTheme.searchbarSize : 0)
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
spacing: headerButtons.spacing
visible: root.swarmDetailsVisibility
visible: root.swarmDetailsVisibility
Shortcut {
sequence: "Ctrl+Shift+F"
context: Qt.ApplicationShortcut
enabled: rowSearchBar.visible
onActivated: {
rowSearchBar.openSearchBar();
}
Shortcut {
sequence: "Ctrl+Shift+F"
context: Qt.ApplicationShortcut
enabled: rowSearchBar.visible
onActivated: {
rowSearchBar.openSearchBar();
}
}
}
PushButton {
id: startAAudioCallButton
PushButton {
id: startAAudioCallButton
visible: interactionButtonsVisibility && (!addMemberVisibility || UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm))
visible: interactionButtonsVisibility && (!addMemberVisibility || UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm))
source: JamiResources.place_audiocall_24dp_svg
toolTipText: JamiStrings.placeAudioCall
source: JamiResources.place_audiocall_24dp_svg
toolTipText: JamiStrings.placeAudioCall
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: CallAdapter.placeAudioOnlyCall()
}
onClicked: CallAdapter.placeAudioOnlyCall()
}
PushButton {
id: startAVideoCallButton
PushButton {
id: startAVideoCallButton
visible: CurrentAccount.videoEnabled_Video && interactionButtonsVisibility && (!addMemberVisibility || UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm))
source: JamiResources.videocam_24dp_svg
toolTipText: JamiStrings.placeVideoCall
visible: CurrentAccount.videoEnabled_Video && interactionButtonsVisibility && (!addMemberVisibility || UtilsAdapter.getAppValue(Settings.EnableExperimentalSwarm))
source: JamiResources.videocam_24dp_svg
toolTipText: JamiStrings.placeVideoCall
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: {
CallAdapter.placeCall();
}
onClicked: {
CallAdapter.placeCall();
}
}
PushButton {
id: addParticipantsButton
PushButton {
id: addParticipantsButton
source: JamiResources.add_people_24dp_svg
toolTipText: JamiStrings.addParticipants
source: JamiResources.add_people_24dp_svg
toolTipText: JamiStrings.addParticipants
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
visible: interactionButtonsVisibility && addMemberVisibility
visible: interactionButtonsVisibility && addMemberVisibility
onClicked: addToConversationClicked()
}
onClicked: addToConversationClicked()
}
PushButton {
id: selectPluginButton
PushButton {
id: selectPluginButton
visible: PluginAdapter.isEnabled && PluginAdapter.chatHandlersListCount && interactionButtonsVisibility
visible: PluginAdapter.isEnabled && PluginAdapter.chatHandlersListCount && interactionButtonsVisibility
source: JamiResources.plugins_24dp_svg
toolTipText: JamiStrings.showPlugins
source: JamiResources.plugins_24dp_svg
toolTipText: JamiStrings.showPlugins
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: pluginSelector()
}
onClicked: pluginSelector()
}
PushButton {
id: sendContactRequestButton
PushButton {
id: sendContactRequestButton
visible: CurrentConversation.isTemporary || CurrentConversation.isBanned
visible: CurrentConversation.isTemporary || CurrentConversation.isBanned
source: JamiResources.add_people_24dp_svg
toolTipText: JamiStrings.addToConversations
source: JamiResources.add_people_24dp_svg
toolTipText: JamiStrings.addToConversations
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: CurrentConversation.isBanned ? MessagesAdapter.unbanConversation(CurrentConversation.id) : MessagesAdapter.sendConversationRequest()
}
onClicked: CurrentConversation.isBanned ? MessagesAdapter.unbanConversation(CurrentConversation.id) : MessagesAdapter.sendConversationRequest()
}
PushButton {
id: detailsButton
PushButton {
id: detailsButton
visible: interactionButtonsVisibility && (swarmDetailsVisibility || LRCInstance.currentAccountType === Profile.Type.SIP) // TODO if SIP not a request
visible: interactionButtonsVisibility && (swarmDetailsVisibility || LRCInstance.currentAccountType === Profile.Type.SIP) // TODO if SIP not a request
source: JamiResources.swarm_details_panel_svg
toolTipText: JamiStrings.details
source: JamiResources.swarm_details_panel_svg
toolTipText: JamiStrings.details
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
normalColor: JamiTheme.chatviewBgColor
imageColor: JamiTheme.chatviewButtonColor
onClicked: showDetailsClicked()
}
onClicked: showDetailsClicked()
}
}
......
src/app/mainview/components/Searchbar.qml
+ 7
− 3
View file @ 2ce88067
......@@ -28,11 +28,15 @@ RowLayout {
property string currentConversationId: CurrentConversation.id
property bool isOpen: extrasPanel.isOpen(ChatView.MessagesResearchPanel)
onIsOpenChanged: if (isOpen)
textArea.forceActiveFocus()
onIsOpenChanged: {
if (isOpen)
textArea.forceActiveFocus()
}
PushButton {
id: startSearchMessages
Layout.preferredHeight: 30
Layout.preferredWidth: 30
source: JamiResources.search_svg
normalColor: JamiTheme.chatviewBgColor
......@@ -60,7 +64,7 @@ RowLayout {
}
}
Layout.preferredWidth: isOpen ? JamiTheme.searchbarSize : 0
width: isOpen ? JamiTheme.searchbarSize : 0
Behavior on Layout.preferredWidth {
NumberAnimation {
duration: 150
......
src/app/wizardview/components/WelcomePage.qml
+ 12
− 9
View file @ 2ce88067
......@@ -34,6 +34,7 @@ Rectangle {
property bool showTab: false
property bool showAlreadyHave: false
property bool showAdvanced: false
property int buttonSize: JamiTheme.wizardButtonWidth
signal showThisPage
......@@ -58,6 +59,8 @@ Rectangle {
KeyNavigation.up: newAccountButton
KeyNavigation.down: KeyNavigation.tab
onWidthChanged: root.buttonSize = Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
ColumnLayout {
id: welcomePageColumnLayout
......@@ -65,7 +68,7 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
width: Math.max(508, root.width - 100)
width: 800
Item {
......@@ -163,7 +166,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.wizardViewBlocMarginSize
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
text: JamiStrings.joinJami
toolTipText: JamiStrings.createNewJamiAccount
......@@ -181,7 +184,7 @@ Rectangle {
objectName: "alreadyHaveAccount"
primary: true
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
Layout.alignment: Qt.AlignCenter
......@@ -219,7 +222,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
visible: false
......@@ -244,7 +247,7 @@ Rectangle {
visible: false
Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
text: JamiStrings.importAccountFromBackup
toolTipText: JamiStrings.connectFromBackup
......@@ -266,7 +269,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
Layout.bottomMargin: newSIPAccountButton.visible ? 0 : JamiTheme.wizardViewPageBackButtonMargins
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
text: JamiStrings.advancedFeatures
toolTipText: showAdvanced ? JamiStrings.hideAdvancedFeatures : JamiStrings.showAdvancedFeatures
......@@ -296,7 +299,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
visible: false
text: JamiStrings.createNewRV
......@@ -319,7 +322,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
visible: false
text: JamiStrings.connectJAMSServer
......@@ -344,7 +347,7 @@ Rectangle {
Layout.alignment: Qt.AlignCenter
Layout.bottomMargin: JamiTheme.wizardViewPageBackButtonMargins
preferredWidth: Math.min(JamiTheme.wizardButtonWidth, root.width - JamiTheme.preferredMarginSize * 2)
preferredWidth: root.buttonSize
visible: false
text: JamiStrings.addSIPAccount
......
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