author | drw <drw> | 2005-04-24 21:48:43 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 21:48:43 (UTC) |
commit | 40a0b1f81d5f53fede7831707d89a840d6691bd9 (patch) (side-by-side diff) | |
tree | 9841e4cc54ef7e2347482a5219b3986940736c64 /core/applets/clipboardapplet/clipboard.cpp | |
parent | 2391cfd9c79b87b3b00a4bb4a1d76981debb4486 (diff) | |
download | opie-40a0b1f81d5f53fede7831707d89a840d6691bd9.zip opie-40a0b1f81d5f53fede7831707d89a840d6691bd9.tar.gz opie-40a0b1f81d5f53fede7831707d89a840d6691bd9.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'core/applets/clipboardapplet/clipboard.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 57a4088..a32e98b 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp @@ -21,7 +21,8 @@ #include "clipboard.h" #include <opie2/otaskbarapplet.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> + #include <qpe/applnk.h> #include <qpainter.h> @@ -40,10 +41,7 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( setFixedWidth ( AppLnk::smallIconSize() ); setFixedHeight ( AppLnk::smallIconSize() ); - QImage img = Resource::loadImage( "paste"); - img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); - - m_clipboardPixmap.convertFromImage( img ); + m_clipboardPixmap = Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ); m_timer = new QTimer ( this ); @@ -96,9 +94,9 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *) m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); m_menu-> insertSeparator ( ); } - m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); - m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); - m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); + m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "cut", Opie::Core::OResource::SmallIcon ), tr( "Cut" ), 100 ); + m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), tr( "Copy" ), 101 ); + m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), tr( "Paste" ), 102 ); connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int))); |