Merge branch 'dirview'

diff --git a/resources/black/folder.png b/resources/black/folder.png
new file mode 100644 (file)
index 0000000..1328dd4
Binary files /dev/null and b/resources/black/folder.png differ

diff --git a/resources/resources.qrc b/resources/resources.qrc
index 6774c0d..6b177c5 100644 (file)
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -71,5 +71,7 @@
         <file>white/directory.png</file>
         <file>black/home.png</file>
         <file>white/home.png</file>
+        <file>black/folder.png</file>
+        <file>white/folder.png</file>
     </qresource>
 </RCC>

diff --git a/resources/white/folder.png b/resources/white/folder.png
new file mode 100644 (file)
index 0000000..ac9886b
Binary files /dev/null and b/resources/white/folder.png differ

diff --git a/src/directoryview.cpp b/src/directoryview.cpp
index 60e0839..e0c9f41 100644 (file)
--- a/src/directoryview.cpp
+++ b/src/directoryview.cpp
@@ -94,7 +94,7 @@ void DirectoryView::readDir(QString path) {
        int i = 0;
        foreach (QString str, dirnames) {
                _model->setItem(i, 0, new QStandardItem(QIcon(":/icons/"+_icons_theme+"/deselect_all.png"), ""));
-               _model->setItem(i, 1, new QStandardItem(str+"/"));
+               _model->setItem(i, 1, new QStandardItem(QIcon(":/icons/"+_icons_theme+"/folder.png"), str+"/"));
                i++;
        }
        foreach (QString str, filenames) {