[QgsQuick] External widget changes

Simplified callbacks for onSaved/onCanceled form Some design fixes.
qgis · Apr 24, 2019 · 1b428a5 · 1b428a5
1 parent 0375ce4
commit 1b428a5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/src/quickgui/plugin/editor/qgsquickexternalresource.qml b/src/quickgui/plugin/editor/qgsquickexternalresource.qml
@@ -39,13 +39,11 @@ Item {
   // Ment to be use with the save callback - stores image source
   property string sourceToDelete
 
-  Component.onCompleted: {
+  function callbackOnSave() {
-    callbackOnSave = function() {
+    externalResourceHandler.onFormSave(fieldItem)
-      externalResourceHandler.onFormSave(fieldItem)
+  }
-    }
+  function callbackOnCancel() {
-    callbackOnCancel = function() {
+    externalResourceHandler.onFormCanceled(fieldItem)
-      externalResourceHandler.onFormCanceled(fieldItem)
-    }
   }
 
   id: fieldItem
@@ -129,13 +127,14 @@ Item {
 
   Button {
     id: deleteButton
-    visible: !readOnly && fieldItem.state === "valid"
+    visible: !readOnly && fieldItem.state !== "notSet"
-    width: fieldItem.iconSize
+    width: buttonsContainer.itemHeight
     height: width
     padding: 0
 
     anchors.right: imageContainer.right
     anchors.bottom: imageContainer.bottom
+    anchors.margins: buttonsContainer.itemHeight/4
 
     onClicked: externalResourceHandler.removeImage(fieldItem, homePath + "/" + image.currentValue)
 
@@ -163,7 +162,7 @@ Item {
     anchors.centerIn: imageContainer
     anchors.fill: imageContainer
     anchors.margins: fieldItem.textMargin
-    visible: fieldItem.state !== "valid"
+    visible: fieldItem.state === "notSet"
 
     anchors.horizontalCenter: parent.horizontalCenter
     anchors.verticalCenter: parent.verticalCenter
@@ -216,18 +215,20 @@ Item {
     }
   }
 
-  QgsQuick.IconTextItem {
+  Text {
-    id: infoItem
+    id: text
-    iconSize: fieldItem.iconSize/2
+    height: parent.height
-    fontColor: customStyle.fields.fontColor
+    width: imageContainer.width - 2* fieldItem.textMargin
-    iconSource: fieldItem.brokenImageIcon
+    wrapMode: Text.WordWrap
-    labelText: qsTr("Image is not available: ") + image.currentValue
+    minimumPixelSize: 50 * QgsQuick.Utils.dp
-
+    text: qsTr("Image is not available: ") + image.currentValue
+    font.pixelSize: buttonsContainer.itemHeight * 0.75
+    color: customStyle.fields.fontColor
+    anchors.leftMargin: buttonsContainer.itemHeight + fieldItem.textMargin
+    horizontalAlignment: Text.AlignHCenter
+    verticalAlignment: Text.AlignVCenter
+    elide: Text.ElideRight
     visible: fieldItem.state === "notAvailable"
-    height: fieldItem.iconSize/2
-    anchors.bottom: parent.bottom
-    anchors.bottomMargin: fieldItem.textMargin
-    anchors.horizontalCenter: parent.horizontalCenter
   }
 
 }
diff --git a/src/quickgui/plugin/qgsquickfeatureform.qml b/src/quickgui/plugin/qgsquickfeatureform.qml
@@ -376,8 +376,6 @@ Item {
           property var customStyle: form.style
           property var externalResourceHandler: form.externalResourceHandler
           property bool readOnly: form.state == "ReadOnly" || !AttributeEditable
-          property var callbackOnSave: undefined
-          property var callbackOnCancel: undefined
 
           active: widget !== 'Hidden'
 
@@ -395,8 +393,8 @@ Item {
           target: form
           ignoreUnknownSignals: true
           onSaved: {
-            if (attributeEditorLoader.widget === "ExternalResource") {
+            if (typeof attributeEditorLoader.item.callbackOnSave === "function") {
-              attributeEditorLoader.callbackOnSave()
+              attributeEditorLoader.item.callbackOnSave()
             }
           }
         }
@@ -405,8 +403,8 @@ Item {
           target: form
           ignoreUnknownSignals: true
           onCanceled: {
-            if (attributeEditorLoader.widget === "ExternalResource") {
+            if (typeof attributeEditorLoader.item.callbackOnCancel === "function") {
-              attributeEditorLoader.callbackOnCancel()
+              attributeEditorLoader.item.callbackOnCancel()
             }
           }
         }