Changeset 13983

Timestamp:

Feb 8, 2013, 1:34:59 AM (8 years ago)

Author:

jordan

Message:

(gtk) match transmission-qt's way of showing up & down speeds in the statusbar

Location:

trunk/gtk

Files:

• tr-core.c (modified) (7 diffs)
• tr-core.h (modified) (1 diff)
• tr-window.c (modified) (4 diffs)

trunk/gtk/tr-core.c

@@ -198 +198 @@
                     G_TYPE_DOUBLE,    /* tr_stat.pieceUploadSpeed_KBps */
                     G_TYPE_DOUBLE,    /* tr_stat.pieceDownloadSpeed_KBps */
+                    G_TYPE_INT,       /* tr_stat.peersGettingFromUs */
+                    G_TYPE_INT,       /* tr_stat.peersSendingToUs + webseedsSendingToUs */
                     G_TYPE_DOUBLE,    /* tr_stat.recheckProgress */
                     G_TYPE_BOOLEAN,   /* filter.c:ACTIVITY_FILTER_ACTIVE */
@@ -1079 +1081 @@
         MC_SPEED_UP,          st->pieceUploadSpeed_KBps,
         MC_SPEED_DOWN,        st->pieceDownloadSpeed_KBps,
+        MC_ACTIVE_PEERS_UP,   st->peersGettingFromUs,
+        MC_ACTIVE_PEERS_DOWN, st->peersSendingToUs + st->webseedsSendingToUs,
         MC_RECHECK_PROGRESS,  st->recheckProgress,
         MC_ACTIVE,            is_torrent_active (st),
@@ -1429 +1433 @@
   bool oldFinished, newFinished;
   int oldQueuePosition, newQueuePosition;
+  int oldDownloadPeerCount, newDownloadPeerCount;
+  int oldUploadPeerCount, newUploadPeerCount;
   tr_priority_t oldPriority, newPriority;
   unsigned int oldTrackers, newTrackers;
@@ -1443 +1449 @@
                       MC_ACTIVE, &oldActive,
                       MC_ACTIVE_PEER_COUNT, &oldActivePeerCount,
+                      MC_ACTIVE_PEERS_UP, &oldUploadPeerCount,
+                      MC_ACTIVE_PEERS_DOWN, &oldDownloadPeerCount,
                       MC_ERROR, &oldError,
                       MC_ACTIVITY, &oldActivity,
@@ -1466 +1474 @@
   newRecheckProgress = st->recheckProgress;
   newActivePeerCount = st->peersSendingToUs + st->peersGettingFromUs + st->webseedsSendingToUs;
+  newDownloadPeerCount = st->peersSendingToUs;
+  newUploadPeerCount = st->peersGettingFromUs + st->webseedsSendingToUs;
   newError = st->error;
 
@@ -1477 +1487 @@
         || (newError != oldError)
         || (newActivePeerCount != oldActivePeerCount)
+        || (newDownloadPeerCount != oldDownloadPeerCount)
+        || (newUploadPeerCount != oldUploadPeerCount)
         || (newTrackers != oldTrackers)
         || gtr_compare_double (newUpSpeed, oldUpSpeed, 2)
@@ -1485 +1497 @@
                           MC_ACTIVE, newActive,
                           MC_ACTIVE_PEER_COUNT, newActivePeerCount,
+                          MC_ACTIVE_PEERS_UP, newUploadPeerCount,
+                          MC_ACTIVE_PEERS_DOWN, newDownloadPeerCount,
                           MC_ERROR, newError,
                           MC_ACTIVITY, newActivity,

trunk/gtk/tr-core.h

@@ -174 +174 @@
     MC_SPEED_UP,
     MC_SPEED_DOWN,
+    MC_ACTIVE_PEERS_UP,
+    MC_ACTIVE_PEERS_DOWN,
     MC_RECHECK_PROGRESS,
     MC_ACTIVE,

trunk/gtk/tr-window.c

@@ -741 +741 @@
   gtk_grid_attach_next_to (grid, w, sibling, GTK_POS_RIGHT, 1, 1);
   sibling = w;
-  w = gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU);
-  g_object_set (G_OBJECT(w), "margin-left", GUI_PAD, NULL);
-  gtk_grid_attach_next_to (grid, w, sibling, GTK_POS_RIGHT, 1, 1);
-  sibling = w;
 
   /* upload */
@@ -751 +747 @@
   p->ul_lb = GTK_LABEL (w);
   gtk_label_set_single_line_mode (p->ul_lb, TRUE);
-  gtk_grid_attach_next_to (grid, w, sibling, GTK_POS_RIGHT, 1, 1);
-  sibling = w;
-  w = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU);
-  g_object_set (G_OBJECT(w), "margin-left", GUI_PAD, NULL);
   gtk_grid_attach_next_to (grid, w, sibling, GTK_POS_RIGHT, 1, 1);
   sibling = w;
@@ -819 +811 @@
   tr_sessionSetAltSpeedFunc (gtr_core_session (core), onAltSpeedToggled, p);
 
+  gtr_window_refresh (GTK_WINDOW(self));
   return self;
 }
@@ -919 +912 @@
   if (session != NULL)
     {
-      char buf[128];
-      double up=0, down=0;
+      char text_str[256];
+      char speed_str[128];
+      double upSpeed = 0;
+      double downSpeed = 0;
+      int upCount = 0;
+      int downCount = 0;
       GtkTreeIter iter;
       GtkTreeModel * model = gtr_core_model (p->core);
 
+
       if (gtk_tree_model_iter_nth_child (model, &iter, NULL, 0)) do
         {
-          double u, d;
-          gtk_tree_model_get (model, &iter, MC_SPEED_UP, &u,
-                                            MC_SPEED_DOWN, &d,
+          int uc, dc;
+          double us, ds;
+          gtk_tree_model_get (model, &iter, MC_SPEED_UP, &us,
+                                            MC_SPEED_DOWN, &ds,
+                                            MC_ACTIVE_PEERS_UP, &uc,
+                                            MC_ACTIVE_PEERS_DOWN, &dc,
                                             -1);
-          up += u;
-          down += d;
+          upSpeed += us;
+          upCount += uc;
+          downSpeed += ds;
+          downCount += dc;
         }
       while (gtk_tree_model_iter_next (model, &iter));
 
-      tr_formatter_speed_KBps (buf, down, sizeof (buf));
-      gtr_label_set_text (p->dl_lb, buf);
-
-      tr_formatter_speed_KBps (buf, up, sizeof (buf));
-      gtr_label_set_text (p->ul_lb, buf);
+      tr_formatter_speed_KBps (speed_str, downSpeed, sizeof (speed_str));
+      g_snprintf (text_str, sizeof(text_str), "%s %s", speed_str, gtr_get_unicode_string (GTR_UNICODE_DOWN));
+      gtr_label_set_text (p->dl_lb, text_str);
+      gtk_widget_set_visible (GTK_WIDGET (p->dl_lb), (downCount>0));
+
+      tr_formatter_speed_KBps (speed_str, upSpeed, sizeof (speed_str));
+      g_snprintf (text_str, sizeof(text_str), "%s %s", speed_str, gtr_get_unicode_string (GTR_UNICODE_UP));
+      gtr_label_set_text (p->ul_lb, text_str);
+      gtk_widget_set_visible (GTK_WIDGET (p->ul_lb), ((downCount>0) || (upCount>0)));
     }
 }