X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4582bca90b36e14a5a4e293494c864cee5bf4080..d1a70c0b629b:/src/views/dolphinview.cpp diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 678111eca..c98929ead 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -20,164 +20,179 @@ #include "dolphinview.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "dolphin_detailsmodesettings.h" +#include "dolphin_generalsettings.h" +#include "dolphinitemlistview.h" +#include "dolphinnewfilemenuobserver.h" +#include "draganddrophelper.h" +#include "kitemviews/kfileitemlistview.h" +#include "kitemviews/kfileitemmodel.h" +#include "kitemviews/kitemlistcontainer.h" +#include "kitemviews/kitemlistcontroller.h" +#include "kitemviews/kitemlistheader.h" +#include "kitemviews/kitemlistselectionmanager.h" +#include "versioncontrol/versioncontrolobserver.h" +#include "viewproperties.h" +#include "views/tooltips/tooltipmanager.h" +#include "zoomlevelinfo.h" -#include +#ifdef HAVE_BALOO +#include +#endif #include -#include +#include #include -#include -#include #include -#include -#include -#include -#include -#include -#include +#include +#include #include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include -#include - -#include "additionalinfoaccessor.h" -#include "dolphindirlister.h" -#include "dolphinnewfilemenuobserver.h" -#include "dolphin_detailsmodesettings.h" -#include "dolphin_generalsettings.h" -#include "dolphinitemlistcontainer.h" -#include "renamedialog.h" -#include "settings/dolphinsettings.h" -#include "viewmodecontroller.h" -#include "viewproperties.h" -#include "views/tooltips/tooltipmanager.h" -#include "zoomlevelinfo.h" +#include -namespace { - const int MaxModeEnum = DolphinView::CompactView; - const int MaxSortingEnum = DolphinView::SortByPath; -}; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -DolphinView::DolphinView(const KUrl& url, QWidget* parent) : +DolphinView::DolphinView(const QUrl& url, QWidget* parent) : QWidget(parent), m_active(true), m_tabsForFiles(false), m_assureVisibleCurrentIndex(false), m_isFolderWritable(true), + m_dragging(false), m_url(url), + m_viewPropertiesContext(), m_mode(DolphinView::IconsView), - m_additionalInfoList(), - m_topLayout(0), - m_dirLister(0), - m_container(0), - m_toolTipManager(0), - m_selectionChangedTimer(0), - m_currentItemIndex(-1), + m_visibleRoles(), + m_topLayout(nullptr), + m_model(nullptr), + m_view(nullptr), + m_container(nullptr), + m_toolTipManager(nullptr), + m_selectionChangedTimer(nullptr), + m_currentItemUrl(), + m_scrollToCurrentItem(false), m_restoredContentsPosition(), - m_createdItemUrl(), - m_selectedItems() + m_selectedUrls(), + m_clearSelectionBeforeSelectingNewItems(false), + m_markFirstNewlySelectedItemAsCurrent(false), + m_versionControlObserver(nullptr), + m_twoClicksRenamingTimer(nullptr) { m_topLayout = new QVBoxLayout(this); m_topLayout->setSpacing(0); - m_topLayout->setMargin(0); - - //m_dolphinViewController = new DolphinViewController(this); - - //m_viewModeController = new ViewModeController(this); - //m_viewModeController->setUrl(url); - - /*connect(m_viewModeController, SIGNAL(urlChanged(KUrl)), - this, SIGNAL(urlChanged(KUrl))); - - connect(m_dolphinViewController, SIGNAL(requestContextMenu(QPoint,QList)), - this, SLOT(openContextMenu(QPoint,QList))); - 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(QList)), - this, SLOT(updateAdditionalInfo(QList)));*/ - //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(KFileItem)), - this, SLOT(showHoverInformation(KFileItem))); - connect(m_dolphinViewController, SIGNAL(viewportEntered()), - this, SLOT(clearHoverInformation())); - connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)), - this, SLOT(slotUrlChangeRequested(KUrl)));*/ + m_topLayout->setContentsMargins(0, 0, 0, 0); // 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())); - - 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(completed()), this, SLOT(slotDirListerCompleted())); - connect(m_dirLister, SIGNAL(refreshItems(QList >)), - 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); - QHash visibleRoles; - visibleRoles.insert("name", 0); - m_container->setVisibleRoles(visibleRoles); - - KItemListController* controller = m_container->controller(); + 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({"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(), &QScrollBar::valueChanged, this, [=] { hideToolTip(); }); + connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, [=] { hideToolTip(); }); + 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, &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(controller, &KItemListController::selectedItemTextPressed, this, &DolphinView::slotSelectedItemTextPressed); + + 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::columnWidthChangeFinished, + this, &DolphinView::slotHeaderColumnWidthChangeFinished); KItemListSelectionManager* selectionManager = controller->selectionManager(); - connect(selectionManager, SIGNAL(selectionChanged(QSet,QSet)), - this, SLOT(slotSelectionChanged(QSet,QSet))); + connect(selectionManager, &KItemListSelectionManager::selectionChanged, + this, &DolphinView::slotSelectionChanged); +#ifdef HAVE_BALOO m_toolTipManager = new ToolTipManager(this); + connect(m_toolTipManager, &ToolTipManager::urlActivated, this, &DolphinView::urlActivated); +#endif + + m_versionControlObserver = new VersionControlObserver(this); + m_versionControlObserver->setView(this); + 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); + + m_twoClicksRenamingTimer = new QTimer(this); + m_twoClicksRenamingTimer->setSingleShot(true); + connect(m_twoClicksRenamingTimer, &QTimer::timeout, this, &DolphinView::slotTwoClicksRenamingTimerTimeout); applyViewProperties(); m_topLayout->addWidget(m_container); @@ -189,7 +204,7 @@ DolphinView::~DolphinView() { } -KUrl DolphinView::url() const +QUrl DolphinView::url() const { return m_url; } @@ -202,30 +217,13 @@ void DolphinView::setActive(bool active) m_active = active; - QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); - if (!active) { - color.setAlpha(150); - } - - /*QAbstractItemView* view = m_viewAccessor.itemView(); - QWidget* viewport = view ? view->viewport() : 0; - if (viewport) { - QPalette palette; - palette.setColor(viewport->backgroundRole(), color); - viewport->setPalette(palette); - }*/ - - update(); + updatePalette(); if (active) { - //if (view) { - // view->setFocus(); - //} + m_container->setFocus(); emit activated(); emit writeStateChanged(m_isFolderWritable); } - - //m_viewModeController->indicateActivationChange(active); } bool DolphinView::isActive() const @@ -236,11 +234,14 @@ bool DolphinView::isActive() const 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); } } @@ -249,37 +250,99 @@ DolphinView::Mode DolphinView::mode() const return m_mode; } +void DolphinView::setPreviewsShown(bool show) +{ + if (previewsShown() == show) { + return; + } + + ViewProperties props(viewPropertiesUrl()); + props.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_model->showHiddenFiles() == show) { + return; + } + + const KFileItemList itemList = selectedItems(); + m_selectedUrls.clear(); + m_selectedUrls = itemList.urlList(); + + ViewProperties props(viewPropertiesUrl()); + props.setHiddenFilesShown(show); + + m_model->setShowHiddenFiles(show); + emit hiddenFilesShownChanged(show); } bool DolphinView::hiddenFilesShown() const { - return m_dirLister->showingDotFiles(); + return m_model->showHiddenFiles(); } -bool DolphinView::categorizedSorting() const +void DolphinView::setGroupedSorting(bool grouped) { - return false; //m_storedCategorizedSorting; + if (grouped == groupedSorting()) { + return; + } + + ViewProperties props(viewPropertiesUrl()); + props.setGroupedSorting(grouped); + props.save(); + + m_container->controller()->model()->setGroupedSorting(grouped); + + emit groupedSortingChanged(grouped); +} + +bool DolphinView::groupedSorting() const +{ + 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 selectedIndexes = selectionManager->selectedItems(); KFileItemList selectedItems; - QSetIterator it(selectedIndexes); - while (it.hasNext()) { - const int index = it.next(); - selectedItems.append(model->fileItem(index)); + const auto items = selectionManager->selectedItems(); + selectedItems.reserve(items.count()); + for (int index : items) { + selectedItems.append(m_model->fileItem(index)); } return selectedItems; } @@ -290,28 +353,30 @@ int DolphinView::selectedItemsCount() const return selectionManager->selectedItems().count(); } -void DolphinView::markUrlsAsSelected(const QList& urls) +void DolphinView::markUrlsAsSelected(const QList& urls) { - foreach (const KUrl& url, urls) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); - m_selectedItems.append(item); - } + m_selectedUrls = urls; +} + +void DolphinView::markUrlAsCurrent(const QUrl &url) +{ + m_currentItemUrl = url; + m_scrollToCurrentItem = true; } -void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled) +void DolphinView::selectItems(const QRegularExpression ®exp, 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); - if (pattern.exactMatch(item.name())) { - // An alternative approach would be to store the matching items in a QSet and + for (int index = 0; index < m_model->count(); index++) { + const KFileItem item = m_model->fileItem(index); + if (regexp.match(item.text()).hasMatch()) { + // 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, SelectionMode mode) + // KItemListSelectionManager::setSelected(KItemSet, SelectionMode mode) // for that. selectionManager->setSelected(index, 1, mode); } @@ -321,28 +386,29 @@ void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled) 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::setSorting(Sorting sorting) +void DolphinView::setSortRole(const QByteArray& role) { - if (sorting != this->sorting()) { - updateSorting(sorting); + if (role != sortRole()) { + updateSortRole(role); } } -DolphinView::Sorting DolphinView::sorting() const +QByteArray DolphinView::sortRole() const { - return DolphinView::SortByName; - //return m_viewAccessor.proxyModel()->sorting(); + const KItemModelBase* model = m_container->controller()->model(); + return model->sortRole(); } void DolphinView::setSortOrder(Qt::SortOrder order) @@ -354,7 +420,7 @@ void DolphinView::setSortOrder(Qt::SortOrder order) Qt::SortOrder DolphinView::sortOrder() const { - return Qt::AscendingOrder; // m_viewAccessor.proxyModel()->sortOrder(); + return m_model->sortOrder(); } void DolphinView::setSortFoldersFirst(bool foldersFirst) @@ -366,25 +432,25 @@ void DolphinView::setSortFoldersFirst(bool foldersFirst) bool DolphinView::sortFoldersFirst() const { - return true; // m_viewAccessor.proxyModel()->sortFoldersFirst(); + return m_model->sortDirectoriesFirst(); } -void DolphinView::setAdditionalInfoList(const QList& info) +void DolphinView::setVisibleRoles(const QList& roles) { - const QList previousList = info; + const QList previousRoles = roles; - ViewProperties props(url()); - props.setAdditionalInfoList(info); + ViewProperties props(viewPropertiesUrl()); + props.setVisibleRoles(roles); - m_additionalInfoList = info; - applyAdditionalInfoListToView(); + m_visibleRoles = roles; + m_view->setVisibleRoles(roles); - emit additionalInfoListChanged(m_additionalInfoList, previousList); + emit visibleRolesChanged(m_visibleRoles, previousRoles); } -QList DolphinView::additionalInfoList() const +QList DolphinView::visibleRoles() const { - return m_additionalInfoList; + return m_visibleRoles; } void DolphinView::reload() @@ -392,7 +458,6 @@ void DolphinView::reload() QByteArray viewState; QDataStream saveStream(&viewState, QIODevice::WriteOnly); saveState(saveStream); - m_selectedItems= selectedItems(); setUrl(url()); loadDirectory(url(), true); @@ -401,132 +466,138 @@ void DolphinView::reload() restoreState(restoreStream); } -void DolphinView::stopLoading() +void DolphinView::readSettings() { - m_dirLister->stop(); -} - -void DolphinView::refresh() -{ - const bool oldActivationState = m_active; - const int oldZoomLevel = zoomLevel(); - m_active = true; + const int oldZoomLevel = m_view->zoomLevel(); + GeneralSettings::self()->load(); + m_view->readSettings(); applyViewProperties(); - reload(); - setActive(oldActivationState); - updateZoomLevel(oldZoomLevel); + 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()->save(); + m_view->writeSettings(); } void DolphinView::setNameFilter(const QString& nameFilter) { - Q_UNUSED(nameFilter); - //m_viewModeController->setNameFilter(nameFilter); + m_model->setNameFilter(nameFilter); } QString DolphinView::nameFilter() const { - return QString(); //m_viewModeController->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 { - QString text; + QString summary; + QString foldersText; + QString filesText; + int folderCount = 0; int fileCount = 0; KIO::filesize_t totalFileSize = 0; - if (hasSelection()) { - // give a summary of the status of the selected files + if (m_container->controller()->selectionManager()->hasSelection()) { + // Give a summary of the status of the selected files const KFileItemList list = selectedItems(); - if (list.isEmpty()) { - // when an item is triggered, it is temporary selected but selectedItems() - // will return an empty list - return text; - } - - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - const KFileItem& item = *it; + foreach (const KFileItem& item, list) { if (item.isDir()) { ++folderCount; } else { ++fileCount; totalFileSize += item.size(); } - ++it; } if (folderCount + fileCount == 1) { - // if only one item is selected, show the filename - const QString name = list.first().text(); - text = (folderCount == 1) ? i18nc("@info:status", "%1 selected", name) : - i18nc("@info:status", "%1 selected (%2)", - name, KIO::convertSize(totalFileSize)); + // If only one item is selected, show info about it + return list.first().getStatusBarInfo(); } else { - // at least 2 items are selected - const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount); - const QString filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount); - if ((folderCount > 0) && (fileCount > 0)) { - text = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", - foldersText, filesText, KIO::convertSize(totalFileSize)); - } else if (fileCount > 0) { - text = i18nc("@info:status files (size)", "%1 (%2)", filesText, KIO::convertSize(totalFileSize)); - } else { - Q_ASSERT(folderCount > 0); - text = foldersText; - } + // At least 2 items are selected + foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount); + filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount); } } else { calculateItemCount(fileCount, folderCount, totalFileSize); - text = KIO::itemsSummaryString(fileCount + folderCount, - fileCount, folderCount, - totalFileSize, true); + foldersText = i18ncp("@info:status", "1 Folder", "%1 Folders", folderCount); + filesText = i18ncp("@info:status", "1 File", "%1 Files", fileCount); } - return text; + if (fileCount > 0 && folderCount > 0) { + summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)", + foldersText, filesText, + KFormat().formatByteSize(totalFileSize)); + } else if (fileCount > 0) { + summary = i18nc("@info:status files (size)", "%1 (%2)", + filesText, + KFormat().formatByteSize(totalFileSize)); + } else if (folderCount > 0) { + summary = foldersText; + } else { + summary = i18nc("@info:status", "0 Folders, 0 Files"); + } + + return summary; } QList DolphinView::versionControlActions(const KFileItemList& items) const { - Q_UNUSED(items); - return QList(); //m_dolphinViewController->versionControlActions(items); + QList actions; + + if (items.isEmpty()) { + const KFileItem item = m_model->rootItem(); + if (!item.isNull()) { + actions = m_versionControlObserver->actions(KFileItemList() << item); + } + } else { + actions = m_versionControlObserver->actions(items); + } + + return actions; } -void DolphinView::setUrl(const KUrl& url) +void DolphinView::setUrl(const QUrl& url) { if (url == m_url) { return; } - emit urlAboutToBeChanged(url); + clearSelection(); + m_url = url; - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); - } + 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); @@ -536,74 +607,86 @@ void DolphinView::setUrl(const KUrl& 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; } - /*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 {*/ - 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 + 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 { + KIO::RenameFileDialog* dialog = new KIO::RenameFileDialog(items, this); + connect(dialog, &KIO::RenameFileDialog::renamingFinished, + this, &DolphinView::slotRenameDialogRenamingFinished); + + dialog->open(); + } + + // 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; } void DolphinView::trashSelectedItems() { - const KUrl::List list = simplifiedSelectedUrls(); - KonqOperations::del(this, KonqOperations::TRASH, list); + const QList list = simplifiedSelectedUrls(); + 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, QUrl(QStringLiteral("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); + const QList list = simplifiedSelectedUrls(); - 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::copySelectedItems() +void DolphinView::copySelectedItemsToClipboard() { QMimeData* mimeData = selectionMimeData(); QApplication::clipboard()->setMimeData(mimeData); @@ -622,67 +705,132 @@ void DolphinView::pasteIntoFolder() } } -void DolphinView::setPreviewsShown(bool show) +void DolphinView::duplicateSelectedItems() { - if (previewsShown() == show) { + const KFileItemList itemList = selectedItems(); + if (itemList.isEmpty()) { return; } - ViewProperties props(url()); - props.setPreviewsShown(show); + const QMimeDatabase db; - m_container->setPreviewsShown(show); - emit previewsShownChanged(show); -} + // Duplicate all selected items and append "copy" to the end of the file name + // but before the filename extension, if present + QList newSelection; + for (const auto &item : itemList) { + const QUrl originalURL = item.url(); + const QString originalDirectoryPath = originalURL.adjusted(QUrl::RemoveFilename).path(); + const QString originalFileName = item.name(); -void DolphinView::setHiddenFilesShown(bool show) -{ - if (m_dirLister->showingDotFiles() == show) { - return; - } + QString extension = db.suffixForFileName(originalFileName); - m_selectedItems = selectedItems(); + QUrl duplicateURL = originalURL; - ViewProperties props(url()); - props.setHiddenFilesShown(show); + // No extension; new filename is " copy" + if (extension.isEmpty()) { + duplicateURL.setPath(originalDirectoryPath + i18nc(" copy", "%1 copy", originalFileName)); + // There's an extension; new filename is " copy." + } else { + // Need to add a dot since QMimeDatabase::suffixForFileName() doesn't include it + extension = QLatin1String(".") + extension; + const QString originalFilenameWithoutExtension = originalFileName.chopped(extension.size()); + // Preserve file's original filename extension in case the casing differs + // from what QMimeDatabase::suffixForFileName() returned + const QString originalExtension = originalFileName.right(extension.size()); + duplicateURL.setPath(originalDirectoryPath + i18nc(" copy", "%1 copy", originalFilenameWithoutExtension) + originalExtension); + } - m_dirLister->setShowingDotFiles(show); - m_dirLister->emitChanges(); - emit hiddenFilesShownChanged(show); + KIO::CopyJob* job = KIO::copyAs(originalURL, duplicateURL, KIO::HideProgressInfo); + KJobWidgets::setWindow(job, this); + + if (job) { + newSelection << duplicateURL; + KIO::FileUndoManager::self()->recordCopyJob(job); + } + } + + forceUrlsSelection(newSelection.first(), newSelection); } -void DolphinView::setCategorizedSorting(bool categorized) +void DolphinView::stopLoading() { - if (categorized == categorizedSorting()) { - return; - } + m_model->cancelDirectoryLoading(); +} - ViewProperties props(url()); - props.setCategorizedSorting(categorized); - props.save(); +void DolphinView::updatePalette() +{ + QColor color = KColorScheme(isActiveWindow() ? QPalette::Active : QPalette::Inactive, KColorScheme::View).background().color(); + if (!m_active) { + color.setAlpha(150); + } - //m_viewAccessor.proxyModel()->setCategorizedModel(categorized); + QWidget* viewport = m_container->viewport(); + if (viewport) { + QPalette palette; + palette.setColor(viewport->backgroundRole(), color); + viewport->setPalette(palette); + } - emit categorizedSortingChanged(categorized); + update(); } -void DolphinView::mouseReleaseEvent(QMouseEvent* event) +void DolphinView::abortTwoClicksRenaming() { - QWidget::mouseReleaseEvent(event); - setActive(true); + m_twoClicksRenamingItemUrl.clear(); + m_twoClicksRenamingTimer->stop(); } -void DolphinView::contextMenuEvent(QContextMenuEvent* event) +bool DolphinView::eventFilter(QObject* watched, QEvent* event) { - Q_UNUSED(event); + switch (event->type()) { + case QEvent::PaletteChange: + updatePalette(); + QPixmapCache::clear(); + break; + + case QEvent::WindowActivate: + case QEvent::WindowDeactivate: + updatePalette(); + break; + + case QEvent::KeyPress: + hideToolTip(ToolTipManager::HideBehavior::Instantly); + if (GeneralSettings::useTabForSwitchingSplitView()) { + QKeyEvent* keyEvent = static_cast(event); + if (keyEvent->key() == Qt::Key_Tab && keyEvent->modifiers() == Qt::NoModifier) { + emit toggleActiveViewRequested(); + return true; + } + } + break; + case QEvent::FocusIn: + if (watched == m_container) { + setActive(true); + } + break; + + case QEvent::GraphicsSceneDragEnter: + if (watched == m_view) { + m_dragging = true; + abortTwoClicksRenaming(); + } + break; + + case QEvent::GraphicsSceneDragLeave: + if (watched == m_view) { + m_dragging = false; + } + 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()); + case QEvent::GraphicsSceneDrop: + if (watched == m_view) { + m_dragging = false; + } + default: + break; } + + return QWidget::eventFilter(watched, event); } void DolphinView::wheelEvent(QWheelEvent* event) @@ -692,8 +840,31 @@ void DolphinView::wheelEvent(QWheelEvent* event) const int numSteps = numDegrees / 15; setZoomLevel(zoomLevel() + numSteps); + event->accept(); + } else { + event->ignore(); } - event->accept(); +} + +void DolphinView::hideEvent(QHideEvent* event) +{ + hideToolTip(); + QWidget::hideEvent(event); +} + +bool DolphinView::event(QEvent* event) +{ + if (event->type() == QEvent::WindowDeactivate) { + /* See Bug 297355 + * Dolphin leaves file preview tooltips open even when is not visible. + * + * Hide tool-tip when Dolphin loses focus. + */ + hideToolTip(); + abortTwoClicksRenaming(); + } + + return QWidget::event(event); } void DolphinView::activate() @@ -703,62 +874,223 @@ void DolphinView::activate() void DolphinView::slotItemActivated(int index) { - const KFileItemList items = selectedItems(); - if (items.isEmpty()) - return; - if (items.count() == 1) { - emit itemActivated(items.at(0)); // caught by DolphinViewContainer or DolphinPart + abortTwoClicksRenaming(); + + const KFileItem item = m_model->fileItem(index); + if (!item.isNull()) { + emit itemActivated(item); } - else { - foreach (const KFileItem& fileItem, items) { - if (fileItem.isDir()) { - emit tabRequested(fileItem.url()); - } else { - emit itemActivated(fileItem); - } +} + +void DolphinView::slotItemsActivated(const KItemSet& indexes) +{ + Q_ASSERT(indexes.count() >= 2); + + abortTwoClicksRenaming(); + + 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()); + + for (int index : indexes) { + KFileItem item = m_model->fileItem(index); + const QUrl& url = openItemAsFolderUrl(item); + + if (!url.isEmpty()) { // Open folders in new tabs + emit tabRequested(url, DolphinTabWidget::AfterLastTab); + } else { + 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()) { - emit tabRequested(item.url()); + const KFileItem& item = m_model->fileItem(index); + const QUrl& url = openItemAsFolderUrl(item); + if (!url.isEmpty()) { + emit tabRequested(url, DolphinTabWidget::AfterCurrentTab); + } else if (isTabsForFilesEnabled()) { + emit tabRequested(item.url(), DolphinTabWidget::AfterCurrentTab); } } -void DolphinView::slotContextMenuRequested(int index, const QPointF& pos) +void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos) { - Q_UNUSED(pos); - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); + // 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 = fileItemModel()->fileItem(index); - emit requestContextMenu(item, url(), QList()); + + const KFileItem item = m_model->fileItem(index); + emit requestContextMenu(pos.toPoint(), item, url(), QList()); } -void DolphinView::slotItemExpansionToggleClicked(int index) +void DolphinView::slotViewContextMenuRequested(const QPointF& pos) { - // 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); + emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList()); +} + +void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) +{ + ViewProperties props(viewPropertiesUrl()); + + QPointer menu = new QMenu(QApplication::activeWindow()); + + KItemListView* view = m_container->controller()->view(); + const QSet visibleRolesSet = view->visibleRoles().toSet(); + + bool indexingEnabled = false; +#ifdef HAVE_BALOO + Baloo::IndexerConfig config; + indexingEnabled = config.fileIndexingEnabled(); +#endif + + QString groupName; + QMenu* groupMenu = nullptr; + + // Add all roles to the menu that can be shown or hidden by the user + const QList rolesInfo = KFileItemModel::rolesInformation(); + foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + if (info.role == "text") { + // It should not be possible to hide the "text" role + continue; + } + + const QString text = m_model->roleDescription(info.role); + QAction* action = nullptr; + if (info.group.isEmpty()) { + action = menu->addAction(text); + } else { + if (!groupMenu || info.group != groupName) { + groupName = info.group; + groupMenu = menu->addMenu(groupName); + } + + action = groupMenu->addAction(text); + } + + action->setCheckable(true); + action->setChecked(visibleRolesSet.contains(info.role)); + action->setData(info.role); + + const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || + (info.requiresBaloo) || + (info.requiresIndexer && indexingEnabled); + action->setEnabled(enable); + } + + menu->addSeparator(); + + QActionGroup* widthsGroup = new QActionGroup(menu); + const bool autoColumnWidths = props.headerColumnWidths().isEmpty(); + + QAction* autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths")); + autoAdjustWidthsAction->setCheckable(true); + autoAdjustWidthsAction->setChecked(autoColumnWidths); + autoAdjustWidthsAction->setActionGroup(widthsGroup); + + QAction* customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths")); + customWidthsAction->setCheckable(true); + customWidthsAction->setChecked(!autoColumnWidths); + customWidthsAction->setActionGroup(widthsGroup); + + QAction* action = menu->exec(pos.toPoint()); + if (menu && action) { + KItemListHeader* header = view->header(); + + if (action == autoAdjustWidthsAction) { + // Clear the column-widths from the viewproperties and turn on + // the automatic resizing of the columns + props.setHeaderColumnWidths(QList()); + header->setAutomaticColumnResizing(true); + } else if (action == customWidthsAction) { + // Apply the current column-widths as custom column-widths and turn + // off the automatic resizing of the columns + QList columnWidths; + columnWidths.reserve(view->visibleRoles().count()); + foreach (const QByteArray& role, view->visibleRoles()) { + columnWidths.append(header->columnWidth(role)); + } + props.setHeaderColumnWidths(columnWidths); + header->setAutomaticColumnResizing(false); + } else { + // Show or hide the selected role + const QByteArray selectedRole = action->data().toByteArray(); + + QList visibleRoles = view->visibleRoles(); + if (action->isChecked()) { + visibleRoles.append(selectedRole); + } else { + visibleRoles.removeOne(selectedRole); + } + + view->setVisibleRoles(visibleRoles); + props.setVisibleRoles(visibleRoles); + + QList columnWidths; + if (!header->automaticColumnResizing()) { + columnWidths.reserve(view->visibleRoles().count()); + foreach (const QByteArray& role, view->visibleRoles()) { + columnWidths.append(header->columnWidth(role)); + } + } + props.setHeaderColumnWidths(columnWidths); + } + } + + delete menu; +} + +void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current) +{ + const QList visibleRoles = m_view->visibleRoles(); + + ViewProperties props(viewPropertiesUrl()); + QList columnWidths = props.headerColumnWidths(); + if (columnWidths.count() != visibleRoles.count()) { + columnWidths.clear(); + columnWidths.reserve(visibleRoles.count()); + const KItemListHeader* header = m_view->header(); + foreach (const QByteArray& role, visibleRoles) { + const int width = header->columnWidth(role); + columnWidths.append(width); + } + } + + const int roleIndex = visibleRoles.indexOf(role); + Q_ASSERT(roleIndex >= 0 && roleIndex < columnWidths.count()); + columnWidths[roleIndex] = current; + + props.setHeaderColumnWidths(columnWidths); } void DolphinView::slotItemHovered(int index) { - const KFileItem item = fileItemModel()->fileItem(index); + const KFileItem item = m_model->fileItem(index); - if (GeneralSettings::showToolTips()) { - QRectF itemRect = m_container->controller()->view()->itemBoundingRect(index); + if (GeneralSettings::showToolTips() && !m_dragging) { + QRectF itemRect = m_container->controller()->view()->itemContextRect(index); const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint()); itemRect.moveTo(pos); - m_toolTipManager->showToolTip(item, itemRect); +#ifdef HAVE_BALOO + m_toolTipManager->showToolTip(item, itemRect, nativeParentWidget()->windowHandle()); +#endif } emit requestItemInfo(item); @@ -766,14 +1098,113 @@ void DolphinView::slotItemHovered(int index) void DolphinView::slotItemUnhovered(int index) { - Q_UNUSED(index); - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); - } + Q_UNUSED(index) + hideToolTip(); emit requestItemInfo(KFileItem()); } -void DolphinView::slotSelectionChanged(const QSet& current, const QSet& previous) +void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) +{ + QUrl destUrl; + 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 = m_model->rootItem(); + destUrl = url(); + } else { + // The item represents a directory or desktop-file + destUrl = destItem.mostLocalUrl(); + } + + QDropEvent dropEvent(event->pos().toPoint(), + event->possibleActions(), + event->mimeData(), + event->buttons(), + event->modifiers()); + dropUrls(destUrl, &dropEvent, this); + + setActive(true); +} + +void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget) +{ + KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget); + + if (job) { + connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult); + + if (destUrl == url()) { + // Mark the dropped urls as selected. + m_clearSelectionBeforeSelectingNewItems = true; + m_markFirstNewlySelectedItemAsCurrent = true; + connect(job, &KIO::DropJob::itemCreated, this, &DolphinView::slotItemCreated); + } + } +} + +void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous) +{ + if (previous != nullptr) { + Q_ASSERT(qobject_cast(previous)); + KFileItemModel* fileItemModel = static_cast(previous); + disconnect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted); + m_versionControlObserver->setModel(nullptr); + } + + if (current) { + Q_ASSERT(qobject_cast(current)); + KFileItemModel* fileItemModel = static_cast(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 (buttons & Qt::BackButton) { + emit goBackRequested(); + } else if (buttons & Qt::ForwardButton) { + emit goForwardRequested(); + } +} + +void DolphinView::slotSelectedItemTextPressed(int index) +{ + if (GeneralSettings::renameInline() && !m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) { + const KFileItem item = m_model->fileItem(index); + const KFileItemListProperties capabilities(KFileItemList() << item); + if (capabilities.supportsMoving()) { + m_twoClicksRenamingItemUrl = item.url(); + m_twoClicksRenamingTimer->start(QApplication::doubleClickInterval()); + } + } +} + +void DolphinView::slotItemCreated(const QUrl& url) +{ + if (m_markFirstNewlySelectedItemAsCurrent) { + markUrlAsCurrent(url); + m_markFirstNewlySelectedItemAsCurrent = false; + } + m_selectedUrls << url; +} + +void DolphinView::slotPasteJobResult(KJob *job) +{ + if (job->error()) { + emit errorMessage(job->errorString()); + } + if (!m_selectedUrls.isEmpty()) { + m_selectedUrls = KDirModel::simplifiedUrlList(m_selectedUrls); + } +} + +void DolphinView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous) { const int currentCount = current.count(); const int previousCount = previous.count(); @@ -793,62 +1224,43 @@ void DolphinView::emitSelectionChangedSignal() emit selectionChanged(selectedItems()); } -void DolphinView::openContextMenu(const QPoint& pos, - const QList& customActions) +void DolphinView::updateSortRole(const QByteArray& role) { - KFileItem item; - const int index = m_container->controller()->view()->itemAt(pos); - if (index >= 0) { - item = fileItemModel()->fileItem(index); - } - - emit requestContextMenu(item, url(), customActions); -} - -void DolphinView::dropUrls(const KFileItem& destItem, - const KUrl& destPath, - QDropEvent* event) -{ - Q_UNUSED(destItem); - Q_UNUSED(destPath); - markPastedUrlsAsSelected(event->mimeData()); - //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this); -} - -void DolphinView::updateSorting(DolphinView::Sorting sorting) -{ - ViewProperties props(url()); - props.setSorting(sorting); + ViewProperties props(viewPropertiesUrl()); + props.setSortRole(role); KItemModelBase* model = m_container->controller()->model(); - model->setSortRole(sortRoleForSorting(sorting)); + model->setSortRole(role); - emit sortingChanged(sorting); + emit sortRoleChanged(role); } void DolphinView::updateSortOrder(Qt::SortOrder order) { - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setSortOrder(order); - //m_viewAccessor.proxyModel()->setSortOrder(order); + m_model->setSortOrder(order); emit sortOrderChanged(order); } void DolphinView::updateSortFoldersFirst(bool foldersFirst) { - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setSortFoldersFirst(foldersFirst); - //m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst); + m_model->setSortDirectoriesFirst(foldersFirst); emit sortFoldersFirstChanged(foldersFirst); } QPair DolphinView::pasteInfo() const { - return KonqOperations::pasteInfo(url()); + const QMimeData *mimeData = QApplication::clipboard()->mimeData(); + QPair info; + info.second = KIO::pasteActionText(mimeData, &info.first, rootItem()); + return info; } void DolphinView::setTabsForFilesEnabled(bool tabsForFiles) @@ -863,34 +1275,51 @@ bool DolphinView::isTabsForFilesEnabled() const bool DolphinView::itemsExpandable() const { - return false; //m_viewAccessor.itemsExpandable(); + return m_mode == DetailsView; } 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_currentItemIndex; + stream >> m_currentItemUrl; + + // Restore the previously selected items + stream >> m_selectedUrls; // 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 urlsToExpand; - stream >> urlsToExpand; - /*const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand); - if (expander) { - m_expanderActive = true; - connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted())); - } - else { - m_expanderActive = false; - }*/ + QSet urls; + stream >> 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 - stream << m_container->controller()->selectionManager()->currentItem(); + const int currentIndex = m_container->controller()->selectionManager()->currentItem(); + if (currentIndex != -1) { + KFileItem item = m_model->fileItem(currentIndex); + Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist + QUrl currentItemUrl = item.url(); + stream << currentItemUrl; + } else { + stream << QUrl(); + } + + // Save the selected urls + stream << selectedItems().urlList(); // Save view position const qreal x = m_container->horizontalScrollBar()->value(); @@ -898,45 +1327,91 @@ void DolphinView::saveState(QDataStream& stream) 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 << 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() +QUrl 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 QUrl(); + } + + QUrl 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:// when clicking on a tar file, + // zip:// 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.setScheme(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 QUrl::fromUserInput(linkUrl); + } + } } } - disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), - this, SLOT(selectAndScrollToCreatedItem()));*/ - m_createdItemUrl = KUrl(); + return QUrl(); +} + +void DolphinView::resetZoomLevel() +{ + ViewModeSettings::ViewMode mode; + + switch (m_mode) { + case IconsView: mode = ViewModeSettings::IconsMode; break; + case CompactView: mode = ViewModeSettings::CompactMode; break; + case DetailsView: mode = ViewModeSettings::DetailsMode; break; + } + const ViewModeSettings settings(mode); + const QSize iconSize = QSize(settings.iconSize(), settings.iconSize()); + setZoomLevel(ZoomLevelInfo::zoomLevelForIconSize(iconSize)); } -void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) +void DolphinView::observeCreatedItem(const QUrl& url) { - if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) { + if (m_active) { + forceUrlsSelection(url, {url}); + } +} + +void DolphinView::slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUrl) +{ + if (oldUrl.matches(url(), QUrl::StripTrailingSlash)) { emit redirection(oldUrl, newUrl); m_url = newUrl; // #186947 } @@ -944,10 +1419,26 @@ void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) void DolphinView::updateViewState() { - if (m_currentItemIndex >= 0) { + if (m_currentItemUrl != QUrl()) { KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - selectionManager->setCurrentItem(m_currentItemIndex); - m_currentItemIndex =-1; + + // if there is a selection already, leave it that way + if (!selectionManager->hasSelection()) { + 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 = QUrl(); } if (!m_restoredContentsPosition.isNull()) { @@ -959,31 +1450,97 @@ void DolphinView::updateViewState() m_container->verticalScrollBar()->setValue(y); } - if (!m_selectedItems.isEmpty()) { + if (!m_selectedUrls.isEmpty()) { KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - QSet selectedItems = selectionManager->selectedItems(); - const KFileItemModel* model = fileItemModel(); - foreach (const KFileItem& selectedItem, m_selectedItems) { - const int index = model->index(selectedItem); - if (index >= 0) { - selectedItems.insert(index); + // if there is a selection already, leave it that way + if (!selectionManager->hasSelection()) { + if (m_clearSelectionBeforeSelectingNewItems) { + selectionManager->clearSelection(); + m_clearSelectionBeforeSelectingNewItems = false; } + + KItemSet selectedItems = selectionManager->selectedItems(); + + QList::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->beginAnchoredSelection(selectionManager->currentItem()); + selectionManager->setSelectedItems(selectedItems); } + } +} - selectionManager->setSelectedItems(selectedItems); - m_selectedItems.clear(); +void DolphinView::hideToolTip(const ToolTipManager::HideBehavior behavior) +{ +#ifdef HAVE_BALOO + if (GeneralSettings::showToolTips()) { + m_toolTipManager->hideToolTip(behavior); } +#endif } -void DolphinView::showHoverInformation(const KFileItem& item) +void DolphinView::calculateItemCount(int& fileCount, + int& folderCount, + KIO::filesize_t& totalFileSize) const { - emit requestItemInfo(item); + const int itemCount = m_model->count(); + + bool countFileSize = true; + + // In case we have a precomputed value + const auto job = KIO::statDetails(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize); + job->exec(); + const auto entry = job->statResult(); + if (entry.contains(KIO::UDSEntry::UDS_RECURSIVE_SIZE)) { + totalFileSize = static_cast(entry.numberValue(KIO::UDSEntry::UDS_RECURSIVE_SIZE)); + countFileSize = false; + } + + for (int i = 0; i < itemCount; ++i) { + const KFileItem item = m_model->fileItem(i); + if (item.isDir()) { + ++folderCount; + } else { + ++fileCount; + if (countFileSize) { + totalFileSize += item.size(); + } + } + } } -void DolphinView::clearHoverInformation() +void DolphinView::slotTwoClicksRenamingTimerTimeout() { - emit requestItemInfo(KFileItem()); + const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); + + // verify that only one item is selected + if (selectionManager->selectedItems().count() == 1) { + const int index = selectionManager->currentItem(); + const QUrl fileItemUrl = m_model->fileItem(index).url(); + + // check if the selected item was the same item that started the twoClicksRenaming + if (fileItemUrl.isValid() && m_twoClicksRenamingItemUrl == fileItemUrl) { + renameSelectedItems(); + } + } +} + +void DolphinView::slotTrashFileFinished(KJob* job) +{ + 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) @@ -995,51 +1552,167 @@ void DolphinView::slotDeleteFileFinished(KJob* job) } } -void DolphinView::slotDirListerStarted(const KUrl& url) +void DolphinView::slotRenamingResult(KJob* job) +{ + if (job->error()) { + KIO::CopyJob *copyJob = qobject_cast(job); + Q_ASSERT(copyJob); + const QUrl newUrl = copyJob->destUrl(); + const int index = m_model->index(newUrl); + if (index >= 0) { + QHash data; + const QUrl oldUrl = copyJob->srcUrls().at(0); + 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 - // in DolphinView::slotDirListerCompleted() + // in DolphinView::slotDirectoryLoadingCompleted() if (m_isFolderWritable) { m_isFolderWritable = false; emit writeStateChanged(m_isFolderWritable); } - emit startedPathLoading(url); + emit directoryLoadingStarted(); } -void DolphinView::slotDirListerCompleted() +void DolphinView::slotDirectoryLoadingCompleted() { - // 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())); + // 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, &DolphinView::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(m_model->sortOrder() == current); + + ViewProperties props(viewPropertiesUrl()); + props.setSortOrder(current); + + emit sortOrderChanged(current); +} + +void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous) +{ + Q_UNUSED(previous) + Q_ASSERT(m_model->sortRole() == current); + + ViewProperties props(viewPropertiesUrl()); + props.setSortRole(current); + + emit sortRoleChanged(current); +} + +void DolphinView::slotVisibleRolesChangedByHeader(const QList& current, + const QList& previous) +{ + Q_UNUSED(previous) + Q_ASSERT(m_container->controller()->view()->visibleRoles() == current); + + const QList previousVisibleRoles = m_visibleRoles; + + m_visibleRoles = current; + + ViewProperties props(viewPropertiesUrl()); + props.setVisibleRoles(m_visibleRoles); + + emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles); } -KFileItemModel* DolphinView::fileItemModel() const +void DolphinView::slotRoleEditingCanceled() { - return static_cast(m_container->controller()->model()); + disconnect(m_view, &DolphinItemListView::roleEditingFinished, + this, &DolphinView::slotRoleEditingFinished); } -void DolphinView::loadDirectory(const KUrl& url, bool reload) +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 != QLatin1Char('.') && newName != QLatin1String("..")) { + const QUrl oldUrl = oldItem.url(); + + QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename); + newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName)); + +#ifndef Q_OS_WIN + //Confirm hiding file/directory by renaming inline + if (!hiddenFilesShown() && newName.startsWith(QLatin1Char('.')) && !oldItem.name().startsWith(QLatin1Char('.'))) { + KGuiItem yesGuiItem(KStandardGuiItem::yes()); + yesGuiItem.setText(i18nc("@action:button", "Rename and Hide")); + + const auto code = KMessageBox::questionYesNo(this, + oldItem.isFile() ? i18n("Adding a dot to the beginning of this file's name will hide it from view.\n" + "Do you still want to rename it?") + : i18n("Adding a dot to the beginning of this folder's name will hide it from view.\n" + "Do you still want to rename it?"), + oldItem.isFile() ? i18n("Hide this File?") : i18n("Hide this Folder?"), + yesGuiItem, + KStandardGuiItem::cancel(), + QStringLiteral("ConfirmHide") + ); + + if (code == KMessageBox::No) { + return; + } + } +#endif + + 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 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 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, {oldUrl}, newUrl, job); + job->uiDelegate()->setAutoErrorHandlingEnabled(true); + + forceUrlsSelection(newUrl, {newUrl}); + + 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 QUrl& url, bool reload) { if (!url.isValid()) { - const QString location(url.pathOrUrl()); + const QString location(url.toDisplayString(QUrl::PreferLocalFile)); if (location.isEmpty()) { emit errorMessage(i18nc("@info:status", "The location is empty.")); } else { @@ -1048,14 +1721,22 @@ 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(); + const ViewProperties props(viewPropertiesUrl()); + applyViewProperties(props); +} - const ViewProperties props(url()); +void DolphinView::applyViewProperties(const ViewProperties& props) +{ + m_view->beginTransaction(); const Mode mode = props.viewMode(); if (m_mode != mode) { @@ -1065,69 +1746,59 @@ void DolphinView::applyViewProperties() // 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 != m_dirLister->showingDotFiles()) { - m_dirLister->setShowingDotFiles(hiddenFilesShown); - m_dirLister->emitChanges(); + if (hiddenFilesShown != m_model->showHiddenFiles()) { + m_model->setShowHiddenFiles(hiddenFilesShown); emit hiddenFilesShownChanged(hiddenFilesShown); } -/* m_storedCategorizedSorting = props.categorizedSorting(); - const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting(); - if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) { - m_viewAccessor.proxyModel()->setCategorizedModel(categorized); - emit categorizedSortingChanged(); - }*/ + const bool groupedSorting = props.groupedSorting(); + if (groupedSorting != m_model->groupedSorting()) { + m_model->setGroupedSorting(groupedSorting); + emit groupedSortingChanged(groupedSorting); + } - const DolphinView::Sorting sorting = props.sorting(); - KItemModelBase* model = m_container->controller()->model(); - const QByteArray newSortRole = sortRoleForSorting(sorting); - if (newSortRole != model->sortRole()) { - model->setSortRole(newSortRole); - emit sortingChanged(sorting); + const QByteArray sortRole = props.sortRole(); + if (sortRole != m_model->sortRole()) { + m_model->setSortRole(sortRole); + emit sortRoleChanged(sortRole); } -/* + const Qt::SortOrder sortOrder = props.sortOrder(); - if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) { - m_viewAccessor.proxyModel()->setSortOrder(sortOrder); + if (sortOrder != m_model->sortOrder()) { + m_model->setSortOrder(sortOrder); emit sortOrderChanged(sortOrder); } const bool sortFoldersFirst = props.sortFoldersFirst(); - if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) { - m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst); + if (sortFoldersFirst != m_model->sortDirectoriesFirst()) { + m_model->setSortDirectoriesFirst(sortFoldersFirst); emit sortFoldersFirstChanged(sortFoldersFirst); } -*/ - const QList infoList = props.additionalInfoList(); - if (infoList != m_additionalInfoList) { - const QList previousList = m_additionalInfoList; - m_additionalInfoList = infoList; - applyAdditionalInfoListToView(); - emit additionalInfoListChanged(m_additionalInfoList, previousList); + + const QList visibleRoles = props.visibleRoles(); + if (visibleRoles != m_visibleRoles) { + const QList previousVisibleRoles = m_visibleRoles; + m_visibleRoles = 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 @@ -1136,47 +1807,54 @@ void DolphinView::applyViewProperties() } } - m_container->endTransaction(); -} - -void DolphinView::applyAdditionalInfoListToView() -{ - const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance(); - - QHash visibleRoles; - visibleRoles.insert("name", 0); - - int index = 1; - foreach (AdditionalInfo info, m_additionalInfoList) { - visibleRoles.insert(infoAccessor.role(info), index); - ++index; + KItemListView* itemListView = m_container->controller()->view(); + if (itemListView->isHeaderVisible()) { + KItemListHeader* header = itemListView->header(); + const QList headerColumnWidths = props.headerColumnWidths(); + const int rolesCount = m_visibleRoles.count(); + if (headerColumnWidths.count() == rolesCount) { + header->setAutomaticColumnResizing(false); + + QHash columnWidths; + for (int i = 0; i < rolesCount; ++i) { + columnWidths.insert(m_visibleRoles[i], headerColumnWidths[i]); + } + header->setColumnWidths(columnWidths); + } else { + header->setAutomaticColumnResizing(true); + } } - m_container->setVisibleRoles(visibleRoles); + m_view->endTransaction(); } -void DolphinView::pasteToUrl(const KUrl& url) +void DolphinView::applyModeToView() { - markPastedUrlsAsSelected(QApplication::clipboard()->mimeData()); - KonqOperations::doPaste(this, url); + 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::updateZoomLevel(int oldZoomLevel) +void DolphinView::pasteToUrl(const QUrl& url) { - Q_UNUSED(oldZoomLevel); - /* const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize()); - if (oldZoomLevel != newZoomLevel) { - m_viewModeController->setZoomLevel(newZoomLevel); - emit zoomLevelChanged(newZoomLevel); - }*/ + KIO::PasteJob *job = KIO::paste(QApplication::clipboard()->mimeData(), url); + KJobWidgets::setWindow(job, this); + m_clearSelectionBeforeSelectingNewItems = true; + m_markFirstNewlySelectedItemAsCurrent = true; + connect(job, &KIO::PasteJob::itemCreated, this, &DolphinView::slotItemCreated); + connect(job, &KIO::PasteJob::result, this, &DolphinView::slotPasteJobResult); } -KUrl::List DolphinView::simplifiedSelectedUrls() const +QList DolphinView::simplifiedSelectedUrls() const { - KUrl::List urls; + QList urls; const KFileItemList items = selectedItems(); - foreach (const KFileItem &item, items) { + urls.reserve(items.count()); + foreach (const KFileItem& item, items) { urls.append(item.url()); } @@ -1190,50 +1868,54 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const QMimeData* DolphinView::selectionMimeData() const { - const KFileItemModel* model = fileItemModel(); const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager(); - const QSet selectedIndexes = selectionManager->selectedItems(); - - return model->createMimeData(selectedIndexes); -} + const KItemSet selectedIndexes = selectionManager->selectedItems(); -void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData) -{ - const KUrl::List urls = KUrl::List::fromMimeData(mimeData); - markUrlsAsSelected(urls); + return m_model->createMimeData(selectedIndexes); } void DolphinView::updateWritableState() { const bool wasFolderWritable = m_isFolderWritable; - m_isFolderWritable = true; - - const KFileItem item = m_dirLister->rootItem(); - if (!item.isNull()) { - KFileItemListProperties capabilities(KFileItemList() << item); - m_isFolderWritable = capabilities.supportsWriting(); + m_isFolderWritable = false; + + 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(url()); + item.setDelayedMimeTypes(true); } + + KFileItemListProperties capabilities(KFileItemList() << item); + m_isFolderWritable = capabilities.supportsWriting(); + if (m_isFolderWritable != wasFolderWritable) { emit writeStateChanged(m_isFolderWritable); } } -QByteArray DolphinView::sortRoleForSorting(Sorting sorting) const +QUrl DolphinView::viewPropertiesUrl() const { - 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; + if (m_viewPropertiesContext.isEmpty()) { + return m_url; } - return QByteArray(); + QUrl url; + url.setScheme(m_url.scheme()); + url.setPath(m_viewPropertiesContext); + return url; +} + +void DolphinView::slotRenameDialogRenamingFinished(const QList& urls) +{ + forceUrlsSelection(urls.first(), urls); } -#include "dolphinview.moc" +void DolphinView::forceUrlsSelection(const QUrl& current, const QList& selected) +{ + clearSelection(); + m_clearSelectionBeforeSelectingNewItems = true; + markUrlAsCurrent(current); + markUrlsAsSelected(selected); +}