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

Editor: add update optional actions function to action handler

Browse Source 
Change-Id: I342fc53aaa845c6fa2933ea19a0a36a6dc8e6338
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-06-15 10:14:35 +02:00
parent 699d89290e
commit bdc8411af5
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/texteditor/texteditoractionhandler.cpp
View File

@@ -114,6 +114,7 @@ public:
void createActions(); void createActions();
void updateActions(); void updateActions();
void updateOptionalActions();
void updateRedoAction(bool on); void updateRedoAction(bool on);
void updateUndoAction(bool on); void updateUndoAction(bool on);
void updateCopyAction(bool on); void updateCopyAction(bool on);
@@ -517,13 +518,7 @@ void TextEditorActionHandlerPrivate::createActions()
m_modifyingActions << m_upperCaseSelectionAction; m_modifyingActions << m_upperCaseSelectionAction;
m_modifyingActions << m_sortSelectedLinesAction; m_modifyingActions << m_sortSelectedLinesAction;
// set enabled state of optional actions updateOptionalActions();
m_followSymbolAction->setEnabled(m_optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
m_followSymbolInNextSplitAction->setEnabled(m_optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
m_jumpToFileAction->setEnabled(m_optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
m_jumpToFileInNextSplitAction->setEnabled(m_optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
m_unfoldAllAction->setEnabled(m_optionalActions & TextEditorActionHandler::UnCollapseAll);
m_renameSymbolAction->setEnabled(m_optionalActions & TextEditorActionHandler::RenameSymbol);
} }
void TextEditorActionHandlerPrivate::updateActions() void TextEditorActionHandlerPrivate::updateActions()
@@ -531,8 +526,6 @@ void TextEditorActionHandlerPrivate::updateActions()
bool isWritable = m_currentEditorWidget && !m_currentEditorWidget->isReadOnly(); bool isWritable = m_currentEditorWidget && !m_currentEditorWidget->isReadOnly();
foreach (QAction *a, m_modifyingActions) foreach (QAction *a, m_modifyingActions)
a->setEnabled(isWritable); a->setEnabled(isWritable);
m_autoIndentAction->setEnabled((m_optionalActions & TextEditorActionHandler::Format) && isWritable);
m_autoFormatAction->setEnabled((m_optionalActions & TextEditorActionHandler::Format) && isWritable);
m_unCommentSelectionAction->setEnabled((m_optionalActions & TextEditorActionHandler::UnCommentSelection) && isWritable); m_unCommentSelectionAction->setEnabled((m_optionalActions & TextEditorActionHandler::UnCommentSelection) && isWritable);
m_visualizeWhitespaceAction->setEnabled(m_currentEditorWidget); m_visualizeWhitespaceAction->setEnabled(m_currentEditorWidget);
m_textWrappingAction->setEnabled(m_currentEditorWidget); m_textWrappingAction->setEnabled(m_currentEditorWidget);
@@ -545,6 +538,28 @@ void TextEditorActionHandlerPrivate::updateActions()
updateRedoAction(m_currentEditorWidget && m_currentEditorWidget->document()->isRedoAvailable()); updateRedoAction(m_currentEditorWidget && m_currentEditorWidget->document()->isRedoAvailable());
updateUndoAction(m_currentEditorWidget && m_currentEditorWidget->document()->isUndoAvailable()); updateUndoAction(m_currentEditorWidget && m_currentEditorWidget->document()->isUndoAvailable());
updateCopyAction(m_currentEditorWidget && m_currentEditorWidget->textCursor().hasSelection()); updateCopyAction(m_currentEditorWidget && m_currentEditorWidget->textCursor().hasSelection());
updateOptionalActions();
}
void TextEditorActionHandlerPrivate::updateOptionalActions()
{
m_followSymbolAction->setEnabled(
m_optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
m_followSymbolInNextSplitAction->setEnabled(
m_optionalActions & TextEditorActionHandler::FollowSymbolUnderCursor);
m_jumpToFileAction->setEnabled(
m_optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
m_jumpToFileInNextSplitAction->setEnabled(
m_optionalActions & TextEditorActionHandler::JumpToFileUnderCursor);
m_unfoldAllAction->setEnabled(
m_optionalActions & TextEditorActionHandler::UnCollapseAll);
m_renameSymbolAction->setEnabled(
m_optionalActions & TextEditorActionHandler::RenameSymbol);
bool formatEnabled = (m_optionalActions & TextEditorActionHandler::Format)
&& m_currentEditorWidget && !m_currentEditorWidget->isReadOnly();
m_autoIndentAction->setEnabled(formatEnabled);
m_autoFormatAction->setEnabled(formatEnabled);
} }
void TextEditorActionHandlerPrivate::updateRedoAction(bool on) void TextEditorActionHandlerPrivate::updateRedoAction(bool on)