#include "dolphinview.h"
+#include <QAbstractItemView>
#include <QApplication>
#include <QClipboard>
#include <QKeyEvent>
m_mode(DolphinView::IconsView),
m_topLayout(0),
m_controller(0),
- m_fileItemDelegate(0),
m_viewAccessor(proxyModel),
+ m_selectionModel(0),
m_selectionChangedTimer(0),
m_versionControlObserver(0),
m_rootUrl(),
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());
}
// the file item delegate has been recreated, apply the current
// additional information manually
const KFileItemDelegate::InformationList infoList = props.additionalInfo();
- m_fileItemDelegate->setShowInformation(infoList);
+ m_viewAccessor.itemDelegate()->setShowInformation(infoList);
emit additionalInfoChanged();
// Not all view modes support categorized sorting. Adjust the sorting model
const KUrl viewPropsUrl = rootUrl();
ViewProperties props(viewPropsUrl);
props.setAdditionalInfo(info);
- m_fileItemDelegate->setShowInformation(info);
+ m_viewAccessor.itemDelegate()->setShowInformation(info);
emit additionalInfoChanged();
KFileItemDelegate::InformationList DolphinView::additionalInfo() const
{
- return m_fileItemDelegate->showInformation();
+ return m_viewAccessor.itemDelegate()->showInformation();
}
void DolphinView::reload()
}
m_controller->setUrl(url); // emits urlChanged, which we forward
- if (m_viewAccessor.prepareUrlChange(url)) {
- initializeView();
- }
+ m_viewAccessor.prepareUrlChange(url);
applyViewProperties();
loadDirectory(url);
// 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)
props.setAdditionalInfo(info);
props.save();
- m_fileItemDelegate->setShowInformation(info);
+ m_viewAccessor.itemDelegate()->setShowInformation(info);
emit additionalInfoChanged();
}
showGroupInfo->setEnabled(enable);
showMimeInfo->setEnabled(enable);
- foreach (KFileItemDelegate::Information info, m_fileItemDelegate->showInformation()) {
+ foreach (KFileItemDelegate::Information info, m_viewAccessor.itemDelegate()->showInformation()) {
switch (info) {
case KFileItemDelegate::Size:
showSizeInfo->setChecked(true);
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()) {
}
KFileItemDelegate::InformationList info = props.additionalInfo();
- if (info != m_fileItemDelegate->showInformation()) {
- m_fileItemDelegate->setShowInformation(info);
+ if (info != m_viewAccessor.itemDelegate()->showInformation()) {
+ m_viewAccessor.itemDelegate()->setShowInformation(info);
emit additionalInfoChanged();
}
deleteView();
Q_ASSERT(m_viewAccessor.itemView() == 0);
m_viewAccessor.createView(this, m_controller, m_mode);
- initializeView();
- m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
-}
-
-void DolphinView::deleteView()
-{
- QAbstractItemView* view = m_viewAccessor.itemView();
- if (view != 0) {
- // It's important to set the keyboard focus to the parent
- // before deleting the view: Otherwise when having a split
- // view the other view will get the focus and will request
- // an activation (see DolphinView::eventFilter()).
- setFocusProxy(0);
- setFocus();
-
- m_topLayout->removeWidget(view);
- view->close();
- disconnect(view);
- m_controller->disconnect(view);
- view->disconnect();
-
- // TODO: move this code into ViewAccessor::deleteView()
- deleteWhenNotDragSource(view);
- view = 0;
-
- m_viewAccessor.deleteView();
- m_fileItemDelegate = 0;
- }
-}
-
-void DolphinView::initializeView()
-{
QAbstractItemView* view = m_viewAccessor.itemView();
Q_ASSERT(view != 0);
view->installEventFilter(this);
view->viewport()->installEventFilter(this);
- setFocusProxy(view);
- //if (m_mode != ColumnView) {
+
+ /* 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.
connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
m_controller, SLOT(triggerItem(const QModelIndex&)));
- // TODO: enable again later
- /*}
+ }
else {
// Listen out for requests to delete the current column.
connect(m_viewAccessor.columnsContainer(), SIGNAL(requestColumnDeletion(QAbstractItemView*)),
m_controller->setItemView(view);
- m_fileItemDelegate = new DolphinFileItemDelegate(view);
- m_fileItemDelegate->setShowToolTipWhenElided(false);
- m_fileItemDelegate->setMinimizedNameColumn(m_mode == DetailsView);
- view->setItemDelegate(m_fileItemDelegate);
-
- // TODO: reactivate selection model
- /*view->setModel(m_viewAccessor.proxyModel());
+ // 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
+ // selection model to DolphinView, so that it can be shared by all item views.
if (m_selectionModel != 0) {
view->setSelectionModel(m_selectionModel);
} else {
m_selectionModel = view->selectionModel();
- }*/
-
- m_selectionChangedTimer = new QTimer(this);
- m_selectionChangedTimer->setSingleShot(true);
- m_selectionChangedTimer->setInterval(300);
- connect(m_selectionChangedTimer, SIGNAL(timeout()),
- this, SLOT(emitSelectionChangedSignal()));
-
- // reparent the selection model, as it should not be deleted
- // when deleting the model
- //m_selectionModel->setParent(this);
-
- view->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ }
+ m_selectionModel->setParent(this);
m_versionControlObserver = new VersionControlObserver(view);
connect(m_versionControlObserver, SIGNAL(infoMessage(const QString&)),
this, SLOT(emitContentsMoved()));
connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(emitContentsMoved()));
+
+ setFocusProxy(m_viewAccessor.layoutTarget());
+ m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
+}
+
+void DolphinView::deleteView()
+{
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ if (view != 0) {
+ // It's important to set the keyboard focus to the parent
+ // before deleting the view: Otherwise when having a split
+ // view the other view will get the focus and will request
+ // an activation (see DolphinView::eventFilter()).
+ setFocusProxy(0);
+ setFocus();
+
+ m_topLayout->removeWidget(view);
+ view->close();
+
+ disconnect(view);
+ m_controller->disconnect(view);
+ view->disconnect();
+
+ // TODO: move this code into ViewAccessor::deleteView()
+ deleteWhenNotDragSource(view);
+ view = 0;
+
+ m_viewAccessor.deleteView();
+ }
}
void DolphinView::pasteToUrl(const KUrl& url)
}
-bool DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
+void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
{
if (m_columnsContainer != 0) {
- return m_columnsContainer->showColumn(url);
+ m_columnsContainer->showColumn(url);
}
- return false;
}
QAbstractItemView* DolphinView::ViewAccessor::itemView() const
return 0;
}
+KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const
+{
+ return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
+}
+
QWidget* DolphinView::ViewAccessor::layoutTarget() const
{
if (m_columnsContainer != 0) {
projects / dolphin.git / blobdiff