Changeset 3993

Timestamp:

Nov 27, 2007, 3:29:51 AM (15 years ago)

Author:

charles

Message:

add stats dialog to the gtk+ client

Location:

trunk

Files:

• gtk/Makefile.am (modified) (2 diffs)
• gtk/actions.c (modified) (1 diff)
• gtk/main.c (modified) (3 diffs)
• gtk/stats.c (added)
• gtk/stats.h (added)
• gtk/torrent-inspector.c (modified) (1 diff)
• gtk/tr_window.c (modified) (1 diff)
• gtk/ui.h (modified) (1 diff)
• po/POTFILES.in (modified) (1 diff)

trunk/gtk/Makefile.am

@@ -20 +20 @@
     makemeta-ui.h \
     msgwin.h \
+    stats.h \
     torrent-inspector.h \
     tr_cell_renderer_progress.h \
@@ -42 +43 @@
     makemeta-ui.c \
     msgwin.c \
+    stats.c \
     torrent-inspector.c \
     tr_cell_renderer_progress.c \

trunk/gtk/actions.c

@@ -71 +71 @@
   { "start-torrent", GTK_STOCK_MEDIA_PLAY,
     N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
+  { "show-stats", NULL, N_("_Statistics"), NULL, NULL, G_CALLBACK(action_cb) },
   { "verify-torrent", NULL,
     N_("_Verify Local Data"), NULL, NULL, G_CALLBACK(action_cb) },

trunk/gtk/main.c

@@ -42 +42 @@
 #include "makemeta-ui.h"
 #include "msgwin.h"
+#include "stats.h"
 #include "torrent-inspector.h"
 #include "tr_cell_renderer_progress.h"
@@ -698 +699 @@
 setpex( tr_torrent * tor, void * arg )
 {
-    gboolean * val;
-
-    val = arg;
-    tr_torrentDisablePex( tor, !(*val) );
+    const gboolean * val = arg;
+    tr_torrentDisablePex( tor, !*val );
 }
 
@@ -861 +860 @@
         makeaddwind( data->wind, data->core );
     }
+    else if (!strcmp (action_name, "show-stats"))
+    {
+        GtkWidget * dialog = stats_dialog_create( data->wind,
+                                                  data->core );
+        gtk_widget_show( dialog );
+    }
     else if (!strcmp (action_name, "start-torrent"))
     {

trunk/gtk/torrent-inspector.c

@@ -665 +665 @@
     gtk_box_pack_start (GTK_BOX(vbox), w, FALSE, FALSE, 0);
 
-    g_snprintf (name, sizeof(name), "<b>%s</b>", _("Peers"));
+    g_snprintf (name, sizeof(name), "<b>%s</b>", _("Connected Peers"));
     l = gtk_label_new (NULL);
     gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.5f);

trunk/gtk/tr_window.c

@@ -93 +93 @@
     else if( TR_STATUS_DOWNLOAD & status )
     {
-        bottom = g_strdup_printf( ngettext( "Downloading from %i of %i peer",
-                                            "Downloading from %i of %i peers",
+        bottom = g_strdup_printf( ngettext( "Downloading from %i of %i connections",
+                                            "Downloading from %i of %i connections",
                                             tpeers ), dpeers, tpeers );
     }

trunk/gtk/ui.h

@@ -24 +24 @@
 "    <menu action='help-menu'>\n"
 "      <menuitem action='toggle-message-log'/>\n"
+"      <menuitem action='show-stats'/>\n"
 "      <separator/>\n"
 "      <menuitem action='show-about-dialog'/>\n"

trunk/po/POTFILES.in

@@ -10 +10 @@
 gtk/makemeta-ui.c
 gtk/msgwin.c
+gtk/stats.c
 gtk/torrent-inspector.c
 gtk/tr_cell_renderer_progress.c