Changeset 11513


Ignore:
Timestamp:
Dec 11, 2010, 6:49:59 PM (11 years ago)
Author:
charles
Message:

(trunk gtk) futz with the preferences dialog layout & terminology a little bit. steal a little back from qBittorrent.

Location:
trunk/gtk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/actions.c

    r11263 r11513  
    9393static GtkToggleActionEntry  pref_toggle_entries[] =
    9494{
    95     { "alt-speed-enabled", NULL, N_( "Enable Temporary Speed _Limits" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
     95    { "alt-speed-enabled", NULL, N_( "Enable Alternative Speed _Limits" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
    9696    { "compact-view",      NULL, N_( "_Compact View" ), "<alt>C", NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
    9797    { "sort-reversed",     NULL, N_( "Re_verse Sort Order" ), NULL, NULL, G_CALLBACK( toggle_pref_cb ), FALSE },
  • trunk/gtk/tr-prefs.c

    r11512 r11513  
    270270    hig_workarea_add_section_title( t, &row, _( "Adding" ) );
    271271
     272    s = _( "_Start when added" );
     273    w = new_check_button( s, TR_PREFS_KEY_START, core );
     274    hig_workarea_add_wide_control( t, &row, w );
     275
     276    s = _( "Show _options dialog" );
     277    w = new_check_button( s, PREF_KEY_OPTIONS_PROMPT, core );
     278    hig_workarea_add_wide_control( t, &row, w );
     279
     280    s = _( "Mo_ve .torrent file to the trash" );
     281    w = new_check_button( s, TR_PREFS_KEY_TRASH_ORIGINAL, core );
     282    hig_workarea_add_wide_control( t, &row, w );
     283
    272284#ifdef HAVE_GIO
    273285    s = _( "Automatically _add torrents from:" );
     
    280292#endif
    281293
    282     s = _( "Show _options dialog" );
    283     w = new_check_button( s, PREF_KEY_OPTIONS_PROMPT, core );
    284     hig_workarea_add_wide_control( t, &row, w );
    285 
    286     s = _( "_Start when added" );
    287     w = new_check_button( s, TR_PREFS_KEY_START, core );
    288     hig_workarea_add_wide_control( t, &row, w );
    289 
    290     s = _( "Mo_ve .torrent file to the trash" );
    291     w = new_check_button( s, TR_PREFS_KEY_TRASH_ORIGINAL, core );
    292     hig_workarea_add_wide_control( t, &row, w );
    293 
    294294    hig_workarea_add_section_divider( t, &row );
    295295    hig_workarea_add_section_title( t, &row, _( "Downloading" ) );
     
    317317
    318318    hig_workarea_add_section_divider( t, &row );
    319     hig_workarea_add_section_title( t, &row, _( "Seeding Limits" ) );
     319    hig_workarea_add_section_title( t, &row, _( "Seeding" ) );
    320320
    321321    s = _( "Stop seeding at _ratio:" );
     
    781781    w = new_spin_button( TR_PREFS_KEY_RPC_PORT, core, 0, USHRT_MAX, 1 );
    782782    page->widgets = g_slist_append( page->widgets, w );
    783     w = hig_workarea_add_row( t, &row, _( "Listening _port:" ), w, NULL );
     783    w = hig_workarea_add_row( t, &row, _( "HTTP _port:" ), w, NULL );
    784784    page->widgets = g_slist_append( page->widgets, w );
    785785
     
    10151015    hig_workarea_add_section_title( t, &row, _( "Speed Limits" ) );
    10161016
    1017         g_snprintf( buf, sizeof( buf ), _( "Limit _download speed (%s):" ), _(speed_K_str) );
     1017        g_snprintf( buf, sizeof( buf ), _( "_Upload (%s):" ), _(speed_K_str) );
     1018        w = new_check_button( buf, TR_PREFS_KEY_USPEED_ENABLED, core );
     1019        w2 = new_spin_button( TR_PREFS_KEY_USPEED_KBps, core, 0, INT_MAX, 5 );
     1020        gtk_widget_set_sensitive( GTK_WIDGET( w2 ), pref_flag_get( TR_PREFS_KEY_USPEED_ENABLED ) );
     1021        g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
     1022        hig_workarea_add_row_w( t, &row, w, w2, NULL );
     1023
     1024        g_snprintf( buf, sizeof( buf ), _( "_Download (%s):" ), _(speed_K_str) );
    10181025        w = new_check_button( buf, TR_PREFS_KEY_DSPEED_ENABLED, core );
    10191026        w2 = new_spin_button( TR_PREFS_KEY_DSPEED_KBps, core, 0, INT_MAX, 5 );
     
    10221029        hig_workarea_add_row_w( t, &row, w, w2, NULL );
    10231030
    1024         g_snprintf( buf, sizeof( buf ), _( "Limit _upload speed (%s):" ), _(speed_K_str) );
    1025         w = new_check_button( buf, TR_PREFS_KEY_USPEED_ENABLED, core );
    1026         w2 = new_spin_button( TR_PREFS_KEY_USPEED_KBps, core, 0, INT_MAX, 5 );
    1027         gtk_widget_set_sensitive( GTK_WIDGET( w2 ), pref_flag_get( TR_PREFS_KEY_USPEED_ENABLED ) );
    1028         g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
    1029         hig_workarea_add_row_w( t, &row, w, w2, NULL );
    1030 
    10311031    hig_workarea_add_section_divider( t, &row );
    10321032    h = gtk_hbox_new( FALSE, GUI_PAD );
    1033     w = gtk_image_new_from_stock( "alt-speed-off", -1 );
     1033    w = gtk_image_new_from_stock( "alt-speed-on", -1 );
    10341034    gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 );
    1035     g_snprintf( buf, sizeof( buf ), "<b>%s</b>", _( "Temporary Speed Limits" ) );
     1035    g_snprintf( buf, sizeof( buf ), "<b>%s</b>", _( "Alternative Speed Limits" ) );
    10361036    w = gtk_label_new( buf );
    10371037    gtk_misc_set_alignment( GTK_MISC( w ), 0.0f, 0.5f );
     
    10471047        hig_workarea_add_wide_control( t, &row, w );
    10481048
    1049         g_snprintf( buf, sizeof( buf ), _( "Limit do_wnload speed (%s):" ), _(speed_K_str) );
     1049        g_snprintf( buf, sizeof( buf ), _( "U_pload (%s):" ), _(speed_K_str) );
     1050        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_UP_KBps, core, 0, INT_MAX, 5 );
     1051        hig_workarea_add_row( t, &row, buf, w, NULL );
     1052
     1053        g_snprintf( buf, sizeof( buf ), _( "Do_wnload (%s):" ), _(speed_K_str) );
    10501054        w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_DOWN_KBps, core, 0, INT_MAX, 5 );
    1051         hig_workarea_add_row( t, &row, buf, w, NULL );
    1052 
    1053         g_snprintf( buf, sizeof( buf ), _( "Limit u_pload speed (%s):" ), _(speed_K_str) );
    1054         w = new_spin_button( TR_PREFS_KEY_ALT_SPEED_UP_KBps, core, 0, INT_MAX, 5 );
    10551055        hig_workarea_add_row( t, &row, buf, w, NULL );
    10561056
     
    11821182    /* build the page */
    11831183    t = hig_workarea_create( );
    1184     hig_workarea_add_section_title( t, &row, _( "Incoming Peers" ) );
    1185 
    1186     s = _( "_Port for incoming connections:" );
     1184    hig_workarea_add_section_title( t, &row, _( "Listening Port" ) );
     1185
     1186    s = _( "_Port used for incoming connections:" );
    11871187    w = data->portSpin = new_spin_button( TR_PREFS_KEY_PEER_PORT, core, 1, USHRT_MAX, 1 );
    11881188    hig_workarea_add_row( t, &row, s, w, NULL );
     
    12081208
    12091209    hig_workarea_add_section_divider( t, &row );
    1210     hig_workarea_add_section_title( t, &row, _( "Limits" ) );
     1210    hig_workarea_add_section_title( t, &row, _( "Peer Limits" ) );
    12111211
    12121212    w = new_spin_button( TR_PREFS_KEY_PEER_LIMIT_TORRENT, core, 1, 300, 5 );
     
    12181218    hig_workarea_add_section_title( t, &row, _( "Options" ) );
    12191219
    1220     w = gtk_button_new_with_mnemonic( _( "Launch GNOME Network Preferences" ) );
     1220    w = gtk_button_new_with_mnemonic( _( "Edit GNOME Proxy Settings" ) );
    12211221    g_signal_connect( w, "clicked", G_CALLBACK( onGNOMEClicked ), data );
    1222     hig_workarea_add_row( t, &row, _( "Pro_xies:" ), w, NULL );
     1222    h = gtk_hbox_new( FALSE, 0 );
     1223    gtk_box_pack_start( GTK_BOX( h ), w, FALSE, FALSE, 0 );
     1224    hig_workarea_add_wide_control( t, &row, h );
    12231225
    12241226    hig_workarea_finish( t, &row );
  • trunk/gtk/tr-window.c

    r11439 r11513  
    262262    tr_formatter_speed_KBps( u, pref_int_get( TR_PREFS_KEY_ALT_SPEED_UP_KBps ), sizeof( u ) );
    263263    tr_formatter_speed_KBps( d, pref_int_get( TR_PREFS_KEY_ALT_SPEED_DOWN_KBps ), sizeof( d ) );
    264     fmt = b ? _( "Click to disable Temporary Speed Limits\n(%1$s down, %2$s up)" )
    265             : _( "Click to enable Temporary Speed Limits\n(%1$s down, %2$s up)" );
     264    fmt = b ? _( "Click to disable Alternative Speed Limits\n(%1$s down, %2$s up)" )
     265            : _( "Click to enable Alternative Speed Limits\n(%1$s down, %2$s up)" );
    266266    str = g_strdup_printf( fmt, d, u );
    267267
Note: See TracChangeset for help on using the changeset viewer.