Changeset 10611

Timestamp:

May 1, 2010, 4:23:42 PM (11 years ago)

Author:

charles

Message:

(trunk) add LDS toggles to GTK+ client, Qt client, and transmission-remote

Location:

trunk

Files:

• daemon/remote.c (modified) (3 diffs)
• daemon/transmission-remote.1 (modified) (2 diffs)
• gtk/main.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (1 diff)
• qt/prefs-dialog.cc (modified) (2 diffs)
• qt/prefs.cc (modified) (1 diff)
• qt/prefs.h (modified) (1 diff)

trunk/daemon/remote.c

@@ -256 +256 @@
     { 'x', "pex",                   "Enable peer exchange (PEX)", "x",  0, NULL },
     { 'X', "no-pex",                "Disable peer exchange (PEX)", "X",  0, NULL },
+    { 'z', "lds",                   "Enable local peer discovery (LDS)", "z",  0, NULL },
+    { 'Z', "no-lds",                "Disable local peer discovery (LDS)", "Z",  0, NULL },
     { 940, "peer-info",             "List the current torrent(s)' peers", "pi",  0, NULL },
     {   0, NULL,                    NULL, NULL, 0, NULL }
@@ -324 +326 @@
         case 'x': /* pex */
         case 'X': /* no-pex */
+        case 'z': /* lds */
+        case 'Z': /* no-lds */
         case 970: /* alt-speed */
         case 971: /* no-alt-speed */
@@ -1816 +1820 @@
                 case 'X': tr_bencDictAddBool( args, TR_PREFS_KEY_PEX_ENABLED, FALSE );
                           break;
+                case 'z': tr_bencDictAddBool( args, TR_PREFS_KEY_LDS_ENABLED, TRUE );
+                          break;
+                case 'Z': tr_bencDictAddBool( args, TR_PREFS_KEY_LDS_ENABLED, FALSE );
+                          break;
                 case 953: tr_bencDictAddReal( args, "seedRatioLimit", atof(optarg) );
                           tr_bencDictAddBool( args, "seedRatioLimited", TRUE );

trunk/daemon/transmission-remote.1

@@ -56 +56 @@
 .Op Fl w Ar download-dir
 .Op Fl x | X
+.Op Fl z | Z
 .Op Fl pi
 .Ek
@@ -247 +248 @@
 .It Fl X Fl -no-pex
 Disable peer exchange (PEX).
+.It Fl z Fl -lds
+Enable local peer discovery (LDS).
+.It Fl Z Fl -no-lds
+Disable local peer discovery (LDS).
 .It Fl pi Fl -peer-info
 List the current torrent's connected peers.

trunk/gtk/main.c

@@ -1222 +1222 @@
         tr_sessionSetDHTEnabled( tr, pref_flag_get( key ) );
     }
+    else if( !strcmp( key, TR_PREFS_KEY_LDS_ENABLED ) )
+    {
+        tr_sessionSetLDSEnabled( tr, pref_flag_get( key ) );
+    }
     else if( !strcmp( key, TR_PREFS_KEY_RPC_PORT ) )
     {

trunk/gtk/tr-prefs.c

@@ -552 +552 @@
     w = new_check_button( s, TR_PREFS_KEY_DHT_ENABLED, core );
     s = _( "DHT is a tool for finding peers without a tracker." );
+    gtr_widget_set_tooltip_text( w, s );
+    hig_workarea_add_wide_control( t, &row, w );
+
+    s = _( "Use LDS to find local peers" );
+    w = new_check_button( s, TR_PREFS_KEY_LDS_ENABLED, core );
+    s = _( "LDS is a tool for finding peers on your local network." );
     gtr_widget_set_tooltip_text( w, s );
     hig_workarea_add_wide_control( t, &row, w );

trunk/qt/prefs-dialog.cc

@@ -452 +452 @@
     QHBoxLayout * h = new QHBoxLayout( );
     QIcon i( style()->standardIcon( QStyle::StandardPixmap( QStyle::SP_BrowserReload ) ) );
-    QPushButton * w = new QPushButton( i, tr( "&Update blocklist" ) );
+    QWidget * w = new QPushButton( i, tr( "&Update blocklist" ) );
     connect( w, SIGNAL(clicked(bool)), this, SLOT(onUpdateBlocklistClicked()));
     myBlockWidgets << w;
@@ -474 +474 @@
     hig->addSectionTitle( tr( "Privacy" ) );
     hig->addRow( tr( "&Encryption mode:" ), box );
-    hig->addWideControl( checkBoxNew( tr( "Use PE&X to find more peers" ), Prefs::PEX_ENABLED ) );
-    hig->addWideControl( checkBoxNew( tr( "Use &DHT to find more peers" ), Prefs::DHT_ENABLED ) );
+    hig->addWideControl( w = checkBoxNew( tr( "Use PE&X to find more peers" ), Prefs::PEX_ENABLED ) );
+    w->setToolTip( tr( "PEX is a tool for exchanging peer lists with the peers you're connected to." ) );
+    hig->addWideControl( w = checkBoxNew( tr( "Use &DHT to find more peers" ), Prefs::DHT_ENABLED ) );
+    w->setToolTip( tr( "DHT is a tool for finding peers without a tracker." ) );
+    hig->addWideControl( w = checkBoxNew( tr( "Use &LDS to find local peers" ), Prefs::LDS_ENABLED ) );
+    w->setToolTip( tr( "LDS is a tool for finding peers on your local network." ) );
 
     hig->finish( );

trunk/qt/prefs.cc

@@ -94 +94 @@
     { PEX_ENABLED, TR_PREFS_KEY_PEX_ENABLED, QVariant::Bool },
     { DHT_ENABLED, TR_PREFS_KEY_DHT_ENABLED, QVariant::Bool },
+    { LDS_ENABLED, TR_PREFS_KEY_LDS_ENABLED, QVariant::Bool },
     { PORT_FORWARDING, TR_PREFS_KEY_PORT_FORWARDING, QVariant::Bool },
     { PROXY_AUTH_ENABLED, TR_PREFS_KEY_PROXY_AUTH_ENABLED, QVariant::Bool },

trunk/qt/prefs.h

@@ -98 +98 @@
             PEX_ENABLED,
             DHT_ENABLED,
+            LDS_ENABLED,
             PORT_FORWARDING,
             PROXY_AUTH_ENABLED,