Changeset 10611


Ignore:
Timestamp:
May 1, 2010, 4:23:42 PM (8 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/daemon/remote.c

    r10556 r10611  
    256256    { 'x', "pex",                   "Enable peer exchange (PEX)", "x",  0, NULL },
    257257    { 'X', "no-pex",                "Disable peer exchange (PEX)", "X",  0, NULL },
     258    { 'z', "lds",                   "Enable local peer discovery (LDS)", "z",  0, NULL },
     259    { 'Z', "no-lds",                "Disable local peer discovery (LDS)", "Z",  0, NULL },
    258260    { 940, "peer-info",             "List the current torrent(s)' peers", "pi",  0, NULL },
    259261    {   0, NULL,                    NULL, NULL, 0, NULL }
     
    324326        case 'x': /* pex */
    325327        case 'X': /* no-pex */
     328        case 'z': /* lds */
     329        case 'Z': /* no-lds */
    326330        case 970: /* alt-speed */
    327331        case 971: /* no-alt-speed */
     
    18161820                case 'X': tr_bencDictAddBool( args, TR_PREFS_KEY_PEX_ENABLED, FALSE );
    18171821                          break;
     1822                case 'z': tr_bencDictAddBool( args, TR_PREFS_KEY_LDS_ENABLED, TRUE );
     1823                          break;
     1824                case 'Z': tr_bencDictAddBool( args, TR_PREFS_KEY_LDS_ENABLED, FALSE );
     1825                          break;
    18181826                case 953: tr_bencDictAddReal( args, "seedRatioLimit", atof(optarg) );
    18191827                          tr_bencDictAddBool( args, "seedRatioLimited", TRUE );
  • trunk/daemon/transmission-remote.1

    r10545 r10611  
    5656.Op Fl w Ar download-dir
    5757.Op Fl x | X
     58.Op Fl z | Z
    5859.Op Fl pi
    5960.Ek
     
    247248.It Fl X Fl -no-pex
    248249Disable peer exchange (PEX).
     250.It Fl z Fl -lds
     251Enable local peer discovery (LDS).
     252.It Fl Z Fl -no-lds
     253Disable local peer discovery (LDS).
    249254.It Fl pi Fl -peer-info
    250255List the current torrent's connected peers.
  • trunk/gtk/main.c

    r10560 r10611  
    12221222        tr_sessionSetDHTEnabled( tr, pref_flag_get( key ) );
    12231223    }
     1224    else if( !strcmp( key, TR_PREFS_KEY_LDS_ENABLED ) )
     1225    {
     1226        tr_sessionSetLDSEnabled( tr, pref_flag_get( key ) );
     1227    }
    12241228    else if( !strcmp( key, TR_PREFS_KEY_RPC_PORT ) )
    12251229    {
  • trunk/gtk/tr-prefs.c

    r10536 r10611  
    552552    w = new_check_button( s, TR_PREFS_KEY_DHT_ENABLED, core );
    553553    s = _( "DHT is a tool for finding peers without a tracker." );
     554    gtr_widget_set_tooltip_text( w, s );
     555    hig_workarea_add_wide_control( t, &row, w );
     556
     557    s = _( "Use LDS to find local peers" );
     558    w = new_check_button( s, TR_PREFS_KEY_LDS_ENABLED, core );
     559    s = _( "LDS is a tool for finding peers on your local network." );
    554560    gtr_widget_set_tooltip_text( w, s );
    555561    hig_workarea_add_wide_control( t, &row, w );
  • trunk/qt/prefs-dialog.cc

    r10536 r10611  
    452452    QHBoxLayout * h = new QHBoxLayout( );
    453453    QIcon i( style()->standardIcon( QStyle::StandardPixmap( QStyle::SP_BrowserReload ) ) );
    454     QPushButton * w = new QPushButton( i, tr( "&Update blocklist" ) );
     454    QWidget * w = new QPushButton( i, tr( "&Update blocklist" ) );
    455455    connect( w, SIGNAL(clicked(bool)), this, SLOT(onUpdateBlocklistClicked()));
    456456    myBlockWidgets << w;
     
    474474    hig->addSectionTitle( tr( "Privacy" ) );
    475475    hig->addRow( tr( "&Encryption mode:" ), box );
    476     hig->addWideControl( checkBoxNew( tr( "Use PE&X to find more peers" ), Prefs::PEX_ENABLED ) );
    477     hig->addWideControl( checkBoxNew( tr( "Use &DHT to find more peers" ), Prefs::DHT_ENABLED ) );
     476    hig->addWideControl( w = checkBoxNew( tr( "Use PE&X to find more peers" ), Prefs::PEX_ENABLED ) );
     477    w->setToolTip( tr( "PEX is a tool for exchanging peer lists with the peers you're connected to." ) );
     478    hig->addWideControl( w = checkBoxNew( tr( "Use &DHT to find more peers" ), Prefs::DHT_ENABLED ) );
     479    w->setToolTip( tr( "DHT is a tool for finding peers without a tracker." ) );
     480    hig->addWideControl( w = checkBoxNew( tr( "Use &LDS to find local peers" ), Prefs::LDS_ENABLED ) );
     481    w->setToolTip( tr( "LDS is a tool for finding peers on your local network." ) );
    478482
    479483    hig->finish( );
  • trunk/qt/prefs.cc

    r10442 r10611  
    9494    { PEX_ENABLED, TR_PREFS_KEY_PEX_ENABLED, QVariant::Bool },
    9595    { DHT_ENABLED, TR_PREFS_KEY_DHT_ENABLED, QVariant::Bool },
     96    { LDS_ENABLED, TR_PREFS_KEY_LDS_ENABLED, QVariant::Bool },
    9697    { PORT_FORWARDING, TR_PREFS_KEY_PORT_FORWARDING, QVariant::Bool },
    9798    { PROXY_AUTH_ENABLED, TR_PREFS_KEY_PROXY_AUTH_ENABLED, QVariant::Bool },
  • trunk/qt/prefs.h

    r10442 r10611  
    9898            PEX_ENABLED,
    9999            DHT_ENABLED,
     100            LDS_ENABLED,
    100101            PORT_FORWARDING,
    101102            PROXY_AUTH_ENABLED,
Note: See TracChangeset for help on using the changeset viewer.