/***************************************************************************
- * Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at> *
+ * Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at> *
* Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net> *
* *
* This program is free software; you can redistribute it and/or modify *
#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"
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);
this, SLOT(clearHoverInformation()));
KDirLister* dirLister = m_viewAccessor.dirLister();
- connect(dirLister, SIGNAL(redirection(KUrl, KUrl)),
- this, SIGNAL(redirection(KUrl, KUrl)));
+ connect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
+ this, SLOT(slotRedirection(KUrl,KUrl)));
connect(dirLister, SIGNAL(completed()),
this, SLOT(slotDirListerCompleted()));
connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
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
bool DolphinView::hasSelection() const
{
- return m_viewAccessor.itemView()->selectionModel()->hasSelection();
+ const QAbstractItemView* view = m_viewAccessor.itemView();
+ return view && view->selectionModel()->hasSelection();
}
void DolphinView::clearSelection()
void DolphinView::setContentsPosition(int x, int y)
{
QAbstractItemView* view = m_viewAccessor.itemView();
+ Q_ASSERT(view != 0);
view->horizontalScrollBar()->setValue(x);
view->verticalScrollBar()->setValue(y);
QPoint DolphinView::contentsPosition() const
{
- const int x = m_viewAccessor.itemView()->horizontalScrollBar()->value();
- const int y = m_viewAccessor.itemView()->verticalScrollBar()->value();
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ Q_ASSERT(view != 0);
+ const int x = view->horizontalScrollBar()->value();
+ const int y = view->verticalScrollBar()->value();
return QPoint(x, y);
}
QList<QAction*> 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)
return;
}
delete dialog;
-
+
// the selection would be invalid after renaming the items, so just clear
// it before
clearSelection();
// 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)
m_viewAccessor.dirLister()->setShowingDotFiles(show);
emit showHiddenFilesChanged();
-
- loadDirectory(viewPropsUrl);
}
void DolphinView::setCategorizedSorting(bool categorized)
setActive(true);
}
-void DolphinView::wheelEvent(QWheelEvent* event)
-{
- if (event->modifiers() & Qt::ControlModifier) {
- const int delta = event->delta();
- const int level = zoomLevel();
- if (delta > 0) {
- setZoomLevel(level + 1);
- } else if (delta < 0) {
- setZoomLevel(level - 1);
- }
- event->accept();
- }
-}
-
bool DolphinView::eventFilter(QObject* watched, QEvent* event)
{
switch (event->type()) {
}
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);
}
break;
+ case QEvent::Wheel:
+ if (watched == m_viewAccessor.itemView()->viewport()) {
+ // Ctrl+wheel events should cause icon zooming, but not if the left mouse button is pressed
+ // (the user is probably trying to scroll during a selection in that case)
+ QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
+ if (wheelEvent->modifiers() & Qt::ControlModifier && !(wheelEvent->buttons() & Qt::LeftButton)) {
+ const int delta = wheelEvent->delta();
+ const int level = zoomLevel();
+ if (delta > 0) {
+ setZoomLevel(level + 1);
+ } else if (delta < 0) {
+ setZoomLevel(level - 1);
+ }
+ return true;
+ }
+ }
+ break;
+
default:
break;
}
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;
connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection()));
}
- m_viewAccessor.dirLister()->stop();
m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
}
createView();
}
Q_ASSERT(m_viewAccessor.itemView() != 0);
- Q_ASSERT(m_fileItemDelegate != 0);
+ Q_ASSERT(m_viewAccessor.itemDelegate() != 0);
const bool showHiddenFiles = props.showHiddenFiles();
if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
void DolphinView::createView()
{
deleteView();
+
Q_ASSERT(m_viewAccessor.itemView() == 0);
m_viewAccessor.createView(this, m_controller, m_mode);
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
}
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());
}
m_topLayout->removeWidget(view);
view->close();
+ // disconnect all signal/slots
disconnect(view);
m_controller->disconnect(view);
view->disconnect();
-
- // TODO: move this code into ViewAccessor::deleteView()
- deleteWhenNotDragSource(view);
- view = 0;
+ disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+ this, SLOT(emitContentsMoved()));
+ disconnect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+ this, SLOT(emitContentsMoved()));
m_viewAccessor.deleteView();
}
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,
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;
- m_columnsContainer->deleteLater();
+ if (m_columnsContainer != 0) {
+ m_columnsContainer->deleteLater();
+ }
m_columnsContainer = 0;
}
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();
return m_detailsView != 0;
}
-
DolphinModel* DolphinView::ViewAccessor::dirModel() const
{
return static_cast<DolphinModel*>(proxyModel()->sourceModel());
return dirModel()->dirLister();
}
+void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+{
+ emit redirection(oldUrl, newUrl);
+ m_controller->redirectToUrl(newUrl); // #186947
+}
+
#include "dolphinview.moc"
projects / dolphin.git / blobdiff