aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils/lumina-fm/Browser.cpp
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2017-08-06 00:02:16 +0000
committerWeblate <noreply@weblate.org>2017-08-06 00:02:16 +0000
commitb1df5e55259c76e6ca963cf0af25e20ee4a1897d (patch)
tree770cbcbc98cc24416d43282ca7f37c1a3cd7309a /src-qt5/desktop-utils/lumina-fm/Browser.cpp
parentTranslated using Weblate (French) (diff)
parentMake sure the "start-lumina-desktop" routine will detect/adjust the X11 Displ... (diff)
downloadlumina-b1df5e55259c76e6ca963cf0af25e20ee4a1897d.tar.gz
lumina-b1df5e55259c76e6ca963cf0af25e20ee4a1897d.tar.bz2
lumina-b1df5e55259c76e6ca963cf0af25e20ee4a1897d.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm/Browser.cpp')
-rw-r--r--src-qt5/desktop-utils/lumina-fm/Browser.cpp12
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()){
bgstack15