Added info about E.T.A. in "show sends"

diff --git a/NGL fserv/install.kvs b/NGL fserv/install.kvs
index 7fdd5e3525f2d14d1d1ebd081b1ddb086165803c..158d2884ba132211d6445b7714e6ec3f016960ac 100644 (file)
--- a/NGL fserv/install.kvs
+++ b/NGL fserv/install.kvs
@@ -195,10 +195,17 @@ defpopup(NGLfserv_channel)
                        if(%id) {\r
                                %a=$($dcc.transferredBytes(%id)/100)\r
                                %b=$($dcc.localFileSize(%id)/100)\r
-                               %percent=$(100*%a/%b)\%\r
+                               %c=$((%b-%a)/($dcc.averageSpeed(%id)/100))\r
+                               if($($date("e",%c)-1) > 0) %eta .= $($date("e",%c)-1)d" "\r
+                               if($($date("k",%c)-1) > 0) %eta .= $($date("k",%c)-1)h" "\r
+                               if($date("M",%c) > 0) %eta .= $date("M",%c)m" "\r
+                               if($date("S",%c) > 0) %eta .= $date("S",%c)s" "\r
+                               %progress=done at $k(%NGLc2)$r$r$(100*%a/%b)\%$k(%NGLc1), ETA: $k(%NGLc2)$r$r%eta$k(%NGLc1)\r
                        }\r
-                       else %percent=Waiting\r
-                       say $k(%NGLc1)#$(%i+1) $k(%NGLc2)%Send->$at(%i)->%file$k(%NGLc1), to $k(%NGLc2)%Send->$at(%i)->%nick$k(%NGLc1), done at $k(%NGLc2)$r$r%percent$k(%NGLc1), size: $k(%NGLc2)$r$r$NGLfserv::corefunctions::calc(%Send->$at(%i)->%size)\r
+                       else {\r
+                               %progress=Waiting\r
+                       }\r
+                       say $k(%NGLc1)#$(%i+1) $k(%NGLc2)%Send->$at(%i)->%file$k(%NGLc1), to $k(%NGLc2)%Send->$at(%i)->%nick$k(%NGLc1), %progress, size: $k(%NGLc2)$r$r$NGLfserv::corefunctions::calc(%Send->$at(%i)->%size)\r
                }\r
        }\r
 \r
@@ -262,7 +269,7 @@ defpopup(NGLfserv_nick)
                }\r
        }\r
 \r
-       item($tr("Enqueue file","NGLfserv"),257) ($(%Send->$count()>=%MaxSends))\r
+       item($tr("Enqueue file","NGLfserv"),257) ($(%Send->$count()>0))\r
        {\r
                dialog.file(open,%NGLlogo,,,$0) {\r
                        if ($0) {\r