Backing out unintentional merge from TT branch.

16 files changed, 291 insertions, 345 deletions

diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index fca9797..8567b30 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -51,2 +51,4 @@ static QPixmap *whiteStone;
 
+static bool smallStones = FALSE;
+
 GoMainWidget::GoMainWidget( QWidget *parent, const char* name) :
@@ -199,2 +201,15 @@ void GoWidget::resizeEvent( QResizeEvent * )
     by = (height() - 18*d)/2 ;
+
+    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" ));
+	newBlackStone = new QPixmap(Resource::loadPixmap( "Go-black-highlight" ));
+	smallStones = FALSE;
+    }
 }
diff --git a/noncore/games/minesweep/minefield.h b/noncore/games/minesweep/minefield.h
index 4ede435..1349c35 100644
--- a/noncore/games/minesweep/minefield.h
+++ b/noncore/games/minesweep/minefield.h
@@ -22,3 +22,3 @@
 
-#include <qtable.h>
+#include <qscrollview.h>
 
@@ -27,3 +27,3 @@ class Config;
 
-class MineField : public QTable
+class MineField : public QScrollView
 {
@@ -43,2 +43,3 @@ public:
 
+    void setAvailableRect( const QRect & );
 public slots:
@@ -54,13 +55,18 @@ signals:
 protected:
-    void paintFocus( QPainter*, const QRect& );
-    void viewportMousePressEvent( QMouseEvent* );
-    void viewportMouseReleaseEvent( QMouseEvent* );
+
+    void contentsMousePressEvent( QMouseEvent* );
+    void contentsMouseReleaseEvent( QMouseEvent* );
     void keyPressEvent( QKeyEvent* );
     void keyReleaseEvent( QKeyEvent* );
-
+    void drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph );
+    
     int getHint( int row, int col );
-    void setHint( Mine* );
+    void setHint( int r, int c );
     void updateMine( int row, int col );
     void paletteChange( const QPalette & );
-
+    void updateCell( int r, int c );
+    bool onBoard( int r, int c ) const { return r >= 0 && r < numRows && c >= 0 && c < numCols; }
+    Mine *mine( int row, int col ) { return onBoard(row, col ) ? mines[row+numCols*col] : 0; }
+    const Mine *mine( int row, int col ) const { return onBoard(row, col ) ? mines[row+numCols*col] : 0; }
+    
 protected slots:
@@ -71,2 +77,5 @@ protected slots:
 private:
+    int findCellSize();
+    void setCellSize( int );
+    
     State stat;
@@ -79,2 +88,4 @@ private:
     int currCol;
+    int numRows, numCols;
+    
     int minecount;
@@ -83,3 +94,6 @@ private:
     int lev;
+    QRect availableRect;
+    int cellSize;
     QTimer *holdTimer;
+    Mine **mines;
 };
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 6492462..c84fe53 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -221,2 +221,19 @@ void ResultIndicator::timerEvent( QTimerEvent *te )
 
+class MineFrame : public QFrame
+{
+public:
+    MineFrame( QWidget *parent, const char *name = 0 )
+	:QFrame( parent, name ) {}
+    void setField( MineField *f ) { field = f; }
+protected:
+    void resizeEvent( QResizeEvent *e ) {
+	field->setAvailableRect( contentsRect());
+	QFrame::resizeEvent(e); 
+    }
+private:
+    MineField *field;
+};
+
+
+
 MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
@@ -228,4 +245,6 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
 
-    QPEToolBar *menuToolBar = new QPEToolBar( this );
-    QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar );
+    QPEToolBar *toolBar = new QPEToolBar( this );
+    toolBar->setHorizontalStretchable( TRUE );
+
+    QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
 
@@ -237,5 +256,2 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
     menuBar->insertItem( tr("Game"), gameMenu );
-
-    QPEToolBar *toolBar = new QPEToolBar( this );
-    toolBar->setHorizontalStretchable( TRUE );
     
