X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/518372394da1f58da8e69acbb981a97db375e739..29c5ab3b74d26657c60b40770676be082caa953d:/src/dolphincolumnwidget.cpp?ds=sidebyside diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index b1050afda..e85c9491b 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -24,27 +24,29 @@ #include "dolphincontroller.h" #include "dolphindirlister.h" #include "dolphinsortfilterproxymodel.h" -#include "dolphinsettings.h" +#include "settings/dolphinsettings.h" +#include "dolphinviewautoscroller.h" #include "dolphin_columnmodesettings.h" #include "dolphin_generalsettings.h" #include "draganddrophelper.h" +#include "folderexpander.h" #include "selectionmanager.h" +#include "tooltips/tooltipmanager.h" #include #include #include +#include #include #include #include -#include #include -#include "iconmanager.h" - #include #include #include #include +#include DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, DolphinColumnView* columnView, @@ -52,6 +54,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, QListView(parent), m_active(true), m_view(columnView), + m_selectionManager(0), + m_autoScroller(0), m_url(url), m_childUrl(), m_font(), @@ -59,12 +63,11 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, m_dirLister(0), m_dolphinModel(0), m_proxyModel(0), - m_iconManager(0), - m_dragging(false), + m_previewGenerator(0), + m_toolTipManager(0), m_dropRect() { setMouseTracking(true); - viewport()->setAttribute(Qt::WA_Hover); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setSelectionBehavior(SelectItems); @@ -72,15 +75,12 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, setDragDropMode(QAbstractItemView::DragDrop); setDropIndicatorShown(false); setSelectionRectVisible(true); + setEditTriggers(QAbstractItemView::NoEditTriggers); -// 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(QListView::ScrollPerPixel); setHorizontalScrollMode(QListView::ScrollPerPixel); -#endif + + m_autoScroller = new DolphinViewAutoScroller(this); // apply the column mode settings to the widget const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); @@ -99,6 +99,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, setDecorationSize(QSize(iconSize, iconSize)); KFileItemDelegate* delegate = new KFileItemDelegate(this); + delegate->setShowToolTipWhenElided(false); setItemDelegate(delegate); activate(); @@ -108,8 +109,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(slotEntered(const QModelIndex&))); - //m_dirLister = new DolphinDirLister(); TODO - m_dirLister = new KDirLister(); + m_dirLister = new DolphinDirLister(); m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(window()); m_dirLister->setDelayedMimeTypes(true); @@ -126,26 +126,34 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, const DolphinView* dolphinView = m_view->m_controller->dolphinView(); m_proxyModel->setSorting(dolphinView->sorting()); m_proxyModel->setSortOrder(dolphinView->sortOrder()); + m_proxyModel->setSortFoldersFirst(dolphinView->sortFoldersFirst()); setModel(m_proxyModel); - const bool useSelManager = KGlobalSettings::singleClick() && - DolphinSettings::instance().generalSettings()->showSelectionToggle(); - if (useSelManager) { - SelectionManager* selManager = new SelectionManager(this); - connect(selManager, SIGNAL(selectionChanged()), + + if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) { + m_selectionManager = new SelectionManager(this); + connect(m_selectionManager, SIGNAL(selectionChanged()), this, SLOT(requestActivation())); connect(m_view->m_controller, SIGNAL(urlChanged(const KUrl&)), - selManager, SLOT(reset())); + m_selectionManager, SLOT(reset())); } - new KMimeTypeResolver(this, m_dolphinModel); - m_iconManager = new IconManager(this, m_proxyModel); - m_iconManager->setShowPreview(m_view->m_controller->dolphinView()->showPreview()); + m_previewGenerator = new KFilePreviewGenerator(this); + m_previewGenerator->setPreviewShown(m_view->m_controller->dolphinView()->showPreview()); + + if (DolphinSettings::instance().generalSettings()->showToolTips()) { + m_toolTipManager = new ToolTipManager(this, m_proxyModel); + } m_dirLister->openUrl(url, KDirLister::NoFlags); connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()), this, SLOT(updateFont())); + + FolderExpander* folderExpander = new FolderExpander(this, m_proxyModel); + folderExpander->setEnabled(DolphinSettings::instance().generalSettings()->autoExpandFolders()); + connect (folderExpander, SIGNAL(enterDir(const QModelIndex&)), + m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); } DolphinColumnWidget::~DolphinColumnWidget() @@ -162,20 +170,28 @@ void DolphinColumnWidget::setDecorationSize(const QSize& size) setIconSize(size); m_decorationSize = size; doItemsLayout(); + if (m_previewGenerator != 0) { + m_previewGenerator->updateIcons(); + } + if (m_selectionManager != 0) { + m_selectionManager->reset(); + } } void DolphinColumnWidget::setActive(bool active) { - if (m_active == active) { - return; + if (active && (m_view->focusProxy() != this)) { + m_view->setFocusProxy(this); } - m_active = active; + if (m_active != active) { + m_active = active; - if (active) { - activate(); - } else { - deactivate(); + if (active) { + activate(); + } else { + deactivate(); + } } } @@ -195,6 +211,11 @@ void DolphinColumnWidget::setSortOrder(Qt::SortOrder order) m_proxyModel->setSortOrder(order); } +void DolphinColumnWidget::setSortFoldersFirst(bool foldersFirst) +{ + m_proxyModel->setSortFoldersFirst(foldersFirst); +} + void DolphinColumnWidget::setShowHiddenFiles(bool show) { if (show != m_dirLister->showingDotFiles()) { @@ -206,7 +227,7 @@ void DolphinColumnWidget::setShowHiddenFiles(bool show) void DolphinColumnWidget::setShowPreview(bool show) { - m_iconManager->setShowPreview(show); + m_previewGenerator->setPreviewShown(show); m_dirLister->stop(); m_dirLister->openUrl(m_url, KDirLister::Reload); @@ -234,6 +255,47 @@ void DolphinColumnWidget::setNameFilter(const QString& nameFilter) m_proxyModel->setFilterRegExp(nameFilter); } +void DolphinColumnWidget::editItem(const KFileItem& item) +{ + const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); + const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); + if (proxyIndex.isValid()) { + edit(proxyIndex); + } +} + +KFileItem DolphinColumnWidget::itemAt(const QPoint& pos) const +{ + KFileItem item; + const QModelIndex index = indexAt(pos); + if (index.isValid() && (index.column() == DolphinModel::Name)) { + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + item = m_dolphinModel->itemForIndex(dolphinModelIndex); + } + return item; +} + +KFileItemList DolphinColumnWidget::selectedItems() const +{ + const QItemSelection selection = m_proxyModel->mapSelectionToSource(selectionModel()->selection()); + KFileItemList itemList; + + const QModelIndexList indexList = selection.indexes(); + foreach (const QModelIndex &index, indexList) { + KFileItem item = m_dolphinModel->itemForIndex(index); + if (!item.isNull()) { + itemList.append(item); + } + } + + return itemList; +} + +QMimeData* DolphinColumnWidget::selectionMimeData() const +{ + const QItemSelection selection = m_proxyModel->mapSelectionToSource(selectionModel()->selection()); + return m_dolphinModel->mimeData(selection.indexes()); +} QStyleOptionViewItem DolphinColumnWidget::viewOptions() const { @@ -246,24 +308,20 @@ QStyleOptionViewItem DolphinColumnWidget::viewOptions() const void DolphinColumnWidget::startDrag(Qt::DropActions supportedActions) { - DragAndDropHelper::startDrag(this, supportedActions); + DragAndDropHelper::instance().startDrag(this, supportedActions, m_view->m_controller); } void DolphinColumnWidget::dragEnterEvent(QDragEnterEvent* event) { - if (event->mimeData()->hasUrls()) { + if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) { event->acceptProposedAction(); + requestActivation(); } - - m_dragging = true; } void DolphinColumnWidget::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); } @@ -285,7 +343,7 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event) } setDirtyRegion(m_dropRect); - if (event->mimeData()->hasUrls()) { + if (DragAndDropHelper::instance().isMimeDataSupported(event->mimeData())) { // accept url drops, independently from the destination item event->acceptProposedAction(); } @@ -293,18 +351,11 @@ void DolphinColumnWidget::dragMoveEvent(QDragMoveEvent* event) void DolphinColumnWidget::dropEvent(QDropEvent* event) { - const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); - if (!urls.isEmpty()) { - const QModelIndex index = indexAt(event->pos()); - m_view->m_controller->setItemView(this); - const KFileItem item = m_view->m_controller->itemForIndex(index); - m_view->m_controller->indicateDroppedUrls(urls, - url(), - item); - event->acceptProposedAction(); - } + const QModelIndex index = indexAt(event->pos()); + m_view->m_controller->setItemView(this); + const KFileItem item = m_view->m_controller->itemForIndex(index); + m_view->m_controller->indicateDroppedUrls(item, url(), event); QListView::dropEvent(event); - m_dragging = false; } void DolphinColumnWidget::paintEvent(QPaintEvent* event) @@ -316,30 +367,28 @@ void DolphinColumnWidget::paintEvent(QPaintEvent* event) 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 = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight); - DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush); - } } void DolphinColumnWidget::mousePressEvent(QMouseEvent* event) { requestActivation(); + if (!indexAt(event->pos()).isValid()) { + if (QApplication::mouseButtons() & Qt::MidButton) { + m_view->m_controller->replaceUrlByClipboard(); + } + } else if (event->button() == Qt::LeftButton) { + // TODO: see comment in DolphinIconsView::mousePressEvent() + setState(QAbstractItemView::DraggingState); + } QListView::mousePressEvent(event); } @@ -347,7 +396,34 @@ void DolphinColumnWidget::keyPressEvent(QKeyEvent* event) { QListView::keyPressEvent(event); requestActivation(); - m_view->m_controller->handleKeyPressEvent(event); + + DolphinController* controller = m_view->m_controller; + controller->handleKeyPressEvent(event); + switch (event->key()) { + case Qt::Key_Right: { + // Special key handling for the column: A Key_Right should + // open a new column for the currently selected folder. + const QModelIndex index = currentIndex(); + const KFileItem item = controller->itemForIndex(index); + if (!item.isNull() && item.isDir()) { + controller->emitItemTriggered(item); + } + break; + } + + case Qt::Key_Escape: + selectionModel()->setCurrentIndex(selectionModel()->currentIndex(), + QItemSelectionModel::Current | + QItemSelectionModel::Clear); + break; + + default: + break; + } + + if (m_toolTipManager != 0) { + m_toolTipManager->hideTip(); + } } void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event) @@ -357,30 +433,52 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event) Q_ASSERT(m_view->m_controller->itemView() == this); m_view->m_controller->triggerUrlChangeRequest(m_url); } + Q_ASSERT(m_active); 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()); - Q_ASSERT(m_view->m_controller->itemView() == this); - m_view->m_controller->triggerContextMenuRequest(pos); + if (!index.isValid()) { + clearSelection(); } + + if (m_toolTipManager != 0) { + m_toolTipManager->hideTip(); + } + + const QPoint pos = m_view->viewport()->mapFromGlobal(event->globalPos()); + Q_ASSERT(m_view->m_controller->itemView() == this); + m_view->m_controller->triggerContextMenuRequest(pos); } void DolphinColumnWidget::wheelEvent(QWheelEvent* event) { + if (m_selectionManager != 0) { + m_selectionManager->reset(); + } + // let Ctrl+wheel events propagate to the DolphinView for icon zooming - // (installing an event filter does not work, as the wheel event is handled first) if (event->modifiers() & Qt::ControlModifier) { event->ignore(); return; } + + const int height = m_decorationSize.height(); + const int step = (height >= KIconLoader::SizeHuge) ? height / 10 : (KIconLoader::SizeHuge - height) / 2; + verticalScrollBar()->setSingleStep(step); + QListView::wheelEvent(event); } +void DolphinColumnWidget::leaveEvent(QEvent* event) +{ + QListView::leaveEvent(event); + // if the mouse is above an item and moved very fast outside the widget, + // no viewportEntered() signal might be emitted although the mouse has been moved + // above the viewport + m_view->m_controller->emitViewportEntered(); +} + void DolphinColumnWidget::selectionChanged(const QItemSelection& selected, const QItemSelection& deselected) { QListView::selectionChanged(selected, deselected); @@ -390,21 +488,51 @@ void DolphinColumnWidget::selectionChanged(const QItemSelection& selected, const selModel->select(deselected, QItemSelectionModel::Deselect); } +void DolphinColumnWidget::currentChanged(const QModelIndex& current, const QModelIndex& previous) +{ + QListView::currentChanged(current, previous); + if (current.isValid() && !m_autoScroller->isActive()) { + scrollTo(current); + } +} + void DolphinColumnWidget::slotEntered(const QModelIndex& index) { m_view->m_controller->setItemView(this); m_view->m_controller->emitItemEntered(index); } +void DolphinColumnWidget::slotClicked(const QModelIndex& index) +{ + DolphinController* controller = m_view->m_controller; + if (KGlobalSettings::singleClick()) { + controller->triggerItem(index); + } else { + // even when using double click, a directory should be opened + // after the first click + const KFileItem item = controller->itemForIndex(index); + if (!item.isNull() && item.isDir()) { + controller->triggerItem(index); + } + } +} + +void DolphinColumnWidget::slotDoubleClicked(const QModelIndex& index) +{ + if (!KGlobalSettings::singleClick()) { + m_view->m_controller->triggerItem(index); + } +} + void DolphinColumnWidget::requestActivation() { + m_view->m_controller->setItemView(this); m_view->m_controller->requestActivation(); if (!m_active) { m_view->requestActivation(this); m_view->m_controller->triggerUrlChangeRequest(m_url); selectionModel()->clear(); } - Q_ASSERT(m_view->m_controller->itemView() == this); } void DolphinColumnWidget::updateFont() @@ -421,19 +549,16 @@ void DolphinColumnWidget::activate() { setFocus(Qt::OtherFocusReason); - // 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&))); - } + connect(this, SIGNAL(clicked(const QModelIndex&)), + m_view->m_controller, SLOT(requestTab(const QModelIndex&))); + connect(this, SIGNAL(clicked(const QModelIndex&)), + this, SLOT(slotClicked(const QModelIndex&))); + connect(this, SIGNAL(doubleClicked(const QModelIndex&)), + this, SLOT(slotDoubleClicked(const QModelIndex&))); - if (selectionModel() && selectionModel()->currentIndex().isValid()) + if (selectionModel() && selectionModel()->currentIndex().isValid()) { selectionModel()->setCurrentIndex(selectionModel()->currentIndex(), QItemSelectionModel::SelectCurrent); + } updateBackground(); } @@ -441,17 +566,12 @@ void DolphinColumnWidget::activate() void DolphinColumnWidget::deactivate() { clearFocus(); - - // 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&)), - this, SLOT(triggerItem(const QModelIndex&))); - } else { - disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); - } + disconnect(this, SIGNAL(clicked(const QModelIndex&)), + m_view->m_controller, SLOT(requestTab(const QModelIndex&))); + disconnect(this, SIGNAL(clicked(const QModelIndex&)), + this, SLOT(slotClicked(const QModelIndex&))); + disconnect(this, SIGNAL(doubleClicked(const QModelIndex&)), + this, SLOT(slotDoubleClicked(const QModelIndex&))); const QModelIndex current = selectionModel()->currentIndex(); selectionModel()->clear();