mirror of
https://github.com/transmission/transmission
synced 2025-03-03 10:15:45 +00:00
fix "select all" wart for users w/gtk < 2.10
This commit is contained in:
parent
32b41bb72e
commit
dd7111d3a0
3 changed files with 11 additions and 15 deletions
|
@ -38,18 +38,13 @@ action_cb ( GtkAction * a, gpointer user_data )
|
||||||
#define GTK_STOCK_INFO GTK_STOCK_PROPERTIES
|
#define GTK_STOCK_INFO GTK_STOCK_PROPERTIES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(2,10,0)
|
|
||||||
#define GTK_STOCK_SELECT_ALL NULL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static GtkRadioActionEntry sort_radio_entries[] =
|
static GtkRadioActionEntry sort_radio_entries[] =
|
||||||
{
|
{
|
||||||
{ "sort-by-activity", NULL, N_("Sort by _Activity"), NULL, NULL, 0 },
|
{ "sort-by-activity", NULL, N_("Sort by _Activity"), NULL, NULL, 0 },
|
||||||
{ "sort-by-date-added", NULL, N_("Sort by _Date Added"), NULL, NULL, 1 },
|
{ "sort-by-name", NULL, N_("Sort by _Name"), NULL, NULL, 1 },
|
||||||
{ "sort-by-name", NULL, N_("Sort by _Name"), NULL, NULL, 2 },
|
{ "sort-by-progress", NULL, N_("Sort by _Progress"), NULL, NULL, 2 },
|
||||||
{ "sort-by-progress", NULL, N_("Sort by _Progress"), NULL, NULL, 3 },
|
{ "sort-by-state", NULL, N_("Sort by _State"), NULL, NULL, 3 },
|
||||||
{ "sort-by-state", NULL, N_("Sort by _State"), NULL, NULL, 4 },
|
{ "sort-by-tracker", NULL, N_("Sort by _Tracker"), NULL, NULL, 4 }
|
||||||
{ "sort-by-tracker", NULL, N_("Sort by _Tracker"), NULL, NULL, 5 }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -118,7 +113,8 @@ static GtkActionEntry entries[] =
|
||||||
N_("Close main window"),
|
N_("Close main window"),
|
||||||
G_CALLBACK(action_cb) },
|
G_CALLBACK(action_cb) },
|
||||||
{ "quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, NULL, G_CALLBACK(action_cb) },
|
{ "quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
{ "select-all", GTK_STOCK_SELECT_ALL, NULL, "<control>A", NULL, G_CALLBACK(action_cb) },
|
{ "select-all", NULL,
|
||||||
|
N_( "Select _All" ), "<control>A", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "unselect-all", NULL,
|
{ "unselect-all", NULL,
|
||||||
N_("Dese_lect All"), "<shift><control>A", NULL, G_CALLBACK(action_cb) },
|
N_("Dese_lect All"), "<shift><control>A", NULL, G_CALLBACK(action_cb) },
|
||||||
{ "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK(action_cb) },
|
{ "edit-preferences", GTK_STOCK_PREFERENCES, NULL, NULL, NULL, G_CALLBACK(action_cb) },
|
||||||
|
|
|
@ -719,11 +719,11 @@ info_page_new (tr_torrent * tor)
|
||||||
|
|
||||||
l = gtk_label_new (tr_torrentGetFolder (tor));
|
l = gtk_label_new (tr_torrentGetFolder (tor));
|
||||||
gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
|
gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
|
||||||
hig_workarea_add_row (t, &row, _( "Destination folder" ), l, NULL);
|
hig_workarea_add_row (t, &row, _( "Destination folder:" ), l, NULL);
|
||||||
|
|
||||||
l = gtk_label_new ( info->torrent );
|
l = gtk_label_new ( info->torrent );
|
||||||
gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
|
gtk_label_set_ellipsize( GTK_LABEL( l ), PANGO_ELLIPSIZE_END );
|
||||||
hig_workarea_add_row (t, &row, _( "Torrent file" ), l, NULL);
|
hig_workarea_add_row (t, &row, _( "Torrent file:" ), l, NULL);
|
||||||
|
|
||||||
hig_workarea_finish (t, &row);
|
hig_workarea_finish (t, &row);
|
||||||
return t;
|
return t;
|
||||||
|
@ -1001,7 +1001,7 @@ options_page_new ( TrTorrent * gtor )
|
||||||
maxConnectedPeers = tr_torrentGetMaxConnectedPeers( tor );
|
maxConnectedPeers = tr_torrentGetMaxConnectedPeers( tor );
|
||||||
w = gtk_spin_button_new_with_range( 1, 3000, 5 );
|
w = gtk_spin_button_new_with_range( 1, 3000, 5 );
|
||||||
gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), maxConnectedPeers );
|
gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), maxConnectedPeers );
|
||||||
hig_workarea_add_row( t, &row, _( "_Maximum number of peers:" ), w, w );
|
hig_workarea_add_row( t, &row, _( "_Maximum peers:" ), w, w );
|
||||||
g_signal_connect( w, "value-changed", G_CALLBACK( max_peers_spun_cb ), gtor );
|
g_signal_connect( w, "value-changed", G_CALLBACK( max_peers_spun_cb ), gtor );
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|
|
@ -144,7 +144,7 @@ openSingleTorrentDialog( GtkWindow * parent,
|
||||||
uint8_t flag;
|
uint8_t flag;
|
||||||
|
|
||||||
/* make the dialog */
|
/* make the dialog */
|
||||||
d = gtk_dialog_new_with_buttons( _( "Open Torrent" ), parent,
|
d = gtk_dialog_new_with_buttons( _( "Torrent Options" ), parent,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
|
GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
||||||
|
@ -272,7 +272,7 @@ openDialog( GtkWindow * parent,
|
||||||
GtkFileFilter * filter;
|
GtkFileFilter * filter;
|
||||||
char * folder;
|
char * folder;
|
||||||
|
|
||||||
w = gtk_file_chooser_dialog_new( _( "Select Torrents" ), parent,
|
w = gtk_file_chooser_dialog_new( _( "Open a Torrent" ), parent,
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
GTK_FILE_CHOOSER_ACTION_OPEN,
|
||||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||||
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
|
||||||
|
|
Loading…
Reference in a new issue