kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue when moving items to trash

Browse source 
KDirLister does not emit a completed() signal when deleting files,
only when files are listed.
This commit is contained in:
Peter Penz 2011-09-01 15:43:59 +02:00
parent 15ebfc7329
commit 9e6d73aef8
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/kitemviews/kfileitemmodel.cpp
View file

@ -45,7 +45,6 @@ KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
m_minimumUpdateIntervalTimer(0),
m_maximumUpdateIntervalTimer(0),
m_pendingItemsToInsert(),
m_pendingItemsToDelete(),
m_rootExpansionLevel(-1)
{
resetRoles();
@ -67,14 +66,14 @@ KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
m_minimumUpdateIntervalTimer = new QTimer(this);
m_minimumUpdateIntervalTimer->setInterval(1000);
m_minimumUpdateIntervalTimer->setSingleShot(true);
connect(m_minimumUpdateIntervalTimer, SIGNAL(timeout()), this, SLOT(dispatchPendingItems()));
connect(m_minimumUpdateIntervalTimer, SIGNAL(timeout()), this, SLOT(dispatchPendingItemsToInsert()));
// For slow KIO-slaves like used for searching it makes sense to show results periodically even
// before the completed() or canceled() signal has been emitted.
m_maximumUpdateIntervalTimer = new QTimer(this);
m_maximumUpdateIntervalTimer->setInterval(2000);
m_maximumUpdateIntervalTimer->setSingleShot(true);
connect(m_maximumUpdateIntervalTimer, SIGNAL(timeout()), this, SLOT(dispatchPendingItems()));
connect(m_maximumUpdateIntervalTimer, SIGNAL(timeout()), this, SLOT(dispatchPendingItemsToInsert()));
Q_ASSERT(m_minimumUpdateIntervalTimer->interval() <= m_maximumUpdateIntervalTimer->interval());
}
@ -363,7 +362,7 @@ void KFileItemModel::slotCompleted()
return;
}
dispatchPendingItems();
dispatchPendingItemsToInsert();
m_minimumUpdateIntervalTimer->start();
}
@ -371,15 +370,11 @@ void KFileItemModel::slotCanceled()
{
m_minimumUpdateIntervalTimer->stop();
m_maximumUpdateIntervalTimer->stop();
dispatchPendingItems();
dispatchPendingItemsToInsert();
}
void KFileItemModel::slotNewItems(const KFileItemList& items)
{
if (!m_pendingItemsToDelete.isEmpty()) {
removeItems(m_pendingItemsToDelete);
m_pendingItemsToDelete.clear();
}
m_pendingItemsToInsert.append(items);
if (useMaximumUpdateInterval() && !m_maximumUpdateIntervalTimer->isActive()) {
@ -395,7 +390,7 @@ void KFileItemModel::slotItemsDeleted(const KFileItemList& items)
insertItems(m_pendingItemsToInsert);
m_pendingItemsToInsert.clear();
}
m_pendingItemsToDelete.append(items);
removeItems(items);
}
void KFileItemModel::slotClear()
@ -407,7 +402,6 @@ void KFileItemModel::slotClear()
m_minimumUpdateIntervalTimer->stop();
m_maximumUpdateIntervalTimer->stop();
m_pendingItemsToInsert.clear();
m_pendingItemsToDelete.clear();
m_rootExpansionLevel = -1;
@ -425,16 +419,11 @@ void KFileItemModel::slotClear(const KUrl& url)
Q_UNUSED(url);
}
void KFileItemModel::dispatchPendingItems()
void KFileItemModel::dispatchPendingItemsToInsert()
{
if (!m_pendingItemsToInsert.isEmpty()) {
Q_ASSERT(m_pendingItemsToDelete.isEmpty());
insertItems(m_pendingItemsToInsert);
m_pendingItemsToInsert.clear();
} else if (!m_pendingItemsToDelete.isEmpty()) {
Q_ASSERT(m_pendingItemsToInsert.isEmpty());
removeItems(m_pendingItemsToDelete);
m_pendingItemsToDelete.clear();
}
}

3
src/kitemviews/kfileitemmodel.h
View file

@ -112,7 +112,7 @@ private slots:
void slotClear();
void slotClear(const KUrl& url);
void dispatchPendingItems();
void dispatchPendingItemsToInsert();
private:
void insertItems(const KFileItemList& items);
@ -184,7 +184,6 @@ private:
QTimer* m_minimumUpdateIntervalTimer;
QTimer* m_maximumUpdateIntervalTimer;
KFileItemList m_pendingItemsToInsert;
KFileItemList m_pendingItemsToDelete;
// Stores the smallest expansion level of the root-URL. Is required to calculate
// the "expansionLevel" role in an efficient way. A value < 0 indicates that