| author | drw <drw> | 2005-06-09 20:47:58 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-06-09 20:47:58 (UTC) |
| commit | 650c69e864bdfa61137e028efde767527c3c1562 (patch) (side-by-side diff) | |
| tree | 69c425ba79f1d9252e65819082c91dedfd450900 | |
| parent | ccc819750468aa161255e863dac4d2ca55ace253 (diff) | |
| download | opie-650c69e864bdfa61137e028efde767527c3c1562.zip opie-650c69e864bdfa61137e028efde767527c3c1562.tar.gz opie-650c69e864bdfa61137e028efde767527c3c1562.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 8 | ||||
| -rw-r--r-- | noncore/settings/appearance2/config.in | 2 | ||||
| -rw-r--r-- | noncore/settings/appearance2/exceptlistitem.h | 8 | ||||
| -rw-r--r-- | noncore/settings/appearance2/stylelistitem.h | 3 |
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 @@ -362,13 +362,13 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg ) rotbtngrp-> insert ( m_rotdir_cw ); rotbtngrp-> insert ( m_rotdir_ccw ); rotbtngrp-> insert ( m_rotdir_flip ); - QImage ccwImage = Resource::loadImage( "redo" ); + QImage ccwImage = Opie::Core::OResource::loadImage( "redo", Opie::Core::OResource::SmallIcon ); QPixmap cw, ccw, flip; - cw.convertFromImage( ccwImage.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - ccw.convertFromImage( ccwImage.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ).mirror( 1, 0 ) ); - flip.convertFromImage( Resource::loadImage( "pass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + cw.convertFromImage( ccwImage ); + ccw.convertFromImage( ccwImage.mirror( 1, 0 ) ); + flip.convertFromImage( Opie::Core::OResource::loadImage( "pass", Opie::Core::OResource::SmallIcon ) ); m_rotdir_cw-> setPixmap( cw ); m_rotdir_ccw-> setPixmap( ccw ); m_rotdir_flip-> setPixmap( flip ); 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 @@ config APPEARANCE2 boolean "opie-appearance (control color, widget view etc)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBQTAUX + 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 @@ -83,12 +83,12 @@ public: if ( init ) return; - QImage noimg = Resource::loadImage ( "appearance/no.png" ); - QImage fontimg = Resource::loadImage ( "appearance/font.png" ); - QImage styleimg = Resource::loadImage ( "appearance/style.png" ); - QImage decoimg = Resource::loadImage ( "appearance/deco.png" ); + QImage noimg = Opie::Core::OResource::loadImage ( "appearance/no.png", Opie::Core::OResource::SmallIcon ); + QImage fontimg = Opie::Core::OResource::loadImage ( "appearance/font.png", Opie::Core::OResource::SmallIcon ); + QImage styleimg = Opie::Core::OResource::loadImage ( "appearance/style.png", Opie::Core::OResource::SmallIcon ); + QImage decoimg = Opie::Core::OResource::loadImage ( "appearance/deco.png", Opie::Core::OResource::SmallIcon ); s_fontpix [0] = new QPixmap ( ); s_fontpix [0]-> convertFromImage ( fontimg ); overlay ( fontimg, noimg ); 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 @@ -31,11 +31,12 @@ #ifndef STYLELISTITEM_H #define STYLELISTITEM_H /* OPIE */ +#include <opie2/oresource.h> + #include <qpe/styleinterface.h> #include <qpe/qlibrary.h> -#include <qpe/resource.h> /* QT */ #include <qlistbox.h> #include <qfileinfo.h> |