diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 7ff630baa4c..58b86931999 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -99,7 +99,7 @@ void GitSubmitEditorWidget::initialize(CommitType commitType, logChangeGroupBox->setLayout(logChangeLayout); m_logChangeWidget = new LogChangeWidget; m_logChangeWidget->init(repository); - connect(m_logChangeWidget, SIGNAL(doubleClicked(QString)), this, SIGNAL(show(QString))); + connect(m_logChangeWidget, SIGNAL(activated(QString)), this, SIGNAL(show(QString))); logChangeLayout->addWidget(m_logChangeWidget); insertTopWidget(logChangeGroupBox); m_gitSubmitPanelUi.editGroup->hide(); diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index f2360aee1e5..ffc4ac51bf8 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -59,7 +59,7 @@ enum Columns }; LogChangeWidget::LogChangeWidget(QWidget *parent) - : QTreeView(parent) + : Utils::TreeView(parent) , m_model(new QStandardItemModel(0, ColumnCount, this)) , m_hasCustomDelegate(false) { @@ -71,7 +71,8 @@ LogChangeWidget::LogChangeWidget(QWidget *parent) setUniformRowHeights(true); setRootIsDecorated(false); setSelectionBehavior(QAbstractItemView::SelectRows); - connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(emitDoubleClicked(QModelIndex))); + setActivationMode(Utils::DoubleClickActivation); + connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(emitActivated(QModelIndex))); } bool LogChangeWidget::init(const QString &repository, const QString &commit, LogFlags flags) @@ -114,23 +115,23 @@ QString LogChangeWidget::earliestCommit() const void LogChangeWidget::setItemDelegate(QAbstractItemDelegate *delegate) { - QTreeView::setItemDelegate(delegate); + Utils::TreeView::setItemDelegate(delegate); m_hasCustomDelegate = true; } -void LogChangeWidget::emitDoubleClicked(const QModelIndex &index) +void LogChangeWidget::emitActivated(const QModelIndex &index) { if (index.isValid()) { QString commit = index.sibling(index.row(), Sha1Column).data().toString(); if (!commit.isEmpty()) - emit doubleClicked(commit); + emit activated(commit); } } void LogChangeWidget::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { - QTreeView::selectionChanged(selected, deselected); + Utils::TreeView::selectionChanged(selected, deselected); if (!m_hasCustomDelegate) return; const QModelIndexList previousIndexes = deselected.indexes(); diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h index c1fe042d0e1..d689c1dc65b 100644 --- a/src/plugins/git/logchangedialog.h +++ b/src/plugins/git/logchangedialog.h @@ -30,10 +30,11 @@ #ifndef LOGCHANGEDDIALOG_H #define LOGCHANGEDDIALOG_H +#include + #include #include #include -#include QT_BEGIN_NAMESPACE class QDialogButtonBox; @@ -48,7 +49,7 @@ namespace Internal { // A widget that lists SHA1 and subject of the changes // Used for reset and interactive rebase -class LogChangeWidget : public QTreeView +class LogChangeWidget : public Utils::TreeView { Q_OBJECT @@ -70,10 +71,10 @@ public: void setItemDelegate(QAbstractItemDelegate *delegate); signals: - void doubleClicked(const QString &commit); + void activated(const QString &commit); private slots: - void emitDoubleClicked(const QModelIndex &index); + void emitActivated(const QModelIndex &index); private: void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);