/***************************************************************************
- * Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at> *
+ * Copyright (C) 2006-2009 by Peter Penz <peter.penz19@gmail.com> *
* Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net> *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QAbstractItemView>
#include <QApplication>
+#include <QBoxLayout>
#include <QClipboard>
+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>
#include <QKeyEvent>
#include <QItemSelection>
-#include <QBoxLayout>
#include <QTimer>
#include <QScrollBar>
-#include <kactioncollection.h>
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-#include <kiconeffect.h>
-#include <kfileitem.h>
-#include <kfileitemlistproperties.h>
-#include <klocale.h>
-#include <kio/deletejob.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kjob.h>
-#include <kmenu.h>
-#include <kmessagebox.h>
+#include <KActionCollection>
+#include <KColorScheme>
+#include <KDirLister>
+#include <KDirModel>
+#include <KIconEffect>
+#include <KFileItem>
+#include <KFileItemListProperties>
+#include <KLocale>
+#include <kitemviews/kfileitemmodel.h>
+#include <kitemviews/kfileitemlistview.h>
+#include <kitemviews/kitemlistselectionmanager.h>
+#include <kitemviews/kitemlistview.h>
+#include <kitemviews/kitemlistcontroller.h>
+#include <KIO/DeleteJob>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KJob>
+#include <KMenu>
+#include <KMessageBox>
#include <konq_fileitemcapabilities.h>
#include <konq_operations.h>
#include <konqmimedata.h>
-#include <ktoggleaction.h>
-#include <kurl.h>
+#include <KToggleAction>
+#include <KUrl>
#include "additionalinfoaccessor.h"
-#include "dolphinmodel.h"
-#include "dolphincolumnviewcontainer.h"
-#include "dolphinviewcontroller.h"
-#include "dolphindetailsview.h"
-#include "dolphinfileitemdelegate.h"
+#include "dolphindirlister.h"
#include "dolphinnewfilemenuobserver.h"
-#include "dolphinsortfilterproxymodel.h"
#include "dolphin_detailsmodesettings.h"
-#include "dolphiniconsview.h"
#include "dolphin_generalsettings.h"
+#include "dolphinitemlistcontainer.h"
#include "draganddrophelper.h"
#include "renamedialog.h"
#include "settings/dolphinsettings.h"
+#include "versioncontrol/versioncontrolobserver.h"
#include "viewmodecontroller.h"
#include "viewproperties.h"
+#include "views/tooltips/tooltipmanager.h"
#include "zoomlevelinfo.h"
-#include "dolphindetailsviewexpander.h"
-DolphinView::DolphinView(QWidget* parent,
- const KUrl& url,
- DolphinSortFilterProxyModel* proxyModel) :
+namespace {
+ const int MaxModeEnum = DolphinView::CompactView;
+ const int MaxSortingEnum = DolphinView::SortByPath;
+};
+
+DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
QWidget(parent),
m_active(true),
- m_showPreview(false),
- m_storedCategorizedSorting(false),
m_tabsForFiles(false),
- m_isContextMenuOpen(false),
m_assureVisibleCurrentIndex(false),
- m_expanderActive(false),
m_isFolderWritable(true),
+ m_url(url),
m_mode(DolphinView::IconsView),
+ m_additionalInfoList(),
m_topLayout(0),
- m_dolphinViewController(0),
- m_viewModeController(0),
- m_viewAccessor(proxyModel),
+ m_dirLister(0),
+ m_container(0),
+ m_toolTipManager(0),
m_selectionChangedTimer(0),
- m_activeItemUrl(),
+ m_currentItemUrl(),
m_restoredContentsPosition(),
m_createdItemUrl(),
- m_selectedItems(),
- m_newFileNames()
+ m_selectedUrls(),
+ m_versionControlObserver(0)
{
m_topLayout = new QVBoxLayout(this);
m_topLayout->setSpacing(0);
m_topLayout->setMargin(0);
- m_dolphinViewController = new DolphinViewController(this);
+ //m_dolphinViewController = new DolphinViewController(this);
- m_viewModeController = new ViewModeController(this);
- m_viewModeController->setUrl(url);
+ //m_viewModeController = new ViewModeController(this);
+ //m_viewModeController->setUrl(url);
- connect(m_viewModeController, SIGNAL(urlChanged(const KUrl&)),
- this, SIGNAL(urlChanged(const KUrl&)));
+ /*connect(m_viewModeController, SIGNAL(urlChanged(KUrl)),
+ this, SIGNAL(urlChanged(KUrl)));
- connect(m_dolphinViewController, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
- this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
- connect(m_dolphinViewController, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
- this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));
+ connect(m_dolphinViewController, SIGNAL(requestContextMenu(QPoint,QList<QAction*>)),
+ this, SLOT(openContextMenu(QPoint,QList<QAction*>)));
+ connect(m_dolphinViewController, SIGNAL(urlsDropped(KFileItem,KUrl,QDropEvent*)),
+ this, SLOT(dropUrls(KFileItem,KUrl,QDropEvent*)));
connect(m_dolphinViewController, SIGNAL(sortingChanged(DolphinView::Sorting)),
this, SLOT(updateSorting(DolphinView::Sorting)));
connect(m_dolphinViewController, SIGNAL(sortOrderChanged(Qt::SortOrder)),
this, SLOT(updateSortOrder(Qt::SortOrder)));
connect(m_dolphinViewController, SIGNAL(sortFoldersFirstChanged(bool)),
this, SLOT(updateSortFoldersFirst(bool)));
- connect(m_dolphinViewController, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
- this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
- connect(m_dolphinViewController, SIGNAL(itemTriggered(const KFileItem&)),
- this, SLOT(triggerItem(const KFileItem&)));
- connect(m_dolphinViewController, SIGNAL(tabRequested(const KUrl&)),
- this, SIGNAL(tabRequested(const KUrl&)));
- connect(m_dolphinViewController, SIGNAL(activated()),
+ connect(m_dolphinViewController, SIGNAL(additionalInfoChanged(QList<DolphinView::AdditionalInfo>)),
+ this, SLOT(updateAdditionalInfo(QList<DolphinView::AdditionalInfo>)));*/
+ //connect(m_dolphinViewController, SIGNAL(itemActivated(KFileItem)),
+ // this, SLOT(triggerItem(KFileItem)));
+ //connect(m_dolphinViewController, SIGNAL(tabRequested(KUrl)),
+ // this, SIGNAL(tabRequested(KUrl)));
+ /*connect(m_dolphinViewController, SIGNAL(activated()),
this, SLOT(activate()));
- connect(m_dolphinViewController, SIGNAL(itemEntered(const KFileItem&)),
- this, SLOT(showHoverInformation(const KFileItem&)));
+ connect(m_dolphinViewController, SIGNAL(itemEntered(KFileItem)),
+ this, SLOT(showHoverInformation(KFileItem)));
connect(m_dolphinViewController, SIGNAL(viewportEntered()),
this, SLOT(clearHoverInformation()));
connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)),
- this, SLOT(slotUrlChangeRequested(KUrl)));
+ this, SLOT(slotUrlChangeRequested(KUrl)));*/
// When a new item has been created by the "Create New..." menu, the item should
// get selected and it must be assured that the item will get visible. As the
// creation is done asynchronously, several signals must be checked:
- connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
- this, SLOT(observeCreatedItem(const KUrl&)));
+ connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(KUrl)),
+ this, SLOT(observeCreatedItem(KUrl)));
m_selectionChangedTimer = new QTimer(this);
m_selectionChangedTimer->setSingleShot(true);
connect(m_selectionChangedTimer, SIGNAL(timeout()),
this, SLOT(emitSelectionChangedSignal()));
+ m_dirLister = new DolphinDirLister(this);
+ m_dirLister->setAutoUpdate(true);
+ m_dirLister->setDelayedMimeTypes(true);
+
+ connect(m_dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(slotRedirection(KUrl,KUrl)));
+ connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotDirListerStarted(KUrl)));
+ connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)),
+ this, SLOT(slotRefreshItems()));
+
+ connect(m_dirLister, SIGNAL(clear()), this, SIGNAL(itemCountChanged()));
+ connect(m_dirLister, SIGNAL(newItems(KFileItemList)), this, SIGNAL(itemCountChanged()));
+ connect(m_dirLister, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
+ connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SIGNAL(infoMessage(QString)));
+ connect(m_dirLister, SIGNAL(percent(int)), this, SIGNAL(pathLoadingProgress(int)));
+ connect(m_dirLister, SIGNAL(urlIsFileError(KUrl)), this, SIGNAL(urlIsFileError(KUrl)));
+ connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SIGNAL(itemCountChanged()));
+
+ m_container = new DolphinItemListContainer(m_dirLister, this);
+ m_container->setVisibleRoles(QList<QByteArray>() << "name");
+
+ KItemListController* controller = m_container->controller();
+ controller->setSelectionBehavior(KItemListController::MultiSelection);
+ connect(controller, SIGNAL(itemActivated(int)),
+ this, SLOT(slotItemActivated(int)));
+ connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
+ connect(controller, SIGNAL(contextMenuRequested(int,QPointF)), this, SLOT(slotContextMenuRequested(int,QPointF)));
+ connect(controller, SIGNAL(itemExpansionToggleClicked(int)), this, SLOT(slotItemExpansionToggleClicked(int)));
+ connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
+ connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
+ connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
+ connect(controller, SIGNAL(modelChanged(KItemModelBase*,KItemModelBase*)), this, SLOT(slotModelChanged(KItemModelBase*,KItemModelBase*)));
+
+ KFileItemModel* model = fileItemModel();
+ if (model) {
+ connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+ }
+
+ KItemListSelectionManager* selectionManager = controller->selectionManager();
+ connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
+ this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
+
+ m_toolTipManager = new ToolTipManager(this);
+
+ m_versionControlObserver = new VersionControlObserver(this);
+ m_versionControlObserver->setModel(model);
+ connect(m_versionControlObserver, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
+ connect(m_versionControlObserver, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
+ connect(m_versionControlObserver, SIGNAL(operationCompletedMessage(QString)), this, SIGNAL(operationCompletedMessage(QString)));
+
applyViewProperties();
- m_topLayout->addWidget(m_viewAccessor.layoutTarget());
+ m_topLayout->addWidget(m_container);
+
+ loadDirectory(url);
}
DolphinView::~DolphinView()
KUrl DolphinView::url() const
{
- return m_viewModeController->url();
-}
-
-KUrl DolphinView::rootUrl() const
-{
- const KUrl viewUrl = url();
- const KUrl root = m_viewAccessor.rootUrl();
- if (root.isEmpty() || !root.isParentOf(viewUrl)) {
- return viewUrl;
- }
- return root;
+ return m_url;
}
void DolphinView::setActive(bool active)
color.setAlpha(150);
}
- QWidget* viewport = m_viewAccessor.itemView()->viewport();
- QPalette palette;
- palette.setColor(viewport->backgroundRole(), color);
- viewport->setPalette(palette);
+ /*QAbstractItemView* view = m_viewAccessor.itemView();
+ QWidget* viewport = view ? view->viewport() : 0;
+ if (viewport) {
+ QPalette palette;
+ palette.setColor(viewport->backgroundRole(), color);
+ viewport->setPalette(palette);
+ }*/
update();
if (active) {
- m_viewAccessor.itemView()->setFocus();
+ //if (view) {
+ // view->setFocus();
+ //}
emit activated();
- emitSelectionChangedSignal();
emit writeStateChanged(m_isFolderWritable);
}
- m_viewModeController->indicateActivationChange(active);
+ //m_viewModeController->indicateActivationChange(active);
}
bool DolphinView::isActive() const
void DolphinView::setMode(Mode mode)
{
- if (mode == m_mode) {
- return; // the wished mode is already set
- }
-
- const int oldZoomLevel = m_viewModeController->zoomLevel();
- m_mode = mode;
+ if (mode != m_mode) {
+ ViewProperties props(url());
+ props.setViewMode(mode);
+ props.save();
- // remember the currently selected items, so that they will
- // be restored after reloading the directory
- m_selectedItems = selectedItems();
-
- const bool hasFocus = m_viewAccessor.itemView()->hasFocus();
- deleteView();
-
- const KUrl viewPropsUrl = rootUrl();
- ViewProperties props(viewPropsUrl);
- props.setViewMode(m_mode);
- createView();
-
- if (hasFocus) {
- m_viewAccessor.itemView()->setFocus();
+ applyViewProperties();
}
-
- // the file item delegate has been recreated, apply the current
- // additional information manually
- const KFileItemDelegate::InformationList infoList = props.additionalInfo();
- m_viewAccessor.itemDelegate()->setShowInformation(infoList);
- emit additionalInfoChanged();
-
- // Not all view modes support categorized sorting. Adjust the sorting model
- // if changing the view mode results in a change of the categorized sorting
- // capabilities.
- m_storedCategorizedSorting = props.categorizedSorting();
- const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
- if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
- m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
- emit categorizedSortingChanged();
- }
-
- emit modeChanged();
-
- updateZoomLevel(oldZoomLevel);
- loadDirectory(viewPropsUrl);
}
DolphinView::Mode DolphinView::mode() const
return m_mode;
}
-bool DolphinView::showPreview() const
+bool DolphinView::previewsShown() const
{
- return m_showPreview;
+ return m_container->previewsShown();
}
-bool DolphinView::showHiddenFiles() const
+bool DolphinView::hiddenFilesShown() const
{
- return m_viewAccessor.dirLister()->showingDotFiles();
+ return m_dirLister->showingDotFiles();
}
bool DolphinView::categorizedSorting() const
{
- // If all view modes would support categorized sorting, returning
- // m_viewAccessor.proxyModel()->isCategorizedModel() would be the way to go. As
- // currently only the icons view supports caterized sorting, we remember
- // the stored view properties state in m_storedCategorizedSorting and
- // return this state. The application takes care to disable the corresponding
- // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate
- // that this setting is not applied to the current view mode.
- return m_storedCategorizedSorting;
-}
-
-bool DolphinView::supportsCategorizedSorting() const
-{
- return m_viewAccessor.supportsCategorizedSorting();
+ return false; //m_storedCategorizedSorting;
}
KFileItemList DolphinView::items() const
{
- return m_viewAccessor.dirLister()->items();
+ return m_dirLister->items();
}
KFileItemList DolphinView::selectedItems() const
{
- KFileItemList itemList;
- const QAbstractItemView* view = m_viewAccessor.itemView();
- if (view == 0) {
- return itemList;
- }
-
- const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
+ const KFileItemModel* model = fileItemModel();
+ const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ const QSet<int> selectedIndexes = selectionManager->selectedItems();
- const QModelIndexList indexList = selection.indexes();
- foreach (const QModelIndex &index, indexList) {
- KFileItem item = m_viewAccessor.dirModel()->itemForIndex(index);
- if (!item.isNull()) {
- itemList.append(item);
- }
+ KFileItemList selectedItems;
+ QSetIterator<int> it(selectedIndexes);
+ while (it.hasNext()) {
+ const int index = it.next();
+ selectedItems.append(model->fileItem(index));
}
-
- return itemList;
+ return selectedItems;
}
int DolphinView::selectedItemsCount() const
{
- const QAbstractItemView* view = m_viewAccessor.itemView();
- if (view == 0) {
- return 0;
- }
-
- return view->selectionModel()->selectedIndexes().count();
+ const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ return selectionManager->selectedItems().count();
}
void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
{
- foreach (const KUrl& url, urls) {
- KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
- m_selectedItems.append(item);
- }
+ m_selectedUrls = urls;
}
void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
{
- const QItemSelection matchingIndexes = childrenMatchingPattern(QModelIndex(), pattern);
- const QItemSelectionModel::SelectionFlags command = enabled
- ? QItemSelectionModel::Select
- : QItemSelectionModel::Deselect;
- m_viewAccessor.itemView()->selectionModel()->select(matchingIndexes, command);
+ const KItemListSelectionManager::SelectionMode mode = enabled
+ ? KItemListSelectionManager::Select
+ : KItemListSelectionManager::Deselect;
+ const KFileItemModel* model = fileItemModel();
+ KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+
+ for (int index = 0; index < model->count(); index++) {
+ const KFileItem item = model->fileItem(index);
+ if (pattern.exactMatch(item.name())) {
+ // An alternative approach would be to store the matching items in a QSet<int> and
+ // select them in one go after the loop, but we'd need a new function
+ // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
+ // for that.
+ selectionManager->setSelected(index, 1, mode);
+ }
+ }
}
void DolphinView::setZoomLevel(int level)
{
- if (level < ZoomLevelInfo::minimumLevel()) {
- level = ZoomLevelInfo::minimumLevel();
- } else if (level > ZoomLevelInfo::maximumLevel()) {
- level = ZoomLevelInfo::maximumLevel();
- }
-
- if (level != zoomLevel()) {
- m_viewModeController->setZoomLevel(level);
- emit zoomLevelChanged(level);
+ const int oldZoomLevel = zoomLevel();
+ m_container->setZoomLevel(level);
+ if (zoomLevel() != oldZoomLevel) {
+ emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
}
}
int DolphinView::zoomLevel() const
{
- return m_viewModeController->zoomLevel();
+ return m_container->zoomLevel();
}
void DolphinView::setSorting(Sorting sorting)
DolphinView::Sorting DolphinView::sorting() const
{
- return m_viewAccessor.proxyModel()->sorting();
+ KItemModelBase* model = m_container->controller()->model();
+ return sortingForSortRole(model->sortRole());
}
void DolphinView::setSortOrder(Qt::SortOrder order)
Qt::SortOrder DolphinView::sortOrder() const
{
- return m_viewAccessor.proxyModel()->sortOrder();
+ KItemModelBase* model = fileItemModel();
+ return model->sortOrder();
}
void DolphinView::setSortFoldersFirst(bool foldersFirst)
bool DolphinView::sortFoldersFirst() const
{
- return m_viewAccessor.proxyModel()->sortFoldersFirst();
+ KFileItemModel* model = fileItemModel();
+ return model->sortFoldersFirst();
}
-void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
+void DolphinView::setAdditionalInfoList(const QList<AdditionalInfo>& info)
{
- const KUrl viewPropsUrl = rootUrl();
- ViewProperties props(viewPropsUrl);
- props.setAdditionalInfo(info);
- m_viewAccessor.itemDelegate()->setShowInformation(info);
+ const QList<AdditionalInfo> previousList = info;
- emit additionalInfoChanged();
+ ViewProperties props(url());
+ props.setAdditionalInfoList(info);
- if (m_viewAccessor.reloadOnAdditionalInfoChange()) {
- loadDirectory(viewPropsUrl);
- }
+ m_additionalInfoList = info;
+ applyAdditionalInfoListToView();
+
+ emit additionalInfoListChanged(m_additionalInfoList, previousList);
}
-KFileItemDelegate::InformationList DolphinView::additionalInfo() const
+QList<DolphinView::AdditionalInfo> DolphinView::additionalInfoList() const
{
- return m_viewAccessor.itemDelegate()->showInformation();
+ return m_additionalInfoList;
}
void DolphinView::reload()
QByteArray viewState;
QDataStream saveStream(&viewState, QIODevice::WriteOnly);
saveState(saveStream);
- m_selectedItems= selectedItems();
+
+ const KFileItemList itemList = selectedItems();
+ m_selectedUrls.clear();
+ m_selectedUrls = itemList.urlList();
setUrl(url());
loadDirectory(url(), true);
void DolphinView::stopLoading()
{
- m_viewAccessor.dirLister()->stop();
+ m_dirLister->stop();
}
void DolphinView::refresh()
{
const bool oldActivationState = m_active;
- const int oldZoomLevel = m_viewModeController->zoomLevel();
+ const int oldZoomLevel = zoomLevel();
m_active = true;
- createView();
applyViewProperties();
reload();
void DolphinView::setNameFilter(const QString& nameFilter)
{
- m_viewModeController->setNameFilter(nameFilter);
+ Q_UNUSED(nameFilter);
+ //m_viewModeController->setNameFilter(nameFilter);
+}
+
+QString DolphinView::nameFilter() const
+{
+ return QString(); //m_viewModeController->nameFilter();
}
void DolphinView::calculateItemCount(int& fileCount,
int& folderCount,
KIO::filesize_t& totalFileSize) const
{
- foreach (const KFileItem& item, m_viewAccessor.dirLister()->items()) {
+ foreach (const KFileItem& item, m_dirLister->items()) {
if (item.isDir()) {
++folderCount;
} else {
QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
{
- return m_dolphinViewController->versionControlActions(items);
+ QList<QAction*> actions;
+
+ if (items.isEmpty()) {
+ const KFileItem item = fileItemModel()->rootItem();
+ actions = m_versionControlObserver->actions(KFileItemList() << item);
+ } else {
+ actions = m_versionControlObserver->actions(items);
+ }
+
+ return actions;
}
void DolphinView::setUrl(const KUrl& url)
{
- if (m_viewModeController->url() == url) {
+ if (url == m_url) {
return;
}
- const bool hadSelection = hasSelection();
+ emit urlAboutToBeChanged(url);
+ m_url = url;
- // The selection model and directory lister might change in the case of the column view:
- disconnectViewAccessor();
-
- m_newFileNames.clear();
+ if (GeneralSettings::showToolTips()) {
+ m_toolTipManager->hideToolTip();
+ }
- m_viewModeController->setUrl(url); // emits urlChanged, which we forward
- m_viewAccessor.prepareUrlChange(url);
+ // It is important to clear the items from the model before
+ // applying the view properties, otherwise expensive operations
+ // might be done on the existing items although they get cleared
+ // anyhow afterwards by loadDirectory().
+ fileItemModel()->clear();
applyViewProperties();
-
- // When changing the URL there is no need to keep the version
- // data of the previous URL.
- m_viewAccessor.dirModel()->clearVersionData();
-
- // Reconnect to the (probably) new selection model and directory lister
- connectViewAccessor();
loadDirectory(url);
- if (hadSelection || hasSelection()) {
- emitSelectionChangedSignal();
- }
+ emit urlChanged(url);
}
void DolphinView::selectAll()
{
- m_viewAccessor.itemView()->selectAll();
+ KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ selectionManager->setSelected(0, fileItemModel()->count());
}
void DolphinView::invertSelection()
{
- QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
- const QAbstractItemModel* itemModel = selectionModel->model();
-
- const QModelIndex topLeft = itemModel->index(0, 0);
- const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
- itemModel->columnCount() - 1);
-
- const QItemSelection selection(topLeft, bottomRight);
- selectionModel->select(selection, QItemSelectionModel::Toggle);
+ KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ selectionManager->setSelected(0, fileItemModel()->count(), KItemListSelectionManager::Toggle);
}
void DolphinView::clearSelection()
{
- m_viewAccessor.itemView()->clearSelection();
+ m_container->controller()->selectionManager()->clearSelection();
}
void DolphinView::renameSelectedItems()
return;
}
- if ((itemCount == 1) && DolphinSettings::instance().generalSettings()->renameInline()) {
+ /*if ((itemCount == 1) && DolphinSettings::instance().generalSettings()->renameInline()) {
const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
m_viewAccessor.itemView()->edit(proxyIndex);
- } else {
+ } else {*/
RenameDialog* dialog = new RenameDialog(this, items);
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->show();
dialog->raise();
dialog->activateWindow();
- }
+ //}
+
+ // assure that the current index remains visible when KDirLister
+ // will notify the view about changed items
+ m_assureVisibleCurrentIndex = true;
}
void DolphinView::trashSelectedItems()
}
}
-void DolphinView::setShowPreview(bool show)
+void DolphinView::setPreviewsShown(bool show)
{
- if (m_showPreview == show) {
+ if (previewsShown() == show) {
return;
}
- const KUrl viewPropsUrl = rootUrl();
- ViewProperties props(viewPropsUrl);
- props.setShowPreview(show);
-
- m_showPreview = show;
- const int oldZoomLevel = m_viewModeController->zoomLevel();
- emit showPreviewChanged();
+ ViewProperties props(url());
+ props.setPreviewsShown(show);
- // Enabling or disabling the preview might change the icon size of the view.
- // 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);
+ m_container->setPreviewsShown(show);
+ emit previewsShownChanged(show);
}
-void DolphinView::setShowHiddenFiles(bool show)
+void DolphinView::setHiddenFilesShown(bool show)
{
- if (m_viewAccessor.dirLister()->showingDotFiles() == show) {
+ if (m_dirLister->showingDotFiles() == show) {
return;
}
- const KUrl viewPropsUrl = rootUrl();
- ViewProperties props(viewPropsUrl);
- props.setShowHiddenFiles(show);
+ const KFileItemList itemList = selectedItems();
+ m_selectedUrls.clear();
+ m_selectedUrls = itemList.urlList();
+
+ ViewProperties props(url());
+ props.setHiddenFilesShown(show);
- m_viewAccessor.dirLister()->setShowingDotFiles(show);
- emit showHiddenFilesChanged();
+ m_dirLister->setShowingDotFiles(show);
+ m_dirLister->emitChanges();
+ emit hiddenFilesShownChanged(show);
}
void DolphinView::setCategorizedSorting(bool categorized)
return;
}
- // setCategorizedSorting(true) may only get invoked
- // if the view supports categorized sorting
- Q_ASSERT(!categorized || supportsCategorizedSorting());
-
- ViewProperties props(rootUrl());
+ ViewProperties props(url());
props.setCategorizedSorting(categorized);
props.save();
- m_storedCategorizedSorting = categorized;
- m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+ //m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
- emit categorizedSortingChanged();
+ emit categorizedSortingChanged(categorized);
}
void DolphinView::mouseReleaseEvent(QMouseEvent* event)
setActive(true);
}
-bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+void DolphinView::contextMenuEvent(QContextMenuEvent* event)
{
- switch (event->type()) {
- case QEvent::FocusIn:
- if (watched == m_viewAccessor.itemView()) {
- m_dolphinViewController->requestActivation();
- }
- break;
+ Q_UNUSED(event);
- case QEvent::DragEnter:
- if (watched == m_viewAccessor.itemView()->viewport()) {
- setActive(true);
- }
- break;
-
- case QEvent::KeyPress:
- if (watched == m_viewAccessor.itemView()) {
- // clear the selection when Escape has been pressed
- QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
- if (keyEvent->key() == Qt::Key_Escape) {
- clearSelection();
- }
- }
- 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;
+ const QPoint pos = m_container->mapFromGlobal(QCursor::pos());
+ const KItemListView* view = m_container->controller()->view();
+ if (view->itemAt(pos) < 0) {
+ // Only open the context-menu if the cursor is above the viewport
+ // (the context-menu for items is handled in slotContextMenuRequested())
+ requestContextMenu(KFileItem(), url(), QList<QAction*>());
}
+}
+
+void DolphinView::wheelEvent(QWheelEvent* event)
+{
+ if (event->modifiers().testFlag(Qt::ControlModifier)) {
+ const int numDegrees = event->delta() / 8;
+ const int numSteps = numDegrees / 15;
- return QWidget::eventFilter(watched, event);
+ setZoomLevel(zoomLevel() + numSteps);
+ event->accept();
+ } else {
+ event->ignore();
+ }
}
void DolphinView::activate()
setActive(true);
}
-void DolphinView::triggerItem(const KFileItem& item)
+void DolphinView::slotItemActivated(int index)
{
- const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
- if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
- // items are selected by the user, hence don't trigger the
- // item specified by 'index'
+ Q_UNUSED(index);
+
+ const KFileItemList items = selectedItems();
+ if (items.isEmpty()) {
return;
}
- // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
- if (item.isNull() || m_isContextMenuOpen) {
- return;
+ if (items.count() == 1) {
+ emit itemActivated(items.at(0)); // caught by DolphinViewContainer or DolphinPart
+ } else {
+ foreach (const KFileItem& item, items) {
+ if (item.isDir()) {
+ emit tabRequested(item.url());
+ } else {
+ emit itemActivated(item);
+ }
+ }
+ }
+}
+
+void DolphinView::slotItemMiddleClicked(int index)
+{
+ const KFileItem item = fileItemModel()->fileItem(index);
+ if (item.isDir() || isTabsForFilesEnabled()) {
+ emit tabRequested(item.url());
+ }
+}
+
+void DolphinView::slotContextMenuRequested(int index, const QPointF& pos)
+{
+ Q_UNUSED(pos);
+ if (GeneralSettings::showToolTips()) {
+ m_toolTipManager->hideToolTip();
+ }
+ const KFileItem item = fileItemModel()->fileItem(index);
+ emit requestContextMenu(item, url(), QList<QAction*>());
+}
+
+void DolphinView::slotItemExpansionToggleClicked(int index)
+{
+ // TODO: When doing a model->setExpanded(false) it should
+ // be checked here whether the current index is part of the
+ // closed sub-tree. If this is the case, the current index
+ // should be adjusted to the parent index.
+ KFileItemModel* model = fileItemModel();
+ const bool expanded = model->isExpanded(index);
+ model->setExpanded(index, !expanded);
+}
+
+void DolphinView::slotItemHovered(int index)
+{
+ const KFileItem item = fileItemModel()->fileItem(index);
+
+ if (GeneralSettings::showToolTips()) {
+ QRectF itemRect = m_container->controller()->view()->itemBoundingRect(index);
+ const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
+ itemRect.moveTo(pos);
+
+ m_toolTipManager->showToolTip(item, itemRect);
+ }
+
+ emit requestItemInfo(item);
+}
+
+void DolphinView::slotItemUnhovered(int index)
+{
+ Q_UNUSED(index);
+ if (GeneralSettings::showToolTips()) {
+ m_toolTipManager->hideToolTip();
+ }
+ emit requestItemInfo(KFileItem());
+}
+
+void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+{
+ const KFileItem destItem = fileItemModel()->fileItem(index);
+
+ QDropEvent dropEvent(event->pos().toPoint(),
+ event->possibleActions(),
+ event->mimeData(),
+ event->buttons(),
+ event->modifiers());
+
+ DragAndDropHelper::dropUrls(destItem, url(), &dropEvent, this);
+}
+
+void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
+{
+ if (previous != 0) {
+ disconnect(previous, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
}
- emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+ Q_ASSERT(qobject_cast<KFileItemModel*>(current));
+ connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+
+ KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
+ m_versionControlObserver->setModel(fileItemModel);
}
-void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
+void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
{
- const int count = selectedItemsCount();
- const bool selectionStateChanged = ((count > 0) && (selected.count() == count)) ||
- ((count == 0) && !deselected.isEmpty());
+ const int currentCount = current.count();
+ const int previousCount = previous.count();
+ const bool selectionStateChanged = (currentCount == 0 && previousCount > 0) ||
+ (currentCount > 0 && previousCount == 0);
// If nothing has been selected before and something got selected (or if something
// was selected before and now nothing is selected) the selectionChangedSignal must
const QList<QAction*>& customActions)
{
KFileItem item;
- const QModelIndex index = m_viewAccessor.itemView()->indexAt(pos);
- if (index.isValid() && (index.column() == DolphinModel::Name)) {
- const QModelIndex dolphinModelIndex = m_viewAccessor.proxyModel()->mapToSource(index);
- item = m_viewAccessor.dirModel()->itemForIndex(dolphinModelIndex);
+ const int index = m_container->controller()->view()->itemAt(pos);
+ if (index >= 0) {
+ item = fileItemModel()->fileItem(index);
}
- m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
emit requestContextMenu(item, url(), customActions);
- m_isContextMenuOpen = false;
}
void DolphinView::dropUrls(const KFileItem& destItem,
const KUrl& destPath,
QDropEvent* event)
{
- addNewFileNames(event->mimeData());
- DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
+ Q_UNUSED(destItem);
+ Q_UNUSED(destPath);
+ markPastedUrlsAsSelected(event->mimeData());
+ //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
}
void DolphinView::updateSorting(DolphinView::Sorting sorting)
{
- ViewProperties props(rootUrl());
+ ViewProperties props(url());
props.setSorting(sorting);
- m_viewAccessor.proxyModel()->setSorting(sorting);
+ KItemModelBase* model = m_container->controller()->model();
+ model->setSortRole(sortRoleForSorting(sorting));
emit sortingChanged(sorting);
}
void DolphinView::updateSortOrder(Qt::SortOrder order)
{
- ViewProperties props(rootUrl());
+ ViewProperties props(url());
props.setSortOrder(order);
- m_viewAccessor.proxyModel()->setSortOrder(order);
+ KItemModelBase* model = fileItemModel();
+ model->setSortOrder(order);
emit sortOrderChanged(order);
}
void DolphinView::updateSortFoldersFirst(bool foldersFirst)
{
- ViewProperties props(rootUrl());
+ ViewProperties props(url());
props.setSortFoldersFirst(foldersFirst);
- m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+ KFileItemModel* model = fileItemModel();
+ model->setSortFoldersFirst(foldersFirst);
emit sortFoldersFirstChanged(foldersFirst);
}
-void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
-{
- ViewProperties props(rootUrl());
- props.setAdditionalInfo(info);
- props.save();
-
- m_viewAccessor.itemDelegate()->setShowInformation(info);
-
- emit additionalInfoChanged();
-}
-
-void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
-{
- const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-
- const KFileItemDelegate::InformationList checkedInfo = m_viewAccessor.itemDelegate()->showInformation();
- const KFileItemDelegate::InformationList infoKeys = infoAccessor.keys();
-
- const bool enable = (m_mode == DolphinView::DetailsView) ||
- (m_mode == DolphinView::IconsView);
-
- foreach (const KFileItemDelegate::Information& info, infoKeys) {
- const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType);
- QAction* action = collection->action(name);
- Q_ASSERT(action != 0);
- action->setEnabled(enable);
- action->setChecked(checkedInfo.contains(info));
- }
-}
-
QPair<bool, QString> DolphinView::pasteInfo() const
{
return KonqOperations::pasteInfo(url());
bool DolphinView::itemsExpandable() const
{
- return m_viewAccessor.itemsExpandable();
+ return m_mode == DetailsView;
}
void DolphinView::restoreState(QDataStream& stream)
{
- // Restore the URL of the current item that had the keyboard focus
- stream >> m_activeItemUrl;
-
- // Restore the root URL
- KUrl rootUrl;
- stream >> rootUrl;
- m_viewAccessor.setRootUrl(rootUrl);
+ // Restore the current item that had the keyboard focus
+ stream >> m_currentItemUrl;
// Restore the view position
stream >> m_restoredContentsPosition;
// Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
- QSet<KUrl> urlsToExpand;
- stream >> urlsToExpand;
- const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand);
- if (expander != 0) {
- m_expanderActive = true;
- connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));
- }
- else {
- m_expanderActive = false;
- }
+ QSet<KUrl> urls;
+ stream >> urls;
+ fileItemModel()->restoreExpandedUrls(urls);
}
void DolphinView::saveState(QDataStream& stream)
{
- // Save the URL of the current item that has the keyboard focus
- KFileItem currentItem;
- const QAbstractItemView* view = m_viewAccessor.itemView();
-
- if (view != 0) {
- const QModelIndex proxyIndex = view->currentIndex();
- const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
- currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex);
- }
-
- KUrl currentItemUrl;
- if (!currentItem.isNull()) {
- currentItemUrl = currentItem.url();
+ // Save the current item that has the keyboard focus
+ const int currentIndex = m_container->controller()->selectionManager()->currentItem();
+ if (currentIndex != -1) {
+ KFileItem item = fileItemModel()->fileItem(currentIndex);
+ KUrl currentItemUrl = item.url();
+ stream << currentItemUrl;
+ } else {
+ stream << KUrl();
}
- stream << currentItemUrl;
-
- // Save the root URL
- stream << m_viewAccessor.rootUrl();
-
// Save view position
- const int x = view->horizontalScrollBar()->value();
- const int y = view->verticalScrollBar()->value();
+ const qreal x = m_container->horizontalScrollBar()->value();
+ const qreal y = m_container->verticalScrollBar()->value();
stream << QPoint(x, y);
// Save expanded folders (only relevant for the details view - the set will be empty in other view modes)
- stream << m_viewAccessor.expandedUrls();
+ stream << fileItemModel()->expandedUrls();
}
bool DolphinView::hasSelection() const
{
- const QAbstractItemView* view = m_viewAccessor.itemView();
- return (view != 0) && view->selectionModel()->hasSelection();
+ return m_container->controller()->selectionManager()->hasSelection();
+}
+
+KFileItem DolphinView::rootItem() const
+{
+ return m_dirLister->rootItem();
}
void DolphinView::observeCreatedItem(const KUrl& url)
{
m_createdItemUrl = url;
- connect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
- this, SLOT(selectAndScrollToCreatedItem()));
+ //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ // this, SLOT(selectAndScrollToCreatedItem()));
}
void DolphinView::selectAndScrollToCreatedItem()
{
- const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
+ /*const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
if (dirIndex.isValid()) {
const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
- m_viewAccessor.itemView()->setCurrentIndex(proxyIndex);
+ QAbstractItemView* view = m_viewAccessor.itemView();
+ if (view) {
+ view->setCurrentIndex(proxyIndex);
+ }
}
- disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
- this, SLOT(selectAndScrollToCreatedItem()));
+ disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(selectAndScrollToCreatedItem()));*/
m_createdItemUrl = KUrl();
}
{
if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
emit redirection(oldUrl, newUrl);
- m_viewModeController->redirectToUrl(newUrl); // #186947
+ m_url = newUrl; // #186947
}
}
-void DolphinView::restoreContentsPosition()
+void DolphinView::updateViewState()
{
+ if (m_currentItemUrl != KUrl()) {
+ KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ const int currentIndex = fileItemModel()->index(m_currentItemUrl);
+ if (currentIndex != -1) {
+ selectionManager->setCurrentItem(currentIndex);
+ } else {
+ selectionManager->setCurrentItem(0);
+ }
+ m_currentItemUrl = KUrl();
+ }
+
if (!m_restoredContentsPosition.isNull()) {
const int x = m_restoredContentsPosition.x();
const int y = m_restoredContentsPosition.y();
m_restoredContentsPosition = QPoint();
- QAbstractItemView* view = m_viewAccessor.itemView();
- Q_ASSERT(view != 0);
- view->horizontalScrollBar()->setValue(x);
- view->verticalScrollBar()->setValue(y);
+ m_container->horizontalScrollBar()->setValue(x);
+ m_container->verticalScrollBar()->setValue(y);
}
-}
-void DolphinView::slotUrlChangeRequested(const KUrl& url)
-{
- m_viewModeController->setUrl(url);
- updateWritableState();
+ if (!m_selectedUrls.isEmpty()) {
+ KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ QSet<int> selectedItems = selectionManager->selectedItems();
+ const KFileItemModel* model = fileItemModel();
+
+ foreach (const KUrl& url, m_selectedUrls) {
+ const int index = model->index(url);
+ if (index >= 0) {
+ selectedItems.insert(index);
+ }
+ }
+
+ selectionManager->setSelectedItems(selectedItems);
+ m_selectedUrls.clear();
+ }
}
void DolphinView::showHoverInformation(const KFileItem& item)
void DolphinView::slotDirListerStarted(const KUrl& url)
{
// Disable the writestate temporary until it can be determined in a fast way
- // in DolphinView::slotDirListerCompleted()
+ // in DolphinView::slotLoadingCompleted()
if (m_isFolderWritable) {
m_isFolderWritable = false;
emit writeStateChanged(m_isFolderWritable);
emit startedPathLoading(url);
}
-void DolphinView::slotDirListerCompleted()
-{
- if (!m_expanderActive) {
- slotLoadingCompleted();
- }
-
- if (!m_newFileNames.isEmpty()) {
- // select all newly added items created by a paste operation or
- // a drag & drop operation, and clear the previous selection
- m_viewAccessor.itemView()->clearSelection();
- const int rowCount = m_viewAccessor.proxyModel()->rowCount();
- QItemSelection selection;
- for (int row = 0; row < rowCount; ++row) {
- const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->index(row, 0);
- const QModelIndex dirIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
- const KUrl url = m_viewAccessor.dirModel()->itemForIndex(dirIndex).url();
- if (m_newFileNames.contains(url.fileName())) {
- selection.merge(QItemSelection(proxyIndex, proxyIndex), QItemSelectionModel::Select);
- }
- }
- m_viewAccessor.itemView()->selectionModel()->select(selection, QItemSelectionModel::Select);
-
- m_newFileNames.clear();
- }
-
- updateWritableState();
-}
-
void DolphinView::slotLoadingCompleted()
{
- m_expanderActive = false;
-
- if (!m_activeItemUrl.isEmpty()) {
- // assure that the current item remains visible
- const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl);
- if (dirIndex.isValid()) {
- const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
- QAbstractItemView* view = m_viewAccessor.itemView();
- const bool clearSelection = !hasSelection();
- view->setCurrentIndex(proxyIndex);
- if (clearSelection) {
- view->clearSelection();
- }
- m_activeItemUrl.clear();
- }
- }
-
- if (!m_selectedItems.isEmpty()) {
- const KUrl& baseUrl = url();
- KUrl url;
- QItemSelection newSelection;
- foreach(const KFileItem& item, m_selectedItems) {
- url = item.url().upUrl();
- if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
- QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item));
- newSelection.select(index, index);
- }
- }
- m_viewAccessor.itemView()->selectionModel()->select(newSelection,
- QItemSelectionModel::ClearAndSelect
- | QItemSelectionModel::Current);
- m_selectedItems.clear();
- }
-
- // Restore the contents position. This has to be done using a Qt::QueuedConnection
- // because the view might not be in its final state yet.
- QMetaObject::invokeMethod(this, "restoreContentsPosition", Qt::QueuedConnection);
+ // Update the view-state. This has to be done using a Qt::QueuedConnection
+ // because the view might not be in its final state yet (the view also
+ // listens to the completed()-signal from KDirLister and the order of
+ // of slots is undefined).
+ QTimer::singleShot(0, this, SLOT(updateViewState()));
emit finishedPathLoading(url());
+
+ updateWritableState();
}
void DolphinView::slotRefreshItems()
{
if (m_assureVisibleCurrentIndex) {
m_assureVisibleCurrentIndex = false;
- m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
+ //QAbstractItemView* view = m_viewAccessor.itemView();
+ //if (view) {
+ // m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
+ //}
}
}
+KFileItemModel* DolphinView::fileItemModel() const
+{
+ return static_cast<KFileItemModel*>(m_container->controller()->model());
+}
+
void DolphinView::loadDirectory(const KUrl& url, bool reload)
{
if (!url.isValid()) {
return;
}
- KDirLister* dirLister = m_viewAccessor.dirLister();
- dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+ m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
}
void DolphinView::applyViewProperties()
{
- const ViewProperties props(rootUrl());
+ m_container->beginTransaction();
+
+ const ViewProperties props(url());
const Mode mode = props.viewMode();
if (m_mode != mode) {
- const int oldZoomLevel = m_viewModeController->zoomLevel();
-
+ const Mode previousMode = m_mode;
m_mode = mode;
- createView();
- emit modeChanged();
- updateZoomLevel(oldZoomLevel);
- }
- if (m_viewAccessor.itemView() == 0) {
- createView();
- }
+ // Changing the mode might result in changing
+ // the zoom level. Remember the old zoom level so
+ // that zoomLevelChanged() can get emitted.
+ const int oldZoomLevel = m_container->zoomLevel();
- Q_ASSERT(m_viewAccessor.itemView() != 0);
- Q_ASSERT(m_viewAccessor.itemDelegate() != 0);
+ switch (m_mode) {
+ case IconsView: m_container->setItemLayout(KFileItemListView::IconsLayout); break;
+ case CompactView: m_container->setItemLayout(KFileItemListView::CompactLayout); break;
+ case DetailsView: m_container->setItemLayout(KFileItemListView::DetailsLayout); break;
+ default: Q_ASSERT(false); break;
+ }
+
+ emit modeChanged(m_mode, previousMode);
+
+ if (m_container->zoomLevel() != oldZoomLevel) {
+ emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
+ }
+ }
- const bool showHiddenFiles = props.showHiddenFiles();
- if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
- m_viewAccessor.dirLister()->setShowingDotFiles(showHiddenFiles);
- emit showHiddenFilesChanged();
+ const bool hiddenFilesShown = props.hiddenFilesShown();
+ if (hiddenFilesShown != m_dirLister->showingDotFiles()) {
+ m_dirLister->setShowingDotFiles(hiddenFilesShown);
+ m_dirLister->emitChanges();
+ emit hiddenFilesShownChanged(hiddenFilesShown);
}
- m_storedCategorizedSorting = props.categorizedSorting();
+/* m_storedCategorizedSorting = props.categorizedSorting();
const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
emit categorizedSortingChanged();
- }
+ }*/
const DolphinView::Sorting sorting = props.sorting();
- if (sorting != m_viewAccessor.proxyModel()->sorting()) {
- m_viewAccessor.proxyModel()->setSorting(sorting);
+ KFileItemModel* model = fileItemModel();
+ const QByteArray newSortRole = sortRoleForSorting(sorting);
+ if (newSortRole != model->sortRole()) {
+ model->setSortRole(newSortRole);
emit sortingChanged(sorting);
}
const Qt::SortOrder sortOrder = props.sortOrder();
- if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
- m_viewAccessor.proxyModel()->setSortOrder(sortOrder);
+ if (sortOrder != model->sortOrder()) {
+ model->setSortOrder(sortOrder);
emit sortOrderChanged(sortOrder);
}
const bool sortFoldersFirst = props.sortFoldersFirst();
- if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
- m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+ if (sortFoldersFirst != model->sortFoldersFirst()) {
+ model->setSortFoldersFirst(sortFoldersFirst);
emit sortFoldersFirstChanged(sortFoldersFirst);
}
- KFileItemDelegate::InformationList info = props.additionalInfo();
- if (info != m_viewAccessor.itemDelegate()->showInformation()) {
- m_viewAccessor.itemDelegate()->setShowInformation(info);
- emit additionalInfoChanged();
+ const QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
+ if (infoList != m_additionalInfoList) {
+ const QList<DolphinView::AdditionalInfo> previousList = m_additionalInfoList;
+ m_additionalInfoList = infoList;
+ applyAdditionalInfoListToView();
+ emit additionalInfoListChanged(m_additionalInfoList, previousList);
}
- const bool showPreview = props.showPreview();
- if (showPreview != m_showPreview) {
- m_showPreview = showPreview;
- const int oldZoomLevel = m_viewModeController->zoomLevel();
- emit showPreviewChanged();
+ const bool previewsShown = props.previewsShown();
+ if (previewsShown != m_container->previewsShown()) {
+ const int oldZoomLevel = zoomLevel();
- // Enabling or disabling the preview might change the icon size of the view.
- // 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);
- }
-}
-
-void DolphinView::createView()
-{
- deleteView();
+ m_container->setPreviewsShown(previewsShown);
+ emit previewsShownChanged(previewsShown);
- Q_ASSERT(m_viewAccessor.itemView() == 0);
- Q_ASSERT(m_dolphinViewController->itemView() == 0);
- m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode);
-
- QAbstractItemView* view = m_viewAccessor.itemView();
- Q_ASSERT(view != 0);
- view->installEventFilter(this);
- view->viewport()->installEventFilter(this);
-
- m_dolphinViewController->setItemView(view);
-
- const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize());
- m_viewModeController->setZoomLevel(zoomLevel);
-
- connectViewAccessor();
+ // Changing the preview-state might result in a changed zoom-level
+ if (oldZoomLevel != zoomLevel()) {
+ emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
+ }
+ }
- setFocusProxy(m_viewAccessor.layoutTarget());
- m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
+ m_container->endTransaction();
}
-void DolphinView::deleteView()
+void DolphinView::applyAdditionalInfoListToView()
{
- QAbstractItemView* view = m_viewAccessor.itemView();
- Q_ASSERT((m_dolphinViewController->itemView() == 0) || (m_dolphinViewController->itemView() == view));
- m_dolphinViewController->setItemView(0);
-
- if (view != 0) {
- disconnectViewAccessor();
-
- if (hasFocus()) {
- // 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();
- }
+ const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- m_viewModeController->disconnect(view);
+ QList<QByteArray> visibleRoles;
+ visibleRoles.reserve(m_additionalInfoList.count() + 1);
+ visibleRoles.append("name");
- m_viewAccessor.deleteView();
+ foreach (AdditionalInfo info, m_additionalInfoList) {
+ visibleRoles.append(infoAccessor.role(info));
}
+
+ m_container->setVisibleRoles(visibleRoles);
}
void DolphinView::pasteToUrl(const KUrl& url)
{
- addNewFileNames(QApplication::clipboard()->mimeData());
+ markPastedUrlsAsSelected(QApplication::clipboard()->mimeData());
KonqOperations::doPaste(this, url);
}
void DolphinView::updateZoomLevel(int oldZoomLevel)
{
- const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
+ Q_UNUSED(oldZoomLevel);
+ /* const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
if (oldZoomLevel != newZoomLevel) {
m_viewModeController->setZoomLevel(newZoomLevel);
emit zoomLevelChanged(newZoomLevel);
- }
+ }*/
}
KUrl::List DolphinView::simplifiedSelectedUrls() const
urls.append(item.url());
}
-
if (itemsExpandable()) {
+ // TODO: Check if we still need KDirModel for this in KDE 5.0
urls = KDirModel::simplifiedUrlList(urls);
}
QMimeData* DolphinView::selectionMimeData() const
{
- const QAbstractItemView* view = m_viewAccessor.itemView();
- Q_ASSERT((view != 0) && (view->selectionModel() != 0));
- const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
- return m_viewAccessor.dirModel()->mimeData(selection.indexes());
-}
-
-void DolphinView::addNewFileNames(const QMimeData* mimeData)
-{
- const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
- foreach (const KUrl& url, urls) {
- m_newFileNames.insert(url.fileName());
- }
-}
-
-QItemSelection DolphinView::childrenMatchingPattern(const QModelIndex& parent, const QRegExp& pattern) const
-{
- QItemSelection matchingIndexes;
- const DolphinSortFilterProxyModel* proxyModel = m_viewAccessor.proxyModel();
- const DolphinModel* dolphinModel = m_viewAccessor.dirModel();
-
- const int rowCount = proxyModel->rowCount(parent);
-
- for (int row = 0; row < rowCount; ++row) {
- QModelIndex index = proxyModel->index(row, 0, parent);
- QModelIndex sourceIndex = proxyModel->mapToSource(index);
-
- if (sourceIndex.isValid() && pattern.exactMatch(dolphinModel->data(sourceIndex).toString())) {
- matchingIndexes += QItemSelectionRange(index);
- }
-
- if (proxyModel->hasChildren(index)) {
- matchingIndexes += childrenMatchingPattern(index, pattern);
- }
- }
+ const KFileItemModel* model = fileItemModel();
+ const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+ const QSet<int> selectedIndexes = selectionManager->selectedItems();
- return matchingIndexes;
+ return model->createMimeData(selectedIndexes);
}
-void DolphinView::connectViewAccessor()
+void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
{
- KDirLister* dirLister = m_viewAccessor.dirLister();
- connect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
- this, SLOT(slotRedirection(KUrl,KUrl)));
- connect(dirLister, SIGNAL(started(KUrl)),
- this, SLOT(slotDirListerStarted(KUrl)));
- connect(dirLister, SIGNAL(completed()),
- this, SLOT(slotDirListerCompleted()));
- connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
- this, SLOT(slotRefreshItems()));
-
- QAbstractItemView* view = m_viewAccessor.itemView();
- connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
- this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
-}
-
-void DolphinView::disconnectViewAccessor()
-{
- KDirLister* dirLister = m_viewAccessor.dirLister();
- disconnect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
- this, SLOT(slotRedirection(KUrl,KUrl)));
- disconnect(dirLister, SIGNAL(started(KUrl)),
- this, SLOT(slotDirListerStarted(KUrl)));
- disconnect(dirLister, SIGNAL(completed()),
- this, SLOT(slotDirListerCompleted()));
- disconnect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
- this, SLOT(slotRefreshItems()));
-
- QAbstractItemView* view = m_viewAccessor.itemView();
- disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
- this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+ const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+ markUrlsAsSelected(urls);
}
void DolphinView::updateWritableState()
const bool wasFolderWritable = m_isFolderWritable;
m_isFolderWritable = true;
- const KFileItem item = m_viewAccessor.dirLister()->rootItem();
+ const KFileItem item = m_dirLister->rootItem();
if (!item.isNull()) {
KFileItemListProperties capabilities(KFileItemList() << item);
m_isFolderWritable = capabilities.supportsWriting();
}
}
-DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) :
- m_rootUrl(),
- m_iconsView(0),
- m_detailsView(0),
- m_columnsContainer(0),
- m_proxyModel(proxyModel),
- m_dragSource(0)
-{
-}
-
-DolphinView::ViewAccessor::~ViewAccessor()
-{
- delete m_dragSource;
- m_dragSource = 0;
-}
-
-void DolphinView::ViewAccessor::createView(QWidget* parent,
- DolphinViewController* dolphinViewController,
- const ViewModeController* viewModeController,
- Mode mode)
-{
- Q_ASSERT(itemView() == 0);
-
- switch (mode) {
- case IconsView:
- m_iconsView = new DolphinIconsView(parent,
- dolphinViewController,
- viewModeController,
- m_proxyModel);
- break;
-
- case DetailsView:
- m_detailsView = new DolphinDetailsView(parent,
- dolphinViewController,
- viewModeController,
- m_proxyModel);
- break;
-
- case ColumnView:
- m_columnsContainer = new DolphinColumnViewContainer(parent,
- dolphinViewController,
- viewModeController);
- if (!m_rootUrl.isEmpty() && m_rootUrl.isParentOf(viewModeController->url())) {
- // The column-view must show several columns starting with m_rootUrl as
- // first column and viewModeController->url() as last column.
- m_columnsContainer->showColumn(m_rootUrl);
- m_columnsContainer->showColumn(viewModeController->url());
- }
- break;
-
- default:
- Q_ASSERT(false);
- }
-}
-
-void DolphinView::ViewAccessor::deleteView()
-{
- if (m_columnsContainer != 0) {
- m_columnsContainer->close();
- m_columnsContainer->disconnect();
- m_columnsContainer->deleteLater();
- m_columnsContainer = 0;
- } else {
- QAbstractItemView* view = itemView();
- if (view != 0) {
- view->close();
- view->disconnect();
-
- 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();
- view = 0;
- }
- }
-
- m_iconsView = 0;
- m_detailsView = 0;
- }
-}
-
-void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
-{
- if (m_columnsContainer != 0) {
- m_columnsContainer->showColumn(url);
- }
-}
-
-QAbstractItemView* DolphinView::ViewAccessor::itemView() const
-{
- if (m_iconsView != 0) {
- return m_iconsView;
- }
-
- if (m_detailsView != 0) {
- return m_detailsView;
- }
-
- if (m_columnsContainer != 0) {
- return m_columnsContainer->activeColumn();
- }
-
- return 0;
-}
-
-KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const
-{
- return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
-}
-
-QWidget* DolphinView::ViewAccessor::layoutTarget() const
-{
- if (m_columnsContainer != 0) {
- return m_columnsContainer;
- }
- return itemView();
-}
-
-void DolphinView::ViewAccessor::setRootUrl(const KUrl& rootUrl)
-{
- m_rootUrl = rootUrl;
-}
-
-KUrl DolphinView::ViewAccessor::rootUrl() const
-{
- return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : m_rootUrl;
-}
-
-bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
-{
- return m_iconsView != 0;
-}
-
-bool DolphinView::ViewAccessor::itemsExpandable() const
-{
- return (m_detailsView != 0) && m_detailsView->itemsExpandable();
-}
-
-QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
-{
- if (m_detailsView != 0) {
- return m_detailsView->expandedUrls();
- }
-
- return QSet<KUrl>();
-}
-
-const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)
+QByteArray DolphinView::sortRoleForSorting(Sorting sorting) const
{
- if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
- // Check if another expander is already active and stop it if necessary.
- if(!m_detailsViewExpander.isNull()) {
- m_detailsViewExpander->stop();
- }
-
- m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
- return m_detailsViewExpander;
+ switch (sorting) {
+ case SortByName: return "name";
+ case SortBySize: return "size";
+ case SortByDate: return "date";
+ case SortByPermissions: return "permissions";
+ case SortByOwner: return "owner";
+ case SortByGroup: return "group";
+ case SortByType: return "type";
+ case SortByDestination: return "destination";
+ case SortByPath: return "path";
+ default: break;
}
- else {
- return 0;
- }
-}
-bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
-{
- // the details view requires no reloading of the directory, as it maps
- // the file item delegate info to its columns internally
- return m_detailsView != 0;
-}
-
-DolphinModel* DolphinView::ViewAccessor::dirModel() const
-{
- return static_cast<DolphinModel*>(proxyModel()->sourceModel());
+ return QByteArray();
}
-DolphinSortFilterProxyModel* DolphinView::ViewAccessor::proxyModel() const
+DolphinView::Sorting DolphinView::sortingForSortRole(const QByteArray& sortRole) const
{
- if (m_columnsContainer != 0) {
- return static_cast<DolphinSortFilterProxyModel*>(m_columnsContainer->activeColumn()->model());
+ static QHash<QByteArray, DolphinView::Sorting> sortHash;
+ if (sortHash.isEmpty()) {
+ sortHash.insert("name", SortByName);
+ sortHash.insert("size", SortBySize);
+ sortHash.insert("date", SortByDate);
+ sortHash.insert("permissions", SortByPermissions);
+ sortHash.insert("owner", SortByOwner);
+ sortHash.insert("group", SortByGroup);
+ sortHash.insert("type", SortByType);
+ sortHash.insert("destination", SortByDestination);
+ sortHash.insert("path", SortByPath);
}
- return m_proxyModel;
+ return sortHash.value(sortRole);
}
-KDirLister* DolphinView::ViewAccessor::dirLister() const
+void DolphinView::markUrlAsCurrent(const KUrl& url)
{
- return dirModel()->dirLister();
+ m_currentItemUrl = url;
}
#include "dolphinview.moc"
projects / dolphin.git / blobdiff