# HG changeset patch # User Chris Cannam # Date 1300278363 0 # Node ID 293d91cf44deafc5eed1b4a84a041828fae76d6a # Parent b422d1bcfb3c3fb4d7e592c19d97243817b90e85 Double-click on modified files shows diff instead of annotation diff -r b422d1bcfb3c -r 293d91cf44de filestatuswidget.cpp --- a/filestatuswidget.cpp Wed Mar 16 12:18:50 2011 +0000 +++ b/filestatuswidget.cpp Wed Mar 16 12:26:03 2011 +0000 @@ -251,8 +251,21 @@ void FileStatusWidget::itemDoubleClicked(QListWidgetItem *item) { QStringList files; - files << item->text(); - emit annotateFiles(files); + QString file = item->text(); + files << file; + + switch (m_fileStates.stateOf(file)) { + + case FileStates::Modified: + case FileStates::InConflict: + emit diffFiles(files); + break; + + case FileStates::Clean: + case FileStates::Missing: + emit annotateFiles(files); + break; + } } void FileStatusWidget::itemSelectionChanged()