Merge branch 'qml'

[mdictionary] / src / mdictionary / qml / XdxfDialog.qml

diff --git a/src/mdictionary/qml/XdxfDialog.qml b/src/mdictionary/qml/XdxfDialog.qml
index e16180b..1b2a960 100644 (file)
--- a/src/mdictionary/qml/XdxfDialog.qml
+++ b/src/mdictionary/qml/XdxfDialog.qml
@@ -96,7 +96,7 @@ Rectangle{
     Text {
         id: textInfo
         width: rectangle1.width
-        height: paintedHeight+5;
+        height: (paintedHeight+5)>150?150:paintedHeight+5;
         text: ": "
         wrapMode: Text.Wrap;
         anchors.top: textDescription.bottom
@@ -105,13 +105,26 @@ Rectangle{
         font.pixelSize: 12
     }
 
+
+    Rectangle {
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: saveButton.bottom
+        anchors.top: optimalizeCheckbox.top
+
+        id: rectangle2
+        color: myPalette.window
+        anchors.topMargin: -2
+    }
+
     Checkbox {
         id: optimalizeCheckbox
         width: 20
         height: 20
+        anchors.bottom: stripCheckbox.top
+        anchors.bottomMargin: 5
         anchors.left: parent.left
         anchors.leftMargin: 5
-        anchors.top: textInfo.bottom
         onChanged: rectangle1.optimalizeCheckboxChanged(selected);
     }
 
@@ -119,8 +132,8 @@ Rectangle{
         id: stripCheckbox
         width: 20
         height: 20
-        anchors.top: optimalizeCheckbox.bottom
-        anchors.topMargin: 5
+        anchors.bottom: saveButton.top
+        anchors.bottomMargin: 15
         anchors.horizontalCenter: optimalizeCheckbox.horizontalCenter
         onChanged: rectangle1.stripCheckboxChanged(selected);
     }
@@ -151,9 +164,8 @@ Rectangle{
     Button {
         id: saveButton
         height: 30
+        anchors.bottom: parent.bottom
         textInButton: qsTr("Save")
-        anchors.top: stripCheckbox.bottom
-        anchors.topMargin: 10
         anchors.right: parent.right
         anchors.left: parent.left
         onClicked: rectangle1.saveButtonClicked();
@@ -200,6 +212,7 @@ Rectangle{
         onClicked: rectangle1.downloadButtonClicked();
     }
 
+
     states: [
         State {
             name: "Stan1"