summaryrefslogtreecommitdiff
path: root/src/plugins/git
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-04-09 16:10:14 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-04-14 12:08:16 +0200
commitc17ddb77660622920db7d5bbf645718dbfb40d18 (patch)
tree225903f6cbc9949a9b6c6487111b63a43199be6f /src/plugins/git
parent04c9809e9fae5f777dd9363eb0dfd33f1429c034 (diff)
downloadqt-creator-c17ddb77660622920db7d5bbf645718dbfb40d18.tar.gz
Git: Fix keyboard activation in StashView
Change-Id: I8ad4991b17e2cf60e73278db13c0ac403e35807c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/git')
-rw-r--r--src/plugins/git/stashdialog.cpp3
-rw-r--r--src/plugins/git/stashdialog.ui7
2 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index f0df45edf6..89aed1dbe2 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -133,6 +133,7 @@ StashDialog::StashDialog(QWidget *parent) :
m_proxyModel->setSourceModel(m_model);
m_proxyModel->setFilterKeyColumn(-1);
m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+ ui->stashView->setActivationMode(Utils::DoubleClickActivation);
ui->stashView->setModel(m_proxyModel);
ui->stashView->setSelectionMode(QAbstractItemView::ExtendedSelection);
ui->stashView->setAllColumnsShowFocus(true);
@@ -142,7 +143,7 @@ StashDialog::StashDialog(QWidget *parent) :
this, SLOT(enableButtons()));
connect(ui->stashView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(enableButtons()));
- connect(ui->stashView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(showCurrent()));
+ connect(ui->stashView, SIGNAL(activated(QModelIndex)), this, SLOT(showCurrent()));
ui->stashView->setFocus();
}
diff --git a/src/plugins/git/stashdialog.ui b/src/plugins/git/stashdialog.ui
index cbece9c6c6..3416e39ddf 100644
--- a/src/plugins/git/stashdialog.ui
+++ b/src/plugins/git/stashdialog.ui
@@ -27,7 +27,7 @@
<widget class="Utils::FancyLineEdit" name="filterLineEdit"/>
</item>
<item>
- <widget class="QTreeView" name="stashView"/>
+ <widget class="Utils::TreeView" name="stashView"/>
</item>
</layout>
</item>
@@ -49,6 +49,11 @@
<extends>QLineEdit</extends>
<header location="global">utils/fancylineedit.h</header>
</customwidget>
+ <customwidget>
+ <class>Utils::TreeView</class>
+ <extends>QTreeView</extends>
+ <header location="global">utils/itemviews.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections>