diff options
| author | Nicolas Fella <[email protected]> | 2023-07-05 22:44:40 +0200 |
|---|---|---|
| committer | Nicolas Fella <[email protected]> | 2023-07-05 22:44:40 +0200 |
| commit | f510339f033658eae27f8400bf042b78b36f82f2 (patch) | |
| tree | f5ada1ed265b86f6ae44b71218099ec383dd15de /src/dolphinviewcontainer.cpp | |
| parent | cd2e64154fd5446a7e19aff4cb147efe2f2ba31e (diff) | |
| parent | ed2d352c42a6d517d4f29b3582c0e00aa34fe647 (diff) | |
Merge branch 'master' into kf6
Diffstat (limited to 'src/dolphinviewcontainer.cpp')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 12108b729..1199da6c5 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -32,6 +32,7 @@ #include <KProtocolManager> #include <KShell> +#include <QApplication> #include <QDesktopServices> #include <QDropEvent> #include <QGridLayout> @@ -338,6 +339,9 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti } Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once. Q_CHECK_PTR(m_selectionModeBottomBar); + if (m_selectionModeTopBar->isAncestorOf(QApplication::focusWidget()) || m_selectionModeBottomBar->isAncestorOf(QApplication::focusWidget())) { + m_view->setFocus(); + } m_selectionModeTopBar->setVisible(false, WithAnimation); m_selectionModeBottomBar->setVisible(false, WithAnimation); Q_EMIT selectionModeChanged(false); @@ -625,7 +629,7 @@ void DolphinViewContainer::updateStatusBar() void DolphinViewContainer::updateDirectoryLoadingProgress(int percent) { if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder...")); + m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder…")); } m_statusBar->setProgress(percent); } @@ -633,7 +637,7 @@ void DolphinViewContainer::updateDirectoryLoadingProgress(int percent) void DolphinViewContainer::updateDirectorySortingProgress(int percent) { if (m_statusBar->progressText().isEmpty()) { - m_statusBar->setProgressText(i18nc("@info:progress", "Sorting...")); + m_statusBar->setProgressText(i18nc("@info:progress", "Sorting…")); } m_statusBar->setProgress(percent); } @@ -644,7 +648,7 @@ void DolphinViewContainer::slotDirectoryLoadingStarted() // Search KIO-slaves usually don't provide any progress information. Give // a hint to the user that a searching is done: updateStatusBar(); - m_statusBar->setProgressText(i18nc("@info", "Searching...")); + m_statusBar->setProgressText(i18nc("@info", "Searching…")); m_statusBar->setProgress(-1); } else { // Trigger an undetermined progress indication. The progress @@ -946,3 +950,5 @@ QString DolphinViewContainer::getNearestExistingAncestorOfPath(const QString &pa return dir.exists() ? dir.path() : QString{}; } + +#include "moc_dolphinviewcontainer.cpp" |