From c456c5d528f470ce782a90646eae52951c0f31b9 Mon Sep 17 00:00:00 2001 From: Anthony Fieroni Date: Sun, 1 Jan 2017 21:47:10 +0200 Subject: [DolphinSearchBox] Stop search timer on hide REVIEW: 129705 Signed-off-by: Anthony Fieroni --- src/search/dolphinsearchbox.cpp | 7 +++++++ src/search/dolphinsearchbox.h | 1 + 2 files changed, 8 insertions(+) (limited to 'src') diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 26ddd27f8..60a4a7567 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -206,6 +206,13 @@ void DolphinSearchBox::showEvent(QShowEvent* event) } } +void DolphinSearchBox::hideEvent(QHideEvent* event) +{ + Q_UNUSED(event); + m_startedSearching = false; + m_startSearchTimer->stop(); +} + void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event) { QWidget::keyReleaseEvent(event); diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index a80617476..b747679ec 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -100,6 +100,7 @@ public: protected: virtual bool event(QEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; -- cgit v1.3 From 24ed38d77f4bc6db71ba2608452fa0cd401bddac Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Mon, 2 Jan 2017 14:52:37 +0100 Subject: Properly disable create_dir action in Trash `isFolderWritable` is set in DolphinView::updateWritableState() according to KFileItemListProperties::supportsWriting(). However, `writing=true` does not imply `makedir=true`, in an ioslave's .protocol file. An example is the trash protocol. So we need to enable the `create_dir` action only if the protocol is actually able to create folders. CCBUG: 332463 REVIEW: 129712 --- src/views/dolphinviewactionhandler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 858f9299b..5c0b49cd2 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include "dolphindebug.h" @@ -486,7 +487,8 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) { - m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable); + m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable && + KProtocolManager::supportsMakeDir(currentView()->url())); } KToggleAction* DolphinViewActionHandler::iconsModeAction() -- cgit v1.3