Changeset 13195
- Timestamp:
- Feb 3, 2012, 9:21:52 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cli/cli.c
r13191 r13195 45 45 #define MEM_T_STR "TiB" 46 46 47 #define DISK_K 10 2447 #define DISK_K 1000 48 48 #define DISK_B_STR "B" 49 #define DISK_K_STR " KiB"50 #define DISK_M_STR "M iB"51 #define DISK_G_STR "G iB"52 #define DISK_T_STR "T iB"53 54 #define SPEED_K 10 2455 #define SPEED_B_STR 56 #define SPEED_K_STR " KiB/s"57 #define SPEED_M_STR "M iB/s"58 #define SPEED_G_STR "G iB/s"59 #define SPEED_T_STR "T iB/s"49 #define DISK_K_STR "kB" 50 #define DISK_M_STR "MB" 51 #define DISK_G_STR "GB" 52 #define DISK_T_STR "TB" 53 54 #define SPEED_K 1000 55 #define SPEED_B_STR "B/s" 56 #define SPEED_K_STR "kB/s" 57 #define SPEED_M_STR "MB/s" 58 #define SPEED_G_STR "GB/s" 59 #define SPEED_T_STR "TB/s" 60 60 61 61 /*** -
trunk/daemon/daemon.c
r12476 r13195 44 44 #define MEM_T_STR "TiB" 45 45 46 #define DISK_K 10 2447 #define DISK_B_STR 48 #define DISK_K_STR " KiB"49 #define DISK_M_STR "M iB"50 #define DISK_G_STR "G iB"51 #define DISK_T_STR "T iB"52 53 #define SPEED_K 10 2454 #define SPEED_B_STR 55 #define SPEED_K_STR " KiB/s"56 #define SPEED_M_STR "M iB/s"57 #define SPEED_G_STR "G iB/s"58 #define SPEED_T_STR "T iB/s"46 #define DISK_K 1000 47 #define DISK_B_STR "B" 48 #define DISK_K_STR "kB" 49 #define DISK_M_STR "MB" 50 #define DISK_G_STR "GB" 51 #define DISK_T_STR "TB" 52 53 #define SPEED_K 1000 54 #define SPEED_B_STR "B/s" 55 #define SPEED_K_STR "kB/s" 56 #define SPEED_M_STR "MB/s" 57 #define SPEED_G_STR "GB/s" 58 #define SPEED_T_STR "TB/s" 59 59 60 60 static bool paused = false; -
trunk/daemon/remote.c
r13182 r13195 52 52 #define MEM_T_STR "TiB" 53 53 54 #define DISK_K 10 2455 #define DISK_B_STR 56 #define DISK_K_STR " KiB"57 #define DISK_M_STR "M iB"58 #define DISK_G_STR "G iB"59 #define DISK_T_STR "T iB"60 61 #define SPEED_K 10 2462 #define SPEED_B_STR 63 #define SPEED_K_STR " KiB/s"64 #define SPEED_M_STR "M iB/s"65 #define SPEED_G_STR "G iB/s"66 #define SPEED_T_STR "T iB/s"54 #define DISK_K 1000 55 #define DISK_B_STR "B" 56 #define DISK_K_STR "kB" 57 #define DISK_M_STR "MB" 58 #define DISK_G_STR "GB" 59 #define DISK_T_STR "TB" 60 61 #define SPEED_K 1000 62 #define SPEED_B_STR "B/s" 63 #define SPEED_K_STR "kB/s" 64 #define SPEED_M_STR "MB/s" 65 #define SPEED_G_STR "GB/s" 66 #define SPEED_T_STR "TB/s" 67 67 68 68 /*** -
trunk/gtk/tr-window.c
r12970 r13195 734 734 int w=0, h=0; 735 735 PangoLayout * pango_layout; 736 pango_layout = gtk_widget_create_pango_layout( p->ul_lb, "999.99 KiB/s" );736 pango_layout = gtk_widget_create_pango_layout( p->ul_lb, "999.99 kB/s" ); 737 737 pango_layout_get_pixel_size( pango_layout, &w, &h ); 738 738 gtk_widget_set_size_request( p->ul_lb, w, h ); -
trunk/gtk/util.c
r13179 r13195 41 41 const char * mem_T_str = N_("TiB"); 42 42 43 const int disk_K = 10 24;44 const char * disk_K_str = N_(" KiB");45 const char * disk_M_str = N_("M iB");46 const char * disk_G_str = N_("G iB");47 const char * disk_T_str = N_("T iB");48 49 const int speed_K = 10 24;50 const char * speed_K_str = N_(" KiB/s");51 const char * speed_M_str = N_("M iB/s");52 const char * speed_G_str = N_("G iB/s");53 const char * speed_T_str = N_("T iB/s");43 const int disk_K = 1000; 44 const char * disk_K_str = N_("kB"); 45 const char * disk_M_str = N_("MB"); 46 const char * disk_G_str = N_("GB"); 47 const char * disk_T_str = N_("TB"); 48 49 const int speed_K = 1000; 50 const char * speed_K_str = N_("kB/s"); 51 const char * speed_M_str = N_("MB/s"); 52 const char * speed_G_str = N_("GB/s"); 53 const char * speed_T_str = N_("TB/s"); 54 54 55 55 /*** -
trunk/qt/formatter.cc
r12429 r13195 35 35 Formatter :: initUnits( ) 36 36 { 37 speed_K = 10 24;38 unitStrings[SPEED][B] = tr( 39 unitStrings[SPEED][KB] = tr( " KiB/s" );40 unitStrings[SPEED][MB] = tr( "M iB/s" );41 unitStrings[SPEED][GB] = tr( "G iB/s" );42 unitStrings[SPEED][TB] = tr( "T iB/s" );37 speed_K = 1000; 38 unitStrings[SPEED][B] = tr( "B/s" ); 39 unitStrings[SPEED][KB] = tr( "kB/s" ); 40 unitStrings[SPEED][MB] = tr( "MB/s" ); 41 unitStrings[SPEED][GB] = tr( "GB/s" ); 42 unitStrings[SPEED][TB] = tr( "TB/s" ); 43 43 tr_formatter_speed_init( speed_K, 44 44 qPrintable( unitStrings[SPEED][KB] ), … … 47 47 qPrintable( unitStrings[SPEED][TB] ) ); 48 48 49 size_K = 10 24;50 unitStrings[SIZE][B] = tr( 51 unitStrings[SIZE][KB] = tr( " KiB" );52 unitStrings[SIZE][MB] = tr( "M iB" );53 unitStrings[SIZE][GB] = tr( "G iB" );54 unitStrings[SIZE][TB] = tr( "T iB" );49 size_K = 1000; 50 unitStrings[SIZE][B] = tr( "B" ); 51 unitStrings[SIZE][KB] = tr( "kB" ); 52 unitStrings[SIZE][MB] = tr( "MB" ); 53 unitStrings[SIZE][GB] = tr( "GB" ); 54 unitStrings[SIZE][TB] = tr( "TB" ); 55 55 tr_formatter_size_init( size_K, 56 56 qPrintable( unitStrings[SIZE][KB] ), -
trunk/utils/show.c
r12225 r13195 37 37 #define MEM_T_STR "TiB" 38 38 39 #define DISK_K 10 2440 #define DISK_B_STR "B"41 #define DISK_K_STR " KiB"42 #define DISK_M_STR "M iB"43 #define DISK_G_STR "G iB"44 #define DISK_T_STR "T iB"45 46 #define SPEED_K 10 2447 #define SPEED_B_STR "B/s"48 #define SPEED_K_STR " KiB/s"49 #define SPEED_M_STR "M iB/s"50 #define SPEED_G_STR "G iB/s"51 #define SPEED_T_STR "T iB/s"39 #define DISK_K 1000 40 #define DISK_B_STR "B" 41 #define DISK_K_STR "kB" 42 #define DISK_M_STR "MB" 43 #define DISK_G_STR "GB" 44 #define DISK_T_STR "TB" 45 46 #define SPEED_K 1000 47 #define SPEED_B_STR "B/s" 48 #define SPEED_K_STR "kB/s" 49 #define SPEED_M_STR "MB/s" 50 #define SPEED_G_STR "GB/s" 51 #define SPEED_T_STR "TB/s" 52 52 53 53 static tr_option options[] = -
trunk/web/javascript/formatter.js
r13194 r13195 15 15 var speed_T_str = 'TB/s'; 16 16 17 var size_K = 10 24;17 var size_K = 1000; 18 18 var size_B_str = 'B'; 19 var size_K_str = ' KB';19 var size_K_str = 'kB'; 20 20 var size_M_str = 'MB'; 21 21 var size_G_str = 'GB'; … … 23 23 24 24 var mem_K = 1024; 25 var mem_B_str = 'B';26 var mem_K_str = 'K B';27 var mem_M_str = 'M B';28 var mem_G_str = 'G B';29 var mem_T_str = 'T B';25 var mem_B_str = 'B'; 26 var mem_K_str = 'KiB'; 27 var mem_M_str = 'MiB'; 28 var mem_G_str = 'GiB'; 29 var mem_T_str = 'TiB'; 30 30 31 31 return {
Note: See TracChangeset
for help on using the changeset viewer.