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

VcsBaseEditor: Highlight default actions on context menu

Browse Source 
Change-Id: Idc493658dbc829394bd2898a59ba5686036bc3fe
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-02-28 10:03:11 +02:00
committed by Orgad Shaneh
parent a8c9d394fd
commit a01035fefb
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -255,7 +255,7 @@ private slots:
void slotCopyRevision(); void slotCopyRevision();
private: private:
QAction *createDescribeAction(const QString &change) const; void addDescribeAction(QMenu *menu, const QString &change) const;
QAction *createAnnotateAction(const QString &change, bool previous) const; QAction *createAnnotateAction(const QString &change, bool previous) const;
QAction *createCopyRevisionAction(const QString &change) const; QAction *createCopyRevisionAction(const QString &change) const;
@@ -299,7 +299,7 @@ void ChangeTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType typ
menu->addSeparator(); menu->addSeparator();
menu->addAction(createCopyRevisionAction(m_currentChange)); menu->addAction(createCopyRevisionAction(m_currentChange));
if (currentValid) if (currentValid)
menu->addAction(createDescribeAction(m_currentChange)); addDescribeAction(menu, m_currentChange);
menu->addSeparator(); menu->addSeparator();
if (currentValid) if (currentValid)
menu->addAction(createAnnotateAction(widget->decorateVersion(m_currentChange), false)); menu->addAction(createAnnotateAction(widget->decorateVersion(m_currentChange), false));
@@ -313,7 +313,7 @@ void ChangeTextCursorHandler::fillContextMenu(QMenu *menu, EditorContentType typ
default: // Describe current / Annotate file of current default: // Describe current / Annotate file of current
menu->addSeparator(); menu->addSeparator();
menu->addAction(createCopyRevisionAction(m_currentChange)); menu->addAction(createCopyRevisionAction(m_currentChange));
menu->addAction(createDescribeAction(m_currentChange)); addDescribeAction(menu, m_currentChange);
if (widget->isFileLogAnnotateEnabled()) if (widget->isFileLogAnnotateEnabled())
menu->addAction(createAnnotateAction(m_currentChange, false)); menu->addAction(createAnnotateAction(m_currentChange, false));
break; break;
@@ -336,11 +336,12 @@ void ChangeTextCursorHandler::slotCopyRevision()
QApplication::clipboard()->setText(m_currentChange); QApplication::clipboard()->setText(m_currentChange);
} }
QAction *ChangeTextCursorHandler::createDescribeAction(const QString &change) const void ChangeTextCursorHandler::addDescribeAction(QMenu *menu, const QString &change) const
{ {
auto a = new QAction(VcsBaseEditorWidget::tr("&Describe Change %1").arg(change), nullptr); auto a = new QAction(VcsBaseEditorWidget::tr("&Describe Change %1").arg(change), nullptr);
connect(a, &QAction::triggered, this, &ChangeTextCursorHandler::slotDescribe); connect(a, &QAction::triggered, this, &ChangeTextCursorHandler::slotDescribe);
return a; menu->addAction(a);
menu->setDefaultAction(a);
} }
QAction *ChangeTextCursorHandler::createAnnotateAction(const QString &change, bool previous) const QAction *ChangeTextCursorHandler::createAnnotateAction(const QString &change, bool previous) const