[Camino-devel] camino/src/client Game.h Game.cpp

[Pascal Audoux]

CVSROOT:        /cvsroot/camino
Module name:    camino
Changes by:     Pascal Audoux <address@hidden>  03/01/28 14:37:46

Modified files:
        src/client     : Game.h Game.cpp 

Log message:
        use ActionList and TilePresentation

Patches:
Index: camino/src/client/Game.cpp
diff -u camino/src/client/Game.cpp:1.7 camino/src/client/Game.cpp:1.8
--- camino/src/client/Game.cpp:1.7      Mon Jan 27 17:52:53 2003
+++ camino/src/client/Game.cpp  Tue Jan 28 14:37:46 2003
@@ -2,7 +2,7 @@
 **
 ** Camino
 **
-** Version : $Id: Game.cpp,v 1.7 2003/01/27 22:52:53 Audoux Exp $
+** Version : $Id: Game.cpp,v 1.8 2003/01/28 19:37:46 Audoux Exp $
 **
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 15/01/2003
@@ -28,10 +28,12 @@
 
 // application specific include files
 #include "Game.h"
+#include "client/ActionList.h"
 #include "client/BoardCanvas.h"
 #include "client/BoardView.h"
 #include "client/ChatWidget.h"
 #include "client/ClientEngine.h"
+#include "client/TilePresentation.h"
 
 Game::Game( QWidget * parent , const char * name )
   : QWidget( parent, name, QWidget::WStyle_Customize | 
QWidget::WStyle_DialogBorder )
@@ -41,10 +43,18 @@
        _board = new BoardCanvas( this );
        BoardView * boardView = new BoardView( _board, this );
 
+       _actions = new ActionList( this );
+       _presentation = new TilePresentation( this );
+
+       QHBoxLayout * layH1 = new QHBoxLayout();
+       layH1->addWidget( _presentation );
+       layH1->addWidget( boardView, 1 );
+       layH1->addWidget( _actions );
+
        _chat = new ChatWidget( this );
 
        QVBoxLayout * layout = new QVBoxLayout( this );
-       layout->addWidget( boardView, 1 );
+       layout->addLayout( layH1, 1 );
        layout->addWidget( _chat, 1 );
        layout->activate();
 
Index: camino/src/client/Game.h
diff -u camino/src/client/Game.h:1.5 camino/src/client/Game.h:1.6
--- camino/src/client/Game.h:1.5        Mon Jan 27 17:52:53 2003
+++ camino/src/client/Game.h    Tue Jan 28 14:37:46 2003
@@ -5,7 +5,7 @@
 ** Game.h
 ** Main widget of the game
 **
-** Version : $Id: Game.h,v 1.5 2003/01/27 22:52:53 Audoux Exp $
+** Version : $Id: Game.h,v 1.6 2003/01/28 19:37:46 Audoux Exp $
 ** Author(s) : Philippe Fremy, Pascal Audoux
 ** Creation : 15/01/2003
 ** Copyright: Pascal Audoux, Philippe Fremy 2003
@@ -35,9 +35,11 @@
 // application specific include files
 #include "common/MsgDecoder.h"
 
+class ActionList;
 class BoardCanvas;
 class ChatWidget;
 class ClientEngine;
+class TilePresentation;
 
 /*              ------------------------------
  *                         Game
@@ -61,6 +63,8 @@
        void slot_serverMessage( const QString & msg );
 
 protected:
+       ActionList * _actions;
+       TilePresentation * _presentation;
        BoardCanvas * _board;
        ChatWidget * _chat;
        ClientEngine * _engine;