Diffstat (limited to 'noncore/styles/theme/othemebase.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/styles/theme/othemebase.cpp | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp index 62b3a11..7ce4e5a 100644 --- a/noncore/styles/theme/othemebase.cpp +++ b/noncore/styles/theme/othemebase.cpp | |||
@@ -14,26 +14,28 @@ | |||
14 | along with this library; see the file COPYING.LIB. If not, write to | 14 | along with this library; see the file COPYING.LIB. If not, write to |
15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 15 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
16 | Boston, MA 02111-1307, USA. | 16 | Boston, MA 02111-1307, USA. |
17 | */ | 17 | */ |
18 | |||
18 | #include "othemebase.h" | 19 | #include "othemebase.h" |
19 | #include "ogfxeffect.h" | 20 | #include "ogfxeffect.h" |
21 | |||
22 | /* OPIE */ | ||
23 | #include <opie2/odebug.h> | ||
20 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
21 | //#include <kdebug.h> | ||
22 | //#include <klocale.h> | ||
23 | #include <qpe/config.h> | 25 | #include <qpe/config.h> |
24 | //#include <kglobal.h> | 26 | using namespace Opie::Core; |
25 | //#include <kglobalsettings.h> | 27 | |
26 | //#include <kstddirs.h> | 28 | /* QT */ |
27 | #include <qfile.h> | 29 | #include <qfile.h> |
28 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
29 | #include <qdir.h> | 31 | #include <qdir.h> |
30 | #include <qpainter.h> | 32 | #include <qpainter.h> |
31 | #include <qbitmap.h> | 33 | #include <qbitmap.h> |
32 | #include <stdlib.h> | ||
33 | #include <qstringlist.h> | 34 | #include <qstringlist.h> |
34 | 35 | ||
35 | #include <stdio.h> | 36 | /* STD */ |
37 | #include <stdlib.h> | ||
36 | 38 | ||
37 | 39 | ||
38 | template class QIntCache<OThemePixmap> | 40 | template class QIntCache<OThemePixmap> |
39 | ; | 41 | ; |
@@ -261,29 +263,23 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ ) | |||
261 | configFileName = cfg. readEntry ( "Theme", "default" ); | 263 | configFileName = cfg. readEntry ( "Theme", "default" ); |
262 | } | 264 | } |
263 | Config config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File ); | 265 | Config config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File ); |
264 | 266 | ||
265 | //printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii()); | ||
266 | |||
267 | // Are we initalized? | 267 | // Are we initalized? |
268 | applyMiscResourceGroup( &config ); | 268 | applyMiscResourceGroup( &config ); |
269 | for ( i = 0; i < INHERIT_ITEMS; ++i ) { | 269 | for ( i = 0; i < INHERIT_ITEMS; ++i ) { |
270 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 270 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
271 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | ||
272 | } | 271 | } |
273 | for ( ; i < INHERIT_ITEMS*2; ++i ) { | 272 | for ( ; i < INHERIT_ITEMS*2; ++i ) { |
274 | if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) { | 273 | if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) { |
275 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 274 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
276 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | ||
277 | } | 275 | } |
278 | else { | 276 | else { |
279 | copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ]; | 277 | copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ]; |
280 | // printf ( "%d [%s]: copy=%s\n", i, widgetEntries [i], copyfrom [i].latin1()); | ||
281 | } | 278 | } |
282 | } | 279 | } |
283 | for ( ; i < WIDGETS; ++i ) { | 280 | for ( ; i < WIDGETS; ++i ) { |
284 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); | 281 | applyResourceGroup( &config, i, copyfrom, pixnames, brdnames ); |
285 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() ); | ||
286 | } | 282 | } |
287 | 283 | ||
288 | // initalize defaults that may not be read | 284 | // initalize defaults that may not be read |
289 | for ( i = 0; i < WIDGETS; ++i ) | 285 | for ( i = 0; i < WIDGETS; ++i ) |
@@ -294,9 +290,8 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ ) | |||
294 | splitterWidth = 10; | 290 | splitterWidth = 10; |
295 | 291 | ||
296 | for ( i = 0; i < WIDGETS; ++i ) { | 292 | for ( i = 0; i < WIDGETS; ++i ) { |
297 | readResourceGroup( i, copyfrom, pixnames, brdnames, loaded ); | 293 | readResourceGroup( i, copyfrom, pixnames, brdnames, loaded ); |
298 | // printf ( "%d [%s]: copy=%s, pix=%s, brd=%s, colors=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1(), (colors[i]?colors[i]->background().name().latin1():"<none)" )); | ||
299 | } | 294 | } |
300 | 295 | ||
301 | // misc items | 296 | // misc items |
302 | readMiscResourceGroup(); | 297 | readMiscResourceGroup(); |
@@ -406,9 +401,9 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget ) | |||
406 | if ( pixmaps[ widget ] ) | 401 | if ( pixmaps[ widget ] ) |
407 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, | 402 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, |
408 | widget ); | 403 | widget ); |
409 | else | 404 | else |
410 | qDebug( "We would have inserted a null pixmap!\n" ); | 405 | odebug << "We would have inserted a null pixmap!\n" << oendl; |
411 | pixmaps[ widget ] = cachePix; | 406 | pixmaps[ widget ] = cachePix; |
412 | } | 407 | } |
413 | else { | 408 | else { |
414 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget ); | 409 | cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget ); |