Changeset 7821

Timestamp:

Jan 31, 2009, 2:54:10 PM (12 years ago)

Author:

charles

Message:

(1.5x) backport #1757, #1777 to 1.5x branch

Location:

branches/1.5x

Files:

• daemon/remote.c (modified) (4 diffs)
• daemon/transmission-remote.1 (modified) (2 diffs)
• gtk/tr-prefs.c (modified) (1 diff)

branches/1.5x/daemon/remote.c

@@ -631 +631 @@
 
 static char*
-strlsize( char *  buf,
-          int64_t size,
-          size_t  buflen )
+strlsize( char *  buf, int64_t size, size_t  buflen )
 {
     if( !size )
@@ -1080 +1078 @@
     {
         int i, n;
-        printf( "%-4s  %-4s  %-8s  %-6s  %-6s  %-5s  %-11s  %s\n",
-                "ID", "Done", "ETA", "Up", "Down", "Ratio", "Status",
+        printf( "%-4s  %-4s  %8s  %-8s  %6s  %6s  %-5s  %-11s  %s\n",
+                "ID", "Done", "Have", "ETA", "Up", "Down", "Ratio", "Status",
                 "Name" );
         for( i = 0, n = tr_bencListSize( list ); i < n; ++i )
@@ -1103 +1101 @@
                 char statusStr[64];
                 char ratioStr[32];
+                char haveStr[32];
+
+                strlsize( haveStr, sizeWhenDone - leftUntilDone, sizeof( haveStr ) );
 
                 if( leftUntilDone )
@@ -1109 +1110 @@
                     tr_snprintf( etaStr, sizeof( etaStr ), "Done" );
                 printf(
-                    "%4d  %3d%%  %-8s  %6.1f  %6.1f  %5s  %-11s  %s\n",
+                    "%4d  %3d%%  %8s  %-8s  %6.1f  %6.1f  %5s  %-11s  %s\n",
                     (int)id,
-                    (int)( 100.0 *
-                           ( sizeWhenDone - leftUntilDone ) / sizeWhenDone ),
+                    (int)( 100.0 * ( sizeWhenDone - leftUntilDone ) / sizeWhenDone ),
+                    haveStr,
                     etaStr,
                     up / 1024.0,

branches/1.5x/daemon/transmission-remote.1

@@ -31 +31 @@
 .Op Fl R
 .Op Fl s | S
+.Op Fl Ar -session
 .Op Fl t Ar all | Ar id | Ar hash
 .Op Fl u Ar number | Fl U
@@ -143 +144 @@
 .It Fl S Fl -stop
 Stop the current torrent(s) from downloading or seeding
+
+.It Fl -session
+List session information from the server
 
 .It Fl t Fl -torrent Ar all | id | torrent-hash

branches/1.5x/gtk/tr-prefs.c

@@ -738 +738 @@
     h = gtk_hbox_new( FALSE, GUI_PAD_BIG );
     gtk_box_pack_start( GTK_BOX( h ), w, TRUE, TRUE, 0 );
-    w = gtk_button_new_from_stock( GTK_STOCK_OPEN );
+    w = gtr_button_new_from_stock( GTK_STOCK_OPEN, _( "_Open web interface" ) );
     page->widgets = g_slist_append( page->widgets, w );
     g_signal_connect( w, "clicked", G_CALLBACK( onLaunchClutchCB ), NULL );