X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5de9950182b5a1b0b99e4cc51e48d4d83b6bef24..d9f5e191a6bd32a4dc15b3a3eb34795cda7697dd:/src/dolphindetailsview.cpp diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 098fc46a0..e55c2582d 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -20,6 +20,7 @@ #include "dolphindetailsview.h" +#include "dolphinmodel.h" #include "dolphincontroller.h" #include "dolphinsettings.h" #include "dolphinsortfilterproxymodel.h" @@ -28,7 +29,11 @@ #include "dolphin_detailsmodesettings.h" #include +#include +#include +#include +#include #include #include #include @@ -52,6 +57,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr setSelectionBehavior(SelectItems); setDragDropMode(QAbstractItemView::DragDrop); setDropIndicatorShown(false); + setAlternatingRowColors(true); setMouseTracking(true); viewport()->setAttribute(Qt::WA_Hover); @@ -60,23 +66,29 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr setSortIndicatorSection(props.sorting()); setSortIndicatorOrder(props.sortOrder()); - connect(header(), SIGNAL(sectionClicked(int)), + QHeaderView* headerView = header(); + connect(headerView, SIGNAL(sectionClicked(int)), this, SLOT(synchronizeSortingState(int))); + headerView->setContextMenuPolicy(Qt::CustomContextMenu); + connect(headerView, SIGNAL(customContextMenuRequested(const QPoint&)), + this, SLOT(configureColumns(const QPoint&))); connect(parent, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(setSortIndicatorSection(DolphinView::Sorting))); connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(setSortIndicatorOrder(Qt::SortOrder))); + // 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' and to handle the + // RETURN-key in keyPressEvent(). if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + this, SLOT(triggerItem(const QModelIndex&))); } else { connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + this, SLOT(triggerItem(const QModelIndex&))); } - connect(this, SIGNAL(activated(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(slotEntered(const QModelIndex&))); connect(this, SIGNAL(viewportEntered()), @@ -85,6 +97,8 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr this, SLOT(zoomIn())); connect(controller, SIGNAL(zoomOut()), this, SLOT(zoomOut())); + connect(controller->dolphinView(), SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)), + this, SLOT(updateColumnVisibility())); // apply the details mode settings to the widget const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); @@ -96,8 +110,20 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr font.setItalic(settings->italicFont()); font.setBold(settings->boldFont()); m_viewOptions.font = font; + m_viewOptions.showDecorationSelected = true; + +// TODO: Remove this check when 4.3.2 is released and KDE requires it... this +// check avoids a division by zero happening on versions before 4.3.1. +// Right now KDE in theory can be shipped with Qt 4.3.0 and above. +// ereslibre +#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY)) + setVerticalScrollMode(QTreeView::ScrollPerPixel); + setHorizontalScrollMode(QTreeView::ScrollPerPixel); +#endif updateDecorationSize(); + + setFocus(); } DolphinDetailsView::~DolphinDetailsView() @@ -114,30 +140,25 @@ bool DolphinDetailsView::event(QEvent* event) headerView->setStretchLastSection(false); headerView->setResizeMode(QHeaderView::ResizeToContents); headerView->setResizeMode(0, QHeaderView::Stretch); + headerView->setMovable(false); - // hide columns if this is indicated by the settings - const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - Q_ASSERT(settings != 0); - if (!settings->showDate()) { - hideColumn(KDirModel::ModifiedTime); - } - - if (!settings->showPermissions()) { - hideColumn(KDirModel::Permissions); - } - - if (!settings->showOwner()) { - hideColumn(KDirModel::Owner); - } - - if (!settings->showGroup()) { - hideColumn(KDirModel::Group); - } + updateColumnVisibility(); - if (!settings->showType()) { - hideColumn(KDirModel::Type); + hideColumn(DolphinModel::Rating); + hideColumn(DolphinModel::Tags); + } +// TODO: Remove this check when 4.3.2 is released and KDE requires it... this +// check avoids a division by zero happening on versions before 4.3.1. +// Right now KDE in theory can be shipped with Qt 4.3.0 and above. +// ereslibre +#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY)) + else if (event->type() == QEvent::UpdateRequest) { + // a wheel movement will scroll 4 items + if (model()->rowCount() > 0) { + verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4); } } +#endif return QTreeView::event(event); } @@ -155,10 +176,12 @@ void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event) void DolphinDetailsView::mousePressEvent(QMouseEvent* event) { + m_controller->requestActivation(); + QTreeView::mousePressEvent(event); const QModelIndex index = indexAt(event->pos()); - if (!index.isValid() || (index.column() != KDirModel::Name)) { + if (!index.isValid() || (index.column() != DolphinModel::Name)) { const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) { clearSelection(); @@ -191,7 +214,6 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event) updateElasticBand(); m_showElasticBand = false; } - m_controller->triggerActivation(); } void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event) @@ -223,11 +245,15 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event) // TODO: remove this code when the issue #160611 is solved in Qt 4.4 setDirtyRegion(m_dropRect); const QModelIndex index = indexAt(event->pos()); - if (!index.isValid() || (index.column() != KDirModel::Name)) { + if (!index.isValid() || (index.column() != DolphinModel::Name)) { m_dragging = false; } else { m_dragging = true; - m_dropRect = visualRect(index); + if (itemForIndex(index).isDir()) { + m_dropRect = visualRect(index); + } else { + m_dropRect.setSize(QSize()); // set as invalid + } setDirtyRegion(m_dropRect); } } @@ -237,9 +263,14 @@ void DolphinDetailsView::dropEvent(QDropEvent* event) const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (!urls.isEmpty()) { event->acceptProposedAction(); + const QModelIndex index = indexAt(event->pos()); + KFileItem item; + if (index.isValid() && (index.column() == DolphinModel::Name)) { + item = itemForIndex(index); + } m_controller->indicateDroppedUrls(urls, - indexAt(event->pos()), - event->source()); + m_controller->url(), + item); } QTreeView::dropEvent(event); m_dragging = false; @@ -264,16 +295,57 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event) painter.restore(); } + // TODO: remove this code when the issue #160611 is solved in Qt 4.4 if (m_dragging) { - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - QPainter painter(viewport()); - painter.save(); - QBrush brush(m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight)); - QColor color = brush.color(); - color.setAlpha(64); - brush.setColor(color); - painter.fillRect(m_dropRect, brush); - painter.restore(); + const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight); + DolphinController::drawHoverIndication(viewport(), m_dropRect, brush); + } +} + +void DolphinDetailsView::keyPressEvent(QKeyEvent* event) +{ + QTreeView::keyPressEvent(event); + + const QItemSelectionModel* selModel = selectionModel(); + const QModelIndex currentIndex = selModel->currentIndex(); + const bool trigger = currentIndex.isValid() + && (event->key() == Qt::Key_Return) + && (selModel->selectedIndexes().count() <= 1); + if (trigger) { + triggerItem(currentIndex); + } +} + +void DolphinDetailsView::resizeEvent(QResizeEvent* event) +{ + QTreeView::resizeEvent(event); + + // assure that the width of the name-column does not get too small + const int minWidth = 120; + QHeaderView* headerView = header(); + bool useFixedWidth = (headerView->sectionSize(KDirModel::Name) <= minWidth) + && (headerView->resizeMode(0) != QHeaderView::Fixed); + if (useFixedWidth) { + // the current width of the name-column is too small, hence + // use a fixed size + headerView->setResizeMode(QHeaderView::Fixed); + headerView->setResizeMode(0, QHeaderView::Fixed); + headerView->resizeSection(KDirModel::Name, minWidth); + } else if (headerView->resizeMode(0) != QHeaderView::Stretch) { + // check whether there is enough available viewport width + // to automatically resize the columns + const int availableWidth = viewport()->width(); + + int headerWidth = 0; + const int count = headerView->count(); + for (int i = 0; i < count; ++i) { + headerWidth += headerView->sectionSize(i); + } + + if (headerWidth < availableWidth) { + headerView->setResizeMode(QHeaderView::ResizeToContents); + headerView->setResizeMode(0, QHeaderView::Stretch); + } } } @@ -302,9 +374,9 @@ void DolphinDetailsView::synchronizeSortingState(int column) void DolphinDetailsView::slotEntered(const QModelIndex& index) { const QPoint pos = viewport()->mapFromGlobal(QCursor::pos()); - const int nameColumnWidth = header()->sectionSize(KDirModel::Name); + const int nameColumnWidth = header()->sectionSize(DolphinModel::Name); if (pos.x() < nameColumnWidth) { - m_controller->emitItemEntered(index); + m_controller->emitItemEntered(itemForIndex(index)); } else { m_controller->emitViewportEntered(); @@ -320,14 +392,20 @@ void DolphinDetailsView::updateElasticBand() setDirtyRegion(dirtyRegion); } +QRect DolphinDetailsView::elasticBandRect() const +{ + const QPoint pos(contentsPos()); + const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y()); + return QRect(topLeft, m_elasticBandDestination).normalized(); +} + void DolphinDetailsView::zoomIn() { if (isZoomInPossible()) { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - // 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(); @@ -338,26 +416,103 @@ void DolphinDetailsView::zoomOut() { if (isZoomOutPossible()) { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - // 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(); } } +void DolphinDetailsView::triggerItem(const QModelIndex& index) +{ + const KFileItem item = itemForIndex(index); + if (index.isValid() && (index.column() == KDirModel::Name)) { + m_controller->triggerItem(item); + } else { + clearSelection(); + m_controller->emitItemEntered(item); + } +} + +void DolphinDetailsView::configureColumns(const QPoint& pos) +{ + KMenu popup(this); + popup.addTitle(i18nc("@title:menu", "Columns")); + + QHeaderView* headerView = header(); + for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) { + const int logicalIndex = headerView->logicalIndex(i); + const QString text = model()->headerData(i, Qt::Horizontal).toString(); + QAction* action = popup.addAction(text); + action->setCheckable(true); + action->setChecked(!headerView->isSectionHidden(logicalIndex)); + action->setData(i); + } + + QAction* activatedAction = popup.exec(header()->mapToGlobal(pos)); + if (activatedAction != 0) { + const bool show = activatedAction->isChecked(); + const int columnIndex = activatedAction->data().toInt(); + + KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo(); + KFileItemDelegate::Information info = KFileItemDelegate::NoInformation; + switch (columnIndex) { + case DolphinModel::Size: info = KFileItemDelegate::Size; break; + case DolphinModel::ModifiedTime: info = KFileItemDelegate::ModificationTime; break; + case DolphinModel::Permissions: info = KFileItemDelegate::Permissions; break; + case DolphinModel::Owner: info = KFileItemDelegate::Owner; break; + case DolphinModel::Group: info = KFileItemDelegate::OwnerAndGroup; break; + case DolphinModel::Type: info = KFileItemDelegate::FriendlyMimeType; break; + default: break; + } + + if (show) { + Q_ASSERT(!list.contains(info)); + list.append(info); + } else { + Q_ASSERT(list.contains(info)); + const int index = list.indexOf(info); + list.removeAt(index); + } + + m_controller->indicateAdditionalInfoChange(list); + setColumnHidden(columnIndex, !show); + } +} + +void DolphinDetailsView::updateColumnVisibility() +{ + KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo(); + if (list.isEmpty() || list.contains(KFileItemDelegate::NoInformation)) { + // Using the details view without any additional information (-> additional column) + // makes no sense and leads to a usability problem as no viewport area is available + // anymore. Hence as fallback provide at least a size and date column. + list.clear(); + list.append(KFileItemDelegate::Size); + list.append(KFileItemDelegate::ModificationTime); + m_controller->indicateAdditionalInfoChange(list); + } + + setColumnHidden(DolphinModel::Size, !list.contains(KFileItemDelegate::Size)); + setColumnHidden(DolphinModel::ModifiedTime, !list.contains(KFileItemDelegate::ModificationTime)); + setColumnHidden(DolphinModel::Permissions, !list.contains(KFileItemDelegate::Permissions)); + setColumnHidden(DolphinModel::Owner, !list.contains(KFileItemDelegate::Owner)); + setColumnHidden(DolphinModel::Group, !list.contains(KFileItemDelegate::OwnerAndGroup)); + setColumnHidden(DolphinModel::Type, !list.contains(KFileItemDelegate::FriendlyMimeType)); +} + bool DolphinDetailsView::isZoomInPossible() const { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - return settings->iconSize() < K3Icon::SizeLarge; + return settings->iconSize() < KIconLoader::SizeLarge; } bool DolphinDetailsView::isZoomOutPossible() const { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - return settings->iconSize() > K3Icon::SizeSmall; + return settings->iconSize() > KIconLoader::SizeSmall; } void DolphinDetailsView::updateDecorationSize() @@ -390,11 +545,12 @@ QPoint DolphinDetailsView::contentsPos() const return QPoint(0, y); } -QRect DolphinDetailsView::elasticBandRect() const +KFileItem DolphinDetailsView::itemForIndex(const QModelIndex& index) const { - const QPoint pos(contentsPos()); - const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y()); - return QRect(topLeft, m_elasticBandDestination).normalized(); + QAbstractProxyModel* proxyModel = static_cast(model()); + KDirModel* dirModel = static_cast(proxyModel->sourceModel()); + const QModelIndex dirIndex = proxyModel->mapToSource(index); + return dirModel->itemForIndex(dirIndex); } #include "dolphindetailsview.moc"