pine icon now in go dir

1 files changed, 22 insertions, 22 deletions

diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index 8567b30..1d38c9f 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -37,9 +37,9 @@
 #include "amigo.h"
 #include "goplayutils.h"
 
 static const enum bVal computer_color = BLACK;
-    
+
 static int current_handicap = 1;
 
 static QBrush *goBrush;
 //static QImage *newBlackStone;
@@ -51,9 +51,9 @@ static QPixmap *whiteStone;
 
 static bool smallStones = FALSE;
 
 GoMainWidget::GoMainWidget( QWidget *parent, const char* name) :
-        QMainWindow( parent, name ) 
+        QMainWindow( parent, name )
 {
      setToolBarsMovable( FALSE );
     GoWidget *go = new GoWidget(this);
 
@@ -73,34 +73,34 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name) :
     a = new QAction( tr( "Pass" ), Resource::loadPixmap( "pass" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), go, SLOT( pass() ) );
     a->addTo( file );
     a->addTo( toolbar );
-    
-    
+
+
     a = new QAction( tr( "Resign" ), Resource::loadPixmap( "reset" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), go, SLOT( resign() ) );
     a->addTo( file );
 
     a = new QAction( tr( "Two player option" ),  QString::null, 0, this, 0 );
     a->setToggleAction( TRUE );
     connect( a, SIGNAL( toggled(bool) ), go, SLOT( setTwoplayer(bool) ) );
     a->addTo( file );
-    
+
     mb->insertItem( tr( "Game" ), file );
-    
+
     QLabel *turnLabel = new QLabel( toolbar );
     turnLabel->setBackgroundMode( PaletteButton );
-    connect( go, SIGNAL(showTurn(const QPixmap&)), 
+    connect( go, SIGNAL(showTurn(const QPixmap&)),
              turnLabel, SLOT(setPixmap(const QPixmap&)) );
 
-    
+
     QLabel * scoreLabel = new QLabel( toolbar );
     scoreLabel->setBackgroundMode( PaletteButton );
-    connect( go, SIGNAL(showScore(const QString&)), 
+    connect( go, SIGNAL(showScore(const QString&)),
              scoreLabel, SLOT(setText(const QString&)) );
 
     toolbar->setStretchableWidget( scoreLabel );
-    
+
     go->readConfig();
 }
 
 void GoMainWidget::resizeEvent( QResizeEvent * )
@@ -116,19 +116,19 @@ void GoMainWidget::resizeEvent( QResizeEvent * )
 
 GoWidget *GoWidget::self = 0;
 
 GoWidget::GoWidget( QWidget *parent, const char* name) :
-        QWidget( parent, name ) 
+        QWidget( parent, name )
 {
     if ( self )
         fatal( "Only one Go widget allowed" );
     self = this;
     twoplayer = FALSE;
 
-    
+
     d = bx = by = 1;
-    
-    QPixmap pix = Resource::loadPixmap( "pine" );
+
+    QPixmap pix = Resource::loadPixmap( "go/pine" );
     goBrush = new QBrush( black, pix );
     /*
     QString fn = Resource::findPixmap("Go-black");
     blackStone = new QImage( fn );
@@ -203,9 +203,9 @@ void GoWidget::resizeEvent( QResizeEvent * )
     if ( d < 10 && !smallStones ) {
         blackStone->convertFromImage( blackStone->convertToImage().smoothScale(8,8) );
         whiteStone->convertFromImage( whiteStone->convertToImage().smoothScale(8,8) );
         newBlackStone->convertFromImage( newBlackStone->convertToImage().smoothScale(8,8) );
-        
+
         smallStones = TRUE;
     } else if ( d >= 10 && smallStones ) {
         blackStone = new QPixmap(Resource::loadPixmap( "Go-black" ));
         whiteStone = new QPixmap(Resource::loadPixmap( "Go-white" ));
@@ -237,9 +237,9 @@ void GoWidget::paintEvent( QPaintEvent *e )
 {
     int i,j;
 
     int r = whiteStone->width()/2;
-    
+
     QPainter p(this);
     p.fillRect( bx - d/2, by - d/2, 19*d, 19*d, *goBrush );
 
     int xMin = QMAX( x2board(e->rect().left()), 0 );
@@ -248,9 +248,9 @@ void GoWidget::paintEvent( QPaintEvent *e )
     int yMax = QMIN( y2board(e->rect().bottom()), 18 );
 
     QColor pine( 255, 186, 89 );
     p.setPen( pine.dark() );
-    
+
     for ( i = xMin; i < xMax+1 ; i ++ ) {
         p.drawLine( bx+i*d, by, bx+i*d, by+18*d );
     }
     for ( j = yMin; j < yMax+1 ; j ++ ) {
@@ -261,13 +261,13 @@ void GoWidget::paintEvent( QPaintEvent *e )
     p.setBrush( black );
     for ( i = 3; i < xMax+1; i+=6 )
         for ( j = 3; j < yMax+1; j+=6 )
             p.drawEllipse( bx+i*d-2, by+j*d-2, 5, 5 );
-    
-    
+
+
     for ( i = xMin; i < xMax+1; i++ )
         for ( j = yMin; j < yMax+1; j++ ) {
-            if ( board[i][j] == WHITE || 
+            if ( board[i][j] == WHITE ||
                  currentPlayer==WHITE && newX == i && newY == j )
                 p.drawPixmap( bx+i*d - r, by+j*d - r, *whiteStone );
             else if ( i == lastX && j == lastY )
                 p.drawPixmap( bx+i*d - r, by+j*d - r, *newBlackStone );
@@ -393,9 +393,9 @@ void GoWidget::showStone( int x, int y, enum bVal c )
         newX = x;
         newY = y;
         refresh(x,y);
     }
-    
+
 }
 
 void GoWidget::mouseReleaseEvent( QMouseEvent * )
 {
@@ -405,9 +405,9 @@ void GoWidget::mouseReleaseEvent( QMouseEvent * )
 }
 
 void GoWidget::refresh( int x, int y )
 {
-    update( bx+d*x-d/2-1, by+d*y-d/2-1, d+2, d+2 );    
+    update( bx+d*x-d/2-1, by+d*y-d/2-1, d+2, d+2 );
 }
 
 void GoWidget::removeStone(short x, short y)
 {