summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-10-14 09:29:29 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-10-14 09:29:29 +0000
commit743147bd08d975c665c59005010bac146533756e (patch)
treec65806c65a2cd4709bfbf1b2b186e7f1cc839202
parentDon't try to set infinite bounds on SpinButtons in LPE Scalar (diff)
downloadinkscape-743147bd08d975c665c59005010bac146533756e.tar.gz
inkscape-743147bd08d975c665c59005010bac146533756e.zip
keys: merge duplicate entries
(bzr r11795)
-rw-r--r--share/keys/default.xml7
-rw-r--r--share/keys/inkscape.xml7
2 files changed, 6 insertions, 8 deletions
diff --git a/share/keys/default.xml b/share/keys/default.xml
index 619db8cdb..dfc1d7687 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -269,7 +269,9 @@ override) the bindings in the main default.xml.
<bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
<bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
- <bind action="TogglePalette" />
+ <bind key="p" modifiers="Shift,Alt" action="TogglePalette" display="true" />
+ <bind key="P" modifiers="Shift,Alt" action="TogglePalette" />
+
<bind action="ToggleStatusbar" />
<bind action="ViewNew" />
@@ -676,7 +678,4 @@ override) the bindings in the main default.xml.
<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="p" modifiers="Shift,Alt" action="TogglePalette" display="true" />
- <bind key="P" modifiers="Shift,Alt" action="TogglePalette" />
-
</keys>
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index 619db8cdb..dfc1d7687 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -269,7 +269,9 @@ override) the bindings in the main default.xml.
<bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
<bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
- <bind action="TogglePalette" />
+ <bind key="p" modifiers="Shift,Alt" action="TogglePalette" display="true" />
+ <bind key="P" modifiers="Shift,Alt" action="TogglePalette" />
+
<bind action="ToggleStatusbar" />
<bind action="ViewNew" />
@@ -676,7 +678,4 @@ override) the bindings in the main default.xml.
<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="p" modifiers="Shift,Alt" action="TogglePalette" display="true" />
- <bind key="P" modifiers="Shift,Alt" action="TogglePalette" />
-
</keys>