Diffstat (limited to 'core/applets/clipboardapplet/clipboard.cpp') (more/less context) (ignore 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 | |||
@@ -18,13 +18,14 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
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> |
28 | #include <qpopupmenu.h> | 29 | #include <qpopupmenu.h> |
29 | #include <qwindowsystem_qws.h> | 30 | #include <qwindowsystem_qws.h> |
30 | #include <qapplication.h> | 31 | #include <qapplication.h> |
@@ -37,16 +38,13 @@ | |||
37 | using namespace Opie::Ui; | 38 | using namespace Opie::Ui; |
38 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 39 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
39 | { | 40 | { |
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 | ||
50 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged()), this, SLOT( newData())); | 48 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged()), this, SLOT( newData())); |
51 | connect ( m_timer, SIGNAL( timeout()), this, SLOT( newData())); | 49 | connect ( m_timer, SIGNAL( timeout()), this, SLOT( newData())); |
52 | connect ( qApp, SIGNAL( aboutToQuit()), this, SLOT( shutdown())); | 50 | connect ( qApp, SIGNAL( aboutToQuit()), this, SLOT( shutdown())); |
@@ -93,15 +91,15 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *) | |||
93 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); | 91 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); |
94 | m_menu-> setItemChecked ( i, false ); | 92 | m_menu-> setItemChecked ( i, false ); |
95 | } | 93 | } |
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 | ||
105 | m_dirty = false; | 103 | m_dirty = false; |
106 | } | 104 | } |
107 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); | 105 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); |