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

ProjectTree: Fix adding files from context menu

Browse Source 
We need to retrieve the current node before the dialog opens up.
While the dialog has focus, the current node depends on what is
visible in the EditorManager.

Change-Id: Icdb212e8d837c9cd789e369f76d6a136d46fcaae
Task-number: QTCREATORBUG-14295
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-04-16 15:27:31 +02:00
parent 8c4624951a
commit 458bcdf6aa
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -3021,29 +3021,33 @@ void ProjectExplorerPluginPrivate::addNewSubproject()
void ProjectExplorerPluginPrivate::handleAddExistingFiles() void ProjectExplorerPluginPrivate::handleAddExistingFiles()
{ {
QTC_ASSERT(ProjectTree::currentNode(), return); Node *node = ProjectTree::currentNode();
FolderNode *folderNode = node ? node->asFolderNode() : 0;
QTC_ASSERT(folderNode, return);
QStringList fileNames = QFileDialog::getOpenFileNames(ICore::mainWindow(), QStringList fileNames = QFileDialog::getOpenFileNames(ICore::mainWindow(),
tr("Add Existing Files"), directoryFor(ProjectTree::currentNode())); tr("Add Existing Files"), directoryFor(ProjectTree::currentNode()));
if (fileNames.isEmpty()) if (fileNames.isEmpty())
return; return;
ProjectExplorerPlugin::addExistingFiles(fileNames); ProjectExplorerPlugin::addExistingFiles(fileNames, folderNode);
} }
void ProjectExplorerPluginPrivate::addExistingDirectory() void ProjectExplorerPluginPrivate::addExistingDirectory()
{ {
QTC_ASSERT(ProjectTree::currentNode(), return); Node *node = ProjectTree::currentNode();
FolderNode *folderNode = node ? node->asFolderNode() : 0;
QTC_ASSERT(folderNode, return);
SelectableFilesDialogAddDirectory dialog(directoryFor(ProjectTree::currentNode()), QStringList(), ICore::mainWindow()); SelectableFilesDialogAddDirectory dialog(directoryFor(ProjectTree::currentNode()), QStringList(), ICore::mainWindow());
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
ProjectExplorerPlugin::addExistingFiles(dialog.selectedFiles()); ProjectExplorerPlugin::addExistingFiles(dialog.selectedFiles(), folderNode);
} }
void ProjectExplorerPlugin::addExistingFiles(const QStringList &filePaths) void ProjectExplorerPlugin::addExistingFiles(const QStringList &filePaths, FolderNode *folderNode)
{ {
Node *node = ProjectTree::currentNode();
FolderNode *folderNode = node ? node->asFolderNode() : 0;
addExistingFiles(folderNode, filePaths); addExistingFiles(folderNode, filePaths);
} }

2
src/plugins/projectexplorer/projectexplorer.h
View File

@@ -104,7 +104,7 @@ public:
const bool forceSkipDeploy = false); const bool forceSkipDeploy = false);
static void addExistingFiles(FolderNode *projectNode, const QStringList &filePaths); static void addExistingFiles(FolderNode *projectNode, const QStringList &filePaths);
static void addExistingFiles(const QStringList &filePaths); static void addExistingFiles(const QStringList &filePaths, FolderNode *folderNode);
static void buildProject(Project *p); static void buildProject(Project *p);
/// Normally there's no need to call this function. /// Normally there's no need to call this function.