@@ -267,13 +283,12 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
 
-    addToolBar( menuToolBar );
     addToolBar( toolBar );
 
-    QFrame *mainframe = new QFrame( this );
+    MineFrame *mainframe = new MineFrame( this );
     mainframe->setFrameShape( QFrame::Box );
     mainframe->setFrameShadow( QFrame::Raised );
-    mainframe->setMargin(5);
+
     mainframe->setLineWidth(2);
-    QBoxLayout *box = new QVBoxLayout( mainframe );
+
     field = new MineField( mainframe );
-    box->addWidget( field, 0, AlignCenter );
+    mainframe->setField( field );
     QFont fnt = field->font();
diff --git a/noncore/games/snake/interface.h b/noncore/games/snake/interface.h
index 30c7f84..454d4ee 100644
--- a/noncore/games/snake/interface.h
+++ b/noncore/games/snake/interface.h
@@ -38,3 +38,2 @@ public:
     void createTargets();
-    void welcomescreen();
 
@@ -53,2 +52,3 @@ private slots:
     void scoreInc();
+    void welcomescreen();
  
diff --git a/noncore/games/snake/obstacle.cpp b/noncore/games/snake/obstacle.cpp
index 2d07fe7..4bdefa5 100644
--- a/noncore/games/snake/obstacle.cpp
+++ b/noncore/games/snake/obstacle.cpp
@@ -25,16 +25,35 @@
 
-Obstacle::Obstacle(QCanvas* canvas, int x, int y)
-         : QCanvasSprite(0, canvas)
+
+
+Obstacle::Obstacle(QCanvas* canvas, int y)
+         : QCanvasSprite(0,canvas)
 {
-   newObstacle(x, y);
+    newObstacle(y);
 } 
 
-void Obstacle::newObstacle(int x, int y)
+void Obstacle::newObstacle(int y)
 {
-   QCanvasPixmapArray* obstaclearray = new QCanvasPixmapArray(Resource::findPixmap("snake/wall.png"));
- 
+   QPixmap obstaclePix( Resource::findPixmap("snake/wall.png") );
+   
+   if ( obstaclePix.width() > canvas()->width()*3/5 ) {
+       int w = canvas()->width()*3/5;
+       w = w - w % 16;
+       obstaclePix.resize( w, obstaclePix.height() );
+   }
+
+   QList<QPixmap> pixl;
+   pixl.append( &obstaclePix );
+
+   QPoint nullp;
+   QList<QPoint> pl;
+   pl.append( &nullp );
+   
+   QCanvasPixmapArray* obstaclearray = new QCanvasPixmapArray(pixl, pl);
    setSequence(obstaclearray);
- 
+   
+   int x = ( canvas()->width() - obstaclePix.width() )/2;
+   x = x - x % 16;
+   y = y - y % 16;
    move(x, y);
- 
+   setZ( -100 );
    show();
diff --git a/noncore/games/snake/obstacle.h b/noncore/games/snake/obstacle.h
index 838917f..b3c7846 100644
--- a/noncore/games/snake/obstacle.h
+++ b/noncore/games/snake/obstacle.h
@@ -25,5 +25,5 @@ class Obstacle : public QCanvasSprite
 public:
-   Obstacle(QCanvas*, int x, int y);
+   Obstacle(QCanvas*, int y);
    ~Obstacle();
-   void newObstacle(int x, int y);
+   void newObstacle(int y);
    int rtti() const;
diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp
index ae3c859..7c4a5ba 100644
--- a/noncore/games/solitaire/canvascard.cpp
+++ b/noncore/games/solitaire/canvascard.cpp
@@ -29,2 +29,3 @@
 #include <qbitmap.h>
+#include <qgfx_qws.h> // Needed to get the device's width
 
@@ -104,6 +105,13 @@ CanvasCard::CanvasCard( eValue v, eSuit s, bool f, QCanvas *canvas ) :
     if ( !cardsFaces ) {
-	cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face" ) );
-	cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) );
-	cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars" ) );
-	cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits" ) );
+	if ( qt_screen->deviceWidth() < 200 ) {
+	    cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face_small" ) );
+	    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) );
+	    cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars_small" ) );
+	    cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits_small" ) );
+	} else {
+	    cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face" ) );
+	    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) );
+	    cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars" ) );
+	    cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits" ) );
+	}
 	cardsCharsUpsideDown = Create180RotatedBitmap( cardsChars );
@@ -128,13 +136,28 @@ void CanvasCard::setCardBack(int b)
 
-	switch (cardBack) {
-	    case 0:
-		cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); break;
-	    case 1:
-		cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002" ) ); break;
-	    case 2:
-		cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003" ) ); break;
-	    case 3:
-		cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004" ) ); break;
-	    case 4:
-		cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005" ) ); break;
+	if ( qt_screen->deviceWidth() < 200 ) {
+	    switch (cardBack) {
+		case 0:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) ); break;
+		case 1:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002_small" ) ); break;
+		case 2:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003_small" ) ); break;
+		case 3:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004_small" ) ); break;
+		case 4:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005_small" ) ); break;
+	    }
+	} else {
+	    switch (cardBack) {
+		case 0:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); break;
+		case 1:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002" ) ); break;
+		case 2:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003" ) ); break;
+		case 3:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004" ) ); break;
+		case 4:
+		    cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005" ) ); break;
+	    }
 	}
@@ -183,7 +206,15 @@ void CanvasCard::draw(QPainter &painter)
 
-	p->drawPixmap( ix +      0, iy +     0, *cardsFaces );
-	p->drawPixmap( ix +      4, iy +     4, *cardsChars, 7*(getValue()-1), 0, 7, 7 );
-	p->drawPixmap( ix +     12, iy +     4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 );
-	p->drawPixmap( ix +  w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 );
-	p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 );
+	if ( qt_screen->deviceWidth() < 200 ) {
+	    p->drawPixmap( ix +      0, iy +     0, *cardsFaces );
+	    p->drawPixmap( ix +      3, iy +     3, *cardsChars, 5*(getValue()-1), 0, 5, 6 );
+	    p->drawPixmap( ix +     11, iy +     3, *cardsSuits, 5*(getSuit()-1), 0, 5, 6 );
+	    p->drawPixmap( ix +  w-3-5, iy + h-3-6, *cardsCharsUpsideDown, 5*(12-getValue()+1), 0, 5, 6 );
+	    p->drawPixmap( ix + w-11-5, iy + h-3-6, *cardsSuitsUpsideDown, 5*(3-getSuit()+1), 0, 5, 6 );
+	} else {
+	    p->drawPixmap( ix +      0, iy +     0, *cardsFaces );
+	    p->drawPixmap( ix +      4, iy +     4, *cardsChars, 7*(getValue()-1), 0, 7, 7 );
+	    p->drawPixmap( ix +     12, iy +     4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 );
+	    p->drawPixmap( ix +  w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 );
+	    p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 );
+	}
 
diff --git a/noncore/games/solitaire/canvasshapes.cpp b/noncore/games/solitaire/canvasshapes.cpp
index 28d0b4e..6ccd4a4 100644
--- a/noncore/games/solitaire/canvasshapes.cpp
+++ b/noncore/games/solitaire/canvasshapes.cpp
@@ -21,2 +21,3 @@
 #include <qcanvas.h>
+#include <qgfx_qws.h>
 #include "canvasshapes.h"
@@ -25,3 +26,3 @@
 CanvasRoundRect::CanvasRoundRect(int x, int y, QCanvas *canvas) :
