mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
InformationPanel: better refresh state when current dir changes
Refactor and simplify things along the way. BUG: 457813
This commit is contained in:
parent
06df12013b
commit
4150960081
|
@ -33,7 +33,7 @@ InformationPanel::InformationPanel(QWidget* parent) :
|
||||||
m_shownUrl(),
|
m_shownUrl(),
|
||||||
m_urlCandidate(),
|
m_urlCandidate(),
|
||||||
m_invalidUrlCandidate(),
|
m_invalidUrlCandidate(),
|
||||||
m_fileItem(),
|
m_hoveredItem(),
|
||||||
m_selection(),
|
m_selection(),
|
||||||
m_folderStatJob(nullptr),
|
m_folderStatJob(nullptr),
|
||||||
m_content(nullptr)
|
m_content(nullptr)
|
||||||
|
@ -47,7 +47,6 @@ InformationPanel::~InformationPanel()
|
||||||
void InformationPanel::setSelection(const KFileItemList& selection)
|
void InformationPanel::setSelection(const KFileItemList& selection)
|
||||||
{
|
{
|
||||||
m_selection = selection;
|
m_selection = selection;
|
||||||
m_fileItem = KFileItem();
|
|
||||||
|
|
||||||
if (!isVisible()) {
|
if (!isVisible()) {
|
||||||
return;
|
return;
|
||||||
|
@ -70,7 +69,7 @@ void InformationPanel::setSelection(const KFileItemList& selection)
|
||||||
|
|
||||||
void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
|
void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
|
||||||
{
|
{
|
||||||
if (!isVisible() || (item.isNull() && m_fileItem.isNull())) {
|
if (!isVisible()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,21 +79,15 @@ void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.isNull()) {
|
||||||
|
m_hoveredItem = KFileItem();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
cancelRequest();
|
cancelRequest();
|
||||||
|
|
||||||
if (item.isNull()) {
|
m_hoveredItem = item;
|
||||||
// The cursor is above the viewport. If files are selected,
|
m_infoTimer->start();
|
||||||
// show information regarding the selection.
|
|
||||||
if (!m_selection.isEmpty()) {
|
|
||||||
m_fileItem = KFileItem();
|
|
||||||
m_infoTimer->start();
|
|
||||||
}
|
|
||||||
} else if (item.url().isValid() && !isEqualToShownUrl(item.url())) {
|
|
||||||
// The cursor is above an item that is not shown currently
|
|
||||||
m_urlCandidate = item.url();
|
|
||||||
m_fileItem = item;
|
|
||||||
m_infoTimer->start();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool InformationPanel::urlChanged()
|
bool InformationPanel::urlChanged()
|
||||||
|
@ -112,7 +105,6 @@ bool InformationPanel::urlChanged()
|
||||||
|
|
||||||
if (!isEqualToShownUrl(url())) {
|
if (!isEqualToShownUrl(url())) {
|
||||||
m_shownUrl = url();
|
m_shownUrl = url();
|
||||||
m_fileItem = KFileItem();
|
|
||||||
|
|
||||||
// Update the content with a delay. This gives
|
// Update the content with a delay. This gives
|
||||||
// the directory lister the chance to show the content
|
// the directory lister the chance to show the content
|
||||||
|
@ -219,34 +211,36 @@ void InformationPanel::showItemInfo()
|
||||||
}
|
}
|
||||||
|
|
||||||
cancelRequest();
|
cancelRequest();
|
||||||
|
//qDebug() << "showItemInfo" << m_fileItem;
|
||||||
|
|
||||||
if (m_fileItem.isNull() && (m_selection.count() > 1)) {
|
if (m_hoveredItem.isNull() && (m_selection.count() > 1)) {
|
||||||
// The information for a selection of items should be shown
|
// The information for a selection of items should be shown
|
||||||
m_content->showItems(m_selection);
|
m_content->showItems(m_selection);
|
||||||
} else {
|
} else {
|
||||||
// The information for exactly one item should be shown
|
// The information for exactly one item should be shown
|
||||||
KFileItem item;
|
KFileItem item;
|
||||||
if (!m_fileItem.isNull()) {
|
if (!m_hoveredItem.isNull()) {
|
||||||
item = m_fileItem;
|
item = m_hoveredItem;
|
||||||
} else if (!m_selection.isEmpty()) {
|
} else if (!m_selection.isEmpty()) {
|
||||||
Q_ASSERT(m_selection.count() == 1);
|
Q_ASSERT(m_selection.count() == 1);
|
||||||
item = m_selection.first();
|
item = m_selection.first();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.isNull()) {
|
if (!item.isNull()) {
|
||||||
// No item is hovered and no selection has been done: provide
|
|
||||||
// an item for the currently shown directory.
|
|
||||||
m_shownUrl = url();
|
|
||||||
m_folderStatJob = KIO::statDetails(url(), KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo);
|
|
||||||
if (m_folderStatJob->uiDelegate()) {
|
|
||||||
KJobWidgets::setWindow(m_folderStatJob, this);
|
|
||||||
}
|
|
||||||
connect(m_folderStatJob, &KIO::Job::result,
|
|
||||||
this, &InformationPanel::slotFolderStatFinished);
|
|
||||||
} else {
|
|
||||||
m_shownUrl = item.url();
|
m_shownUrl = item.url();
|
||||||
m_content->showItem(item);
|
m_content->showItem(item);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No item is hovered and no selection has been done: provide
|
||||||
|
// an item for the currently shown directory.
|
||||||
|
m_shownUrl = url();
|
||||||
|
m_folderStatJob = KIO::statDetails(m_shownUrl, KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo);
|
||||||
|
if (m_folderStatJob->uiDelegate()) {
|
||||||
|
KJobWidgets::setWindow(m_folderStatJob, this);
|
||||||
|
}
|
||||||
|
connect(m_folderStatJob, &KIO::Job::result,
|
||||||
|
this, &InformationPanel::slotFolderStatFinished);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -273,23 +267,24 @@ void InformationPanel::reset()
|
||||||
// the content to show the directory URL.
|
// the content to show the directory URL.
|
||||||
m_selection.clear();
|
m_selection.clear();
|
||||||
m_shownUrl = url();
|
m_shownUrl = url();
|
||||||
m_fileItem = KFileItem();
|
|
||||||
showItemInfo();
|
showItemInfo();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InformationPanel::slotFileRenamed(const QString& source, const QString& dest)
|
void InformationPanel::slotFileRenamed(const QString& source, const QString& dest)
|
||||||
{
|
{
|
||||||
if (m_shownUrl == QUrl::fromUserInput(source)) {
|
auto sourceUrl = QUrl::fromUserInput(source);
|
||||||
m_shownUrl = QUrl::fromUserInput(dest);
|
if (m_shownUrl == sourceUrl) {
|
||||||
m_fileItem = KFileItem(m_shownUrl);
|
auto destUrl = QUrl::fromUserInput(dest);
|
||||||
|
|
||||||
if ((m_selection.count() == 1) && (m_selection[0].url() == QUrl::fromLocalFile(source))) {
|
if ((m_selection.count() == 1) && (m_selection[0].url() == sourceUrl)) {
|
||||||
m_selection[0] = m_fileItem;
|
m_selection[0] = KFileItem(destUrl);
|
||||||
// Implementation note: Updating the selection is only required if exactly one
|
// Implementation note: Updating the selection is only required if exactly one
|
||||||
// item is selected, as the name of the item is shown. If this should change
|
// item is selected, as the name of the item is shown. If this should change
|
||||||
// in future: Before parsing the whole selection take care to test possible
|
// in future: Before parsing the whole selection take care to test possible
|
||||||
// performance bottlenecks when renaming several hundreds of files.
|
// performance bottlenecks when renaming several hundreds of files.
|
||||||
|
} else {
|
||||||
|
m_hoveredItem = KFileItem(destUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
showItemInfo();
|
showItemInfo();
|
||||||
|
@ -301,8 +296,7 @@ void InformationPanel::slotFilesAdded(const QString& directory)
|
||||||
if (m_shownUrl == QUrl::fromUserInput(directory)) {
|
if (m_shownUrl == QUrl::fromUserInput(directory)) {
|
||||||
// If the 'trash' icon changes because the trash has been emptied or got filled,
|
// If the 'trash' icon changes because the trash has been emptied or got filled,
|
||||||
// the signal filesAdded("trash:/") will be emitted.
|
// the signal filesAdded("trash:/") will be emitted.
|
||||||
KFileItem item(QUrl::fromUserInput(directory));
|
requestDelayedItemInfo(KFileItem());
|
||||||
requestDelayedItemInfo(item);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,7 +304,6 @@ void InformationPanel::slotFilesItemChanged(const KFileItemList &changedFileItem
|
||||||
{
|
{
|
||||||
const auto item = changedFileItems.findByUrl(m_shownUrl);
|
const auto item = changedFileItems.findByUrl(m_shownUrl);
|
||||||
if (!item.isNull()) {
|
if (!item.isNull()) {
|
||||||
m_fileItem = item;
|
|
||||||
showItemInfo();
|
showItemInfo();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -339,10 +332,7 @@ void InformationPanel::slotFilesRemoved(const QStringList& files)
|
||||||
|
|
||||||
void InformationPanel::slotEnteredDirectory(const QString& directory)
|
void InformationPanel::slotEnteredDirectory(const QString& directory)
|
||||||
{
|
{
|
||||||
if (m_shownUrl == QUrl::fromUserInput(directory)) {
|
Q_UNUSED(directory)
|
||||||
KFileItem item(QUrl::fromUserInput(directory));
|
|
||||||
requestDelayedItemInfo(item);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void InformationPanel::slotLeftDirectory(const QString& directory)
|
void InformationPanel::slotLeftDirectory(const QString& directory)
|
||||||
|
|
|
@ -138,7 +138,7 @@ private:
|
||||||
// a directory has been changed.
|
// a directory has been changed.
|
||||||
QUrl m_invalidUrlCandidate;
|
QUrl m_invalidUrlCandidate;
|
||||||
|
|
||||||
KFileItem m_fileItem; // file item for m_shownUrl if available (otherwise null)
|
KFileItem m_hoveredItem;
|
||||||
KFileItemList m_selection;
|
KFileItemList m_selection;
|
||||||
|
|
||||||
KIO::Job* m_folderStatJob;
|
KIO::Job* m_folderStatJob;
|
||||||
|
|
Loading…
Reference in a new issue