diff solitaire_ori/canvascard.cpp solitaire/canvascard.cpp 23c23 < #include --- > //#include 102,103c102,103 < cardsFaces = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_face_small" ) ); < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001_small" ) ); --- > cardsFaces = new QPixmap( "cards/card_face_small.png") ; > cardsBacks = new QPixmap( "cards/card_back0001_small.png" ); 105c105 < *cardsChars = Opie::Core::OResource::loadPixmap( "cards/card_chars_small" ); --- > *cardsChars = QPixmap( "cards/card_chars_small.png" ); 107c107 < *cardsSuits = Opie::Core::OResource::loadPixmap( "cards/card_suits_small" ); --- > *cardsSuits = QPixmap( "cards/card_suits_small.png" ); 109,110c109,110 < cardsFaces = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_face" ) ); < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001" ) ); --- > cardsFaces = new QPixmap( "cards/card_face.png" ) ; > cardsBacks = new QPixmap( "cards/card_back0001.png" ); 112c112 < *cardsChars = Opie::Core::OResource::loadPixmap( "cards/card_chars" ); --- > *cardsChars = QPixmap( "cards/card_chars.png" ); 114c114 < *cardsSuits = Opie::Core::OResource::loadPixmap( "cards/card_suits" ); --- > *cardsSuits = QPixmap( "cards/card_suits.png" ); 139c139 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001_small" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0001_small.png" ); break; 141c141 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0002_small" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0002_small.png" ); break; 143c143 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0003_small" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0003_small.png" ); break; 145c145 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0004_small" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0004_small.png" ); break; 147c147 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0005_small" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0005_small.png" ) ; break; 152c152 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0001.png" ); break; 154c154 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0002" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0002.png" ); break; 156c156 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0003" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0003.png" ); break; 158c158 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0004" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0004.png" ); break; 160c160 < cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0005" ) ); break; --- > cardsBacks = new QPixmap( "cards/card_back0005.png" ); break; diff solitaire_ori/canvascardwindow.cpp solitaire/canvascardwindow.cpp 26,27c26,31 < < #include --- > #include > #include > #include > #include > #include > //#include 30c34 < QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0), --- > ZMainWidget( "Solitaire", false, parent, name, f), canvas(240, 260), snapOn(TRUE), cardBack(4), gameType(0), 33,34c37,47 < setIcon( Opie::Core::OResource::loadPixmap( "cards" ) ); < setCaption(tr("Patience")); --- > setGeometry(0,0,240,320); > // showFullScreen(); > // setIcon( QPixmap( "cards.png" ) ); > // setCaption(tr("Patience")); > cst = new UTIL_CST(this, "new"); > setCSTWidget(cst); > ZPushButton *wp; > > wp = cst->getRightBtn(); > connect(wp, SIGNAL(clicked()), qApp, SLOT(slotQuickQuit())); > 43c56 < bg.convertFromImage( Opie::Core::OResource::loadImage( "table_pattern" ), ThresholdDither ); --- > bg.convertFromImage( QImage("table_pattern.png" ), ThresholdDither ); 80c93,94 < QMenuBar* menu = menuBar(); --- > // QMenuBar* menu = menuBar(); > 88c102,104 < menu->insertItem(tr("Play"), file); --- > wp = cst->getMidBtn(); > wp->setPopup(file); > // menu->insertItem(tr("Play"), file); 90c106 < menu->insertSeparator(); --- > // menu->insertSeparator(); 99c115,117 < menu->insertItem(tr("Settings"),settings); --- > settings->insertSeparator(); > settings->insertItem(tr("About"), this, SLOT(help())); > // menu->insertItem(tr("Settings"),settings); 101c119,121 < --- > // menu->insertItem(tr("Quit"), qApp, SLOT(slotQuickQuit())); > wp = cst->getLeftBtn(); > wp->setPopup(settings); 104c124 < menu->show(); --- > // menu->show(); 115a136,140 > cst->getMidBtn()->setText("Patience"); > // setCaption(tr("Patience")); > > //setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); 117,118d141 < setCaption(tr("Patience")); < setCentralWidget(cardGame); 123,124c146,150 < setCaption(tr("Freecell")); < setCentralWidget(cardGame); --- > // setCaption(tr("Freecell")); > cst->getMidBtn()->setText("Freecell"); > // setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > 131,132c157,162 < setCaption(tr("Chicane")); < setCentralWidget(cardGame); --- > // setCaption(tr("Chicane")); > cst->getMidBtn()->setText("Chicane"); > // setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > > 138,139c168,173 < setCaption(tr("Harp")); < setCentralWidget(cardGame); --- > // setCaption(tr("Harp")); > cst->getMidBtn()->setText("Harp"); > // setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > > 145,146c179,184 < setCaption(tr("Teeclub")); < setCentralWidget(cardGame); --- > //setCaption(tr("Teeclub")); > cst->getMidBtn()->setText("Teeclub"); > // setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > > 155a194 > 157a197,199 > void CanvasCardWindow::help() { > ZMessageBox::information(this, QPixmap("Solitaire.png"), "Solitaire EZX
Motorola E680I/A780
(c) 2006 Y.S Hsiao

