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

(qt) #5282 "Formatter's sizeToString() and memToString() return wrong text for 0 bytes": fixed.

This commit is contained in:
Jordan Lee 2013-02-09 18:59:05 +00:00
parent 6304bef11b
commit 00a5e86939
2 changed files with 149 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
qt/formatter.cc
View File

@ -24,51 +24,51 @@
namespace
{
unsigned int speed_K;
unsigned int mem_K;
unsigned int size_K;
unsigned int speed_K;
unsigned int mem_K;
unsigned int size_K;
}
QString Formatter::unitStrings[3][5];
void
Formatter :: initUnits( )
Formatter :: initUnits ()
{
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,
unitStrings[SPEED][KB].toUtf8().constData(),
unitStrings[SPEED][MB].toUtf8().constData(),
unitStrings[SPEED][GB].toUtf8().constData(),
unitStrings[SPEED][TB].toUtf8().constData() );
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,
unitStrings[SPEED][KB].toUtf8 ().constData (),
unitStrings[SPEED][MB].toUtf8 ().constData (),
unitStrings[SPEED][GB].toUtf8 ().constData (),
unitStrings[SPEED][TB].toUtf8 ().constData ());
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,
unitStrings[SIZE][KB].toUtf8().constData(),
unitStrings[SIZE][MB].toUtf8().constData(),
unitStrings[SIZE][GB].toUtf8().constData(),
unitStrings[SIZE][TB].toUtf8().constData() );
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,
unitStrings[SIZE][KB].toUtf8 ().constData (),
unitStrings[SIZE][MB].toUtf8 ().constData (),
unitStrings[SIZE][GB].toUtf8 ().constData (),
unitStrings[SIZE][TB].toUtf8 ().constData ());
mem_K = 1024;
unitStrings[MEM][B] = tr( "B" );
unitStrings[MEM][KB] = tr( "KiB" );
unitStrings[MEM][MB] = tr( "MiB" );
unitStrings[MEM][GB] = tr( "GiB" );
unitStrings[MEM][TB] = tr( "TiB" );
tr_formatter_mem_init( mem_K,
unitStrings[MEM][KB].toUtf8().constData(),
unitStrings[MEM][MB].toUtf8().constData(),
unitStrings[MEM][GB].toUtf8().constData(),
unitStrings[MEM][TB].toUtf8().constData() );
mem_K = 1024;
unitStrings[MEM][B] = tr ( "B");
unitStrings[MEM][KB] = tr ("KiB");
unitStrings[MEM][MB] = tr ("MiB");
unitStrings[MEM][GB] = tr ("GiB");
unitStrings[MEM][TB] = tr ("TiB");
tr_formatter_mem_init (mem_K,
unitStrings[MEM][KB].toUtf8 ().constData (),
unitStrings[MEM][MB].toUtf8 ().constData (),
unitStrings[MEM][GB].toUtf8 ().constData (),
unitStrings[MEM][TB].toUtf8 ().constData ());
}
/***
@ -76,15 +76,15 @@ Formatter :: initUnits( )
***/
double
Speed :: KBps( ) const
Speed :: KBps () const
{
return _Bps / (double)speed_K;
return _Bps / (double)speed_K;
}
Speed
Speed :: fromKBps( double KBps )
Speed :: fromKBps (double KBps)
{
return int( KBps * speed_K );
return int (KBps * speed_K);
}
/***
@ -92,102 +92,39 @@ Speed :: fromKBps( double KBps )
***/
QString
Formatter :: memToString( int64_t bytes )
Formatter :: memToString (int64_t bytes)
{
if( bytes < 1 )
return tr( "Unknown" );
else if( !bytes )
return tr( "None" );
else {
char buf[128];
tr_formatter_mem_B( buf, bytes, sizeof( buf ) );
return QString::fromUtf8( buf );
}
if (bytes < 0)
return tr ("Unknown");
if (!bytes)
return tr ("None");
char buf[128];
tr_formatter_mem_B (buf, bytes, sizeof (buf));
return QString::fromUtf8 (buf);
}
QString
Formatter :: sizeToString( int64_t bytes )
Formatter :: sizeToString (int64_t bytes)
{
if( bytes < 1 )
return tr( "Unknown" );
else if( !bytes )
return tr( "None" );
else {
char buf[128];
tr_formatter_size_B( buf, bytes, sizeof( buf ) );
return QString::fromUtf8( buf );
}
if (bytes < 0)
return tr ("Unknown");
if (!bytes)
return tr ("None");
char buf[128];
tr_formatter_size_B (buf, bytes, sizeof (buf));
return QString::fromUtf8 (buf);
}
QString
Formatter :: speedToString( const Speed& speed )
Formatter :: speedToString (const Speed& speed)
{
char buf[128];
tr_formatter_speed_KBps( buf, speed.KBps( ), sizeof( buf ) );
return QString::fromUtf8( buf );
}
QString
Formatter :: percentToString( double x )
{
char buf[128];
return QString( tr_strpercent( buf, x, sizeof(buf) ) );
}
QString
Formatter :: ratioToString( double ratio )
{
char buf[128];
return QString::fromUtf8( tr_strratio( buf, sizeof(buf), ratio, "\xE2\x88\x9E" ) );
}
QString
Formatter :: timeToString( int seconds )
{
int days, hours, minutes;
QString d, h, m, s;
QString str;
if( seconds < 0 )
seconds = 0;
days = seconds / 86400;
hours = ( seconds % 86400 ) / 3600;
minutes = ( seconds % 3600 ) / 60;
seconds %= 60;
d = tr( "%Ln day(s)", 0, days );
h = tr( "%Ln hour(s)", 0, hours );
m = tr( "%Ln minute(s)", 0, minutes );
s = tr( "%Ln second(s)", 0, seconds );
if( days )
{
if( days >= 4 || !hours )
str = d;
else
str = tr( "%1, %2" ).arg( d ).arg( h );
}
else if( hours )
{
if( hours >= 4 || !minutes )
str = h;
else
str = tr( "%1, %2" ).arg( h ).arg( m );
}
else if( minutes )
{
if( minutes >= 4 || !seconds )
str = m;
else
str = tr( "%1, %2" ).arg( m ).arg( s );
}
else
{
str = s;
}
return str;
tr_formatter_speed_KBps (buf, speed.KBps (), sizeof (buf));
return QString::fromUtf8 (buf);
}
QString
@ -195,7 +132,7 @@ Formatter :: uploadSpeedToString (const Speed& uploadSpeed)
{
static const QChar uploadSymbol (0x25B4);
return tr( "%1 %2").arg(speedToString(uploadSpeed)).arg(uploadSymbol);
return tr ("%1 %2").arg (speedToString (uploadSpeed)).arg (uploadSymbol);
}
QString
@ -203,6 +140,68 @@ Formatter :: downloadSpeedToString (const Speed& downloadSpeed)
{
static const QChar downloadSymbol (0x25BE);
return tr( "%1 %2").arg(speedToString(downloadSpeed)).arg(downloadSymbol);
return tr ("%1 %2").arg (speedToString (downloadSpeed)).arg (downloadSymbol);
}
QString
Formatter :: percentToString (double x)
{
char buf[128];
return QString (tr_strpercent (buf, x, sizeof (buf)));
}
QString
Formatter :: ratioToString (double ratio)
{
char buf[128];
return QString::fromUtf8 (tr_strratio (buf, sizeof (buf), ratio, "\xE2\x88\x9E"));
}
QString
Formatter :: timeToString (int seconds)
{
int days, hours, minutes;
QString d, h, m, s;
QString str;
if (seconds < 0)
seconds = 0;
days = seconds / 86400;
hours = (seconds % 86400) / 3600;
minutes = (seconds % 3600) / 60;
seconds %= 60;
d = tr ("%Ln day (s)", 0, days);
h = tr ("%Ln hour (s)", 0, hours);
m = tr ("%Ln minute (s)", 0, minutes);
s = tr ("%Ln second (s)", 0, seconds);
if (days)
{
if (days >= 4 || !hours)
str = d;
else
str = tr ("%1, %2").arg (d).arg (h);
}
else if (hours)
{
if (hours >= 4 || !minutes)
str = h;
else
str = tr ("%1, %2").arg (h).arg (m);
}
else if (minutes)
{
if (minutes >= 4 || !seconds)
str = m;
else
str = tr ("%1, %2").arg (m).arg (s);
}
else
{
str = s;
}
return str;
}

42
qt/formatter.h
View File

@ -1,5 +1,5 @@
/*
* This file Copyright (C) Mnemosyne LLC
* This file Copyright(C) Mnemosyne LLC
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
@ -23,34 +23,34 @@ class Speed;
class Formatter: public QObject
{
Q_OBJECT
Q_OBJECT
public:
public:
Formatter( ) { }
virtual ~Formatter( ) { }
Formatter() {}
virtual ~Formatter() {}
public:
public:
static QString memToString( int64_t bytes );
static QString sizeToString( int64_t bytes );
static QString speedToString( const Speed& speed );
static QString percentToString( double x );
static QString ratioToString( double ratio );
static QString timeToString( int seconds );
static QString uploadSpeedToString (const Speed& up);
static QString downloadSpeedToString (const Speed& down);
static QString memToString (int64_t bytes);
static QString sizeToString (int64_t bytes);
static QString speedToString (const Speed& speed);
static QString percentToString (double x);
static QString ratioToString (double ratio);
static QString timeToString (int seconds);
static QString uploadSpeedToString(const Speed& up);
static QString downloadSpeedToString(const Speed& down);
public:
public:
typedef enum { B, KB, MB, GB, TB } Size;
typedef enum { SPEED, SIZE, MEM } Type;
static QString unitStr( Type t, Size s ) { return unitStrings[t][s]; }
static void initUnits( );
typedef enum { B, KB, MB, GB, TB } Size;
typedef enum { SPEED, SIZE, MEM } Type;
static QString unitStr (Type t, Size s) { return unitStrings[t][s]; }
static void initUnits ();
private:
private:
static QString unitStrings[3][5];
static QString unitStrings[3][5];
};
#endif