mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Show "Loading canceled" placeholder when loading was canceled
Rather than "Folder empty", which is misleading as we didn't actually load anything.
This commit is contained in:
parent
5ebc6b865d
commit
74ae8478ac
|
@ -70,7 +70,6 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
|
||||||
m_assureVisibleCurrentIndex(false),
|
m_assureVisibleCurrentIndex(false),
|
||||||
m_isFolderWritable(true),
|
m_isFolderWritable(true),
|
||||||
m_dragging(false),
|
m_dragging(false),
|
||||||
m_loading(false),
|
|
||||||
m_url(url),
|
m_url(url),
|
||||||
m_viewPropertiesContext(),
|
m_viewPropertiesContext(),
|
||||||
m_mode(DolphinView::IconsView),
|
m_mode(DolphinView::IconsView),
|
||||||
|
@ -1728,7 +1727,7 @@ void DolphinView::slotRenamingResult(KJob* job)
|
||||||
|
|
||||||
void DolphinView::slotDirectoryLoadingStarted()
|
void DolphinView::slotDirectoryLoadingStarted()
|
||||||
{
|
{
|
||||||
m_loading = true;
|
m_loadingState = LoadingState::Loading;
|
||||||
updatePlaceholderLabel();
|
updatePlaceholderLabel();
|
||||||
|
|
||||||
// Disable the writestate temporary until it can be determined in a fast way
|
// Disable the writestate temporary until it can be determined in a fast way
|
||||||
|
@ -1743,7 +1742,7 @@ void DolphinView::slotDirectoryLoadingStarted()
|
||||||
|
|
||||||
void DolphinView::slotDirectoryLoadingCompleted()
|
void DolphinView::slotDirectoryLoadingCompleted()
|
||||||
{
|
{
|
||||||
m_loading = false;
|
m_loadingState = LoadingState::Completed;
|
||||||
|
|
||||||
// Update the view-state. This has to be done asynchronously
|
// Update the view-state. This has to be done asynchronously
|
||||||
// because the view might not be in its final state yet.
|
// because the view might not be in its final state yet.
|
||||||
|
@ -1760,7 +1759,7 @@ void DolphinView::slotDirectoryLoadingCompleted()
|
||||||
|
|
||||||
void DolphinView::slotDirectoryLoadingCanceled()
|
void DolphinView::slotDirectoryLoadingCanceled()
|
||||||
{
|
{
|
||||||
m_loading = false;
|
m_loadingState = LoadingState::Canceled;
|
||||||
|
|
||||||
updatePlaceholderLabel();
|
updatePlaceholderLabel();
|
||||||
|
|
||||||
|
@ -2159,13 +2158,15 @@ void DolphinView::updatePlaceholderLabel()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_loading) {
|
if (m_loadingState == LoadingState::Loading) {
|
||||||
m_placeholderLabel->setVisible(false);
|
m_placeholderLabel->setVisible(false);
|
||||||
m_showLoadingPlaceholderTimer->start();
|
m_showLoadingPlaceholderTimer->start();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!nameFilter().isEmpty()) {
|
if (m_loadingState == LoadingState::Canceled) {
|
||||||
|
m_placeholderLabel->setText(i18n("Loading canceled"));
|
||||||
|
} else if (!nameFilter().isEmpty()) {
|
||||||
m_placeholderLabel->setText(i18n("No items matching the filter"));
|
m_placeholderLabel->setText(i18n("No items matching the filter"));
|
||||||
} else if (m_url.scheme() == QLatin1String("baloosearch") || m_url.scheme() == QLatin1String("filenamesearch")) {
|
} else if (m_url.scheme() == QLatin1String("baloosearch") || m_url.scheme() == QLatin1String("filenamesearch")) {
|
||||||
m_placeholderLabel->setText(i18n("No items matching the search"));
|
m_placeholderLabel->setText(i18n("No items matching the search"));
|
||||||
|
|
|
@ -875,7 +875,14 @@ private:
|
||||||
bool m_isFolderWritable;
|
bool m_isFolderWritable;
|
||||||
bool m_dragging; // True if a dragging is done. Required to be able to decide whether a
|
bool m_dragging; // True if a dragging is done. Required to be able to decide whether a
|
||||||
// tooltip may be shown when hovering an item.
|
// tooltip may be shown when hovering an item.
|
||||||
bool m_loading;
|
|
||||||
|
enum class LoadingState {
|
||||||
|
Idle,
|
||||||
|
Loading,
|
||||||
|
Canceled,
|
||||||
|
Completed
|
||||||
|
};
|
||||||
|
LoadingState m_loadingState = LoadingState::Idle;
|
||||||
|
|
||||||
QUrl m_url;
|
QUrl m_url;
|
||||||
QString m_viewPropertiesContext;
|
QString m_viewPropertiesContext;
|
||||||
|
|
Loading…
Reference in a new issue