X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=4c1a22f2ea47f6a78ee96924aa905f6c6806ded6;hp=aeccf678fc7381bb03c739a34ee56fc0e1d541cb;hb=c2a02924342a5d9a0ebbc1794e9f7df4ca13c50d;hpb=b79832bf9c4c21b05629cfd2fdbd008ad690572f

diff --git a/src/common/util.cpp b/src/common/util.cpp
index aeccf678..4c1a22f2 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -18,10 +18,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "util.h"
+#include <QCoreApplication>
 #include <QDebug>
 #include <QTextCodec>
 
+#include "util.h"
+
 class QMetaMethod;
 
 QString nickFromMask(QString mask) {
@@ -142,14 +144,37 @@ QByteArray methodName(const QMetaMethod &method) {
 QDir quasselDir() {
   // kinda ugly, but I currently see no other way to do that
 #ifdef Q_OS_WIN32
-  QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "/quassel/";
+  QString quasselDir = qgetenv("APPDATA") + "/quassel/";
 #else
   QString quasselDir = QDir::homePath() + "/.quassel/";
 #endif
 
   QDir qDir(quasselDir);
-  if(!qDir.exists(quasselDir))
-    qDir.mkpath(quasselDir);
+  if(!qDir.exists(quasselDir)) {
+    if(!qDir.mkpath(quasselDir)) {
+      qCritical() << "Unable to create Quassel data directory:" << qPrintable(qDir.absolutePath());
+    }
+  }
 
   return qDir;
 }
+
+
+QString secondsToString(int timeInSeconds) {
+    QList< QPair<int, QString> > timeUnit;
+    timeUnit.append(qMakePair(365*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
+    timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
+    timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
+    timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
+    timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
+
+    QString returnString;
+    for(int i=0; i < timeUnit.size(); i++) {
+      int n = timeInSeconds / timeUnit[i].first;
+      if(n > 0) {
+        returnString += QString("%1 %2 ").arg(QString::number(n), timeUnit[i].second);
+      }
+      timeInSeconds = timeInSeconds % timeUnit[i].first;
+    }
+    return returnString;
+}