Merge ssh://192.168.222.14/home/amoeller/devel/SheMov into archive_view

Conflicts:
	shemov.cpp
	shemov.h

1 files changed, 6 insertions, 12 deletions

diff --git a/smdirmodel.cpp b/smdirmodel.cpp
index 1d90573..f967cf1 100644
--- a/smdirmodel.cpp
+++ b/smdirmodel.cpp
@@ -56,15 +56,13 @@ QVariant SmDirModel::data(const QModelIndex &index, int role) const{
             return i->data(Present);
         case Qt::DecorationRole: {
             if(index.column() == 0){
-                QStringList mime = i->data(Type).toString().split('/');
-                if(mime.at(0) == "inode"){
+                QFileInfo fi(i->data(FullPath).toString());
+                if(fi.isDir()){
                     return mIcons.value("folder");
                 }
-                if(!mIcons.contains(mime.at(0))){
-                    return mIcons.value("other");
+                if(fi.isFile()){
+                    return mIcons.value("file");
                 }
-                return mIcons.value(mime.at(0).toLower());
-            }else{
                 return QVariant();
             }
         }
@@ -173,12 +171,8 @@ void SmDirModel::readSettings(){
     QSettings s;
     QString iconName = s.value("ui/foldericon").toString();
     mIcons.insert("folder", QIcon(icons.value(iconName)));
-    iconName = s.value("ui/movieicon").toString();
-    mIcons.insert("video", QIcon(icons.value(iconName)));
-    iconName = s.value("ui/pictureicon").toString();
-    mIcons.insert("image", QIcon(icons.value(iconName)));
-    iconName = s.value("ui/othericon").toString();
-    mIcons.insert("other", QIcon(icons.value(iconName)));
+    iconName = s.value("ui/fileicon").toString();
+    mIcons.insert("file", QIcon(icons.value(iconName)));
     bool autorefresh = s.value("ui/autorefresh", false).toBool();
     if(autorefresh){
         mRefreshTimer->stop();