Changeset 6131


Ignore:
Timestamp:
Jun 10, 2008, 11:05:30 PM (13 years ago)
Author:
charles
Message:

(gtk) sync the proxy preferences' text with the mac client

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/tr-prefs.c

    r6118 r6131  
    961961
    962962    hig_workarea_add_section_divider( t, &row );
    963     hig_workarea_add_section_title (t, &row, _( "Tracker Proxies" ) );
    964 
    965         s = _( "Use a tracker _proxy:" );
     963    hig_workarea_add_section_title (t, &row, _( "Tracker Proxy" ) );
     964
     965        s = _( "Connect to tracker with HTTP proxy" );
    966966        w = new_check_button( s, PREF_KEY_PROXY_SERVER_ENABLED, core );
    967         w2 = new_entry( PREF_KEY_PROXY_SERVER, core );
    968         page->proxy_widgets = g_slist_append( page->proxy_widgets, w2 );
    969         g_signal_connect( w, "toggled", G_CALLBACK(onProxyToggled), page );
    970         hig_workarea_add_row_w( t, &row, w, w2, NULL );
    971 
    972         s = _( "My proxy requires _authentication" );
    973         w = new_check_button( s, PREF_KEY_PROXY_AUTH_ENABLED, core );
    974         page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
    975967        g_signal_connect( w, "toggled", G_CALLBACK(onProxyToggled), page );
    976968        hig_workarea_add_wide_control( t, &row, w );
    977969
     970        s = _( "Proxy server:" );
     971        w = new_entry( PREF_KEY_PROXY_SERVER, core );
     972        page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
     973        w = hig_workarea_add_row( t, &row, s, w, NULL );
     974        page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
     975
     976        s = _( "_Authentication is required" );
     977        w = new_check_button( s, PREF_KEY_PROXY_AUTH_ENABLED, core );
     978        g_signal_connect( w, "toggled", G_CALLBACK(onProxyToggled), page );
     979        hig_workarea_add_wide_control( t, &row, w );
     980        page->proxy_widgets = g_slist_append( page->proxy_widgets, w );
     981
     982        s = _( "_Username:" );
    978983        w = new_entry( PREF_KEY_PROXY_USERNAME, core );
    979984        page->proxy_auth_widgets = g_slist_append( page->proxy_auth_widgets, w );
    980         w = hig_workarea_add_row( t, &row, _( "_Username:" ), w, NULL );
     985        w = hig_workarea_add_row( t, &row, s, w, NULL );
    981986        page->proxy_auth_widgets = g_slist_append( page->proxy_auth_widgets, w );
    982987
     988        s = _( "_Password:" );
    983989        w = new_entry( PREF_KEY_PROXY_PASSWORD, core );
    984990        gtk_entry_set_visibility( GTK_ENTRY( w ), FALSE );
    985991        page->proxy_auth_widgets = g_slist_append( page->proxy_auth_widgets, w );
    986         w = hig_workarea_add_row( t, &row, _( "_Password:" ), w, NULL );
     992        w = hig_workarea_add_row( t, &row, s, w, NULL );
    987993        page->proxy_auth_widgets = g_slist_append( page->proxy_auth_widgets, w );
    988994
Note: See TracChangeset for help on using the changeset viewer.