X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/78d1167c38be4318114aa8ae4b7d433c12f86b77..9c8e7f4e43d23c6d014ca4ffe2083ad8cc737753:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 26259df87..5ec8c901e 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -22,6 +22,7 @@ #include +#include #include #include #include @@ -36,6 +37,7 @@ #include #include +#include "dolphincontroller.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" @@ -62,6 +64,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_mainWindow(mainWindow), m_topLayout(0), m_urlNavigator(0), + m_controller(0), m_iconsView(0), m_detailsView(0), m_filterBar(0), @@ -76,9 +79,18 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_topLayout->setSpacing(0); m_topLayout->setMargin(0); + connect(m_mainWindow, SIGNAL(activeViewChanged()), + this, SLOT(updateActivationState())); + m_urlNavigator = new UrlNavigator(url, this); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(loadDirectory(const KUrl&))); + connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)), + this, SLOT(dropUrls(const KUrl::List&, const KUrl&))); + connect(m_urlNavigator, SIGNAL(activated()), + this, SLOT(requestActivation())); + connect(this, SIGNAL(contentsMoved(int, int)), + m_urlNavigator, SLOT(storeContentsPosition(int, int))); m_statusBar = new DolphinStatusBar(this); @@ -108,6 +120,22 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_proxyModel = new DolphinSortFilterProxyModel(this); m_proxyModel->setSourceModel(m_dirModel); + m_controller = new DolphinController(this); + connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), + this, SLOT(openContextMenu(const QPoint&))); + connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QPoint&)), + this, SLOT(dropUrls(const KUrl::List&, const QPoint&))); + connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)), + this, SLOT(updateSorting(DolphinView::Sorting))); + connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)), + this, SLOT(updateSortOrder(Qt::SortOrder))); + connect(m_controller, SIGNAL(itemTriggered(const QModelIndex&)), + this, SLOT(triggerItem(const QModelIndex&))); + connect(m_controller, SIGNAL(selectionChanged()), + this, SLOT(emitSelectionChangedSignal())); + connect(m_controller, SIGNAL(activated()), + this, SLOT(requestActivation())); + createView(); m_iconSize = K3Icon::SizeMedium; @@ -116,7 +144,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, m_filterBar->hide(); connect(m_filterBar, SIGNAL(filterChanged(const QString&)), this, SLOT(changeNameFilter(const QString&))); - connect(m_filterBar, SIGNAL(closed()), + connect(m_filterBar, SIGNAL(closeRequest()), this, SLOT(closeFilterBar())); m_topLayout->addWidget(m_urlNavigator); @@ -136,6 +164,7 @@ DolphinView::~DolphinView() void DolphinView::setUrl(const KUrl& url) { m_urlNavigator->setUrl(url); + m_controller->setUrl(url); } const KUrl& DolphinView::url() const @@ -143,14 +172,9 @@ const KUrl& DolphinView::url() const return m_urlNavigator->url(); } -void DolphinView::requestActivation() -{ - mainWindow()->setActiveView(this); -} - bool DolphinView::isActive() const { - return (mainWindow()->activeView() == this); + return m_mainWindow->activeView() == this; } void DolphinView::setMode(Mode mode) @@ -319,12 +343,12 @@ DolphinStatusBar* DolphinView::statusBar() const int DolphinView::contentsX() const { - return 0; //scrollView()->contentsX(); + return itemView()->horizontalScrollBar()->value(); } int DolphinView::contentsY() const { - return 0; //scrollView()->contentsY(); + return itemView()->verticalScrollBar()->value(); } void DolphinView::refreshSettings() @@ -370,12 +394,7 @@ bool DolphinView::isZoomOutPossible() const void DolphinView::setSorting(Sorting sorting) { if (sorting != this->sorting()) { - ViewProperties props(url()); - props.setSorting(sorting); - - m_proxyModel->setSorting(sorting); - - emit sortingChanged(sorting); + updateSorting(sorting); } } @@ -387,12 +406,7 @@ DolphinView::Sorting DolphinView::sorting() const void DolphinView::setSortOrder(Qt::SortOrder order) { if (sortOrder() != order) { - ViewProperties props(url()); - props.setSortOrder(order); - - m_proxyModel->setSortOrder(order); - - emit sortOrderChanged(order); + updateSortOrder(order); } } @@ -483,12 +497,6 @@ KFileItem* DolphinView::fileItem(const QModelIndex index) const return m_dirModel->itemForIndex(dirModelIndex); } -void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos) -{ - DolphinContextMenu contextMenu(this, fileInfo, pos); - contextMenu.open(); -} - void DolphinView::rename(const KUrl& source, const QString& newName) { bool ok = false; @@ -555,27 +563,6 @@ void DolphinView::reload() startDirLister(m_urlNavigator->url(), true); } -void DolphinView::slotUrlListDropped(QDropEvent* /* event */, - const KUrl::List& urls, - const KUrl& url) -{ - KUrl destination(url); - if (destination.isEmpty()) { - destination = m_urlNavigator->url(); - } - else { - // Check whether the destination Url is a directory. If this is not the - // case, use the navigator Url as destination (otherwise the destination, - // which represents a file, would be replaced by a copy- or move-operation). - KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, destination); - if (!fileItem.isDir()) { - destination = m_urlNavigator->url(); - } - } - - mainWindow()->dropUrls(urls, destination); -} - void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); @@ -620,19 +607,28 @@ void DolphinView::loadDirectory(const KUrl& url) startDirLister(url); emit urlChanged(url); + + m_statusBar->clear(); } void DolphinView::triggerItem(const QModelIndex& index) { + const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); + if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) { + // items are selected by the user, hence don't trigger the + // item specified by 'index' + return; + } + KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); if (item == 0) { return; } if (item->isDir()) { - // Prefer the local path over the Url. This assures that the - // volume space information is correct. Assuming that the Url is media:/sda1, - // and the local path is /windows/C: For the Url the space info is related + // Prefer the local path over the URL. This assures that the + // volume space information is correct. Assuming that the URL is media:/sda1, + // and the local path is /windows/C: For the URL the space info is related // to the root partition (and hence wrong) and for the local path the space // info is related to the windows partition (-> correct). const QString localPath(item->localPath()); @@ -658,7 +654,7 @@ void DolphinView::updateProgress(int percent) void DolphinView::updateItemCount() { if (m_showProgress) { - m_statusBar->setProgressText(QString::null); + m_statusBar->setProgressText(QString()); m_statusBar->setProgress(100); m_showProgress = false; } @@ -682,6 +678,23 @@ void DolphinView::updateItemCount() } updateStatusBar(); + + QTimer::singleShot(0, this, SLOT(restoreContentsPos())); +} + +void DolphinView::restoreContentsPos() +{ + int index = 0; + const QLinkedList history = urlHistory(index); + if (!history.isEmpty()) { + QAbstractItemView* view = itemView(); + // TODO: view->setCurrentItem(history[index].currentFileName()); + + QLinkedList::const_iterator it = history.begin(); + it += index; + view->horizontalScrollBar()->setValue((*it).contentsX()); + view->verticalScrollBar()->setValue((*it).contentsY()); + } } void DolphinView::showInfoMessage(const QString& msg) @@ -736,50 +749,19 @@ void DolphinView::startDirLister(const KUrl& url, bool reload) QString DolphinView::defaultStatusBarText() const { - // TODO: the following code is not suitable for languages where multiple forms - // of plurals are given (e. g. in Poland three forms of plurals exist). - const int itemCount = m_folderCount + m_fileCount; - - QString text; - if (itemCount == 1) { - text = i18n("1 Item"); - } - else { - text = i18n("%1 Items",itemCount); - } - - text += " ("; - - if (m_folderCount == 1) { - text += i18n("1 Folder"); - } - else { - text += i18n("%1 Folders",m_folderCount); - } - - text += ", "; - - if (m_fileCount == 1) { - text += i18n("1 File"); - } - else { - text += i18n("%1 Files",m_fileCount); - } - - text += ")"; - - return text; + return KIO::itemsSummaryString(m_fileCount + m_folderCount, + m_fileCount, + m_folderCount, + 0, false); } QString DolphinView::selectionStatusBarText() const { - // TODO: the following code is not suitable for languages where multiple forms - // of plurals are given (e. g. in Poland three forms of plurals exist). QString text; const KFileItemList list = selectedItems(); if (list.isEmpty()) { - // TODO: assert(!list.isEmpty()) should be used, as this method is only invoked if - // DolphinView::hasSelection() is true. Inconsistent behavior? + // when an item is triggered, it is temporary selected but selectedItems() + // will return an empty list return QString(); } @@ -800,23 +782,16 @@ QString DolphinView::selectionStatusBarText() const ++it; } - if (folderCount == 1) { - text = i18n("1 Folder selected"); - } - else if (folderCount > 1) { - text = i18n("%1 Folders selected",folderCount); - } - - if ((fileCount > 0) && (folderCount > 0)) { - text += ", "; + if (folderCount > 0) { + text = i18np("1 Folder selected", "%1 Folders selected", folderCount); + if (fileCount > 0) { + text += ", "; + } } - const QString sizeText(KIO::convertSize(byteSize)); - if (fileCount == 1) { - text += i18n("1 File selected (%1)",sizeText); - } - else if (fileCount > 1) { - text += i18n("%1 Files selected (%1)",fileCount,sizeText); + if (fileCount > 0) { + const QString sizeText(KIO::convertSize(byteSize)); + text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText); } return text; @@ -833,11 +808,6 @@ void DolphinView::showFilterBar(bool show) } } -void DolphinView::declareViewActive() -{ - mainWindow()->setActiveView( this ); -} - void DolphinView::updateStatusBar() { // As the item count information is less important @@ -861,6 +831,11 @@ void DolphinView::updateStatusBar() } } +void DolphinView::requestActivation() +{ + m_mainWindow->setActiveView(this); +} + void DolphinView::changeNameFilter(const QString& nameFilter) { // The name filter of KDirLister does a 'hard' filtering, which @@ -886,12 +861,81 @@ void DolphinView::changeNameFilter(const QString& nameFilter) #endif } +void DolphinView::openContextMenu(const QPoint& pos) +{ + KFileItem* item = 0; + + const QModelIndex index = itemView()->indexAt(pos); + if (index.isValid()) { + item = fileItem(index); + } + + DolphinContextMenu contextMenu(this, item); + contextMenu.open(); +} + +void DolphinView::dropUrls(const KUrl::List& urls, + const QPoint& pos) +{ + KFileItem* directory = 0; + const QModelIndex index = itemView()->indexAt(pos); + if (index.isValid()) { + KFileItem* item = fileItem(index); + assert(item != 0); + if (item->isDir()) { + // the URLs are dropped above a directory + directory = item; + } + } + + const KUrl& destination = (directory == 0) ? url() : + directory->url(); + dropUrls(urls, destination); +} + +void DolphinView::dropUrls(const KUrl::List& urls, + const KUrl& destination) +{ + m_mainWindow->dropUrls(urls, destination); +} + + +void DolphinView::updateSorting(DolphinView::Sorting sorting) +{ + ViewProperties props(url()); + props.setSorting(sorting); + + m_proxyModel->setSorting(sorting); + + emit sortingChanged(sorting); +} + +void DolphinView::updateSortOrder(Qt::SortOrder order) +{ + ViewProperties props(url()); + props.setSortOrder(order); + + m_proxyModel->setSortOrder(order); + + emit sortOrderChanged(order); +} + +void DolphinView::emitContentsMoved() +{ + emit contentsMoved(contentsX(), contentsY()); +} + +void DolphinView::updateActivationState() +{ + m_urlNavigator->setActive(isActive()); +} + void DolphinView::createView() { // delete current view QAbstractItemView* view = itemView(); if (view != 0) { - m_topLayout->remove(view); + m_topLayout->removeWidget(view); view->close(); view->deleteLater(); m_iconsView = 0; @@ -904,22 +948,17 @@ void DolphinView::createView() // ... and recreate it representing the current mode switch (m_mode) { case IconsView: - m_iconsView = new DolphinIconsView(this); - m_iconsView->setViewMode(QListView::IconMode); - m_iconsView->setSpacing(32); + m_iconsView = new DolphinIconsView(this, m_controller); view = m_iconsView; - // TODO: read out view settings break; case DetailsView: - m_detailsView = new DolphinDetailsView(this); + m_detailsView = new DolphinDetailsView(this, m_controller); view = m_detailsView; - // TODO: read out view settings break; } view->setModel(m_proxyModel); - view->setSelectionMode(QAbstractItemView::ExtendedSelection); KFileItemDelegate* delegate = new KFileItemDelegate(this); @@ -927,25 +966,14 @@ void DolphinView::createView() view->setItemDelegate(delegate); new KMimeTypeResolver(view, m_dirModel); - - connect(view, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); - connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(emitSelectionChangedSignal())); - m_topLayout->insertWidget(1, view); -} -int DolphinView::columnIndex(Sorting sorting) const -{ - int index = 0; - switch (sorting) { - case SortByName: index = KDirModel::Name; break; - case SortBySize: index = KDirModel::Size; break; - case SortByDate: index = KDirModel::ModifiedTime; break; - default: assert(false); - } - return index; + connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), + m_controller, SLOT(indicateSelectionChange())); + connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(emitContentsMoved())); + connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(emitContentsMoved())); } void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)