author | sandman <sandman> | 2002-06-26 00:43:45 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-26 00:43:45 (UTC) |
commit | d31131a054c7ab5d42034d040dae5b72a3338085 (patch) (unidiff) | |
tree | 8e4796072b772450ee0f41a23dd570482363a65a /core/applets | |
parent | b970aebbdfc7e6f811c9b75ee62ad9370f74ace0 (diff) | |
download | opie-d31131a054c7ab5d42034d040dae5b72a3338085.zip opie-d31131a054c7ab5d42034d040dae5b72a3338085.tar.gz opie-d31131a054c7ab5d42034d040dae5b72a3338085.tar.bz2 |
Added FIFO history entries for the last 5 cut/copy operations.
-rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 102 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboard.h | 20 |
2 files changed, 92 insertions, 30 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 203e23e..181f4bf 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -20,17 +20,18 @@ | |||
20 | 20 | ||
21 | #include "clipboard.h" | 21 | #include "clipboard.h" |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | 24 | ||
25 | #include <qpainter.h> | 25 | #include <qpainter.h> |
26 | #include <qpopupmenu.h> | 26 | #include <qpopupmenu.h> |
27 | #include <qwindowsystem_qws.h> | 27 | #include <qwindowsystem_qws.h> |
28 | #include <qmessagebox.h> | 28 | #include <qapplication.h> |
29 | #include <qclipboard.h> | ||
29 | #include <qtimer.h> | 30 | #include <qtimer.h> |
30 | 31 | ||
31 | //=========================================================================== | 32 | //=========================================================================== |
32 | 33 | ||
33 | /* XPM */ | 34 | /* XPM */ |
34 | static const char * paste_xpm[] = { | 35 | static const char * paste_xpm[] = { |
35 | "14 16 64 1", | 36 | "14 16 64 1", |
36 | " c None", | 37 | " c None", |
@@ -114,64 +115,119 @@ static const char * paste_xpm[] = { | |||
114 | " ...$mljnn0qd.", | 115 | " ...$mljnn0qd.", |
115 | " 4.......,"}; | 116 | " 4.......,"}; |
116 | 117 | ||
117 | 118 | ||
118 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 119 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
119 | { | 120 | { |
120 | setFixedWidth ( 14 ); | 121 | setFixedWidth ( 14 ); |
121 | setFixedHeight ( 18 ); | 122 | setFixedHeight ( 18 ); |
122 | clipboardPixmap = QPixmap ( paste_xpm ); | 123 | m_clipboardPixmap = QPixmap ( paste_xpm ); |
123 | menu = 0; | 124 | |
125 | QTimer *timer = new QTimer ( this ); | ||
126 | |||
127 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); | ||
128 | connect ( timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); | ||
129 | |||
130 | timer-> start ( 1000 ); | ||
131 | |||
132 | m_menu = 0; | ||
133 | m_dirty = true; | ||
134 | m_lasttext = QString::null; | ||
124 | } | 135 | } |
125 | 136 | ||
126 | ClipboardApplet::~ClipboardApplet ( ) | 137 | ClipboardApplet::~ClipboardApplet ( ) |
127 | { | 138 | { |
128 | } | 139 | } |
129 | 140 | ||
130 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) | 141 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) |
131 | { | 142 | { |
132 | if ( !menu ) { | 143 | if ( m_dirty ) { |
133 | menu = new QPopupMenu ( this ); | 144 | delete m_menu; |
134 | menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 0 ); | 145 | |
135 | menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 1 ); | 146 | m_menu = new QPopupMenu ( this ); |
136 | menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 2 ); | 147 | m_menu-> setCheckable ( true ); |
137 | connect ( menu, SIGNAL( activated ( int )), this, SLOT( action ( int ))); | 148 | |
149 | if ( m_history. count ( )) { | ||
150 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { | ||
151 | QString str = m_history [i]; | ||
152 | |||
153 | if ( str. length ( ) > 20 ) | ||
154 | str = str. left ( 20 ) + "..."; | ||
155 | |||
156 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); | ||
157 | m_menu-> setItemChecked ( i, false ); | ||
158 | } | ||
159 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); | ||
160 | m_menu-> insertSeparator ( ); | ||
161 | } | ||
162 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); | ||
163 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); | ||
164 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); | ||
165 | |||
166 | connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int ))); | ||
167 | |||
168 | m_dirty = false; | ||
138 | } | 169 | } |
139 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); | 170 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); |
140 | QSize s = menu-> sizeHint ( ); | 171 | QSize s = m_menu-> sizeHint ( ); |
141 | 172 | ||
142 | menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ))); | 173 | m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ))); |
143 | } | 174 | } |
144 | 175 | ||
145 | void ClipboardApplet::action(int id) | 176 | void ClipboardApplet::action(int id) |
146 | { | 177 | { |
147 | ushort unicode=0; | 178 | ushort unicode = 0; |
148 | int scan=0; | 179 | int scan = 0; |
149 | 180 | ||
150 | switch ( id ) { | 181 | switch ( id ) { |
151 | case 0: | 182 | case 100: |
152 | unicode='X'-'@'; | 183 | unicode = 'X' - '@'; |
153 | scan=Key_X; // Cut | 184 | scan = Key_X; // Cut |
185 | break; | ||
186 | case 101: | ||
187 | unicode = 'C' - '@'; | ||
188 | scan = Key_C; // Copy | ||
154 | break; | 189 | break; |
155 | case 1: | 190 | case 102: |
156 | unicode='C'-'@'; | 191 | unicode = 'V' - '@'; |
157 | scan=Key_C; // Copy | 192 | scan = Key_V; // Paste |
158 | break; | 193 | break; |
159 | case 2: | 194 | |
160 | unicode='V'-'@'; | 195 | default: |
161 | scan=Key_V; // Paste | 196 | if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) { |
197 | QApplication::clipboard ( )-> setText ( m_history [id] ); | ||
198 | |||
199 | for ( uint i = 0; i < m_history. count ( ); i++ ) | ||
200 | m_menu-> setItemChecked ( i, i == uint( id )); | ||
201 | |||
202 | unicode = 'V' - '@'; | ||
203 | scan = Key_V; | ||
204 | } | ||
162 | break; | 205 | break; |
163 | } | 206 | } |
164 | 207 | ||
165 | if ( scan ) { | 208 | if ( scan ) { |
166 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); | 209 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); |
167 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); | 210 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); |
168 | } | 211 | } |
169 | } | 212 | } |
170 | 213 | ||
171 | void ClipboardApplet::paintEvent ( QPaintEvent* ) | 214 | void ClipboardApplet::paintEvent ( QPaintEvent* ) |
172 | { | 215 | { |
173 | QPainter p ( this ); | 216 | QPainter p ( this ); |
174 | p. drawPixmap ( 0, 1, clipboardPixmap ); | 217 | p. drawPixmap ( 0, 1, m_clipboardPixmap ); |
175 | } | 218 | } |
176 | 219 | ||
220 | void ClipboardApplet::newData ( ) | ||
221 | { | ||
222 | QCString type = "plain"; | ||
223 | QString txt = QApplication::clipboard ( )-> text ( type ); | ||
224 | |||
225 | if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) { | ||
226 | m_history. append ( txt ); | ||
177 | 227 | ||
228 | if ( m_history. count ( ) > 5 ) | ||
229 | m_history. remove ( m_history. begin ( )); | ||
230 | |||
231 | m_dirty = true; | ||
232 | } | ||
233 | } | ||
diff --git a/core/applets/clipboardapplet/clipboard.h b/core/applets/clipboardapplet/clipboard.h index 9dd59ed..84743d9 100644 --- a/core/applets/clipboardapplet/clipboard.h +++ b/core/applets/clipboardapplet/clipboard.h | |||
@@ -17,31 +17,37 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef __CLIPBOARD_APPLET_H__ | 20 | #ifndef __CLIPBOARD_APPLET_H__ |
21 | #define __CLIPBOARD_APPLET_H__ | 21 | #define __CLIPBOARD_APPLET_H__ |
22 | 22 | ||
23 | #include <qwidget.h> | 23 | #include <qwidget.h> |
24 | #include <qpixmap.h> | 24 | #include <qpixmap.h> |
25 | #include <qstringlist.h> | ||
25 | 26 | ||
26 | class ClipboardApplet : public QWidget | 27 | class ClipboardApplet : public QWidget |
27 | { | 28 | { |
28 | Q_OBJECT | 29 | Q_OBJECT |
29 | public: | 30 | public: |
30 | ClipboardApplet( QWidget *parent = 0, const char *name=0 ); | 31 | ClipboardApplet ( QWidget *parent = 0, const char *name=0 ); |
31 | ~ClipboardApplet(); | 32 | ~ClipboardApplet ( ); |
32 | 33 | ||
33 | protected: | 34 | protected: |
34 | void mousePressEvent( QMouseEvent *); | 35 | void mousePressEvent ( QMouseEvent *); |
35 | void paintEvent( QPaintEvent* ); | 36 | void paintEvent ( QPaintEvent* ); |
36 | 37 | ||
37 | private slots: | 38 | private slots: |
38 | void action(int); | 39 | void action ( int ); |
40 | void newData ( ); | ||
39 | 41 | ||
40 | private: | 42 | private: |
41 | QPopupMenu* menu; | 43 | QPopupMenu * m_menu; |
42 | QPixmap clipboardPixmap; | 44 | QStringList m_history; |
45 | bool m_dirty; | ||
46 | QString m_lasttext; | ||
47 | |||
48 | QPixmap m_clipboardPixmap; | ||
43 | }; | 49 | }; |
44 | 50 | ||
45 | 51 | ||
46 | #endif // __CLIPBOARD_APPLET_H__ | 52 | #endif // __CLIPBOARD_APPLET_H__ |
47 | 53 | ||