diff options
author | Ken Moore <ken@ixsystems.com> | 2017-08-04 12:48:15 -0400 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2017-08-04 12:48:15 -0400 |
commit | 0e52cc4ec5287efd7cd039aac946e2c19c485b5b (patch) | |
tree | 98de09feeee09fadcd1ed17e0c6f89e985576aa0 /src-qt5/desktop-utils | |
parent | Setup the Lumina 1.x desktop to use the new theme engine by default (diff) | |
download | lumina-0e52cc4ec5287efd7cd039aac946e2c19c485b5b.tar.gz lumina-0e52cc4ec5287efd7cd039aac946e2c19c485b5b.tar.bz2 lumina-0e52cc4ec5287efd7cd039aac946e2c19c485b5b.zip |
Update the browser to multi-thread *all* file loading, not just thumbnails.
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/Browser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp index adfe6162..f2bdc178 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp +++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp @@ -97,13 +97,13 @@ void Browser::futureFinished(QString name, QImage icon){ QIcon ico; //LFileInfo info(name); LFileInfo *info = new LFileInfo(name); - if(!icon.isNull()){ + if(!icon.isNull() && showThumbs){ //qDebug() << " -- Data:"; QPixmap pix = QPixmap::fromImage(icon); ico.addPixmap(pix); - }else if(info->isDir()){ + //}else if(info->isDir()){ //qDebug() << " -- Folder:"; - ico = loadIcon("folder"); + //ico = loadIcon("folder"); } if(ico.isNull()){ //qDebug() << " -- MimeType:" << info.fileName() << info.mimetype(); @@ -141,12 +141,12 @@ void Browser::loadDirectory(QString dir){ QString path = directory.absoluteFilePath(files[i]); if(old.contains(path)){ old.removeAll(path); } oldFiles << path; //add to list for next time - if(showThumbs && imageFormats.contains(path.section(".",-1).toLower())){ + //if(showThumbs && imageFormats.contains(path.section(".",-1).toLower())){ QtConcurrent::run(this, &Browser::loadItem, path, this); - }else{ + /*}else{ //No special icon loading - just skip the file read step futureFinished(path, QImage()); //loadItem(path, this); - } + }*/ } watcher->addPath(directory.absolutePath()); if(!old.isEmpty()){ |