Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-23 03:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(gtk) yin/yang icon: add a pulldown menu for {total,session}{ratio,transfer}

Browse Source
This commit is contained in:
Charles Kerr
2007-12-20 19:21:21 +00:00
parent 4f8ac624dd
commit b51af2e799
5 changed files with 105 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/main.c
View File

@@ -748,7 +748,6 @@ setpex( tr_torrent * tor, void * arg )
gboolean
updatemodel(gpointer gdata) {
struct cbdata *data = gdata;
float up, down;
if( !data->closing && 0 < global_sigcount )
{
@@ -760,11 +759,8 @@ updatemodel(gpointer gdata) {
tr_core_update( data->core );
/* update the main window's statusbar and toolbar buttons */
if( NULL != data->wind )
{
tr_torrentRates( tr_core_handle( data->core ), &down, &up );
tr_window_update( data->wind, down, up );
}
if( data->wind )
tr_window_update( data->wind );
/* update the message window */
msgwin_update();

1
gtk/tr_prefs.c
View File

@@ -29,6 +29,7 @@ tr_prefs_init_global( void )
{
cf_check_older_configs( );
pref_string_set_default ( PREF_KEY_STATUS_BAR_STATS, "total-ratio" );
pref_flag_set_default ( PREF_KEY_STATUS_BAR, TRUE );
pref_flag_set_default ( PREF_KEY_TOOLBAR, TRUE );

1
gtk/tr_prefs.h
View File

@@ -39,6 +39,7 @@ GtkWidget * tr_prefs_dialog_new( GObject * core, GtkWindow * parent );
#define PREF_KEY_SORT_REVERSED "sort-reversed"
#define PREF_KEY_MINIMAL_VIEW "minimal-view"
#define PREF_KEY_STATUS_BAR "show-status-bar"
#define PREF_KEY_STATUS_BAR_STATS "status-bar-stats"
#define PREF_KEY_TOOLBAR "show-toolbar"
void tr_prefs_init_global( void );

97
gtk/tr_window.c
View File

@@ -54,6 +54,7 @@ typedef struct
GtkWidget * view;
GtkWidget * toolbar;
GtkWidget * status;
GtkWidget * status_menu;
GtkWidget * ul_lb;
GtkWidget * dl_lb;
GtkWidget * stats_lb;
@@ -163,6 +164,10 @@ prefsChanged( TrCore * core UNUSED, const char * key, gpointer wind )
const gboolean isEnabled = pref_flag_get( key );
g_object_set( p->toolbar, "visible", isEnabled, NULL );
}
else if( !strcmp( key, PREF_KEY_STATUS_BAR_STATS ) )
{
tr_window_update( (TrWindow*)wind );
}
}
static void
@@ -173,6 +178,36 @@ privateFree( gpointer vprivate )
g_free( p );
}
static void
onYinYangReleased( GtkWidget * w UNUSED, GdkEventButton * button UNUSED, gpointer vprivate )
{
PrivateData * p = ( PrivateData * ) vprivate;
gtk_menu_popup( GTK_MENU( p->status_menu ), 0, 0, 0, 0, 0, gtk_get_current_event_time( ) );
}
#define STATS_MODE "stats-mode"
static struct {
const char *val, *i18n;
} stats_modes[] = {
{ "total-ratio", N_("Total Ratio") },
{ "session-ratio", N_("Session Ratio") },
{ "total-transfer", N_("Total Transfer") },
{ "session-transfer", N_("Session Transfer") }
};
static void
status_menu_toggled_cb( GtkCheckMenuItem * menu_item,
gpointer vprivate )
{
if( gtk_check_menu_item_get_active( menu_item ) )
{
PrivateData * p = (PrivateData*) vprivate;
const char * val = g_object_get_data( G_OBJECT( menu_item ), STATS_MODE );
tr_core_set_pref( p->core, PREF_KEY_STATUS_BAR_STATS, val );
}
}
/***
**** PUBLIC
***/
@@ -180,8 +215,11 @@ privateFree( gpointer vprivate )
GtkWidget *
tr_window_new( GtkUIManager * ui_manager, TrCore * core )
{
int i, n;
int status_stats_mode;
char * pch;
PrivateData * p = g_new( PrivateData, 1 );
GtkWidget *vbox, *w, *self, *h;
GtkWidget *vbox, *w, *self, *h, *c;
/* make the window */
self = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -204,6 +242,24 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
w = p->toolbar = action_get_widget( "/main-window-toolbar" );
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
/* status menu */
GtkWidget * menu = p->status_menu = gtk_menu_new( );
status_stats_mode = 0;
GSList * l = NULL;
pch = pref_string_get( PREF_KEY_STATUS_BAR_STATS );
for( i=0, n=G_N_ELEMENTS(stats_modes); i<n; ++i )
{
const char * val = stats_modes[i].val;
w = gtk_radio_menu_item_new_with_label( l, _( stats_modes[i].i18n ) );
l = gtk_radio_menu_item_get_group( GTK_RADIO_MENU_ITEM(w) );
gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(w), !strcmp( val, pch ) );
g_object_set_data( G_OBJECT(w), STATS_MODE, (gpointer)stats_modes[i].val );
g_signal_connect( w, "toggled", G_CALLBACK(status_menu_toggled_cb), p );
gtk_menu_shell_append( GTK_MENU_SHELL(menu), w );
gtk_widget_show( w );
}
g_free( pch );
/* statusbar */
h = p->status = gtk_hbox_new( FALSE, GUI_PAD );
gtk_container_set_border_width( GTK_CONTAINER(h), GUI_PAD );
@@ -221,6 +277,10 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, 0 );
w = gtk_image_new_from_stock( "tr-yin-yang", (GtkIconSize)-1 );
c = gtk_event_box_new( );
gtk_container_add( GTK_CONTAINER(c), w );
w = c;
g_signal_connect( w, "button-release-event", G_CALLBACK(onYinYangReleased), p );
gtk_box_pack_start( GTK_BOX(h), w, FALSE, FALSE, 0 );
w = p->stats_lb = gtk_label_new( NULL );
gtk_box_pack_start( GTK_BOX(h), w, FALSE, FALSE, 0 );
@@ -245,6 +305,7 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
/* listen for prefs changes that affect the window */
prefsChanged( core, PREF_KEY_MINIMAL_VIEW, self );
prefsChanged( core, PREF_KEY_STATUS_BAR, self );
prefsChanged( core, PREF_KEY_STATUS_BAR_STATS, self );
prefsChanged( core, PREF_KEY_TOOLBAR, self );
p->core = core;
p->pref_handler_id = g_signal_connect( core, "prefs-changed",
@@ -254,25 +315,49 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
}
void
tr_window_update( TrWindow * self, float downspeed, float upspeed )
tr_window_update( TrWindow * self )
{
PrivateData * p = get_private_data( self );
tr_handle * handle = NULL;
if( p && p->core )
handle = tr_core_handle( p->core );
if( handle )
{
char * pch;
float u, d;
char up[32], down[32], buf[64];
struct tr_session_stats stats;
tr_handle * handle = tr_core_handle( p->core );
tr_strlspeed( buf, downspeed, sizeof( buf ) );
tr_torrentRates( handle, &d, &u );
tr_strlspeed( buf, d, sizeof( buf ) );
gtk_label_set_text( GTK_LABEL( p->dl_lb ), buf );
tr_strlspeed( buf, upspeed, sizeof( buf ) );
tr_strlspeed( buf, u, sizeof( buf ) );
gtk_label_set_text( GTK_LABEL( p->ul_lb ), buf );
pch = pref_string_get( PREF_KEY_STATUS_BAR_STATS );
if( !strcmp( pch, "session-ratio" ) ) {
tr_getSessionStats( handle, &stats );
g_snprintf( buf, sizeof(buf), _("Ratio: %.1f"), stats.ratio );
} else if( !strcmp( pch, "session-transfer" ) ) {
tr_getSessionStats( handle, &stats );
tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
g_snprintf( buf, sizeof( buf ), _( "Down: %s Up: %s" ), down, up );
} else if( !strcmp( pch, "total-transfer" ) ) {
tr_getCumulativeSessionStats( handle, &stats );
tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
g_snprintf( buf, sizeof( buf ), _( "Down: %s Up: %s" ), down, up );
} else { /* default is total-ratio */
tr_getCumulativeSessionStats( handle, &stats );
g_snprintf( buf, sizeof(buf), _("Ratio: %.1f"), stats.ratio );
}
g_free( pch );
gtk_label_set_text( GTK_LABEL( p->stats_lb ), buf );
}
}
GtkTreeSelection*
tr_window_get_selection ( TrWindow * w )

2
gtk/tr_window.h
View File

@@ -34,6 +34,6 @@ GtkTreeSelection * tr_window_get_selection( TrWindow* wind );
GtkWidget * tr_window_new( GtkUIManager*, TrCore * core );
void tr_window_update( TrWindow * wind, float downspeed, float upspeed );
void tr_window_update( TrWindow * wind );
#endif