#include "dolphinview.h"
-#include <config-nepomuk.h>
+#include <config-baloo.h>
#include <QAbstractItemView>
#include <QApplication>
-#include <QBoxLayout>
#include <QClipboard>
#include <QDropEvent>
#include <QGraphicsSceneDragDropEvent>
-#include <QKeyEvent>
-#include <QItemSelection>
#include <QTimer>
#include <QScrollBar>
-
-#include <KActionCollection>
+#include <QPointer>
+#include <QMenu>
+#include <QVBoxLayout>
+#include <KDesktopFile>
+#include <KProtocolManager>
#include <KColorScheme>
#include <KDirModel>
-#include <KIconEffect>
#include <KFileItem>
#include <KFileItemListProperties>
-#include <KLocale>
+#include <KLocalizedString>
#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/CopyJob>
#include <KIO/DeleteJob>
+#include <KIO/JobUiDelegate>
#include <KIO/NetAccess>
#include <KIO/PreviewJob>
+#include <KIO/Paste>
#include <KJob>
-#include <KMenu>
+#include <QMenu>
#include <KMessageBox>
-#include <konq_fileitemcapabilities.h>
+#include <KJobWidgets>
#include <konq_operations.h>
-#include <konqmimedata.h>
-#include <KToggleAction>
#include <KUrl>
#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 "views/tooltips/tooltipmanager.h"
#include "zoomlevelinfo.h"
-#ifdef HAVE_NEPOMUK
- #include <Nepomuk/ResourceManager>
+#ifdef HAVE_BALOO
+ #include <Baloo/IndexerConfig>
#endif
+#include <KFormat>
namespace {
const int MaxModeEnum = DolphinView::CompactView;
m_isFolderWritable(true),
m_dragging(false),
m_url(url),
+ m_viewPropertiesContext(),
m_mode(DolphinView::IconsView),
m_visibleRoles(),
m_topLayout(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_markFirstNewlySelectedItemAsCurrent(false),
m_versionControlObserver(0)
{
m_topLayout = new QVBoxLayout(this);
// 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(KUrl)),
- this, SLOT(observeCreatedItem(KUrl)));
+ connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated,
+ this, &DolphinView::observeCreatedItem);
m_selectionChangedTimer = new QTimer(this);
m_selectionChangedTimer->setSingleShot(true);
m_selectionChangedTimer->setInterval(300);
- connect(m_selectionChangedTimer, SIGNAL(timeout()),
- this, SLOT(emitSelectionChangedSignal()));
+ connect(m_selectionChangedTimer, &QTimer::timeout,
+ this, &DolphinView::emitSelectionChangedSignal);
+
+ 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);
- m_container = new DolphinItemListContainer(this);
- m_container->setVisibleRoles(QList<QByteArray>() << "name");
+ // 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()));
+ connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, &DolphinView::hideToolTip);
+ connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, &DolphinView::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(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
- connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
- connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
- connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));
- connect(controller, SIGNAL(mouseButtonPressed(int,Qt::MouseButtons)), this, SLOT(slotMouseButtonPressed(int,Qt::MouseButtons)));
- 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();
- connect(model, SIGNAL(directoryLoadingStarted()), this, SLOT(slotDirectoryLoadingStarted()));
- connect(model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
- connect(model, SIGNAL(directoryLoadingProgress(int)), this, SIGNAL(directoryLoadingProgress(int)));
- connect(model, SIGNAL(directorySortingProgress(int)), this, SIGNAL(directorySortingProgress(int)));
- connect(model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
- this, SLOT(slotItemsChanged()));
- connect(model, SIGNAL(itemsRemoved(KItemRangeList)), this, SIGNAL(itemCountChanged()));
- connect(model, SIGNAL(itemsInserted(KItemRangeList)), this, SIGNAL(itemCountChanged()));
- connect(model, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
- connect(model, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
- connect(model, SIGNAL(directoryRedirection(KUrl,KUrl)), this, SLOT(slotDirectoryRedirection(KUrl,KUrl)));
-
- KItemListView* view = controller->view();
- view->installEventFilter(this);
- connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
- this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
- connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
- this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
- connect(view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
- this, SLOT(slotVisibleRolesChangedByHeader(QList<QByteArray>,QList<QByteArray>)));
- connect(view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
- this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));
+ connect(controller, &KItemListController::itemActivated, this, &DolphinView::slotItemActivated);
+ connect(controller, &KItemListController::itemsActivated, this, &DolphinView::slotItemsActivated);
+ connect(controller, &KItemListController::itemMiddleClicked, this, &DolphinView::slotItemMiddleClicked);
+ connect(controller, &KItemListController::itemContextMenuRequested, this, &DolphinView::slotItemContextMenuRequested);
+ connect(controller, &KItemListController::viewContextMenuRequested, this, &DolphinView::slotViewContextMenuRequested);
+ connect(controller, &KItemListController::headerContextMenuRequested, this, &DolphinView::slotHeaderContextMenuRequested);
+ connect(controller, &KItemListController::mouseButtonPressed, this, &DolphinView::slotMouseButtonPressed);
+ connect(controller, &KItemListController::itemHovered, this, &DolphinView::slotItemHovered);
+ connect(controller, &KItemListController::itemUnhovered, this, &DolphinView::slotItemUnhovered);
+ connect(controller, &KItemListController::itemDropEvent, this, &DolphinView::slotItemDropEvent);
+ connect(controller, &KItemListController::escapePressed, this, &DolphinView::stopLoading);
+ connect(controller, &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);
+
+ connect(m_model, &KFileItemModel::directoryLoadingStarted, this, &DolphinView::slotDirectoryLoadingStarted);
+ connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+ connect(m_model, &KFileItemModel::directoryLoadingCanceled, this, &DolphinView::directoryLoadingCanceled);
+ connect(m_model, &KFileItemModel::directoryLoadingProgress, this, &DolphinView::directoryLoadingProgress);
+ connect(m_model, &KFileItemModel::directorySortingProgress, this, &DolphinView::directorySortingProgress);
+ connect(m_model, &KFileItemModel::itemsChanged,
+ this, &DolphinView::slotItemsChanged);
+ connect(m_model, &KFileItemModel::itemsRemoved, this, &DolphinView::itemCountChanged);
+ connect(m_model, &KFileItemModel::itemsInserted, this, &DolphinView::itemCountChanged);
+ connect(m_model, &KFileItemModel::infoMessage, this, &DolphinView::infoMessage);
+ connect(m_model, &KFileItemModel::errorMessage, this, &DolphinView::errorMessage);
+ connect(m_model, &KFileItemModel::directoryRedirection, this, &DolphinView::slotDirectoryRedirection);
+ connect(m_model, &KFileItemModel::urlIsFileError, this, &DolphinView::urlIsFileError);
+
+ m_view->installEventFilter(this);
+ connect(m_view, &DolphinItemListView::sortOrderChanged,
+ this, &DolphinView::slotSortOrderChangedByHeader);
+ connect(m_view, &DolphinItemListView::sortRoleChanged,
+ this, &DolphinView::slotSortRoleChangedByHeader);
+ connect(m_view, &DolphinItemListView::visibleRolesChanged,
+ this, &DolphinView::slotVisibleRolesChangedByHeader);
+ connect(m_view, &DolphinItemListView::roleEditingCanceled,
+ this, &DolphinView::slotRoleEditingCanceled);
+ connect(m_view->header(), &KItemListHeader::columnWidthChanged,
+ this, &DolphinView::slotHeaderColumnWidthChanged);
KItemListSelectionManager* selectionManager = controller->selectionManager();
- connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
- this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
+ connect(selectionManager, &KItemListSelectionManager::selectionChanged,
+ this, &DolphinView::slotSelectionChanged);
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)));
+ m_versionControlObserver->setModel(m_model);
+ connect(m_versionControlObserver, &VersionControlObserver::infoMessage, this, &DolphinView::infoMessage);
+ connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, &DolphinView::errorMessage);
+ connect(m_versionControlObserver, &VersionControlObserver::operationCompletedMessage, this, &DolphinView::operationCompletedMessage);
applyViewProperties();
m_topLayout->addWidget(m_container);
void DolphinView::setMode(Mode mode)
{
if (mode != m_mode) {
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setViewMode(mode);
- props.save();
- applyViewProperties();
+ // We pass the new ViewProperties to applyViewProperties, rather than
+ // storing them on disk and letting applyViewProperties() read them
+ // from there, to prevent that changing the view mode fails if the
+ // .directory file is not writable (see bug 318534).
+ applyViewProperties(props);
}
}
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)
{
- KFileItemModel* model = fileItemModel();
- if (model->showHiddenFiles() == show) {
+ if (m_model->showHiddenFiles() == show) {
return;
}
const KFileItemList itemList = selectedItems();
m_selectedUrls.clear();
- m_selectedUrls = itemList.urlList();
+ m_selectedUrls = KUrl::List(itemList.urlList());
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setHiddenFilesShown(show);
- model->setShowHiddenFiles(show);
+ m_model->setShowHiddenFiles(show);
emit hiddenFilesShownChanged(show);
}
bool DolphinView::hiddenFilesShown() const
{
- return fileItemModel()->showHiddenFiles();
+ 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
{
KFileItemList list;
- const KFileItemModel* model = fileItemModel();
- const int itemCount = model->count();
+ const int itemCount = m_model->count();
list.reserve(itemCount);
for (int i = 0; i < itemCount; ++i) {
- list.append(model->fileItem(i));
+ list.append(m_model->fileItem(i));
}
return list;
int DolphinView::itemsCount() const
{
- return fileItemModel()->count();
+ 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();
KFileItemList selectedItems;
- QSetIterator<int> it(selectedIndexes);
- while (it.hasNext()) {
- const int index = it.next();
- selectedItems.append(model->fileItem(index));
+ foreach (int index, selectionManager->selectedItems()) {
+ selectedItems.append(m_model->fileItem(index));
}
return selectedItems;
}
void DolphinView::markUrlAsCurrent(const KUrl& url)
{
m_currentItemUrl = url;
+ m_scrollToCurrentItem = true;
}
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
+ // An alternative approach would be to store the matching items in a KItemSet and
// select them in one go after the loop, but we'd need a new function
- // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
+ // KItemListSelectionManager::setSelected(KItemSet, SelectionMode mode)
// for that.
selectionManager->setSelected(index, 1, mode);
}
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->sortDirectoriesFirst();
+ 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);
}
const KFileItemList itemList = selectedItems();
m_selectedUrls.clear();
- m_selectedUrls = itemList.urlList();
+ m_selectedUrls = KUrl::List(itemList.urlList());
setUrl(url());
loadDirectory(url(), true);
restoreState(restoreStream);
}
-void DolphinView::stopLoading()
-{
- fileItemModel()->cancelDirectoryLoading();
-}
-
void DolphinView::readSettings()
{
- const int oldZoomLevel = m_container->zoomLevel();
+ const int oldZoomLevel = m_view->zoomLevel();
- GeneralSettings::self()->readConfig();
- m_container->readSettings();
+ GeneralSettings::self()->load();
+ 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();
+ GeneralSettings::self()->save();
+ 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::setMimeTypeFilters(const QStringList& filters)
+{
+ return m_model->setMimeTypeFilters(filters);
+}
+
+QStringList DolphinView::mimeTypeFilters() const
+{
+ return m_model->mimeTypeFilters();
}
QString DolphinView::statusBarText() const
}
if (folderCount + fileCount == 1) {
- // If only one item is selected, show the filename
- filesText = i18nc("@info:status", "<filename>%1</filename> selected", list.first().text());
+ // If only one item is selected, show info about it
+ return list.first().getStatusBarInfo();
} else {
// At least 2 items are selected
foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
if (fileCount > 0 && folderCount > 0) {
summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
foldersText, filesText,
- KGlobal::locale()->formatByteSize(totalFileSize));
+ KFormat().formatByteSize(totalFileSize));
} else if (fileCount > 0) {
summary = i18nc("@info:status files (size)", "%1 (%2)",
filesText,
- KGlobal::locale()->formatByteSize(totalFileSize));
+ KFormat().formatByteSize(totalFileSize));
} else if (folderCount > 0) {
summary = foldersText;
} else {
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;
hideToolTip();
+ disconnect(m_view, &DolphinItemListView::roleEditingFinished,
+ this, &DolphinView::slotRoleEditingFinished);
+
// 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();
+ 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");
+
+ hideToolTip();
+
+ connect(m_view, &DolphinItemListView::roleEditingFinished,
+ this, &DolphinView::slotRoleEditingFinished);
+ } 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 KFileItemModel
// will notify the view about changed items (which might result in
void DolphinView::trashSelectedItems()
{
const KUrl::List list = simplifiedSelectedUrls();
- KonqOperations::del(this, KonqOperations::TRASH, list);
+ KIO::JobUiDelegate uiDelegate;
+ uiDelegate.setWindow(window());
+ if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Trash, KIO::JobUiDelegate::DefaultConfirmation)) {
+ KIO::Job* job = KIO::trash(list);
+ KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Trash, list, KUrl("trash:/"), job);
+ KJobWidgets::setWindow(job, this);
+ connect(job, &KIO::Job::result,
+ this, &DolphinView::slotTrashFileFinished);
+ }
}
void DolphinView::deleteSelectedItems()
{
const KUrl::List list = simplifiedSelectedUrls();
- const bool del = KonqOperations::askDeleteConfirmation(list,
- KonqOperations::DEL,
- KonqOperations::DEFAULT_CONFIRMATION,
- this);
- if (del) {
+ KIO::JobUiDelegate uiDelegate;
+ uiDelegate.setWindow(window());
+ if (uiDelegate.askDeleteConfirmation(list, KIO::JobUiDelegate::Delete, KIO::JobUiDelegate::DefaultConfirmation)) {
KIO::Job* job = KIO::del(list);
- connect(job, SIGNAL(result(KJob*)),
- this, SLOT(slotDeleteFileFinished(KJob*)));
+ KJobWidgets::setWindow(job, this);
+ connect(job, &KIO::Job::result,
+ this, &DolphinView::slotDeleteFileFinished);
}
}
void DolphinView::cutSelectedItems()
{
QMimeData* mimeData = selectionMimeData();
- KonqMimeData::addIsCutSelection(mimeData, true);
+ KIO::setClipboardDataCut(mimeData, true);
QApplication::clipboard()->setMimeData(mimeData);
}
}
}
+void DolphinView::stopLoading()
+{
+ m_model->cancelDirectoryLoading();
+}
+
bool DolphinView::eventFilter(QObject* watched, QEvent* event)
{
switch (event->type()) {
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);
}
}
-void DolphinView::slotItemsActivated(const QSet<int>& indexes)
+void DolphinView::slotItemsActivated(const KItemSet& indexes)
{
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));
- }
+ foreach (int index, indexes) {
+ KFileItem item = m_model->fileItem(index);
+ const KUrl& url = openItemAsFolderUrl(item);
- foreach (const KFileItem& item, items) {
- if (item.isDir()) {
- emit tabRequested(item.url());
+ if (!url.isEmpty()) { // Open folders in new tabs
+ emit tabRequested(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);
- if (item.isDir() || isTabsForFilesEnabled()) {
+ const KFileItem& item = m_model->fileItem(index);
+ const KUrl& url = openItemAsFolderUrl(item);
+ if (!url.isEmpty()) {
+ emit tabRequested(url);
+ } else if (isTabsForFilesEnabled()) {
emit tabRequested(item.url());
}
}
void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ // Force emit of a selection changed signal before we request the
+ // context menu, to update the edit-actions first. (See Bug 294013)
+ if (m_selectionChangedTimer->isActive()) {
+ emitSelectionChangedSignal();
+ }
+
+ 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());
+ QPointer<QMenu> menu = new QMenu(QApplication::activeWindow());
KItemListView* view = m_container->controller()->view();
const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
- bool nepomukRunning = false;
bool indexingEnabled = false;
-#ifdef HAVE_NEPOMUK
- nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
- if (nepomukRunning) {
- KConfig config("nepomukserverrc");
- indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
- }
+#ifdef HAVE_BALOO
+ Baloo::IndexerConfig config;
+ indexingEnabled = config.fileIndexingEnabled();
#endif
QString groupName;
// 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);
action->setChecked(visibleRolesSet.contains(info.role));
action->setData(info.role);
- const bool enable = (!info.requiresNepomuk && !info.requiresIndexer) ||
- (info.requiresNepomuk && nepomukRunning) ||
+ const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
+ (info.requiresBaloo) ||
(info.requiresIndexer && indexingEnabled);
action->setEnabled(enable);
}
{
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
event->buttons(),
event->modifiers());
- const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
+ QString error;
+ KonqOperations* op = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent, error);
if (!error.isEmpty()) {
- emit errorMessage(error);
+ emit infoMessage(error);
}
- if (destUrl == url()) {
+ if (op && destUrl == url()) {
// Mark the dropped urls as selected.
- markPastedUrlsAsSelected(event->mimeData());
+ m_clearSelectionBeforeSelectingNewItems = true;
+ m_markFirstNewlySelectedItemAsCurrent = true;
+ connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
}
+
+ setActive(true);
}
void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
{
if (previous != 0) {
- disconnect(previous, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
+ Q_ASSERT(qobject_cast<KFileItemModel*>(previous));
+ KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(previous);
+ disconnect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+ m_versionControlObserver->setModel(0);
}
- Q_ASSERT(qobject_cast<KFileItemModel*>(current));
- connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
-
- KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
- m_versionControlObserver->setModel(fileItemModel);
+ if (current) {
+ Q_ASSERT(qobject_cast<KFileItemModel*>(current));
+ KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
+ connect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+ m_versionControlObserver->setModel(fileItemModel);
+ }
}
void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons)
{
+ Q_UNUSED(itemIndex);
+
hideToolTip();
- if (itemIndex < 0) {
- // Trigger the history navigation only when clicking on the viewport:
- // Above an item the XButtons provide a simple way to select items in
- // the singleClick mode.
- if (buttons & Qt::XButton1) {
- emit goBackRequested();
- } else if (buttons & Qt::XButton2) {
- emit goForwardRequested();
+ if (buttons & Qt::BackButton) {
+ emit goBackRequested();
+ } else if (buttons & Qt::ForwardButton) {
+ emit goForwardRequested();
+ }
+}
+
+void DolphinView::slotAboutToCreate(const KUrl::List& urls)
+{
+ if (!urls.isEmpty()) {
+ if (m_markFirstNewlySelectedItemAsCurrent) {
+ markUrlAsCurrent(urls.first());
+ m_markFirstNewlySelectedItemAsCurrent = false;
}
+ m_selectedUrls << KUrl::List(KDirModel::simplifiedUrlList(urls));
}
}
-void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
+void DolphinView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)
{
const int currentCount = current.count();
const int previousCount = previous.count();
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->setSortDirectoriesFirst(foldersFirst);
+ m_model->setSortDirectoriesFirst(foldersFirst);
emit sortFoldersFirstChanged(foldersFirst);
}
void DolphinView::restoreState(QDataStream& stream)
{
+ // Read the version number of the view state and check if the version is supported.
+ quint32 version = 0;
+ stream >> version;
+ if (version != 1) {
+ // The version of the view state isn't supported, we can't restore it.
+ return;
+ }
+
// Restore the current item that had the keyboard focus
stream >> m_currentItemUrl;
// 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()->restoreExpandedDirectories(urls);
+ m_model->restoreExpandedDirectories(urls);
}
void DolphinView::saveState(QDataStream& stream)
{
+ stream << quint32(1); // View state version
+
// 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()->expandedDirectories();
+ stream << m_model->expandedDirectories();
}
KFileItem DolphinView::rootItem() const
{
- return fileItemModel()->rootItem();
+ return m_model->rootItem();
}
-void DolphinView::observeCreatedItem(const KUrl& url)
+void DolphinView::setViewPropertiesContext(const QString& context)
+{
+ m_viewPropertiesContext = context;
+}
+
+QString DolphinView::viewPropertiesContext() const
{
- m_createdItemUrl = url;
- //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- // this, SLOT(selectAndScrollToCreatedItem()));
+ return m_viewPropertiesContext;
}
-void DolphinView::selectAndScrollToCreatedItem()
+KUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseThroughArchives)
{
- /*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 (item.isNull()) {
+ return KUrl();
+ }
+
+ KUrl url = item.targetUrl();
+
+ if (item.isDir()) {
+ return url;
+ }
+
+ if (item.isMimeTypeKnown()) {
+ const QString& mimetype = item.mimetype();
+
+ if (browseThroughArchives && item.isFile() && url.isLocalFile()) {
+ // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
+ // zip:/<path>/ when clicking on a zip file, etc.
+ // The .protocol file specifies the mimetype that the kioslave handles.
+ // Note that we don't use mimetype inheritance since we don't want to
+ // open OpenDocument files as zip folders...
+ const QString& protocol = KProtocolManager::protocolForArchiveMimetype(mimetype);
+ if (!protocol.isEmpty()) {
+ url.setProtocol(protocol);
+ return url;
+ }
+ }
+
+ if (mimetype == QLatin1String("application/x-desktop")) {
+ // Redirect to the URL in Type=Link desktop files, unless it is a http(s) URL.
+ KDesktopFile desktopFile(url.toLocalFile());
+ if (desktopFile.hasLinkType()) {
+ const QString linkUrl = desktopFile.readUrl();
+ if (!linkUrl.startsWith(QLatin1String("http"))) {
+ return linkUrl;
+ }
+ }
}
}
- disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(selectAndScrollToCreatedItem()));*/
- m_createdItemUrl = KUrl();
+ return KUrl();
+}
+
+void DolphinView::observeCreatedItem(const KUrl& url)
+{
+ if (m_active) {
+ clearSelection();
+ markUrlAsCurrent(url);
+ markUrlsAsSelected(QList<KUrl>() << url);
+ }
}
void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& 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);
}
+
m_currentItemUrl = KUrl();
}
}
if (!m_selectedUrls.isEmpty()) {
- clearSelection();
-
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 (m_clearSelectionBeforeSelectingNewItems) {
+ selectionManager->clearSelection();
+ m_clearSelectionBeforeSelectingNewItems = false;
+ }
+
+ KItemSet selectedItems = selectionManager->selectedItems();
+
+ 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();
}
}
int& folderCount,
KIO::filesize_t& totalFileSize) const
{
- const KFileItemModel* model = fileItemModel();
- const int itemCount = model->count();
+ const int itemCount = m_model->count();
for (int i = 0; i < itemCount; ++i) {
- const KFileItem item = model->fileItem(i);
+ const KFileItem item = m_model->fileItem(i);
if (item.isDir()) {
++folderCount;
} else {
}
}
-void DolphinView::showHoverInformation(const KFileItem& item)
+void DolphinView::slotTrashFileFinished(KJob* job)
{
- emit requestItemInfo(item);
-}
-
-void DolphinView::clearHoverInformation()
-{
- emit requestItemInfo(KFileItem());
+ if (job->error() == 0) {
+ emit operationCompletedMessage(i18nc("@info:status", "Trash operation completed."));
+ } else if (job->error() != KIO::ERR_USER_CANCELED) {
+ emit errorMessage(job->errorString());
+ }
}
void DolphinView::slotDeleteFileFinished(KJob* job)
}
}
+void DolphinView::slotRenamingResult(KJob* job)
+{
+ if (job->error()) {
+ KIO::CopyJob *copyJob = qobject_cast<KIO::CopyJob *>(job);
+ Q_ASSERT(copyJob);
+ const QUrl newUrl = copyJob->destUrl();
+ const int index = m_model->index(KUrl(newUrl));
+ if (index >= 0) {
+ QHash<QByteArray, QVariant> data;
+ const QUrl oldUrl = copyJob->srcUrls().first();
+ data.insert("text", oldUrl.fileName());
+ m_model->setData(index, data);
+ }
+ }
+}
+
void DolphinView::slotDirectoryLoadingStarted()
{
// Disable the writestate temporary until it can be determined in a fast way
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::slotRoleEditingCanceled()
{
- return static_cast<KFileItemModel*>(m_container->controller()->model());
+ disconnect(m_view, &DolphinItemListView::roleEditingFinished,
+ this, &DolphinView::slotRoleEditingFinished);
+}
+
+void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
+{
+ disconnect(m_view, &DolphinItemListView::roleEditingFinished,
+ this, &DolphinView::slotRoleEditingFinished);
+
+ 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();
+
+ QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
+ newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName));
+
+ const bool newNameExistsAlready = (m_model->index(KUrl(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 KIO::CopyJob 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);
+ }
+
+ KIO::Job * job = KIO::moveAs(oldUrl, newUrl);
+ KJobWidgets::setWindow(job, this);
+ KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, QList<QUrl>() << oldUrl, newUrl, job);
+ job->ui()->setAutoErrorHandlingEnabled(true);
+
+ if (!newNameExistsAlready) {
+ // Only connect the result signal if there is no item with the new name
+ // in the model yet, see bug 328262.
+ connect(job, &KJob::result, this, &DolphinView::slotRenamingResult);
+ }
+ }
+ }
}
void DolphinView::loadDirectory(const KUrl& url, bool reload)
return;
}
- KFileItemModel* model = fileItemModel();
if (reload) {
- model->refreshDirectory(url);
+ m_model->refreshDirectory(url);
} else {
- model->loadDirectory(url);
+ m_model->loadDirectory(url);
}
}
void DolphinView::applyViewProperties()
{
- m_container->beginTransaction();
+ const ViewProperties props(viewPropertiesUrl());
+ applyViewProperties(props);
+}
- const ViewProperties props(url());
- KFileItemModel* model = fileItemModel();
+void DolphinView::applyViewProperties(const ViewProperties& props)
+{
+ m_view->beginTransaction();
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->sortDirectoriesFirst()) {
- model->setSortDirectoriesFirst(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)
{
- markPastedUrlsAsSelected(QApplication::clipboard()->mimeData());
- KonqOperations::doPaste(this, url);
+ KonqOperations* op = KonqOperations::doPasteV2(this, url);
+ if (op) {
+ m_clearSelectionBeforeSelectingNewItems = true;
+ m_markFirstNewlySelectedItemAsCurrent = true;
+ connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
+ }
}
KUrl::List DolphinView::simplifiedSelectedUrls() const
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();
+ const KItemSet selectedIndexes = selectionManager->selectedItems();
- return 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());
- destUrls << destination;
- }
- markUrlsAsSelected(destUrls);
+ return m_model->createMimeData(selectedIndexes);
}
void DolphinView::updateWritableState()
{
const bool wasFolderWritable = m_isFolderWritable;
- m_isFolderWritable = true;
+ m_isFolderWritable = false;
- const KFileItem item = fileItemModel()->rootItem();
- if (!item.isNull()) {
- KFileItemListProperties capabilities(KFileItemList() << item);
- m_isFolderWritable = capabilities.supportsWriting();
+ KFileItem item = m_model->rootItem();
+ if (item.isNull()) {
+ // Try to find out if the URL is writable even if the "root item" is
+ // null, see https://bugs.kde.org/show_bug.cgi?id=330001
+ item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url(), true);
}
+
+ KFileItemListProperties capabilities(KFileItemList() << item);
+ m_isFolderWritable = capabilities.supportsWriting();
+
if (m_isFolderWritable != wasFolderWritable) {
emit writeStateChanged(m_isFolderWritable);
}
}
-#include "dolphinview.moc"
+KUrl DolphinView::viewPropertiesUrl() const
+{
+ if (m_viewPropertiesContext.isEmpty()) {
+ return m_url;
+ }
+
+ KUrl url;
+ url.setProtocol(m_url.protocol());
+ url.setPath(m_viewPropertiesContext);
+ return url;
+}
+
projects / dolphin.git / blobdiff