change rectangle to column in global settings GODT-677

Changelog.md

@@ -9,6 +9,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-834 Info about tags in BUILDS.md and link to Import-Export page in README.md.
 
 ### Fixed
+* GODT-677 Windows IE: global import settings not fit in window
 * GODT-749 Don't force PGP/Inline when sending plaintext messages.
 * GODT-764 Fix deadlock in integration tests for Import-Export.
 * GODT-662 Do not resume paused transfer progress after dismissing cancel popup.

internal/frontend/qml/ImportExportUI/DialogImport.qml

@@ -279,9 +279,8 @@ Dialog {
             titleTo        : root.address
         }
 
-        Rectangle {
+        Column {
             id: masterImportSettings
-            height: 150 // fixme
             anchors {
                 right  : parent.right
                 left   : parent.left
@@ -291,7 +290,11 @@ Dialog {
                 rightMargin  : Style.main.leftMargin
                 bottomMargin : Style.main.bottomMargin
             }
-            color: Style.dialog.background
+
+            spacing: Style.main.bottomMargin
+
+            Row {
+                spacing: masterImportSettings.width - labelMasterImportSettings.width - resetSourceButton.width
 
                 Text {
                     id: labelMasterImportSettings
@@ -305,24 +308,21 @@ Dialog {
                     color: Style.main.text
 
                     InfoToolTip {
-                    info: qsTr(
-                        "If master import date range is selected only emails within this range will be imported, unless it is specified differently in folder date range.",
-                        "Text in master import settings tooltip."
-                    )
                         anchors {
                             left: parent.right
                             bottom: parent.bottom
                             leftMargin : Style.dialog.leftMargin
                         }
+                        info: qsTr(
+                            "If master import date range is selected only emails within this range will be imported, unless it is specified differently in folder date range.",
+                            "Text in master import settings tooltip."
+                        )
                     }
                 }
 
                 // Reset all to default
                 ClickIconText {
-                anchors {
+                    id: resetSourceButton
-                    right: parent.right
-                    bottom: labelMasterImportSettings.bottom
-                }
                     text:qsTr("Reset all settings to default")
                     iconText: Style.fa.refresh
                     textColor: Style.main.textBlue
@@ -332,6 +332,7 @@ Dialog {
                         timer.start()
                     }
                 }
+            }
 
             Rectangle{
                 id: line
@@ -348,30 +349,22 @@ Dialog {
 
             InlineDateRange {
                 id: globalDateRange
-                anchors {
-                    left      : parent.left
-                    top       : line.bottom
-                    topMargin : Style.dialog.topMargin
-                }
             }
 
             // Add global label (inline)
             InlineLabelSelect {
                 id: globalLabels
-                anchors {
-                    left      : parent.left
-                    top       : globalDateRange.bottom
-                    topMargin : Style.dialog.topMargin
             }
-                //labelWidth : globalDateRange.labelWidth
         }
 
         // Buttons
         Row {
             spacing: Style.dialog.spacing
             anchors {
-                    bottom       : parent.bottom
                 right: parent.right
+                bottom: parent.bottom
+                rightMargin: Style.main.leftMargin
+                bottomMargin: Style.main.bottomMargin
             }
 
             ButtonRounded {
@@ -393,7 +386,6 @@ Dialog {
             }
         }
     }
-    }
 
     Rectangle { // Progress
         id: progressStatus