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

Move findOnFileSystem from FolderNavigation to FindInFiles

Browse Source 
Change-Id: I39069e1da20d34f9d5fd0f3caa996b13600ee5bb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Orgad Shaneh
2013-09-24 12:10:43 +03:00
committed by Orgad Shaneh
parent 666bdaa9b7
commit 372079d35f
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/projectexplorer/foldernavigationwidget.cpp
View File

@@ -343,11 +343,7 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
return;
}
if (action == actionFind) {
QFileInfo info = m_fileSystemModel->fileInfo(current);
if (m_fileSystemModel->isDir(current))
findOnFileSystem(info.absoluteFilePath());
else
findOnFileSystem(info.absolutePath());
TextEditor::FindInFiles::findOnFileSystem(m_fileSystemModel->filePath(current));
return;
}
Core::DocumentManager::executeOpenWithMenuAction(action);
@@ -358,21 +354,6 @@ QString FolderNavigationWidget::msgFindOnFileSystem()
return tr("Find in this directory...");
}
void FolderNavigationWidget::findOnFileSystem(const QString &pathIn)
{
const QFileInfo fileInfo(pathIn);
const QString folder = fileInfo.isDir() ? fileInfo.absoluteFilePath() : fileInfo.absolutePath();
TextEditor::FindInFiles *fif = ExtensionSystem::PluginManager::getObject<TextEditor::FindInFiles>();
if (!fif)
return;
Find::FindPlugin *plugin = Find::FindPlugin::instance();
if (!plugin)
return;
fif->setDirectory(folder);
Find::FindPlugin::instance()->openFindDialog(fif);
}
void FolderNavigationWidget::setHiddenFilesFilter(bool filter)
{
QDir::Filters filters = m_fileSystemModel->filter();