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 | |||
@@ -12,47 +12,45 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
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> |
31 | #include <qclipboard.h> | 32 | #include <qclipboard.h> |
32 | #include <qtimer.h> | 33 | #include <qtimer.h> |
33 | 34 | ||
34 | //=========================================================================== | 35 | //=========================================================================== |
35 | 36 | ||
36 | 37 | ||
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())); |
53 | 51 | ||
54 | m_menu = 0; | 52 | m_menu = 0; |
55 | m_dirty = true; | 53 | m_dirty = true; |
56 | m_lasttext = QString::null; | 54 | m_lasttext = QString::null; |
57 | 55 | ||
58 | m_timer-> start ( 0, true ); | 56 | m_timer-> start ( 0, true ); |
@@ -87,27 +85,27 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *) | |||
87 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { | 85 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { |
88 | QString str = m_history [i]; | 86 | QString str = m_history [i]; |
89 | 87 | ||
90 | if ( str. length ( ) > 20 ) | 88 | if ( str. length ( ) > 20 ) |
91 | str = str. left ( 20 ) + "..."; | 89 | str = str. left ( 20 ) + "..."; |
92 | 90 | ||
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 )); |
108 | QSize s = m_menu-> sizeHint ( ); | 106 | QSize s = m_menu-> sizeHint ( ); |
109 | 107 | ||
110 | m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ))); | 108 | m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ))); |
111 | } | 109 | } |
112 | 110 | ||
113 | void ClipboardApplet::action(int id) | 111 | void ClipboardApplet::action(int id) |