[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bgluon=5D_player=3A_KDE_Extended_Player=3A_Store_the?=
From:       Laszlo Papp <djszapi () archlinux ! us>
Date:       2011-02-06 16:50:29
Message-ID: 20110206165029.198A3A609B () git ! kde ! org
[Download RAW message or body]

Git commit 7454bdd2f3fe8492d42d43818024766e47a5a806 by Laszlo Papp.
Committed on 06/02/11 at 17:51.
Pushed by lpapp into branch 'master'.

KDE Extended Player: Store the idS in a QStringList for now.

M  +3    -3    player/kdeext/gamesoverlay.cpp     
M  +2    -0    player/kdeext/gamesoverlay.h     
M  +11   -13   player/kdeext/mainwindow.cpp     
M  +0    -2    player/kdeext/mainwindow.h     
M  +1    -1    player/kdeext/models/gameitemsmodel.cpp     
M  +1    -0    player/kdeext/models/gameitemsmodel.h     

http://commits.kde.org/gluon/7454bdd2f3fe8492d42d43818024766e47a5a806

diff --git a/player/kdeext/gamesoverlay.cpp b/player/kdeext/gamesoverlay.cpp
index cbb06bc..6032233 100644
--- a/player/kdeext/gamesoverlay.cpp
+++ b/player/kdeext/gamesoverlay.cpp
@@ -27,20 +27,20 @@ GamesOverlay::GamesOverlay( QWidget* parent, Qt::WindowFlags \
wFlags )  , m_model( new ListModel( m_view ) )
     , m_gamesView( new QListView( this ) )
     , m_gamesDelegate( new ItemsViewDelegate(m_gamesView, this) )
+    , m_gameItemsModel( new GameItemsModel( m_gamesView ) )
     , m_loginForm( new LoginForm( this ) )
     , m_gridLayout( new QGridLayout( this ) )
     , m_stackedWidget( new QStackedWidget( this ) )
     , m_availableView( new KSqueezedTextLabel( i18n( "Coming soon!" ), this ) )
     , m_communityView( new KSqueezedTextLabel( i18n( "Community. Under development!" \
), this ) )  {
-    connect( m_gamesView, SIGNAL( gameToPlaySelected( QModelIndex ) ), SIGNAL( \
                gameToPlaySelected( QModelIndex ) ) );
-    connect( m_gamesView, SIGNAL( gameSelected( QModelIndex ) ), SIGNAL( \
                gameSelected( QModelIndex ) ) );
-
     m_view->setModel(m_model);
     m_model->appendPair(qMakePair(i18n("Login"), new KIcon( "network-connect" )));
     m_stackedWidget->addWidget(m_loginForm);
 
     m_model->appendPair(qMakePair(i18n("Installed"), new KIcon( "applications-games" \
))); +    m_gamesView->setItemDelegate(m_gamesDelegate);
+    m_gamesView->setModel(m_gameItemsModel);
     m_stackedWidget->addWidget(m_gamesView);
 
     m_model->appendPair(qMakePair(i18n("Available"), new KIcon( "get-hot-new-stuff" \
                )));
diff --git a/player/kdeext/gamesoverlay.h b/player/kdeext/gamesoverlay.h
index c129f3f..34d6b4a 100644
--- a/player/kdeext/gamesoverlay.h
+++ b/player/kdeext/gamesoverlay.h
@@ -22,6 +22,7 @@
 
 #include "loginform.h"
 #include "models/listmodel.h"
+#include "models/gameitemsmodel.h"
 #include "delegates/itemsviewdelegate.h"
 
 #include <KDE/KIcon>
@@ -59,6 +60,7 @@ namespace GluonKDEPlayer
 
             QListView* m_gamesView;
             ItemsViewDelegate* m_gamesDelegate;
+            GameItemsModel* m_gameItemsModel;
 
             LoginForm* m_loginForm;
             QGridLayout* m_gridLayout;
diff --git a/player/kdeext/mainwindow.cpp b/player/kdeext/mainwindow.cpp
index 20ba0db..e4cee43 100644
--- a/player/kdeext/mainwindow.cpp
+++ b/player/kdeext/mainwindow.cpp
@@ -64,7 +64,6 @@ class MainWindow::MainWindowPrivate
 MainWindow::MainWindow(const QString& filename )
     : KXmlGuiWindow()
     , d( new MainWindowPrivate )
-    , m_gamesModel( new GluonPlayer::GamesModel( this ) )
     , m_gamesOverlay( new GamesOverlay( this ) )
     , m_layout( new QGridLayout )
     , m_gameDetailsOverlay( 0 )
@@ -249,7 +248,6 @@ void MainWindow::resizeEvent( QResizeEvent* event )
 
 void MainWindow::showGames()
 {
-    // m_gamesOverlay->gamesView()->setModel( m_gamesModel );
     m_gamesOverlay->setGeometry( geometry() );
     connect( m_gamesOverlay, SIGNAL( gameToPlaySelected( QModelIndex ) ), SLOT( \
                setProject( QModelIndex ) ) );
     connect( m_gamesOverlay, SIGNAL( gameSelected( QModelIndex ) ), SLOT( \
showGameDetails( QModelIndex ) ) ); @@ -265,19 +263,19 @@ void \
MainWindow::showGames()  
 void MainWindow::showGameDetails( const QModelIndex& index )
 {
-    QString id = index.sibling( index.row(), GluonPlayer::GamesModel::IdColumn \
                ).data().toString();
-    if( id.isEmpty() )
-    {
-        return;
-    }
+    // QString id = index.sibling( index.row(), GluonPlayer::GamesModel::IdColumn \
).data().toString(); +    // if( id.isEmpty() )
+    // {
+        // return;
+    // }
 
     //TODO: the game details should be according to the game selected
-    m_gameDetailsOverlay = new GameDetailsOverlay( id, this );
-    m_gamesOverlay->hide();
-    m_layout->removeWidget( m_gamesOverlay );
-    m_gameDetailsOverlay->show();
-    m_layout->addWidget( m_gameDetailsOverlay );
-    connect( m_gameDetailsOverlay, SIGNAL( back() ), SLOT( showGames() ) );
+    // m_gameDetailsOverlay = new GameDetailsOverlay( id, this );
+    // m_gamesOverlay->hide();
+    // m_layout->removeWidget( m_gamesOverlay );
+    // m_gameDetailsOverlay->show();
+    // m_layout->addWidget( m_gameDetailsOverlay );
+    // connect( m_gameDetailsOverlay, SIGNAL( back() ), SLOT( showGames() ) );
 }
 
 void MainWindow::setProject( const QModelIndex& index )
diff --git a/player/kdeext/mainwindow.h b/player/kdeext/mainwindow.h
index 83985c6..0af1b70 100644
--- a/player/kdeext/mainwindow.h
+++ b/player/kdeext/mainwindow.h
@@ -26,7 +26,6 @@
 #include "gamedetailsoverlay.h"
 #include "views/gamesview.h"
 
-#include <player/lib/models/gamesmodel.h>
 #include <core/gluon_global.h>
 #include <graphics/engine.h>
 #include <engine/gameproject.h>
@@ -86,7 +85,6 @@ namespace GluonKDEPlayer {
             class MainWindowPrivate;
             MainWindowPrivate* d;
 
-            GluonPlayer::GamesModel* m_gamesModel;
             GamesOverlay* m_gamesOverlay;
             QGridLayout* m_layout;
             QString m_gameFileName;
diff --git a/player/kdeext/models/gameitemsmodel.cpp \
b/player/kdeext/models/gameitemsmodel.cpp index 6430060..08bce09 100644
--- a/player/kdeext/models/gameitemsmodel.cpp
+++ b/player/kdeext/models/gameitemsmodel.cpp
@@ -42,7 +42,7 @@ GameItemsModel::GameItemsModel( QObject* parent )
                 GluonEngine::GameProject project;
                 project.loadFromFile( projectFileName );
                 m_gamesViewItems.append(new GamesViewItem(project.name(), \
                project.description()));
-                project.property( "id" );
+                id.append(project.property( "id" ).toString());
         }
     }
 }
diff --git a/player/kdeext/models/gameitemsmodel.h \
b/player/kdeext/models/gameitemsmodel.h index 422d60b..a4db199 100644
--- a/player/kdeext/models/gameitemsmodel.h
+++ b/player/kdeext/models/gameitemsmodel.h
@@ -52,6 +52,7 @@ namespace GluonKDEPlayer
 
         private:
             QList<GamesViewItem*> m_gamesViewItems;
+            QStringList id;
     };
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]