Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GCompris
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
27
Issues
27
List
Boards
Labels
Service Desk
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Education
GCompris
Commits
0dbb6c46
Commit
0dbb6c46
authored
Feb 29, 2020
by
Timothée Giet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gletters, wordsgame, some cleaning
parent
dedb4b83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
src/activities/gletters/ActivityConfig.qml
src/activities/gletters/ActivityConfig.qml
+0
-2
src/activities/wordsgame/ActivityConfig.qml
src/activities/wordsgame/ActivityConfig.qml
+1
-5
No files found.
src/activities/gletters/ActivityConfig.qml
View file @
0dbb6c46
...
@@ -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
...
...
src/activities/wordsgame/ActivityConfig.qml
View file @
0dbb6c46
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment