Commit a694495c authored by Daniel Mensinger's avatar Daniel Mensinger

Merge branch '5.4'

parents 58763db5 4aa54eb0
Pipeline #5852 failed with stage
in 60 minutes
......@@ -149,7 +149,7 @@ void ScratchpadView::setupActions()
connect(action, &QAction::triggered, this, &ScratchpadView::createScratch);
addAction(action);
action = new QAction(QIcon::fromTheme(QStringLiteral("list-remove")), i18n("Remove Scratch"), this);
action = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Remove Scratch"), this);
connect(action, &QAction::triggered, this, [this] {
m_scratchpad->removeScratch(proxyModel()->mapToSource(currentIndex()));
validateItemActions();
......
......@@ -28,7 +28,11 @@
<number>0</number>
</property>
<item>
<widget class="EmptyMessageListView" name="scratchView"/>
<widget class="EmptyMessageListView" name="scratchView">
<property name="editTriggers">
<set>QAbstractItemView::EditKeyPressed</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
......@@ -46,9 +50,6 @@
<header>emptymessagelistview.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scratchTree</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment