#include <KActionCollection>
#include <KColorScheme>
-#include <KDirLister>
#include <KDirModel>
#include <KIconEffect>
#include <KFileItem>
#include <KLocale>
#include <kitemviews/kfileitemmodel.h>
#include <kitemviews/kfileitemlistview.h>
+#include <kitemviews/kitemlistcontainer.h>
#include <kitemviews/kitemlistheader.h>
#include <kitemviews/kitemlistselectionmanager.h>
#include <kitemviews/kitemlistview.h>
#include <kitemviews/kitemlistcontroller.h>
#include <KIO/DeleteJob>
+#include <KIO/JobUiDelegate>
#include <KIO/NetAccess>
#include <KIO/PreviewJob>
#include <KJob>
#include <KToggleAction>
#include <KUrl>
-#include "dolphindirlister.h"
#include "dolphinnewfilemenuobserver.h"
#include "dolphin_detailsmodesettings.h"
#include "dolphin_generalsettings.h"
-#include "dolphinitemlistcontainer.h"
+#include "dolphinitemlistview.h"
#include "draganddrophelper.h"
#include "renamedialog.h"
#include "versioncontrol/versioncontrolobserver.h"
#include "zoomlevelinfo.h"
#ifdef HAVE_NEPOMUK
- #include <Nepomuk/ResourceManager>
+ #include <Nepomuk2/ResourceManager>
#endif
namespace {
m_isFolderWritable(true),
m_dragging(false),
m_url(url),
+ m_viewPropertiesContext(),
m_mode(DolphinView::IconsView),
m_visibleRoles(),
m_topLayout(0),
- m_dirLister(0),
+ m_model(0),
+ m_view(0),
m_container(0),
m_toolTipManager(0),
m_selectionChangedTimer(0),
m_currentItemUrl(),
+ m_scrollToCurrentItem(false),
m_restoredContentsPosition(),
- m_createdItemUrl(),
m_selectedUrls(),
+ m_clearSelectionBeforeSelectingNewItems(false),
m_versionControlObserver(0)
{
m_topLayout = new QVBoxLayout(this);
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");
+ m_model = new KFileItemModel(this);
+ m_view = new DolphinItemListView();
+ m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+ m_view->setVisibleRoles(QList<QByteArray>() << "text");
+ applyModeToView();
+
+ KItemListController* controller = new KItemListController(m_model, m_view, this);
+ const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+ controller->setAutoActivationDelay(delay);
+
+ // The EnlargeSmallPreviews setting can only be changed after the model
+ // has been set in the view by KItemListController.
+ m_view->setEnlargeSmallPreviews(GeneralSettings::enlargeSmallPreviews());
+
+ m_container = new KItemListContainer(controller, this);
m_container->installEventFilter(this);
setFocusProxy(m_container);
connect(m_container->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip()));
connect(m_container->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip()));
- KItemListController* controller = m_container->controller();
controller->setSelectionBehavior(KItemListController::MultiSelection);
connect(controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
connect(controller, SIGNAL(itemsActivated(QSet<int>)), this, SLOT(slotItemsActivated(QSet<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()));
- }
-
- KItemListView* view = controller->view();
- view->installEventFilter(this);
- connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
+ connect(m_model, SIGNAL(directoryLoadingStarted()), this, SLOT(slotDirectoryLoadingStarted()));
+ connect(m_model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
+ connect(m_model, SIGNAL(directoryLoadingCanceled()), this, SIGNAL(directoryLoadingCanceled()));
+ connect(m_model, SIGNAL(directoryLoadingProgress(int)), this, SIGNAL(directoryLoadingProgress(int)));
+ connect(m_model, SIGNAL(directorySortingProgress(int)), this, SIGNAL(directorySortingProgress(int)));
+ connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
+ this, SLOT(slotItemsChanged()));
+ connect(m_model, SIGNAL(itemsRemoved(KItemRangeList)), this, SIGNAL(itemCountChanged()));
+ connect(m_model, SIGNAL(itemsInserted(KItemRangeList)), this, SIGNAL(itemCountChanged()));
+ connect(m_model, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
+ connect(m_model, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
+ connect(m_model, SIGNAL(directoryRedirection(KUrl,KUrl)), this, SLOT(slotDirectoryRedirection(KUrl,KUrl)));
+ connect(m_model, SIGNAL(urlIsFileError(KUrl)), this, SIGNAL(urlIsFileError(KUrl)));
+
+ m_view->installEventFilter(this);
+ connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
- connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
+ connect(m_view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
- connect(view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
+ connect(m_view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
this, SLOT(slotVisibleRolesChangedByHeader(QList<QByteArray>,QList<QByteArray>)));
- connect(view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
+ connect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+ connect(m_view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));
KItemListSelectionManager* selectionManager = controller->selectionManager();
m_toolTipManager = new ToolTipManager(this);
m_versionControlObserver = new VersionControlObserver(this);
- m_versionControlObserver->setModel(model);
+ m_versionControlObserver->setModel(m_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)));
void DolphinView::setMode(Mode mode)
{
if (mode != m_mode) {
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setViewMode(mode);
props.save();
return;
}
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setPreviewsShown(show);
- m_container->setPreviewsShown(show);
+ const int oldZoomLevel = m_view->zoomLevel();
+ m_view->setPreviewsShown(show);
emit previewsShownChanged(show);
+
+ const int newZoomLevel = m_view->zoomLevel();
+ if (newZoomLevel != oldZoomLevel) {
+ emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+ }
}
bool DolphinView::previewsShown() const
{
- return m_container->previewsShown();
+ return m_view->previewsShown();
}
void DolphinView::setHiddenFilesShown(bool show)
{
- if (m_dirLister->showingDotFiles() == show) {
+ if (m_model->showHiddenFiles() == show) {
return;
}
m_selectedUrls.clear();
m_selectedUrls = itemList.urlList();
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setHiddenFilesShown(show);
- fileItemModel()->setShowHiddenFiles(show);
+ m_model->setShowHiddenFiles(show);
emit hiddenFilesShownChanged(show);
}
bool DolphinView::hiddenFilesShown() const
{
- return m_dirLister->showingDotFiles();
+ return m_model->showHiddenFiles();
}
void DolphinView::setGroupedSorting(bool grouped)
return;
}
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setGroupedSorting(grouped);
props.save();
bool DolphinView::groupedSorting() const
{
- return fileItemModel()->groupedSorting();
+ return m_model->groupedSorting();
}
KFileItemList DolphinView::items() const
{
- return m_dirLister->items();
+ KFileItemList list;
+ const int itemCount = m_model->count();
+ list.reserve(itemCount);
+
+ for (int i = 0; i < itemCount; ++i) {
+ list.append(m_model->fileItem(i));
+ }
+
+ return list;
+}
+
+int DolphinView::itemsCount() const
+{
+ return m_model->count();
}
KFileItemList DolphinView::selectedItems() const
{
- const KFileItemModel* model = fileItemModel();
const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
- const QSet<int> selectedIndexes = selectionManager->selectedItems();
+ QList<int> selectedIndexes = selectionManager->selectedItems().toList();
+
+ qSort(selectedIndexes);
KFileItemList selectedItems;
- QSetIterator<int> it(selectedIndexes);
+ QListIterator<int> it(selectedIndexes);
while (it.hasNext()) {
const int index = it.next();
- selectedItems.append(model->fileItem(index));
+ selectedItems.append(m_model->fileItem(index));
}
return selectedItems;
}
void DolphinView::markUrlAsCurrent(const KUrl& url)
{
m_currentItemUrl = url;
+ m_scrollToCurrentItem = true;
}
-void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
+void DolphinView::selectItems(const QRegExp& pattern, bool enabled)
{
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);
+ for (int index = 0; index < m_model->count(); index++) {
+ const KFileItem item = m_model->fileItem(index);
if (pattern.exactMatch(item.text())) {
// 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
void DolphinView::setZoomLevel(int level)
{
const int oldZoomLevel = zoomLevel();
- m_container->setZoomLevel(level);
+ m_view->setZoomLevel(level);
if (zoomLevel() != oldZoomLevel) {
+ hideToolTip();
emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
}
}
int DolphinView::zoomLevel() const
{
- return m_container->zoomLevel();
+ return m_view->zoomLevel();
}
void DolphinView::setSortRole(const QByteArray& role)
Qt::SortOrder DolphinView::sortOrder() const
{
- KItemModelBase* model = fileItemModel();
- return model->sortOrder();
+ return m_model->sortOrder();
}
void DolphinView::setSortFoldersFirst(bool foldersFirst)
bool DolphinView::sortFoldersFirst() const
{
- KFileItemModel* model = fileItemModel();
- return model->sortFoldersFirst();
+ return m_model->sortDirectoriesFirst();
}
void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)
{
const QList<QByteArray> previousRoles = roles;
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setVisibleRoles(roles);
m_visibleRoles = roles;
- m_container->setVisibleRoles(roles);
+ m_view->setVisibleRoles(roles);
emit visibleRolesChanged(m_visibleRoles, previousRoles);
}
void DolphinView::stopLoading()
{
- m_dirLister->stop();
+ m_model->cancelDirectoryLoading();
}
void DolphinView::readSettings()
{
- const int oldZoomLevel = m_container->zoomLevel();
+ const int oldZoomLevel = m_view->zoomLevel();
GeneralSettings::self()->readConfig();
- m_container->readSettings();
+ m_view->readSettings();
applyViewProperties();
- const int newZoomLevel = m_container->zoomLevel();
+ const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+ m_container->controller()->setAutoActivationDelay(delay);
+
+ const int newZoomLevel = m_view->zoomLevel();
if (newZoomLevel != oldZoomLevel) {
emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
}
void DolphinView::writeSettings()
{
GeneralSettings::self()->writeConfig();
- m_container->writeSettings();
+ m_view->writeSettings();
}
void DolphinView::setNameFilter(const QString& nameFilter)
{
- fileItemModel()->setNameFilter(nameFilter);
+ m_model->setNameFilter(nameFilter);
}
QString DolphinView::nameFilter() const
{
- return fileItemModel()->nameFilter();
+ return m_model->nameFilter();
}
-void DolphinView::calculateItemCount(int& fileCount,
- int& folderCount,
- KIO::filesize_t& totalFileSize) const
+void DolphinView::setMimeTypeFilters(const QStringList& filters)
{
- foreach (const KFileItem& item, m_dirLister->items()) {
- if (item.isDir()) {
- ++folderCount;
- } else {
- ++fileCount;
- totalFileSize += item.size();
- }
- }
+ return m_model->setMimeTypeFilters(filters);
+}
+
+QStringList DolphinView::mimeTypeFilters() const
+{
+ return m_model->mimeTypeFilters();
}
QString DolphinView::statusBarText() const
int fileCount = 0;
KIO::filesize_t totalFileSize = 0;
- if (hasSelection()) {
+ if (m_container->controller()->selectionManager()->hasSelection()) {
// Give a summary of the status of the selected files
const KFileItemList list = selectedItems();
foreach (const KFileItem& item, list) {
KGlobal::locale()->formatByteSize(totalFileSize));
} else if (folderCount > 0) {
summary = foldersText;
+ } else {
+ summary = i18nc("@info:status", "0 Folders, 0 Files");
}
return summary;
QList<QAction*> actions;
if (items.isEmpty()) {
- const KFileItem item = fileItemModel()->rootItem();
- actions = m_versionControlObserver->actions(KFileItemList() << item);
+ const KFileItem item = m_model->rootItem();
+ if (!item.isNull()) {
+ actions = m_versionControlObserver->actions(KFileItemList() << item);
+ }
} else {
actions = m_versionControlObserver->actions(items);
}
return;
}
+ clearSelection();
+
emit urlAboutToBeChanged(url);
m_url = url;
// applying the view properties, otherwise expensive operations
// might be done on the existing items although they get cleared
// anyhow afterwards by loadDirectory().
- fileItemModel()->clear();
+ m_model->clear();
applyViewProperties();
loadDirectory(url);
void DolphinView::selectAll()
{
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
- selectionManager->setSelected(0, fileItemModel()->count());
+ selectionManager->setSelected(0, m_model->count());
}
void DolphinView::invertSelection()
{
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
- selectionManager->setSelected(0, fileItemModel()->count(), KItemListSelectionManager::Toggle);
+ selectionManager->setSelected(0, m_model->count(), KItemListSelectionManager::Toggle);
}
void DolphinView::clearSelection()
{
+ m_selectedUrls.clear();
m_container->controller()->selectionManager()->clearSelection();
}
void DolphinView::renameSelectedItems()
{
- KFileItemList items = selectedItems();
- const int itemCount = items.count();
- if (itemCount < 1) {
+ const KFileItemList items = selectedItems();
+ if (items.isEmpty()) {
return;
}
- // TODO: The new view-engine introduced with Dolphin 2.0 does not support inline
- // renaming yet.
- /*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 {*/
+ if (items.count() == 1 && GeneralSettings::renameInline()) {
+ const int index = m_model->index(items.first());
+ m_view->editRole(index, "text");
+ } 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
+ // Assure that the current index remains visible when KFileItemModel
+ // will notify the view about changed items (which might result in
+ // a changed sorting).
m_assureVisibleCurrentIndex = true;
}
if (del) {
KIO::Job* job = KIO::del(list);
+ if (job->ui()) {
+ job->ui()->setWindow(this);
+ }
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotDeleteFileFinished(KJob*)));
}
break;
case QEvent::GraphicsSceneDragEnter:
- if (watched == m_container->controller()->view()) {
+ if (watched == m_view) {
m_dragging = true;
}
break;
case QEvent::GraphicsSceneDragLeave:
- if (watched == m_container->controller()->view()) {
+ if (watched == m_view) {
m_dragging = false;
}
break;
case QEvent::GraphicsSceneDrop:
- if (watched == m_container->controller()->view()) {
+ if (watched == m_view) {
m_dragging = false;
}
default:
QWidget::hideEvent(event);
}
+bool DolphinView::event(QEvent* event)
+{
+ /* See Bug 297355
+ * Dolphin leaves file preview tooltips open even when is not visible.
+ *
+ * Hide tool-tip when Dolphin loses focus.
+ */
+ if (event->type() == QEvent::WindowDeactivate) {
+ hideToolTip();
+ }
+
+ return QWidget::event(event);
+}
+
void DolphinView::activate()
{
setActive(true);
void DolphinView::slotItemActivated(int index)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
emit itemActivated(item);
}
{
Q_ASSERT(indexes.count() >= 2);
+ if (indexes.count() > 5) {
+ QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
+ const int answer = KMessageBox::warningYesNo(this, question);
+ if (answer != KMessageBox::Yes) {
+ return;
+ }
+ }
+
KFileItemList items;
+ items.reserve(indexes.count());
- KFileItemModel* model = fileItemModel();
QSetIterator<int> it(indexes);
while (it.hasNext()) {
const int index = it.next();
- items.append(model->fileItem(index));
- }
+ KFileItem item = m_model->fileItem(index);
- foreach (const KFileItem& item, items) {
- if (item.isDir()) {
+ if (item.isDir()) { // Open folders in new tabs
emit tabRequested(item.url());
} else {
- emit itemActivated(item);
+ items.append(item);
}
}
+
+ if (items.count() == 1) {
+ emit itemActivated(items.first());
+ } else if (items.count() > 1) {
+ emit itemsActivated(items);
+ }
}
void DolphinView::slotItemMiddleClicked(int index)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ const KFileItem item = m_model->fileItem(index);
if (item.isDir() || isTabsForFilesEnabled()) {
emit tabRequested(item.url());
}
void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ const KFileItem item = m_model->fileItem(index);
emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
}
void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
{
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
bool nepomukRunning = false;
bool indexingEnabled = false;
#ifdef HAVE_NEPOMUK
- nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
+ nepomukRunning = (Nepomuk2::ResourceManager::instance()->initialized());
if (nepomukRunning) {
KConfig config("nepomukserverrc");
- indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
+ indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", true);
}
#endif
// Add all roles to the menu that can be shown or hidden by the user
const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
- if (info.role == "name") {
- // It should not be possible to hide the "name" role
+ if (info.role == "text") {
+ // It should not be possible to hide the "text" role
continue;
}
- const QString text = fileItemModel()->roleDescription(info.role);
+ const QString text = m_model->roleDescription(info.role);
QAction* action = 0;
if (info.group.isEmpty()) {
action = menu->addAction(text);
{
Q_UNUSED(previous);
- const QList<QByteArray> visibleRoles = m_container->visibleRoles();
+ const QList<QByteArray> visibleRoles = m_view->visibleRoles();
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
QList<int> columnWidths = props.headerColumnWidths();
if (columnWidths.count() != visibleRoles.count()) {
columnWidths.clear();
columnWidths.reserve(visibleRoles.count());
- const KItemListHeader* header = m_container->controller()->view()->header();
+ const KItemListHeader* header = m_view->header();
foreach (const QByteArray& role, visibleRoles) {
const int width = header->columnWidth(role);
columnWidths.append(width);
void DolphinView::slotItemHovered(int index)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ const KFileItem item = m_model->fileItem(index);
if (GeneralSettings::showToolTips() && !m_dragging) {
QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
{
KUrl destUrl;
- KFileItem destItem = fileItemModel()->fileItem(index);
+ KFileItem destItem = m_model->fileItem(index);
if (destItem.isNull() || (!destItem.isDir() && !destItem.isDesktopFile())) {
// Use the URL of the view as drop target if the item is no directory
// or desktop-file
- destItem = fileItemModel()->rootItem();
+ destItem = m_model->rootItem();
destUrl = url();
} else {
// The item represents a directory or desktop-file
void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
{
if (previous != 0) {
- disconnect(previous, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+ disconnect(previous, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
+ m_versionControlObserver->setModel(0);
}
- Q_ASSERT(qobject_cast<KFileItemModel*>(current));
- connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+ if (current) {
+ Q_ASSERT(qobject_cast<KFileItemModel*>(current));
+ connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
- KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
- m_versionControlObserver->setModel(fileItemModel);
+ KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
+ m_versionControlObserver->setModel(fileItemModel);
+ }
}
void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons)
void DolphinView::updateSortRole(const QByteArray& role)
{
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSortRole(role);
KItemModelBase* model = m_container->controller()->model();
void DolphinView::updateSortOrder(Qt::SortOrder order)
{
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSortOrder(order);
- KItemModelBase* model = fileItemModel();
- model->setSortOrder(order);
+ m_model->setSortOrder(order);
emit sortOrderChanged(order);
}
void DolphinView::updateSortFoldersFirst(bool foldersFirst)
{
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSortFoldersFirst(foldersFirst);
- KFileItemModel* model = fileItemModel();
- model->setSortFoldersFirst(foldersFirst);
+ m_model->setSortDirectoriesFirst(foldersFirst);
emit sortFoldersFirstChanged(foldersFirst);
}
// Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
QSet<KUrl> urls;
stream >> urls;
- fileItemModel()->restoreExpandedUrls(urls);
+ m_model->restoreExpandedDirectories(urls);
}
void DolphinView::saveState(QDataStream& stream)
// 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);
+ KFileItem item = m_model->fileItem(currentIndex);
Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist
KUrl currentItemUrl = item.url();
stream << currentItemUrl;
stream << QPoint(x, y);
// Save expanded folders (only relevant for the details view - the set will be empty in other view modes)
- stream << fileItemModel()->expandedUrls();
+ stream << m_model->expandedDirectories();
}
-bool DolphinView::hasSelection() const
+KFileItem DolphinView::rootItem() const
{
- return m_container->controller()->selectionManager()->hasSelection();
+ return m_model->rootItem();
}
-KFileItem DolphinView::rootItem() const
+void DolphinView::setViewPropertiesContext(const QString& context)
{
- return m_dirLister->rootItem();
+ m_viewPropertiesContext = context;
}
-void DolphinView::observeCreatedItem(const KUrl& url)
+QString DolphinView::viewPropertiesContext() const
{
- m_createdItemUrl = url;
- //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- // this, SLOT(selectAndScrollToCreatedItem()));
+ return m_viewPropertiesContext;
}
-void DolphinView::selectAndScrollToCreatedItem()
+void DolphinView::observeCreatedItem(const KUrl& url)
{
- /*const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
- if (dirIndex.isValid()) {
- const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
- QAbstractItemView* view = m_viewAccessor.itemView();
- if (view) {
- view->setCurrentIndex(proxyIndex);
- }
+ if (m_active) {
+ clearSelection();
+ markUrlAsCurrent(url);
+ markUrlsAsSelected(QList<KUrl>() << url);
}
-
- disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(selectAndScrollToCreatedItem()));*/
- m_createdItemUrl = KUrl();
}
-void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)
{
if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
emit redirection(oldUrl, newUrl);
{
if (m_currentItemUrl != KUrl()) {
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
- const int currentIndex = fileItemModel()->index(m_currentItemUrl);
+ const int currentIndex = m_model->index(m_currentItemUrl);
if (currentIndex != -1) {
selectionManager->setCurrentItem(currentIndex);
+
+ // scroll to current item and reset the state
+ if (m_scrollToCurrentItem) {
+ m_view->scrollToItem(currentIndex);
+ m_scrollToCurrentItem = false;
+ }
} else {
selectionManager->setCurrentItem(0);
}
}
if (!m_selectedUrls.isEmpty()) {
- clearSelection();
-
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+
+ if (m_clearSelectionBeforeSelectingNewItems) {
+ selectionManager->clearSelection();
+ m_clearSelectionBeforeSelectingNewItems = false;
+ }
+
QSet<int> selectedItems = selectionManager->selectedItems();
- const KFileItemModel* model = fileItemModel();
- foreach (const KUrl& url, m_selectedUrls) {
- const int index = model->index(url);
+ QList<KUrl>::iterator it = m_selectedUrls.begin();
+ while (it != m_selectedUrls.end()) {
+ const int index = m_model->index(*it);
if (index >= 0) {
selectedItems.insert(index);
+ it = m_selectedUrls.erase(it);
+ } else {
+ ++it;
}
}
selectionManager->setSelectedItems(selectedItems);
- m_selectedUrls.clear();
}
}
}
}
+void DolphinView::calculateItemCount(int& fileCount,
+ int& folderCount,
+ KIO::filesize_t& totalFileSize) const
+{
+ const int itemCount = m_model->count();
+ for (int i = 0; i < itemCount; ++i) {
+ const KFileItem item = m_model->fileItem(i);
+ if (item.isDir()) {
+ ++folderCount;
+ } else {
+ ++fileCount;
+ totalFileSize += item.size();
+ }
+ }
+}
+
void DolphinView::showHoverInformation(const KFileItem& item)
{
emit requestItemInfo(item);
}
}
-void DolphinView::slotDirListerStarted(const KUrl& url)
+void DolphinView::slotDirectoryLoadingStarted()
{
// Disable the writestate temporary until it can be determined in a fast way
// in DolphinView::slotLoadingCompleted()
emit writeStateChanged(m_isFolderWritable);
}
- emit startedPathLoading(url);
+ emit directoryLoadingStarted();
}
-void DolphinView::slotLoadingCompleted()
+void DolphinView::slotDirectoryLoadingCompleted()
{
- // Update the view-state. This has to be done using a Qt::QueuedConnection
+ // Update the view-state. This has to be done asynchronously
// because the view might not be in its final state yet.
QTimer::singleShot(0, this, SLOT(updateViewState()));
- emit finishedPathLoading(url());
+ emit directoryLoadingCompleted();
updateWritableState();
}
-void DolphinView::slotRefreshItems()
+void DolphinView::slotItemsChanged()
{
- if (m_assureVisibleCurrentIndex) {
- m_assureVisibleCurrentIndex = false;
- //QAbstractItemView* view = m_viewAccessor.itemView();
- //if (view) {
- // m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
- //}
- }
+ m_assureVisibleCurrentIndex = false;
}
void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
{
Q_UNUSED(previous);
- Q_ASSERT(fileItemModel()->sortOrder() == current);
+ Q_ASSERT(m_model->sortOrder() == current);
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSortOrder(current);
emit sortOrderChanged(current);
void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
{
Q_UNUSED(previous);
- Q_ASSERT(fileItemModel()->sortRole() == current);
+ Q_ASSERT(m_model->sortRole() == current);
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSortRole(current);
emit sortRoleChanged(current);
m_visibleRoles = current;
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setVisibleRoles(m_visibleRoles);
emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
}
-KFileItemModel* DolphinView::fileItemModel() const
+void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
{
- return static_cast<KFileItemModel*>(m_container->controller()->model());
+ if (index < 0 || index >= m_model->count()) {
+ return;
+ }
+
+ if (role == "text") {
+ const KFileItem oldItem = m_model->fileItem(index);
+ const QString newName = value.toString();
+ if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+ const KUrl oldUrl = oldItem.url();
+
+ const KUrl newUrl(url().path(KUrl::AddTrailingSlash) + newName);
+ const bool newNameExistsAlready = (m_model->index(newUrl) >= 0);
+ if (!newNameExistsAlready) {
+ // Only change the data in the model if no item with the new name
+ // is in the model yet. If there is an item with the new name
+ // already, calling KonqOperations::rename() will open a dialog
+ // asking for a new name, and KFileItemModel will update the
+ // data when the dir lister signals that the file name has changed.
+ QHash<QByteArray, QVariant> data;
+ data.insert(role, value);
+ m_model->setData(index, data);
+ }
+
+ KonqOperations::rename(this, oldUrl, newName);
+ }
+ }
}
void DolphinView::loadDirectory(const KUrl& url, bool reload)
return;
}
- m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+ if (reload) {
+ m_model->refreshDirectory(url);
+ } else {
+ m_model->loadDirectory(url);
+ }
}
void DolphinView::applyViewProperties()
{
- m_container->beginTransaction();
+ m_view->beginTransaction();
- const ViewProperties props(url());
- KFileItemModel* model = fileItemModel();
+ const ViewProperties props(viewPropertiesUrl());
const Mode mode = props.viewMode();
if (m_mode != mode) {
// 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();
-
- 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;
- }
+ const int oldZoomLevel = m_view->zoomLevel();
+ applyModeToView();
emit modeChanged(m_mode, previousMode);
- if (m_container->zoomLevel() != oldZoomLevel) {
- emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
+ if (m_view->zoomLevel() != oldZoomLevel) {
+ emit zoomLevelChanged(m_view->zoomLevel(), oldZoomLevel);
}
}
const bool hiddenFilesShown = props.hiddenFilesShown();
- if (hiddenFilesShown != model->showHiddenFiles()) {
- model->setShowHiddenFiles(hiddenFilesShown);
+ if (hiddenFilesShown != m_model->showHiddenFiles()) {
+ m_model->setShowHiddenFiles(hiddenFilesShown);
emit hiddenFilesShownChanged(hiddenFilesShown);
}
const bool groupedSorting = props.groupedSorting();
- if (groupedSorting != model->groupedSorting()) {
- model->setGroupedSorting(groupedSorting);
+ if (groupedSorting != m_model->groupedSorting()) {
+ m_model->setGroupedSorting(groupedSorting);
emit groupedSortingChanged(groupedSorting);
}
const QByteArray sortRole = props.sortRole();
- if (sortRole != model->sortRole()) {
- model->setSortRole(sortRole);
+ if (sortRole != m_model->sortRole()) {
+ m_model->setSortRole(sortRole);
emit sortRoleChanged(sortRole);
}
const Qt::SortOrder sortOrder = props.sortOrder();
- if (sortOrder != model->sortOrder()) {
- model->setSortOrder(sortOrder);
+ if (sortOrder != m_model->sortOrder()) {
+ m_model->setSortOrder(sortOrder);
emit sortOrderChanged(sortOrder);
}
const bool sortFoldersFirst = props.sortFoldersFirst();
- if (sortFoldersFirst != model->sortFoldersFirst()) {
- model->setSortFoldersFirst(sortFoldersFirst);
+ if (sortFoldersFirst != m_model->sortDirectoriesFirst()) {
+ m_model->setSortDirectoriesFirst(sortFoldersFirst);
emit sortFoldersFirstChanged(sortFoldersFirst);
}
if (visibleRoles != m_visibleRoles) {
const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
m_visibleRoles = visibleRoles;
- m_container->setVisibleRoles(visibleRoles);
+ m_view->setVisibleRoles(visibleRoles);
emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
}
const bool previewsShown = props.previewsShown();
- if (previewsShown != m_container->previewsShown()) {
+ if (previewsShown != m_view->previewsShown()) {
const int oldZoomLevel = zoomLevel();
- m_container->setPreviewsShown(previewsShown);
+ m_view->setPreviewsShown(previewsShown);
emit previewsShownChanged(previewsShown);
// Changing the preview-state might result in a changed zoom-level
}
}
- m_container->endTransaction();
+ m_view->endTransaction();
+}
+
+void DolphinView::applyModeToView()
+{
+ switch (m_mode) {
+ case IconsView: m_view->setItemLayout(KFileItemListView::IconsLayout); break;
+ case CompactView: m_view->setItemLayout(KFileItemListView::CompactLayout); break;
+ case DetailsView: m_view->setItemLayout(KFileItemListView::DetailsLayout); break;
+ default: Q_ASSERT(false); break;
+ }
}
void DolphinView::pasteToUrl(const KUrl& url)
KUrl::List urls;
const KFileItemList items = selectedItems();
- foreach (const KFileItem &item, items) {
+ foreach (const KFileItem& item, items) {
urls.append(item.url());
}
QMimeData* DolphinView::selectionMimeData() const
{
- const KFileItemModel* model = fileItemModel();
const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
const QSet<int> selectedIndexes = selectionManager->selectedItems();
- return model->createMimeData(selectedIndexes);
+ return m_model->createMimeData(selectedIndexes);
}
void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
KUrl::List destUrls;
foreach (const KUrl& source, sourceUrls) {
- KUrl destination(url().url() + "/" + source.fileName());
+ KUrl destination(url().url() + '/' + source.fileName());
destUrls << destination;
}
markUrlsAsSelected(destUrls);
+ m_clearSelectionBeforeSelectingNewItems = true;
}
void DolphinView::updateWritableState()
const bool wasFolderWritable = m_isFolderWritable;
m_isFolderWritable = true;
- const KFileItem item = m_dirLister->rootItem();
+ const KFileItem item = m_model->rootItem();
if (!item.isNull()) {
KFileItemListProperties capabilities(KFileItemList() << item);
m_isFolderWritable = capabilities.supportsWriting();
}
}
+KUrl DolphinView::viewPropertiesUrl() const
+{
+ if (m_viewPropertiesContext.isEmpty()) {
+ return m_url;
+ }
+
+ KUrl url;
+ url.setProtocol(m_url.protocol());
+ url.setPath(m_viewPropertiesContext);
+ return url;
+}
+
#include "dolphinview.moc"
projects / dolphin.git / blobdiff