* Added Formating for File Size KIB,MIB,GIB and for AGE 1d2h3m

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@818 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/RetroShare.pro

@@ -98,6 +98,7 @@ HEADERS +=  rshare.h \
             util/RsAction.h \
             util/printpreview.h \
             util/log.h \
+            util/misc.h \
             gui/bwgraph/bwgraph.h \
 	    gui/profile/ProfileView.h \
 	    gui/profile/ProfileEdit.h \

retroshare-gui/src/rsiface/RemoteDirModel.cpp

@@ -8,6 +8,7 @@
 #include <sstream>
 #include <math.h>
 #include <algorithm>
+#include "util/misc.h"
 
 /*****
  * #define RDM_DEBUG
@@ -18,6 +19,8 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
          RemoteMode(mode), nIndex(1), indexSet(1)   /* ass zero index cant be used */
 {
 	setSupportedDragActions(Qt::CopyAction);
+
+
 }
 
 
@@ -237,8 +240,7 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
 		switch(coln)
 		{
 			case 0:
-		QIcon icon(":/images/user/identity16.png");
+		return(QIcon(":/images/user/identity16.png"));	
-		return icon;
 		break;
 		}
 	}
@@ -366,8 +368,9 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
 			case 1:
 		{
 			std::ostringstream out;
-			out << details.count;
+			//out << details.count;
-			return QString::fromStdString(out.str());
+			//return QString::fromStdString(out.str());
+			return  misc::friendlyUnit(details.count);
 		}
 			break;
 			case 2:
@@ -380,10 +383,8 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent)
 			case 3:
 		{
 			std::ostringstream out;
-			QDateTime datum = QDateTime::fromTime_t(details.age);
-			QString stime = datum.toString(Qt::LocalDate);
 			//out << details.age;
-			return QString(stime);
+			return  misc::userFriendlyDuration(details.age);
 		}
 			break;
 			default:
@@ -1008,3 +1009,5 @@ QStringList RemoteDirModel::mimeTypes () const
 }
 
 
+
+

retroshare-gui/src/rsiface/RemoteDirModel.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <list>
 #include <string>
+#include "util/misc.h"
 
 class RemoteDirModel : public QAbstractItemModel
  {
@@ -98,6 +99,7 @@ virtual QStringList mimeTypes () const;
 
      mutable int nIndex;
      mutable std::vector<RemoteIndex> indexSet;
+
  };
 
 #endif

retroshare-gui/src/util/misc.h

