author | coredump <coredump> | 2003-11-27 12:26:07 (UTC) |
---|---|---|
committer | coredump <coredump> | 2003-11-27 12:26:07 (UTC) |
commit | 51ca35ecb7e22fc564ffe62184d4a75aa8537b1d (patch) (unidiff) | |
tree | 49bffaeeec6e8dba3b5d2dd5614ef77d50045c9e /core/settings/security/securitybase.ui | |
parent | afe4e5bcfdd3d67166cdbf28f4514783ada1d290 (diff) | |
download | opie-51ca35ecb7e22fc564ffe62184d4a75aa8537b1d.zip opie-51ca35ecb7e22fc564ffe62184d4a75aa8537b1d.tar.gz opie-51ca35ecb7e22fc564ffe62184d4a75aa8537b1d.tar.bz2 |
Added: Default net-ranges are no longer hard-coded and can be edited
Bugfix: Show user-defined net-range upon application restart in
drop-down list
Diffstat (limited to 'core/settings/security/securitybase.ui') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/security/securitybase.ui | 186 |
1 files changed, 121 insertions, 65 deletions
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui index 934111e..1769ae1 100644 --- a/core/settings/security/securitybase.ui +++ b/core/settings/security/securitybase.ui | |||
@@ -13,3 +13,3 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>321</width> | 14 | <width>309</width> |
15 | <height>483</height> | 15 | <height>483</height> |
@@ -111,2 +111,8 @@ | |||
111 | </property> | 111 | </property> |
112 | <property> | ||
113 | <name>whatsThis</name> | ||
114 | <string>This button will let you change the security passcode. | ||
115 | |||
116 | Note: This is *not* the sync password.</string> | ||
117 | </property> | ||
112 | </widget> | 118 | </widget> |
@@ -122,2 +128,7 @@ | |||
122 | </property> | 128 | </property> |
129 | <property> | ||
130 | <name>whatsThis</name> | ||
131 | <string>Delete the current passcode. | ||
132 | You can enter a new one at any time.</string> | ||
133 | </property> | ||
123 | </widget> | 134 | </widget> |
@@ -135,2 +146,6 @@ | |||
135 | </property> | 146 | </property> |
147 | <property> | ||
148 | <name>whatsThis</name> | ||
149 | <string>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</string> | ||
150 | </property> | ||
136 | </widget> | 151 | </widget> |
@@ -238,2 +253,8 @@ | |||
238 | </property> | 253 | </property> |
254 | <property> | ||
255 | <name>whatsThis</name> | ||
256 | <string>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list. | ||
257 | |||
258 | For the Zaurus 5x00 this is always the user "root".</string> | ||
259 | </property> | ||
239 | </widget> | 260 | </widget> |
@@ -245,2 +266,9 @@ | |||
245 | </property> | 266 | </property> |
267 | <property> | ||
268 | <name>whatsThis</name> | ||
269 | <string>This drop-down list allows you to select the user for auto-login | ||
270 | (if enabled above). | ||
271 | |||
272 | You can only select an actually configured user.</string> | ||
273 | </property> | ||
246 | </widget> | 274 | </widget> |
@@ -281,3 +309,3 @@ | |||
281 | </attribute> | 309 | </attribute> |
282 | <vbox> | 310 | <grid> |
283 | <property stdset="1"> | 311 | <property stdset="1"> |
@@ -290,3 +318,24 @@ | |||
290 | </property> | 318 | </property> |
291 | <widget> | 319 | <spacer row="1" column="0" > |
320 | <property> | ||
321 | <name>name</name> | ||
322 | <cstring>Spacer1</cstring> | ||
323 | </property> | ||
324 | <property stdset="1"> | ||
325 | <name>orientation</name> | ||
326 | <enum>Vertical</enum> | ||
327 | </property> | ||
328 | <property stdset="1"> | ||
329 | <name>sizeType</name> | ||
330 | <enum>Expanding</enum> | ||
331 | </property> | ||
332 | <property> | ||
333 | <name>sizeHint</name> | ||
334 | <size> | ||
335 | <width>20</width> | ||
336 | <height>20</height> | ||
337 | </size> | ||
338 | </property> | ||
339 | </spacer> | ||
340 | <widget row="0" column="0" > | ||
292 | <class>QGroupBox</class> | 341 | <class>QGroupBox</class> |
@@ -326,59 +375,79 @@ | |||
326 | <class>QComboBox</class> | 375 | <class>QComboBox</class> |
327 | <item> | 376 | <property stdset="1"> |
328 | <property> | 377 | <name>name</name> |
329 | <name>text</name> | 378 | <cstring>syncnet</cstring> |
330 | <string>192.168.129.0/24 (default)</string> | ||
331 | </property> | 379 | </property> |
332 | </item> | 380 | <property stdset="1"> |
333 | <item> | 381 | <name>editable</name> |
334 | <property> | 382 | <bool>true</bool> |
335 | <name>text</name> | ||
336 | <string>192.168.1.0/24</string> | ||
337 | </property> | 383 | </property> |
338 | </item> | ||
339 | <item> | ||
340 | <property> | 384 | <property> |
341 | <name>text</name> | 385 | <name>whatsThis</name> |
342 | <string>192.168.0.0/16</string> | 386 | <string>Select a net-range or enter a new one. |
387 | |||
388 | This drop-down list lets you select a net range which is allowed to connect to your Zaurus. | ||
389 | |||
390 | For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus. | ||
391 | |||
392 | The entry "All" will allow *any* IP to connect. | ||
393 | The entry "None" will *deny* any connection. | ||
394 | |||
395 | If unsure, select "Any".</string> | ||
343 | </property> | 396 | </property> |
344 | </item> | 397 | </widget> |
345 | <item> | 398 | <widget> |
346 | <property> | 399 | <class>QLayoutWidget</class> |
347 | <name>text</name> | 400 | <property stdset="1"> |
348 | <string>172.16.0.0/12</string> | 401 | <name>name</name> |
402 | <cstring>Layout4</cstring> | ||
349 | </property> | 403 | </property> |
350 | </item> | 404 | <hbox> |
351 | <item> | 405 | <property stdset="1"> |
352 | <property> | 406 | <name>margin</name> |
353 | <name>text</name> | 407 | <number>0</number> |
354 | <string>10.0.0.0/8</string> | ||
355 | </property> | 408 | </property> |
356 | </item> | 409 | <property stdset="1"> |
357 | <item> | 410 | <name>spacing</name> |
358 | <property> | 411 | <number>6</number> |
359 | <name>text</name> | ||
360 | <string>1.0.0.0/8</string> | ||
361 | </property> | 412 | </property> |
362 | </item> | 413 | <widget> |
363 | <item> | 414 | <class>QPushButton</class> |
364 | <property> | 415 | <property stdset="1"> |
416 | <name>name</name> | ||
417 | <cstring>deleteentry</cstring> | ||
418 | </property> | ||
419 | <property stdset="1"> | ||
365 | <name>text</name> | 420 | <name>text</name> |
366 | <string>Any</string> | 421 | <string>Delete Entry</string> |
367 | </property> | 422 | </property> |
368 | </item> | ||
369 | <item> | ||
370 | <property> | 423 | <property> |
371 | <name>text</name> | 424 | <name>whatsThis</name> |
372 | <string>None</string> | 425 | <string>Delete the selected net range from the list |
426 | |||
427 | If you press this button, the currently selected net range will be deleted from the list of net ranges. | ||
428 | |||
429 | If you hit this button in error, the button "Restore Defaults" will restore | ||
430 | the list to the state it has been when you initially booted your Zaurus.</string> | ||
373 | </property> | 431 | </property> |
374 | </item> | 432 | </widget> |
433 | <widget> | ||
434 | <class>QPushButton</class> | ||
375 | <property stdset="1"> | 435 | <property stdset="1"> |
376 | <name>name</name> | 436 | <name>name</name> |
377 | <cstring>syncnet</cstring> | 437 | <cstring>restoredefaults</cstring> |
378 | </property> | 438 | </property> |
379 | <property stdset="1"> | 439 | <property stdset="1"> |
380 | <name>editable</name> | 440 | <name>text</name> |
381 | <bool>true</bool> | 441 | <string>Restore Defaults</string> |
442 | </property> | ||
443 | <property> | ||
444 | <name>whatsThis</name> | ||
445 | <string>This button will restore the list of net ranges | ||
446 | to the defaults. | ||
447 | |||
448 | Beware that all manually entered net ranges will be lost!</string> | ||
382 | </property> | 449 | </property> |
383 | </widget> | 450 | </widget> |
451 | </hbox> | ||
452 | </widget> | ||
384 | <widget> | 453 | <widget> |
@@ -412,2 +481,10 @@ | |||
412 | </property> | 481 | </property> |
482 | <property> | ||
483 | <name>whatsThis</name> | ||
484 | <string>This option changes the login behaviour of the internal FTP server. | ||
485 | |||
486 | If you have problems syncing, try the "IntelliSync" setting, which will accept any password you throw at the sync (FTP) port. | ||
487 | |||
488 | The default is Qtopia. It will let you log in with username "root" and password "Qtopia". The password is CaSeSeNsItIvE.</string> | ||
489 | </property> | ||
413 | </widget> | 490 | </widget> |
@@ -440,24 +517,3 @@ | |||
440 | </widget> | 517 | </widget> |
441 | <spacer> | 518 | </grid> |
442 | <property> | ||
443 | <name>name</name> | ||
444 | <cstring>Spacer1</cstring> | ||
445 | </property> | ||
446 | <property stdset="1"> | ||
447 | <name>orientation</name> | ||
448 | <enum>Vertical</enum> | ||
449 | </property> | ||
450 | <property stdset="1"> | ||
451 | <name>sizeType</name> | ||
452 | <enum>Expanding</enum> | ||
453 | </property> | ||
454 | <property> | ||
455 | <name>sizeHint</name> | ||
456 | <size> | ||
457 | <width>20</width> | ||
458 | <height>20</height> | ||
459 | </size> | ||
460 | </property> | ||
461 | </spacer> | ||
462 | </vbox> | ||
463 | </widget> | 519 | </widget> |