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

List:       kde-commits
Subject:    branches/KDE/3.5/kdegames/kreversi
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2006-07-02 19:20:46
Message-ID: 1151868046.123845.19161.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 557254 by ingwa:

Fix bug 129488: kreversi: wrong player (=color) names in moves window

Write Red/Blue in addition to White/Black if the user has chosen
non-BW in the preferences.

BUG: 129488



 M  +12 -0     ChangeLog  
 M  +11 -4     qreversigameview.cpp  


--- branches/KDE/3.5/kdegames/kreversi/ChangeLog #557253:557254
@@ -1,3 +1,15 @@
+2006-07-02  Inge Wallin  <inge@lysator.liu.se>
+
+	* qreversigameview.cpp (moveMade): Print color Red/Blue in
+	addition to White/Black into the game view if non-BW color is
+	chosen in the preferences.
+
+
+	----------------------------------------------------------------
+	New start of ChangeLogging
+	----------------------------------------------------------------
+
+	
 2005-09-15  Inge Wallin  <inge@lysator.liu.se>
 
 	Bump version number for the release of KDE 3.5
--- branches/KDE/3.5/kdegames/kreversi/qreversigameview.cpp #557253:557254
@@ -59,9 +59,9 @@
 #include <kdebug.h>
 
 #include "board.h"
-#include "prefs.h"
 #include "Engine.h"
 #endif
+#include "prefs.h"
 
 #include "qreversigame.h"
 #include "qreversigameview.h"
@@ -202,14 +202,21 @@
 void QReversiGameView::moveMade(uint moveNum, Move &move)
 {
   //FIXME: Error checks.
-  QString colors[] = {
+  QString colorsWB[] = {
     i18n("White"),
     i18n("Black")
   };
+  QString colorsRB[] = {
+    i18n("Red"),
+    i18n("Blue")
+  };
 
   // Insert the new move in the listbox and mark it as the current one.
-  m_movesView->insertItem(QString("%1. %2 %3").arg(moveNum)
-			  .arg(colors[move.color()]).arg(move.asString()));
+  m_movesView->insertItem(QString("%1. %2 %3")
+			  .arg(moveNum)
+			  .arg(Prefs::grayscale() ? colorsWB[move.color()]
+			       : colorsRB[move.color()])
+			  .arg(move.asString()));
   m_movesView->setCurrentItem(moveNum - 1);
   m_movesView->ensureCurrentVisible();
 
[prev in list] [next in list] [prev in thread] [next in thread]