From 0dbb6c46097841be44e1f43d770d969d61ac791a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Giet?= Date: Sat, 29 Feb 2020 21:23:30 +0100 Subject: [PATCH] gletters, wordsgame, some cleaning --- src/activities/gletters/ActivityConfig.qml | 2 -- src/activities/wordsgame/ActivityConfig.qml | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/activities/gletters/ActivityConfig.qml b/src/activities/gletters/ActivityConfig.qml index 1340cdcb7..de2c72f65 100644 --- a/src/activities/gletters/ActivityConfig.qml +++ b/src/activities/gletters/ActivityConfig.qml @@ -32,7 +32,6 @@ Item { property int speedSetting: 10 property bool uppercaseOnly: false property string locale: "system" - height: columnContent.height width: if(background) background.width property alias availableLangs: langs.languages LanguageList { @@ -40,7 +39,6 @@ Item { } Column { - id: columnContent spacing: 10 Flow { spacing: 5 diff --git a/src/activities/wordsgame/ActivityConfig.qml b/src/activities/wordsgame/ActivityConfig.qml index 2d9a6b026..67bc8fbd1 100644 --- a/src/activities/wordsgame/ActivityConfig.qml +++ b/src/activities/wordsgame/ActivityConfig.qml @@ -31,7 +31,6 @@ Item { property alias speedSlider: speedSlider property int speedSetting: 10 property string locale: "system" - height: column.height width: if(background) background.width property alias availableLangs: langs.languages LanguageList { @@ -39,21 +38,18 @@ Item { } Column { - id: column spacing: 10 Flow { spacing: 5 width: activityConfiguration.width GCComboBox { id: localeBox - visible: true model: langs.languages background: activityConfiguration.background label: qsTr("Select your locale") } GCDialogCheckBox { id: uppercaseBox - visible: true width: parent.width text: qsTr("Uppercase only mode") checked: activityConfiguration.uppercaseOnly @@ -119,7 +115,7 @@ Item { dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly, "speedSetting": speedSetting} activityConfiguration.locale = newLocale; - if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly) { + if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly || oldSpeed !== speedSetting) { configHasChanged = true; } -- GitLab