From 61689d73788a937b1662861db11ea7d0cf9a6ddf Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 18 Oct 2016 11:46:06 -0400 Subject: Fix up the "loading" message on directories with no contents. --- src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp | 2 +- src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5') diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp index 55347ca5..da651cca 100644 --- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp +++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp @@ -356,7 +356,7 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo info){ } void BrowserWidget::itemsLoading(int total){ - //qDebug() << "Got number of items loading:" << total; + qDebug() << "Got number of items loading:" << total; numItems = total; //save this for later if(total<1){ emit updateDirectoryStatus( tr("No Directory Contents") ); diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp index b45200e9..49799f28 100644 --- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp +++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp @@ -504,7 +504,7 @@ void DirWidget::currentDirectoryChanged(bool widgetonly){ QFileInfo info(cur); canmodify = info.isWritable(); if(widgetonly){ ui->label_status->setText(currentBrowser()->status()); } - else{ ui->label_status->setText(tr("Loading...")); } + else if( !currentBrowser()->isEnabled() ){ ui->label_status->setText(tr("Loading...")); } //qDebug() << "Start search for snapshots"; if(!cur.contains("/.zfs/snapshot") ){ normalbasedir = cur; -- cgit