From d60bc0c1dd26d26d29af027d38710176a3e625b3 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 8 Feb 2013 21:20:46 +0000 Subject: [PATCH] improved Server Settings tab git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6110 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/settings/ServerPage.ui | 502 +++++++++--------- 1 file changed, 249 insertions(+), 253 deletions(-) diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index 2e30558f0..0b8a66dd5 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -14,102 +14,7 @@ 6 - - - - - 0 - 0 - - - - Network Configuration - - - - - - - - - Automatic (UPnP) - - - - - Firewalled - - - - - Manually Forwarded Port - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - 200 - 0 - - - - The DHT allows you to answer connection -requests from your friends using BitTorrent's DHT. -It greatly improves the connectivity. - -The Discovery service sends locations and PGP -identities of your trusted contacts to connected -peers, to help them choose new friends. -The friendship is never automatic however, and both -peers still need to trust each other to allow connection. - - - - Public: DHT & Discovery - - - - - Private: Discovery Only - - - - - Inverted: DHT Only - - - - - Dark Net: None - - - - - - - - - - + 0 @@ -118,199 +23,283 @@ peers still need to trust each other to allow connection. Network Configuration - + - - - 6 - + - + - - - Local Address - - + + Automatic (UPnP) + - - - External Address - - + + Firewalled + - - - Dynamic DNS - - + + Manually Forwarded Port + - + - - - 6 + + + Qt::Horizontal - - + + QSizePolicy::Minimum + + + + 40 + 20 + + + + + + + + + 200 + 0 + + + + The DHT allows you to answer connection +requests from your friends using BitTorrent's DHT. +It greatly improves the connectivity. + +The Discovery service sends locations and PGP +identities of your trusted contacts to connected +peers, to help them choose new friends. +The friendship is never automatic however, and both +peers still need to trust each other to allow connection. + + + + Public: DHT & Discovery + - - - - Port: - - + + + Private: Discovery Only + - - - - Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system. - - - 1024 - - - 65535 - - - 7812 - - + + + Inverted: DHT Only + - - + + + Dark Net: None + - - - - Port: - - - - - - - Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system. - - - 1024 - - - 65535 - - - 7812 - - - - - - - + - - + + 6 - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - + + + + + + Local Address + + + + + + + External Address + + + + + + + Dynamic DNS + + + + - - - - Local network + + + + 6 - + + + + + + + Port: + + + + + + + Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system. + + + 1024 + + + 65535 + + + 7812 + + + + + + + + + + Port: + + + + + + + Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system. + + + 1024 + + + 65535 + + + 7812 + + + + + + + - - - 6 - - - 6 - - - - - - 16 - 16 - + + + + + 6 - - + + 6 - - :/images/ledoff1.png - - + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + Local network + + + + - - - - External ip address finder + + + + 6 - + + 6 + + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + External ip address finder + + + + - - - - - - 6 - - - 6 - - - - - - 16 - 16 - + + + + 6 - - + + 6 - - :/images/ledoff1.png - - - - - - - UPnP - - + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + UPnP + + + + @@ -373,6 +362,13 @@ behind a firewall or a VPN. + allowTunnelConnectionCB + showDiscStatusBar + allowIpDeterminationCB + IPServersLV + + textlabel_ext + textlabel_netLimited