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

TextEditor: Fix default context menu

Browse Source 
Text editor implementations that did not do anything special with
invoking their context menu, including our plain text editor, only had
Qt's default context menu, without Qt Creator's clipboard history and
BOM actions.

Make the default actions in our custom context menu more similar to Qt's
default actions by adding Undo, Redo and Select All, and not hiding
disabled actions, and use that by default in all text editor
implementations.

Change-Id: Idd5fb276dcd652223d96536dacde8110f9eb576f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2018-03-21 14:46:14 +01:00
parent deec3fc642
commit 5e6305f346
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3001,6 +3001,11 @@ bool TextEditorWidget::event(QEvent *e)
return QPlainTextEdit::event(e);
}
void TextEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{
showDefaultContextMenu(e, Id());
}
void TextEditorWidget::inputMethodEvent(QInputMethodEvent *e)
{
if (e->commitString().isEmpty() && e->preeditString().isEmpty() && e->attributes().isEmpty()) {
@@ -5662,7 +5667,8 @@ static void appendMenuActionsFromContext(QMenu *menu, Id menuContextId)
void TextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, Id menuContextId)
{
QMenu menu;
appendMenuActionsFromContext(&menu, menuContextId);
if (menuContextId.isValid())
appendMenuActionsFromContext(&menu, menuContextId);
appendStandardContextMenuActions(&menu);
menu.exec(e->globalPos());
}
@@ -7756,24 +7762,26 @@ void TextEditorWidget::setupFallBackEditor(Id id)
void TextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
{
menu->addSeparator();
const auto add = [menu](const Id &id) {
QAction *a = ActionManager::command(id)->action();
if (a)
menu->addAction(a);
};
QAction *a = ActionManager::command(Core::Constants::CUT)->action();
if (a && a->isEnabled())
menu->addAction(a);
a = ActionManager::command(Core::Constants::COPY)->action();
if (a && a->isEnabled())
menu->addAction(a);
a = ActionManager::command(Core::Constants::PASTE)->action();
if (a && a->isEnabled())
menu->addAction(a);
a = ActionManager::command(Constants::CIRCULAR_PASTE)->action();
if (a && a->isEnabled())
menu->addAction(a);
add(Core::Constants::UNDO);
add(Core::Constants::REDO);
menu->addSeparator();
add(Core::Constants::CUT);
add(Core::Constants::COPY);
add(Core::Constants::PASTE);
add(Constants::CIRCULAR_PASTE);
menu->addSeparator();
add(Core::Constants::SELECTALL);
TextDocument *doc = textDocument();
if (doc->codec()->name() == QByteArray("UTF-8") && doc->supportsUtf8Bom()) {
a = ActionManager::command(Constants::SWITCH_UTF8BOM)->action();
if (a && a->isEnabled()) {
QAction *a = ActionManager::command(Constants::SWITCH_UTF8BOM)->action();
if (a) {
a->setText(doc->format().hasUtf8Bom ? tr("Delete UTF-8 BOM on Save")
: tr("Add UTF-8 BOM on Save"));
menu->addSeparator();