aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2016-10-18 11:46:06 -0400
committerKen Moore <ken@ixsystems.com>2016-10-18 11:46:06 -0400
commit61689d73788a937b1662861db11ea7d0cf9a6ddf (patch)
tree30e011181c7ea4c008987d6cffac5a712788c0ab
parentFix the snapshot loading mechanism within lumina-fm. (diff)
downloadlumina-61689d73788a937b1662861db11ea7d0cf9a6ddf.tar.gz
lumina-61689d73788a937b1662861db11ea7d0cf9a6ddf.tar.bz2
lumina-61689d73788a937b1662861db11ea7d0cf9a6ddf.zip
Fix up the "loading" message on directories with no contents.
-rw-r--r--src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp2
-rw-r--r--src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp2
2 files changed, 2 insertions, 2 deletions
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;
bgstack15