summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/go/gowidget.cpp34
1 files changed, 13 insertions, 21 deletions
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index ec03c1d..bc5d788 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -24,4 +24,4 @@
24#include <opie2/odebug.h> 24#include <opie2/odebug.h>
25#include <opie2/oresource.h>
25#include <qpe/config.h> 26#include <qpe/config.h>
26#include <qpe/resource.h>
27using namespace Opie::Core; 27using namespace Opie::Core;
@@ -41,5 +41,2 @@ static int current_handicap = 1;
41static QBrush *goBrush; 41static QBrush *goBrush;
42//static QImage *newBlackStone;
43//static QImage *blackStone;
44//static QImage *whiteStone;
45static QPixmap *newBlackStone; 42static QPixmap *newBlackStone;
@@ -53,2 +50,3 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name, WFlags fl) :
53{ 50{
51 setCaption( tr( "Go" ) );
54 setToolBarsMovable( FALSE ); 52 setToolBarsMovable( FALSE );
@@ -69,3 +67,4 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name, WFlags fl) :
69 67
70 a = new QAction( tr( "Pass" ), Resource::loadPixmap( "pass" ), QString::null, 0, this, 0 ); 68 a = new QAction( tr( "Pass" ), Opie::Core::OResource::loadPixmap( "pass", Opie::Core::OResource::SmallIcon ),
69 QString::null, 0, this, 0 );
71 connect( a, SIGNAL( activated() ), go, SLOT( pass() ) ); 70 connect( a, SIGNAL( activated() ), go, SLOT( pass() ) );
@@ -75,3 +74,4 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name, WFlags fl) :
75 74
76 a = new QAction( tr( "Resign" ), Resource::loadPixmap( "reset" ), QString::null, 0, this, 0 ); 75 a = new QAction( tr( "Resign" ), Opie::Core::OResource::loadPixmap( "reset", Opie::Core::OResource::SmallIcon ),
76 QString::null, 0, this, 0 );
77 connect( a, SIGNAL( activated() ), go, SLOT( resign() ) ); 77 connect( a, SIGNAL( activated() ), go, SLOT( resign() ) );
@@ -126,15 +126,7 @@ GoWidget::GoWidget( QWidget *parent, const char* name) :
126 126
127 QPixmap pix = Resource::loadPixmap( "go/pine" ); 127 QPixmap pix = Opie::Core::OResource::loadPixmap( "go/pine" );
128 goBrush = new QBrush( black, pix ); 128 goBrush = new QBrush( black, pix );
129 /* 129 blackStone = new QPixmap(Opie::Core::OResource::loadPixmap( "Go-black" ));
130 QString fn = Resource::findPixmap("Go-black"); 130 whiteStone = new QPixmap(Opie::Core::OResource::loadPixmap( "Go-white" ));
131 blackStone = new QImage( fn ); 131 newBlackStone = new QPixmap(Opie::Core::OResource::loadPixmap( "Go-black-highlight" ));
132 fn = Resource::findPixmap("Go-black-highlight");
133 newBlackStone = new QImage( fn );
134 fn = Resource::findPixmap("Go-white");
135 whiteStone = new QImage( fn );
136 */
137 blackStone = new QPixmap(Resource::loadPixmap( "Go-black" ));
138 whiteStone = new QPixmap(Resource::loadPixmap( "Go-white" ));
139 newBlackStone = new QPixmap(Resource::loadPixmap( "Go-black-highlight" ));
140 132
@@ -206,5 +198,5 @@ void GoWidget::resizeEvent( QResizeEvent * )
206 } else if ( d >= 10 && smallStones ) { 198 } else if ( d >= 10 && smallStones ) {
207 blackStone = new QPixmap(Resource::loadPixmap( "Go-black" )); 199 blackStone = new QPixmap(Opie::Core::OResource::loadPixmap( "Go-black" ));
208 whiteStone = new QPixmap(Resource::loadPixmap( "Go-white" )); 200 whiteStone = new QPixmap(Opie::Core::OResource::loadPixmap( "Go-white" ));
209 newBlackStone = new QPixmap(Resource::loadPixmap( "Go-black-highlight" )); 201 newBlackStone = new QPixmap(Opie::Core::OResource::loadPixmap( "Go-black-highlight" ));
210 smallStones = FALSE; 202 smallStones = FALSE;