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

misc: fix some overlap issues

+ Fix the password entry for linking a new device with password
+ Fix the linked devices page with a lot of devices
+ Fix the add default moderators popup

Change-Id: I1bac4bd8f55dd91825278399fe39f3503e153edb
GitLab: #886
parent 7931d66b
Branches
Tags
No related merge requests found
......@@ -67,7 +67,7 @@ Popup {
Layout.preferredHeight: text.length === 0 ? 0 : contentHeight
font.pointSize: 12
font.pointSize: JamiTheme.menuFontSize
color: JamiTheme.textColor
}
......
......@@ -23,59 +23,17 @@ import net.jami.Models 1.1
import net.jami.Constants 1.1
import "../../commoncomponents"
Popup {
BaseModalDialog {
id: contactPickerPopup
property int type: ContactList.CONFERENCE
contentWidth: 250
contentHeight: contactPickerPopupRectColumnLayout.height + 50
width: Math.min(appWindow.width - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogWidth)
height: Math.min(appWindow.height - 2 * JamiTheme.preferredMarginSize, JamiTheme.preferredDialogHeight)
padding: 0
modal: true
contentItem: Rectangle {
id: contactPickerPopupRect
width: 250
PushButton {
id: closeButton
anchors.top: contactPickerPopupRect.top
anchors.topMargin: 5
anchors.right: contactPickerPopupRect.right
anchors.rightMargin: 5
imageColor: JamiTheme.textColor
source: JamiResources.round_close_24dp_svg
onClicked: {
contactPickerPopup.close();
}
}
ColumnLayout {
id: contactPickerPopupRectColumnLayout
anchors.top: contactPickerPopupRect.top
anchors.topMargin: 15
Text {
id: contactPickerTitle
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: contactPickerPopupRect.width
Layout.preferredHeight: 30
font.pointSize: JamiTheme.textFontSize
font.bold: true
color: JamiTheme.textColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: {
title: {
switch (type) {
case ContactList.CONFERENCE:
return JamiStrings.addToConference;
......@@ -87,7 +45,9 @@ Popup {
return JamiStrings.addDefaultModerator;
}
}
}
popupContent: ColumnLayout {
id: contactPickerPopupRectColumnLayout
Searchbar {
id: contactPickerContactSearchBar
......@@ -108,8 +68,9 @@ Popup {
id: contactPickerListView
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: contactPickerPopupRect.width
Layout.preferredHeight: 200
Layout.fillWidth: true
Layout.preferredHeight: 180
Layout.bottomMargin: JamiTheme.preferredMarginSize
model: ContactAdapter.getContactSelectableModel(type)
......@@ -121,15 +82,7 @@ Popup {
}
}
radius: 10
color: JamiTheme.backgroundColor
}
onAboutToShow: {
contactPickerListView.model = ContactAdapter.getContactSelectableModel(type);
}
background: Rectangle {
color: "transparent"
}
}
......@@ -20,7 +20,7 @@ function presentContactPickerPopup(type, parent) {
var comp = Qt.createComponent(
"../components/ContactPicker.qml")
if (comp.status === Component.Ready) {
var obj = comp.createObject(parent, { type: type })
var obj = comp.createObject(parent, { type: type, parent: parent })
if (obj === null) {
console.log("Error creating object for contact picker")
} else {
......
......@@ -127,16 +127,21 @@ BaseModalDialog {
PasswordTextEdit {
id: passwordEdit
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: JamiTheme.preferredFieldWidth
Layout.preferredHeight: 48
firstEntry: true
placeholderText: JamiStrings.password
Layout.topMargin: 10
Layout.leftMargin: JamiTheme.cornerIconSize
Layout.rightMargin: JamiTheme.cornerIconSize
Layout.alignment: Qt.AlignLeft
Layout.fillWidth: true
placeholderText: JamiStrings.enterCurrentPassword
KeyNavigation.up: btnConfirm
KeyNavigation.down: KeyNavigation.up
onDynamicTextChanged: {
btnConfirm.enabled = dynamicText.length > 0;
}
onAccepted: btnConfirm.clicked()
}
......
......@@ -68,6 +68,7 @@ SettingsPageBase {
Layout.preferredWidth: parent.width
Layout.alignment: Qt.AlignHCenter
title: JamiStrings.linkedThisDevice
clip: true
}
LinkedDevicesBase {
......@@ -78,6 +79,7 @@ SettingsPageBase {
Layout.alignment: Qt.AlignHCenter
inverted: true
isCurrent: false
clip: true
title: JamiStrings.linkedOtherDevices
}
}
......@@ -92,7 +94,6 @@ SettingsPageBase {
text: JamiStrings.linkedAccountDescription
color: JamiTheme.textColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
font.pixelSize: JamiTheme.settingsDescriptionPixelSize
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment