2 files changed, 160 insertions, 10 deletions

diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index 5c4d1f7..6228a8f 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -36,20 +36,29 @@ OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow(
 {
         QWidget *thing = new QWidget( this );
         setCentralWidget( thing );
         
+
+        setPlayerNumber( 4 );
+        setRoundsNumber( 1 );
+        
+        playerList ps;
+        ps.append( new Player( "Carsten" ) );
+        ps.append( new Player( "Julia" ) );
+        ps.append( new Player( "Christine" ) );
+        ps.append( new Player( "Stephan" ) );
+
+        Game *g = new Game( ps );
+        
+        
         QVBoxLayout *vbox = new QVBoxLayout( thing );
 
-        sb = new Scoreboard( thing , "sb" );
+        sb = new Scoreboard( ps, thing , "sb" );
         dw = new DiceWidget( thing , "dw" );
+        connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) );
         
         vbox->addWidget( sb );
         vbox->addWidget( dw );
-
-        setPlayerNumber( 2 );
-        setRoundsNumber( 1 );
-        
-        connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) );
 }
 
 OYatzee::~OYatzee()
 {
@@ -159,10 +168,8 @@ void OYatzee::detectPosibilities()
 }
 
 void OYatzee::displayPossibilites()
 {
-        qDebug( "running displayPossibilites(), %d item", posibilities.count() );
-        
         for ( QValueListInt::Iterator it = posibilities.begin() ; it != posibilities.end(); ++it )
         {
                 qDebug( QString::number( *it ) );
                 switch ( *it )
@@ -239,10 +246,38 @@ void OYatzee::slotRollDices()
 
 /*
  * Scoreboard
  */
-Scoreboard::Scoreboard( QWidget *parent, const char *name ) : QWidget( parent , name )
+Scoreboard::Scoreboard( playerList ps, QWidget *parent, const char *name ) : QWidget( parent , name )
+{ 
+        ps_ = ps;
+
+        pb = new Possibilityboard( this , "pb" );
+
+        createResultboards( 4 );
+
+        QHBoxLayout *hbox = new QHBoxLayout( this );
+
+        hbox->addWidget( pb );
+
+        hbox->addSpacing( 25 );
+
+        Resultboard *r = rbList.first();
+        
+        for ( ; r != 0 ; r = rbList.next() )
+        {
+                hbox->addWidget( r );
+        }
+}
+
+void Scoreboard::createResultboards(const int num)
 {
+        Player *p = ps_.first();
+        for ( int i = 0 ; i < num ; ++i , p = ps_.next() )
+        {
+                QString n = p->playerName;
+                rbList.append( new Resultboard( n , this ) );
+        }
 }
 
 void Scoreboard::paintEvent( QPaintEvent * )
 {
@@ -360,4 +395,63 @@ Player::Player( QString name )
 {
         playerName = name;
 }
 
+
+/*
+ * Board
+ */
+Board::Board( QWidget *parent , const char* name ) : QWidget ( parent , name )
+{
+}
+
+void Board::paintEvent( QPaintEvent* )
+{
+        QPainter p;
+        p.begin( this );
+
+        p.drawRect( 0,0, this->width() , this->height() );
+}
+
+/*
+ * Resultboard
+ */
+
+Resultboard::Resultboard( QString playerName , QWidget *parent , const char* name ) : Board ( parent , name )
+{
+        pName = playerName;
+}
+
+void Resultboard::paintEvent( QPaintEvent* )
+{
+        QPainter p;
+        p.begin( this );
+
+        p.drawText( 10,10, pName );
+        p.drawRect( 0,0, this->width() , this->height() );
+}
+
+/*
+ * Possibilityboard
+ */
+
+Possibilityboard::Possibilityboard( QWidget *parent , const char* name ) : Board ( parent , name )
+{
+}
+
+void Possibilityboard::paintEvent( QPaintEvent* )
+{
+        QPainter p;
+        p.begin( this );
+
+        p.drawRect( 0,0, this->width() , this->height() );
+}
+
+/*
+ * Game
+ */
+
+Game::Game( playerList pla )
+{
+        players = pla;
+}
+
diff --git a/noncore/games/oyatzee/oyatzee.h b/noncore/games/oyatzee/oyatzee.h
index 65a18fc..dd996ee 100644
--- a/noncore/games/oyatzee/oyatzee.h
+++ b/noncore/games/oyatzee/oyatzee.h
@@ -11,11 +11,15 @@
 class Dice;
 class Game;
 class Scoreboard;
 class DiceWidget;
+class Resultboard;
+class Player;
 
 typedef QList<Dice> dicesList;
+typedef QList<Resultboard> resultboardList;
 typedef QValueList<int> QValueListInt;
+typedef QList<Player> playerList;
 
 class OYatzee : public QMainWindow {
         Q_OBJECT
         public:
@@ -53,8 +57,11 @@ class OYatzee : public QMainWindow {
         private:
                 int numOfPlayers;
                 int numOfRounds;
 
+                /*
+                 * Check what posibilities the player currently has
+                 */
                 void detectPosibilities();
                 void displayPossibilites();
 
 };
@@ -93,18 +100,60 @@ class DiceWidget : public QWidget
 
                 dicesList diceList;
 };
 
+
+class Board : public QWidget
+{
+        Q_OBJECT
+        public:
+                Board( QWidget *parent = 0, const char* name = 0 );
+
+        protected:
+                virtual void paintEvent(  QPaintEvent *e );
+};
+
+class Possibilityboard : public Board
+{
+        Q_OBJECT
+
+        public:
+                Possibilityboard( QWidget *parent = 0, const char* name = 0 );
+        
+        protected:
+                virtual void paintEvent(  QPaintEvent *e );
+};
+
+class Resultboard : public Board
+{
+        Q_OBJECT
+
+        public:
+                Resultboard( QString playerName , QWidget *parent = 0, const char* name = 0 );
+                QString pName;
+
+        protected:
+                virtual void paintEvent(  QPaintEvent *e );
+};
+
+
 class Scoreboard : public QWidget
 {
         Q_OBJECT
         public:
-                Scoreboard( QWidget *parent = 0, const char* name = 0 );
+                Scoreboard( playerList ps, QWidget *parent = 0, const char* name = 0 );
+
+                Possibilityboard *pb;
+                resultboardList rbList;
+                playerList ps_;
 
+                void createResultboards(const int);
+                
         protected:
                 void paintEvent(  QPaintEvent *e );
 };
 
+
 class Player
 {
         public:
                 Player( QString name );
@@ -112,5 +161,12 @@ class Player
                 QString playerName;
                 int totalPoints;
 };
 
+class Game
+{
+        public:
+                Game( playerList pla );
+                playerList players;
+};
+
 #endif // WORDGAME_H