mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Charles Kerr 2008-03-19 20:34:35 +00:00
parent 531dd851ad
commit ca9a75d4aa
7 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/actions.c
View File

@ -119,7 +119,7 @@ static GtkActionEntry entries[] =
{ "quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, NULL, G_CALLBACK(action_cb) },
{ "select-all", GTK_STOCK_SELECT_ALL,
N_( "Select _All" ), "<control>A", NULL, G_CALLBACK(action_cb) },
{ "unselect-all", NULL,
{ "deselect-all", NULL,
N_("Dese_lect All"), "<shift><control>A", NULL, G_CALLBACK(action_cb) },
{ "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK(action_cb) },
{ "show-torrent-details", GTK_STOCK_INFO,

4
gtk/details.c
View File

@ -686,8 +686,8 @@ info_page_new (tr_torrent * tor)
hig_workarea_add_row (t, &row, _("Hash:"), l, NULL);
pch = (info->isPrivate )
? _("Private Torrent: PEX disabled")
: _("Public Torrent");
? _("Private to this tracker -- PEX disabled")
: _("Public torrent");
l = gtk_label_new (pch);
hig_workarea_add_row (t, &row, _("Privacy:"), l, NULL);

10
gtk/main.c
View File

@ -204,6 +204,14 @@ refreshTorrentActions( GtkTreeSelection * s )
canUpdate = 0;
gtk_tree_selection_selected_foreach( s, accumulateCanUpdateForeach, &canUpdate );
action_sensitize( "update-tracker", canUpdate!=0 );
{
GtkTreeView * view = gtk_tree_selection_get_tree_view( s );
GtkTreeModel * model = gtk_tree_view_get_model( view );
const int torrentCount = gtk_tree_model_iter_n_children( model, NULL ) != 0;
action_sensitize( "select-all", torrentCount!=0 );
action_sensitize( "deselect-all", torrentCount!=0 );
}
}
static void
@ -1069,7 +1077,7 @@ doAction ( const char * action_name, gpointer user_data )
GtkTreeSelection * s = tr_window_get_selection(data->wind);
gtk_tree_selection_select_all( s );
}
else if (!strcmp (action_name, "unselect-all"))
else if (!strcmp (action_name, "deselect-all"))
{
GtkTreeSelection * s = tr_window_get_selection(data->wind);
gtk_tree_selection_unselect_all( s );

2
gtk/makemeta-ui.c
View File

@ -289,7 +289,7 @@ make_meta_ui( GtkWindow * parent, tr_handle * handle )
hig_workarea_add_section_divider( t, &row );
hig_workarea_add_section_title (t, &row, _("Metainfo"));
hig_workarea_add_section_title (t, &row, _("Details"));
w = ui->private_check = hig_workarea_add_wide_checkbutton( t, &row, _( "_Private to this tracker" ), FALSE );

43
gtk/open-dialog.c
View File

@ -123,6 +123,22 @@ destinationChanged( GtkFileChooserButton * b, gpointer gdata )
verifyRequested( NULL, data );
}
static void
addTorrentFilters( GtkFileChooser * chooser )
{
GtkFileFilter * filter;
filter = gtk_file_filter_new( );
gtk_file_filter_set_name( filter, _( "Torrent files" ) );
gtk_file_filter_add_pattern( filter, "*.torrent" );
gtk_file_chooser_add_filter( chooser, filter );
filter = gtk_file_filter_new( );
gtk_file_filter_set_name( filter, _( "All files" ) );
gtk_file_filter_add_pattern( filter, "*" );
gtk_file_chooser_add_filter( chooser, filter );
}
/****
*****
****/
@ -139,7 +155,6 @@ openSingleTorrentDialog( GtkWindow * parent,
GtkWidget * d;
GtkWidget * t;
GtkWidget * l;
GtkFileFilter * filter;
struct OpenData * data;
uint8_t flag;
@ -181,18 +196,11 @@ openSingleTorrentDialog( GtkWindow * parent,
gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f );
gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );
++col;
w = gtk_file_chooser_button_new( _( "Select Torrent" ),
w = gtk_file_chooser_button_new( _( "Select Source File" ),
GTK_FILE_CHOOSER_ACTION_OPEN );
gtk_table_attach( GTK_TABLE( t ), w, col, col+1, row, row+1, ~0, 0, 0, 0 );
gtk_label_set_mnemonic_widget( GTK_LABEL( l ), w );
filter = gtk_file_filter_new( );
gtk_file_filter_set_name( filter, _( "Torrent files" ) );
gtk_file_filter_add_pattern( filter, "*.torrent" );
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
filter = gtk_file_filter_new( );
gtk_file_filter_set_name( filter, _( "All files" ) );
gtk_file_filter_add_pattern( filter, "*" );
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
addTorrentFilters( GTK_FILE_CHOOSER( w ) );
g_signal_connect( w, "selection-changed",
G_CALLBACK( sourceChanged ), data );
if( data->filename )
@ -205,7 +213,7 @@ openSingleTorrentDialog( GtkWindow * parent,
gtk_misc_set_alignment( GTK_MISC( l ), 0.0f, 0.5f );
gtk_table_attach( GTK_TABLE( t ), l, col, col+1, row, row+1, GTK_FILL, 0, 0, 0 );
++col;
w = gtk_file_chooser_button_new( _( "Destination" ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
w = gtk_file_chooser_button_new( _( "Select Destination Folder" ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
if( !gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( w ), data->destination ) )
g_warning( "couldn't select '%s'", data->destination );
gtk_table_attach( GTK_TABLE( t ), w, col, col+1, row, row+1, ~0, 0, 0, 0 );
@ -278,7 +286,6 @@ openDialog( GtkWindow * parent,
{
GtkWidget * w;
GtkWidget * c;
GtkFileFilter * filter;
char * folder;
w = gtk_file_chooser_dialog_new( _( "Open a Torrent" ), parent,
@ -291,17 +298,7 @@ openDialog( GtkWindow * parent,
GTK_RESPONSE_CANCEL,
-1 );
gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( w ), TRUE );
filter = gtk_file_filter_new( );
gtk_file_filter_set_name( filter, _( "Torrent files" ) );
gtk_file_filter_add_pattern( filter, "*.torrent" );
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
filter = gtk_file_filter_new( );
gtk_file_filter_set_name( filter, _( "All files" ) );
gtk_file_filter_add_pattern( filter, "*" );
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( w ), filter );
addTorrentFilters( GTK_FILE_CHOOSER( w ) );
g_signal_connect( w, "response", G_CALLBACK(onOpenDialogResponse), core );
if(( folder = pref_string_get( PREF_KEY_OPEN_DIALOG_FOLDER ))) {

2
gtk/ui.h
View File

@ -18,7 +18,7 @@ const char * fallback_ui_file =
" </menu>\n"
" <menu action='edit-menu'>\n"
" <menuitem action='select-all'/>\n"
" <menuitem action='unselect-all'/>\n"
" <menuitem action='deselect-all'/>\n"
" <separator/>\n"
" <menuitem action='edit-preferences'/>\n"
" </menu>\n"

4
libtransmission/transmission.c
View File

@ -460,8 +460,10 @@ tr_loadTorrents ( tr_handle * h,
tr_list_free( &list, NULL );
if( n )
tr_inf( _( "Loaded %d torrents" ), n );
*setmeCount = n;
tr_inf( _( "Loaded %d torrents" ), *setmeCount );
return torrents;
}