X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8072005fada01d772595ec64adca449134f421e..093efca22dfd247f06e2a669ad968300e71ef08d:/src/dolphincolumnview.cpp diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 658bd8587..3f6523ebe 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include /** @@ -56,19 +57,20 @@ public: * drawn in a lighter color. All operations are applied to this column. */ void setActive(bool active); - inline bool isActive() const; + bool isActive() const; /** * Sets the directory URL of the child column that is shown next to * this column. This property is only used for a visual indication * of the shown directory, it does not trigger a loading of the model. */ - inline void setChildUrl(const KUrl& url); - inline const KUrl& childUrl() const; + void setChildUrl(const KUrl& url); + const KUrl& childUrl() const; - /** - * Returns the directory URL that is shown inside the column widget. - */ + /** Sets the directory URL that is shown inside the column widget. */ + void setUrl(const KUrl& url); + + /** Returns the directory URL that is shown inside the column widget. */ inline const KUrl& url() const; protected: @@ -79,6 +81,7 @@ protected: virtual void dropEvent(QDropEvent* event); virtual void paintEvent(QPaintEvent* event); virtual void mousePressEvent(QMouseEvent* event); + virtual void keyPressEvent(QKeyEvent* event); virtual void contextMenuEvent(QContextMenuEvent* event); virtual void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected); @@ -103,7 +106,7 @@ private: ColumnWidget::ColumnWidget(QWidget* parent, DolphinColumnView* columnView, const KUrl& url) : - QListView(columnView), + QListView(parent), m_active(true), m_view(columnView), m_url(url), @@ -115,7 +118,12 @@ ColumnWidget::ColumnWidget(QWidget* parent, viewport()->setAttribute(Qt::WA_Hover); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); + setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); + setSelectionBehavior(SelectItems); setSelectionMode(QAbstractItemView::ExtendedSelection); + setDragDropMode(QAbstractItemView::DragDrop); + setDropIndicatorShown(false); + setFocusPolicy(Qt::NoFocus); // apply the column mode settings to the widget const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); @@ -182,6 +190,11 @@ inline const KUrl& ColumnWidget::childUrl() const return m_childUrl; } +inline void ColumnWidget::setUrl(const KUrl& url) +{ + m_url = url; +} + const KUrl& ColumnWidget::url() const { return m_url; @@ -227,6 +240,7 @@ void ColumnWidget::dropEvent(QDropEvent* event) if (!urls.isEmpty()) { event->acceptProposedAction(); m_view->m_controller->indicateDroppedUrls(urls, + url(), indexAt(event->pos()), event->source()); } @@ -238,10 +252,8 @@ void ColumnWidget::paintEvent(QPaintEvent* event) { if (!m_childUrl.isEmpty()) { // indicate the shown URL of the next column by highlighting the shown folder item - const QAbstractProxyModel* proxyModel = static_cast(m_view->model()); - const DolphinModel* dolphinModel = static_cast(proxyModel->sourceModel()); - const QModelIndex dirIndex = dolphinModel->indexForUrl(m_childUrl); - const QModelIndex proxyIndex = proxyModel->mapFromSource(dirIndex); + const QModelIndex dirIndex = m_view->m_dolphinModel->indexForUrl(m_childUrl); + const QModelIndex proxyIndex = m_view->m_proxyModel->mapFromSource(dirIndex); if (proxyIndex.isValid() && !selectionModel()->isSelected(proxyIndex)) { const QRect itemRect = visualRect(proxyIndex); QPainter painter(viewport()); @@ -275,6 +287,20 @@ void ColumnWidget::mousePressEvent(QMouseEvent* event) QListView::mousePressEvent(event); } +void ColumnWidget::keyPressEvent(QKeyEvent* event) +{ + QListView::keyPressEvent(event); + + const QItemSelectionModel* selModel = selectionModel(); + const QModelIndex currentIndex = selModel->currentIndex(); + const bool triggerItem = currentIndex.isValid() + && (event->key() == Qt::Key_Return) + && (selModel->selectedIndexes().count() <= 1); + if (triggerItem) { + m_view->m_controller->triggerItem(currentIndex); + } +} + void ColumnWidget::contextMenuEvent(QContextMenuEvent* event) { if (!m_active) { @@ -303,15 +329,20 @@ void ColumnWidget::selectionChanged(const QItemSelection& selected, const QItemS void ColumnWidget::activate() { + if (m_view->hasFocus()) { + setFocus(Qt::OtherFocusReason); + } + m_view->setFocusProxy(this); + // TODO: Connecting to the signal 'activated()' is not possible, as kstyle // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is // necessary connecting the signal 'singleClick()' or 'doubleClick'. if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), - m_view, SLOT(triggerItem(const QModelIndex&))); + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); } else { connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - m_view, SLOT(triggerItem(const QModelIndex&))); + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); } const QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); @@ -319,6 +350,14 @@ void ColumnWidget::activate() palette.setColor(viewport()->backgroundRole(), bgColor); viewport()->setPalette(palette); + if (!m_childUrl.isEmpty()) { + // assure that the current index is set on the index that represents + // the child URL + const QModelIndex dirIndex = m_view->m_dolphinModel->indexForUrl(m_childUrl); + const QModelIndex proxyIndex = m_view->m_proxyModel->mapFromSource(dirIndex); + selectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::Current); + } + update(); } @@ -329,22 +368,16 @@ void ColumnWidget::deactivate() // necessary connecting the signal 'singleClick()' or 'doubleClick'. if (KGlobalSettings::singleClick()) { disconnect(this, SIGNAL(clicked(const QModelIndex&)), - m_view, SLOT(triggerItem(const QModelIndex&))); + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); } else { disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)), - m_view, SLOT(triggerItem(const QModelIndex&))); + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); } - QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); - const QColor fgColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color(); - bgColor = KColorUtils::mix(bgColor, fgColor, 0.04); - - QPalette palette = viewport()->palette(); - palette.setColor(viewport()->backgroundRole(), bgColor); + const QPalette palette = m_view->viewport()->palette(); viewport()->setPalette(palette); selectionModel()->clear(); - update(); } @@ -353,10 +386,14 @@ void ColumnWidget::deactivate() DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) : QAbstractItemView(parent), m_controller(controller), + m_restoreActiveColumnFocus(false), + m_dirListerCompleted(false), m_index(-1), m_contentX(0), m_columns(), - m_animation(0) + m_animation(0), + m_dolphinModel(0), + m_proxyModel(0) { Q_ASSERT(controller != 0); @@ -387,6 +424,15 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control m_animation = new QTimeLine(500, this); connect(m_animation, SIGNAL(frameChanged(int)), horizontalScrollBar(), SLOT(setValue(int))); + + // dim the background of the viewport + QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); + const QColor fgColor = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color(); + bgColor = KColorUtils::mix(bgColor, fgColor, 0.04); + + QPalette palette = viewport()->palette(); + palette.setColor(viewport()->backgroundRole(), bgColor); + viewport()->setPalette(palette); } DolphinColumnView::~DolphinColumnView() @@ -398,12 +444,11 @@ QModelIndex DolphinColumnView::indexAt(const QPoint& point) const foreach (ColumnWidget* column, m_columns) { const QPoint topLeft = column->frameGeometry().topLeft(); const QPoint adjustedPoint(point.x() - topLeft.x(), point.y() - topLeft.y()); - QModelIndex index = column->indexAt(adjustedPoint); + const QModelIndex index = column->indexAt(adjustedPoint); if (index.isValid()) { return index; } } - return activeColumn()->indexAt(point); return QModelIndex(); } @@ -420,27 +465,244 @@ QRect DolphinColumnView::visualRect(const QModelIndex& index) const void DolphinColumnView::setModel(QAbstractItemModel* model) { + if (m_dolphinModel != 0) { + m_dolphinModel->disconnect(this); + } + + m_proxyModel = static_cast(model); + m_dolphinModel = static_cast(m_proxyModel->sourceModel()); + connect(m_dolphinModel, SIGNAL(expand(const QModelIndex&)), + this, SLOT(triggerReloadColumns(const QModelIndex&))); + + KDirLister* dirLister = m_dolphinModel->dirLister(); + connect(dirLister, SIGNAL(started(const KUrl&)), + this, SLOT(slotDirListerStarted(const KUrl&))); + connect(dirLister, SIGNAL(completed()), + this, SLOT(slotDirListerCompleted())); + activeColumn()->setModel(model); QAbstractItemView::setModel(model); } +void DolphinColumnView::invertSelection() +{ + // TODO: this approach of inverting the selection is quite slow. It should + // be possible to speedup the implementation by using QItemSelection, but + // all adempts have failed yet... + + ColumnWidget* column = activeColumn(); + QItemSelectionModel* selModel = column->selectionModel(); + + KDirLister* dirLister = m_dolphinModel->dirLister(); + const KFileItemList list = dirLister->itemsForDir(column->url()); + foreach (KFileItem* item, list) { + const QModelIndex index = m_dolphinModel->indexForUrl(item->url()); + selModel->select(m_proxyModel->mapFromSource(index), QItemSelectionModel::Toggle); + } +} + +void DolphinColumnView::reload() +{ + // Due to the reloading of the model all columns will be reset to show + // the same content as the first column. As this is not wanted, all columns + // except of the first column are temporary hidden until the root index can + // be updated again. + m_restoreActiveColumnFocus = false; + QList::iterator start = m_columns.begin() + 1; + QList::iterator end = m_columns.end(); + for (QList::iterator it = start; it != end; ++it) { + ColumnWidget* column = (*it); + if (column->isActive() && column->hasFocus()) { + // because of hiding the column, it will lose the focus + // -> remember that the focus should be restored after reloading + m_restoreActiveColumnFocus = true; + } + column->hide(); + } + + // all columns are hidden, now reload the directory lister + KDirLister* dirLister = m_dolphinModel->dirLister(); + const KUrl& rootUrl = m_columns[0]->url(); + dirLister->openUrl(rootUrl, false, true); + updateColumns(); +} + +void DolphinColumnView::showColumn(const KUrl& url) +{ + const KUrl& rootUrl = m_columns[0]->url(); + if (!rootUrl.isParentOf(url)) { + // the URL is no child URL of the column view, hence clear all columns + // and reset the root column + QList::iterator start = m_columns.begin() + 1; + QList::iterator end = m_columns.end(); + for (QList::iterator it = start; it != end; ++it) { + (*it)->deleteLater(); + } + m_columns.erase(start, end); + m_index = 0; + m_columns[0]->setActive(true); + m_columns[0]->setUrl(url); + assureVisibleActiveColumn(); + return; + } + + KDirLister* dirLister = m_dolphinModel->dirLister(); + const KUrl dirListerUrl = dirLister->url(); + if (dirListerUrl != rootUrl) { + // It is possible that root URL of the directory lister is adjusted + // after creating the column widget (e. g. when restoring the history + // having a different root URL than the controller indicates). + m_columns[0]->setUrl(dirListerUrl); + } + + int columnIndex = 0; + foreach (ColumnWidget* column, m_columns) { + if (column->url() == url) { + // the column represents already the requested URL, hence activate it + requestActivation(column); + return; + } else if (!column->url().isParentOf(url)) { + // the column is no parent of the requested URL, hence + // just delete all remaining columns + if (columnIndex > 0) { + QList::iterator start = m_columns.begin() + columnIndex; + QList::iterator end = m_columns.end(); + for (QList::iterator it = start; it != end; ++it) { + (*it)->deleteLater(); + } + m_columns.erase(start, end); + + const int maxIndex = m_columns.count() - 1; + Q_ASSERT(maxIndex >= 0); + if (m_index > maxIndex) { + m_index = maxIndex; + } + break; + } + } + ++columnIndex; + } + + // Create missing columns. Assuming that the path is "/home/peter/Temp/" and + // the target path is "/home/peter/Temp/a/b/c/", then the columns "a", "b" and + // "c" will be created. + const int lastIndex = m_columns.count() - 1; + Q_ASSERT(lastIndex >= 0); + + const KUrl& activeUrl = m_columns[lastIndex]->url(); + Q_ASSERT(activeUrl.isParentOf(url)); + Q_ASSERT(activeUrl != url); + + QString path = activeUrl.url(KUrl::AddTrailingSlash); + const QString targetPath = url.url(KUrl::AddTrailingSlash); + + columnIndex = lastIndex; + int slashIndex = path.count('/'); + bool hasSubPath = (slashIndex >= 0); + while (hasSubPath) { + const QString subPath = targetPath.section('/', slashIndex, slashIndex); + if (subPath.isEmpty()) { + hasSubPath = false; + } else { + path += subPath + '/'; + ++slashIndex; + + const KUrl childUrl = KUrl(path); + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(KUrl(path)); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + + m_columns[columnIndex]->setChildUrl(childUrl); + columnIndex++; + + ColumnWidget* column = new ColumnWidget(viewport(), this, childUrl); + column->setVerticalScrollMode(ColumnWidget::ScrollPerPixel); + column->setHorizontalScrollMode(ColumnWidget::ScrollPerPixel); + column->setModel(model()); + column->setRootIndex(proxyIndex); + column->setActive(false); + + m_columns.append(column); + + // Before invoking layoutColumns() the column must be set visible temporary. + // To prevent a flickering the initial geometry is set to a hidden position. + column->setGeometry(QRect(-1, -1, 1, 1)); + column->show(); + layoutColumns(); + updateScrollBar(); + + // the layout is finished, now let the column be invisible until it + // gets a valid root index due to expandToActiveUrl() + column->hide(); + } + } + + // set the last column as active column without modifying the controller + // and hence the history + activeColumn()->setActive(false); + m_index = columnIndex; + activeColumn()->setActive(true); +} + +void DolphinColumnView::selectAll() +{ + activeColumn()->selectAll(); +} + bool DolphinColumnView::isIndexHidden(const QModelIndex& index) const { + Q_UNUSED(index); return false;//activeColumn()->isIndexHidden(index); } QModelIndex DolphinColumnView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) { - return QModelIndex(); //activeColumn()->moveCursor(cursorAction, modifiers); + // Parts of this code have been taken from QColumnView::moveCursor(). + // Copyright (C) 1992-2007 Trolltech ASA. + + Q_UNUSED(modifiers); + if (model() == 0) { + return QModelIndex(); + } + + const QModelIndex current = currentIndex(); + if (isRightToLeft()) { + if (cursorAction == MoveLeft) { + cursorAction = MoveRight; + } else if (cursorAction == MoveRight) { + cursorAction = MoveLeft; + } + } + + switch (cursorAction) { + case MoveLeft: + if (m_index > 0) { + setActiveColumnIndex(m_index - 1); + } + break; + + case MoveRight: + if (m_index < m_columns.count() - 1) { + setActiveColumnIndex(m_index + 1); + } + break; + + default: + break; + } + + return QModelIndex(); } void DolphinColumnView::setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) { + Q_UNUSED(rect); + Q_UNUSED(flags); //activeColumn()->setSelection(rect, flags); } QRegion DolphinColumnView::visualRegionForSelection(const QItemSelection& selection) const { + Q_UNUSED(selection); return QRegion(); //activeColumn()->visualRegionForSelection(selection); } @@ -451,7 +713,7 @@ int DolphinColumnView::horizontalOffset() const int DolphinColumnView::verticalOffset() const { - return 0; // activeColumn()->verticalOffset(); + return 0; } void DolphinColumnView::mousePressEvent(QMouseEvent* event) @@ -460,25 +722,6 @@ void DolphinColumnView::mousePressEvent(QMouseEvent* event) QAbstractItemView::mousePressEvent(event); } -void DolphinColumnView::dragEnterEvent(QDragEnterEvent* event) -{ - if (event->mimeData()->hasUrls()) { - event->acceptProposedAction(); - } -} - -void DolphinColumnView::dropEvent(QDropEvent* event) -{ - const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); - if (!urls.isEmpty()) { - m_controller->indicateDroppedUrls(urls, - indexAt(event->pos()), - event->source()); - event->acceptProposedAction(); - } - QAbstractItemView::dropEvent(event); -} - void DolphinColumnView::resizeEvent(QResizeEvent* event) { QAbstractItemView::resizeEvent(event); @@ -514,82 +757,12 @@ void DolphinColumnView::zoomOut() } } -void DolphinColumnView::triggerItem(const QModelIndex& index) -{ - m_controller->triggerItem(index); - - const Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers(); - if ((modifiers & Qt::ControlModifier) || (modifiers & Qt::ShiftModifier)) { - return; - } - - const QAbstractProxyModel* proxyModel = static_cast(model()); - const KDirModel* dirModel = static_cast(proxyModel->sourceModel()); - const KFileItem item = dirModel->itemForIndex(proxyModel->mapToSource(index)); - if ((item.url() != activeColumn()->url()) && item.isDir()) { - deleteInactiveChildColumns(); - - const KUrl& childUrl = m_controller->url(); - activeColumn()->setChildUrl(childUrl); - - ColumnWidget* column = new ColumnWidget(viewport(), this, childUrl); - column->setModel(model()); - column->setRootIndex(index); - - m_columns.append(column); - - setActiveColumnIndex(m_index + 1); - - // Before invoking layoutColumns() the column must be shown. To prevent - // a flickering the initial geometry is set to be invisible. - column->setGeometry(QRect(-1, -1, 1, 1)); - column->show(); - - layoutColumns(); - updateScrollBar(); - assureVisibleActiveColumn(); - } -} - void DolphinColumnView::moveContentHorizontally(int x) { m_contentX = -x; layoutColumns(); } -void DolphinColumnView::showColumn(const KUrl& url) -{ - if (!m_columns[0]->url().isParentOf(url)) { - // the URL is no child URL of the column view, hence do nothing - return; - } - - int columnIndex = 0; - foreach (ColumnWidget* column, m_columns) { - if (column->url() == url) { - // the column represents already the requested URL, hence activate it - requestActivation(column); - return; - } else if (!column->url().isParentOf(url)) { - // the column is no parent of the requested URL, hence it must - // be deleted and a new column must be loaded - if (columnIndex > 0) { - setActiveColumnIndex(columnIndex - 1); - deleteInactiveChildColumns(); - } - - const QAbstractProxyModel* proxyModel = static_cast(model()); - const KDirModel* dirModel = static_cast(proxyModel->sourceModel()); - const QModelIndex dirIndex = dirModel->indexForUrl(url); - if (dirIndex.isValid()) { - triggerItem(proxyModel->mapFromSource(dirIndex)); - } - return; - } - ++columnIndex; - } -} - void DolphinColumnView::updateDecorationSize() { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); @@ -608,6 +781,69 @@ void DolphinColumnView::updateDecorationSize() doItemsLayout(); } +void DolphinColumnView::expandToActiveUrl() +{ + const int lastIndex = m_columns.count() - 1; + Q_ASSERT(lastIndex >= 0); + const KUrl& activeUrl = m_columns[lastIndex]->url(); + const KUrl rootUrl = m_dolphinModel->dirLister()->url(); + const bool expand = m_dirListerCompleted + && rootUrl.isParentOf(activeUrl) + && !rootUrl.equals(activeUrl, KUrl::CompareWithoutTrailingSlash); + if (expand) { + m_dolphinModel->expandToUrl(activeUrl); + } + updateColumns(); +} + +void DolphinColumnView::triggerUpdateColumns(const QModelIndex& index) +{ + Q_UNUSED(index); + // the updating of the columns may not be done in the context of this slot + QMetaObject::invokeMethod(this, "updateColumns", Qt::QueuedConnection); +} + +void DolphinColumnView::updateColumns() +{ + KDirLister* dirLister = m_dolphinModel->dirLister(); + foreach (ColumnWidget* column, m_columns) { + dirLister->updateDirectory(column->url()); + } + + const int end = m_columns.count() - 2; // next to last column + for (int i = 0; i <= end; ++i) { + ColumnWidget* nextColumn = m_columns[i + 1]; + const QModelIndex rootIndex = nextColumn->rootIndex(); + if (rootIndex.isValid()) { + nextColumn->show(); + } else { + const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_columns[i]->childUrl()); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + if (proxyIndex.isValid()) { + nextColumn->setRootIndex(proxyIndex); + nextColumn->show(); + if (nextColumn->isActive() && m_restoreActiveColumnFocus) { + nextColumn->setFocus(); + m_restoreActiveColumnFocus = false; + } + } + } + } + assureVisibleActiveColumn(); +} + +void DolphinColumnView::slotDirListerStarted(const KUrl& url) +{ + Q_UNUSED(url); + m_dirListerCompleted = false; +} + +void DolphinColumnView::slotDirListerCompleted() +{ + m_dirListerCompleted = true; + QMetaObject::invokeMethod(this, "expandToActiveUrl", Qt::QueuedConnection); +} + bool DolphinColumnView::isZoomInPossible() const { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); @@ -633,12 +869,15 @@ void DolphinColumnView::setActiveColumnIndex(int index) m_index = index; m_columns[m_index]->setActive(true); + + m_controller->setUrl(m_columns[m_index]->url()); } void DolphinColumnView::layoutColumns() { int x = m_contentX; - const int columnWidth = 250; + ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); + const int columnWidth = settings->columnWidth(); foreach (ColumnWidget* column, m_columns) { column->setGeometry(QRect(x, 0, columnWidth, viewport()->height())); x += columnWidth; @@ -692,14 +931,4 @@ void DolphinColumnView::requestActivation(ColumnWidget* column) } } -void DolphinColumnView::deleteInactiveChildColumns() -{ - QList::iterator start = m_columns.begin() + m_index + 1; - QList::iterator end = m_columns.end(); - for (QList::iterator it = start; it != end; ++it) { - (*it)->deleteLater(); - } - m_columns.erase(start, end); -} - #include "dolphincolumnview.moc"