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

List:       kde-commits
Subject:    branches/work/kreversi_rewrite
From:       Dmitry Suzdalev <dimsuz () gmail ! com>
Date:       2006-09-06 11:58:35
Message-ID: 1157543915.752698.30323.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 581431 by dimsuz:

valgrinding helps ;)


 M  +5 -0      kreversichip.cpp  
 M  +1 -0      kreversichip.h  
 M  +6 -0      kreversiscene.cpp  
 M  +8 -1      mainwindow.cpp  
 M  +1 -1      mainwindow.h  


--- branches/work/kreversi_rewrite/kreversichip.cpp #581430:581431
@@ -10,6 +10,11 @@
     setColor(m_color);
 }
 
+void KReversiChip::setFrameSet( const KReversiChipFrameSet* frameSet )
+{
+    m_frameSet = frameSet;
+}
+
 void KReversiChip::setColor( ChipColor color )
 {
     m_color = color;
--- branches/work/kreversi_rewrite/kreversichip.h #581430:581431
@@ -11,6 +11,7 @@
 {
 public:
     KReversiChip( ChipColor color, const KReversiChipFrameSet *frameSet, QGraphicsScene *scene );
+    void setFrameSet( const KReversiChipFrameSet *frameSet );
     void setColor( ChipColor color );
     ChipColor color() const { return m_color; }
     /**
--- branches/work/kreversi_rewrite/kreversiscene.cpp #581430:581431
@@ -54,11 +54,17 @@
             // FIXME dimsuz: use qgraphicsitem_cast?
             chip = dynamic_cast<KReversiChip*>(item);
             if( chip )
+            {
+                chip->setFrameSet( m_frameSet );
                 chip->setColor( chip->color() ); // this will reread pixmap
+            }
         }
 
         if(m_hintChip)
+        {
+            m_hintChip->setFrameSet( m_frameSet );
             m_hintChip->setColor( m_hintChip->color() );
+        }
     }
 }
 
--- branches/work/kreversi_rewrite/mainwindow.cpp #581430:581431
@@ -39,7 +39,9 @@
 }
 
 KReversiMainWindow::KReversiMainWindow(QWidget* parent)
-    : KMainWindow(parent), m_scene(0), m_game(0), m_undoAct(0), m_hintAct(0), m_demoAct(0)
+    : KMainWindow(parent), m_scene(0), m_game(0),
+    m_historyLabel(0), m_historyView(0), m_undoAct(0),
+    m_hintAct(0), m_demoAct(0)
 {
     statusBar()->insertItem( i18n("Your turn."), 0 );
 
@@ -213,7 +215,12 @@
         m_hintAct->setEnabled( true );
     if(m_demoAct)
         m_demoAct->setChecked( false );
+    if(m_undoAct)
+        m_undoAct->setEnabled( false );
 
+    if(m_historyView)
+        m_historyView->clear();
+
     if(m_scene == 0) // if called first time
     {
         // FIXME dimsuz: if chips.png not found give error end exit
--- branches/work/kreversi_rewrite/mainwindow.h #581430:581431
@@ -35,8 +35,8 @@
     KReversiScene *m_scene;
     KReversiView  *m_view;
     KReversiGame  *m_game;
+    QLabel        *m_historyLabel;
     QListWidget   *m_historyView;
-    QLabel        *m_historyLabel;
 
     KAction* m_undoAct;
     KAction* m_hintAct;
[prev in list] [next in list] [prev in thread] [next in thread]