summaryrefslogtreecommitdiff
authorsandman <sandman>2002-07-20 22:34:42 (UTC)
committer sandman <sandman>2002-07-20 22:34:42 (UTC)
commit594dfd3535846a536cebdb3381f4858239404c49 (patch) (unidiff)
treed813fa27d282e03b732fb79985beabd3aa190064
parentd7e4bedb202300254511ad5949cb6176bcf4f37f (diff)
downloadopie-594dfd3535846a536cebdb3381f4858239404c49.zip
opie-594dfd3535846a536cebdb3381f4858239404c49.tar.gz
opie-594dfd3535846a536cebdb3381f4858239404c49.tar.bz2
Fix for a (obvious) bug that resulted in double pasting and/or hanging apps
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clipboardapplet/clipboard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 181f4bf..5848d0f 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -162,72 +162,72 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *)
162 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); 162 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
163 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); 163 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
164 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); 164 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );
165 165
166 connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int ))); 166 connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int )));
167 167
168 m_dirty = false; 168 m_dirty = false;
169 } 169 }
170 QPoint p = mapToGlobal ( QPoint ( 0, 0 )); 170 QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
171 QSize s = m_menu-> sizeHint ( ); 171 QSize s = m_menu-> sizeHint ( );
172 172
173 m_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 ( )));
174} 174}
175 175
176void ClipboardApplet::action(int id) 176void ClipboardApplet::action(int id)
177{ 177{
178 ushort unicode = 0; 178 ushort unicode = 0;
179 int scan = 0; 179 int scan = 0;
180 180
181 switch ( id ) { 181 switch ( id ) {
182 case 100: 182 case 100:
183 unicode = 'X' - '@'; 183 unicode = 'X' - '@';
184 scan = Key_X; // Cut 184 scan = Key_X; // Cut
185 break; 185 break;
186 case 101: 186 case 101:
187 unicode = 'C' - '@'; 187 unicode = 'C' - '@';
188 scan = Key_C; // Copy 188 scan = Key_C; // Copy
189 break; 189 break;
190 case 102: 190 case 102:
191 unicode = 'V' - '@'; 191 unicode = 'V' - '@';
192 scan = Key_V; // Paste 192 scan = Key_V; // Paste
193 break; 193 break;
194 194
195 default: 195 default:
196 if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) { 196 if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) {
197 QApplication::clipboard ( )-> setText ( m_history [id] ); 197 QApplication::clipboard ( )-> setText ( m_history [id] );
198 198
199 for ( uint i = 0; i < m_history. count ( ); i++ ) 199 for ( uint i = 0; i < m_history. count ( ); i++ )
200 m_menu-> setItemChecked ( i, i == uint( id )); 200 m_menu-> setItemChecked ( i, i == uint( id ));
201 201
202 unicode = 'V' - '@'; 202 unicode = 'V' - '@';
203 scan = Key_V; 203 scan = Key_V;
204 } 204 }
205 break; 205 break;
206 } 206 }
207 207
208 if ( scan ) { 208 if ( scan ) {
209 qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); 209 qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false );
210 qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); 210 qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, false, false );
211 } 211 }
212} 212}
213 213
214void ClipboardApplet::paintEvent ( QPaintEvent* ) 214void ClipboardApplet::paintEvent ( QPaintEvent* )
215{ 215{
216 QPainter p ( this ); 216 QPainter p ( this );
217 p. drawPixmap ( 0, 1, m_clipboardPixmap ); 217 p. drawPixmap ( 0, 1, m_clipboardPixmap );
218} 218}
219 219
220void ClipboardApplet::newData ( ) 220void ClipboardApplet::newData ( )
221{ 221{
222 QCString type = "plain"; 222 QCString type = "plain";
223 QString txt = QApplication::clipboard ( )-> text ( type ); 223 QString txt = QApplication::clipboard ( )-> text ( type );
224 224
225 if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) { 225 if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) {
226 m_history. append ( txt ); 226 m_history. append ( txt );
227 227
228 if ( m_history. count ( ) > 5 ) 228 if ( m_history. count ( ) > 5 )
229 m_history. remove ( m_history. begin ( )); 229 m_history. remove ( m_history. begin ( ));
230 230
231 m_dirty = true; 231 m_dirty = true;
232 } 232 }
233} 233}