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

Hide reload button for diff editor when there is no reloader

Browse Source 
Refactor code a bit. Now DiffEditorController has a pointer
to DiffEditorReloader.

Change-Id: I224579127f112923bc665cd59717b0c4d833981b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-07-04 13:55:51 +02:00
committed by Jarek Kobus
parent cb7963bc18
commit 91e4271069
8 changed files with 82 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/git/gitclient.cpp
View File

@@ -963,9 +963,9 @@ void GitClient::diff(const QString &workingDirectory,
if (!diffEditorDocument) {
diffEditorDocument = createDiffEditor(documentId, workingDirectory, title);
GitDiffEditorReloader *reloader =
new GitDiffEditorReloader(diffEditorDocument->controller());
reloader->setDiffEditorController(diffEditorDocument->controller());
DiffEditor::DiffEditorController *controller = diffEditorDocument->controller();
GitDiffEditorReloader *reloader = new GitDiffEditorReloader(controller);
controller->setReloader(reloader);
reloader->setWorkingDirectory(workingDirectory);
reloader->setDiffType(diffType);
@@ -991,9 +991,9 @@ void GitClient::diff(const QString &workingDirectory, const QString &fileName)
if (!diffEditorDocument) {
diffEditorDocument = createDiffEditor(documentId, sourceFile, title);
GitDiffEditorReloader *reloader =
new GitDiffEditorReloader(diffEditorDocument->controller());
reloader->setDiffEditorController(diffEditorDocument->controller());
DiffEditor::DiffEditorController *controller = diffEditorDocument->controller();
GitDiffEditorReloader *reloader = new GitDiffEditorReloader(controller);
controller->setReloader(reloader);
reloader->setWorkingDirectory(workingDirectory);
reloader->setDiffType(GitDiffEditorReloader::DiffFile);
@@ -1015,9 +1015,9 @@ void GitClient::diffBranch(const QString &workingDirectory,
if (!diffEditorDocument) {
diffEditorDocument = createDiffEditor(documentId, workingDirectory, title);
GitDiffEditorReloader *reloader =
new GitDiffEditorReloader(diffEditorDocument->controller());
reloader->setDiffEditorController(diffEditorDocument->controller());
DiffEditor::DiffEditorController *controller = diffEditorDocument->controller();
GitDiffEditorReloader *reloader = new GitDiffEditorReloader(controller);
controller->setReloader(reloader);
reloader->setWorkingDirectory(workingDirectory);
reloader->setDiffType(GitDiffEditorReloader::DiffBranch);
@@ -1147,9 +1147,9 @@ void GitClient::show(const QString &source, const QString &id, const QString &na
diffEditorDocument->controller()->setDescriptionEnabled(true);
GitDiffEditorReloader *reloader =
new GitDiffEditorReloader(diffEditorDocument->controller());
reloader->setDiffEditorController(diffEditorDocument->controller());
DiffEditor::DiffEditorController *controller = diffEditorDocument->controller();
GitDiffEditorReloader *reloader = new GitDiffEditorReloader(controller);
controller->setReloader(reloader);
reloader->setWorkingDirectory(workingDirectory);
reloader->setDiffType(GitDiffEditorReloader::DiffShow);