X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d5726758b87579d7f4ff8bbf41a5f679458b1cc1..119f7a3f:/src/panels/folders/folderspanel.cpp diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index 87b0297c2..f56f5a139 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -22,7 +22,9 @@ #include "dolphin_folderspanelsettings.h" #include "dolphin_generalsettings.h" #include "treeviewcontextmenu.h" +#include "foldersitemlistwidget.h" +#include #include #include #include @@ -30,9 +32,11 @@ #include #include -#include #include -#include +#include +#include +#include +#include #include #include @@ -43,37 +47,33 @@ #include #include -#include #include FoldersPanel::FoldersPanel(QWidget* parent) : Panel(parent), m_updateCurrentItem(false), - m_dirLister(0), - m_controller(0) + m_controller(0), + m_model(0) { setLayoutDirection(Qt::LeftToRight); } FoldersPanel::~FoldersPanel() { - FoldersPanelSettings::self()->writeConfig(); + FoldersPanelSettings::self()->save(); if (m_controller) { KItemListView* view = m_controller->view(); m_controller->setView(0); delete view; } - - delete m_dirLister; - m_dirLister = 0; } void FoldersPanel::setShowHiddenFiles(bool show) { FoldersPanelSettings::setHiddenFilesShown(show); - fileItemModel()->setShowHiddenFiles(show); + m_model->setShowHiddenFiles(show); } bool FoldersPanel::showHiddenFiles() const @@ -94,11 +94,9 @@ bool FoldersPanel::autoScrolling() const void FoldersPanel::rename(const KFileItem& item) { - // TODO: Inline renaming is not supported anymore in Dolphin 2.0 - if (false /* GeneralSettings::renameInline() */) { - //const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); - //const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); - //m_treeView->edit(proxyIndex); + if (GeneralSettings::renameInline()) { + const int index = m_model->index(item); + m_controller->view()->editRole(index, "text"); } else { RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item); dialog->setAttribute(Qt::WA_DeleteOnClose); @@ -110,13 +108,13 @@ void FoldersPanel::rename(const KFileItem& item) bool FoldersPanel::urlChanged() { - if (!url().isValid() || url().protocol().contains("search")) { + if (!url().isValid() || url().scheme().contains("search")) { // Skip results shown by a search, as possible identical // directory names are useless without parent-path information. return false; } - if (m_dirLister) { + if (m_controller) { loadTree(url()); } @@ -130,70 +128,43 @@ void FoldersPanel::showEvent(QShowEvent* event) return; } - if (!m_dirLister) { - // Postpone the creating of the dir lister to the first show event. - // This assures that no performance and memory overhead is given when the TreeView is not - // used at all (see FoldersPanel::setUrl()). - m_dirLister = new KDirLister(); - m_dirLister->setAutoUpdate(true); - m_dirLister->setMainWindow(window()); - m_dirLister->setDelayedMimeTypes(true); - m_dirLister->setAutoErrorHandlingEnabled(false, this); - + if (!m_controller) { + // Postpone the creating of the controller to the first show event. + // This assures that no performance and memory overhead is given when the folders panel is not + // used at all and stays invisible. KFileItemListView* view = new KFileItemListView(); - view->setWidgetCreator(new KItemListWidgetCreator()); - - KItemListStyleOption styleOption = view->styleOption(); - styleOption.padding = 2; - styleOption.iconSize = KIconLoader::SizeSmall; - styleOption.extendedSelectionRegion = true; - view->setStyleOption(styleOption); - - const qreal itemHeight = qMax(int(KIconLoader::SizeSmall), styleOption.fontMetrics.height()); - view->setItemSize(QSizeF(-1, itemHeight + 2 * styleOption.padding)); - view->setItemLayout(KFileItemListView::DetailsLayout); + view->setWidgetCreator(new KItemListWidgetCreator()); view->setSupportsItemExpanding(true); // Set the opacity to 0 initially. The opacity will be increased after the loading of the initial tree // has been finished in slotLoadingCompleted(). This prevents an unnecessary animation-mess when // opening the folders panel. view->setOpacity(0); - KFileItemModel* model = new KFileItemModel(m_dirLister, this); - model->setShowFoldersOnly(true); - model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown()); + connect(view, &KFileItemListView::roleEditingFinished, + this, &FoldersPanel::slotRoleEditingFinished); + + m_model = new KFileItemModel(this); + m_model->setShowDirectoriesOnly(true); + m_model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown()); // Use a QueuedConnection to give the view the possibility to react first on the // finished loading. - connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection); + connect(m_model, &KFileItemModel::directoryLoadingCompleted, this, &FoldersPanel::slotLoadingCompleted, Qt::QueuedConnection); - KItemListContainer* container = new KItemListContainer(this); - m_controller = container->controller(); - m_controller->setView(view); - m_controller->setModel(model); + m_controller = new KItemListController(m_model, view, this); m_controller->setSelectionBehavior(KItemListController::SingleSelection); + m_controller->setAutoActivationBehavior(KItemListController::ExpansionOnly); + m_controller->setMouseDoubleClickAction(KItemListController::ActivateAndExpandItem); m_controller->setAutoActivationDelay(750); - m_controller->setSingleClickActivation(true); - - connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int))); - connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int))); - connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF))); - connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF))); - connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*))); - - // TODO: Check whether it makes sense to make an explicit API for KItemListContainer - // to make the background transparent. - container->setFrameShape(QFrame::NoFrame); - QGraphicsView* graphicsView = qobject_cast(container->viewport()); - if (graphicsView) { - // Make the background of the container transparent and apply the window-text color - // to the text color, so that enough contrast is given for all color - // schemes - QPalette p = graphicsView->palette(); - p.setColor(QPalette::Active, QPalette::Text, p.color(QPalette::Active, QPalette::WindowText)); - p.setColor(QPalette::Inactive, QPalette::Text, p.color(QPalette::Inactive, QPalette::WindowText)); - p.setColor(QPalette::Disabled, QPalette::Text, p.color(QPalette::Disabled, QPalette::WindowText)); - graphicsView->setPalette(p); - graphicsView->viewport()->setAutoFillBackground(false); - } + m_controller->setSingleClickActivationEnforced(true); + + connect(m_controller, &KItemListController::itemActivated, this, &FoldersPanel::slotItemActivated); + connect(m_controller, &KItemListController::itemMiddleClicked, this, &FoldersPanel::slotItemMiddleClicked); + connect(m_controller, &KItemListController::itemContextMenuRequested, this, &FoldersPanel::slotItemContextMenuRequested); + connect(m_controller, &KItemListController::viewContextMenuRequested, this, &FoldersPanel::slotViewContextMenuRequested); + connect(m_controller, &KItemListController::itemDropEvent, this, &FoldersPanel::slotItemDropEvent); + + KItemListContainer* container = new KItemListContainer(m_controller, this); + container->setEnabledFrame(false); QVBoxLayout* layout = new QVBoxLayout(this); layout->setMargin(0); @@ -216,17 +187,17 @@ void FoldersPanel::keyPressEvent(QKeyEvent* event) void FoldersPanel::slotItemActivated(int index) { - const KFileItem item = fileItemModel()->fileItem(index); + const KFileItem item = m_model->fileItem(index); if (!item.isNull()) { - emit changeUrl(item.url(), Qt::LeftButton); + emit folderActivated(item.url()); } } void FoldersPanel::slotItemMiddleClicked(int index) { - const KFileItem item = fileItemModel()->fileItem(index); + const KFileItem item = m_model->fileItem(index); if (!item.isNull()) { - emit changeUrl(item.url(), Qt::MiddleButton); + emit folderMiddleClicked(item.url()); } } @@ -234,7 +205,7 @@ void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos) { Q_UNUSED(pos); - const KFileItem fileItem = fileItemModel()->fileItem(index); + const KFileItem fileItem = m_model->fileItem(index); QWeakPointer contextMenu = new TreeViewContextMenu(this, fileItem); contextMenu.data()->open(); @@ -257,7 +228,7 @@ void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos) void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) { if (index >= 0) { - KFileItem destItem = fileItemModel()->fileItem(index); + KFileItem destItem = m_model->fileItem(index); if (destItem.isNull()) { return; } @@ -268,7 +239,29 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve event->buttons(), event->modifiers()); - DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent); + QString error; + DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent, error); + if (!error.isEmpty()) { + emit errorMessage(error); + } + } +} + +void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value) +{ + if (role == "text") { + const KFileItem item = m_model->fileItem(index); + const QString newName = value.toString(); + if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) { + const QUrl oldUrl = item.url(); + QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename); + newUrl.setPath(newUrl.path() + KIO::encodeFileName(newName)); + + KIO::Job* job = KIO::moveAs(oldUrl, newUrl); + KJobWidgets::setWindow(job, this); + KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job); + job->ui()->setAutoErrorHandlingEnabled(true); + } } } @@ -288,7 +281,7 @@ void FoldersPanel::slotLoadingCompleted() return; } - const int index = fileItemModel()->index(url()); + const int index = m_model->index(url()); updateCurrentItem(index); m_updateCurrentItem = false; } @@ -303,13 +296,13 @@ void FoldersPanel::startFadeInAnimation() anim->setDuration(200); } -void FoldersPanel::loadTree(const KUrl& url) +void FoldersPanel::loadTree(const QUrl& url) { - Q_ASSERT(m_dirLister); + Q_ASSERT(m_controller); m_updateCurrentItem = false; - KUrl baseUrl; + QUrl baseUrl; if (url.isLocalFile()) { // Use the root directory as base for local URLs (#150941) baseUrl = QDir::rootPath(); @@ -319,19 +312,17 @@ void FoldersPanel::loadTree(const KUrl& url) baseUrl.setPath(QString('/')); } - if (m_dirLister->url() != baseUrl) { + if (m_model->directory() != baseUrl) { m_updateCurrentItem = true; - m_dirLister->stop(); - m_dirLister->openUrl(baseUrl, KDirLister::Reload); + m_model->refreshDirectory(baseUrl); } - KFileItemModel* model = fileItemModel(); - const int index = model->index(url); + const int index = m_model->index(url); if (index >= 0) { updateCurrentItem(index); } else { m_updateCurrentItem = true; - model->expandParentItems(url); + m_model->expandParentDirectories(url); // slotLoadingCompleted() will be invoked after the model has // expanded the url } @@ -347,9 +338,3 @@ void FoldersPanel::updateCurrentItem(int index) m_controller->view()->scrollToItem(index); } -KFileItemModel* FoldersPanel::fileItemModel() const -{ - return static_cast(m_controller->model()); -} - -#include "folderspanel.moc"