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

Add a DiffShowEditor showing an additional info

Browse Source 
Task-number: QTCREATORBUG-9489

Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
jkobus
2013-06-17 13:55:31 +02:00
committed by Jarek Kobus
parent a304fb45fc
commit f5a2c1469a
17 changed files with 613 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/diffeditor/diffeditor.h
View File

@@ -27,8 +27,8 @@
**
****************************************************************************/
#ifndef DIFFEDITOREDITABLE_H
#define DIFFEDITOREDITABLE_H
#ifndef DIFFEDITOR_H
#define DIFFEDITOR_H
#include "diffeditor_global.h"
#include "diffeditorwidget.h"
@@ -77,16 +77,18 @@ public slots:
private slots:
void entryActivated(int index);
protected:
QToolBar *m_toolWidget;
private:
void updateEntryToolTip();
Internal::DiffEditorFile *m_file;
DiffEditorWidget *m_editorWidget;
QToolBar *m_toolWidget;
QComboBox *m_entriesComboBox;
mutable QString m_displayName;
};
} // namespace DiffEditor
#endif // DIFFEDITOREDITABLE_H
#endif // DIFFEDITOR_H