ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Added Copy action to code view context menu

Browse Source
This commit is contained in:
Eberhard Graether
2018-10-20 00:09:57 +02:00
parent 1e7a694c80
commit ab6cf631f4
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtCodeArea.cpp
+22 -9
View File
@@ -101,6 +101,7 @@ QtCodeArea::QtCodeArea(
connect(this, &QtCodeArea::blockCountChanged, this, &QtCodeArea::updateLineNumberAreaWidth);
connect(this, &QtCodeArea::updateRequest, this, &QtCodeArea::updateLineNumberArea);
connect(this, &QtCodeArea::copyAvailable, this, &QtCodeArea::setCopyAvailable);
// MouseWheelOverScrollbarFilter is deleted by parent.
horizontalScrollBar()->installEventFilter(new MouseWheelOverScrollbarFilter());
@@ -593,10 +594,10 @@ void QtCodeArea::resizeEvent(QResizeEvent *e)
void QtCodeArea::mousePressEvent(QMouseEvent* event)
{
clearSelection();
if (event->button() == Qt::LeftButton)
{
clearSelection();
m_oldMousePosition = event->pos();
m_panningDistance = 0;
@@ -735,6 +736,7 @@ void QtCodeArea::contextMenuEvent(QContextMenuEvent* event)
menu.addSeparator();
menu.addFileActions(getSourceLocationFile()->getFilePath());
menu.addSeparator();
menu.addAction(m_copyAction);
menu.addAction(m_setIDECursorPositionAction);
menu.show();
}
@@ -784,6 +786,18 @@ void QtCodeArea::updateLineNumberArea(const QRect &rect, int dy)
}
}
void QtCodeArea::setIDECursorPosition()
{
std::pair<int, int> lineColumn = toLineColumn(this->cursorForPosition(m_eventPosition).position());
MessageMoveIDECursor(getSourceLocationFile()->getFilePath(), lineColumn.first, lineColumn.second).dispatch();
}
void QtCodeArea::setCopyAvailable(bool yes)
{
m_copyAction->setEnabled(yes);
}
void QtCodeArea::clearSelection()
{
QTextCursor cursor = textCursor();
@@ -803,13 +817,6 @@ void QtCodeArea::setNewTextCursor(const QTextCursor& cursor)
verticalScrollBar()->setValue(verticalValue);
}
void QtCodeArea::setIDECursorPosition()
{
std::pair<int, int> lineColumn = toLineColumn(this->cursorForPosition(m_eventPosition).position());
MessageMoveIDECursor(getSourceLocationFile()->getFilePath(), lineColumn.first, lineColumn.second).dispatch();
}
void QtCodeArea::activateErrors(const std::vector<const Annotation*>& annotations)
{
std::vector<Id> errorIds;
@@ -851,6 +858,12 @@ void QtCodeArea::annotateText()
void QtCodeArea::createActions()
{
m_copyAction = new QAction(tr("Copy Selection"), this);
m_copyAction->setStatusTip(tr("Copy selection to clipboard"));
m_copyAction->setToolTip(tr("Copy selection to clipboard"));
m_copyAction->setEnabled(false);
connect(m_copyAction, &QAction::triggered, this, &QPlainTextEdit::copy);
m_setIDECursorPositionAction = new QAction(tr("Show in IDE (Ctrl + Left Click)"), this);
#if defined(Q_OS_MAC)
m_setIDECursorPositionAction->setText(tr("Show in IDE (Cmd + Left Click)"));
src/lib_gui/qt/element/QtCodeArea.h
+5 -2
View File
@@ -107,11 +107,13 @@ protected:
private slots:
void updateLineNumberAreaWidth(int newBlockCount = 0);
void updateLineNumberArea(const QRect&, int);
void clearSelection();
void setNewTextCursor(const QTextCursor& cursor);
void setIDECursorPosition();
void setCopyAvailable(bool yes);
private:
void clearSelection();
void setNewTextCursor(const QTextCursor& cursor);
void activateErrors(const std::vector<const Annotation*>& annotations);
void annotateText();
@@ -128,6 +130,7 @@ private:
QPoint m_oldMousePosition;
int m_panningDistance;
QAction* m_copyAction;
QAction* m_setIDECursorPositionAction;
QPoint m_eventPosition; // is needed for IDE cursor control via context menu
// the position where the context menu is opened needs to be stored]