-	QCanvasRectangle( x, y, 23, 36, canvas)
+	QCanvasRectangle( x, y, ( qt_screen->deviceWidth() < 200 ) ? 20 : 23, ( qt_screen->deviceWidth() < 200 ) ? 27 : 36, canvas)
 {
@@ -41,3 +42,6 @@ void CanvasRoundRect::drawShape(QPainter &p)
 {
-    p.drawRoundRect( (int)x(), (int)y(), 23, 36);
+    if ( qt_screen->deviceWidth() < 200 )
+	p.drawRoundRect( (int)x() + 1, (int)y() + 1, 18, 25);
+    else
+	p.drawRoundRect( (int)x(), (int)y(), 23, 36);
 }
@@ -75,16 +79,34 @@ void CanvasCircleOrCross::drawShape(QPainter &p)
 {
-    int x1 = (int)x(), y1 = (int)y();
-    // Green circle
-    if (circleShape == TRUE) {
-	p.setPen( QPen( QColor(0x10, 0xE0, 0x10), 1 ) );
-	p.drawEllipse( x1 - 1, y1 - 1, 21, 21);
-	p.drawEllipse( x1 - 1, y1 - 0, 21, 19);
-	p.drawEllipse( x1 + 0, y1 + 0, 19, 19);
-	p.drawEllipse( x1 + 1, y1 + 0, 17, 19);
-	p.drawEllipse( x1 + 1, y1 + 1, 17, 17);
-    // Red cross
+    if ( qt_screen->deviceWidth() < 200 ) {
+	int x1 = (int)x(), y1 = (int)y();
+	// Green circle
+	if (circleShape == TRUE) {
+	    p.setPen( QPen( QColor(0x10, 0xE0, 0x10), 1 ) );
+	    p.drawEllipse( x1 - 1, y1 - 1, 17, 17);
+	    p.drawEllipse( x1 - 1, y1 - 0, 17, 15);
+	    p.drawEllipse( x1 + 0, y1 + 0, 15, 15);
+	    p.drawEllipse( x1 + 1, y1 + 0, 13, 15);
+	    p.drawEllipse( x1 + 1, y1 + 1, 13, 13);
+	// Red cross
+	} else {
+	    p.setPen( QPen( QColor(0xE0, 0x10, 0x10), 4 ) );
+	    p.drawLine( x1, y1, x1 + 14, y1 + 14);
+	    p.drawLine( x1 + 14, y1, x1, y1 + 14);
+	}
     } else {
-	p.setPen( QPen( QColor(0xE0, 0x10, 0x10), 5 ) );
-	p.drawLine( x1, y1, x1 + 20, y1 + 20);
-	p.drawLine( x1 + 20, y1, x1, y1 + 20);
+	int x1 = (int)x(), y1 = (int)y();
+	// Green circle
+	if (circleShape == TRUE) {
+	    p.setPen( QPen( QColor(0x10, 0xE0, 0x10), 1 ) );
+	    p.drawEllipse( x1 - 1, y1 - 1, 21, 21);
+	    p.drawEllipse( x1 - 1, y1 - 0, 21, 19);
+	    p.drawEllipse( x1 + 0, y1 + 0, 19, 19);
+	    p.drawEllipse( x1 + 1, y1 + 0, 17, 19);
+	    p.drawEllipse( x1 + 1, y1 + 1, 17, 17);
+	// Red cross
+	} else {
+	    p.setPen( QPen( QColor(0xE0, 0x10, 0x10), 5 ) );
+	    p.drawLine( x1, y1, x1 + 20, y1 + 20);
+	    p.drawLine( x1 + 20, y1, x1, y1 + 20);
+	}
     }
diff --git a/noncore/games/solitaire/freecellcardgame.cpp b/noncore/games/solitaire/freecellcardgame.cpp
index e82afd4..98415aa 100644
--- a/noncore/games/solitaire/freecellcardgame.cpp
+++ b/noncore/games/solitaire/freecellcardgame.cpp
@@ -19,2 +19,3 @@
 **********************************************************************/
+#include <qgfx_qws.h>
 #include "freecellcardgame.h"
@@ -31,4 +32,8 @@ FreecellCardGame::FreecellCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
 
+    int spaceBetweenPiles = ( qt_screen->deviceWidth() < 200 ) ? 21 : 28;
+    int xOrigin = ( qt_screen->deviceWidth() < 200 ) ? 0 : 5;
+    int spacing = ( qt_screen->deviceWidth() < 200 ) ? 0 : 0;
+
     for (int i = 0; i < 4; i++) {
-	freecellPiles[i] = new FreecellFreecellPile( 5 + i * 28, 10, canvas() );
+	freecellPiles[i] = new FreecellFreecellPile( xOrigin + i * spaceBetweenPiles, 10, canvas() );
 	addCardPile(freecellPiles[i]);
@@ -36,3 +41,3 @@ FreecellCardGame::FreecellCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
     for (int i = 0; i < 4; i++) {
-	discardPiles[i] = new FreecellDiscardPile( 125 + i * 28, 10, canvas() );
+	discardPiles[i] = new FreecellDiscardPile( xOrigin + spacing + 6 + (i + 4) * spaceBetweenPiles, 10, canvas() );
 	addCardPile(discardPiles[i]);
@@ -40,3 +45,3 @@ FreecellCardGame::FreecellCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
     for (int i = 0; i < 8; i++) {
-	workingPiles[i] = new FreecellWorkingPile( 10 + i * 28, 50, canvas() );
+	workingPiles[i] = new FreecellWorkingPile( xOrigin + spacing + 2 + i * spaceBetweenPiles, 50, canvas() );
 	addCardPile(workingPiles[i]);
diff --git a/noncore/games/solitaire/patiencecardgame.cpp b/noncore/games/solitaire/patiencecardgame.cpp
index 5a9326a..1501d2f 100644
--- a/noncore/games/solitaire/patiencecardgame.cpp
+++ b/noncore/games/solitaire/patiencecardgame.cpp
@@ -19,2 +19,3 @@
 **********************************************************************/
+#include <qgfx_qws.h>
 #include "patiencecardgame.h"
@@ -30,15 +31,31 @@ PatienceCardGame::PatienceCardGame(QCanvas *c, bool snap, QWidget *parent) : Can
 
-    circleCross = new CanvasCircleOrCross( 7, 18, canvas() );
-    rectangle = new CanvasRoundRect(  35, 10, canvas() );
+    if ( qt_screen->deviceWidth() < 200 ) {
+	circleCross = new CanvasCircleOrCross( 7, 16, canvas() );
+	rectangle = new CanvasRoundRect(  30, 10, canvas() );
 
-    for (int i = 0; i < 4; i++) {
-	discardPiles[i] = new PatienceDiscardPile( 110 + i * 30, 10, canvas() );
-	addCardPile(discardPiles[i]);
-    }
-    for (int i = 0; i < 7; i++) {
-	workingPiles[i] = new PatienceWorkingPile( 10 + i * 30, 50, canvas() );
-	addCardPile(workingPiles[i]);
+	for (int i = 0; i < 4; i++) {
+	    discardPiles[i] = new PatienceDiscardPile( 78 + i * 23, 10, canvas() );
+	    addCardPile(discardPiles[i]);
+	}
+	for (int i = 0; i < 7; i++) {
+	    workingPiles[i] = new PatienceWorkingPile( 5 + i * 23, 50, canvas() );
+	    addCardPile(workingPiles[i]);
+	}
+	faceDownDealingPile = new PatienceFaceDownDeck( 5, 10, canvas() );
+	faceUpDealingPile   = new PatienceFaceUpDeck( 30, 10, canvas() );
+    } else {
+	circleCross = new CanvasCircleOrCross( 7, 18, canvas() );
+	rectangle = new CanvasRoundRect(  35, 10, canvas() );
+
+	for (int i = 0; i < 4; i++) {
+	    discardPiles[i] = new PatienceDiscardPile( 110 + i * 30, 10, canvas() );
+	    addCardPile(discardPiles[i]);
+	}
+	for (int i = 0; i < 7; i++) {
+	    workingPiles[i] = new PatienceWorkingPile( 10 + i * 30, 50, canvas() );
+	    addCardPile(workingPiles[i]);
+	}
+	faceDownDealingPile = new PatienceFaceDownDeck( 5, 10, canvas() );
+	faceUpDealingPile   = new PatienceFaceUpDeck( 35, 10, canvas() );
     }
-    faceDownDealingPile = new PatienceFaceDownDeck( 5, 10, canvas() );
-    faceUpDealingPile   = new PatienceFaceUpDeck( 35, 10, canvas() );
 }
@@ -175,3 +192,6 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
 
-	    item->flipTo( 35, (int)item->y() );
+	    if ( qt_screen->deviceWidth() < 200 )
+		item->flipTo( 30, (int)item->y() );
+	    else
+		item->flipTo( 35, (int)item->y() );
 	}
@@ -197,3 +217,6 @@ bool PatienceCardGame::mousePressCard( Card *card, QPoint p )
 
-		item->flipTo( 35, (int)item->y(), 8 * flipped );
+		if ( qt_screen->deviceWidth() < 200 )
+		    item->flipTo( 30, (int)item->y(), 8 * flipped );
+		else
+		    item->flipTo( 35, (int)item->y(), 8 * flipped );
 	    }
diff --git a/noncore/games/solitaire/patiencecardgame.h b/noncore/games/solitaire/patiencecardgame.h
index c4f6c48..0d0e3d5 100644
--- a/noncore/games/solitaire/patiencecardgame.h
+++ b/noncore/games/solitaire/patiencecardgame.h
@@ -27,2 +27,3 @@
 #include <qcanvas.h>
+#include <qgfx_qws.h>
 // #include "canvascardshapes.h"
@@ -132,2 +133,3 @@ public:
 	    if ( newTopCard->isFacing() == FALSE ) {
+		int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
 		// correct the position taking in to account the card is not
@@ -136,3 +138,3 @@ public:
 		newTopCard->flipTo( top.x(), top.y() );
-		top = QPoint( top.x(), top.y() + 13 );
+		top = QPoint( top.x(), top.y() + offsetDown );
 	    }
@@ -147,3 +149,4 @@ public:
 	    if (card->isFacing()) {
-		y += 13;    
+		int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
+		y += offsetDown; 
 	    } else {
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp
index ca4352d..16d37b3 100644
--- a/noncore/games/wordgame/wordgame.cpp
+++ b/noncore/games/wordgame/wordgame.cpp
@@ -61,2 +61,9 @@ enum RuleEffects {
 
+static int tile_smallw = 16;
+static int tile_smallh = 16;
+static int tile_bigw = 22;
+static int tile_bigh = 22;
+static int tile_stweak = -2;
+static int tile_btweak = -1;
+
 static const int rack_tiles=7;
@@ -113,2 +120,11 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) :
 {
+    if ( qApp->desktop()->width() < 240 ) {
+	tile_smallw = 10;
+	tile_smallh = 10;
+	tile_bigw = 16;
+	tile_bigh = 16;
+	tile_stweak = 0;
+	tile_btweak = 0;
+    }
+
     setIcon( Resource::loadPixmap( "wordgame" ) );
@@ -249,2 +265,3 @@ void WordGame::startGame(const QStringList& playerlist)
     racks = new QWidgetStack(vbox);
+    racks->setFixedHeight(TileItem::bigHeight()+2);
     namelist.clear();
@@ -285,3 +302,2 @@ bool WordGame::loadRules(const QString &name)
 
-    QPixmap bgshapes = Resource::loadPixmap(shapepixmap);
     QString rule_shapes;
@@ -299,2 +315,8 @@ bool WordGame::loadRules(const QString &name)
     }
+
+    QImage shim = Resource::loadImage(shapepixmap);
+    shim = shim.smoothScale((re-1)*TileItem::smallWidth(),TileItem::smallHeight());
+    QPixmap bgshapes;
+    bgshapes.convertFromImage(shim);
+
     rule_effects[re++] = 100; // default bonus
@@ -683,3 +705,3 @@ int TileItem::smallWidth()
 {
-    return 16;
+    return tile_smallw;
 }
@@ -688,3 +710,3 @@ int TileItem::smallHeight()
 {
-    return 16;
+    return tile_smallh;
 }
@@ -693,3 +715,3 @@ int TileItem::bigWidth()
 {
-    return 22;
+    return tile_bigw;
 }
@@ -698,3 +720,3 @@ int TileItem::bigHeight()
 {
-    return 22;
+    return tile_bigh;
 }
@@ -722,5 +744,15 @@ void TileItem::drawShape(QPainter& p)
 {
-    static QFont value_font("heletica",8);
-    static QFont big_font("smoothtimes",17);
-    static QFont small_font("smoothtimes",10);
+    static QFont *value_font=0;
+    static QFont *big_font=0;
+    static QFont *small_font=0;
+    if ( !value_font ) {
+	value_font = new QFont("helvetica",8);
+	if ( TileItem::bigWidth() < 20 ) {
+	    big_font = new QFont("helvetica",12);
+	    small_font = new QFont("helvetica",8);
+	} else {
+	    big_font = new QFont("smoothtimes",17);
+	    small_font = new QFont("smoothtimes",10);
+	}
+    }
 
@@ -730,3 +762,3 @@ void TileItem::drawShape(QPainter& p)
     if ( big ) {
-	p.setFont(value_font);
+	p.setFont(*value_font);
 	QString n = QString::number(t.value());
@@ -735,9 +767,9 @@ void TileItem::drawShape(QPainter& p)
 	w *= n.length();
-	QRect valuearea(x()+width()-w-2,y()+height()-h+1,w,h);
+	QRect valuearea(x()+width()-w-1,y()+height()-h,w,h);
 	p.drawText(valuearea,AlignCenter,n);
-	p.setFont(big_font);
-	area = QRect(x(),y(),width()-2,height()-1);
+	p.setFont(*big_font);
+	area = QRect(x(),y()+tile_btweak,width()-4,height()-1);
     } else {
-	p.setFont(small_font);
-	area = QRect(x(),y()+2,width(),height()-2);
+	p.setFont(*small_font);
+	area = QRect(x()+1+tile_stweak,y()+1,width(),height()-3);
     }
@@ -752,2 +784,3 @@ Board::Board(QPixmap bgshapes, int w, int h, QWidget* parent) :
 {
+    setFixedSize(w*TileItem::smallWidth(),h*TileItem::smallHeight());
     grid = new TileItem*[w*h];
@@ -766,2 +799,7 @@ Board::~Board()
 
+QSize Board::sizeHint() const
+{
+    return QSize(canvas()->width(),canvas()->height());
+}
+
 void Board::writeConfig(Config& cfg)
@@ -1183,2 +1221,7 @@ Rack::~Rack()
 
+QSize Rack::sizeHint() const
+{
+    return QSize(-1,TileItem::bigHeight()+2);
+}
+
 void Rack::clear()
diff --git a/noncore/games/wordgame/wordgame.h b/noncore/games/wordgame/wordgame.h
index 0ffa56a..f73c85a 100644
--- a/noncore/games/wordgame/wordgame.h
+++ b/noncore/games/wordgame/wordgame.h
@@ -150,2 +150,4 @@ public:
 
+    QSize sizeHint() const;
+
 protected:
@@ -213,2 +215,4 @@ public:
 
+    QSize sizeHint() const;
+
 signals:
@@ -333,3 +337,3 @@ private:
     QToolBar* toolbar;
-    QVBox *vbox;
+    QWidget *vbox;
     Board *board;
diff --git a/noncore/multimedia/showimg/settingsdialog.cpp b/noncore/multimedia/showimg/settingsdialog.cpp
deleted file mode 100644
index d21f4cb..0000000
--- a/noncore/multimedia/showimg/settingsdialog.cpp
+++ b/dev/null
@@ -1,57 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#include "settingsdialog.h"
-#include <qslider.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-
-SettingsDialog::SettingsDialog( QWidget *parent, const char *name, bool modal, WFlags f )
-    : SettingsDialogBase( parent, name, modal, f )
-{
-    connect( delaySlider, SIGNAL(valueChanged(int)), this, SLOT(delayChanged(int)) );
-}
-
-void SettingsDialog::setDelay( int d )
-{
-    delaySlider->setValue( d );
-    delayChanged( d );
-}
-
-int SettingsDialog::delay() const
-{
-    return delaySlider->value();
-}
-
-void SettingsDialog::setRepeat( bool r )
-{
-    repeatCheck->setChecked( r );
-}
-
-bool SettingsDialog::repeat() const
-{
-    return repeatCheck->isChecked();
-}
-
-void SettingsDialog::delayChanged( int d )
-{
-    delayText->setText( QString::number( d ) + " s" );
-}
-
diff --git a/noncore/multimedia/showimg/settingsdialog.h b/noncore/multimedia/showimg/settingsdialog.h
deleted file mode 100644
index 6dfd2c4..0000000
--- a/noncore/multimedia/showimg/settingsdialog.h
+++ b/dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
-#ifndef SETTINGSDIALOG_H
-#define SETTINGSDIALOG_H
-
-#include "settingsdialogbase.h"
-
-class SettingsDialog : public SettingsDialogBase
-{
-    Q_OBJECT
-public:
-    SettingsDialog( QWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
-
-    void setDelay( int d );
-    int delay() const;
-    void setRepeat( bool r );
-    bool repeat() const;
-
-private slots:
-    void delayChanged( int );
-};
-
-
-#endif
diff --git a/noncore/multimedia/showimg/settingsdialogbase.ui b/noncore/multimedia/showimg/settingsdialogbase.ui
deleted file mode 100644
index ed404d8..0000000
--- a/noncore/multimedia/showimg/settingsdialogbase.ui
+++ b/dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>SettingsDialogBase</class>
-<widget>
-    <class>QDialog</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>SettingsDialogBase</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>227</width>
-            <height>258</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Preferences</string>
-    </property>
-    <vbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget>
-            <class>QGroupBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>GroupBox1</cstring>
-            </property>
-            <property stdset="1">
-                <name>title</name>
-                <string>Slide Show</string>
-            </property>
-            <vbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget>
-                    <class>QCheckBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>repeatCheck</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Repeat</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout1</cstring>
-                    </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabel1</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Delay</string>
-                            </property>
-                        </widget>
-                        <widget>
-                            <class>QSlider</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>delaySlider</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>minValue</name>
-                                <number>5</number>
-                            </property>
-                            <property stdset="1">
-                                <name>maxValue</name>
-                                <number>60</number>
-                            </property>
-                            <property stdset="1">
-                                <name>lineStep</name>
-                                <number>5</number>
-                            </property>
-                            <property stdset="1">
-                                <name>orientation</name>
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property stdset="1">
-                                <name>tickmarks</name>
-                                <enum>Right</enum>
-                            </property>
-                            <property stdset="1">
-                                <name>tickInterval</name>
-                                <number>10</number>
-                            </property>
-                        </widget>
-                        <widget>
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>delayText</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>minimumSize</name>
-                                <size>
-                                    <width>25</width>
-                                    <height>0</height>
-                                </size>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>s</string>
-                            </property>
-                            <property stdset="1">
-                                <name>alignment</name>
-                                <set>AlignVCenter|AlignRight</set>
-                            </property>
-                            <property>
-                                <name>hAlign</name>
-                            </property>
-                        </widget>
-                    </hbox>
-                </widget>
-            </vbox>
-        </widget>
-    </vbox>
-</widget>
-</UI>