aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffeditor.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2017-05-09 12:19:11 +0200
committerEike Ziller <eike.ziller@qt.io>2017-05-18 08:24:26 +0000
commitee722a047cfd4bee213343087519a0380f5227e8 (patch)
tree3a717ac05c5a0a009b3b659b7597754bbb6757e4 /src/plugins/diffeditor/diffeditor.h
parentfd7edcb8263059d828873e5ed675fa2e43dfdf01 (diff)
DiffEditor: Fix editor actions
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>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r--src/plugins/diffeditor/diffeditor.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 57541d009e..0777aed00e 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -47,6 +47,8 @@ namespace Internal {
class DescriptionEditorWidget;
class DiffEditorDocument;
class IDiffView;
+class UnifiedView;
+class SideBySideView;
class DiffEditor : public Core::IEditor
{
@@ -59,6 +61,10 @@ public:
Core::IEditor *duplicate() override;
Core::IDocument *document() override;
QWidget *toolBar() override;
+ TextEditor::TextEditorWidget *descriptionWidget() const;
+ TextEditor::TextEditorWidget *unifiedEditorWidget() const;
+ TextEditor::TextEditorWidget *leftEditorWidget() const;
+ TextEditor::TextEditorWidget *rightEditorWidget() const;
private:
DiffEditor();
@@ -89,6 +95,8 @@ private:
QSharedPointer<DiffEditorDocument> m_document;
DescriptionEditorWidget *m_descriptionWidget;
+ UnifiedView *m_unifiedView;
+ SideBySideView *m_sideBySideView;
QStackedWidget *m_stackedWidget;
QVector<IDiffView *> m_views;
QToolBar *m_toolBar;