summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/comm/keypebble/kvnc.cpp4
-rw-r--r--noncore/comm/keypebble/kvncbookmarkdlgbase.ui6
-rw-r--r--noncore/comm/keypebble/kvncconndlg.cpp2
-rw-r--r--noncore/comm/keypebble/kvncconndlgbase.ui42
4 files changed, 49 insertions, 5 deletions
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index b173004..ef57366 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -51,17 +51,17 @@ static char * menu_xpm[] = {
51" .+@#. ", 51" .+@#. ",
52" .+#. ", 52" .+#. ",
53" .+. ", 53" .+. ",
54" .. ", 54" .. ",
55" "}; 55" "};
56 56
57const int StatusTextId = 0; 57const int StatusTextId = 0;
58 58
59KVNC::KVNC( const char *name ) : QMainWindow( 0, name ) 59KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
60{ 60{
61 setCaption( tr("VNC Viewer") ); 61 setCaption( tr("VNC Viewer") );
62 fullscreen = false; 62 fullscreen = false;
63 63
64 stack = new QWidgetStack( this ); 64 stack = new QWidgetStack( this );
65 setCentralWidget( stack ); 65 setCentralWidget( stack );
66 66
67 bookmarkSelector=new KVNCBookmarkDlg(); 67 bookmarkSelector=new KVNCBookmarkDlg();
@@ -99,17 +99,17 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name )
99 99
100 100
101 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ), 101 QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ),
102 QString::null, 0, this, 0 ); 102 QString::null, 0, this, 0 );
103 connect( n, SIGNAL( activated() ), 103 connect( n, SIGNAL( activated() ),
104 this, SLOT( newConnection() ) ); 104 this, SLOT( newConnection() ) );
105 n->addTo( bar ); 105 n->addTo( bar );
106 106
107 QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "edit" ), 107 QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),
108 QString::null, 0, this, 0 ); 108 QString::null, 0, this, 0 );
109 connect( o, SIGNAL( activated() ), 109 connect( o, SIGNAL( activated() ),
110 this, SLOT( openConnection() ) ); 110 this, SLOT( openConnection() ) );
111 o->addTo( bar ); 111 o->addTo( bar );
112 112
113 QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ), 113 QAction *d = new QAction( tr( "Delete Bookmark" ), Resource::loadPixmap( "trash" ),
114 QString::null, 0, this, 0 ); 114 QString::null, 0, this, 0 );
115 connect( d, SIGNAL( activated() ), 115 connect( d, SIGNAL( activated() ),
diff --git a/noncore/comm/keypebble/kvncbookmarkdlgbase.ui b/noncore/comm/keypebble/kvncbookmarkdlgbase.ui
index 45114cb..69d8a14 100644
--- a/noncore/comm/keypebble/kvncbookmarkdlgbase.ui
+++ b/noncore/comm/keypebble/kvncbookmarkdlgbase.ui
@@ -6,17 +6,17 @@
6 <name>name</name> 6 <name>name</name>
7 <cstring>KVNCBookmarkDlgBase</cstring> 7 <cstring>KVNCBookmarkDlgBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>584</width> 14 <width>580</width>
15 <height>480</height> 15 <height>480</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Bookmarks</string> 20 <string>Bookmarks</string>
21 </property> 21 </property>
22 <vbox> 22 <vbox>
@@ -29,16 +29,20 @@
29 <number>6</number> 29 <number>6</number>
30 </property> 30 </property>
31 <widget> 31 <widget>
32 <class>QListBox</class> 32 <class>QListBox</class>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>name</name> 34 <name>name</name>
35 <cstring>bookmarkList</cstring> 35 <cstring>bookmarkList</cstring>
36 </property> 36 </property>
37 <property>
38 <name>whatsThis</name>
39 <string>Choose a bookmark that you would like to open</string>
40 </property>
37 </widget> 41 </widget>
38 <widget> 42 <widget>
39 <class>QLayoutWidget</class> 43 <class>QLayoutWidget</class>
40 <property stdset="1"> 44 <property stdset="1">
41 <name>name</name> 45 <name>name</name>
42 <cstring>Layout1</cstring> 46 <cstring>Layout1</cstring>
43 </property> 47 </property>
44 <hbox> 48 <hbox>
diff --git a/noncore/comm/keypebble/kvncconndlg.cpp b/noncore/comm/keypebble/kvncconndlg.cpp
index 2f073f8..cd55bb0 100644
--- a/noncore/comm/keypebble/kvncconndlg.cpp
+++ b/noncore/comm/keypebble/kvncconndlg.cpp
@@ -10,17 +10,17 @@
10#include <qlineedit.h> 10#include <qlineedit.h>
11#include <qpushbutton.h> 11#include <qpushbutton.h>
12#include "krfbserver.h" 12#include "krfbserver.h"
13 13
14#include "kvncconndlg.h" 14#include "kvncconndlg.h"
15 15
16KVNCConnDlg::KVNCConnDlg( KRFBServer *options, 16KVNCConnDlg::KVNCConnDlg( KRFBServer *options,
17 QWidget *parent, char *name, bool modal ) 17 QWidget *parent, char *name, bool modal )
18: KVNCConnDlgBase( parent, name, modal ) 18: KVNCConnDlgBase( parent, name, modal, WStyle_ContextHelp )
19{ 19{
20 this->options=options; 20 this->options=options;
21 tmpOptions=*options; 21 tmpOptions=*options;
22 22
23 serverHostname->setText(options->hostname); 23 serverHostname->setText(options->hostname);
24 serverDisplay->setValue(options->display); 24 serverDisplay->setValue(options->display);
25 serverPassword->setText(options->password); 25 serverPassword->setText(options->password);
26 serverBookmark->setText(options->name); 26 serverBookmark->setText(options->name);
diff --git a/noncore/comm/keypebble/kvncconndlgbase.ui b/noncore/comm/keypebble/kvncconndlgbase.ui
index 42765c1..de3f785 100644
--- a/noncore/comm/keypebble/kvncconndlgbase.ui
+++ b/noncore/comm/keypebble/kvncconndlgbase.ui
@@ -6,17 +6,17 @@
6 <name>name</name> 6 <name>name</name>
7 <cstring>KVNCConnDlgBase</cstring> 7 <cstring>KVNCConnDlgBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>260</width> 14 <width>256</width>
15 <height>242</height> 15 <height>242</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>VNC Viewer Connection</string> 20 <string>VNC Viewer Connection</string>
21 </property> 21 </property>
22 <property> 22 <property>
@@ -65,27 +65,35 @@
65 <property stdset="1"> 65 <property stdset="1">
66 <name>autoMask</name> 66 <name>autoMask</name>
67 <bool>true</bool> 67 <bool>true</bool>
68 </property> 68 </property>
69 <property stdset="1"> 69 <property stdset="1">
70 <name>echoMode</name> 70 <name>echoMode</name>
71 <enum>Password</enum> 71 <enum>Password</enum>
72 </property> 72 </property>
73 <property>
74 <name>whatsThis</name>
75 <string>The password of the VNC server</string>
76 </property>
73 </widget> 77 </widget>
74 <widget row="3" column="1" > 78 <widget row="3" column="1" >
75 <class>QCheckBox</class> 79 <class>QCheckBox</class>
76 <property stdset="1"> 80 <property stdset="1">
77 <name>name</name> 81 <name>name</name>
78 <cstring>togglePassword</cstring> 82 <cstring>togglePassword</cstring>
79 </property> 83 </property>
80 <property stdset="1"> 84 <property stdset="1">
81 <name>text</name> 85 <name>text</name>
82 <string>Show Password</string> 86 <string>Show Password</string>
83 </property> 87 </property>
88 <property>
89 <name>whatsThis</name>
90 <string>Toggle obscuring the password</string>
91 </property>
84 </widget> 92 </widget>
85 <widget row="2" column="0" > 93 <widget row="2" column="0" >
86 <class>QLabel</class> 94 <class>QLabel</class>
87 <property stdset="1"> 95 <property stdset="1">
88 <name>name</name> 96 <name>name</name>
89 <cstring>TextLabel3</cstring> 97 <cstring>TextLabel3</cstring>
90 </property> 98 </property>
91 <property stdset="1"> 99 <property stdset="1">
@@ -94,16 +102,20 @@
94 </property> 102 </property>
95 </widget> 103 </widget>
96 <widget row="4" column="1" rowspan="1" colspan="2" > 104 <widget row="4" column="1" rowspan="1" colspan="2" >
97 <class>QLineEdit</class> 105 <class>QLineEdit</class>
98 <property stdset="1"> 106 <property stdset="1">
99 <name>name</name> 107 <name>name</name>
100 <cstring>serverBookmark</cstring> 108 <cstring>serverBookmark</cstring>
101 </property> 109 </property>
110 <property>
111 <name>whatsThis</name>
112 <string>The name of the VNC server</string>
113 </property>
102 </widget> 114 </widget>
103 <widget row="4" column="0" > 115 <widget row="4" column="0" >
104 <class>QLabel</class> 116 <class>QLabel</class>
105 <property stdset="1"> 117 <property stdset="1">
106 <name>name</name> 118 <name>name</name>
107 <cstring>TextLabel1_2</cstring> 119 <cstring>TextLabel1_2</cstring>
108 </property> 120 </property>
109 <property stdset="1"> 121 <property stdset="1">
@@ -112,16 +124,20 @@
112 </property> 124 </property>
113 </widget> 125 </widget>
114 <widget row="0" column="1" rowspan="1" colspan="2" > 126 <widget row="0" column="1" rowspan="1" colspan="2" >
115 <class>QLineEdit</class> 127 <class>QLineEdit</class>
116 <property stdset="1"> 128 <property stdset="1">
117 <name>name</name> 129 <name>name</name>
118 <cstring>serverHostname</cstring> 130 <cstring>serverHostname</cstring>
119 </property> 131 </property>
132 <property>
133 <name>whatsThis</name>
134 <string>The host name of the VNC server</string>
135 </property>
120 </widget> 136 </widget>
121 <widget row="0" column="0" > 137 <widget row="0" column="0" >
122 <class>QLabel</class> 138 <class>QLabel</class>
123 <property stdset="1"> 139 <property stdset="1">
124 <name>name</name> 140 <name>name</name>
125 <cstring>hostname</cstring> 141 <cstring>hostname</cstring>
126 </property> 142 </property>
127 <property stdset="1"> 143 <property stdset="1">
@@ -153,16 +169,20 @@
153 <property stdset="1"> 169 <property stdset="1">
154 <name>minValue</name> 170 <name>minValue</name>
155 <number>0</number> 171 <number>0</number>
156 </property> 172 </property>
157 <property stdset="1"> 173 <property stdset="1">
158 <name>value</name> 174 <name>value</name>
159 <number>0</number> 175 <number>0</number>
160 </property> 176 </property>
177 <property>
178 <name>whatsThis</name>
179 <string>The display number of the VNC server</string>
180 </property>
161 </widget> 181 </widget>
162 <spacer row="5" column="2" > 182 <spacer row="5" column="2" >
163 <property> 183 <property>
164 <name>name</name> 184 <name>name</name>
165 <cstring>Spacer2</cstring> 185 <cstring>Spacer2</cstring>
166 </property> 186 </property>
167 <property stdset="1"> 187 <property stdset="1">
168 <name>orientation</name> 188 <name>orientation</name>
@@ -236,16 +256,20 @@
236 <property stdset="1"> 256 <property stdset="1">
237 <name>maxValue</name> 257 <name>maxValue</name>
238 <number>500</number> 258 <number>500</number>
239 </property> 259 </property>
240 <property stdset="1"> 260 <property stdset="1">
241 <name>minValue</name> 261 <name>minValue</name>
242 <number>1</number> 262 <number>1</number>
243 </property> 263 </property>
264 <property>
265 <name>whatsThis</name>
266 <string>Delay between requesting updates from the server</string>
267 </property>
244 </widget> 268 </widget>
245 <widget> 269 <widget>
246 <class>QLabel</class> 270 <class>QLabel</class>
247 <property stdset="1"> 271 <property stdset="1">
248 <name>name</name> 272 <name>name</name>
249 <cstring>TextLabel2</cstring> 273 <cstring>TextLabel2</cstring>
250 </property> 274 </property>
251 <property stdset="1"> 275 <property stdset="1">
@@ -260,16 +284,20 @@
260 <property stdset="1"> 284 <property stdset="1">
261 <name>name</name> 285 <name>name</name>
262 <cstring>bit</cstring> 286 <cstring>bit</cstring>
263 </property> 287 </property>
264 <property stdset="1"> 288 <property stdset="1">
265 <name>text</name> 289 <name>text</name>
266 <string>Request 8-bit session</string> 290 <string>Request 8-bit session</string>
267 </property> 291 </property>
292 <property>
293 <name>whatsThis</name>
294 <string>Request that the VNC server transfer 8 bit color</string>
295 </property>
268 </widget> 296 </widget>
269 <widget> 297 <widget>
270 <class>QCheckBox</class> 298 <class>QCheckBox</class>
271 <property stdset="1"> 299 <property stdset="1">
272 <name>name</name> 300 <name>name</name>
273 <cstring>deIconify</cstring> 301 <cstring>deIconify</cstring>
274 </property> 302 </property>
275 <property stdset="1"> 303 <property stdset="1">
@@ -282,16 +310,20 @@
282 <property stdset="1"> 310 <property stdset="1">
283 <name>name</name> 311 <name>name</name>
284 <cstring>shared</cstring> 312 <cstring>shared</cstring>
285 </property> 313 </property>
286 <property stdset="1"> 314 <property stdset="1">
287 <name>text</name> 315 <name>text</name>
288 <string>Request shared session</string> 316 <string>Request shared session</string>
289 </property> 317 </property>
318 <property>
319 <name>whatsThis</name>
320 <string>Allow other users to connect to the VNC server</string>
321 </property>
290 </widget> 322 </widget>
291 <widget> 323 <widget>
292 <class>QLayoutWidget</class> 324 <class>QLayoutWidget</class>
293 <property stdset="1"> 325 <property stdset="1">
294 <name>name</name> 326 <name>name</name>
295 <cstring>Layout3</cstring> 327 <cstring>Layout3</cstring>
296 </property> 328 </property>
297 <hbox> 329 <hbox>
@@ -322,16 +354,20 @@
322 <name>text</name> 354 <name>text</name>
323 <string>4</string> 355 <string>4</string>
324 </property> 356 </property>
325 </item> 357 </item>
326 <property stdset="1"> 358 <property stdset="1">
327 <name>name</name> 359 <name>name</name>
328 <cstring>scaleFactor</cstring> 360 <cstring>scaleFactor</cstring>
329 </property> 361 </property>
362 <property>
363 <name>whatsThis</name>
364 <string>Scale the remote display to fit on the PDA (Slow)</string>
365 </property>
330 </widget> 366 </widget>
331 <widget> 367 <widget>
332 <class>QLabel</class> 368 <class>QLabel</class>
333 <property stdset="1"> 369 <property stdset="1">
334 <name>name</name> 370 <name>name</name>
335 <cstring>TextLabel2_3</cstring> 371 <cstring>TextLabel2_3</cstring>
336 </property> 372 </property>
337 <property stdset="1"> 373 <property stdset="1">
@@ -433,16 +469,20 @@
433 <property stdset="1"> 469 <property stdset="1">
434 <name>name</name> 470 <name>name</name>
435 <cstring>copyRect</cstring> 471 <cstring>copyRect</cstring>
436 </property> 472 </property>
437 <property stdset="1"> 473 <property stdset="1">
438 <name>text</name> 474 <name>text</name>
439 <string>Copy rectangle encoding</string> 475 <string>Copy rectangle encoding</string>
440 </property> 476 </property>
477 <property>
478 <name>whatsThis</name>
479 <string>Enable transmiting identical rectangles as references to existing data</string>
480 </property>
441 </widget> 481 </widget>
442 <spacer> 482 <spacer>
443 <property> 483 <property>
444 <name>name</name> 484 <name>name</name>
445 <cstring>Spacer3</cstring> 485 <cstring>Spacer3</cstring>
446 </property> 486 </property>
447 <property stdset="1"> 487 <property stdset="1">
448 <name>orientation</name> 488 <name>orientation</name>