Skip to content
Snippets Groups Projects
Commit be1ee4e4 authored by Andreas Traczyk's avatar Andreas Traczyk Committed by Adrien Béraud
Browse files

updater: fix overlapping download progress

+ also fixes the missing confirm-update string

Change-Id: Ib8d0dce0b09e7415795d96d5c45b2f8a0f19bd30
parent 58031af3
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,7 @@ BaseModalDialog { ...@@ -57,6 +57,7 @@ BaseModalDialog {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: JamiTheme.preferredDialogWidth - JamiTheme.preferredMarginSize Layout.preferredWidth: JamiTheme.preferredDialogWidth - JamiTheme.preferredMarginSize
Layout.preferredHeight: implicitHeight
text: infoText text: infoText
font.pointSize: JamiTheme.menuFontSize - 2 font.pointSize: JamiTheme.menuFontSize - 2
...@@ -71,7 +72,7 @@ BaseModalDialog { ...@@ -71,7 +72,7 @@ BaseModalDialog {
Layout.topMargin: JamiTheme.preferredMarginSize / 2 Layout.topMargin: JamiTheme.preferredMarginSize / 2
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.preferredHeight: childrenRect.height
data: innerContentData data: innerContentData
} }
...@@ -80,6 +81,7 @@ BaseModalDialog { ...@@ -80,6 +81,7 @@ BaseModalDialog {
spacing: JamiTheme.preferredMarginSize spacing: JamiTheme.preferredMarginSize
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: contentHeight
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
Layout.bottomMargin: JamiTheme.preferredMarginSize Layout.bottomMargin: JamiTheme.preferredMarginSize
......
...@@ -169,7 +169,7 @@ ColumnLayout { ...@@ -169,7 +169,7 @@ ColumnLayout {
if (!found) { if (!found) {
presentInfoDialog(JamiStrings.updateNotFound) presentInfoDialog(JamiStrings.updateNotFound)
} else { } else {
presentConfirmInstallDialog(JamiStrings.confirmUpdate, false) presentConfirmInstallDialog(JamiStrings.updateFound, false)
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment