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

Beautifier: Make all tools MIME restrict-able

Browse Source 
The newly introduced auto save option is restricted to user definable
MIME types. The underlaying tool's restriction, however, is only if the
current editor is a cpp editor. This patch makes the tools also MIME
types restrict-able. In addition the auto save functionality is now only
applicable if the file matches the auto save MIME types as well as the
MIME types of the chosen tool.

Change-Id: Ic430b4a07341647e6c8e95d2b802a17db1637a36
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Lorenz Haas
2016-05-19 21:30:27 +02:00
parent 069714b832
commit 3af36134d1
20 changed files with 189 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -38,11 +38,13 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h>
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/texteditor.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <QAction>
#include <QMenu>
@@ -88,12 +90,15 @@ bool ClangFormat::initialize()
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(m_settings, &ClangFormatSettings::supportedMimeTypesChanged,
[this](){updateActions(Core::EditorManager::instance()->currentEditor());});
return true;
}
void ClangFormat::updateActions(Core::IEditor *editor)
{
const bool enabled = (editor && editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID);
const bool enabled = (editor && m_settings->isApplicable(editor->document()));
m_formatFile->setEnabled(enabled);
m_formatRange->setEnabled(enabled);
}
@@ -144,6 +149,11 @@ Command ClangFormat::command() const
return command;
}
bool ClangFormat::isApplicable(const Core::IDocument *document) const
{
return m_settings->isApplicable(document);
}
Command ClangFormat::command(int offset, int length) const
{
Command c = command();