Based on OPIE's Solitaire

Licensed under the GNU General Public License.", "Okay"); > } 176c218,221 < QSize s = centralWidget()->size(); --- > // QSize s = getContentWidget()->size(); > QSize s(240,260); > // QSize s = cardGame->size(); > 186c231 < delete cardGame; --- > delete cardGame; 187a233 > 190,191c236,240 < setCaption(tr("Patience")); < setCentralWidget(cardGame); --- > // setCaption(tr("Patience")); > cst->getMidBtn()->setText("Patience"); > setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > 206,207c255,259 < setCaption(tr("Freecell")); < setCentralWidget(cardGame); --- > //setCaption(tr("Freecell")); > cst->getMidBtn()->setText("Freecell"); > setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > 218c270 < } --- > } 222,223c274,279 < setCaption(tr("Chicane")); < setCentralWidget(cardGame); --- > //setCaption(tr("Chicane")); > cst->getMidBtn()->setText("Chicane"); > setContentWidget(cardGame); > > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > 232c288 < delete cardGame; --- > delete cardGame; 234c290 < cardGame = new HarpCardGame( &canvas, snapOn, this ); --- > cardGame = new HarpCardGame( &canvas, snapOn, this ); 237,238c293,297 < setCaption(tr("Harp")); < setCentralWidget(cardGame); --- > //setCaption(tr("Harp")); > cst->getMidBtn()->setText("Harp"); > setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > 253,254c312,316 < setCaption(tr("Teeclub")); < setCentralWidget(cardGame); --- > // setCaption(tr("Teeclub")); > cst->getMidBtn()->setText("Teeclub"); > setContentWidget(cardGame); > cardGame->setGeometry(0,getTitleBarWidget()->height(),240,260); > diff solitaire_ori/canvascardwindow.h solitaire/canvascardwindow.h 24c24 < #include --- > #include 26c26 < --- > #include 32c32 < class CanvasCardWindow : public QMainWindow { --- > class CanvasCardWindow : public ZMainWidget { 51a52 > void help(); 67a69 > UTIL_CST *cst; Common subdirectories: solitaire_ori/CVS and solitaire/CVS diff solitaire_ori/main.cpp solitaire/main.cpp 21a22,46 > #include > #include > #include > #include > #include > //#include > > //using namespace Opie::Core; > //OPIE_EXPORT_APP( OApplicationFactory ) > > > int > main(int argc, char *argv[]) > { > ZApplication app(argc, argv); > printf("Patience for Motorola E680I/A780 port by intoxicated/YS Hsiao\n"); > > CanvasCardWindow ccw; > QWallpaper wa; > wa.setAppWallpaperMode(QWallpaper::Off); > > app.setMainWidget(&ccw); > ccw.show(); > return app.exec(); > } 23d47 < #include 25,26d48 < using namespace Opie::Core; < OPIE_EXPORT_APP( OApplicationFactory ) \ No newline at end of file Only in solitaire: Makefile Common subdirectories: solitaire_ori/pics and solitaire/pics diff solitaire_ori/solitaire.pro solitaire/solitaire.pro 15,20d14 < INCLUDEPATH += $(OPIEDIR)/include < DEPENDPATH += $(OPIEDIR)/include < LIBS += -lqpe -lopiecore2 < < < include( $(OPIEDIR)/include.pro ) Only in solitaire: trans.cpp