Commit 0dbb6c46 authored by Timothée Giet's avatar Timothée Giet

gletters, wordsgame, some cleaning

parent dedb4b83
...@@ -32,7 +32,6 @@ Item { ...@@ -32,7 +32,6 @@ Item {
property int speedSetting: 10 property int speedSetting: 10
property bool uppercaseOnly: false property bool uppercaseOnly: false
property string locale: "system" property string locale: "system"
height: columnContent.height
width: if(background) background.width width: if(background) background.width
property alias availableLangs: langs.languages property alias availableLangs: langs.languages
LanguageList { LanguageList {
...@@ -40,7 +39,6 @@ Item { ...@@ -40,7 +39,6 @@ Item {
} }
Column { Column {
id: columnContent
spacing: 10 spacing: 10
Flow { Flow {
spacing: 5 spacing: 5
......
...@@ -31,7 +31,6 @@ Item { ...@@ -31,7 +31,6 @@ Item {
property alias speedSlider: speedSlider property alias speedSlider: speedSlider
property int speedSetting: 10 property int speedSetting: 10
property string locale: "system" property string locale: "system"
height: column.height
width: if(background) background.width width: if(background) background.width
property alias availableLangs: langs.languages property alias availableLangs: langs.languages
LanguageList { LanguageList {
...@@ -39,21 +38,18 @@ Item { ...@@ -39,21 +38,18 @@ Item {
} }
Column { Column {
id: column
spacing: 10 spacing: 10
Flow { Flow {
spacing: 5 spacing: 5
width: activityConfiguration.width width: activityConfiguration.width
GCComboBox { GCComboBox {
id: localeBox id: localeBox
visible: true
model: langs.languages model: langs.languages
background: activityConfiguration.background background: activityConfiguration.background
label: qsTr("Select your locale") label: qsTr("Select your locale")
} }
GCDialogCheckBox { GCDialogCheckBox {
id: uppercaseBox id: uppercaseBox
visible: true
width: parent.width width: parent.width
text: qsTr("Uppercase only mode") text: qsTr("Uppercase only mode")
checked: activityConfiguration.uppercaseOnly checked: activityConfiguration.uppercaseOnly
...@@ -119,7 +115,7 @@ Item { ...@@ -119,7 +115,7 @@ Item {
dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly, "speedSetting": speedSetting} dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly, "speedSetting": speedSetting}
activityConfiguration.locale = newLocale; activityConfiguration.locale = newLocale;
if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly) { if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly || oldSpeed !== speedSetting) {
configHasChanged = true; configHasChanged = true;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment