X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3a053415f9d7f8ae635e660f2a1537617feeff40..7c539fd12f5decbfafbea5fa4c317e7c4d753691:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 8eab3efac..d8f90f357 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -18,6 +18,7 @@ ***************************************************************************/ #include "dolphinviewcontainer.h" +#include #include #include @@ -27,20 +28,25 @@ #include #include -#include #include #include #include #include #include #include -#include #include +#include #include +#include #include +#include #include +#include #include +#include +#include +#include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" #include "dolphinstatusbar.h" @@ -50,109 +56,118 @@ #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" -#include "dolphinitemcategorizer.h" +#include "draganddrophelper.h" #include "filterbar.h" -#include "renamedialog.h" #include "kurlnavigator.h" #include "viewproperties.h" -#include "dolphinsettings.h" +#include "settings/dolphinsettings.h" #include "dolphin_generalsettings.h" DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, QWidget* parent, - const KUrl& url, - DolphinView::Mode mode, - bool showHiddenFiles) : + const KUrl& url) : QWidget(parent), m_showProgress(false), - m_folderCount(0), - m_fileCount(0), + m_isFolderWritable(false), m_mainWindow(mainWindow), m_topLayout(0), m_urlNavigator(0), m_view(0), m_filterBar(0), m_statusBar(0), - m_dirModel(0), m_dirLister(0), m_proxyModel(0) { hide(); - setFocusPolicy(Qt::StrongFocus); + m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - connect(m_mainWindow, SIGNAL(activeViewChanged()), - this, SLOT(updateActivationState())); - - QClipboard* clipboard = QApplication::clipboard(); - connect(clipboard, SIGNAL(dataChanged()), - this, SLOT(updateCutItems())); - m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this); + connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl&, QDropEvent*)), + this, SLOT(dropUrls(const KUrl&, QDropEvent*))); + connect(m_urlNavigator, SIGNAL(activated()), + this, SLOT(activate())); + connect(m_urlNavigator->editor(), SIGNAL(completionModeChanged(KGlobalSettings::Completion)), + this, SLOT(saveUrlCompletionMode(KGlobalSettings::Completion))); const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); m_urlNavigator->setHomeUrl(settings->homeUrl()); + KUrlComboBox* editor = m_urlNavigator->editor(); + editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode())); m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(this); - m_dirLister->setShowingDotFiles(showHiddenFiles); + m_dirLister->setMainWindow(window()); m_dirLister->setDelayedMimeTypes(true); - m_dirModel = new KDirModel(); - m_dirModel->setDirLister(m_dirLister); - m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); + m_dolphinModel = new DolphinModel(this); + m_dolphinModel->setDirLister(m_dirLister); + m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); m_proxyModel = new DolphinSortFilterProxyModel(this); - m_proxyModel->setSourceModel(m_dirModel); + m_proxyModel->setSourceModel(m_dolphinModel); + m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); connect(m_dirLister, SIGNAL(clear()), this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int))); - connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)), + connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)), this, SLOT(updateStatusBar())); connect(m_dirLister, SIGNAL(completed()), - this, SLOT(updateItemCount())); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(updateCutItems())); - connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), - this, SLOT(generatePreviews(const KFileItemList&))); + this, SLOT(slotDirListerCompleted())); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); connect(m_dirLister, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); + connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)), + this, SLOT(openFile(const KUrl&))); m_view = new DolphinView(this, url, m_dirLister, - m_dirModel, - m_proxyModel, - mode, - showHiddenFiles); + m_dolphinModel, + m_proxyModel); connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); - connect(m_view, SIGNAL(requestContextMenu(KFileItem*, const KUrl&)), - this, SLOT(openContextMenu(KFileItem*, const KUrl&))); - connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), - m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); - connect(m_view, SIGNAL(requestItemInfo(const KUrl&)), - this, SLOT(showItemInfo(const KUrl&))); + connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), + this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList&))); + connect(m_view, SIGNAL(contentsMoved(int, int)), + this, SLOT(saveContentsPos(int, int))); + connect(m_view, SIGNAL(requestItemInfo(KFileItem)), + this, SLOT(showItemInfo(KFileItem))); + connect(m_view, SIGNAL(errorMessage(const QString&)), + this, SLOT(showErrorMessage(const QString&))); + connect(m_view, SIGNAL(infoMessage(const QString&)), + this, SLOT(showInfoMessage(const QString&))); + connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), + this, SLOT(showOperationCompletedMessage(const QString&))); + connect(m_view, SIGNAL(itemTriggered(KFileItem)), + this, SLOT(slotItemTriggered(KFileItem))); + connect(m_view, SIGNAL(startedPathLoading(const KUrl&)), + this, SLOT(saveRootUrl(const KUrl&))); + connect(m_view, SIGNAL(redirection(KUrl, KUrl)), + this, SLOT(redirect(KUrl, KUrl))); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - m_view, SLOT(setUrl(const KUrl&))); + this, SLOT(restoreView(const KUrl&))); + connect(m_urlNavigator, SIGNAL(historyChanged()), + this, SLOT(slotHistoryChanged())); - m_statusBar = new DolphinStatusBar(this, url); + m_statusBar = new DolphinStatusBar(this, m_view); m_filterBar = new FilterBar(this); m_filterBar->setVisible(settings->filterBar()); connect(m_filterBar, SIGNAL(filterChanged(const QString&)), - this, SLOT(changeNameFilter(const QString&))); + this, SLOT(setNameFilter(const QString&))); connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); + connect(m_view, SIGNAL(urlChanged(const KUrl&)), + m_filterBar, SLOT(clear())); m_topLayout->addWidget(m_urlNavigator); m_topLayout->addWidget(m_view); @@ -162,13 +177,27 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, DolphinViewContainer::~DolphinViewContainer() { - delete m_dirLister; - m_dirLister = 0; + m_dirLister->disconnect(); + + delete m_proxyModel; + m_proxyModel = 0; + delete m_dolphinModel; + m_dolphinModel = 0; + m_dirLister = 0; // deleted by m_dolphinModel } -void DolphinViewContainer::setUrl(const KUrl& url) +void DolphinViewContainer::setUrl(const KUrl& newUrl) { - m_urlNavigator->setUrl(url); + 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(). + m_isFolderWritable = false; + if (isActive()) { + m_mainWindow->newMenu()->menu()->setEnabled(false); + } + } } const KUrl& DolphinViewContainer::url() const @@ -180,6 +209,9 @@ void DolphinViewContainer::setActive(bool active) { m_urlNavigator->setActive(active); m_view->setActive(active); + if (active) { + m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + } } bool DolphinViewContainer::isActive() const @@ -188,79 +220,10 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } -void DolphinViewContainer::renameSelectedItems() -{ - DolphinViewContainer* view = m_mainWindow->activeViewContainer(); - const KUrl::List urls = m_view->selectedUrls(); - if (urls.count() > 1) { - // More than one item has been selected for renaming. Open - // a rename dialog and rename all items afterwards. - RenameDialog dialog(urls); - if (dialog.exec() == QDialog::Rejected) { - return; - } - - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - // TODO: check how this can be integrated into KonqUndoManager/KonqOperations - // as one operation instead of n rename operations like it is done now... - Q_ASSERT(newName.contains('#')); - - // iterate through all selected items and rename them... - const int replaceIndex = newName.indexOf('#'); - Q_ASSERT(replaceIndex >= 0); - int index = 1; - - KUrl::List::const_iterator it = urls.begin(); - KUrl::List::const_iterator end = urls.end(); - while (it != end) { - const KUrl& oldUrl = *it; - QString number; - number.setNum(index++); - - QString name(newName); - name.replace(replaceIndex, 1, number); - - if (oldUrl.fileName() != name) { - KUrl newUrl = oldUrl; - newUrl.setFileName(name); - m_mainWindow->rename(oldUrl, newUrl); - } - ++it; - } - } - } else { - // Only one item has been selected for renaming. Use the custom - // renaming mechanism from the views. - Q_ASSERT(urls.count() == 1); - - // TODO: Think about using KFileItemDelegate as soon as it supports editing. - // Currently the RenameDialog is used, but I'm not sure whether inline renaming - // is a benefit for the user at all -> let's wait for some input first... - RenameDialog dialog(urls); - if (dialog.exec() == QDialog::Rejected) { - return; - } - - const QString& newName = dialog.newName(); - if (newName.isEmpty()) { - view->statusBar()->setMessage(dialog.errorString(), - DolphinStatusBar::Error); - } else { - const KUrl& oldUrl = urls.first(); - KUrl newUrl = oldUrl; - newUrl.setFileName(newName); - m_mainWindow->rename(oldUrl, newUrl); - } - } -} - -DolphinStatusBar* DolphinViewContainer::statusBar() const +void DolphinViewContainer::refresh() { - return m_statusBar; + m_view->refresh(); + m_statusBar->refresh(); } bool DolphinViewContainer::isFilterBarVisible() const @@ -268,20 +231,19 @@ bool DolphinViewContainer::isFilterBarVisible() const return m_filterBar->isVisible(); } -bool DolphinViewContainer::isUrlEditable() const -{ - return m_urlNavigator->isUrlEditable(); -} - -KFileItem* DolphinViewContainer::fileItem(const QModelIndex index) const +void DolphinViewContainer::showFilterBar(bool show) { - const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); - return m_dirModel->itemForIndex(dirModelIndex); + Q_ASSERT(m_filterBar != 0); + if (show) { + m_filterBar->show(); + } else { + closeFilterBar(); + } } -DolphinMainWindow* DolphinViewContainer::mainWindow() const +bool DolphinViewContainer::isUrlEditable() const { - return m_mainWindow; + return m_urlNavigator->isUrlEditable(); } void DolphinViewContainer::updateProgress(int percent) @@ -291,10 +253,10 @@ void DolphinViewContainer::updateProgress(int percent) // not contain another progress information. This means that // the directory loading progress information has the lowest priority. const QString progressText(m_statusBar->progressText()); - m_showProgress = progressText.isEmpty() || - (progressText == i18n("Loading folder...")); + const QString loadingText(i18nc("@info:progress", "Loading folder...")); + m_showProgress = progressText.isEmpty() || (progressText == loadingText); if (m_showProgress) { - m_statusBar->setProgressText(i18n("Loading folder...")); + m_statusBar->setProgressText(loadingText); m_statusBar->setProgress(0); } } @@ -304,7 +266,7 @@ void DolphinViewContainer::updateProgress(int percent) } } -void DolphinViewContainer::updateItemCount() +void DolphinViewContainer::slotDirListerCompleted() { if (m_showProgress) { m_statusBar->setProgressText(QString()); @@ -312,39 +274,31 @@ void DolphinViewContainer::updateItemCount() m_showProgress = false; } - KFileItemList items(m_dirLister->items()); - KFileItemList::const_iterator it = items.begin(); - const KFileItemList::const_iterator end = items.end(); - - m_fileCount = 0; - m_folderCount = 0; - - while (it != end) { - KFileItem* item = *it; - if (item->isDir()) { - ++m_folderCount; - } else { - ++m_fileCount; - } - ++it; - } - updateStatusBar(); + QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection); + + // Enable the 'File'->'Create New...' menu only if the directory + // supports writing. + KFileItem item = m_dirLister->rootItem(); + if (item.isNull()) { + // it is unclear whether writing is supported + m_isFolderWritable = true; + } else { + KFileItemListProperties capabilities(KFileItemList() << item); + m_isFolderWritable = capabilities.supportsWriting(); + } - QTimer::singleShot(0, this, SLOT(restoreContentsPos())); + if (isActive()) { + m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable); + } } -void DolphinViewContainer::showItemInfo(const KUrl& url) +void DolphinViewContainer::showItemInfo(const KFileItem& item) { - if (url.isEmpty()) { + if (item.isNull()) { m_statusBar->clear(); - return; - } - - const QModelIndex index = m_dirModel->indexForUrl(url); - const KFileItem* item = m_dirModel->itemForIndex(index); - if (item != 0) { - m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default); + } else { + m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default); } } @@ -358,65 +312,17 @@ void DolphinViewContainer::showErrorMessage(const QString& msg) m_statusBar->setMessage(msg, DolphinStatusBar::Error); } -void DolphinViewContainer::closeFilterBar() +void DolphinViewContainer::showOperationCompletedMessage(const QString& msg) { - m_filterBar->hide(); - emit showFilterBarChanged(false); -} - -QString DolphinViewContainer::defaultStatusBarText() const -{ - return KIO::itemsSummaryString(m_fileCount + m_folderCount, - m_fileCount, - m_folderCount, - 0, false); -} - -QString DolphinViewContainer::selectionStatusBarText() const -{ - QString text; - const KFileItemList list = m_view->selectedItems(); - if (list.isEmpty()) { - // when an item is triggered, it is temporary selected but selectedItems() - // will return an empty list - return QString(); - } - - int fileCount = 0; - int folderCount = 0; - KIO::filesize_t byteSize = 0; - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - KFileItem* item = *it; - if (item->isDir()) { - ++folderCount; - } else { - ++fileCount; - byteSize += item->size(); - } - ++it; - } - - if (folderCount > 0) { - text = i18np("1 Folder selected", "%1 Folders selected", folderCount); - if (fileCount > 0) { - text += ", "; - } - } - - if (fileCount > 0) { - const QString sizeText(KIO::convertSize(byteSize)); - text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); - } - - return text; + m_statusBar->setMessage(msg, DolphinStatusBar::OperationCompleted); } -void DolphinViewContainer::showFilterBar(bool show) +void DolphinViewContainer::closeFilterBar() { - Q_ASSERT(m_filterBar != 0); - m_filterBar->setVisible(show); + m_filterBar->hide(); + m_filterBar->clear(); + m_view->setFocus(); + emit showFilterBarChanged(false); } void DolphinViewContainer::updateStatusBar() @@ -434,7 +340,7 @@ void DolphinViewContainer::updateStatusBar() (m_statusBar->type() == DolphinStatusBar::Information)) && (m_statusBar->progress() == 100); - const QString text(m_view->hasSelection() ? selectionStatusBarText() : defaultStatusBarText()); + const QString text(m_view->statusBarText()); m_statusBar->setDefaultText(text); if (updateStatusBarMsg) { @@ -442,36 +348,158 @@ void DolphinViewContainer::updateStatusBar() } } -void DolphinViewContainer::changeNameFilter(const QString& nameFilter) +void DolphinViewContainer::setNameFilter(const QString& nameFilter) { - // The name filter of KDirLister does a 'hard' filtering, which - // means that only the items are shown where the names match - // exactly the filter. This is non-transparent for the user, which - // just wants to have a 'soft' filtering: does the name contain - // the filter string? - QString adjustedFilter(nameFilter); - adjustedFilter.insert(0, '*'); - adjustedFilter.append('*'); - - // Use the ProxyModel to filter: - // This code is #ifdefed as setNameFilter behaves - // slightly different than the QSortFilterProxyModel - // as it will not remove directories. I will ask - // our beloved usability experts for input - // -- z. -#if 0 - m_dirLister->setNameFilter(adjustedFilter); - m_dirLister->emitChanges(); -#else - m_proxyModel->setFilterRegExp(nameFilter); -#endif + m_view->setNameFilter(nameFilter); + updateStatusBar(); } -void DolphinViewContainer::openContextMenu(KFileItem* item, - const KUrl& url) +void DolphinViewContainer::openContextMenu(const KFileItem& item, + const KUrl& url, + const QList& customActions) { DolphinContextMenu contextMenu(m_mainWindow, item, url); + contextMenu.setCustomActions(customActions); contextMenu.open(); } +void DolphinViewContainer::saveContentsPos(int x, int y) +{ + m_urlNavigator->savePosition(x, y); +} + +void DolphinViewContainer::restoreContentsPos() +{ + if (!url().isEmpty()) { + const QPoint pos = m_urlNavigator->savedPosition(); + m_view->setContentsPosition(pos.x(), pos.y()); + } +} + +void DolphinViewContainer::activate() +{ + setActive(true); +} + +void DolphinViewContainer::restoreView(const KUrl& url) +{ + if (KProtocolManager::supportsListing(url)) { + m_view->updateView(url, m_urlNavigator->savedRootUrl()); + if (isActive()) { + // When an URL has been entered, the view should get the focus. + // The focus must be requested asynchronously, as changing the URL might create + // a new view widget. Using QTimer::singleShow() works reliable, however + // QMetaObject::invokeMethod() with a queued connection does not work, which might + // indicate that we should pass a hint to DolphinView::updateView() + // regarding the focus instead. To test: Enter an URL and press CTRL+Enter. + // Expected result: The view should get the focus. + QTimer::singleShot(0, this, SLOT(requestFocus())); + } + } else if (KProtocolManager::isSourceProtocol(url)) { + QString app = "konqueror"; + if (url.protocol().startsWith(QLatin1String("http"))) { + showErrorMessage(i18nc("@info:status", + "Dolphin does not support web pages, the web browser has been launched")); + const KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "General"); + 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")); + } + + QString secureUrl = KShell::quoteArg(url.pathOrUrl()); + const QString command = app + ' ' + secureUrl; + KRun::runCommand(command, app, app, this); + } else { + showErrorMessage(i18nc("@info:status", "Invalid protocol")); + } +} + +void DolphinViewContainer::saveRootUrl(const KUrl& url) +{ + Q_UNUSED(url); + m_urlNavigator->saveRootUrl(m_view->rootUrl()); +} + +void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event) +{ + DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this); +} + +void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl) +{ + Q_UNUSED(oldUrl); + const bool block = m_urlNavigator->signalsBlocked(); + m_urlNavigator->blockSignals(true); + m_urlNavigator->setUrl(newUrl); + m_urlNavigator->blockSignals(block); +} + +void DolphinViewContainer::requestFocus() +{ + m_view->setFocus(); +} + +void DolphinViewContainer::saveUrlCompletionMode(KGlobalSettings::Completion completion) +{ + DolphinSettings& settings = DolphinSettings::instance(); + settings.generalSettings()->setUrlCompletionMode(completion); + 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(); + + if (item.isDir()) { + m_view->setUrl(url); + return; + } + + const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + const bool browseThroughArchives = settings->browseThroughArchives(); + if (browseThroughArchives && item.isFile() && url.isLocalFile()) { + // Generic mechanism for redirecting to tar:// when clicking on a tar file, + // zip:// when clicking on a zip file, etc. + // The .protocol file specifies the mimetype that the kioslave handles. + // Note that we don't use mimetype inheritance since we don't want to + // open OpenDocument files as zip folders... + const QString protocol = KProtocolManager::protocolForArchiveMimetype(item.mimetype()); + if (!protocol.isEmpty()) { + url.setProtocol(protocol); + m_view->setUrl(url); + return; + } + } + + item.run(); +} + +void DolphinViewContainer::openFile(const KUrl& url) +{ + // Using m_dolphinModel for getting the file item instance is not possible + // here: openFile() is triggered by an error of the directory lister + // job, so the file item must be received "manually". + const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + slotItemTriggered(item); +} + #include "dolphinviewcontainer.moc"