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

Unified contextMenuEvent implementations of editor widgets.

Browse Source 
Change-Id: Ie5dbde8d0443a65a8e96853002c8bdafd2c0d729
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Konstantin Tokarev
2012-07-24 23:30:32 +04:00
committed by Eike Ziller
parent 95c5ab2746
commit b0da247604
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cmakeprojectmanager/cmakeeditor.cpp
View File

@@ -142,18 +142,7 @@ void CMakeEditorWidget::unCommentSelection()
void CMakeEditorWidget::contextMenuEvent(QContextMenuEvent *e) void CMakeEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{ {
QMenu *menu = new QMenu(); showDefaultContextMenu(e, Constants::M_CONTEXT);
Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(Constants::M_CONTEXT);
QMenu *contextMenu = mcontext->menu();
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
appendStandardContextMenuActions(menu);
menu->exec(e->globalPos());
delete menu;
} }
void CMakeEditorWidget::setFontSettings(const TextEditor::FontSettings &fs) void CMakeEditorWidget::setFontSettings(const TextEditor::FontSettings &fs)

14
src/plugins/qt4projectmanager/profileeditor.cpp
View File

@@ -196,19 +196,7 @@ TextEditor::BaseTextEditor *ProFileEditorWidget::createEditor()
void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e) void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e)
{ {
QMenu *menu = new QMenu(); showDefaultContextMenu(e, Constants::M_CONTEXT);
Core::ActionContainer *mcontext =
Core::ActionManager::actionContainer(Qt4ProjectManager::Constants::M_CONTEXT);
QMenu *contextMenu = mcontext->menu();
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
appendStandardContextMenuActions(menu);
menu->exec(e->globalPos());
delete menu;
} }
void ProFileEditorWidget::setFontSettings(const TextEditor::FontSettings &fs) void ProFileEditorWidget::setFontSettings(const TextEditor::FontSettings &fs)

17
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -4327,6 +4327,14 @@ void BaseTextEditorWidget::dragEnterEvent(QDragEnterEvent *e)
QPlainTextEdit::dragEnterEvent(e); QPlainTextEdit::dragEnterEvent(e);
} }
void BaseTextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, const Core::Id menuContextId)
{
QMenu menu;
appendMenuActionsFromContext(&menu, menuContextId);
appendStandardContextMenuActions(&menu);
menu.exec(e->globalPos());
}
void BaseTextEditorWidget::extraAreaLeaveEvent(QEvent *) void BaseTextEditorWidget::extraAreaLeaveEvent(QEvent *)
{ {
// fake missing mouse move event from Qt // fake missing mouse move event from Qt
@@ -6059,6 +6067,15 @@ QMimeData *BaseTextEditorWidget::duplicateMimeData(const QMimeData *source) cons
return mimeData; return mimeData;
} }
void BaseTextEditorWidget::appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContextId)
{
Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(menuContextId);
QMenu *contextMenu = mcontext->menu();
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
}
void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu) void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
{ {
menu->addSeparator(); menu->addSeparator();

4
src/plugins/texteditor/basetexteditor.h
View File

@@ -166,7 +166,7 @@ public:
QString mimeType() const; QString mimeType() const;
virtual void setMimeType(const QString &mt); virtual void setMimeType(const QString &mt);
void appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContextId);
void appendStandardContextMenuActions(QMenu *menu); void appendStandardContextMenuActions(QMenu *menu);
// Works only in conjunction with a syntax highlighter that puts // Works only in conjunction with a syntax highlighter that puts
@@ -469,6 +469,8 @@ protected:
void dragEnterEvent(QDragEnterEvent *e); void dragEnterEvent(QDragEnterEvent *e);
void showDefaultContextMenu(QContextMenuEvent *e, const Core::Id menuContextId);
public: public:
void indentInsertedText(const QTextCursor &tc); void indentInsertedText(const QTextCursor &tc);
void indent(QTextDocument *doc, const QTextCursor &cursor, QChar typedChar); void indent(QTextDocument *doc, const QTextCursor &cursor, QChar typedChar);