Changeset 5666

Timestamp:

Apr 22, 2008, 2:07:42 PM (15 years ago)

Author:

charles

Message:

add statistics "reset" button

Location:

trunk

Files:

• gtk/stats.c (modified) (4 diffs)
• libtransmission/stats.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)

trunk/gtk/stats.c

@@ -16 +16 @@
 #include "stats.h"
 #include "tr-core.h"
+
+enum
+{
+    TR_RESPONSE_CLEAR = 1
+};
 
 struct stat_ui
@@ -73 +78 @@
 
 static void
-dialogResponse( GtkDialog * dialog, gint response UNUSED, gpointer unused UNUSED )
+dialogResponse( GtkDialog * dialog, gint response, gpointer gdata )
 {
-    g_source_remove( GPOINTER_TO_UINT( g_object_get_data( G_OBJECT(dialog), "TrTimer" ) ) );
-    gtk_widget_destroy( GTK_WIDGET( dialog ) );
+    struct stat_ui * ui = gdata;
+
+    if( response == TR_RESPONSE_CLEAR )
+    {
+        tr_handle * handle = tr_core_handle( ui->core );
+        tr_clearSessionStats( handle );
+        updateStats( ui );
+    }
+
+    if( response == GTK_RESPONSE_CLOSE )
+    {
+        g_source_remove( GPOINTER_TO_UINT( g_object_get_data( G_OBJECT(dialog), "TrTimer" ) ) );
+        gtk_widget_destroy( GTK_WIDGET( dialog ) );
+    }
 }
 
@@ -92 +109 @@
                                      parent,
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     GTK_STOCK_CLEAR, TR_RESPONSE_CLEAR,
                                      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
                                      NULL );
@@ -124 +142 @@
     updateStats( ui );
     g_object_set_data_full( G_OBJECT(d), "data", ui, g_free );
-    g_signal_connect( d, "response", G_CALLBACK(dialogResponse), NULL );
+    g_signal_connect( d, "response", G_CALLBACK(dialogResponse), ui );
     i = g_timeout_add( 1000, updateStats, ui );
     g_object_set_data( G_OBJECT(d), "TrTimer", GUINT_TO_POINTER(i) );

trunk/libtransmission/stats.c

@@ -10 +10 @@
  * $Id$
  */
-
-#include <string.h> /* memset */
 
 #include "transmission.h"
@@ -163 +161 @@
 }
 
+void
+tr_clearSessionStats( tr_handle * handle )
+{
+    tr_session_stats zero;
+    zero.uploadedBytes = 0;
+    zero.downloadedBytes = 0;
+    zero.ratio = TR_RATIO_NA;
+    zero.filesAdded = 0;
+    zero.sessionCount = 0;
+    zero.secondsActive = 0;
+    handle->sessionStats->single = handle->sessionStats->old = zero;
+
+    handle->sessionStats->startTime = time( NULL );
+}
+
 /**
 ***

trunk/libtransmission/transmission.h

@@ -135 +135 @@
                                    tr_session_stats  * setme );
 
+void tr_clearSessionStats( tr_handle * handle );
+
 
 /**