[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gluon] player/active: Download games as well :)
From: Shantanu Tushar <shaan7in () gmail ! com>
Date: 2012-05-25 18:24:10
Message-ID: 20120525182410.F2165A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 63a6237d0a1ea751d6d07042ee8e989c34d36577 by Shantanu Tushar.
Committed on 25/05/2012 at 20:23.
Pushed by shantanu into branch 'master'.
Download games as well :)
M +4 -5 player/active/package/contents/ui/GameItem.qml
M +2 -0 player/active/src/mainwindow.cpp
http://commits.kde.org/gluon/63a6237d0a1ea751d6d07042ee8e989c34d36577
diff --git a/player/active/package/contents/ui/GameItem.qml \
b/player/active/package/contents/ui/GameItem.qml index 9f2a9b6..89bdaaa 100644
--- a/player/active/package/contents/ui/GameItem.qml
+++ b/player/active/package/contents/ui/GameItem.qml
@@ -38,7 +38,7 @@ Item {
PlasmaComponents.Button {
id: iconButton
height: parent.height
- width: parent.width - (playButton.visible ? playButton.width : 0)
+ width: parent.width - playDownloadButton.width
iconSource: "gluon-player"
text: GameName
@@ -47,13 +47,12 @@ Item {
}
PlasmaComponents.ToolButton {
- id: playButton
+ id: playDownloadButton
height: parent.height
width: height
- visible: Status == Gluon.GameItem.Installed || Status == \
Gluon.GameItem.Local
- iconSource: "media-playback-start"
- onClicked: mainWindow.playGame(Id)
+ iconSource: Status == Gluon.GameItem.Installed || Status == \
Gluon.GameItem.Local ? "media-playback-start" : "download" + onClicked: \
Status == Gluon.GameItem.Installed || Status == Gluon.GameItem.Local ? \
mainWindow.playGame(Id) : serviceProvider.downloadGame(Id).startSocialService() }
}
}
diff --git a/player/active/src/mainwindow.cpp b/player/active/src/mainwindow.cpp
index f6f8c15..39732f2 100644
--- a/player/active/src/mainwindow.cpp
+++ b/player/active/src/mainwindow.cpp
@@ -28,6 +28,7 @@
#include <lib/serviceprovider.h>
#include <lib/models/allgameitemsmodel.h>
#include <lib/models/gameitem.h>
+#include <lib/gamedownloadjob.h>
#include <engine/game.h>
#include <input/inputmanager.h>
@@ -50,6 +51,7 @@ MainWindow::MainWindow()
qmlRegisterType<GluonPlayer::GameMetadata>( "org.kde.gluon.playercomponents", 1, \
0, "GameMetadata" );
qmlRegisterType<GluonPlayer::CommentsModel>( "org.kde.gluon.playercomponents", \
1, 0, "CommentsModel" );
qmlRegisterUncreatableType<GluonPlayer::GameItem>( \
"org.kde.gluon.playercomponents", 1, 0, "GameItem", "To be used only for enums" ); + \
qmlRegisterUncreatableType<GluonPlayer::GameDownloadJob>( \
"org.kde.gluon.playercomponents", 1, 0, "GameDownloadJob", "Get an instance from \
serviceProvider" );
declarativeView()->setPackageName("org.kde.gluon.player");
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic