feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericProjectManager: Allow users to remove directories from a project

Browse Source 
... via the project context menu.

Fixes: QTCREATORBUG-16575
Change-Id: I02650a8ef70ffe22c6a42a5450588be4506af925
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2019-07-16 15:55:03 +02:00
parent f689f86be5
commit 1f81f63b56
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/genericprojectmanager/genericproject.h
View File

@@ -26,6 +26,7 @@
#pragma once #pragma once
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <utils/fileutils.h>
namespace CppTools { class CppProjectUpdater; } namespace CppTools { class CppProjectUpdater; }
namespace Utils { class FileSystemWatcher; } namespace Utils { class FileSystemWatcher; }
@@ -46,6 +47,8 @@ public:
bool setFiles(const QStringList &filePaths); bool setFiles(const QStringList &filePaths);
bool renameFile(const QString &filePath, const QString &newFilePath); bool renameFile(const QString &filePath, const QString &newFilePath);
Utils::FilePath filesFilePath() const { return Utils::FilePath::fromString(m_filesFileName); }
enum RefreshOptions { enum RefreshOptions {
Files = 0x01, Files = 0x01,
Configuration = 0x02, Configuration = 0x02,

31
src/plugins/genericprojectmanager/genericprojectplugin.cpp
View File

@@ -39,16 +39,21 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmanager.h> #include <projectexplorer/projectmanager.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/projecttree.h> #include <projectexplorer/projecttree.h>
#include <projectexplorer/selectablefilesmodel.h> #include <projectexplorer/selectablefilesmodel.h>
#include <projectexplorer/taskhub.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <QAction> #include <QAction>
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils;
namespace PEC = ProjectExplorer::Constants;
namespace GenericProjectManager { namespace GenericProjectManager {
namespace Internal { namespace Internal {
@@ -85,13 +90,12 @@ GenericProjectPluginPrivate::GenericProjectPluginPrivate()
IWizardFactory::registerFactoryCreator([] { return QList<IWizardFactory *>{new GenericProjectWizard}; }); IWizardFactory::registerFactoryCreator([] { return QList<IWizardFactory *>{new GenericProjectWizard}; });
ActionContainer *mproject = ActionContainer *mproject = ActionManager::actionContainer(PEC::M_PROJECTCONTEXT);
ActionManager::actionContainer(ProjectExplorer::Constants::M_PROJECTCONTEXT);
Command *command = ActionManager::registerAction(&editFilesAction, Command *command = ActionManager::registerAction(&editFilesAction,
"GenericProjectManager.EditFiles", Context(Constants::GENERICPROJECT_ID)); "GenericProjectManager.EditFiles", Context(Constants::GENERICPROJECT_ID));
command->setAttribute(Command::CA_Hide); command->setAttribute(Command::CA_Hide);
mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_FILES); mproject->addAction(command, PEC::G_PROJECT_FILES);
connect(&editFilesAction, &QAction::triggered, this, [] { connect(&editFilesAction, &QAction::triggered, this, [] {
auto genericProject = qobject_cast<GenericProject *>(ProjectTree::currentProject()); auto genericProject = qobject_cast<GenericProject *>(ProjectTree::currentProject());
@@ -101,7 +105,26 @@ GenericProjectPluginPrivate::GenericProjectPluginPrivate()
genericProject->files(Project::AllFiles), genericProject->files(Project::AllFiles),
ICore::mainWindow()); ICore::mainWindow());
if (sfd.exec() == QDialog::Accepted) if (sfd.exec() == QDialog::Accepted)
genericProject->setFiles(Utils::transform(sfd.selectedFiles(), &Utils::FilePath::toString)); genericProject->setFiles(transform(sfd.selectedFiles(), &FilePath::toString));
});
const auto removeDirAction = new QAction(tr("Remove Directory"), this);
Command * const cmd = ActionManager::registerAction(removeDirAction, "GenericProject.RemoveDir",
Context(PEC::C_PROJECT_TREE));
ActionManager::actionContainer(PEC::M_FOLDERCONTEXT)->addAction(cmd, PEC::G_FOLDER_OTHER);
connect(removeDirAction, &QAction::triggered, this, [] {
const auto folderNode = ProjectTree::currentNode()->asFolderNode();
QTC_ASSERT(folderNode, return);
const auto project = qobject_cast<GenericProject *>(folderNode->getProject());
QTC_ASSERT(project, return);
const QStringList filesToRemove = transform<QStringList>(
folderNode->findNodes([](const Node *node) { return node->asFileNode(); }),
[](const Node *node) { return node->filePath().toString();});
if (!project->removeFiles(filesToRemove)) {
TaskHub::addTask(Task::Error, tr("Project files list update failed."),
PEC::TASK_CATEGORY_BUILDSYSTEM, project->filesFilePath());
}
}); });
} }