[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [pairs/new_qml2] src/qml: Make the code more declarative-friendly
From: Aleix Pol <aleixpol () kde ! org>
Date: 2011-11-30 23:57:24
Message-ID: 20111130235724.EB131A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit f97c6a9b99cd4eb10961700c2092d6cdb357d859 by Aleix Pol.
Committed on 30/11/2011 at 23:06.
Pushed by apol into branch 'new_qml2'.
Make the code more declarative-friendly
M +13 -29 src/qml/OptionsPage.qml
http://commits.kde.org/pairs/f97c6a9b99cd4eb10961700c2092d6cdb357d859
diff --git a/src/qml/OptionsPage.qml b/src/qml/OptionsPage.qml
index 6ace892..f1ef96e 100644
--- a/src/qml/OptionsPage.qml
+++ b/src/qml/OptionsPage.qml
@@ -2,12 +2,14 @@ import QtQuick 1.0
Rectangle {
id: gameSettings
- property string gamelanguage;
- property string gametype;
- gametype: 'image'
- gamelanguage: 'en'
+ property string gameLanguage: 'en'
+ property string gameType: 'image'
+
color: 'green'
signal gameStarted;
+
+ onGameTypeChanged: themesModel.refresh(gameType, gameLanguage)
+
Row {
anchors.margins: 30
anchors.fill: parent
@@ -19,50 +21,32 @@ Rectangle {
Button {
source: playersModel.iconsDir("gameicons/pairs.png")
text: "Pairs"
- onClicked: {
- gametype = 'image';
- themesModel.refresh(gametype, gamelanguage)
- }
+ onClicked: gameType = 'image'
}
Button {
source: playersModel.iconsDir("gameicons/pairs2.png")
text: "Pairs 2"
- onClicked: {
- gametype = 'image2';
- themesModel.refresh(gametype, gamelanguage)
- }
+ onClicked: gameType = 'image2'
}
Button {
source: playersModel.iconsDir("gameicons/logic.png")
text: "Logic"
- onClicked: {
- gametype = 'logic';
- themesModel.refresh(gametype, gamelanguage)
- }
+ onClicked: gameType = 'logic'
}
Button {
source: playersModel.iconsDir("gameicons/sound.png")
text: "Sound"
- onClicked: {
- gametype = 'sound';
- themesModel.refresh(gametype, gamelanguage)
- }
+ onClicked: gameType = 'sound'
}
Button {
source: playersModel.iconsDir("gameicons/sound.png")
text: "SoundLogic"
- onClicked: {
- gametype = 'soundlogic';
- themesModel.refresh(gametype, gamelanguage)
- }
+ onClicked: gameType = 'soundlogic'
}
Button {
source: playersModel.iconsDir("gameicons/words.png")
text: "Words"
- onClicked: {
- gametype = 'word';
- themesModel.refresh(gametype, gamelanguage)
- }
+ onClicked: gameType = 'word'
}
}
GridView {
@@ -75,7 +59,7 @@ Rectangle {
onClicked: {
var idx=themesView.indexAt(mouse.x, mouse.y)
gameStarted()
- fgame.newGame(idx, gamelanguage, gametype)
+ fgame.newGame(idx, gameLanguage, gameType)
playersModel.gameStarted();
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic