Merge branch 'bugs-3222' into 'develop'

Bugs-3222

See merge request !37

widgets/DapComboBox.qml

@@ -3,6 +3,18 @@ import QtQuick.Controls 2.0
 
 DapComboBoxForm
 {
+    Component.onCompleted:
+    {
+        if(isDefaultNeedToAppend && model.get(0, comboBoxTextRole[0]) !== mainLineText)
+        {
+            if(comboBoxTextRole[0] === "name")
+                model.insert(0, {name: mainLineText});
+            else if(comboBoxTextRole[0] === "text")
+                model.insert(0, {text: mainLineText});
+            currentIndex = 0;
+        }
+    }
+
     delegate:
         ItemDelegate
         {

widgets/DapComboBoxForm.ui.qml

@@ -84,6 +84,8 @@ ComboBox
     property var mainRow: [""]
     //@detalis mainLineText Text without unneccesary part.
     property string mainLineText
+    ///@details isDefaultNeedToAppend Sign to add default data to the beginning of model
+    property bool isDefaultNeedToAppend: false
 
 
     width: popup.visible ? widthPopupComboBoxActive : widthPopupComboBoxNormal
@@ -134,8 +136,9 @@ ComboBox
                     Text
                     {
                         anchors.verticalCenter: parent.verticalCenter
+
                         text: (popup.visible) ?
-                                  (index < mainRow.length ? mainRow[index] : ""):
+                                  (dapComboBox.currentIndex === -1 ? mainLineText : (index < mainRow.length ? mainRow[index] : "") ) :
                                   mainLineText
                         font: popup.visible ?
                             ((fontComboBox.length > index) ?