1 files changed, 150 insertions, 37 deletions

diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index 506e87a..f425e06 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -22,4 +22,9 @@
 
+#include "fifteenconfigdialog.h"
+
+#include <opie2/ofileselector.h>
+
 #include <qtopia/resource.h>
 #include <qtopia/config.h>
+#include <qtopia/qpeapplication.h>
 
@@ -31,2 +36,3 @@
 #include <qmenubar.h>
+#include <qimage.h>
 
@@ -38,2 +44,3 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
 {
+
   // random seed
@@ -66,2 +73,8 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
 
+
+  a  = new QAction( tr("Configure"), Resource::loadPixmap( "SettingsIcon" ),
+                    QString::null, 0, this, 0 );
+  connect( a, SIGNAL( activated()), table, SLOT( slotConfigure()) );
+  a->addTo( game );
+
     /* This is pointless and confusing.
@@ -76,4 +89,11 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f
 
+
+
+
+///////////////
+///////  Pieces table Implementation
+///////
 PiecesTable::PiecesTable(QWidget* parent, const char* name )
-  : QTableView(parent, name), _menu(0), _randomized(false)
+  : QTableView(parent, name), _menu(0), _randomized(false),
+    _dialog( 0l )
 {
@@ -92,9 +112,5 @@ PiecesTable::PiecesTable(QWidget* parent, const char* name )
 
-  // set font
-  QFont f = font();
-  f.setPixelSize(18);
-  f.setBold( TRUE );
-  setFont(f);
 }
 
+
 PiecesTable::~PiecesTable()
@@ -102,2 +118,3 @@ PiecesTable::~PiecesTable()
   writeConfig();
+  clear();
 }
@@ -113,2 +130,3 @@ void PiecesTable::writeConfig()
   cfg.writeEntry("Randomized", _randomized );
+  cfg.writeEntry("Image", _image );
 }
@@ -121,2 +139,3 @@ void PiecesTable::readConfig()
   _randomized = cfg.readBoolEntry( "Randomized", FALSE );
+  _image = cfg.readEntry( "Image", QString::null );
   int i = 0;
@@ -127,22 +146,74 @@ void PiecesTable::readConfig()
   }
+
 }
 
-void PiecesTable::paintCell(QPainter *p, int row, int col)
-{
-  int w = cellWidth();
-  int h = cellHeight();
-  int x2 = w - 1;
-  int y2 = h - 1;
 
-  int number = _map[col + row * numCols()] + 1;
+void PiecesTable::clear() {
+    /* clean up and resize */
+    for (uint i = 0; i < _pixmap.count(); ++i )
+        delete _pixmap[i];
+    _pixmap.resize( 16 );
+}
 
-  // draw cell background
-  if(number == 16)
-    p->setBrush(colorGroup().background());
+/*
+ * Let us pre-render the tiles. Either we've a Custom Image as
+ * background or we use the drawRect  to fill the background and
+ * last we put the number on it
+ */
+void PiecesTable::slotCustomImage( const QString& _str , bool upd ) {
+    QString str = _str;
+
+
+    /* couldn't load image fall back to plain tiles*/
+    QImage img = QImage(str);
+    if(img.isNull())
+        str = QString::null;
   else
-    p->setBrush(_colors[number-1]);
-  p->setPen(NoPen);
-  p->drawRect(0, 0, w, h);
+        img = img.smoothScale( width(),height() );
+
+    QPixmap pix;
+    pix.convertFromImage( img );
+
+    uint image=0;
+
+    clear();
+
+    /* used variables */
+    int cols = numCols();
+    int rows = numRows();
+    int cellW   = cellWidth();
+    int cellH   = cellHeight();
+    int x2      = cellW-1;
+    int y2      = cellH-1;
+    bool empty  = str.isEmpty();
+    double bw      = empty ? 0.9 : 0.98;
+            int         x_offset = cellW - int(cellW * bw);// 10% should be enough
+            inty_offset = cellH - int(cellH * bw);
 
-  if (number == 16) return;
+    /* border polygon */
+    initPolygon(cellW, cellH, x_offset, y_offset );
+
+    if ( cellW == 0 || cellH == 0 ) {
+        _pixmap.resize( 0 );
+        return;
+    }
+
+    QFont f = font();
+    f.setPixelSize(18);
+    f.setBold( TRUE );
+
+    /* for every tile */
+    for(int row = 0; row < rows; ++row ) {
+        for(int col= 0; col < cols; ++col) {
+            QPixmap *pip = new QPixmap(cellW, cellH );
+            QPainter *p = new QPainter(pip );
+            p->setFont( f );
+
+            /* draw the tradional tile  or a part of the pixmap*/
+            if(empty) {
+                p->setBrush(_colors[image]);
+                p->setPen(NoPen);
+                p->drawRect(0,0,cellW,cellH);
+            }else
+                p->drawPixmap(0, 0, pix,col*cellW, row*cellH, cellW, cellH );
 
@@ -150,6 +221,6 @@ void PiecesTable::paintCell(QPainter *p, int row, int col)
   if (height() > 40) {
-    p->setBrush(_colors[number-1].light(130));
+                p->setBrush(_colors[image].light(130));
     p->drawPolygon(light_border);
 
-    p->setBrush(_colors[number-1].dark(130));
+                p->setBrush(_colors[image].dark(130));
     p->drawPolygon(dark_border);
@@ -159,20 +230,18 @@ void PiecesTable::paintCell(QPainter *p, int row, int col)
   p->setPen(black);
-  p->drawText(0, 0, x2, y2, AlignHCenter | AlignVCenter, QString::number(number));
-}
+            p->drawText(0, 0, x2, y2, AlignHCenter | AlignVCenter, QString::number(image+1));
 
-void PiecesTable::resizeEvent(QResizeEvent *e)
-{
-  QTableView::resizeEvent(e);
-
-  setCellWidth(contentsRect().width()/ numRows());
-  setCellHeight(contentsRect().height() / numCols());
+            delete p;
+            _pixmap[image++] =  pip;
+        }
+    }
+    _image = str;
 
-  //
-  // Calculate 3d-effect borders
-  //
-          intcell_w = cellWidth();
-          intcell_h = cellHeight();
-          int   x_offset = cell_w - int(cell_w * 0.9);// 10% should be enough
-          inty_offset = cell_h - int(cell_h * 0.9);
+    if ( upd )
+        update();
+}
 
+/*
+ * Calculate 3d-effect borders
+ */
+void PiecesTable::initPolygon(int cell_w, int cell_h, int x_offset, int y_offset ) {
   light_border.setPoints(6,
@@ -194,2 +263,36 @@ void PiecesTable::resizeEvent(QResizeEvent *e)
 
+void PiecesTable::paintCell(QPainter *p, int row, int col)
+{
+  int w = cellWidth();
+  int h = cellHeight();
+
+  int number = _map[col + row * numCols()] + 1;
+
+  // draw cell background
+  if(number == 16) {
+    p->setBrush(colorGroup().background());
+    p->setPen(NoPen);
+    p->drawRect(0, 0, w, h);
+    return;
+  }
+
+  if( _pixmap.count() == 0 )
+      return;
+
+  p->drawPixmap(0, 0, *(_pixmap[(number-1 )]) );
+}
+
+void PiecesTable::resizeEvent(QResizeEvent *e)
+{
+  QTableView::resizeEvent(e);
+
+  setCellWidth(contentsRect().width()/ numRows());
+  setCellHeight(contentsRect().height() / numCols());
+
+
+  /* update the image and calculate border*/
+  slotCustomImage( _image );
+
+}
+
 void PiecesTable::initColors()
@@ -386 +489,11 @@ void PiecesTable::mousePressEvent(QMouseEvent* e)
 }
+
+void PiecesTable::slotConfigure() {
+    if ( !_dialog )
+        _dialog = new FifteenConfigDialog(this, "Fifteen Configure Dialog", true );
+
+
+    _dialog->setImageSrc( _image );
+    if ( QPEApplication::execDialog(_dialog) == QDialog::Accepted )
+        slotCustomImage( _dialog->imageSrc(), true );
+}