X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/540eeb0030470d50a61e192d9348043ffd10f056..abb6807645598e8117e98bbf232cd9cd90fe019a:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 95b16448a..ae6953aad 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -39,16 +39,17 @@ #include #include #include -#include +#include #include +#include #include #include +#include #include #include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" -#include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" #include "dolphinsortfilterproxymodel.h" @@ -57,7 +58,7 @@ #include "dolphincontextmenu.h" #include "draganddrophelper.h" #include "filterbar.h" -#include "kurlnavigator.h" +#include "statusbar/dolphinstatusbar.h" #include "viewproperties.h" #include "settings/dolphinsettings.h" #include "dolphin_generalsettings.h" @@ -74,6 +75,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_view(0), m_filterBar(0), m_statusBar(0), + m_statusBarTimer(0), m_dirLister(0), m_proxyModel(0) { @@ -112,11 +114,11 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); connect(m_dirLister, SIGNAL(clear()), - this, SLOT(updateStatusBar())); + this, SLOT(delayedStatusBarUpdate())); connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); - connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)), - this, SLOT(updateStatusBar())); + connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), + this, SLOT(delayedStatusBarUpdate())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), @@ -126,11 +128,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), this, SLOT(openFile(const KUrl&))); - m_view = new DolphinView(this, - url, - m_dirLister, - m_dolphinModel, - m_proxyModel); + m_view = new DolphinView(this, url, m_proxyModel); connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), @@ -151,11 +149,20 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, this, SLOT(saveRootUrl(const KUrl&))); connect(m_view, SIGNAL(redirection(KUrl, KUrl)), this, SLOT(redirect(KUrl, KUrl))); + connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)), + this, SLOT(delayedStatusBarUpdate())); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(restoreView(const KUrl&))); + connect(m_urlNavigator, SIGNAL(historyChanged()), + this, SLOT(slotHistoryChanged())); m_statusBar = new DolphinStatusBar(this, m_view); + m_statusBarTimer = new QTimer(this); + m_statusBarTimer->setSingleShot(true); + m_statusBarTimer->setInterval(300); + connect(m_statusBarTimer, SIGNAL(timeout()), + this, SLOT(updateStatusBar())); m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); @@ -185,8 +192,8 @@ DolphinViewContainer::~DolphinViewContainer() void DolphinViewContainer::setUrl(const KUrl& newUrl) { - m_urlNavigator->setUrl(newUrl); if (newUrl != m_urlNavigator->url()) { + m_urlNavigator->setUrl(newUrl); // Temporary disable the 'File'->'Create New...' menu until // the write permissions can be checked in a fast way at // DolphinViewContainer::slotDirListerCompleted(). @@ -243,6 +250,37 @@ bool DolphinViewContainer::isUrlEditable() const return m_urlNavigator->isUrlEditable(); } +void DolphinViewContainer::delayedStatusBarUpdate() +{ + // Invoke updateStatusBar() with a small delay. This assures that + // when a lot of delayedStatusBarUpdates() are done in a short time, + // no bottleneck is given. + m_statusBarTimer->start(); +} + +void DolphinViewContainer::updateStatusBar() +{ + // As the item count information is less important + // in comparison with other messages, it should only + // be shown if: + // - the status bar is empty or + // - shows already the item count information or + // - shows only a not very important information + // - if any progress is given don't show the item count info at all + const QString msg(m_statusBar->message()); + const bool updateStatusBarMsg = (msg.isEmpty() + || (msg == m_statusBar->defaultText()) + || (m_statusBar->type() == DolphinStatusBar::Information)) + && (m_statusBar->progress() == 100); + + const QString text(m_view->statusBarText()); + m_statusBar->setDefaultText(text); + + if (updateStatusBarMsg) { + m_statusBar->setMessage(text, DolphinStatusBar::Default); + } +} + void DolphinViewContainer::updateProgress(int percent) { if (!m_showProgress) { @@ -281,7 +319,7 @@ void DolphinViewContainer::slotDirListerCompleted() // it is unclear whether writing is supported m_isFolderWritable = true; } else { - KonqFileItemCapabilities capabilities(KFileItemList() << item); + KFileItemListProperties capabilities(KFileItemList() << item); m_isFolderWritable = capabilities.supportsWriting(); } @@ -293,7 +331,13 @@ void DolphinViewContainer::slotDirListerCompleted() void DolphinViewContainer::showItemInfo(const KFileItem& item) { if (item.isNull()) { - m_statusBar->clear(); + // Only clear the status bar if unimportant messages are shown. + // This prevents that information- or error-messages get hidden + // by moving the mouse above the viewport or when closing the + // context menu. + if (m_statusBar->type() == DolphinStatusBar::Default) { + m_statusBar->clear(); + } } else { m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default); } @@ -322,33 +366,10 @@ void DolphinViewContainer::closeFilterBar() emit showFilterBarChanged(false); } -void DolphinViewContainer::updateStatusBar() -{ - // As the item count information is less important - // in comparison with other messages, it should only - // be shown if: - // - the status bar is empty or - // - shows already the item count information or - // - shows only a not very important information - // - if any progress is given don't show the item count info at all - const QString msg(m_statusBar->message()); - const bool updateStatusBarMsg = (msg.isEmpty() || - (msg == m_statusBar->defaultText()) || - (m_statusBar->type() == DolphinStatusBar::Information)) && - (m_statusBar->progress() == 100); - - const QString text(m_view->statusBarText()); - m_statusBar->setDefaultText(text); - - if (updateStatusBarMsg) { - m_statusBar->setMessage(text, DolphinStatusBar::Default); - } -} - void DolphinViewContainer::setNameFilter(const QString& nameFilter) { m_view->setNameFilter(nameFilter); - updateStatusBar(); + delayedStatusBarUpdate(); } void DolphinViewContainer::openContextMenu(const KFileItem& item, @@ -401,12 +422,18 @@ void DolphinViewContainer::restoreView(const KUrl& url) const QString browser = config.readEntry("BrowserApplication"); if (!browser.isEmpty()) { app = browser; + if (app.startsWith('!')) { + // a literal command has been configured, remove the '!' prefix + app = app.mid(1); + } } } else { showErrorMessage(i18nc("@info:status", "Protocol not supported by Dolphin, Konqueror has been launched")); } - const QString command = app + ' ' + url.pathOrUrl(); + + QString secureUrl = KShell::quoteArg(url.pathOrUrl()); + const QString command = app + ' ' + secureUrl; KRun::runCommand(command, app, app, this); } else { showErrorMessage(i18nc("@info:status", "Invalid protocol")); @@ -445,6 +472,17 @@ void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion com settings.save(); } +void DolphinViewContainer::slotHistoryChanged() +{ + const int index = m_urlNavigator->historyIndex(); + if (index > 0) { + // The "Go Forward" action is enabled. Try to mark + // the previous directory as active item: + const KUrl url = m_urlNavigator->historyUrl(index - 1); + m_view->activateItem(url); + } +} + void DolphinViewContainer::slotItemTriggered(const KFileItem& item) { KUrl url = item.targetUrl();