* don't include decimal points for nothing (ie: 8.0)

* use Mbps for bandwidth values (ie: avoid showing 0.1Gbps)

git-svn-id: https://xpra.org/svn/Xpra/trunk@17298 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client/gtk_base/gtk_tray_menu_base.py

@@ -712,10 +712,12 @@ def make_bandwidthlimitmenuitem(self):
         menuitems = {}
 
         def bwitem(bwlimit=0):
-            if bwlimit>0:
-                label = "%sbps" % std_unit_dec(bwlimit)
-            else:
+            if bwlimit<=0:
                 label = "None"
+            elif bwlimit>=10*1000*1000:
+                label = "%iMbps" % (bwlimit//(1000*1000))
+            else:
+                label = "%sbps" % std_unit_dec(bwlimit)
             c = CheckMenuItem(label)
             c.set_draw_as_radio(True)
             c.set_active(False)

src/xpra/simple_stats.py

@@ -26,6 +26,8 @@ def std_unit_dec(v):
     unit, value = to_std_unit(v*10.0)
     if value>=100:
         return "%s%s" % (int(value//10), unit)
+    elif int(value)%10==0:
+        return "%s%s" % (int(value/10), unit)
     return "%s%s" % (int(value)/10.0, unit)