From 49b943474c4ac39ee5f0f2e900fddd1253a84366 Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 5 Aug 2015 04:04:49 +0200 Subject: Remove progress dialog and use Qt::WaitCursor instead Get rid of the progress Dialog in the filesystem widget and replace it with Qt::WaitCursor. While at it, show the waitcursor in the picture widget, too. Also remove the annoying warnings from ImageMagick by defining the missing constants. --- smdirmodel.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'smdirmodel.cpp') diff --git a/smdirmodel.cpp b/smdirmodel.cpp index 73ae0c5..32bc241 100644 --- a/smdirmodel.cpp +++ b/smdirmodel.cpp @@ -135,11 +135,6 @@ void SmDirModel::setDir(const QString &dir){ mWatch->setDir(mCurrentDir); } -void SmDirModel::setDirNoProgress(const QString &dir){ - mCurrentDir = dir; - mWatch->setDir(mCurrentDir, false); -} - void SmDirModel::dirEvent(const QList &data, int e){ if(e == SmDirWatcher::Added){ /* for some reason SmTreeModel::addRow() doesn't work, @@ -177,7 +172,7 @@ void SmDirModel::readSettings(){ interval *= 1000; mRefreshTimer->setInterval(interval); mRefreshTimer->start(); - connect(mRefreshTimer, SIGNAL(timeout()), this, SLOT(refreshNoProgress())); + connect(mRefreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); } bool expensive = s.value("ui/expensiveops", true).toBool(); mWatch->setExpensiveOps(expensive); @@ -187,13 +182,8 @@ void SmDirModel::refresh(){ setDir(mCurrentDir); } -void SmDirModel::refreshNoProgress(){ - setDirNoProgress(mCurrentDir); -} - void SmDirModel::populate(SmTreeItem *root){ setRoot(root); - //mWatch->startAsyncJobs(); emit needResize(); } -- cgit v1.2.3-70-g09d2