From 44868450eedef3425be7afbc2078f07e2bfdfeea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jun 2016 09:37:20 +0300 Subject: Fixed apply-cancel for language Change-Id: Ib6be8884d5076a706092ded79469870a75fc0115 Reviewed-by: Titta Heikkala Reviewed-by: Miikka Heikkinen --- editorlib/qml/SettingsDialog.qml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/editorlib/qml/SettingsDialog.qml b/editorlib/qml/SettingsDialog.qml index 1e5409e..50d18d5 100644 --- a/editorlib/qml/SettingsDialog.qml +++ b/editorlib/qml/SettingsDialog.qml @@ -43,6 +43,7 @@ Window { property bool previousAutoSaveEnabled property string previousFolder property int previousGridSize + property string previousLanguage property bool autoSaveEnabled: false property string currentFolder property string currentLanguage @@ -222,12 +223,15 @@ Window { gridSizeSpinBox.value = previousGridSize currentGridSize = previousGridSize } - if (currentLanguage === "en") { - englishButton.checked = true - finnishButton.checked = false - } else if (currentLanguage === "fi") { - englishButton.checked = false - finnishButton.checked = true + if (previousLanguage !== currentLanguage) { + currentLanguage = previousLanguage + if (currentLanguage === "en") { + englishButton.checked = true + finnishButton.checked = false + } else if (currentLanguage === "fi") { + englishButton.checked = false + finnishButton.checked = true + } } if (previousFolder.length > 0 && currentFolder !== previousFolder) { @@ -250,6 +254,7 @@ Window { currentGridSize = gridSizeSpinBox.value previousGridSize = currentGridSize setLanguage() + previousLanguage = currentLanguage setFolder() previousFolder = currentFolder dialog.close() @@ -294,6 +299,7 @@ Window { Component.onCompleted: { currentLanguage = editorScene.language + previousLanguage = currentLanguage currentGridSize = editorScene.gridSize previousGridSize = currentGridSize gridSizeSpinBox.value = currentGridSize -- cgit v1.2.3