author | zecke <zecke> | 2004-02-06 10:33:09 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 10:33:09 (UTC) |
commit | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (patch) (side-by-side diff) | |
tree | ab868f654bd296d693b74c43e166a8403aa9ede4 /noncore/games/fifteen/fifteen.cpp | |
parent | 5b2b3a4147742e7053539d3c58a2a552eb830815 (diff) | |
download | opie-46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25.zip opie-46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25.tar.gz opie-46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25.tar.bz2 |
Update from Qtopia1.7 (borders on the items)
make it quicklaunchable
Diffstat (limited to 'noncore/games/fifteen/fifteen.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/fifteen/fifteen.cpp | 83 |
1 files changed, 55 insertions, 28 deletions
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp index 2e4ed94..b4e0308 100644 --- a/noncore/games/fifteen/fifteen.cpp +++ b/noncore/games/fifteen/fifteen.cpp @@ -1,6 +1,6 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the @@ -21,6 +21,6 @@ #include "fifteen.h" -#include <qpe/resource.h> -#include <qpe/config.h> +#include <qtopia/resource.h> +#include <qtopia/config.h> #include <qvbox.h> @@ -30,30 +30,24 @@ #include <qpopupmenu.h> #include <qmessagebox.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qmenubar.h> #include <qstringlist.h> #include <qapplication.h> +#include <qtoolbutton.h> #include <stdlib.h> #include <time.h> -FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name) - : QMainWindow( parent, name ) +FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags fl) + : QMainWindow( parent, name, fl ) { // random seed srand(time(0)); - - setToolBarsMovable( FALSE ); - QVBox *vbox = new QVBox( this ); - PiecesTable *table = new PiecesTable( vbox ); - setCentralWidget(vbox); + setCaption( tr("Fifteen Pieces") ); QToolBar *toolbar = new QToolBar(this); - toolbar->setHorizontalStretchable( TRUE ); - addToolBar(toolbar); - + toolbar->setHorizontalStretchable( FALSE ); QMenuBar *menubar = new QMenuBar( toolbar ); menubar->setMargin(0); - QPopupMenu *game = new QPopupMenu( this ); @@ -62,4 +56,12 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name) toolbar->setStretchableWidget( spacer ); + + setToolBarsMovable( FALSE ); + QVBox *vbox = new QVBox( this ); + PiecesTable *table = new PiecesTable( vbox ); + setCentralWidget(vbox); + + + QAction *a = new QAction( tr( "Randomize" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); @@ -68,10 +70,11 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name) a->addTo( toolbar ); - a = new QAction( tr( "Solve" ), Resource::loadPixmap( "repeat" ), + /* This is pointless and confusing. + a = new QAction( tr( "Solve" ), Resource::loadIconSet( "repeat" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), table, SLOT( slotReset() ) ); a->addTo( game ); a->addTo( toolbar ); - + */ menubar->insertItem( tr( "Game" ), game ); } @@ -110,5 +113,5 @@ void PiecesTable::writeConfig() cfg.setGroup("Game"); QStringList map; - for (unsigned int i = 0; i < 16; i++) + for (int i = 0; i < 16; i++) map.append( QString::number( _map[i] ) ); cfg.writeEntry("Map", map, '-'); @@ -122,5 +125,5 @@ void PiecesTable::readConfig() QStringList map = cfg.readListEntry("Map", '-'); _randomized = cfg.readBoolEntry( "Randomized", FALSE ); - unsigned int i = 0; + int i = 0; for ( QStringList::Iterator it = map.begin(); it != map.end(); ++it ) { _map[i] = (*it).toInt(); @@ -147,16 +150,16 @@ void PiecesTable::paintCell(QPainter *p, int row, int col) p->drawRect(0, 0, w, h); + if (number == 16) return; + // draw borders if (height() > 40) { - p->setPen(colorGroup().text()); - if(col < numCols()-1) - p->drawLine(x2, 0, x2, y2); // right border line + p->setBrush(_colors[number-1].light(130)); + p->drawPolygon(light_border); - if(row < numRows()-1) - p->drawLine(0, y2, x2, y2); // bottom boder line + p->setBrush(_colors[number-1].dark(130)); + p->drawPolygon(dark_border); } // draw number - if (number == 16) return; p->setPen(black); p->drawText(0, 0, x2, y2, AlignHCenter | AlignVCenter, QString::number(number)); @@ -169,4 +172,28 @@ void PiecesTable::resizeEvent(QResizeEvent *e) setCellWidth(contentsRect().width()/ numRows()); setCellHeight(contentsRect().height() / numCols()); + + // + // Calculate 3d-effect borders + // + int cell_w = cellWidth(); + int cell_h = cellHeight(); + int x_offset = cell_w - int(cell_w * 0.9); // 10% should be enough + int y_offset = cell_h - int(cell_h * 0.9); + + light_border.setPoints(6, + 0, 0, + cell_w, 0, + cell_w - x_offset, y_offset, + x_offset, y_offset, + x_offset, cell_h - y_offset, + 0, cell_h); + + dark_border.setPoints(6, + cell_w, 0, + cell_w, cell_h, + 0, cell_h, + x_offset, cell_h - y_offset, + cell_w - x_offset, cell_h - y_offset, + cell_w - x_offset, y_offset); } @@ -182,5 +209,5 @@ void PiecesTable::initMap() { _map.resize(16); - for (unsigned int i = 0; i < 16; i++) + for ( int i = 0; i < 16; i++) _map[i] = i; @@ -242,6 +269,6 @@ void PiecesTable::randomizeMap() // move free cell to click position _map[pos=(col + row * numCols())] = 15; - repaint(); } + repaint(); } |