X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/093efca22dfd247f06e2a669ad968300e71ef08d..56836b0e7a9d466db6412534f2bdb5ed546d0cb7:/src/dolphincolumnview.cpp diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 3f6523ebe..82d571724 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -19,381 +19,26 @@ #include "dolphincolumnview.h" -#include "dolphinmodel.h" +#include "dolphincolumnwidget.h" #include "dolphincontroller.h" #include "dolphinsettings.h" #include "dolphin_columnmodesettings.h" -#include -#include -#include - -#include -#include #include #include -#include #include -/** - * Represents one column inside the DolphinColumnView and has been - * extended to respect view options and hovering information. - */ -class ColumnWidget : public QListView -{ -public: - ColumnWidget(QWidget* parent, - DolphinColumnView* columnView, - const KUrl& url); - virtual ~ColumnWidget(); - - /** Sets the size of the icons. */ - void setDecorationSize(const QSize& size); - - /** - * An active column is defined as column, which shows the same URL - * as indicated by the URL navigator. The active column is usually - * drawn in a lighter color. All operations are applied to this column. - */ - void setActive(bool active); - 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. - */ - void setChildUrl(const KUrl& url); - const KUrl& childUrl() const; - - /** 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: - virtual QStyleOptionViewItem viewOptions() const; - virtual void dragEnterEvent(QDragEnterEvent* event); - virtual void dragLeaveEvent(QDragLeaveEvent* event); - virtual void dragMoveEvent(QDragMoveEvent* event); - 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); - -private: - /** Used by ColumnWidget::setActive(). */ - void activate(); - - /** Used by ColumnWidget::setActive(). */ - void deactivate(); - -private: - bool m_active; - DolphinColumnView* m_view; - KUrl m_url; // URL of the directory that is shown - KUrl m_childUrl; // URL of the next column that is shown - QStyleOptionViewItem m_viewOptions; - - bool m_dragging; // TODO: remove this property when the issue #160611 is solved in Qt 4.4 - QRect m_dropRect; // TODO: remove this property when the issue #160611 is solved in Qt 4.4 -}; - -ColumnWidget::ColumnWidget(QWidget* parent, - DolphinColumnView* columnView, - const KUrl& url) : - QListView(parent), - m_active(true), - m_view(columnView), - m_url(url), - m_childUrl(), - m_dragging(false), - m_dropRect() -{ - setMouseTracking(true); - 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(); - Q_ASSERT(settings != 0); - - m_viewOptions = QListView::viewOptions(); - - QFont font(settings->fontFamily(), settings->fontSize()); - font.setItalic(settings->italicFont()); - font.setBold(settings->boldFont()); - m_viewOptions.font = font; - - const int iconSize = settings->iconSize(); - m_viewOptions.decorationSize = QSize(iconSize, iconSize); - - KFileItemDelegate* delegate = new KFileItemDelegate(this); - setItemDelegate(delegate); - - activate(); - - connect(this, SIGNAL(entered(const QModelIndex&)), - m_view->m_controller, SLOT(emitItemEntered(const QModelIndex&))); - connect(this, SIGNAL(viewportEntered()), - m_view->m_controller, SLOT(emitViewportEntered())); -} - -ColumnWidget::~ColumnWidget() -{ -} - -void ColumnWidget::setDecorationSize(const QSize& size) -{ - m_viewOptions.decorationSize = size; - doItemsLayout(); -} - -void ColumnWidget::setActive(bool active) -{ - if (m_active == active) { - return; - } - - m_active = active; - - if (active) { - activate(); - } else { - deactivate(); - } -} - -inline bool ColumnWidget::isActive() const -{ - return m_active; -} - -inline void ColumnWidget::setChildUrl(const KUrl& url) -{ - m_childUrl = url; -} - -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; -} - -QStyleOptionViewItem ColumnWidget::viewOptions() const -{ - return m_viewOptions; -} - -void ColumnWidget::dragEnterEvent(QDragEnterEvent* event) -{ - if (event->mimeData()->hasUrls()) { - event->acceptProposedAction(); - } - - m_dragging = true; -} - -void ColumnWidget::dragLeaveEvent(QDragLeaveEvent* event) -{ - QListView::dragLeaveEvent(event); - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - m_dragging = false; - setDirtyRegion(m_dropRect); -} - -void ColumnWidget::dragMoveEvent(QDragMoveEvent* event) -{ - QListView::dragMoveEvent(event); - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - const QModelIndex index = indexAt(event->pos()); - setDirtyRegion(m_dropRect); - m_dropRect = visualRect(index); - setDirtyRegion(m_dropRect); -} - -void ColumnWidget::dropEvent(QDropEvent* event) -{ - const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); - if (!urls.isEmpty()) { - event->acceptProposedAction(); - m_view->m_controller->indicateDroppedUrls(urls, - url(), - indexAt(event->pos()), - event->source()); - } - QListView::dropEvent(event); - m_dragging = false; -} - -void ColumnWidget::paintEvent(QPaintEvent* event) -{ - if (!m_childUrl.isEmpty()) { - // indicate the shown URL of the next column by highlighting the shown folder item - 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()); - painter.save(); - - QColor color = KColorScheme(QPalette::Active, KColorScheme::View).foreground().color(); - color.setAlpha(32); - painter.setPen(Qt::NoPen); - painter.setBrush(color); - painter.drawRect(itemRect); - - painter.restore(); - } - } - - QListView::paintEvent(event); - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - if (m_dragging) { - const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight); - DolphinController::drawHoverIndication(viewport(), m_dropRect, brush); - } -} - -void ColumnWidget::mousePressEvent(QMouseEvent* event) -{ - if (!m_active) { - m_view->requestActivation(this); - } - - 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) { - m_view->requestActivation(this); - } - - QListView::contextMenuEvent(event); - - const QModelIndex index = indexAt(event->pos()); - if (index.isValid() || m_active) { - // Only open a context menu above an item or if the mouse is above - // the active column. - const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos()); - m_view->m_controller->triggerContextMenuRequest(pos); - } -} - -void ColumnWidget::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected) -{ - QListView::selectionChanged(selected, deselected); - - QItemSelectionModel* selModel = m_view->selectionModel(); - selModel->select(selected, QItemSelectionModel::Select); - selModel->select(deselected, QItemSelectionModel::Deselect); -} - -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->m_controller, SLOT(triggerItem(const QModelIndex&))); - } else { - connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } - - const QColor bgColor = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); - QPalette palette = viewport()->palette(); - 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(); -} - -void ColumnWidget::deactivate() -{ - // 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()) { - disconnect(this, SIGNAL(clicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } else { - disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)), - m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); - } - - const QPalette palette = m_view->viewport()->palette(); - viewport()->setPalette(palette); - - selectionModel()->clear(); - update(); -} - -// --- - DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) : QAbstractItemView(parent), m_controller(controller), - m_restoreActiveColumnFocus(false), - m_dirListerCompleted(false), + m_active(false), m_index(-1), m_contentX(0), m_columns(), + m_emptyViewport(0), m_animation(0), - m_dolphinModel(0), - m_proxyModel(0) + m_nameFilter() { Q_ASSERT(controller != 0); @@ -401,38 +46,39 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control setDragDropMode(QAbstractItemView::DragDrop); setDropIndicatorShown(false); setSelectionMode(ExtendedSelection); + setFocusPolicy(Qt::NoFocus); + setFrameShape(QFrame::NoFrame); - connect(this, SIGNAL(entered(const QModelIndex&)), - controller, SLOT(emitItemEntered(const QModelIndex&))); connect(this, SIGNAL(viewportEntered()), controller, SLOT(emitViewportEntered())); connect(controller, SIGNAL(zoomIn()), this, SLOT(zoomIn())); connect(controller, SIGNAL(zoomOut()), this, SLOT(zoomOut())); - connect(controller, SIGNAL(urlChanged(const KUrl&)), - this, SLOT(showColumn(const KUrl&))); + connect(controller, SIGNAL(activationChanged(bool)), + this, SLOT(updateColumnsBackground(bool))); + + const DolphinView* view = controller->dolphinView(); + connect(view, SIGNAL(showHiddenFilesChanged()), + this, SLOT(slotShowHiddenFilesChanged())); + connect(view, SIGNAL(showPreviewChanged()), + this, SLOT(slotShowPreviewChanged())); connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(moveContentHorizontally(int))); - ColumnWidget* column = new ColumnWidget(viewport(), this, m_controller->url()); - m_columns.append(column); - setActiveColumnIndex(0); - - updateDecorationSize(); - 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); + DolphinColumnWidget* column = new DolphinColumnWidget(viewport(), this, m_controller->url()); + m_columns.append(column); + setActiveColumnIndex(0); - QPalette palette = viewport()->palette(); - palette.setColor(viewport()->backgroundRole(), bgColor); - viewport()->setPalette(palette); + m_emptyViewport = new QFrame(viewport()); + m_emptyViewport->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + + updateDecorationSize(); + updateColumnsBackground(true); } DolphinColumnView::~DolphinColumnView() @@ -441,7 +87,7 @@ DolphinColumnView::~DolphinColumnView() QModelIndex DolphinColumnView::indexAt(const QPoint& point) const { - foreach (ColumnWidget* column, m_columns) { + foreach (DolphinColumnWidget* column, m_columns) { const QPoint topLeft = column->frameGeometry().topLeft(); const QPoint adjustedPoint(point.x() - topLeft.x(), point.y() - topLeft.y()); const QModelIndex index = column->indexAt(adjustedPoint); @@ -463,111 +109,73 @@ QRect DolphinColumnView::visualRect(const QModelIndex& index) const return activeColumn()->visualRect(index); } -void DolphinColumnView::setModel(QAbstractItemModel* model) +void DolphinColumnView::invertSelection() { - 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&))); + QItemSelectionModel* selectionModel = activeColumn()->selectionModel(); + const QAbstractItemModel* itemModel = selectionModel->model(); - KDirLister* dirLister = m_dolphinModel->dirLister(); - connect(dirLister, SIGNAL(started(const KUrl&)), - this, SLOT(slotDirListerStarted(const KUrl&))); - connect(dirLister, SIGNAL(completed()), - this, SLOT(slotDirListerCompleted())); + const QModelIndex topLeft = itemModel->index(0, 0); + const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1, + itemModel->columnCount() - 1); - activeColumn()->setModel(model); - QAbstractItemView::setModel(model); + const QItemSelection selection(topLeft, bottomRight); + selectionModel->select(selection, QItemSelectionModel::Toggle); } -void DolphinColumnView::invertSelection() +void DolphinColumnView::reload() { - // 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); + foreach (DolphinColumnWidget* column, m_columns) { + column->reload(); } } -void DolphinColumnView::reload() +void DolphinColumnView::setRootUrl(const KUrl& url) +{ + removeAllColumns(); + m_columns[0]->setUrl(url); +} + +void DolphinColumnView::setNameFilter(const QString& nameFilter) { - // 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; + if (nameFilter != m_nameFilter) { + m_nameFilter = nameFilter; + foreach (DolphinColumnWidget* column, m_columns) { + column->setNameFilter(nameFilter); } - 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(); +QString DolphinColumnView::nameFilter() const +{ + return m_nameFilter; +} + +KUrl DolphinColumnView::rootUrl() const +{ + return m_columns[0]->url(); } 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(); + if (!rootUrl().isParentOf(url)) { + setRootUrl(url); 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) { + foreach (DolphinColumnWidget* column, m_columns) { if (column->url() == url) { // the column represents already the requested URL, hence activate it requestActivation(column); + layoutColumns(); 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) { + 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); @@ -608,17 +216,14 @@ void DolphinColumnView::showColumn(const KUrl& url) ++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); + DolphinColumnWidget* column = new DolphinColumnWidget(viewport(), this, childUrl); + const QString filter = nameFilter(); + if (!filter.isEmpty()) { + column->setNameFilter(filter); + } column->setActive(false); m_columns.append(column); @@ -629,10 +234,6 @@ void DolphinColumnView::showColumn(const KUrl& url) 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(); } } @@ -641,6 +242,7 @@ void DolphinColumnView::showColumn(const KUrl& url) activeColumn()->setActive(false); m_index = columnIndex; activeColumn()->setActive(true); + assureVisibleActiveColumn(); } void DolphinColumnView::selectAll() @@ -677,12 +279,14 @@ QModelIndex DolphinColumnView::moveCursor(CursorAction cursorAction, Qt::Keyboar case MoveLeft: if (m_index > 0) { setActiveColumnIndex(m_index - 1); + m_controller->triggerUrlChangeRequest(activeColumn()->url()); } break; case MoveRight: if (m_index < m_columns.count() - 1) { setActiveColumnIndex(m_index + 1); + m_controller->triggerUrlChangeRequest(m_columns[m_index]->url()); } break; @@ -718,7 +322,7 @@ int DolphinColumnView::verticalOffset() const void DolphinColumnView::mousePressEvent(QMouseEvent* event) { - m_controller->triggerActivation(); + m_controller->requestActivation(); QAbstractItemView::mousePressEvent(event); } @@ -727,16 +331,16 @@ void DolphinColumnView::resizeEvent(QResizeEvent* event) QAbstractItemView::resizeEvent(event); layoutColumns(); updateScrollBar(); + assureVisibleActiveColumn(); } void DolphinColumnView::zoomIn() { if (isZoomInPossible()) { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - // TODO: get rid of K3Icon sizes switch (settings->iconSize()) { - case K3Icon::SizeSmall: settings->setIconSize(K3Icon::SizeMedium); break; - case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break; + case KIconLoader::SizeSmall: settings->setIconSize(KIconLoader::SizeMedium); break; + case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeLarge); break; default: Q_ASSERT(false); break; } updateDecorationSize(); @@ -747,10 +351,9 @@ void DolphinColumnView::zoomOut() { if (isZoomOutPossible()) { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - // TODO: get rid of K3Icon sizes switch (settings->iconSize()) { - case K3Icon::SizeLarge: settings->setIconSize(K3Icon::SizeMedium); break; - case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break; + case KIconLoader::SizeLarge: settings->setIconSize(KIconLoader::SizeMedium); break; + case KIconLoader::SizeMedium: settings->setIconSize(KIconLoader::SizeSmall); break; default: Q_ASSERT(false); break; } updateDecorationSize(); @@ -759,7 +362,7 @@ void DolphinColumnView::zoomOut() void DolphinColumnView::moveContentHorizontally(int x) { - m_contentX = -x; + m_contentX = isRightToLeft() ? +x : -x; layoutColumns(); } @@ -770,7 +373,7 @@ void DolphinColumnView::updateDecorationSize() foreach (QObject* object, viewport()->children()) { if (object->inherits("QListView")) { - ColumnWidget* widget = static_cast(object); + DolphinColumnWidget* widget = static_cast(object); widget->setDecorationSize(QSize(iconSize, iconSize)); } } @@ -781,79 +384,54 @@ void DolphinColumnView::updateDecorationSize() doItemsLayout(); } -void DolphinColumnView::expandToActiveUrl() +void DolphinColumnView::updateColumnsBackground(bool active) { - 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); + if (active == m_active) { + return; } - 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); -} + m_active = active; -void DolphinColumnView::updateColumns() -{ - KDirLister* dirLister = m_dolphinModel->dirLister(); - foreach (ColumnWidget* column, m_columns) { - dirLister->updateDirectory(column->url()); - } + // dim the background of the viewport + const QPalette::ColorRole role = viewport()->backgroundRole(); + QColor background = viewport()->palette().color(role); + background.setAlpha(0); // make background transparent - 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; - } - } - } + QPalette palette = viewport()->palette(); + palette.setColor(role, background); + viewport()->setPalette(palette); + + foreach (DolphinColumnWidget* column, m_columns) { + column->updateBackground(); } - assureVisibleActiveColumn(); } -void DolphinColumnView::slotDirListerStarted(const KUrl& url) +void DolphinColumnView::slotShowHiddenFilesChanged() { - Q_UNUSED(url); - m_dirListerCompleted = false; + const bool show = m_controller->dolphinView()->showHiddenFiles(); + foreach (DolphinColumnWidget* column, m_columns) { + column->setShowHiddenFiles(show); + } } -void DolphinColumnView::slotDirListerCompleted() +void DolphinColumnView::slotShowPreviewChanged() { - m_dirListerCompleted = true; - QMetaObject::invokeMethod(this, "expandToActiveUrl", Qt::QueuedConnection); + const bool show = m_controller->dolphinView()->showPreview(); + foreach (DolphinColumnWidget* column, m_columns) { + column->setShowPreview(show); + } } bool DolphinColumnView::isZoomInPossible() const { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - return settings->iconSize() < K3Icon::SizeLarge; + return settings->iconSize() < KIconLoader::SizeLarge; } bool DolphinColumnView::isZoomOutPossible() const { ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); - return settings->iconSize() > K3Icon::SizeSmall; + return settings->iconSize() > KIconLoader::SizeSmall; } void DolphinColumnView::setActiveColumnIndex(int index) @@ -870,26 +448,45 @@ void DolphinColumnView::setActiveColumnIndex(int index) m_index = index; m_columns[m_index]->setActive(true); - m_controller->setUrl(m_columns[m_index]->url()); + assureVisibleActiveColumn(); } void DolphinColumnView::layoutColumns() { - int x = m_contentX; + const int gap = 4; + 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; + + QRect emptyViewportRect; + if (isRightToLeft()) { + int x = viewport()->width() - columnWidth + m_contentX; + foreach (DolphinColumnWidget* column, m_columns) { + column->setGeometry(QRect(x, 0, columnWidth - gap, viewport()->height())); + x -= columnWidth; + } + emptyViewportRect = QRect(0, 0, x + columnWidth - gap, viewport()->height()); + } else { + int x = m_contentX; + foreach (DolphinColumnWidget* column, m_columns) { + column->setGeometry(QRect(x, 0, columnWidth - gap, viewport()->height())); + x += columnWidth; + } + emptyViewportRect = QRect(x, 0, viewport()->width() - x - gap, viewport()->height()); + } + + if (emptyViewportRect.isValid()) { + m_emptyViewport->show(); + m_emptyViewport->setGeometry(emptyViewportRect); + } else { + m_emptyViewport->hide(); } } void DolphinColumnView::updateScrollBar() { - int contentWidth = 0; - foreach (ColumnWidget* column, m_columns) { - contentWidth += column->width(); - } + ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); + const int contentWidth = m_columns.count() * settings->columnWidth(); horizontalScrollBar()->setPageStep(contentWidth); horizontalScrollBar()->setRange(0, contentWidth - viewport()->width()); @@ -899,31 +496,42 @@ void DolphinColumnView::assureVisibleActiveColumn() { const int viewportWidth = viewport()->width(); const int x = activeColumn()->x(); - const int width = activeColumn()->width(); + + ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); + const int width = settings->columnWidth(); + if (x + width > viewportWidth) { - int newContentX = m_contentX - x - width + viewportWidth; - if (newContentX > 0) { - newContentX = 0; + const int newContentX = m_contentX - x - width + viewportWidth; + if (isRightToLeft()) { + m_animation->setFrameRange(m_contentX, newContentX); + } else { + m_animation->setFrameRange(-m_contentX, -newContentX); + } + if (m_animation->state() != QTimeLine::Running) { + m_animation->start(); } - m_animation->setFrameRange(-m_contentX, -newContentX); - m_animation->start(); } else if (x < 0) { const int newContentX = m_contentX - x; - m_animation->setFrameRange(-m_contentX, -newContentX); - m_animation->start(); + if (isRightToLeft()) { + m_animation->setFrameRange(m_contentX, newContentX); + } else { + m_animation->setFrameRange(-m_contentX, -newContentX); + } + if (m_animation->state() != QTimeLine::Running) { + m_animation->start(); + } } } -void DolphinColumnView::requestActivation(ColumnWidget* column) +void DolphinColumnView::requestActivation(DolphinColumnWidget* column) { if (column->isActive()) { assureVisibleActiveColumn(); } else { int index = 0; - foreach (ColumnWidget* currColumn, m_columns) { + foreach (DolphinColumnWidget* currColumn, m_columns) { if (currColumn == column) { setActiveColumnIndex(index); - assureVisibleActiveColumn(); return; } ++index; @@ -931,4 +539,17 @@ void DolphinColumnView::requestActivation(ColumnWidget* column) } } +void DolphinColumnView::removeAllColumns() +{ + 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); + assureVisibleActiveColumn(); +} + #include "dolphincolumnview.moc"