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

Handle "Diff All Modified Files" action enablement

Browse Source 
Also rename it to "Diff Open Files".

Task-number: QTCREATORBUG-17094
Change-Id: I370c32497fcb56cb2bd84700ef7cb4aa7ba0a573
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jarek Kobus
2016-10-18 13:14:40 +02:00
committed by Jarek Kobus
parent 1414826183
commit 4ae306a5e1
4 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/diffeditor/diffeditorplugin.h
View File

@@ -28,7 +28,6 @@
#include "diffeditor_global.h"
#include <coreplugin/diffservice.h>
#include <texteditor/textdocument.h>
#include <extensionsystem/iplugin.h>
QT_FORWARD_DECLARE_CLASS(QAction)
@@ -58,10 +57,10 @@ public:
void extensionsInitialized();
private slots:
void updateCurrentEditor(Core::IEditor *editor);
void updateActions();
void updateDiffCurrentFileAction();
void updateDiffOpenFilesAction();
void diffCurrentFile();
void diffAllModifiedFiles();
void diffOpenFiles();
void diffExternalFiles();
#ifdef WITH_TESTS
@@ -72,7 +71,7 @@ private slots:
#endif // WITH_TESTS
private:
QAction *m_diffCurrentFileAction;
QPointer<TextEditor::TextDocument> m_currentTextDocument;
QAction *m_diffOpenFilesAction;
};
} // namespace Internal