@@ -0,0 +1,337 @@
+/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2008, defnax
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *************************************************************************/
+
+#ifndef MISC_H
+#define MISC_H
+
+#include <sstream>
+#include <stdexcept>
+#include <QObject>
+#include <QString>
+#include <QByteArray>
+#include <QFileInfo>
+#include <QDir>
+#include <QList>
+#include <QPair>
+#include <QThread>
+
+#include <QItemDelegate>
+#include <QStyleOptionProgressBarV2>
+#include <QStyleOptionViewItemV2>
+#include <QModelIndex>
+#include <QPainter>
+#include <QProgressBar>
+#include <QApplication>
+
+
+
+/*  Miscellaneaous functions that can be useful */
+class misc : public QObject{
+ Q_OBJECT
+
+  public:
+    // Convert any type of variable to C++ String
+    // convert=true will convert -1 to 0
+    template <class T> static std::string toString(const T& x, bool convert=false) {
+      std::ostringstream o;
+      if(!(o<<x)) {
+        throw std::runtime_error("::toString()");
+      }
+      if(o.str() == "-1" && convert)
+        return "0";
+      return o.str();
+    }
+
+    template <class T> static QString toQString(const T& x, bool convert=false) {
+      std::ostringstream o;
+      if(!(o<<x)) {
+        throw std::runtime_error("::toString()");
+      }
+      if(o.str() == "-1" && convert)
+        return QString::fromUtf8("0");
+      return QString::fromUtf8(o.str().c_str());
+    }
+
+    template <class T> static QByteArray toQByteArray(const T& x, bool convert=false) {
+      std::ostringstream o;
+      if(!(o<<x)) {
+        throw std::runtime_error("::toString()");
+      }
+      if(o.str() == "-1" && convert)
+        return "0";
+      return QByteArray(o.str().c_str());
+    }
+
+    // Convert C++ string to any type of variable
+    template <class T> static T fromString(const std::string& s) {
+      T x;
+      std::istringstream i(s);
+      if(!(i>>x)) {
+        throw std::runtime_error("::fromString()");
+      }
+      return x;
+    }
+
+//     template <class T> static T fromQString::fromUtf8(const QString& s) {
+//       T x;
+//       std::istringstream i((const char*)s.toUtf8());
+//       if(!(i>>x)) {
+//         throw std::runtime_error("::fromString()");
+//       }
+//       return x;
+//     }
+// 
+//     template <class T> static T fromQByteArray(const QByteArray& s) {
+//       T x;
+//       std::istringstream i((const char*)s);
+//       if(!(i>>x)) {
+//         throw std::runtime_error("::fromString()");
+//       }
+//       return x;
+//     }
+
+    // return best userfriendly storage unit (B, KiB, MiB, GiB, TiB)
+    // use Binary prefix standards from IEC 60027-2
+    // see http://en.wikipedia.org/wiki/Kilobyte
+    // value must be given in bytes
+    static QString friendlyUnit(float val) {
+      if(val < 0) {
+        return tr("Unknown", "Unknown (size)");
+      }
+      const QString units[4] = {tr(" B", "bytes"), tr(" KiB", "kibibytes (1024 bytes)"), tr(" MiB", "mebibytes (1024 kibibytes)"), tr(" GiB", "gibibytes (1024 mibibytes)")};
+      for(unsigned int i=0; i<5; ++i) {
+        if (val < 1024.) {
+          return QString(QByteArray::number(val, 'f', 1)) + units[i];
+        }
+        val /= 1024.;
+      }
+      return  QString(QByteArray::number(val, 'f', 1)) + tr(" TiB", "tebibytes (1024 gibibytes)");
+    }
+
+    static bool isPreviewable(QString extension){
+      extension = extension.toUpper();
+      if(extension == "AVI") return true;
+      if(extension == "MP3") return true;
+      if(extension == "OGG") return true;
+      if(extension == "OGM") return true;
+      if(extension == "WMV") return true;
+      if(extension == "WMA") return true;
+      if(extension == "MPEG") return true;
+      if(extension == "MPG") return true;
+      if(extension == "ASF") return true;
+      if(extension == "QT") return true;
+      if(extension == "RM") return true;
+      if(extension == "RMVB") return true;
+      if(extension == "RMV") return true;
+      if(extension == "SWF") return true;
+      if(extension == "FLV") return true;
+      if(extension == "WAV") return true;
+      if(extension == "MOV") return true;
+      if(extension == "VOB") return true;
+      if(extension == "MID") return true;
+      if(extension == "AC3") return true;
+      if(extension == "MP4") return true;
+      if(extension == "MP2") return true;
+      if(extension == "AVI") return true;
+      if(extension == "FLAC") return true;
+      if(extension == "AU") return true;
+      if(extension == "MPE") return true;
+      if(extension == "MOV") return true;
+      if(extension == "MKV") return true;
+      if(extension == "AIF") return true;
+      if(extension == "AIFF") return true;
+      if(extension == "AIFC") return true;
+      if(extension == "RA") return true;
+      if(extension == "RAM") return true;
+      if(extension == "M4P") return true;
+      if(extension == "M4A") return true;
+      if(extension == "3GP") return true;
+      if(extension == "AAC") return true;
+      if(extension == "SWA") return true;
+      if(extension == "MPC") return true;
+      if(extension == "MPP") return true;
+      return false;
+    }
+
+    // return qBittorrent config path
+    static QString qBittorrentPath() {
+      QString qBtPath = QDir::homePath()+QDir::separator()+QString::fromUtf8(".qbittorrent") + QDir::separator();
+      // Create dir if it does not exist
+      if(!QFile::exists(qBtPath)){
+        QDir dir(qBtPath);
+        dir.mkpath(qBtPath);
+      }
+      return qBtPath;
+    }
+
+// Not used anymore because it is not safe
+//     static bool removePath(QString path) {
+//       qDebug((QString::fromUtf8("file to delete:") + path).toUtf8());
+//       if(!QFile::remove(path)) {
+//         // Probably a folder
+//         QDir current_dir(path);
+//         if(current_dir.exists()) {
+//           //Remove sub items
+//           QStringList subItems = current_dir.entryList();
+//           QString item;
+//           foreach(item, subItems) {
+//             if(item != QString::fromUtf8(".") && item != QString::fromUtf8("..")) {
+//               qDebug("-> Removing "+(path+QDir::separator()+item).toUtf8());
+//               removePath(path+QDir::separator()+item);
+//             }
+//           }
+//           // Remove empty folder
+//           if(current_dir.rmdir(path)) {
+//             return true;
+//           }else{
+//             return false;
+//           }
+//         }else{
+//           return false;
+//         }
+//       }
+//       return true;
+//     }
+
+    static QString findFileInDir(QString dir_path, QString fileName) {
+      QDir dir(dir_path);
+      if(dir.exists(fileName)) {
+        return dir.filePath(fileName);
+      }
+      QStringList subDirs = dir.entryList(QDir::Dirs);
+      QString subdir_name;
+      foreach(subdir_name, subDirs) {
+        QString result = findFileInDir(dir.path()+QDir::separator()+subdir_name, fileName);
+        if(!result.isNull()) {
+          return result;
+        }
+      }
+      return QString();
+    }
+
+
+    // Insertion sort, used instead of bubble sort because it is
+    // approx. 5 times faster.
+    template <class T> static void insertSort(QList<QPair<int, T> > &list, const QPair<int, T>& value, Qt::SortOrder sortOrder) {
+      int i = 0;
+      if(sortOrder == Qt::AscendingOrder) {
+        while(i < list.size() and value.second > list.at(i).second) {
+          ++i;
+        }
+      }else{
+        while(i < list.size() and value.second < list.at(i).second) {
+          ++i;
+        }
+      }
+      list.insert(i, value);
+    }
+
+    template <class T> static void insertSort2(QList<QPair<int, T> > &list, const QPair<int, T>& value, Qt::SortOrder sortOrder) {
+      int i = 0;
+      if(sortOrder == Qt::AscendingOrder) {
+        while(i < list.size() and value.first > list.at(i).first) {
+          ++i;
+        }
+      }else{
+        while(i < list.size() and value.first < list.at(i).first) {
+          ++i;
+        }
+      }
+      list.insert(i, value);
+    }
+
+    // Can't use template class for QString because >,< use unicode code for sorting
+    // which is not what a human would expect when sorting strings.
+    static void insertSortString(QList<QPair<int, QString> > &list, QPair<int, QString> value, Qt::SortOrder sortOrder) {
+      int i = 0;
+      if(sortOrder == Qt::AscendingOrder) {
+        while(i < list.size() and QString::localeAwareCompare(value.second, list.at(i).second) > 0) {
+          ++i;
+        }
+      }else{
+        while(i < list.size() and QString::localeAwareCompare(value.second, list.at(i).second) < 0) {
+          ++i;
+        }
+      }
+      list.insert(i, value);
+    }
+
+    static float getPluginVersion(QString filePath) {
+      QFile plugin(filePath);
+      if(!plugin.exists()){
+        qDebug("%s plugin does not exist, returning 0.0", filePath.toUtf8().data());
+        return 0.0;
+      }
+      if(!plugin.open(QIODevice::ReadOnly | QIODevice::Text)){
+        return 0.0;
+      }
+      float version = 0.0;
+      while (!plugin.atEnd()){
+        QByteArray line = plugin.readLine();
+        if(line.startsWith("#VERSION: ")){
+          line = line.split(' ').last();
+          line.replace("\n", "");
+          version = line.toFloat();
+          qDebug("plugin %s version: %.2f", filePath.toUtf8().data(), version);
+          break;
+        }
+      }
+      return version;
+    }
+
+    // Take a number of seconds and return an user-friendly
+    // time duration like "1d 2h 10m".
+    static QString userFriendlyDuration(qlonglong seconds) {
+      if(seconds < 0) {
+        return tr("Unknown");
+      }
+      if(seconds < 60) {
+        return tr("< 1m", "< 1 minute");
+      }
+      int minutes = seconds / 60;
+      if(minutes < 60) {
+        return tr("%1m","e.g: 10minutes").arg(QString::QString::fromUtf8(misc::toString(minutes).c_str()));
+      }
+      int hours = minutes / 60;
+      minutes = minutes - hours*60;
+       if(hours < 24) {
+        return tr("%1h%2m", "e.g: 3hours 5minutes").arg(QString::fromUtf8(misc::toString(hours).c_str())).arg(QString::fromUtf8(misc::toString(minutes).c_str()));
+      }
+      int days = hours / 24;
+      hours = hours - days * 24;
+      if(days < 100) {
+        return tr("%1d%2h%3m", "e.g: 2days 10hours 2minutes").arg(QString::fromUtf8(misc::toString(days).c_str())).arg(QString::fromUtf8(misc::toString(hours).c_str())).arg(QString::fromUtf8(misc::toString(minutes).c_str()));
+      }
+      return tr("Unknown");
+    }
+};
+
+//  Trick to get a portable sleep() function
+class SleeperThread : public QThread{
+  public:
+    static void msleep(unsigned long msecs)
+    {
+      QThread::msleep(msecs);
+    }
+};
+
+#endif