X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9c7ccd477a32ad52ff0126024ffbad0f6ea164b5..7cdaa3f5bff507812e3e68f14c52aa0782887886:/src/dolphinviewcontainer.cpp diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 514e9e7b3..26b4920e9 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -27,20 +27,19 @@ #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,9 +49,7 @@ #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" -#include "dolphinitemcategorizer.h" #include "filterbar.h" -#include "renamedialog.h" #include "kurlnavigator.h" #include "viewproperties.h" #include "dolphinsettings.h" @@ -63,15 +60,12 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, const KUrl& url) : QWidget(parent), m_showProgress(false), - m_folderCount(0), - m_fileCount(0), 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) { @@ -81,10 +75,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - 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::List&, const KUrl&)), m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); @@ -100,21 +90,21 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_dirLister->setMainWindow(this); 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); 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())); + this, SLOT(slotDirListerCompleted())); connect(m_dirLister, SIGNAL(infoMessage(const QString&)), this, SLOT(showInfoMessage(const QString&))); connect(m_dirLister, SIGNAL(errorMessage(const QString&)), @@ -123,7 +113,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_view = new DolphinView(this, url, m_dirLister, - m_dirModel, + m_dolphinModel, m_proxyModel); connect(m_view, SIGNAL(urlChanged(const KUrl&)), m_urlNavigator, SLOT(setUrl(const KUrl&))); @@ -139,11 +129,15 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, 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_urlNavigator, SIGNAL(urlChanged(const KUrl&)), - m_view, SLOT(setUrl(const KUrl&))); + this, SLOT(restoreView(const KUrl&))); m_statusBar = new DolphinStatusBar(this, url); connect(m_view, SIGNAL(urlChanged(const KUrl&)), @@ -152,7 +146,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, 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())); @@ -190,76 +184,6 @@ bool DolphinViewContainer::isActive() const return m_view->isActive(); } -void DolphinViewContainer::renameSelectedItems() -{ - DolphinViewContainer* view = m_mainWindow->activeViewContainer(); - const QList items = m_view->selectedItems(); - if (items.count() > 1) { - // More than one item has been selected for renaming. Open - // a rename dialog and rename all items afterwards. - RenameDialog dialog(items); - 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; - - QList::const_iterator it = items.begin(); - QList::const_iterator end = items.end(); - while (it != end) { - const KUrl& oldUrl = (*it).url(); - 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(items.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(items); - 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 = items.first().url(); - KUrl newUrl = oldUrl; - newUrl.setFileName(newName); - m_mainWindow->rename(oldUrl, newUrl); - } - } -} - bool DolphinViewContainer::isFilterBarVisible() const { return m_filterBar->isVisible(); @@ -272,8 +196,8 @@ bool DolphinViewContainer::isUrlEditable() const KFileItem DolphinViewContainer::fileItem(const QModelIndex& index) const { - const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); - return m_dirModel->itemForIndex(dirModelIndex); + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + return m_dolphinModel->itemForIndex(dolphinModelIndex); } void DolphinViewContainer::updateProgress(int percent) @@ -296,7 +220,7 @@ void DolphinViewContainer::updateProgress(int percent) } } -void DolphinViewContainer::updateItemCount() +void DolphinViewContainer::slotDirListerCompleted() { if (m_showProgress) { m_statusBar->setProgressText(QString()); @@ -304,23 +228,6 @@ 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(); QTimer::singleShot(100, this, SLOT(restoreContentsPos())); @@ -345,6 +252,11 @@ void DolphinViewContainer::showErrorMessage(const QString& msg) m_statusBar->setMessage(msg, DolphinStatusBar::Error); } +void DolphinViewContainer::showOperationCompletedMessage(const QString& msg) +{ + m_statusBar->setMessage(msg, DolphinStatusBar::OperationCompleted); +} + void DolphinViewContainer::closeFilterBar() { m_filterBar->hide(); @@ -353,16 +265,19 @@ void DolphinViewContainer::closeFilterBar() QString DolphinViewContainer::defaultStatusBarText() const { - return KIO::itemsSummaryString(m_fileCount + m_folderCount, - m_fileCount, - m_folderCount, + int folderCount = 0; + int fileCount = 0; + m_view->calculateItemCount(fileCount, folderCount); + return KIO::itemsSummaryString(fileCount + folderCount, + fileCount, + folderCount, 0, false); } QString DolphinViewContainer::selectionStatusBarText() const { QString text; - const QList list = m_view->selectedItems(); + 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 @@ -372,8 +287,8 @@ QString DolphinViewContainer::selectionStatusBarText() const int fileCount = 0; int folderCount = 0; KIO::filesize_t byteSize = 0; - QList::const_iterator it = list.begin(); - const QList::const_iterator end = list.end(); + KFileItemList::const_iterator it = list.begin(); + const KFileItemList::const_iterator end = list.end(); while (it != end) { const KFileItem& item = *it; if (item.isDir()) { @@ -429,29 +344,10 @@ 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(const KFileItem& item, @@ -479,6 +375,17 @@ void DolphinViewContainer::activate() setActive(true); } +void DolphinViewContainer::restoreView(const KUrl& url) +{ + m_view->updateView(url, m_urlNavigator->savedRootUrl()); +} + +void DolphinViewContainer::saveRootUrl(const KUrl& url) +{ + Q_UNUSED(url); + m_urlNavigator->saveRootUrl(m_view->rootUrl()); +} + void DolphinViewContainer::slotItemTriggered(const KFileItem& item) { // Prefer the local path over the URL.