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

Editor: Allow setting the optional action mask per editor

Browse Source 
Instead of just enable actions that were disabled from the beginning you
can no disable optional actions.

Change-Id: I986b8a72523a8aeec9f4ccf76cd4921018ffc003
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2020-06-17 10:28:27 +02:00
parent c7db952648
commit aaa1376576
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/texteditor/texteditor.cpp
View File

@@ -7828,17 +7828,24 @@ void TextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
}
}
uint TextEditorWidget::optionalActionMask()
uint TextEditorWidget::optionalActions()
{
return d->m_optionalActionMask;
}
void TextEditorWidget::addOptionalActions(uint optionalActionMask)
void TextEditorWidget::setOptionalActions(uint optionalActionMask)
{
d->m_optionalActionMask |= optionalActionMask;
if (d->m_optionalActionMask == optionalActionMask)
return;
d->m_optionalActionMask = optionalActionMask;
emit optionalActionMaskChanged();
}
void TextEditorWidget::addOptionalActions( uint optionalActionMask)
{
setOptionalActions(d->m_optionalActionMask | optionalActionMask);
}
BaseTextEditor::BaseTextEditor()
: d(new BaseTextEditorPrivate)
{
@@ -8734,6 +8741,7 @@ BaseTextEditor *TextEditorFactoryPrivate::createEditorHelper(const TextDocumentP
textEditorWidget->setMarksVisible(m_marksVisible);
textEditorWidget->setParenthesesMatchingEnabled(m_paranthesesMatchinEnabled);
textEditorWidget->setCodeFoldingSupported(m_codeFoldingSupported);
textEditorWidget->setOptionalActions(m_textEditorActionHandler->optionalActions());
BaseTextEditor *editor = m_editorCreator();
editor->setDuplicateSupported(m_duplicatedSupported);