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

(trunk) use base-10 units for network bandwidth (ie, speed) and disk sizes. 

It looks like the Mac client is already doing this and it's clearly the trend in other apps as well. Even apt-get is using kB/s, ferchrissake... :)

Flame away.
This commit is contained in:
Jordan Lee 2012-02-03 21:21:52 +00:00
parent 86d71b0118
commit fbc7f3dc3c
8 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cli/cli.c
View File

@ -44,19 +44,19 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
#define DISK_K 1024
#define DISK_K 1000
#define DISK_B_STR "B"
#define DISK_K_STR "KiB"
#define DISK_M_STR "MiB"
#define DISK_G_STR "GiB"
#define DISK_T_STR "TiB"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "KiB/s"
#define SPEED_M_STR "MiB/s"
#define SPEED_G_STR "GiB/s"
#define SPEED_T_STR "TiB/s"
#define SPEED_K 1000
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
#define SPEED_G_STR "GB/s"
#define SPEED_T_STR "TB/s"
/***
****

24
daemon/daemon.c
View File

@ -43,19 +43,19 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "KiB"
#define DISK_M_STR "MiB"
#define DISK_G_STR "GiB"
#define DISK_T_STR "TiB"
#define DISK_K 1000
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "KiB/s"
#define SPEED_M_STR "MiB/s"
#define SPEED_G_STR "GiB/s"
#define SPEED_T_STR "TiB/s"
#define SPEED_K 1000
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
#define SPEED_G_STR "GB/s"
#define SPEED_T_STR "TB/s"
static bool paused = false;
static bool closing = false;

24
daemon/remote.c
View File

@ -51,19 +51,19 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "KiB"
#define DISK_M_STR "MiB"
#define DISK_G_STR "GiB"
#define DISK_T_STR "TiB"
#define DISK_K 1000
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "KiB/s"
#define SPEED_M_STR "MiB/s"
#define SPEED_G_STR "GiB/s"
#define SPEED_T_STR "TiB/s"
#define SPEED_K 1000
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
#define SPEED_G_STR "GB/s"
#define SPEED_T_STR "TB/s"
/***
****

2
gtk/tr-window.c
View File

@ -733,7 +733,7 @@ gtr_window_new( GtkUIManager * ui_mgr, TrCore * core )
/* this is to determine the maximum width/height for the label */
int w=0, h=0;
PangoLayout * pango_layout;
pango_layout = gtk_widget_create_pango_layout( p->ul_lb, "999.99 KiB/s" );
pango_layout = gtk_widget_create_pango_layout( p->ul_lb, "999.99 kB/s" );
pango_layout_get_pixel_size( pango_layout, &w, &h );
gtk_widget_set_size_request( p->ul_lb, w, h );
gtk_widget_set_size_request( p->dl_lb, w, h );

20
gtk/util.c
View File

@ -40,17 +40,17 @@ const char * mem_M_str = N_("MiB");
const char * mem_G_str = N_("GiB");
const char * mem_T_str = N_("TiB");
const int disk_K = 1024;
const char * disk_K_str = N_("KiB");
const char * disk_M_str = N_("MiB");
const char * disk_G_str = N_("GiB");
const char * disk_T_str = N_("TiB");
const int disk_K = 1000;
const char * disk_K_str = N_("kB");
const char * disk_M_str = N_("MB");
const char * disk_G_str = N_("GB");
const char * disk_T_str = N_("TB");
const int speed_K = 1024;
const char * speed_K_str = N_("KiB/s");
const char * speed_M_str = N_("MiB/s");
const char * speed_G_str = N_("GiB/s");
const char * speed_T_str = N_("TiB/s");
const int speed_K = 1000;
const char * speed_K_str = N_("kB/s");
const char * speed_M_str = N_("MB/s");
const char * speed_G_str = N_("GB/s");
const char * speed_T_str = N_("TB/s");
/***
****

24
qt/formatter.cc
View File

@ -34,24 +34,24 @@ QString Formatter::unitStrings[3][5];
void
Formatter :: initUnits( )
{
speed_K = 1024;
unitStrings[SPEED][B] = tr( "B/s" );
unitStrings[SPEED][KB] = tr( "KiB/s" );
unitStrings[SPEED][MB] = tr( "MiB/s" );
unitStrings[SPEED][GB] = tr( "GiB/s" );
unitStrings[SPEED][TB] = tr( "TiB/s" );
speed_K = 1000;
unitStrings[SPEED][B] = tr( "B/s" );
unitStrings[SPEED][KB] = tr( "kB/s" );
unitStrings[SPEED][MB] = tr( "MB/s" );
unitStrings[SPEED][GB] = tr( "GB/s" );
unitStrings[SPEED][TB] = tr( "TB/s" );
tr_formatter_speed_init( speed_K,
qPrintable( unitStrings[SPEED][KB] ),
qPrintable( unitStrings[SPEED][MB] ),
qPrintable( unitStrings[SPEED][GB] ),
qPrintable( unitStrings[SPEED][TB] ) );
size_K = 1024;
unitStrings[SIZE][B] = tr( "B" );
unitStrings[SIZE][KB] = tr( "KiB" );
unitStrings[SIZE][MB] = tr( "MiB" );
unitStrings[SIZE][GB] = tr( "GiB" );
unitStrings[SIZE][TB] = tr( "TiB" );
size_K = 1000;
unitStrings[SIZE][B] = tr( "B" );
unitStrings[SIZE][KB] = tr( "kB" );
unitStrings[SIZE][MB] = tr( "MB" );
unitStrings[SIZE][GB] = tr( "GB" );
unitStrings[SIZE][TB] = tr( "TB" );
tr_formatter_size_init( size_K,
qPrintable( unitStrings[SIZE][KB] ),
qPrintable( unitStrings[SIZE][MB] ),

24
utils/show.c
View File

@ -36,19 +36,19 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "KiB"
#define DISK_M_STR "MiB"
#define DISK_G_STR "GiB"
#define DISK_T_STR "TiB"
#define DISK_K 1000
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "KiB/s"
#define SPEED_M_STR "MiB/s"
#define SPEED_G_STR "GiB/s"
#define SPEED_T_STR "TiB/s"
#define SPEED_K 1000
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
#define SPEED_G_STR "GB/s"
#define SPEED_T_STR "TB/s"
static tr_option options[] =
{

14
web/javascript/formatter.js
View File

@ -14,19 +14,19 @@ Transmission.fmt = (function()
var speed_G_str = 'GB/s';
var speed_T_str = 'TB/s';
var size_K = 1024;
var size_K = 1000;
var size_B_str = 'B';
var size_K_str = 'KB';
var size_K_str = 'kB';
var size_M_str = 'MB';
var size_G_str = 'GB';
var size_T_str = 'TB';
var mem_K = 1024;
var mem_B_str = 'B';
var mem_K_str = 'KB';
var mem_M_str = 'MB';
var mem_G_str = 'GB';
var mem_T_str = 'TB';
var mem_B_str = 'B';
var mem_K_str = 'KiB';
var mem_M_str = 'MiB';
var mem_G_str = 'GiB';
var mem_T_str = 'TiB';
return {