Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-25 04:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks to make the gtk+ client resemble the os x one more closely

Browse Source
This commit is contained in:
Charles Kerr
2007-07-08 05:51:55 +00:00
parent 26660b0594
commit 26ca860e55
4 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/actions.c
View File

@@ -59,8 +59,7 @@ static GtkActionEntry entries[] =
{ "edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL },
{ "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
{ "priority-menu", NULL, N_("_Priority"), NULL, NULL, NULL },
{ "add-torrent", GTK_STOCK_ADD,
N_("_Add"), "<control>A", NULL, G_CALLBACK(action_cb) },
{ "add-torrent", GTK_STOCK_OPEN, NULL, NULL, NULL, G_CALLBACK(action_cb) },
{ "start-torrent", GTK_STOCK_EXECUTE,
N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
{ "recheck-torrent", GTK_STOCK_REFRESH,

6
gtk/tr_torrent.c
View File

@@ -624,7 +624,7 @@ tr_torrent_status_str ( TrTorrent * gtor )
top = g_strdup_printf( _("Stalled (%.1f%%)"), prog );
else {
char * timestr = readabletime(eta);
top = g_strdup_printf( _("Finishing in %s (%.1f%%)"), timestr, prog );
top = g_strdup_printf( _("%s remaining (%.1f%%)"), timestr, prog );
g_free(timestr);
}
break;
@@ -638,8 +638,8 @@ tr_torrent_status_str ( TrTorrent * gtor )
case TR_STATUS_SEED:
top = g_strdup_printf(
ngettext( "Seeding, uploading to %d of %d peer",
"Seeding, uploading to %d of %d peers", tpeers ),
ngettext( "Seeding to %d of %d peer",
"Seeding to %d of %d peers", tpeers ),
upeers, tpeers );
break;

46
gtk/tr_window.c
View File

@@ -42,6 +42,8 @@ typedef struct
GtkWidget * scroll;
GtkWidget * view;
GtkWidget * status;
GtkWidget * ul_lb;
GtkWidget * dl_lb;
GtkTreeSelection * selection;
GtkCellRenderer * namerend;
}
@@ -110,7 +112,7 @@ formatname( GtkTreeViewColumn * col SHUTUP, GtkCellRenderer * rend,
bottom = NULL;
}
str = g_markup_printf_escaped( "<big>%s (%s)</big>\n<small>%s\n%s</small>",
str = g_markup_printf_escaped( "<b>%s (%s)</b>\n<small>%s\n%s</small>",
name, mb, top,
( NULL == bottom ? "" : bottom ) );
g_object_set( rend, "markup", str, NULL );
@@ -245,7 +247,7 @@ GtkWidget *
tr_window_new( GtkUIManager * ui_manager )
{
PrivateData * p = g_new( PrivateData, 1 );
GtkWidget *vbox, *w, *self;
GtkWidget *vbox, *w, *self, *h;
/* make the window */
self = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -275,10 +277,21 @@ tr_window_new( GtkUIManager * ui_manager )
gtk_box_pack_start_defaults( GTK_BOX(vbox), w );
gtk_container_set_focus_child( GTK_CONTAINER( vbox ), w );
/* spacer */
w = gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
gtk_widget_set_usize (w, 0u, 6u);
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
/* statusbar */
w = p->status = gtk_statusbar_new ();
gtk_statusbar_push( GTK_STATUSBAR(w), 0, "" );
gtk_box_pack_start( GTK_BOX(vbox), w, FALSE, FALSE, 0 );
h = gtk_hbox_new( FALSE, 0 );
w = p->ul_lb = gtk_label_new( NULL );
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, GUI_PAD );
w = gtk_vseparator_new( );
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, GUI_PAD );
w = p->dl_lb = gtk_label_new( NULL );
gtk_box_pack_end( GTK_BOX(h), w, FALSE, FALSE, GUI_PAD );
gtk_box_pack_start( GTK_BOX(vbox), h, FALSE, FALSE, 0 );
/* show all but the window */
gtk_widget_show_all( vbox );
@@ -290,18 +303,19 @@ void
tr_window_update( TrWindow * self, float downspeed, float upspeed )
{
PrivateData * p = get_private_data( self );
GtkStatusbar * status = GTK_STATUSBAR( p->status );
char *tmp1, *tmp2;
/* update the status bar */
char * downstr = readablespeed ( downspeed );
char * upstr = readablespeed ( upspeed );
char * str = g_strdup_printf( _(" Total DL: %s Total UL: %s"),
downstr, upstr );
g_free( downstr );
g_free( upstr );
gtk_statusbar_pop( status, 0 );
gtk_statusbar_push( status, 0, str );
g_free( str );
tmp1 = readablespeed( downspeed );
tmp2 = g_strdup_printf( _("Total DL: %s"), tmp1 );
gtk_label_set_text( GTK_LABEL(p->dl_lb), tmp2 );
g_free( tmp2 );
g_free( tmp1 );
tmp1 = readablespeed( upspeed );
tmp2 = g_strdup_printf( _("Total UL: %s"), tmp1 );
gtk_label_set_text( GTK_LABEL(p->ul_lb), tmp2 );
g_free( tmp2 );
g_free( tmp1 );
}
GtkTreeSelection*

19
gtk/util.c
View File

@@ -109,29 +109,24 @@ readablespeed (double KiBps)
#define MINUTES(s) ((s) / 60 % 60)
#define HOURS(s) ((s) / 60 / 60 % 24)
#define DAYS(s) ((s) / 60 / 60 / 24 % 7)
#define WEEKS(s) ((s) / 60 / 60 / 24 / 7)
char *
readabletime(int secs) {
if(60 > secs)
return g_strdup_printf(_("%i %s"),
SECONDS(secs), ngettext("second", "seconds", SECONDS(secs)));
SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
else if(60 * 60 > secs)
return g_strdup_printf(_("%i %s %i %s"),
MINUTES(secs), ngettext("minute", "minutes", MINUTES(secs)),
SECONDS(secs), ngettext("second", "seconds", SECONDS(secs)));
MINUTES(secs), ngettext("min", "mins", MINUTES(secs)),
SECONDS(secs), ngettext("sec", "secs", SECONDS(secs)));
else if(60 * 60 * 24 > secs)
return g_strdup_printf(_("%i %s %i %s"),
HOURS(secs), ngettext("hour", "hours", HOURS(secs)),
MINUTES(secs), ngettext("minute", "minutes", MINUTES(secs)));
else if(60 * 60 * 24 * 7 > secs)
return g_strdup_printf(_("%i %s %i %s"),
DAYS(secs), ngettext("day", "days", DAYS(secs)),
HOURS(secs), ngettext("hour", "hours", HOURS(secs)));
HOURS(secs), ngettext("hr", "hrs", HOURS(secs)),
MINUTES(secs), ngettext("min", "mins", MINUTES(secs)));
else
return g_strdup_printf(_("%i %s %i %s"),
WEEKS(secs), ngettext("week", "weeks", WEEKS(secs)),
DAYS(secs), ngettext("hour", "hours", DAYS(secs)));
DAYS(secs), ngettext("day", "days", DAYS(secs)),
HOURS(secs), ngettext("hr", "hrs", HOURS(secs)));
}
char *