X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b8a4e0fac2820ec8fc442c2abeea700ae4947e01..fa4680cb38028aceb68d41e1937d27c71d1f121b:/src/dolphincolumnwidget.cpp diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp index 6d983f71f..afa79e78f 100644 --- a/src/dolphincolumnwidget.cpp +++ b/src/dolphincolumnwidget.cpp @@ -24,17 +24,20 @@ #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 "iconmanager.h" +#include "folderexpander.h" +#include "revisioncontrolobserver.h" #include "selectionmanager.h" -#include "tooltipmanager.h" +#include "tooltips/tooltipmanager.h" #include #include #include +#include #include #include #include @@ -44,6 +47,7 @@ #include #include #include +#include DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, DolphinColumnView* columnView, @@ -52,6 +56,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, m_active(true), m_view(columnView), m_selectionManager(0), + m_autoScroller(0), m_url(url), m_childUrl(), m_font(), @@ -59,7 +64,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, m_dirLister(0), m_dolphinModel(0), m_proxyModel(0), - m_iconManager(0), + m_previewGenerator(0), + m_toolTipManager(0), m_dropRect() { setMouseTracking(true); @@ -75,6 +81,8 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, setVerticalScrollMode(QListView::ScrollPerPixel); setHorizontalScrollMode(QListView::ScrollPerPixel); + m_autoScroller = new DolphinViewAutoScroller(this); + // apply the column mode settings to the widget const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings(); Q_ASSERT(settings != 0); @@ -92,6 +100,7 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, setDecorationSize(QSize(iconSize, iconSize)); KFileItemDelegate* delegate = new KFileItemDelegate(this); + delegate->setShowToolTipWhenElided(false); setItemDelegate(delegate); activate(); @@ -101,8 +110,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); @@ -119,11 +127,11 @@ 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) { + + if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) { m_selectionManager = new SelectionManager(this); connect(m_selectionManager, SIGNAL(selectionChanged()), this, SLOT(requestActivation())); @@ -131,17 +139,24 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent, m_selectionManager, SLOT(reset())); } - 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()) { - new ToolTipManager(this, m_proxyModel); + 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&))); + + new RevisionControlObserver(this); } DolphinColumnWidget::~DolphinColumnWidget() @@ -158,8 +173,8 @@ void DolphinColumnWidget::setDecorationSize(const QSize& size) setIconSize(size); m_decorationSize = size; doItemsLayout(); - if (m_iconManager != 0) { - m_iconManager->updatePreviews(); + if (m_previewGenerator != 0) { + m_previewGenerator->updateIcons(); } if (m_selectionManager != 0) { m_selectionManager->reset(); @@ -168,16 +183,18 @@ void DolphinColumnWidget::setDecorationSize(const QSize& size) 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(); + } } } @@ -197,6 +214,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()) { @@ -208,7 +230,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); @@ -272,6 +294,12 @@ KFileItemList DolphinColumnWidget::selectedItems() const return itemList; } +QMimeData* DolphinColumnWidget::selectionMimeData() const +{ + const QItemSelection selection = m_proxyModel->mapSelectionToSource(selectionModel()->selection()); + return m_dolphinModel->mimeData(selection.indexes()); +} + QStyleOptionViewItem DolphinColumnWidget::viewOptions() const { QStyleOptionViewItem viewOptions = QListView::viewOptions(); @@ -283,13 +311,14 @@ 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(); } } @@ -317,7 +346,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(); } @@ -325,16 +354,10 @@ 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); } @@ -376,7 +399,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) @@ -386,6 +436,7 @@ 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); @@ -394,13 +445,13 @@ void DolphinColumnWidget::contextMenuEvent(QContextMenuEvent* event) clearSelection(); } - 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 (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) @@ -415,6 +466,10 @@ void DolphinColumnWidget::wheelEvent(QWheelEvent* event) 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); } @@ -436,6 +491,12 @@ 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); + m_autoScroller->handleCurrentIndexChange(current, previous); +} + void DolphinColumnWidget::slotEntered(const QModelIndex& index) { m_view->m_controller->setItemView(this); @@ -467,9 +528,6 @@ 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&))); @@ -478,8 +536,9 @@ void DolphinColumnWidget::activate() m_view->m_controller, SLOT(triggerItem(const QModelIndex&))); } - if (selectionModel() && selectionModel()->currentIndex().isValid()) + if (selectionModel() && selectionModel()->currentIndex().isValid()) { selectionModel()->setCurrentIndex(selectionModel()->currentIndex(), QItemSelectionModel::SelectCurrent); + } updateBackground(); } @@ -487,10 +546,6 @@ 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&)), m_view->m_controller, SLOT(triggerItem(const QModelIndex&)));