author | drw <drw> | 2005-05-21 20:11:55 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-21 20:11:55 (UTC) |
commit | afb929e7fd04ecdfec2799a5cf9cf298d1af77c6 (patch) (unidiff) | |
tree | 5db439fca569cf1349220f3fbbf155405d13a80d /noncore/games/mindbreaker/mindbreaker.cpp | |
parent | d56ca82c22c3ac6b7dfb0bb7b4d5a0e5ad1ff4f1 (diff) | |
download | opie-afb929e7fd04ecdfec2799a5cf9cf298d1af77c6.zip opie-afb929e7fd04ecdfec2799a5cf9cf298d1af77c6.tar.gz opie-afb929e7fd04ecdfec2799a5cf9cf298d1af77c6.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'noncore/games/mindbreaker/mindbreaker.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/mindbreaker/mindbreaker.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp index 1f554d2..aa4afd7 100644 --- a/noncore/games/mindbreaker/mindbreaker.cpp +++ b/noncore/games/mindbreaker/mindbreaker.cpp | |||
@@ -17,13 +17,14 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "mindbreaker.h" | 21 | #include "mindbreaker.h" |
22 | 22 | ||
23 | #include <qtopia/resource.h> | 23 | #include <opie2/oresource.h> |
24 | |||
24 | #include <qtopia/config.h> | 25 | #include <qtopia/config.h> |
25 | #include <qtopia/qpeapplication.h> | 26 | #include <qtopia/qpeapplication.h> |
26 | #include <qtoolbar.h> | 27 | #include <qtoolbar.h> |
27 | 28 | ||
28 | #include <qtoolbutton.h> | 29 | #include <qtoolbutton.h> |
29 | #include <qmessagebox.h> | 30 | #include <qmessagebox.h> |
@@ -136,13 +137,13 @@ private: | |||
136 | int Peg::eggLevel = 0; | 137 | int Peg::eggLevel = 0; |
137 | QVector<QImage> Peg::normalPegs; | 138 | QVector<QImage> Peg::normalPegs; |
138 | QVector<QImage> Peg::specialPegs; | 139 | QVector<QImage> Peg::specialPegs; |
139 | 140 | ||
140 | void Peg::buildImages() | 141 | void Peg::buildImages() |
141 | { | 142 | { |
142 | QImage pegs = Resource::loadImage("mindbreaker/pegs"); | 143 | QImage pegs = Opie::Core::OResource::loadImage("mindbreaker/pegs"); |
143 | int x = 0; | 144 | int x = 0; |
144 | int y = 0; | 145 | int y = 0; |
145 | int i; | 146 | int i; |
146 | eggLevel = 0; | 147 | eggLevel = 0; |
147 | normalPegs.resize(10); | 148 | normalPegs.resize(10); |
148 | for (i = 0; i < 6; i++) { | 149 | for (i = 0; i < 6; i++) { |
@@ -154,13 +155,13 @@ void Peg::buildImages() | |||
154 | for (i = 0; i < 5; i++) { | 155 | for (i = 0; i < 5; i++) { |
155 | specialPegs.insert(i, new QImage(pegs.copy(x,y,peg_size, peg_size). | 156 | specialPegs.insert(i, new QImage(pegs.copy(x,y,peg_size, peg_size). |
156 | smoothScale(adjusted_peg_size, adjusted_peg_size) )); | 157 | smoothScale(adjusted_peg_size, adjusted_peg_size) )); |
157 | x += peg_size; | 158 | x += peg_size; |
158 | } | 159 | } |
159 | 160 | ||
160 | QImage image = Resource::loadImage("mindbreaker/mindbreaker"); | 161 | QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); |
161 | /* copy from master image to functional images */ | 162 | /* copy from master image to functional images */ |
162 | x = 0; | 163 | x = 0; |
163 | y = panel_height; | 164 | y = panel_height; |
164 | normalPegs.insert(8, | 165 | normalPegs.insert(8, |
165 | new QImage( image.copy(x, y, panel_width, panel_height). | 166 | new QImage( image.copy(x, y, panel_width, panel_height). |
166 | smoothScale( adjusted_panel_width, adjusted_panel_height) | 167 | smoothScale( adjusted_panel_width, adjusted_panel_height) |
@@ -286,15 +287,15 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) | |||
286 | 287 | ||
287 | setToolBarsMovable( FALSE ); | 288 | setToolBarsMovable( FALSE ); |
288 | 289 | ||
289 | QToolBar *tb = new QToolBar(this); | 290 | QToolBar *tb = new QToolBar(this); |
290 | tb->setHorizontalStretchable( TRUE ); | 291 | tb->setHorizontalStretchable( TRUE ); |
291 | 292 | ||
292 | QIconSet newicon = Resource::loadIconSet("new"); | 293 | QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), tr("New Game"), 0, |
293 | new QToolButton(newicon, tr("New Game"), 0, | 294 | board, SLOT(clear()), tb, "NewGame"); |
294 | board, SLOT(clear()), tb, "NewGame"); | 295 | btn->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); |
295 | 296 | ||
296 | score = new QToolButton(tb); | 297 | score = new QToolButton(tb); |
297 | score->setText(""); | 298 | score->setText(""); |
298 | score->setMaximumHeight(20); | 299 | score->setMaximumHeight(20); |
299 | score->setUsesTextLabel(TRUE); | 300 | score->setUsesTextLabel(TRUE); |
300 | tb->setStretchableWidget(score); | 301 | tb->setStretchableWidget(score); |
@@ -480,13 +481,13 @@ void MindBreakerBoard::doFixSize() | |||
480 | writeConfig(); | 481 | writeConfig(); |
481 | 482 | ||
482 | setupBoardSize(s.width() - fw, s.height() - fw); | 483 | setupBoardSize(s.width() - fw, s.height() - fw); |
483 | canvas()->resize(s.width() - fw, s.height() - fw); | 484 | canvas()->resize(s.width() - fw, s.height() - fw); |
484 | Peg::buildImages(); // must be done BEFORE any pegs are made | 485 | Peg::buildImages(); // must be done BEFORE any pegs are made |
485 | 486 | ||
486 | QImage image = Resource::loadImage("mindbreaker/mindbreaker"); | 487 | QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); |
487 | 488 | ||
488 | /* copy from master image to functional images */ | 489 | /* copy from master image to functional images */ |
489 | int x = 0; | 490 | int x = 0; |
490 | int y = 0; | 491 | int y = 0; |
491 | panelImage = image.copy(x, y, panel_width, panel_height). | 492 | panelImage = image.copy(x, y, panel_width, panel_height). |
492 | smoothScale( adjusted_panel_width, adjusted_panel_height); | 493 | smoothScale( adjusted_panel_width, adjusted_panel_height); |