Commit 6e51b8a3 authored by Michael Abrahams's avatar Michael Abrahams

Restore show_brush_editor and show_brush_presets shortcuts

parent 61a45c7d
......@@ -185,7 +185,7 @@
<whatsThis></whatsThis>
<toolTip>Show Brush Editor</toolTip>
<iconText>Show Brush Editor</iconText>
<shortcut>i</shortcut>
<shortcut>F5</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
......@@ -195,7 +195,7 @@
<whatsThis></whatsThis>
<toolTip>Show Brush Presets</toolTip>
<iconText>Show Brush Presets</iconText>
<shortcut></shortcut>
<shortcut>F6</shortcut>
<isCheckable>false</isCheckable>
<statusTip></statusTip>
</Action>
......
......@@ -111,10 +111,10 @@ void KisInputManager::Private::EventEater::deactivate()
void KisInputManager::Private::EventEater::eatOneMousePress()
{
#if defined(Q_OS_WIN)
// #if defined(Q_OS_WIN)
// Enable on other platforms if getting full-pressure splotches
peckish = true;
#endif
// #endif
}
bool KisInputManager::Private::ignoringQtCursorEvents()
......
......@@ -308,19 +308,17 @@ KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *
if (!cfg.toolOptionsInDocker()) {
action = new QWidgetAction(this);
KisActionRegistry::instance()->propertizeAction("show_tool_options", action);
// TODO: check how this is serialized, add it to krita.action
view->actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::Key_Backslash));
view->actionCollection()->addAction("show_tool_options", action);
connect(action, SIGNAL(triggered()), m_toolOptionsPopupButton, SLOT(showPopupWidget()));
}
action = new QWidgetAction(this);
KisActionRegistry::instance()->propertizeAction("show_brush_editor", action);
view->actionCollection()->addAction("show_brush_editor", action);
connect(action, SIGNAL(triggered()), m_brushEditorPopupButton, SLOT(showPopupWidget()));
action = new QWidgetAction(this);
KisActionRegistry::instance()->propertizeAction("show_brush_presets", action);
view->actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::Key_F6)); // TODO: check this
view->actionCollection()->addAction("show_brush_presets", action);
connect(action, SIGNAL(triggered()), m_presetSelectorPopupButton, SLOT(showPopupWidget()));
......
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