summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-03-21 14:21:33 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-03-21 14:21:33 +0000
commit6e4dd17bb7c17023c12ffb4a5e8bac62fc9d5e7d (patch)
tree0d9b47f006038fcb0f9635af413b2194445cce05 /share
parent988601-changes_2013_03_20a.patch (diff)
parentClarified choice of downsampling routine. (diff)
downloadinkscape-6e4dd17bb7c17023c12ffb4a5e8bac62fc9d5e7d.tar.gz
inkscape-6e4dd17bb7c17023c12ffb4a5e8bac62fc9d5e7d.zip
merge from trunk (r1228)
(bzr r11668.1.63)
Diffstat (limited to 'share')
-rw-r--r--share/keys/default.xml19
-rw-r--r--share/keys/inkscape.xml19
2 files changed, 22 insertions, 16 deletions
diff --git a/share/keys/default.xml b/share/keys/default.xml
index f9a6f0d44..cb1273013 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -664,21 +664,24 @@ override) the bindings in the main default.xml.
<!-- Effects -->
- <bind action="EffectLast" />
- <bind action="EffectLastPref" />
+ <bind key="q" modifiers="Alt" action="EffectLast" display="true" />
+ <bind key="Q" modifiers="Alt" action="EffectLast" />
+ <bind key="q" modifiers="Shift,Alt" action="EffectLastPref" display="true" />
+ <bind key="Q" modifiers="Shift,Alt" action="EffectLastPref" />
+
<!-- You can also assign keys to individual effects. The action should be set to he
effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add
Nodes effect. -->
- <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
- <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
+ <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
+ <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
<!--
- <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
- <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
+ <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
+ <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
-->
- <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
- <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
+ <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
+ <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
</keys>
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index f9a6f0d44..cb1273013 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -664,21 +664,24 @@ override) the bindings in the main default.xml.
<!-- Effects -->
- <bind action="EffectLast" />
- <bind action="EffectLastPref" />
+ <bind key="q" modifiers="Alt" action="EffectLast" display="true" />
+ <bind key="Q" modifiers="Alt" action="EffectLast" />
+ <bind key="q" modifiers="Shift,Alt" action="EffectLastPref" display="true" />
+ <bind key="Q" modifiers="Shift,Alt" action="EffectLastPref" />
+
<!-- You can also assign keys to individual effects. The action should be set to he
effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add
Nodes effect. -->
- <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
- <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
+ <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
+ <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
<!--
- <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
- <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
+ <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
+ <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
-->
- <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
- <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
+ <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
+ <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
</keys>