summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -354,29 +354,29 @@ QWidget *Appearance::createAdvancedTab ( QWidget *parent, Config &cfg )
QLabel* rotlabel = new QLabel( tr( "Rotation direction:" ), tab );
m_rotdir_cw = new QRadioButton( tab, "rotdir_cw" );
m_rotdir_ccw = new QRadioButton( tab, "rotdir_ccw" );
m_rotdir_flip = new QRadioButton( tab, "rotdir_flip" );
QButtonGroup* rotbtngrp = new QButtonGroup( tab, "rotbuttongroup" );
rotbtngrp-> hide ( );
rotbtngrp-> setExclusive ( true );
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 );
rotLay-> addWidget ( rotlabel, 0 );
rotLay-> addWidget ( m_rotdir_cw, 0 );
rotLay-> addWidget ( m_rotdir_ccw, 0 );
rotLay-> addWidget ( m_rotdir_flip, 0 );
int rotDirection = cfg.readNumEntry( "rotatedir" );
ODirection rot = CW;
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
@@ -75,28 +75,28 @@ public:
oline++;
}
}
}
static void init ( )
{
static bool init = false;
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 );
s_fontpix [1] = new QPixmap ( );
s_fontpix [1]-> convertFromImage ( fontimg );
s_stylepix [0] = new QPixmap ( );
s_stylepix [0]-> convertFromImage ( styleimg );
overlay ( styleimg, noimg );
s_stylepix [1] = new QPixmap ( );
s_stylepix [1]-> convertFromImage ( styleimg );
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
@@ -23,27 +23,28 @@
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#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>
#include <stdio.h>
class StyleListItem : public QListBoxText {
public:
StyleListItem ( const QString &t, QStyle *sty ) : QListBoxText ( t )
{
m_lib = 0;