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

DiffEditor: Fix editor actions

Browse Source 
The text editor widgets all need a TextEditorActionHandler that takes
care of the editor actions for them.
Each text editor needs its own context, so the editor with focus
receives the actions. This does not happen automatically for these text
editors, since the diff editor manages these itself.

Task-number: QTCREATORBUG-9445
Change-Id: Ib42f095ec23550e401e8ee9b36f3f49517a22877
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2017-05-09 12:19:11 +02:00
parent fd7edcb826
commit ee722a047c
10 changed files with 158 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -74,6 +74,8 @@ class DescriptionEditorWidget : public TextEditorWidget
Q_OBJECT
public:
DescriptionEditorWidget(QWidget *parent = 0);
~DescriptionEditorWidget();
virtual QSize sizeHint() const override;
signals:
@@ -92,6 +94,7 @@ protected:
private:
QTextCursor m_currentCursor;
Core::IContext *m_context;
};
DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
@@ -112,6 +115,16 @@ DescriptionEditorWidget::DescriptionEditorWidget(QWidget *parent)
setFrameStyle(QFrame::NoFrame);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_context = new Core::IContext(this);
m_context->setWidget(this);
m_context->setContext(Core::Context(Constants::C_DIFF_EDITOR_DESCRIPTION));
Core::ICore::addContextObject(m_context);
}
DescriptionEditorWidget::~DescriptionEditorWidget()
{
Core::ICore::removeContextObject(m_context);
}
QSize DescriptionEditorWidget::sizeHint() const
@@ -226,8 +239,11 @@ DiffEditor::DiffEditor()
m_stackedWidget = new QStackedWidget(splitter);
splitter->addWidget(m_stackedWidget);
addView(new SideBySideView);
addView(new UnifiedView);
m_unifiedView = new UnifiedView;
m_sideBySideView = new SideBySideView;
addView(m_sideBySideView);
addView(m_unifiedView);
setWidget(splitter);
@@ -351,6 +367,26 @@ QWidget *DiffEditor::toolBar()
return m_toolBar;
}
TextEditorWidget *DiffEditor::descriptionWidget() const
{
return m_descriptionWidget;
}
TextEditorWidget *DiffEditor::unifiedEditorWidget() const
{
return m_unifiedView->textEditorWidget();
}
TextEditorWidget *DiffEditor::leftEditorWidget() const
{
return m_sideBySideView->leftEditorWidget();
}
TextEditorWidget *DiffEditor::rightEditorWidget() const
{
return m_sideBySideView->rightEditorWidget();
}
void DiffEditor::documentHasChanged()
{
Utils::GuardLocker guard(m_ignoreChanges);