[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [pairs/stack3457] game/qml: remove trailing spaces in QML code
From: Heena Mahour <heena393 () gmail ! com>
Date: 2014-07-01 11:59:39
Message-ID: E1X1wip-0007Ma-H0 () scm ! kde ! org
[Download RAW message or body]
Git commit fcc7b6d4d5bfa9f2cef2f04c6f627e9c34f84622 by Heena Mahour.
Committed on 01/07/2014 at 11:59.
Pushed by heenamahour into branch 'stack3457'.
remove trailing spaces in QML code
M +1 -1 game/qml/Board.qml
M +5 -5 game/qml/Button.qml
M +2 -2 game/qml/InfoPage.qml
M +22 -25 game/qml/Main.qml
M +6 -6 game/qml/OptionsPage.qml
M +2 -2 game/qml/ResultsPage.qml
M +3 -4 game/qml/SelectableListView.qml
M +7 -7 game/qml/TogglableButton.qml
http://commits.kde.org/pairs/fcc7b6d4d5bfa9f2cef2f04c6f627e9c34f84622
diff --git a/game/qml/Board.qml b/game/qml/Board.qml
index cab389e..3886af9 100644
--- a/game/qml/Board.qml
+++ b/game/qml/Board.qml
@@ -23,6 +23,6 @@ import QtQuick 1.1
Page
{
objectName: 'board'
-
+
property bool isGameOver; //Changed from C++ code
}
diff --git a/game/qml/Button.qml b/game/qml/Button.qml
index 4cc8315..f4666cd 100644
--- a/game/qml/Button.qml
+++ b/game/qml/Button.qml
@@ -25,9 +25,9 @@ Item {
id: button
width: 100
height: icon.height + caption.height + icon.anchors.margins * 2 + \
caption.anchors.bottomMargin
-
+
signal clicked;
-
+
property alias text: caption.text
property alias source: icon.source
property alias font: caption.font
@@ -48,7 +48,7 @@ Item {
width: height
}
}
-
+
Text {
id: caption
anchors {
@@ -60,10 +60,10 @@ Item {
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.pointSize: 12
- color: mouse.containsMouse ? "red" : "white"
+ color: mouse.containsMouse ? "red" : "white"
Behavior on color { ColorAnimation { duration: 200 } }
}
-
+
MouseArea {
id: mouse
anchors.fill: parent
diff --git a/game/qml/InfoPage.qml b/game/qml/InfoPage.qml
index f56fe01..c036291 100644
--- a/game/qml/InfoPage.qml
+++ b/game/qml/InfoPage.qml
@@ -28,7 +28,7 @@ Page {
margins: 5
}
spacing: 10
-
+
header: Text {
font.pixelSize: 26
anchors.horizontalCenter: parent.horizontalCenter
@@ -59,7 +59,7 @@ Page {
}
}
model: authors
-
+
property list<Author> authors: [
Author {
name: "Aleix Pol Gonzalez"
diff --git a/game/qml/Main.qml b/game/qml/Main.qml
index 10552c9..560097a 100644
--- a/game/qml/Main.qml
+++ b/game/qml/Main.qml
@@ -27,32 +27,32 @@ FancyBackground
id: game
Item {
id: main
-
+
anchors {
fill: parent
leftMargin: Math.min(game.width/3, 320)
margins: 20
}
-
+
Board {
id: board
anchors.fill: parent
visible: game.state=="playing"
-
+
onIsGameOverChanged: {
if(isGameOver)
game.state="congratulations"
}
}
-
+
OptionsPage {
id: options
anchors.fill: parent
visible: game.state=="newgame"
-
+
onGameStarted: game.state="playing"
}
-
+
ResultsPage {
anchors.fill: parent
visible: game.state=="congratulations"
@@ -64,12 +64,12 @@ FancyBackground
anchors.fill: parent
onClicked: game.state="newgame"
}
-
+
}
}
-
+
Component.onCompleted: game.state="newgame"
-
+
Page {
id: toolbar
anchors {
@@ -79,19 +79,19 @@ FancyBackground
margins: 20
}
height: 130
-
+
Row {
anchors.fill: parent
id: tools
property real buttonWidth: 90
-
+
Button {
width: tools.buttonWidth
source: playersModel.iconsDir("gameicons/exit.svg")
text: i18n("Quit")
onClicked: Qt.quit()
}
-
+
Button {
width: tools.buttonWidth
source: playersModel.iconsDir("gameicons/getThemes.svg")
@@ -99,7 +99,7 @@ FancyBackground
onClicked: fgame.download()
visible: game.state=="newgame"
}
-
+
Button {
width: tools.buttonWidth
source: playersModel.iconsDir("gameicons/info.svg")
@@ -130,7 +130,7 @@ FancyBackground
}
}
}
-
+
Page {
id: playersView
anchors {
@@ -158,7 +158,7 @@ FancyBackground
color : "white"
text: i18n("Players")
}
-
+
model: playersModel
delegate: TogglableButton {
text: game.state!="playing" ? display : i18nc("name. found/tries, \
time seconds", "%1<br/>%2/%3, %4s", display, found, missed+found, time) @@ -168,14 \
+168,14 @@ FancyBackground overlayVisible: game.state=="newgame"
opacity: game.state!="playing" || fgame.currentPlayer==index ? 1 : \
0.3 width: 100
-
+
enabled: selected
onClicked: if(game.state=="newgame") \
playersModel.toggleSelection(index) onOverlayClicked: \
playersModel.removePlayer(index) }
}
}
-
+
Page {
id: playersControl
height: game.state=='newgame' || game.state == "" ? 130 : 0
@@ -188,7 +188,7 @@ FancyBackground
topMargin: 30
margins: 20
}
-
+
Text {
id: label
anchors {
@@ -200,7 +200,7 @@ FancyBackground
color: "white"
text: i18n("Join!")
}
-
+
Item {
id: controls
visible: height>0
@@ -226,7 +226,7 @@ FancyBackground
onClicked: newUserPicture.source=playersModel.randomIcon()
}
}
-
+
Column {
id: playerNameControls
anchors.verticalCenterOffset: -10
@@ -236,19 +236,18 @@ FancyBackground
color: "white"
text: i18n("Player Name:")
}
-
+
PlasmaComponents.TextField {
id: playerName
width: 100
text: i18n("Player")
focus: true
-
Component.onCompleted: selectAll()
onAccepted: playersControl.addPlayer()
}
}
}
-
+
Button {
id: addPlayer
anchors {
@@ -270,8 +269,6 @@ FancyBackground
Behavior on height { NumberAnimation { duration: 200; easing.type: \
Easing.InQuad } } }
-
-
states: [
State { name: "newgame" },
State { name: "playing" },
diff --git a/game/qml/OptionsPage.qml b/game/qml/OptionsPage.qml
index d49d695..7ea3b0e 100644
--- a/game/qml/OptionsPage.qml
+++ b/game/qml/OptionsPage.qml
@@ -24,7 +24,7 @@ import QtQuick 1.0
Flickable {
id: gameSettings
property string gameType: 'image'
-
+
signal gameStarted;
contentHeight: games.height
Column {
@@ -84,7 +84,7 @@ Flickable {
}
}
}
-
+
Page {
width: parent.width
height: themesView.height
@@ -93,17 +93,17 @@ Flickable {
width: parent.width
spacing: 20
anchors.margins: 10
-
+
Repeater {
model: themesModel
-
+
delegate: Button {
width: Math.max((themesView.width - 120) / 6, 100)
visible: themesModel.isPertinent(index, gameType, \
fgame.language()) source: "image://theme/"+display+"/"+decoration
text: display
font.pointSize: 12
-
+
onClicked: {
if(!playersModel.isAnySelected()) {
//if there are no selected players, select the first \
one @@ -113,7 +113,7 @@ Flickable {
else
playersControl.addPlayer()
}
-
+
gameStarted()
fgame.newGame(index, gameType)
}
diff --git a/game/qml/ResultsPage.qml b/game/qml/ResultsPage.qml
index f3d8673..11685dd 100644
--- a/game/qml/ResultsPage.qml
+++ b/game/qml/ResultsPage.qml
@@ -24,7 +24,7 @@ import QtQuick 1.0
Page {
ListView {
anchors.fill: parent
-
+
header: Text {
font.pixelSize: 70
anchors.horizontalCenter: parent.horizontalCenter
@@ -32,7 +32,7 @@ Page {
text: i18n("Congratulations!")
}
model: playersModel
-
+
delegate: Row {
spacing: 20
Image { height: 150; width: 150; source: decoration }
diff --git a/game/qml/SelectableListView.qml b/game/qml/SelectableListView.qml
index cb63c8e..2332b0b 100644
--- a/game/qml/SelectableListView.qml
+++ b/game/qml/SelectableListView.qml
@@ -23,7 +23,7 @@ import QtQuick 1.1
ListView
{
id: root;
-
+
highlightFollowsCurrentItem: true
highlightRangeMode: ListView.ApplyRange
highlight: Rectangle {
@@ -31,13 +31,12 @@ ListView
GradientStop { position: 0; color: "lightsteelblue" }
GradientStop { position: 1; color: "transparent" }
}
-
+
radius: 5
}
-
+
MouseArea {
anchors.fill: parent
-
onClicked: {
var idx=root.indexAt(mouse.x, mouse.y)
root.currentIndex=idx
diff --git a/game/qml/TogglableButton.qml b/game/qml/TogglableButton.qml
index c72cf4e..1888a21 100644
--- a/game/qml/TogglableButton.qml
+++ b/game/qml/TogglableButton.qml
@@ -30,10 +30,10 @@ Item
property alias source: button.source
property alias overlaySource: overlay.source
property bool overlayVisible: true
-
+
signal overlayClicked
signal clicked
-
+
Rectangle {
radius: 20
smooth: true
@@ -46,25 +46,25 @@ Item
GradientStop { position: 1; color: "transparent" }
}
}
-
+
Button {
id: button
width: parent.width
anchors.verticalCenterOffset: -10
-
+
onClicked: container.clicked()
}
-
+
Image {
id: overlay
-
+
opacity: !container.enabled && overlayVisible ? 1 : 0
width: parent.width/3
height: parent.height/3
anchors.top: parent.top
anchors.right: parent.right
Behavior on opacity { NumberAnimation { duration: 200; easing.type: \
Easing.InQuad } }
-
+
MouseArea {
anchors.fill: parent
onClicked: container.overlayClicked()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic