author | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 12:14:56 (UTC) |
commit | 0c74629e8f5c12a9b5a282b817f884fa10dee491 (patch) (side-by-side diff) | |
tree | 3294663b92023f8d24d68a01022e011a3c94002d /noncore/games/solitaire/canvascardwindow.cpp | |
parent | 46ce5afcfbe7be19f4d5ac0fed6886a0759f1a25 (diff) | |
download | opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.zip opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.gz opie-0c74629e8f5c12a9b5a282b817f884fa10dee491.tar.bz2 |
Merge from the 1.0.x release
Diffstat (limited to 'noncore/games/solitaire/canvascardwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/solitaire/canvascardwindow.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp index dec5591..c12344a 100644 --- a/noncore/games/solitaire/canvascardwindow.cpp +++ b/noncore/games/solitaire/canvascardwindow.cpp @@ -38,4 +38,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) { setIcon( Resource::loadPixmap( "cards" ) ); + setCaption(tr("Patience")); // Create Playing Area for Games @@ -46,5 +47,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) } else { QPixmap bg; - bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither ); + bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither ); canvas.setBackgroundPixmap(bg); } @@ -67,5 +68,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub()), CTRL+Key_F); menu->insertItem(tr("&Game"), file); - + menu->insertSeparator(); @@ -92,5 +93,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub())); menu->insertItem(tr("Play"), file); - + menu->insertSeparator(); @@ -119,5 +120,5 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) cardGame = new PatienceCardGame( &canvas, snapOn, this ); cardGame->setNumberToDraw(drawThree ? 3 : 1); - + setCaption(tr("Patience")); setCentralWidget(cardGame); @@ -187,5 +188,5 @@ void CanvasCardWindow::resizeEvent(QResizeEvent *) void CanvasCardWindow::initPatience() { - // Create New Game + // Create New Game if ( cardGame ) delete cardGame; @@ -254,5 +255,5 @@ void CanvasCardWindow::initTeeclub() } cardGame = new TeeclubCardGame( &canvas, snapOn, this ); - cardGame->setNumberToDraw(1); + cardGame->setNumberToDraw(1); gameType = 4; setCaption(tr("Teeclub")); @@ -260,5 +261,5 @@ void CanvasCardWindow::initTeeclub() cardGame->newGame(); setCardBacks(); -} +} |