X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bdd6c8b26c73ae545b7c062abb2d6b13ed7ebc92..fda626e07459cbd6901cbeb51da1058d0d4b3f8c:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index c19b52fbc..476f6591d 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006-2009 by Peter Penz * * Copyright (C) 2006 by Gregor Kališnik * * * * This program is free software; you can redistribute it and/or modify * @@ -60,10 +60,8 @@ #include "dolphiniconsview.h" #include "dolphin_generalsettings.h" #include "draganddrophelper.h" -#include "folderexpander.h" #include "renamedialog.h" #include "settings/dolphinsettings.h" -#include "versioncontrolobserver.h" #include "viewproperties.h" #include "zoomlevelinfo.h" @@ -94,13 +92,11 @@ DolphinView::DolphinView(QWidget* parent, m_viewAccessor(proxyModel), m_selectionModel(0), m_selectionChangedTimer(0), - m_versionControlObserver(0), m_rootUrl(), m_activeItemUrl(), m_createdItemUrl(), m_selectedItems(), - m_newFileNames(), - m_expandedDragSource(0) + m_newFileNames() { m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); @@ -151,14 +147,18 @@ DolphinView::DolphinView(QWidget* parent, connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)), this, SLOT(observeCreatedItem(const KUrl&))); + m_selectionChangedTimer = new QTimer(this); + m_selectionChangedTimer->setSingleShot(true); + m_selectionChangedTimer->setInterval(300); + connect(m_selectionChangedTimer, SIGNAL(timeout()), + this, SLOT(emitSelectionChangedSignal())); + applyViewProperties(); m_topLayout->addWidget(m_viewAccessor.itemView()); } DolphinView::~DolphinView() { - delete m_expandedDragSource; - m_expandedDragSource = 0; } const KUrl& DolphinView::url() const @@ -246,7 +246,7 @@ void DolphinView::setMode(Mode mode) emit modeChanged(); updateZoomLevel(oldZoomLevel); - if (m_showPreview) { + if (m_showPreview) { loadDirectory(viewPropsUrl); } } @@ -570,9 +570,7 @@ QString DolphinView::statusBarText() const QList DolphinView::versionControlActions(const KFileItemList& items) const { - return items.isEmpty() - ? m_versionControlObserver->contextMenuActions(url().path(KUrl::AddTrailingSlash)) - : m_versionControlObserver->contextMenuActions(items); + return m_controller->versionControlActions(items); } void DolphinView::setUrl(const KUrl& url) @@ -753,8 +751,6 @@ void DolphinView::setShowPreview(bool show) // As the view does not emit a signal when the icon size has been changed, // the used zoom level of the controller must be adjusted manually: updateZoomLevel(oldZoomLevel); - - loadDirectory(viewPropsUrl); } void DolphinView::setShowHiddenFiles(bool show) @@ -769,8 +765,6 @@ void DolphinView::setShowHiddenFiles(bool show) m_viewAccessor.dirLister()->setShowingDotFiles(show); emit showHiddenFilesChanged(); - - loadDirectory(viewPropsUrl); } void DolphinView::setCategorizedSorting(bool categorized) @@ -856,18 +850,6 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) } break; - case QEvent::MouseButtonPress: - if ((watched == m_viewAccessor.itemView()->viewport()) && (m_expandedDragSource != 0)) { - // Listening to a mousebutton press event to delete expanded views is a - // workaround, as it seems impossible for the FolderExpander to know when - // a dragging outside a view has been finished. However it works quite well: - // A mousebutton press event indicates that a drag operation must be - // finished already. - m_expandedDragSource->deleteLater(); - m_expandedDragSource = 0; - } - break; - case QEvent::DragEnter: if (watched == m_viewAccessor.itemView()->viewport()) { setActive(true); @@ -1067,26 +1049,6 @@ bool DolphinView::itemsExpandable() const return m_viewAccessor.itemsExpandable(); } -void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view) -{ - if (view == 0) - return; - - if (DragAndDropHelper::instance().isDragSource(view)) { - // We must store for later deletion. - if (m_expandedDragSource != 0) { - // The old stored view is obviously not the drag source anymore. - m_expandedDragSource->deleteLater(); - m_expandedDragSource = 0; - } - view->hide(); - m_expandedDragSource = view; - } - else { - view->deleteLater(); - } -} - void DolphinView::observeCreatedItem(const KUrl& url) { m_createdItemUrl = url; @@ -1211,7 +1173,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload) connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection())); } - m_viewAccessor.dirLister()->stop(); m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); } @@ -1306,33 +1267,10 @@ void DolphinView::createView() Q_ASSERT(view != 0); view->installEventFilter(this); view->viewport()->installEventFilter(this); - setFocusProxy(view); - - /* TODO: enable folder expanding again later - - if (m_mode != ColumnView) { - // Give the view the ability to auto-expand its directories on hovering - // (the column view takes care about this itself). If the details view - // uses expandable folders, the auto-expanding should be used always. - FolderExpander* folderExpander = new FolderExpander(view, m_viewAccessor.proxyModel()); - folderExpander->setEnabled(m_viewAccessor.hasExpandableFolders()); - connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)), - m_controller, SLOT(triggerItem(const QModelIndex&))); - - } - else { - // Listen out for requests to delete the current column. - connect(m_viewAccessor.columnsContainer(), SIGNAL(requestColumnDeletion(QAbstractItemView*)), - this, SLOT(deleteWhenNotDragSource(QAbstractItemView*))); - }*/ m_controller->setItemView(view); - - m_selectionChangedTimer = new QTimer(this); - m_selectionChangedTimer->setSingleShot(true); - m_selectionChangedTimer->setInterval(300); - connect(m_selectionChangedTimer, SIGNAL(timeout()), - this, SLOT(emitSelectionChangedSignal())); + connect(m_controller, SIGNAL(selectionChanged()), + this, SLOT(emitDelayedSelectionChangedSignal())); // When changing the view mode, the selection is lost due to reinstantiating // a new item view with a custom selection model. Pass the ownership of the @@ -1344,23 +1282,12 @@ void DolphinView::createView() } m_selectionModel->setParent(this); - view->setSelectionMode(QAbstractItemView::ExtendedSelection); - - m_versionControlObserver = new VersionControlObserver(view); - connect(m_versionControlObserver, SIGNAL(infoMessage(const QString&)), - this, SIGNAL(infoMessage(const QString&))); - connect(m_versionControlObserver, SIGNAL(errorMessage(const QString&)), - this, SIGNAL(errorMessage(const QString&))); - connect(m_versionControlObserver, SIGNAL(operationCompletedMessage(const QString&)), - this, SIGNAL(operationCompletedMessage(const QString&))); - - connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(emitDelayedSelectionChangedSignal())); connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(emitContentsMoved())); connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(emitContentsMoved())); + setFocusProxy(m_viewAccessor.layoutTarget()); m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget()); } @@ -1382,10 +1309,6 @@ void DolphinView::deleteView() m_controller->disconnect(view); view->disconnect(); - // TODO: move this code into ViewAccessor::deleteView() - deleteWhenNotDragSource(view); - view = 0; - m_viewAccessor.deleteView(); } } @@ -1434,10 +1357,17 @@ DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) m_iconsView(0), m_detailsView(0), m_columnsContainer(0), - m_proxyModel(proxyModel) + m_proxyModel(proxyModel), + m_dragSource(0) { } +DolphinView::ViewAccessor::~ViewAccessor() +{ + delete m_dragSource; + m_dragSource = 0; +} + void DolphinView::ViewAccessor::createView(QWidget* parent, DolphinController* controller, Mode mode) @@ -1464,9 +1394,25 @@ void DolphinView::ViewAccessor::createView(QWidget* parent, void DolphinView::ViewAccessor::deleteView() { - // TODO: Move the deleteWhenNotDragSource() code into the view - // accessor, so that creating and deleting is fully done by - // the view accessor. + QAbstractItemView* view = itemView(); + if (view != 0) { + if (DragAndDropHelper::instance().isDragSource(view)) { + // The view is a drag source (the feature "Open folders + // during drag operations" is used). Deleting the view + // during an ongoing drag operation is not allowed, so + // this will postponed. + if (m_dragSource != 0) { + // the old stored view is obviously not the drag source anymore + m_dragSource->deleteLater(); + m_dragSource = 0; + } + view->hide(); + m_dragSource = view; + } else { + view->deleteLater(); + } + } + m_iconsView = 0; m_detailsView = 0; @@ -1522,13 +1468,6 @@ bool DolphinView::ViewAccessor::supportsCategorizedSorting() const return m_iconsView != 0; } -bool DolphinView::ViewAccessor::hasExpandableFolders() const -{ - const DolphinSettings& settings = DolphinSettings::instance(); - return settings.generalSettings()->autoExpandFolders() || - ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders()); -} - bool DolphinView::ViewAccessor::itemsExpandable() const { return (m_detailsView != 0) && m_detailsView->itemsExpandable(); @@ -1541,7 +1480,6 @@ bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const return m_detailsView != 0; } - DolphinModel* DolphinView::ViewAccessor::dirModel() const { return static_cast(proxyModel()->sourceModel());