Bladeren bron

reduced time strings to 2 units (e.g. 2 day 12 hours)

Wolfgang Ortmann 9 jaren geleden
bovenliggende
commit
5b2d445ba1
2 gewijzigde bestanden met toevoegingen van 395 en 365 verwijderingen
  1. 380 360
      src/kind.cpp
  2. 15 5
      src/stringtools.cpp

File diff suppressed because it is too large
+ 380 - 360
src/kind.cpp


+ 15 - 5
src/stringtools.cpp

@@ -210,13 +210,23 @@ string timeString(time_t t)
   int hour = t % 24;
   int hour = t % 24;
   t /= 24;
   t /= 24;
   int days = t;
   int days = t;
+  int nParts = 0;
   if (days > 0)
   if (days > 0)
-    res += to_string(days) + " days ";
+    {
+      res += to_string(days) + " days ";
+      nParts++;
+    }
   if (hour > 0)
   if (hour > 0)
-    res += to_string(hour) + " hours ";
-  if (min > 0)
-    res += to_string(min) + " minutes ";
-  if (sec > 0 || res.empty())
+    {
+      res += to_string(hour) + " hours ";
+      nParts++;
+    }
+  if (min > 0 && nParts < 2)
+    {
+      res += to_string(min) + " minutes ";
+      nParts++;
+    }
+  if ((sec > 0 && nParts < 2) || nParts == 0)
     res += to_string(sec) + " seconds ";
     res += to_string(sec) + " seconds ";
   return res;
   return res;
 }
 }

Some files were not shown because too many files changed in this diff