qmldesigner: add language to create scene command

and also save the last used language to settings

Task-number: QDS-2218
Change-Id: Ib82f7bc755755661183452b32829be3d048d9947
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

1 files changed, 17 insertions, 11 deletions

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 678bb1ea94..96dd127f28 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -69,6 +69,7 @@
 #include "variantproperty.h"
 #include "view3dactioncommand.h"
 
+#include <designersettings.h>
 #include <metainfo.h>
 #include <model.h>
 #include <modelnode.h>
@@ -540,7 +541,9 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node,
             }
         }
     } else if (node.isRootNode() && name == "language@Internal") {
-        nodeInstanceServer()->changeLanguage({value.toString()});
+        const QString languageAsString = value.toString();
+        DesignerSettings::setValue(DesignerSettingsKey::LAST_USED_TRANSLATION_LANGUAGE, languageAsString);
+        nodeInstanceServer()->changeLanguage({languageAsString});
     } else if (node.isRootNode() && name == "previewSize@Internal") {
         nodeInstanceServer()->changePreviewImageSize(value.toSize());
     }
@@ -982,16 +985,19 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
     }
 
 
-    return CreateSceneCommand(instanceContainerList,
-                              reparentContainerList,
-                              idContainerList,
-                              valueContainerList,
-                              bindingContainerList,
-                              auxiliaryContainerVector,
-                              importVector,
-                              mockupTypesVector,
-                              model()->fileUrl(),
-                              m_edit3DToolStates[model()->fileUrl()]);
+    return CreateSceneCommand(
+                instanceContainerList,
+                reparentContainerList,
+                idContainerList,
+                valueContainerList,
+                bindingContainerList,
+                auxiliaryContainerVector,
+                importVector,
+                mockupTypesVector,
+                model()->fileUrl(),
+                m_edit3DToolStates[model()->fileUrl()],
+                DesignerSettings::getValue(DesignerSettingsKey::LAST_USED_TRANSLATION_LANGUAGE).toString()
+                );
 }
 
 ClearSceneCommand NodeInstanceView::createClearSceneCommand() const