-rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 14 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboardapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clipboardapplet/opie-clipboardapplet.control | 2 |
3 files changed, 8 insertions, 10 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 @@ | |||
21 | #include "clipboard.h" | 21 | #include "clipboard.h" |
22 | 22 | ||
23 | #include <opie2/otaskbarapplet.h> | 23 | #include <opie2/otaskbarapplet.h> |
24 | #include <qpe/resource.h> | 24 | #include <opie2/oresource.h> |
25 | |||
25 | #include <qpe/applnk.h> | 26 | #include <qpe/applnk.h> |
26 | 27 | ||
27 | #include <qpainter.h> | 28 | #include <qpainter.h> |
@@ -40,10 +41,7 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( | |||
40 | setFixedWidth ( AppLnk::smallIconSize() ); | 41 | setFixedWidth ( AppLnk::smallIconSize() ); |
41 | setFixedHeight ( AppLnk::smallIconSize() ); | 42 | setFixedHeight ( AppLnk::smallIconSize() ); |
42 | 43 | ||
43 | QImage img = Resource::loadImage( "paste"); | 44 | m_clipboardPixmap = Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ); |
44 | img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | ||
45 | |||
46 | m_clipboardPixmap.convertFromImage( img ); | ||
47 | 45 | ||
48 | m_timer = new QTimer ( this ); | 46 | m_timer = new QTimer ( this ); |
49 | 47 | ||
@@ -96,9 +94,9 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *) | |||
96 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); | 94 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); |
97 | m_menu-> insertSeparator ( ); | 95 | m_menu-> insertSeparator ( ); |
98 | } | 96 | } |
99 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); | 97 | m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "cut", Opie::Core::OResource::SmallIcon ), tr( "Cut" ), 100 ); |
100 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); | 98 | m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), tr( "Copy" ), 101 ); |
101 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); | 99 | m_menu-> insertItem ( Opie::Core::OResource::loadPixmap( "paste", Opie::Core::OResource::SmallIcon ), tr( "Paste" ), 102 ); |
102 | 100 | ||
103 | connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int))); | 101 | connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int))); |
104 | 102 | ||
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro index 647598d..cdd0121 100644 --- a/core/applets/clipboardapplet/clipboardapplet.pro +++ b/core/applets/clipboardapplet/clipboardapplet.pro | |||
@@ -6,7 +6,7 @@ TARGET = clipboardapplet | |||
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += | 8 | DEPENDPATH += |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
diff --git a/core/applets/clipboardapplet/opie-clipboardapplet.control b/core/applets/clipboardapplet/opie-clipboardapplet.control index e0e2d82..6596633 100644 --- a/core/applets/clipboardapplet/opie-clipboardapplet.control +++ b/core/applets/clipboardapplet/opie-clipboardapplet.control | |||
@@ -4,7 +4,7 @@ Priority: optional | |||
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Robert Griebl <sandman@handhelds.org> | 5 | Maintainer: Robert Griebl <sandman@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Clipboard applet | 8 | Description: Clipboard applet |
9 | Clipboard applet for the Opie environment taskbar. | 9 | Clipboard applet for the Opie environment taskbar. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |