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

List:       kde-commits
Subject:    kdegames/kreversi
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2005-04-03 16:32:15
Message-ID: 20050403163215.0DBDA637 () office ! kde ! org
[Download RAW message or body]

CVS commit by ingwa: 

Move the movelist to the new gameview.


  M +9 -0      ChangeLog   1.67
  M +21 -18    kreversi.cpp   1.52
  M +2 -0      kreversi.h   1.28


--- kdegames/kreversi/ChangeLog  #1.66:1.67
@@ -1,2 +1,11 @@
+2005-04-03  Inge Wallin  <inge@lysator.liu.se>
+
+        Move the movelist to the gameview.
+
+        Refactor: Create a new class QReversiGameView that will comprise
+        the entire view.
+        * Unfortunately the details of the change got lost in some stupid
+        mistake of mine.
+        
 2005-04-02  Inge Wallin  <inge@lysator.liu.se>
 

--- kdegames/kreversi/kreversi.cpp  #1.51:1.52
@@ -59,11 +59,13 @@
 #include <kexthighscore.h>
 
-#include "prefs.h"
 #include "Score.h"
 #include "kreversi.h"
-#include "kreversi.moc"
-#include "board.h"
+
+// Automatically generated headers
+#include "prefs.h"
 #include "settings.h"
 
+#include "kreversi.moc"
+
 
 // ================================================================
@@ -134,4 +136,9 @@ KReversi::KReversi()
   m_humanColor = Black;
 
+  // The Engine
+  m_engine = new Engine();
+  setStrength(1);
+  
+  // The visual stuff
   w = new QWidget(this);
   setCentralWidget(w);
@@ -143,4 +150,5 @@ KReversi::KReversi()
   top->addMultiCellWidget(m_gameView, 0, 1, 0, 0);
 
+#if 0
   // The "Moves" label
   QLabel  *movesLabel = new QLabel( "Moves", w);
@@ -152,9 +160,5 @@ KReversi::KReversi()
   m_movesView->setMinimumWidth(150);
   top->addWidget(m_movesView, 1, 1);
-
-
-  // The Engine
-  m_engine = new Engine();
-  setStrength(1);
+#endif
   
   // Populate the GUI.
@@ -318,5 +322,5 @@ void KReversi::slotNewGame()
   showTurn(Black);
   m_gameView->updateBoard(TRUE);
-  m_movesView->clear();
+  m_gameView->clearMovelist();  // FIXME: Should be done by a signal from the game.
   showScore();
 
@@ -396,5 +400,5 @@ void KReversi::slotUndo()
   while (m_krgame->moveNumber() != 0
          && last_color == m_krgame->lastMove().color()) {
-    m_movesView->removeItem(m_krgame->moveNumber() - 1);
+    m_gameView->removeMove(m_krgame->moveNumber() - 1);
     m_krgame->undoMove();
   }
@@ -402,9 +406,9 @@ void KReversi::slotUndo()
   // Take back one more move.
   if (m_krgame->moveNumber() > 0) {
-    m_movesView->removeItem(m_krgame->moveNumber() - 1);
+    m_gameView->removeMove(m_krgame->moveNumber() - 1);
     m_krgame->undoMove();
 
-    m_movesView->setCurrentItem(m_krgame->moveNumber() - 1);
-    m_movesView->ensureCurrentVisible();
+    m_gameView->setCurrentMove(m_krgame->moveNumber() - 1);
+    m_gameView->ensureCurrentMoveVisible();
   }
 
@@ -551,11 +555,10 @@ void  KReversi::showMove(uint moveno, Mo
   };
 
-  m_movesView->insertItem(QString("%1. %2 %3")
-                          .arg(moveno)
+  m_gameView->insertMove(QString("%1. %2 %3").arg(moveno)
                           .arg(colors[move.color()]).arg(move.asString()));
 
   // Mark the current move in the listbox.
-  m_movesView->setCurrentItem(moveno - 1);
-  m_movesView->ensureCurrentVisible();
+  m_gameView->setCurrentMove(moveno - 1);
+  m_gameView->ensureCurrentMoveVisible();
 }
 

--- kdegames/kreversi/kreversi.h  #1.27:1.28
@@ -197,5 +197,7 @@ private:
   // Widgets
   QReversiGameView   *m_gameView;          // The board widget.
+#if 0
   QListBox           *m_movesView;
+#endif
   StatusWidget       *m_humanStatus;
   StatusWidget       *m_computerStatus;


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