change units to the IEC standard (and the Ubuntu units policy) for base2 (/1024) - KiB/GiB etc. this is instead of KB/s etc which Windows and many other apps use for base2. I've tried to fix up the translations as best as I can.

1 files changed, 28 insertions, 9 deletions

diff --git a/src/util.h b/src/util.h
index 6dd6e23..990cafa 100644
--- a/src/util.h
+++ b/src/util.h
@@ -28,16 +28,25 @@
 
 #include "trg-client.h"
 
-#define trg_strlspeed(a, b) tr_strlspeed(a, b, sizeof(a))
+#define trg_strlspeed(a, b) tr_formatter_speed_KBps(a, b, sizeof(a))
 #define trg_strlpercent(a, b) tr_strlpercent(a, b, sizeof(a))
-#define trg_strlsize(a, b) tr_strlsize(a, b, sizeof(a))
+#define trg_strlsize(a, b) tr_formatter_size_B(a, b, sizeof(a))
 #define trg_strlratio(a, b) tr_strlratio(a, b, sizeof(a))
 
 #define TR_RATIO_NA  -1
 #define TR_RATIO_INF -2
-#define KILOBYTE_FACTOR 1024.0
-#define MEGABYTE_FACTOR ( 1024.0 * 1024.0 )
-#define GIGABYTE_FACTOR ( 1024.0 * 1024.0 * 1024.0 )
+
+extern const int disk_K;
+extern const char * disk_K_str;
+extern const char * disk_M_str;
+extern const char * disk_G_str;
+extern const char * disk_T_str;
+
+extern const int speed_K;
+extern const char * speed_K_str;
+extern const char * speed_M_str;
+extern const char * speed_G_str;
+extern const char * speed_T_str;
 
 void add_file_id_to_array(JsonObject * args, gchar * key, gint index);
 void g_str_slist_free(GSList * list);
@@ -46,6 +55,20 @@ gchar *trg_gregex_get_first(GRegex * rx, const gchar * uri);
 gchar *make_error_message(JsonObject * response, int status);
 void trg_error_dialog(GtkWindow * parent, trg_response * response);
 
+void
+tr_formatter_size_init( unsigned int kilo,
+                        const char * kb, const char * mb,
+                        const char * gb, const char * tb );
+char*
+tr_formatter_size_B( char * buf, gint64 bytes, size_t buflen );
+
+void
+tr_formatter_speed_init( unsigned int kilo,
+                         const char * kb, const char * mb,
+                         const char * gb, const char * tb );
+char*
+tr_formatter_speed_KBps( char * buf, double KBps, size_t buflen );
+
 char *tr_strltime_long(char *buf, long seconds, size_t buflen);
 char *tr_strltime_short(char *buf, long seconds, size_t buflen);
 char *tr_strpercent(char *buf, double x, size_t buflen);
@@ -53,8 +76,6 @@ char *tr_strlpercent(char *buf, double x, size_t buflen);
 char *tr_strratio(char *buf, size_t buflen, double ratio,
                   const char *infinity);
 char *tr_strlratio(char *buf, double ratio, size_t buflen);
-char *tr_strlspeed(char *buf, double kb_sec, size_t buflen);
-char *tr_strlsize(char *buf, guint64 size, size_t buflen);
 char *gtr_localtime(time_t time);
 char *gtr_localtime2(char *buf, time_t time, size_t buflen);
 int tr_snprintf(char *buf, size_t buflen, const char *fmt, ...);
@@ -65,12 +86,10 @@ int evutil_vsnprintf(char *buf, size_t buflen, const char *format,
                      va_list ap);
 void rm_trailing_slashes(gchar * str);
 void trg_widget_set_visible(GtkWidget * w, gboolean visible);
-gdouble json_double_to_progress(JsonNode * n);
 gchar *trg_base64encode(const gchar * filename);
 GtkWidget *my_scrolledwin_new(GtkWidget * child);
 gboolean is_url(gchar * string);
 gboolean is_magnet(gchar * string);
-gdouble json_node_really_get_double(JsonNode * node);
 GtkWidget *gtr_combo_box_new_enum(const char *text_1, ...);
 
 #endif                          /* UTIL_H_ */