Changeset 5314


Ignore:
Timestamp:
Mar 19, 2008, 8:34:35 PM (14 years ago)
Author:
charles
Message:

(gtk) fix minor terminology inconsistencies between the "new torrent" and "details" dialogs

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/actions.c

    r5312 r5314  
    120120  { "select-all", GTK_STOCK_SELECT_ALL,
    121121    N_( "Select _All" ), "<control>A", NULL, G_CALLBACK(action_cb) },
    122   { "unselect-all", NULL,
     122  { "deselect-all", NULL,
    123123    N_("Dese_lect All"), "<shift><control>A", NULL, G_CALLBACK(action_cb) },
    124124  { "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK(action_cb) },
  • trunk/gtk/details.c

    r5313 r5314  
    687687
    688688    pch = (info->isPrivate )
    689       ? _("Private Torrent: PEX disabled")
    690       : _("Public Torrent");
     689      ? _("Private to this tracker -- PEX disabled")
     690      : _("Public torrent");
    691691    l = gtk_label_new (pch);
    692692    hig_workarea_add_row (t, &row, _("Privacy:"), l, NULL);
  • trunk/gtk/main.c

    r5302 r5314  
    205205    gtk_tree_selection_selected_foreach( s, accumulateCanUpdateForeach, &canUpdate );
    206206    action_sensitize( "update-tracker", canUpdate!=0 );
     207
     208    {
     209        GtkTreeView * view = gtk_tree_selection_get_tree_view( s );
     210        GtkTreeModel * model = gtk_tree_view_get_model( view );
     211        const int torrentCount = gtk_tree_model_iter_n_children( model, NULL ) != 0;
     212        action_sensitize( "select-all", torrentCount!=0 );
     213        action_sensitize( "deselect-all", torrentCount!=0 );
     214    }
    207215}
    208216
     
    10701078        gtk_tree_selection_select_all( s );
    10711079    }
    1072     else if (!strcmp (action_name, "unselect-all"))
     1080    else if (!strcmp (action_name, "deselect-all"))
    10731081    {
    10741082        GtkTreeSelection * s = tr_window_get_selection(data->wind);
  • trunk/gtk/makemeta-ui.c

    r5313 r5314  
    290290
    291291    hig_workarea_add_section_divider( t, &row );
    292     hig_workarea_add_section_title (t, &row, _("Metainfo"));
     292    hig_workarea_add_section_title (t, &row, _("Details"));
    293293
    294294        w = ui->private_check = hig_workarea_add_wide_checkbutton( t, &row, _( "_Private to this tracker" ), FALSE );
  • trunk/gtk/open-dialog.c

    r5307 r5314  
    124124}
    125125
     126static void
     127addTorrentFilters( GtkFileChooser * chooser )
     128{
     129    GtkFileFilter * filter;
     130
     131    filter = gtk_file_filter_new( );
     132    gtk_file_filter_set_name( filter, _( "Torrent files" ) );
     133    gtk_file_filter_add_pattern( filter, "*.torrent" );
     134    gtk_file_chooser_add_filter( chooser, filter );
     135
     136    filter = gtk_file_filter_new( );
     137    gtk_file_filter_set_name( filter, _( "All files" ) );
     138    gtk_file_filter_add_pattern( filter, "*" );
     139    gtk_file_chooser_add_filter( chooser, filter );
     140}
     141
    126142/****
    127143*****
     
    140156    GtkWidget * t;
    141157    GtkWidget * l;
    142     GtkFileFilter * filter;
    143158    struct OpenData * data;
    144159    uint8_t flag;
     
    182197    gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );
    183198    ++col;
    184     w = gtk_file_chooser_button_new( _( "Select Torrent" ),
     199    w = gtk_file_chooser_button_new( _( "Select Source File" ),
    185200                                     GTK_FILE_CHOOSER_ACTION_OPEN );
    186201    gtk_table_attach( GTK_TABLE( t ), w, col, col+1, row, row+1, ~0, 0, 0, 0 );
    187202    gtk_label_set_mnemonic_widget( GTK_LABEL( l ), w );
    188     filter = gtk_file_filter_new( );
    189     gtk_file_filter_set_name( filter, _( "Torrent files" ) );
    190     gtk_file_filter_add_pattern( filter, "*.torrent" );
    191     gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
    192     filter = gtk_file_filter_new( );
    193     gtk_file_filter_set_name( filter, _( "All files" ) );
    194     gtk_file_filter_add_pattern( filter, "*" );
    195     gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
     203    addTorrentFilters( GTK_FILE_CHOOSER( w ) );
    196204    g_signal_connect( w, "selection-changed",
    197205                      G_CALLBACK( sourceChanged ), data );
     
    206214    gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );
    207215    ++col;
    208     w = gtk_file_chooser_button_new( _( "Destination" ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
     216    w = gtk_file_chooser_button_new( _( "Select Destination Folder" ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
    209217    if( !gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( w ), data->destination ) )
    210218        g_warning( "couldn't select '%s'", data->destination );
     
    279287    GtkWidget * w;
    280288    GtkWidget * c;
    281     GtkFileFilter * filter;
    282289    char * folder;
    283290
     
    292299                                             -1 );
    293300    gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( w ), TRUE );
    294 
    295     filter = gtk_file_filter_new( );
    296     gtk_file_filter_set_name( filter, _( "Torrent files" ) );
    297     gtk_file_filter_add_pattern( filter, "*.torrent" );
    298     gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
    299 
    300     filter = gtk_file_filter_new( );
    301     gtk_file_filter_set_name( filter, _( "All files" ) );
    302     gtk_file_filter_add_pattern( filter, "*" );
    303     gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
    304 
     301    addTorrentFilters( GTK_FILE_CHOOSER( w ) );
    305302    g_signal_connect( w, "response", G_CALLBACK(onOpenDialogResponse), core );
    306303
  • trunk/gtk/ui.h

    r5312 r5314  
    1919"    <menu action='edit-menu'>\n"
    2020"      <menuitem action='select-all'/>\n"
    21 "      <menuitem action='unselect-all'/>\n"
     21"      <menuitem action='deselect-all'/>\n"
    2222"      <separator/>\n"
    2323"      <menuitem action='edit-preferences'/>\n"
  • trunk/libtransmission/transmission.c

    r5226 r5314  
    461461    tr_list_free( &list, NULL );
    462462
     463    if( n )
     464        tr_inf( _( "Loaded %d torrents" ), n );
     465
    463466    *setmeCount = n;
    464     tr_inf( _( "Loaded %d torrents" ), *setmeCount );
    465467    return torrents;
    466468}
Note: See TracChangeset for help on using the changeset viewer.