summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/comm/keypebble/krfbcanvas.cpp40
-rw-r--r--noncore/comm/keypebble/krfbcanvas.h4
-rw-r--r--noncore/comm/keypebble/kvnc.cpp16
-rw-r--r--noncore/comm/keypebble/kvnc.h2
-rw-r--r--noncore/comm/keypebble/kvncbookmarkdlgbase.ui7
-rw-r--r--noncore/comm/keypebble/kvncconndlgbase.ui314
6 files changed, 243 insertions, 140 deletions
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index 918ce8b..049bbd4 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -12,2 +12,3 @@
12#include <qpixmap.h> 12#include <qpixmap.h>
13#include <qpoint.h>
13#include <qapplication.h> 14#include <qapplication.h>
@@ -29,2 +30,5 @@ KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name )
29 viewport()->setFocus(); 30 viewport()->setFocus();
31
32 nextRightClick=0;
33 nextDoubleClick=0;
30} 34}
@@ -126,4 +130,19 @@ void KRFBCanvas::contentsMousePressEvent( QMouseEvent *e )
126{ 130{
127 if ( loggedIn_ ) 131
132 if (nextDoubleClick) {
133 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),LeftButton,LeftButton));
134 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0));
135 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0));
136 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),NoButton,NoButton));
137 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),NoButton,0));
138 } if (nextRightClick) {
139 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),RightButton,RightButton));
140 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),RightButton,0));
141 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),NoButton,NoButton));
142 connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),NoButton,0));
143 } else if ( loggedIn_ )
128 connection_->buffer()->mouseEvent( e ); 144 connection_->buffer()->mouseEvent( e );
145
146 qDebug("Press");
147 qDebug(QString::number(e->type()==QEvent::MouseButtonPress));
129} 148}
@@ -132,3 +151,3 @@ void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e )
132{ 151{
133 if ( loggedIn_ ) 152 if ( loggedIn_ && !nextRightClick && !nextDoubleClick) {
134 connection_->buffer()->mouseEvent( e ); 153 connection_->buffer()->mouseEvent( e );
@@ -136,2 +155,8 @@ void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e )
136 155
156 nextRightClick=0;
157 nextDoubleClick=0;
158 qDebug("Release");
159 qDebug(QString::number(e->button()));
160}
161
137void KRFBCanvas::contentsMouseMoveEvent( QMouseEvent *e ) 162void KRFBCanvas::contentsMouseMoveEvent( QMouseEvent *e )
@@ -169,3 +194,2 @@ void KRFBCanvas::sendCtlAltDel( void)
169 194
170 qDebug("Here");
171 if ( loggedIn_ ) { 195 if ( loggedIn_ ) {
@@ -179 +203,11 @@ void KRFBCanvas::sendCtlAltDel( void)
179} 203}
204
205void KRFBCanvas::markDoubleClick( void)
206{
207 nextRightClick=1;
208}
209
210void KRFBCanvas::markRightClick( void)
211{
212 nextRightClick=1;
213}
diff --git a/noncore/comm/keypebble/krfbcanvas.h b/noncore/comm/keypebble/krfbcanvas.h
index cd3047c..5c7b949 100644
--- a/noncore/comm/keypebble/krfbcanvas.h
+++ b/noncore/comm/keypebble/krfbcanvas.h
@@ -34,2 +34,4 @@ public slots:
34 void sendCtlAltDel(void); 34 void sendCtlAltDel(void);
35 void markRightClick(void);
36 void markDoubleClick(void);
35 37
@@ -50,2 +52,4 @@ protected slots:
50private: 52private:
53 int nextRightClick;
54 int nextDoubleClick;
51 KRFBConnection *connection_; 55 KRFBConnection *connection_;
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index ef57366..abdb1e0 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -185,2 +185,14 @@ void KVNC::setupActions()
185 disconnectAction->setEnabled( false ); 185 disconnectAction->setEnabled( false );
186
187 doubleClickAction = new QAction( tr("Next Click is Double Click"), QString::null, 0, 0 );
188 connect( doubleClickAction, SIGNAL(activated()),
189 canvas, SLOT( markDoubleClick() ) );
190 doubleClickAction->addTo( cornerMenu );
191 doubleClickAction->setEnabled( false );
192
193 rightClickAction = new QAction( tr("Next Click is Right Click"), QString::null, 0, 0 );
194 connect( rightClickAction, SIGNAL(activated()),
195 canvas, SLOT( markRightClick() ) );
196 rightClickAction->addTo( cornerMenu );
197 rightClickAction->setEnabled( false );
186} 198}
@@ -240,2 +252,4 @@ void KVNC::connected()
240 fullScreenAction->setEnabled( true ); 252 fullScreenAction->setEnabled( true );
253 doubleClickAction->setEnabled( false );
254 rightClickAction->setEnabled( true );
241 stack->raiseWidget(canvas); 255 stack->raiseWidget(canvas);
@@ -260,2 +274,4 @@ void KVNC::disconnected()
260 fullScreenAction->setEnabled( false ); 274 fullScreenAction->setEnabled( false );
275 doubleClickAction->setEnabled( false );
276 rightClickAction->setEnabled( false );
261 stack->raiseWidget(bookmarkSelector); 277 stack->raiseWidget(bookmarkSelector);
diff --git a/noncore/comm/keypebble/kvnc.h b/noncore/comm/keypebble/kvnc.h
index 82a24fc..51c7151 100644
--- a/noncore/comm/keypebble/kvnc.h
+++ b/noncore/comm/keypebble/kvnc.h
@@ -59,2 +59,4 @@ private:
59 QAction *connectAction; 59 QAction *connectAction;
60 QAction *rightClickAction;
61 QAction *doubleClickAction;
60 QToolBar * bar; 62 QToolBar * bar;
diff --git a/noncore/comm/keypebble/kvncbookmarkdlgbase.ui b/noncore/comm/keypebble/kvncbookmarkdlgbase.ui
index 69d8a14..4ca4f26 100644
--- a/noncore/comm/keypebble/kvncbookmarkdlgbase.ui
+++ b/noncore/comm/keypebble/kvncbookmarkdlgbase.ui
@@ -13,3 +13,3 @@
13 <y>0</y> 13 <y>0</y>
14 <width>580</width> 14 <width>576</width>
15 <height>480</height> 15 <height>480</height>
@@ -21,2 +21,5 @@
21 </property> 21 </property>
22 <property>
23 <name>layoutMargin</name>
24 </property>
22 <vbox> 25 <vbox>
@@ -24,3 +27,3 @@
24 <name>margin</name> 27 <name>margin</name>
25 <number>11</number> 28 <number>0</number>
26 </property> 29 </property>
diff --git a/noncore/comm/keypebble/kvncconndlgbase.ui b/noncore/comm/keypebble/kvncconndlgbase.ui
index de3f785..003aad2 100644
--- a/noncore/comm/keypebble/kvncconndlgbase.ui
+++ b/noncore/comm/keypebble/kvncconndlgbase.ui
@@ -13,4 +13,4 @@
13 <y>0</y> 13 <y>0</y>
14 <width>256</width> 14 <width>253</width>
15 <height>242</height> 15 <height>408</height>
16 </rect> 16 </rect>
@@ -24,3 +24,12 @@
24 </property> 24 </property>
25 <widget> 25 <grid>
26 <property stdset="1">
27 <name>margin</name>
28 <number>11</number>
29 </property>
30 <property stdset="1">
31 <name>spacing</name>
32 <number>6</number>
33 </property>
34 <widget row="0" column="0" >
26 <class>QTabWidget</class> 35 <class>QTabWidget</class>
@@ -30,11 +39,2 @@
30 </property> 39 </property>
31 <property stdset="1">
32 <name>geometry</name>
33 <rect>
34 <x>0</x>
35 <y>0</y>
36 <width>266</width>
37 <height>233</height>
38 </rect>
39 </property>
40 <widget> 40 <widget>
@@ -58,3 +58,3 @@
58 </property> 58 </property>
59 <widget row="2" column="1" rowspan="1" colspan="2" > 59 <widget row="2" column="1" >
60 <class>QLineEdit</class> 60 <class>QLineEdit</class>
@@ -84,2 +84,9 @@
84 <property stdset="1"> 84 <property stdset="1">
85 <name>sizePolicy</name>
86 <sizepolicy>
87 <hsizetype>7</hsizetype>
88 <vsizetype>0</vsizetype>
89 </sizepolicy>
90 </property>
91 <property stdset="1">
85 <name>text</name> 92 <name>text</name>
@@ -103,3 +110,3 @@
103 </widget> 110 </widget>
104 <widget row="4" column="1" rowspan="1" colspan="2" > 111 <widget row="4" column="1" >
105 <class>QLineEdit</class> 112 <class>QLineEdit</class>
@@ -125,3 +132,3 @@
125 </widget> 132 </widget>
126 <widget row="0" column="1" rowspan="1" colspan="2" > 133 <widget row="0" column="1" >
127 <class>QLineEdit</class> 134 <class>QLineEdit</class>
@@ -158,3 +165,3 @@
158 </widget> 165 </widget>
159 <widget row="1" column="1" rowspan="1" colspan="2" > 166 <widget row="1" column="1" >
160 <class>QSpinBox</class> 167 <class>QSpinBox</class>
@@ -165,2 +172,9 @@
165 <property stdset="1"> 172 <property stdset="1">
173 <name>sizePolicy</name>
174 <sizepolicy>
175 <hsizetype>7</hsizetype>
176 <vsizetype>0</vsizetype>
177 </sizepolicy>
178 </property>
179 <property stdset="1">
166 <name>maxValue</name> 180 <name>maxValue</name>
@@ -181,6 +195,6 @@
181 </widget> 195 </widget>
182 <spacer row="5" column="2" > 196 <spacer row="5" column="0" >
183 <property> 197 <property>
184 <name>name</name> 198 <name>name</name>
185 <cstring>Spacer2</cstring> 199 <cstring>Spacer4</cstring>
186 </property> 200 </property>
@@ -214,3 +228,3 @@
214 </attribute> 228 </attribute>
215 <vbox> 229 <grid>
216 <property stdset="1"> 230 <property stdset="1">
@@ -223,61 +237,46 @@
223 </property> 237 </property>
224 <widget> 238 <widget row="4" column="0" rowspan="1" colspan="3" >
225 <class>QLabel</class> 239 <class>QCheckBox</class>
226 <property stdset="1"> 240 <property stdset="1">
227 <name>name</name> 241 <name>name</name>
228 <cstring>TextLabel1</cstring> 242 <cstring>shared</cstring>
229 </property>
230 <property stdset="1">
231 <name>text</name>
232 <string>Check for screen updates every:</string>
233 </property> 243 </property>
234 </widget>
235 <widget>
236 <class>QLayoutWidget</class>
237 <property stdset="1"> 244 <property stdset="1">
238 <name>name</name> 245 <name>sizePolicy</name>
239 <cstring>Layout2</cstring> 246 <sizepolicy>
247 <hsizetype>7</hsizetype>
248 <vsizetype>0</vsizetype>
249 </sizepolicy>
240 </property> 250 </property>
241 <hbox>
242 <property stdset="1"> 251 <property stdset="1">
243 <name>margin</name> 252 <name>text</name>
244 <number>0</number> 253 <string>Request shared session</string>
245 </property> 254 </property>
246 <property stdset="1"> 255 <property>
247 <name>spacing</name> 256 <name>whatsThis</name>
248 <number>6</number> 257 <string>Allow other users to connect to the VNC server</string>
249 </property> 258 </property>
250 <widget> 259 </widget>
251 <class>QSpinBox</class> 260 <spacer row="6" column="1" >
252 <property stdset="1"> 261 <property>
253 <name>name</name> 262 <name>name</name>
254 <cstring>timeBox</cstring> 263 <cstring>Spacer2</cstring>
255 </property> 264 </property>
256 <property stdset="1"> 265 <property stdset="1">
257 <name>maxValue</name> 266 <name>orientation</name>
258 <number>500</number> 267 <enum>Vertical</enum>
259 </property> 268 </property>
260 <property stdset="1"> 269 <property stdset="1">
261 <name>minValue</name> 270 <name>sizeType</name>
262 <number>1</number> 271 <enum>Expanding</enum>
263 </property> 272 </property>
264 <property> 273 <property>
265 <name>whatsThis</name> 274 <name>sizeHint</name>
266 <string>Delay between requesting updates from the server</string> 275 <size>
267 </property> 276 <width>20</width>
268 </widget> 277 <height>20</height>
269 <widget> 278 </size>
270 <class>QLabel</class>
271 <property stdset="1">
272 <name>name</name>
273 <cstring>TextLabel2</cstring>
274 </property>
275 <property stdset="1">
276 <name>text</name>
277 <string>Milliseconds</string>
278 </property> 279 </property>
279 </widget> 280 </spacer>
280 </hbox> 281 <widget row="2" column="0" rowspan="1" colspan="3" >
281 </widget>
282 <widget>
283 <class>QCheckBox</class> 282 <class>QCheckBox</class>
@@ -288,2 +287,9 @@
288 <property stdset="1"> 287 <property stdset="1">
288 <name>sizePolicy</name>
289 <sizepolicy>
290 <hsizetype>7</hsizetype>
291 <vsizetype>0</vsizetype>
292 </sizepolicy>
293 </property>
294 <property stdset="1">
289 <name>text</name> 295 <name>text</name>
@@ -296,22 +302,22 @@
296 </widget> 302 </widget>
297 <widget> 303 <widget row="1" column="0" rowspan="1" colspan="2" >
298 <class>QCheckBox</class> 304 <class>QSpinBox</class>
299 <property stdset="1"> 305 <property stdset="1">
300 <name>name</name> 306 <name>name</name>
301 <cstring>deIconify</cstring> 307 <cstring>timeBox</cstring>
302 </property> 308 </property>
303 <property stdset="1"> 309 <property stdset="1">
304 <name>text</name> 310 <name>sizePolicy</name>
305 <string>Raise on bell</string> 311 <sizepolicy>
312 <hsizetype>7</hsizetype>
313 <vsizetype>0</vsizetype>
314 </sizepolicy>
306 </property> 315 </property>
307 </widget>
308 <widget>
309 <class>QCheckBox</class>
310 <property stdset="1"> 316 <property stdset="1">
311 <name>name</name> 317 <name>maxValue</name>
312 <cstring>shared</cstring> 318 <number>500</number>
313 </property> 319 </property>
314 <property stdset="1"> 320 <property stdset="1">
315 <name>text</name> 321 <name>minValue</name>
316 <string>Request shared session</string> 322 <number>1</number>
317 </property> 323 </property>
@@ -319,21 +325,6 @@
319 <name>whatsThis</name> 325 <name>whatsThis</name>
320 <string>Allow other users to connect to the VNC server</string> 326 <string>Delay between requesting updates from the server</string>
321 </property> 327 </property>
322 </widget> 328 </widget>
323 <widget> 329 <widget row="5" column="0" >
324 <class>QLayoutWidget</class>
325 <property stdset="1">
326 <name>name</name>
327 <cstring>Layout3</cstring>
328 </property>
329 <hbox>
330 <property stdset="1">
331 <name>margin</name>
332 <number>0</number>
333 </property>
334 <property stdset="1">
335 <name>spacing</name>
336 <number>6</number>
337 </property>
338 <widget>
339 <class>QComboBox</class> 330 <class>QComboBox</class>
@@ -361,2 +352,9 @@
361 </property> 352 </property>
353 <property stdset="1">
354 <name>sizePolicy</name>
355 <sizepolicy>
356 <hsizetype>7</hsizetype>
357 <vsizetype>0</vsizetype>
358 </sizepolicy>
359 </property>
362 <property> 360 <property>
@@ -366,3 +364,3 @@
366 </widget> 364 </widget>
367 <widget> 365 <widget row="5" column="1" rowspan="1" colspan="2" >
368 <class>QLabel</class> 366 <class>QLabel</class>
@@ -377,26 +375,43 @@
377 </widget> 375 </widget>
378 </hbox> 376 <widget row="1" column="2" >
377 <class>QLabel</class>
378 <property stdset="1">
379 <name>name</name>
380 <cstring>TextLabel2</cstring>
381 </property>
382 <property stdset="1">
383 <name>text</name>
384 <string>Milliseconds</string>
385 </property>
379 </widget> 386 </widget>
380 <spacer> 387 <widget row="3" column="0" rowspan="1" colspan="3" >
381 <property> 388 <class>QCheckBox</class>
389 <property stdset="1">
382 <name>name</name> 390 <name>name</name>
383 <cstring>Spacer2</cstring> 391 <cstring>deIconify</cstring>
384 </property> 392 </property>
385 <property stdset="1"> 393 <property stdset="1">
386 <name>orientation</name> 394 <name>sizePolicy</name>
387 <enum>Vertical</enum> 395 <sizepolicy>
396 <hsizetype>7</hsizetype>
397 <vsizetype>0</vsizetype>
398 </sizepolicy>
388 </property> 399 </property>
389 <property stdset="1"> 400 <property stdset="1">
390 <name>sizeType</name> 401 <name>text</name>
391 <enum>Expanding</enum> 402 <string>Raise on bell</string>
392 </property> 403 </property>
393 <property> 404 </widget>
394 <name>sizeHint</name> 405 <widget row="0" column="0" rowspan="1" colspan="3" >
395 <size> 406 <class>QLabel</class>
396 <width>20</width> 407 <property stdset="1">
397 <height>20</height> 408 <name>name</name>
398 </size> 409 <cstring>TextLabel1</cstring>
399 </property> 410 </property>
400 </spacer> 411 <property stdset="1">
401 </vbox> 412 <name>text</name>
413 <string>Check for screen updates every:</string>
414 </property>
415 </widget>
416 </grid>
402 </widget> 417 </widget>
@@ -412,3 +427,3 @@
412 </attribute> 427 </attribute>
413 <vbox> 428 <grid>
414 <property stdset="1"> 429 <property stdset="1">
@@ -421,3 +436,24 @@
421 </property> 436 </property>
422 <widget> 437 <spacer row="4" column="1" >
438 <property>
439 <name>name</name>
440 <cstring>Spacer3</cstring>
441 </property>
442 <property stdset="1">
443 <name>orientation</name>
444 <enum>Vertical</enum>
445 </property>
446 <property stdset="1">
447 <name>sizeType</name>
448 <enum>Expanding</enum>
449 </property>
450 <property>
451 <name>sizeHint</name>
452 <size>
453 <width>20</width>
454 <height>20</height>
455 </size>
456 </property>
457 </spacer>
458 <widget row="0" column="0" rowspan="1" colspan="2" >
423 <class>QCheckBox</class> 459 <class>QCheckBox</class>
@@ -432,2 +468,9 @@
432 <property stdset="1"> 468 <property stdset="1">
469 <name>sizePolicy</name>
470 <sizepolicy>
471 <hsizetype>7</hsizetype>
472 <vsizetype>0</vsizetype>
473 </sizepolicy>
474 </property>
475 <property stdset="1">
433 <name>text</name> 476 <name>text</name>
@@ -436,3 +479,3 @@
436 </widget> 479 </widget>
437 <widget> 480 <widget row="1" column="0" rowspan="1" colspan="2" >
438 <class>QCheckBox</class> 481 <class>QCheckBox</class>
@@ -447,2 +490,9 @@
447 <property stdset="1"> 490 <property stdset="1">
491 <name>sizePolicy</name>
492 <sizepolicy>
493 <hsizetype>7</hsizetype>
494 <vsizetype>0</vsizetype>
495 </sizepolicy>
496 </property>
497 <property stdset="1">
448 <name>text</name> 498 <name>text</name>
@@ -451,3 +501,3 @@
451 </widget> 501 </widget>
452 <widget> 502 <widget row="2" column="0" >
453 <class>QCheckBox</class> 503 <class>QCheckBox</class>
@@ -462,2 +512,9 @@
462 <property stdset="1"> 512 <property stdset="1">
513 <name>sizePolicy</name>
514 <sizepolicy>
515 <hsizetype>7</hsizetype>
516 <vsizetype>0</vsizetype>
517 </sizepolicy>
518 </property>
519 <property stdset="1">
463 <name>text</name> 520 <name>text</name>
@@ -466,3 +523,3 @@
466 </widget> 523 </widget>
467 <widget> 524 <widget row="3" column="0" rowspan="1" colspan="2" >
468 <class>QCheckBox</class> 525 <class>QCheckBox</class>
@@ -473,2 +530,9 @@
473 <property stdset="1"> 530 <property stdset="1">
531 <name>sizePolicy</name>
532 <sizepolicy>
533 <hsizetype>7</hsizetype>
534 <vsizetype>0</vsizetype>
535 </sizepolicy>
536 </property>
537 <property stdset="1">
474 <name>text</name> 538 <name>text</name>
@@ -481,26 +545,6 @@
481 </widget> 545 </widget>
482 <spacer> 546 </grid>
483 <property>
484 <name>name</name>
485 <cstring>Spacer3</cstring>
486 </property>
487 <property stdset="1">
488 <name>orientation</name>
489 <enum>Vertical</enum>
490 </property>
491 <property stdset="1">
492 <name>sizeType</name>
493 <enum>Expanding</enum>
494 </property>
495 <property>
496 <name>sizeHint</name>
497 <size>
498 <width>20</width>
499 <height>20</height>
500 </size>
501 </property>
502 </spacer>
503 </vbox>
504 </widget> 547 </widget>
505 </widget> 548 </widget>
549 </grid>
506</widget> 550</widget>