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

DiffEditor: Show tooltips with filenames

Browse Source 
Change-Id: I32af3b310deb4c96bf1dc798392029cc361ced97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
jkobus
2013-06-18 14:09:54 +02:00
committed by Jarek Kobus
parent f5a2c1469a
commit b5be527eb9
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/diffeditor/diffeditorwidget.cpp
View File

@@ -48,6 +48,9 @@
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
#include <utils/tooltip/tipcontents.h>
#include <utils/tooltip/tooltip.h>
static const int BASE_LEVEL = 0; static const int BASE_LEVEL = 0;
static const int FILE_LEVEL = 1; static const int FILE_LEVEL = 1;
static const int CHUNK_LEVEL = 2; static const int CHUNK_LEVEL = 2;
@@ -102,10 +105,19 @@ class DiffViewEditorEditable : public BaseTextEditor
{ {
Q_OBJECT Q_OBJECT
public: public:
DiffViewEditorEditable(BaseTextEditorWidget *editorWidget) : BaseTextEditor(editorWidget) {} DiffViewEditorEditable(BaseTextEditorWidget *editorWidget)
: BaseTextEditor(editorWidget)
{
connect(this, SIGNAL(tooltipRequested(TextEditor::ITextEditor*,QPoint,int)),
this, SLOT(slotTooltipRequested(TextEditor::ITextEditor*,QPoint, int)));
}
Core::Id id() const { return "DiffViewEditor"; } Core::Id id() const { return "DiffViewEditor"; }
bool isTemporary() const { return false; } bool isTemporary() const { return false; }
private slots:
void slotTooltipRequested(TextEditor::ITextEditor *editor, const QPoint &globalPoint, int position);
}; };
@@ -125,6 +137,7 @@ public:
} }
QMap<int, int> skippedLines() const { return m_skippedLines; } QMap<int, int> skippedLines() const { return m_skippedLines; }
QMap<int, DiffEditorWidget::DiffFileInfo> fileInfo() const { return m_fileInfo; }
void setWorkingDirectory(const QString &workingDirectory) { m_workingDirectory = workingDirectory; } void setWorkingDirectory(const QString &workingDirectory) { m_workingDirectory = workingDirectory; }
void setLineNumber(int blockNumber, int lineNumber); void setLineNumber(int blockNumber, int lineNumber);
@@ -182,6 +195,24 @@ private:
QColor m_textForeground; QColor m_textForeground;
}; };
void DiffViewEditorEditable::slotTooltipRequested(TextEditor::ITextEditor *editor, const QPoint &globalPoint, int position)
{
DiffViewEditorWidget *ew = qobject_cast<DiffViewEditorWidget *>(editorWidget());
if (!ew)
return;
QMap<int, DiffEditorWidget::DiffFileInfo> fi = ew->fileInfo();
QMap<int, DiffEditorWidget::DiffFileInfo>::const_iterator it
= fi.constFind(ew->document()->findBlock(position).blockNumber());
if (it != fi.constEnd()) {
Utils::ToolTip::instance()->show(globalPoint,
Utils::TextContent(it.value().fileName),
editor->widget());
} else {
Utils::ToolTip::instance()->hide();
}
}
DiffViewEditorWidget::DiffViewEditorWidget(QWidget *parent) DiffViewEditorWidget::DiffViewEditorWidget(QWidget *parent)
: SnippetEditorWidget(parent), m_lineNumberDigits(1), m_inPaintEvent(false) : SnippetEditorWidget(parent), m_lineNumberDigits(1), m_inPaintEvent(false)
{ {