summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp8
-rw-r--r--noncore/settings/appearance2/config.in2
-rw-r--r--noncore/settings/appearance2/exceptlistitem.h8
-rw-r--r--noncore/settings/appearance2/stylelistitem.h3
4 files changed, 11 insertions, 10 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index 93e28fa..eea1a19 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -360,17 +360,17 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
360 rotbtngrp-> hide ( ); 360 rotbtngrp-> hide ( );
361 rotbtngrp-> setExclusive ( true ); 361 rotbtngrp-> setExclusive ( true );
362 rotbtngrp-> insert ( m_rotdir_cw ); 362 rotbtngrp-> insert ( m_rotdir_cw );
363 rotbtngrp-> insert ( m_rotdir_ccw ); 363 rotbtngrp-> insert ( m_rotdir_ccw );
364 rotbtngrp-> insert ( m_rotdir_flip ); 364 rotbtngrp-> insert ( m_rotdir_flip );
365 365
366 QImage ccwImage = Resource::loadImage( "redo" ); 366 QImage ccwImage = Opie::Core::OResource::loadImage( "redo", Opie::Core::OResource::SmallIcon );
367 QPixmap cw, ccw, flip; 367 QPixmap cw, ccw, flip;
368 cw.convertFromImage( ccwImage.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 368 cw.convertFromImage( ccwImage );
369 ccw.convertFromImage( ccwImage.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ).mirror( 1, 0 ) ); 369 ccw.convertFromImage( ccwImage.mirror( 1, 0 ) );
370 flip.convertFromImage( Resource::loadImage( "pass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 370 flip.convertFromImage( Opie::Core::OResource::loadImage( "pass", Opie::Core::OResource::SmallIcon ) );
371 371
372 m_rotdir_cw-> setPixmap( cw ); 372 m_rotdir_cw-> setPixmap( cw );
373 m_rotdir_ccw-> setPixmap( ccw ); 373 m_rotdir_ccw-> setPixmap( ccw );
374 m_rotdir_flip-> setPixmap( flip ); 374 m_rotdir_flip-> setPixmap( flip );
375 375
376 rotLay-> addWidget ( rotlabel, 0 ); 376 rotLay-> addWidget ( rotlabel, 0 );
diff --git a/noncore/settings/appearance2/config.in b/noncore/settings/appearance2/config.in
index 9e30429..2f23c1c 100644
--- a/noncore/settings/appearance2/config.in
+++ b/noncore/settings/appearance2/config.in
@@ -1,4 +1,4 @@
1 config APPEARANCE2 1 config APPEARANCE2
2 boolean "opie-appearance (control color, widget view etc)" 2 boolean "opie-appearance (control color, widget view etc)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBQTAUX 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
diff --git a/noncore/settings/appearance2/exceptlistitem.h b/noncore/settings/appearance2/exceptlistitem.h
index 365fa90..b8cec86 100644
--- a/noncore/settings/appearance2/exceptlistitem.h
+++ b/noncore/settings/appearance2/exceptlistitem.h
@@ -81,16 +81,16 @@ public:
81 { 81 {
82 static bool init = false; 82 static bool init = false;
83 83
84 if ( init ) 84 if ( init )
85 return; 85 return;
86 86
87 QImage noimg = Resource::loadImage ( "appearance/no.png" ); 87 QImage noimg = Opie::Core::OResource::loadImage ( "appearance/no.png", Opie::Core::OResource::SmallIcon );
88 QImage fontimg = Resource::loadImage ( "appearance/font.png" ); 88 QImage fontimg = Opie::Core::OResource::loadImage ( "appearance/font.png", Opie::Core::OResource::SmallIcon );
89 QImage styleimg = Resource::loadImage ( "appearance/style.png" ); 89 QImage styleimg = Opie::Core::OResource::loadImage ( "appearance/style.png", Opie::Core::OResource::SmallIcon );
90 QImage decoimg = Resource::loadImage ( "appearance/deco.png" ); 90 QImage decoimg = Opie::Core::OResource::loadImage ( "appearance/deco.png", Opie::Core::OResource::SmallIcon );
91 91
92 s_fontpix [0] = new QPixmap ( ); 92 s_fontpix [0] = new QPixmap ( );
93 s_fontpix [0]-> convertFromImage ( fontimg ); 93 s_fontpix [0]-> convertFromImage ( fontimg );
94 overlay ( fontimg, noimg ); 94 overlay ( fontimg, noimg );
95 s_fontpix [1] = new QPixmap ( ); 95 s_fontpix [1] = new QPixmap ( );
96 s_fontpix [1]-> convertFromImage ( fontimg ); 96 s_fontpix [1]-> convertFromImage ( fontimg );
diff --git a/noncore/settings/appearance2/stylelistitem.h b/noncore/settings/appearance2/stylelistitem.h
index 613fa71..3946190 100644
--- a/noncore/settings/appearance2/stylelistitem.h
+++ b/noncore/settings/appearance2/stylelistitem.h
@@ -29,15 +29,16 @@
29*/ 29*/
30 30
31#ifndef STYLELISTITEM_H 31#ifndef STYLELISTITEM_H
32#define STYLELISTITEM_H 32#define STYLELISTITEM_H
33 33
34/* OPIE */ 34/* OPIE */
35#include <opie2/oresource.h>
36
35#include <qpe/styleinterface.h> 37#include <qpe/styleinterface.h>
36#include <qpe/qlibrary.h> 38#include <qpe/qlibrary.h>
37#include <qpe/resource.h>
38 39
39/* QT */ 40/* QT */
40#include <qlistbox.h> 41#include <qlistbox.h>
41#include <qfileinfo.h> 42#include <qfileinfo.h>
42 43
43#include <stdio.h> 44#include <stdio.h>