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

Merge branch 'Applications/16.12'

Browse source
This commit is contained in:
Elvis Angelaccio 2017-01-02 14:57:57 +01:00
parent 6af0dad2ee 24ed38d77f
commit 331c8bc89e
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/search/dolphinsearchbox.cpp
View file

@ -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) void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
{ {
QWidget::keyReleaseEvent(event); QWidget::keyReleaseEvent(event);

1
src/search/dolphinsearchbox.h
View file

@ -100,6 +100,7 @@ public:
protected: protected:
virtual bool event(QEvent* event) Q_DECL_OVERRIDE; virtual bool event(QEvent* event) Q_DECL_OVERRIDE;
virtual void showEvent(QShowEvent* 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 void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE;

4
src/views/dolphinviewactionhandler.cpp
View file

@ -37,6 +37,7 @@
#include <KSelectAction> #include <KSelectAction>
#include <KToggleAction> #include <KToggleAction>
#include <KPropertiesDialog> #include <KPropertiesDialog>
#include <KProtocolManager>
#include <QIcon> #include <QIcon>
#include "dolphindebug.h" #include "dolphindebug.h"
@ -486,7 +487,8 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) 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() KToggleAction* DolphinViewActionHandler::iconsModeAction()