From 98880e443048e327c83bd6d0c5d0d8aab2cb8fbb Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 2 Nov 2014 15:34:30 +0100 Subject: [PATCH] Update status of paste action once directory has finished loading. Since 6a6cf1ab328e7600f0c2b375e43a1e3bd236a5a7, it depends on rootItem() which is not available until the dirlister emits it. --- src/dolphinmainwindow.cpp | 7 +++++++ src/dolphinmainwindow.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 49c234606d..c9b5594397 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -497,6 +497,11 @@ void DolphinMainWindow::updatePasteAction() pasteAction->setText(pasteInfo.second); } +void DolphinMainWindow::slotDirectoryLoadingCompleted() +{ + updatePasteAction(); +} + void DolphinMainWindow::selectAll() { clearStatusBar(); @@ -1427,6 +1432,8 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) this, &DolphinMainWindow::enableStopAction); connect(view, &DolphinView::directoryLoadingCompleted, this, &DolphinMainWindow::disableStopAction); + connect(view, &DolphinView::directoryLoadingCompleted, + this, &DolphinMainWindow::slotDirectoryLoadingCompleted); connect(view, &DolphinView::goBackRequested, this, static_cast(&DolphinMainWindow::goBack)); connect(view, &DolphinView::goForwardRequested, diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 36a16e518d..12933f9ce4 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -432,6 +432,11 @@ private slots: */ void setUrlAsCaption(const QUrl& url); + /** + * Is called when the view has finished loading the directory. + */ + void slotDirectoryLoadingCompleted(); + private: void setupActions(); void setupDockWidgets();