share/keyboards -> share/keys; first shot at configurable keymaps

diff --git a/ChangeLog b/ChangeLog
index c604ebde817829942e28d76a680ed6c71f57ec78..f57923f4f4381b61132ab2b52de2d264675094d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-04-05  MenTaLguY  <mental@rydia.net>
+
+       * configure.ac, share/keyboards/.cvsignore, share/keyboards/Makefile.am,
+         share/keyboards/README, share/keys/.cvsignore, share/keys/Makefile.am,
+         share/keys/Makefile.in, share/Makefile.am:
+
+         share/keyboards -> share/keys
+
+       * share/keys/Makefile.am, share/keys/default.xml, src/Makefile_insert,
+         src/shortcuts.cpp, src/shortcuts-default-xml.cpp:
+
+      first shot at configurable keymaps
+
 2006-04-05  MenTaLguY  <mental@rydia.net>
 
        * src/io/Makefile_insert, src/io/resource.cpp, src/io/resource.h:

diff --git a/configure.ac b/configure.ac
index 7a58025091261d079fbbbf8a4116206f0c8d3dd7..2160021ce26cfa3bb9b3e406a7fa2456272ba165 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -818,7 +818,7 @@ share/extensions/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile
-share/keyboards/Makefile
+share/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile
 share/patterns/Makefile

diff --git a/share/Makefile.am b/share/Makefile.am
index c77be8161cb71b3e291c1a7ac186e79aafcfdf49..f8f1dd53be98f720342dfe27c0253cff1418a1f7 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = clipart \
           fonts \
           gradients \
           icons \
-          keyboards \
+          keys \
           markers \
           palettes \
           patterns \

diff --git a/share/keyboards/.cvsignore b/share/keyboards/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
--- a/share/keyboards/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

diff --git a/share/keyboards/Makefile.am b/share/keyboards/Makefile.am
deleted file mode 100644 (file)
index bd4a760..0000000
--- a/share/keyboards/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-keyboardsdir = $(datadir)/inkscape/keyboards
-
-keyboards_DATA = \
-       README
-
-EXTRA_DIST = $(keyboards_DATA)

diff --git a/share/keyboards/README b/share/keyboards/README
deleted file mode 100644 (file)
index 0dd74cf..0000000
--- a/share/keyboards/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This new folder is part of the Inkscape 0.38 directory reorganization. Please place the appropriate files into this folder.
-
-Thank You!
-
-Inkscape Developers

diff --git a/share/keys/.cvsignore b/share/keys/.cvsignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/share/keys/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/share/keys/Makefile.am b/share/keys/Makefile.am
new file mode 100644 (file)
index 0000000..1c59555
--- /dev/null
+++ b/share/keys/Makefile.am
@@ -0,0 +1,7 @@
+
+keysdir = $(datadir)/inkscape/keys
+
+keys_DATA = default.xml
+
+EXTRA_DIST = $(keys_DATA)
+

diff --git a/share/keys/Makefile.in b/share/keys/Makefile.in
new file mode 100644 (file)
index 0000000..293ca47
--- /dev/null
+++ b/share/keys/Makefile.in
@@ -0,0 +1,397 @@
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
+GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
+GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
+GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
+INKJAR_FALSE = @INKJAR_FALSE@
+INKJAR_TRUE = @INKJAR_TRUE@
+INKSCAPE_CFLAGS = @INKSCAPE_CFLAGS@
+INKSCAPE_DATADIR = @INKSCAPE_DATADIR@
+INKSCAPE_LIBDIR = @INKSCAPE_LIBDIR@
+INKSCAPE_LIBS = @INKSCAPE_LIBS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBLOUDMOUTH_CFLAGS = @LIBLOUDMOUTH_CFLAGS@
+LIBLOUDMOUTH_LIBS = @LIBLOUDMOUTH_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_LOCALE_DIR = @PACKAGE_LOCALE_DIR@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@
+PANGOFT2_LIBS = @PANGOFT2_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL_CFLAGS = @PERL_CFLAGS@
+PERL_LIBS = @PERL_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+POW_LIB = @POW_LIB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PYTHON_CFLAGS = @PYTHON_CFLAGS@
+PYTHON_LIBS = @PYTHON_LIBS@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_GNOME_PRINT_FALSE = @USE_GNOME_PRINT_FALSE@
+USE_GNOME_PRINT_TRUE = @USE_GNOME_PRINT_TRUE@
+USE_GNOME_VFS_FALSE = @USE_GNOME_VFS_FALSE@
+USE_GNOME_VFS_TRUE = @USE_GNOME_VFS_TRUE@
+USE_LCMS_FALSE = @USE_LCMS_FALSE@
+USE_LCMS_TRUE = @USE_LCMS_TRUE@
+USE_MMX_FALSE = @USE_MMX_FALSE@
+USE_MMX_TRUE = @USE_MMX_TRUE@
+USE_NLS = @USE_NLS@
+USE_XFT_FALSE = @USE_XFT_FALSE@
+USE_XFT_TRUE = @USE_XFT_TRUE@
+VERSION = @VERSION@
+WITH_INKBOARD_FALSE = @WITH_INKBOARD_FALSE@
+WITH_INKBOARD_TRUE = @WITH_INKBOARD_TRUE@
+WITH_PERL_FALSE = @WITH_PERL_FALSE@
+WITH_PERL_TRUE = @WITH_PERL_TRUE@
+WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
+WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
+XFT_CFLAGS = @XFT_CFLAGS@
+XFT_LIBS = @XFT_LIBS@
+XGETTEXT = @XGETTEXT@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+
+keysdir = $(datadir)/inkscape/keys
+
+keys_DATA = default.xml
+
+EXTRA_DIST = $(keys_DATA)
+subdir = share/keys
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(keys_DATA)
+
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  share/keys/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+keysDATA_INSTALL = $(INSTALL_DATA)
+install-keysDATA: $(keys_DATA)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(keysdir)
+       @list='$(keys_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " $(keysDATA_INSTALL) $$d$$p $(DESTDIR)$(keysdir)/$$f"; \
+         $(keysDATA_INSTALL) $$d$$p $(DESTDIR)$(keysdir)/$$f; \
+       done
+
+uninstall-keysDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(keys_DATA)'; for p in $$list; do \
+         f="`echo $$p | sed -e 's|^.*/||'`"; \
+         echo " rm -f $(DESTDIR)$(keysdir)/$$f"; \
+         rm -f $(DESTDIR)$(keysdir)/$$f; \
+       done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkinstalldirs) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+
+installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(keysdir)
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-keysDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-keysDATA
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-keysDATA install-man install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-info-am uninstall-keysDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

diff --git a/share/keys/default.xml b/share/keys/default.xml
new file mode 100644 (file)
index 0000000..a273f86
--- /dev/null
+++ b/share/keys/default.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0"?>
+<keybindings name="Inkscape default">
+  <primary keyval="n" modifiers="control" verb="FileNew" />
+  <secondary keyval="N" modifiers="control" verb="FileNew" />
+  <primary keyval="o" modifiers="control" verb="FileOpen" />
+  <secondary keyval="O" modifiers="control" verb="FileOpen" />
+  <primary keyval="s" modifiers="control" verb="FileSave" />
+  <secondary keyval="S" modifiers="control" verb="FileSave" />
+  <primary keyval="s" modifiers="control,shift" verb="FileSaveAs" />
+  <secondary keyval="S" modifiers="control,shift" verb="FileSaveAs" />
+  <primary keyval="p" modifiers="control" verb="FilePrint" />
+  <secondary keyval="P" modifiers="control" verb="FilePrint" />
+  <primary keyval="F11" verb="FullScreen" />
+  <primary keyval="e" modifiers="control,shift" verb="FileExport" />
+  <secondary keyval="E" modifiers="control,shift" verb="FileExport" />
+  <primary keyval="i" modifiers="control" verb="FileImport" />
+  <secondary keyval="I" modifiers="control" verb="FileImport" />
+  <primary keyval="Tab" modifiers="control" verb="FileNextDesktop" />
+  <primary keyval="Tab" modifiers="control,shift" verb="FilePrevDesktop" />
+  <secondary keyval="ISO_Left_Tab" modifiers="control" verb="FilePrevDesktop" />
+  <secondary keyval="ISO_Left_Tab" modifiers="control,shift" verb="FilePrevDesktop" />
+  <primary keyval="w" modifiers="control" verb="FileCloseView" />
+  <primary keyval="W" modifiers="control" verb="FileCloseView" />
+  <primary keyval="q" modifiers="control" verb="FileQuit" />
+  <primary keyval="Q" modifiers="control" verb="FileQuit" />
+  <primary keyval="F1" verb="DrawSelect" />
+  <secondary keyval="s" verb="DrawSelect" />
+  <secondary keyval="S" verb="DrawSelect" />
+  <primary keyval="F1" modifiers="control" verb="DrawGradient" />
+  <secondary keyval="g" verb="DrawGradient" />
+  <secondary keyval="G" verb="DrawGradient" />
+  <primary keyval="F2" verb="DrawNode" />
+  <secondary keyval="n" verb="DrawNode" />
+  <secondary keyval="N" verb="DrawNode" />
+  <primary keyval="F3" verb="DrawZoom" />
+  <secondary keyval="z" verb="DrawZoom" />
+  <secondary keyval="Z" verb="DrawZoom" />
+  <primary keyval="F4" verb="DrawRect" />
+  <secondary keyval="r" verb="DrawRect" />
+  <secondary keyval="R" verb="DrawRect" />
+  <primary keyval="F5" verb="DrawArc" />
+  <secondary keyval="e" verb="DrawArc" />
+  <secondary keyval="E" verb="DrawArc" />
+  <primary keyval="F6" verb="DrawPencil" />
+  <secondary keyval="p" verb="DrawPencil" />
+  <secondary keyval="P" verb="DrawPencil" />
+  <primary keyval="F6" modifiers="shift" verb="DrawPen" />
+  <secondary keyval="b" verb="DrawPen" />
+  <secondary keyval="B" verb="DrawPen" />
+  <primary keyval="F6" modifiers="control" verb="DrawCalligrphic" />
+  <secondary keyval="c" verb="DrawCalligrphic" />
+  <secondary keyval="C" verb="DrawCalligrphic" />
+  <primary keyval="F7" verb="DrawDropper" />
+  <secondary keyval="d" verb="DrawDropper" />
+  <secondary keyval="D" verb="DrawDropper" />
+  <primary keyval="F8" verb="DrawText" />
+  <secondary keyval="t" verb="DrawText" />
+  <secondary keyval="T" verb="DrawText" />
+  <primary keyval="F9" verb="DrawSpiral" />
+  <secondary keyval="i" verb="DrawSpiral" />
+  <secondary keyval="I" verb="DrawSpiral" />
+  <secondary keyval="F9" modifiers="shift" verb="DrawStar" />
+  <secondary keyval="asterisk" modifiers="shift" verb="DrawStar" />
+  <secondary keyval="asterisk" verb="DrawStar" />
+  <primary keyval="KP_Multiply" verb="DrawStar" />
+  <primary keyval="F2" modifiers="control" verb="DrawConnector" />
+  <secondary keyval="o" verb="DrawConnector" />
+  <secondary keyval="O" verb="DrawConnector" />
+  <primary keyval="plus" verb="ZoomIn" />
+  <secondary keyval="plus" modifiers="shift" verb="ZoomIn" />
+  <secondary keyval="equal" verb="ZoomIn" />
+  <secondary keyval="KP_Add" verb="ZoomIn" />
+  <primary keyval="minus" verb="ZoomOut" />
+  <secondary keyval="KP_Subtract" verb="ZoomOut" />
+  <primary keyval="1" verb="Zoom1:0" />
+  <primary keyval="grave" verb="ZoomPrev" />
+  <primary keyval="grave" modifiers="shift" verb="ZoomNext" />
+  <secondary keyval="asciitilde" modifiers="shift" verb="ZoomNext" />
+  <primary keyval="2" verb="Zoom1:2" />
+  <primary keyval="3" verb="ZoomSelection" />
+  <primary keyval="4" verb="ZoomDrawing" />
+  <primary keyval="5" verb="ZoomPage" />
+  <secondary keyval="KP_5" verb="ZoomPage" />
+  <primary keyval="6" verb="ZoomPageWidth" />
+  <secondary keyval="e" modifiers="control" verb="ZoomPageWidth" />
+  <secondary keyval="E" modifiers="control" verb="ZoomPageWidth" />
+  <primary keyval="r" modifiers="control" verb="ToggleRulers" />
+  <secondary keyval="R" modifiers="control" verb="ToggleRulers" />
+  <primary keyval="b" modifiers="control" verb="ToggleScrollbars" />
+  <secondary keyval="B" modifiers="control" verb="ToggleScrollbars" />
+  <secondary keyval="bar" modifiers="shift" verb="ToggleGuides" />
+  <primary keyval="bar" verb="ToggleGuides" />
+  <secondary keyval="numbersign" modifiers="shift" verb="ToggleGrid" />
+  <primary keyval="numbersign" verb="ToggleGrid" />
+  <primary keyval="z" modifiers="control" verb="EditUndo" />
+  <secondary keyval="Z" modifiers="control" verb="EditUndo" />
+  <secondary keyval="y" modifiers="control" verb="EditRedo" />
+  <secondary keyval="Y" modifiers="control" verb="EditRedo" />
+  <primary keyval="z" modifiers="control,shift" verb="EditRedo" />
+  <secondary keyval="Z" modifiers="control,shift" verb="EditRedo" />
+  <secondary keyval="y" modifiers="control,shift" verb="EditUndo" />
+  <secondary keyval="Y" modifiers="control,shift" verb="EditUndo" />
+  <primary keyval="x" modifiers="control" verb="EditCut" />
+  <secondary keyval="X" modifiers="control" verb="EditCut" />
+  <primary keyval="c" modifiers="control" verb="EditCopy" />
+  <secondary keyval="C" modifiers="control" verb="EditCopy" />
+  <primary keyval="v" modifiers="control" verb="EditPaste" />
+  <secondary keyval="V" modifiers="control" verb="EditPaste" />
+  <primary keyval="v" modifiers="control,shift" verb="EditPasteStyle" />
+  <secondary keyval="V" modifiers="control,shift" verb="EditPasteStyle" />
+  <primary keyval="v" modifiers="control,alt" verb="EditPasteInPlace" />
+  <secondary keyval="V" modifiers="control,alt" verb="EditPasteInPlace" />
+  <primary keyval="Delete" verb="EditDelete" />
+  <secondary keyval="KP_Delete" verb="EditDelete" />
+  <secondary keyval="BackSpace" verb="EditDelete" />
+  <primary keyval="d" modifiers="control" verb="EditDuplicate" />
+  <secondary keyval="D" modifiers="control" verb="EditDuplicate" />
+  <primary keyval="d" modifiers="alt" verb="EditClone" />
+  <secondary keyval="D" modifiers="alt" verb="EditClone" />
+  <primary keyval="d" modifiers="alt,shift" verb="EditUnlinkClone" />
+  <secondary keyval="D" modifiers="alt,shift" verb="EditUnlinkClone" />
+  <primary keyval="d" modifiers="shift" verb="EditCloneOriginal" />
+  <secondary keyval="D" modifiers="shift" verb="EditCloneOriginal" />
+  <primary keyval="i" modifiers="alt" verb="EditTile" />
+  <secondary keyval="I" modifiers="alt" verb="EditTile" />
+  <primary keyval="i" modifiers="alt,shift" verb="EditUnTile" />
+  <secondary keyval="I" modifiers="alt,shift" verb="EditUnTile" />
+  <primary keyval="c" modifiers="control,shift" verb="ObjectToCurve" />
+  <secondary keyval="C" modifiers="control,shift" verb="ObjectToCurve" />
+  <primary keyval="w" modifiers="alt" verb="ObjectFlowText" />
+  <secondary keyval="W" modifiers="alt" verb="ObjectFlowText" />
+  <primary keyval="w" modifiers="alt,shift" verb="ObjectUnFlowText" />
+  <secondary keyval="W" modifiers="alt,shift" verb="ObjectUnFlowText" />
+  <primary keyval="h" verb="ObjectFlipHorizontally" />
+  <secondary keyval="H" verb="ObjectFlipHorizontally" />
+  <primary keyval="v" verb="ObjectFlipVertically" />
+  <secondary keyval="V" verb="ObjectFlipVertically" />
+  <primary keyval="Page_Up" modifiers="control,shift" verb="LayerRaise" />
+  <secondary keyval="KP_Page_Up" modifiers="control,shift" verb="LayerRaise" />
+  <primary keyval="Page_Down" modifiers="control,shift" verb="LayerLower" />
+  <secondary keyval="KP_Page_Down" modifiers="control,shift" verb="LayerLower" />
+  <primary keyval="Home" modifiers="control,shift" verb="LayerToTop" />
+  <secondary keyval="KP_Home" modifiers="control,shift" verb="LayerToTop" />
+  <primary keyval="End" modifiers="control,shift" verb="LayerToBottom" />
+  <secondary keyval="KP_End" modifiers="control,shift" verb="LayerToBottom" />
+  <primary keyval="Page_Up" modifiers="shift" verb="LayerMoveToNext" />
+  <secondary keyval="KP_Page_Up" modifiers="shift" verb="LayerMoveToNext" />
+  <primary keyval="Page_Down" modifiers="shift" verb="LayerMoveToPrev" />
+  <secondary keyval="KP_Page_Down" modifiers="shift" verb="LayerMoveToPrev" />
+  <primary keyval="Home" verb="SelectionToFront" />
+  <secondary keyval="KP_Home" verb="SelectionToFront" />
+  <primary keyval="End" verb="SelectionToBack" />
+  <secondary keyval="KP_End" verb="SelectionToBack" />
+  <primary keyval="Page_Up" verb="SelectionRaise" />
+  <secondary keyval="KP_Page_Up" verb="SelectionRaise" />
+  <primary keyval="Page_Down" verb="SelectionLower" />
+  <secondary keyval="KP_Page_Down" verb="SelectionLower" />
+  <primary keyval="a" modifiers="control" verb="EditSelectAll" />
+  <secondary keyval="A" modifiers="control" verb="EditSelectAll" />
+  <primary keyval="a" modifiers="control,alt" verb="EditSelectAllInAllLayers" />
+  <secondary keyval="A" modifiers="control,alt" verb="EditSelectAllInAllLayers" />
+  <primary keyval="exclam" verb="EditInvert" />
+  <secondary keyval="exclam" modifiers="shift" verb="EditInvert" />
+  <primary keyval="exclam" modifiers="alt" verb="EditInvertInAllLayers" />
+  <secondary keyval="exclam" modifiers="alt,shift" verb="EditInvertInAllLayers" />
+  <primary keyval="g" modifiers="control" verb="SelectionGroup" />
+  <secondary keyval="G" modifiers="control" verb="SelectionGroup" />
+  <secondary keyval="u" modifiers="control" verb="SelectionUnGroup" />
+  <secondary keyval="U" modifiers="control" verb="SelectionUnGroup" />
+  <primary keyval="g" modifiers="control,shift" verb="SelectionUnGroup" />
+  <secondary keyval="G" modifiers="control,shift" verb="SelectionUnGroup" />
+  <secondary keyval="u" modifiers="control,shift" verb="SelectionGroup" />
+  <secondary keyval="U" modifiers="control,shift" verb="SelectionGroup" />
+  <primary keyval="plus" modifiers="control" verb="SelectionUnion" />
+  <secondary keyval="KP_Add" modifiers="control" verb="SelectionUnion" />
+  <secondary keyval="plus" modifiers="control,shift" verb="SelectionUnion" />
+  <primary keyval="asterisk" modifiers="control" verb="SelectionIntersect" />
+  <secondary keyval="KP_Multiply" modifiers="control" verb="SelectionIntersect" />
+  <secondary keyval="asterisk" modifiers="control,shift" verb="SelectionIntersect" />
+  <primary keyval="minus" modifiers="control" verb="SelectionDiff" />
+  <secondary keyval="underscore" modifiers="control" verb="SelectionDiff" />
+  <secondary keyval="underscore" modifiers="control,shift" verb="SelectionDiff" />
+  <secondary keyval="KP_Subtract" modifiers="control" verb="SelectionDiff" />
+  <secondary keyval="minus" modifiers="control,shift" verb="SelectionDiff" />
+  <primary keyval="asciicircum" modifiers="control" verb="SelectionSymDiff" />
+  <secondary keyval="asciicircum" modifiers="control,shift" verb="SelectionSymDiff" />
+  <primary keyval="slash" modifiers="control,alt" verb="SelectionCutPath" />
+  <secondary keyval="slash" modifiers="control,alt,shift" verb="SelectionCutPath" />
+  <primary keyval="slash" modifiers="control" verb="SelectionDivide" />
+  <secondary keyval="slash" modifiers="control,shift" verb="SelectionDivide" />
+  <primary keyval="parenright" modifiers="control" verb="SelectionOffset" />
+  <secondary keyval="parenright" modifiers="control,shift" verb="SelectionOffset" />
+  <secondary keyval="0" modifiers="control,shift" verb="SelectionOffset" />
+  <primary keyval="parenright" modifiers="alt" verb="SelectionOffsetScreen" />
+  <secondary keyval="0" modifiers="alt" verb="SelectionOffsetScreen" />
+  <primary keyval="parenright" modifiers="alt,shift" verb="SelectionOffsetScreen10" />
+  <secondary keyval="0" modifiers="alt,shift" verb="SelectionOffsetScreen10" />
+  <primary keyval="parenleft" modifiers="control" verb="SelectionInset" />
+  <secondary keyval="parenleft" modifiers="control,shift" verb="SelectionInset" />
+  <secondary keyval="9" modifiers="control,shift" verb="SelectionInset" />
+  <primary keyval="parenleft" modifiers="alt" verb="SelectionInsetScreen" />
+  <secondary keyval="9" modifiers="alt" verb="SelectionInsetScreen" />
+  <primary keyval="parenleft" modifiers="alt,shift" verb="SelectionInsetScreen" />
+  <secondary keyval="9" modifiers="alt,shift" verb="SelectionInsetScreen" />
+  <primary keyval="j" modifiers="control" verb="SelectionDynOffset" />
+  <secondary keyval="J" modifiers="control" verb="SelectionDynOffset" />
+  <primary keyval="j" modifiers="control,alt" verb="SelectionLinkedOffset" />
+  <secondary keyval="J" modifiers="control,alt" verb="SelectionLinkedOffset" />
+  <primary keyval="c" modifiers="control,alt" verb="SelectionOutline" />
+  <secondary keyval="C" modifiers="control,alt" verb="SelectionOutline" />
+  <primary keyval="l" modifiers="control" verb="SelectionSimplify" />
+  <secondary keyval="L" modifiers="control" verb="SelectionSimplify" />
+  <primary keyval="b" modifiers="alt" verb="SelectionCreateBitmap" />
+  <secondary keyval="B" modifiers="alt" verb="SelectionCreateBitmap" />
+  <primary keyval="b" modifiers="alt,shift" verb="SelectionTrace" />
+  <secondary keyval="B" modifiers="alt,shift" verb="SelectionTrace" />
+  <primary keyval="k" modifiers="control" verb="SelectionCombine" />
+  <secondary keyval="K" modifiers="control" verb="SelectionCombine" />
+  <primary keyval="k" modifiers="control,shift" verb="SelectionBreakApart" />
+  <secondary keyval="K" modifiers="control,shift" verb="SelectionBreakApart" />
+  <primary keyval="x" modifiers="control,shift" verb="DialogXMLEditor" />
+  <secondary keyval="X" modifiers="control,shift" verb="DialogXMLEditor" />
+  <primary keyval="d" modifiers="control,shift" verb="DialogNamedview" />
+  <secondary keyval="D" modifiers="control,shift" verb="DialogNamedview" />
+  <primary keyval="a" modifiers="control,shift" verb="DialogAlignDistribute" />
+  <secondary keyval="A" modifiers="control,shift" verb="DialogAlignDistribute" />
+  <primary keyval="t" modifiers="control,shift" verb="Dialogtext" />
+  <secondary keyval="T" modifiers="control,shift" verb="Dialogtext" />
+  <primary keyval="p" modifiers="control,shift" verb="DialogDisplay" />
+  <secondary keyval="P" modifiers="control,shift" verb="DialogDisplay" />
+  <primary keyval="f" modifiers="control,shift" verb="DialogFillStroke" />
+  <secondary keyval="F" modifiers="control,shift" verb="DialogFillStroke" />
+  <primary keyval="f" modifiers="control" verb="DialogFind" />
+  <secondary keyval="F" modifiers="control" verb="DialogFind" />
+  <primary keyval="m" modifiers="control,shift" verb="DialogTransform" />
+  <secondary keyval="M" modifiers="control,shift" verb="DialogTransform" />
+  <primary keyval="o" modifiers="control,shift" verb="DialogItem" />
+  <secondary keyval="O" modifiers="control,shift" verb="DialogItem" />
+  <primary keyval="w" modifiers="control,shift" verb="DialogSwatches" />
+  <secondary keyval="W" modifiers="control,shift" verb="DialogSwatches" />
+  <primary keyval="F12" verb="DialogsToggle" />
+</keybindings>

diff --git a/src/Makefile_insert b/src/Makefile_insert
index 31f57f33b83973bd10150670d71ecd63b995304b..e09b69ffc69e3ed88bc79515144a5255c3901d80 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -120,7 +120,6 @@ libinkpre_a_SOURCES =       \
        selection.cpp selection.h       \
        seltrans-handles.cpp seltrans-handles.h \
        seltrans.cpp seltrans.h \
-       shortcuts-default-xml.cpp       \
        shortcuts.cpp shortcuts.h       \
        slideshow.cpp slideshow.h       \
        snap.cpp snap.h \

diff --git a/src/shortcuts-default-xml.cpp b/src/shortcuts-default-xml.cpp
deleted file mode 100644 (file)
index 56b31ce..0000000
--- a/src/shortcuts-default-xml.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-extern char const shortcuts_default_xml[]=
-"<?xml version=\"1.0\"?>\n"
-"<keybindings name=\"Inkscape default\">\n"
-"  <primary keyval=\"n\" modifiers=\"control\" verb=\"FileNew\" />\n"
-"  <secondary keyval=\"N\" modifiers=\"control\" verb=\"FileNew\" />\n"
-"  <primary keyval=\"o\" modifiers=\"control\" verb=\"FileOpen\" />\n"
-"  <secondary keyval=\"O\" modifiers=\"control\" verb=\"FileOpen\" />\n"
-"  <primary keyval=\"s\" modifiers=\"control\" verb=\"FileSave\" />\n"
-"  <secondary keyval=\"S\" modifiers=\"control\" verb=\"FileSave\" />\n"
-"  <primary keyval=\"s\" modifiers=\"control,shift\" verb=\"FileSaveAs\" />\n"
-"  <secondary keyval=\"S\" modifiers=\"control,shift\" verb=\"FileSaveAs\" />\n"
-"  <primary keyval=\"p\" modifiers=\"control\" verb=\"FilePrint\" />\n"
-"  <secondary keyval=\"P\" modifiers=\"control\" verb=\"FilePrint\" />\n"
-"  <primary keyval=\"F11\" verb=\"FullScreen\" />\n"
-"  <primary keyval=\"e\" modifiers=\"control,shift\" verb=\"FileExport\" />\n"
-"  <secondary keyval=\"E\" modifiers=\"control,shift\" verb=\"FileExport\" />\n"
-"  <primary keyval=\"i\" modifiers=\"control\" verb=\"FileImport\" />\n"
-"  <secondary keyval=\"I\" modifiers=\"control\" verb=\"FileImport\" />\n"
-"  <primary keyval=\"Tab\" modifiers=\"control\" verb=\"FileNextDesktop\" />\n"
-"  <primary keyval=\"Tab\" modifiers=\"control,shift\" verb=\"FilePrevDesktop\" />\n"
-"  <secondary keyval=\"ISO_Left_Tab\" modifiers=\"control\" verb=\"FilePrevDesktop\" />\n"
-"  <secondary keyval=\"ISO_Left_Tab\" modifiers=\"control,shift\" verb=\"FilePrevDesktop\" />\n"
-"  <primary keyval=\"w\" modifiers=\"control\" verb=\"FileCloseView\" />\n"
-"  <primary keyval=\"W\" modifiers=\"control\" verb=\"FileCloseView\" />\n"
-"  <primary keyval=\"q\" modifiers=\"control\" verb=\"FileQuit\" />\n"
-"  <primary keyval=\"Q\" modifiers=\"control\" verb=\"FileQuit\" />\n"
-"  <primary keyval=\"F1\" verb=\"DrawSelect\" />\n"
-"  <secondary keyval=\"s\" verb=\"DrawSelect\" />\n"
-"  <secondary keyval=\"S\" verb=\"DrawSelect\" />\n"
-"  <primary keyval=\"F1\" modifiers=\"control\" verb=\"DrawGradient\" />\n"
-"  <secondary keyval=\"g\" verb=\"DrawGradient\" />\n"
-"  <secondary keyval=\"G\" verb=\"DrawGradient\" />\n"
-"  <primary keyval=\"F2\" verb=\"DrawNode\" />\n"
-"  <secondary keyval=\"n\" verb=\"DrawNode\" />\n"
-"  <secondary keyval=\"N\" verb=\"DrawNode\" />\n"
-"  <primary keyval=\"F3\" verb=\"DrawZoom\" />\n"
-"  <secondary keyval=\"z\" verb=\"DrawZoom\" />\n"
-"  <secondary keyval=\"Z\" verb=\"DrawZoom\" />\n"
-"  <primary keyval=\"F4\" verb=\"DrawRect\" />\n"
-"  <secondary keyval=\"r\" verb=\"DrawRect\" />\n"
-"  <secondary keyval=\"R\" verb=\"DrawRect\" />\n"
-"  <primary keyval=\"F5\" verb=\"DrawArc\" />\n"
-"  <secondary keyval=\"e\" verb=\"DrawArc\" />\n"
-"  <secondary keyval=\"E\" verb=\"DrawArc\" />\n"
-"  <primary keyval=\"F6\" verb=\"DrawPencil\" />\n"
-"  <secondary keyval=\"p\" verb=\"DrawPencil\" />\n"
-"  <secondary keyval=\"P\" verb=\"DrawPencil\" />\n"
-"  <primary keyval=\"F6\" modifiers=\"shift\" verb=\"DrawPen\" />\n"
-"  <secondary keyval=\"b\" verb=\"DrawPen\" />\n"
-"  <secondary keyval=\"B\" verb=\"DrawPen\" />\n"
-"  <primary keyval=\"F6\" modifiers=\"control\" verb=\"DrawCalligrphic\" />\n"
-"  <secondary keyval=\"c\" verb=\"DrawCalligrphic\" />\n"
-"  <secondary keyval=\"C\" verb=\"DrawCalligrphic\" />\n"
-"  <primary keyval=\"F7\" verb=\"DrawDropper\" />\n"
-"  <secondary keyval=\"d\" verb=\"DrawDropper\" />\n"
-"  <secondary keyval=\"D\" verb=\"DrawDropper\" />\n"
-"  <primary keyval=\"F8\" verb=\"DrawText\" />\n"
-"  <secondary keyval=\"t\" verb=\"DrawText\" />\n"
-"  <secondary keyval=\"T\" verb=\"DrawText\" />\n"
-"  <primary keyval=\"F9\" verb=\"DrawSpiral\" />\n"
-"  <secondary keyval=\"i\" verb=\"DrawSpiral\" />\n"
-"  <secondary keyval=\"I\" verb=\"DrawSpiral\" />\n"
-"  <secondary keyval=\"F9\" modifiers=\"shift\" verb=\"DrawStar\" />\n"
-"  <secondary keyval=\"asterisk\" modifiers=\"shift\" verb=\"DrawStar\" />\n"
-"  <secondary keyval=\"asterisk\" verb=\"DrawStar\" />\n"
-"  <primary keyval=\"KP_Multiply\" verb=\"DrawStar\" />\n"
-"  <primary keyval=\"F2\" modifiers=\"control\" verb=\"DrawConnector\" />\n"
-"  <secondary keyval=\"o\" verb=\"DrawConnector\" />\n"
-"  <secondary keyval=\"O\" verb=\"DrawConnector\" />\n"
-"  <primary keyval=\"plus\" verb=\"ZoomIn\" />\n"
-"  <secondary keyval=\"plus\" modifiers=\"shift\" verb=\"ZoomIn\" />\n"
-"  <secondary keyval=\"equal\" verb=\"ZoomIn\" />\n"
-"  <secondary keyval=\"KP_Add\" verb=\"ZoomIn\" />\n"
-"  <primary keyval=\"minus\" verb=\"ZoomOut\" />\n"
-"  <secondary keyval=\"KP_Subtract\" verb=\"ZoomOut\" />\n"
-"  <primary keyval=\"1\" verb=\"Zoom1:0\" />\n"
-"  <primary keyval=\"grave\" verb=\"ZoomPrev\" />\n"
-"  <primary keyval=\"grave\" modifiers=\"shift\" verb=\"ZoomNext\" />\n"
-"  <secondary keyval=\"asciitilde\" modifiers=\"shift\" verb=\"ZoomNext\" />\n"
-"  <primary keyval=\"2\" verb=\"Zoom1:2\" />\n"
-"  <primary keyval=\"3\" verb=\"ZoomSelection\" />\n"
-"  <primary keyval=\"4\" verb=\"ZoomDrawing\" />\n"
-"  <primary keyval=\"5\" verb=\"ZoomPage\" />\n"
-"  <secondary keyval=\"KP_5\" verb=\"ZoomPage\" />\n"
-"  <primary keyval=\"6\" verb=\"ZoomPageWidth\" />\n"
-"  <secondary keyval=\"e\" modifiers=\"control\" verb=\"ZoomPageWidth\" />\n"
-"  <secondary keyval=\"E\" modifiers=\"control\" verb=\"ZoomPageWidth\" />\n"
-"  <primary keyval=\"r\" modifiers=\"control\" verb=\"ToggleRulers\" />\n"
-"  <secondary keyval=\"R\" modifiers=\"control\" verb=\"ToggleRulers\" />\n"
-"  <primary keyval=\"b\" modifiers=\"control\" verb=\"ToggleScrollbars\" />\n"
-"  <secondary keyval=\"B\" modifiers=\"control\" verb=\"ToggleScrollbars\" />\n"
-"  <secondary keyval=\"bar\" modifiers=\"shift\" verb=\"ToggleGuides\" />\n"
-"  <primary keyval=\"bar\" verb=\"ToggleGuides\" />\n"
-"  <secondary keyval=\"numbersign\" modifiers=\"shift\" verb=\"ToggleGrid\" />\n"
-"  <primary keyval=\"numbersign\" verb=\"ToggleGrid\" />\n"
-"  <primary keyval=\"z\" modifiers=\"control\" verb=\"EditUndo\" />\n"
-"  <secondary keyval=\"Z\" modifiers=\"control\" verb=\"EditUndo\" />\n"
-"  <secondary keyval=\"y\" modifiers=\"control\" verb=\"EditRedo\" />\n"
-"  <secondary keyval=\"Y\" modifiers=\"control\" verb=\"EditRedo\" />\n"
-"  <primary keyval=\"z\" modifiers=\"control,shift\" verb=\"EditRedo\" />\n"
-"  <secondary keyval=\"Z\" modifiers=\"control,shift\" verb=\"EditRedo\" />\n"
-"  <secondary keyval=\"y\" modifiers=\"control,shift\" verb=\"EditUndo\" />\n"
-"  <secondary keyval=\"Y\" modifiers=\"control,shift\" verb=\"EditUndo\" />\n"
-"  <primary keyval=\"x\" modifiers=\"control\" verb=\"EditCut\" />\n"
-"  <secondary keyval=\"X\" modifiers=\"control\" verb=\"EditCut\" />\n"
-"  <primary keyval=\"c\" modifiers=\"control\" verb=\"EditCopy\" />\n"
-"  <secondary keyval=\"C\" modifiers=\"control\" verb=\"EditCopy\" />\n"
-"  <primary keyval=\"v\" modifiers=\"control\" verb=\"EditPaste\" />\n"
-"  <secondary keyval=\"V\" modifiers=\"control\" verb=\"EditPaste\" />\n"
-"  <primary keyval=\"v\" modifiers=\"control,shift\" verb=\"EditPasteStyle\" />\n"
-"  <secondary keyval=\"V\" modifiers=\"control,shift\" verb=\"EditPasteStyle\" />\n"
-"  <primary keyval=\"v\" modifiers=\"control,alt\" verb=\"EditPasteInPlace\" />\n"
-"  <secondary keyval=\"V\" modifiers=\"control,alt\" verb=\"EditPasteInPlace\" />\n"
-"  <primary keyval=\"Delete\" verb=\"EditDelete\" />\n"
-"  <secondary keyval=\"KP_Delete\" verb=\"EditDelete\" />\n"
-"  <secondary keyval=\"BackSpace\" verb=\"EditDelete\" />\n"
-"  <primary keyval=\"d\" modifiers=\"control\" verb=\"EditDuplicate\" />\n"
-"  <secondary keyval=\"D\" modifiers=\"control\" verb=\"EditDuplicate\" />\n"
-"  <primary keyval=\"d\" modifiers=\"alt\" verb=\"EditClone\" />\n"
-"  <secondary keyval=\"D\" modifiers=\"alt\" verb=\"EditClone\" />\n"
-"  <primary keyval=\"d\" modifiers=\"alt,shift\" verb=\"EditUnlinkClone\" />\n"
-"  <secondary keyval=\"D\" modifiers=\"alt,shift\" verb=\"EditUnlinkClone\" />\n"
-"  <primary keyval=\"d\" modifiers=\"shift\" verb=\"EditCloneOriginal\" />\n"
-"  <secondary keyval=\"D\" modifiers=\"shift\" verb=\"EditCloneOriginal\" />\n"
-"  <primary keyval=\"i\" modifiers=\"alt\" verb=\"EditTile\" />\n"
-"  <secondary keyval=\"I\" modifiers=\"alt\" verb=\"EditTile\" />\n"
-"  <primary keyval=\"i\" modifiers=\"alt,shift\" verb=\"EditUnTile\" />\n"
-"  <secondary keyval=\"I\" modifiers=\"alt,shift\" verb=\"EditUnTile\" />\n"
-"  <primary keyval=\"c\" modifiers=\"control,shift\" verb=\"ObjectToCurve\" />\n"
-"  <secondary keyval=\"C\" modifiers=\"control,shift\" verb=\"ObjectToCurve\" />\n"
-"  <primary keyval=\"w\" modifiers=\"alt\" verb=\"ObjectFlowText\" />\n"
-"  <secondary keyval=\"W\" modifiers=\"alt\" verb=\"ObjectFlowText\" />\n"
-"  <primary keyval=\"w\" modifiers=\"alt,shift\" verb=\"ObjectUnFlowText\" />\n"
-"  <secondary keyval=\"W\" modifiers=\"alt,shift\" verb=\"ObjectUnFlowText\" />\n"
-"  <primary keyval=\"h\" verb=\"ObjectFlipHorizontally\" />\n"
-"  <secondary keyval=\"H\" verb=\"ObjectFlipHorizontally\" />\n"
-"  <primary keyval=\"v\" verb=\"ObjectFlipVertically\" />\n"
-"  <secondary keyval=\"V\" verb=\"ObjectFlipVertically\" />\n"
-"  <primary keyval=\"Page_Up\" modifiers=\"control,shift\" verb=\"LayerRaise\" />\n"
-"  <secondary keyval=\"KP_Page_Up\" modifiers=\"control,shift\" verb=\"LayerRaise\" />\n"
-"  <primary keyval=\"Page_Down\" modifiers=\"control,shift\" verb=\"LayerLower\" />\n"
-"  <secondary keyval=\"KP_Page_Down\" modifiers=\"control,shift\" verb=\"LayerLower\" />\n"
-"  <primary keyval=\"Home\" modifiers=\"control,shift\" verb=\"LayerToTop\" />\n"
-"  <secondary keyval=\"KP_Home\" modifiers=\"control,shift\" verb=\"LayerToTop\" />\n"
-"  <primary keyval=\"End\" modifiers=\"control,shift\" verb=\"LayerToBottom\" />\n"
-"  <secondary keyval=\"KP_End\" modifiers=\"control,shift\" verb=\"LayerToBottom\" />\n"
-"  <primary keyval=\"Page_Up\" modifiers=\"shift\" verb=\"LayerMoveToNext\" />\n"
-"  <secondary keyval=\"KP_Page_Up\" modifiers=\"shift\" verb=\"LayerMoveToNext\" />\n"
-"  <primary keyval=\"Page_Down\" modifiers=\"shift\" verb=\"LayerMoveToPrev\" />\n"
-"  <secondary keyval=\"KP_Page_Down\" modifiers=\"shift\" verb=\"LayerMoveToPrev\" />\n"
-"  <primary keyval=\"Home\" verb=\"SelectionToFront\" />\n"
-"  <secondary keyval=\"KP_Home\" verb=\"SelectionToFront\" />\n"
-"  <primary keyval=\"End\" verb=\"SelectionToBack\" />\n"
-"  <secondary keyval=\"KP_End\" verb=\"SelectionToBack\" />\n"
-"  <primary keyval=\"Page_Up\" verb=\"SelectionRaise\" />\n"
-"  <secondary keyval=\"KP_Page_Up\" verb=\"SelectionRaise\" />\n"
-"  <primary keyval=\"Page_Down\" verb=\"SelectionLower\" />\n"
-"  <secondary keyval=\"KP_Page_Down\" verb=\"SelectionLower\" />\n"
-"  <primary keyval=\"a\" modifiers=\"control\" verb=\"EditSelectAll\" />\n"
-"  <secondary keyval=\"A\" modifiers=\"control\" verb=\"EditSelectAll\" />\n"
-"  <primary keyval=\"a\" modifiers=\"control,alt\" verb=\"EditSelectAllInAllLayers\" />\n"
-"  <secondary keyval=\"A\" modifiers=\"control,alt\" verb=\"EditSelectAllInAllLayers\" />\n"
-"  <primary keyval=\"exclam\" verb=\"EditInvert\" />\n"
-"  <secondary keyval=\"exclam\" modifiers=\"shift\" verb=\"EditInvert\" />\n"
-"  <primary keyval=\"exclam\" modifiers=\"alt\" verb=\"EditInvertInAllLayers\" />\n"
-"  <secondary keyval=\"exclam\" modifiers=\"alt,shift\" verb=\"EditInvertInAllLayers\" />\n"
-"  <primary keyval=\"g\" modifiers=\"control\" verb=\"SelectionGroup\" />\n"
-"  <secondary keyval=\"G\" modifiers=\"control\" verb=\"SelectionGroup\" />\n"
-"  <secondary keyval=\"u\" modifiers=\"control\" verb=\"SelectionUnGroup\" />\n"
-"  <secondary keyval=\"U\" modifiers=\"control\" verb=\"SelectionUnGroup\" />\n"
-"  <primary keyval=\"g\" modifiers=\"control,shift\" verb=\"SelectionUnGroup\" />\n"
-"  <secondary keyval=\"G\" modifiers=\"control,shift\" verb=\"SelectionUnGroup\" />\n"
-"  <secondary keyval=\"u\" modifiers=\"control,shift\" verb=\"SelectionGroup\" />\n"
-"  <secondary keyval=\"U\" modifiers=\"control,shift\" verb=\"SelectionGroup\" />\n"
-"  <primary keyval=\"plus\" modifiers=\"control\" verb=\"SelectionUnion\" />\n"
-"  <secondary keyval=\"KP_Add\" modifiers=\"control\" verb=\"SelectionUnion\" />\n"
-"  <secondary keyval=\"plus\" modifiers=\"control,shift\" verb=\"SelectionUnion\" />\n"
-"  <primary keyval=\"asterisk\" modifiers=\"control\" verb=\"SelectionIntersect\" />\n"
-"  <secondary keyval=\"KP_Multiply\" modifiers=\"control\" verb=\"SelectionIntersect\" />\n"
-"  <secondary keyval=\"asterisk\" modifiers=\"control,shift\" verb=\"SelectionIntersect\" />\n"
-"  <primary keyval=\"minus\" modifiers=\"control\" verb=\"SelectionDiff\" />\n"
-"  <secondary keyval=\"underscore\" modifiers=\"control\" verb=\"SelectionDiff\" />\n"
-"  <secondary keyval=\"underscore\" modifiers=\"control,shift\" verb=\"SelectionDiff\" />\n"
-"  <secondary keyval=\"KP_Subtract\" modifiers=\"control\" verb=\"SelectionDiff\" />\n"
-"  <secondary keyval=\"minus\" modifiers=\"control,shift\" verb=\"SelectionDiff\" />\n"
-"  <primary keyval=\"asciicircum\" modifiers=\"control\" verb=\"SelectionSymDiff\" />\n"
-"  <secondary keyval=\"asciicircum\" modifiers=\"control,shift\" verb=\"SelectionSymDiff\" />\n"
-"  <primary keyval=\"slash\" modifiers=\"control,alt\" verb=\"SelectionCutPath\" />\n"
-"  <secondary keyval=\"slash\" modifiers=\"control,alt,shift\" verb=\"SelectionCutPath\" />\n"
-"  <primary keyval=\"slash\" modifiers=\"control\" verb=\"SelectionDivide\" />\n"
-"  <secondary keyval=\"slash\" modifiers=\"control,shift\" verb=\"SelectionDivide\" />\n"
-"  <primary keyval=\"parenright\" modifiers=\"control\" verb=\"SelectionOffset\" />\n"
-"  <secondary keyval=\"parenright\" modifiers=\"control,shift\" verb=\"SelectionOffset\" />\n"
-"  <secondary keyval=\"0\" modifiers=\"control,shift\" verb=\"SelectionOffset\" />\n"
-"  <primary keyval=\"parenright\" modifiers=\"alt\" verb=\"SelectionOffsetScreen\" />\n"
-"  <secondary keyval=\"0\" modifiers=\"alt\" verb=\"SelectionOffsetScreen\" />\n"
-"  <primary keyval=\"parenright\" modifiers=\"alt,shift\" verb=\"SelectionOffsetScreen10\" />\n"
-"  <secondary keyval=\"0\" modifiers=\"alt,shift\" verb=\"SelectionOffsetScreen10\" />\n"
-"  <primary keyval=\"parenleft\" modifiers=\"control\" verb=\"SelectionInset\" />\n"
-"  <secondary keyval=\"parenleft\" modifiers=\"control,shift\" verb=\"SelectionInset\" />\n"
-"  <secondary keyval=\"9\" modifiers=\"control,shift\" verb=\"SelectionInset\" />\n"
-"  <primary keyval=\"parenleft\" modifiers=\"alt\" verb=\"SelectionInsetScreen\" />\n"
-"  <secondary keyval=\"9\" modifiers=\"alt\" verb=\"SelectionInsetScreen\" />\n"
-"  <primary keyval=\"parenleft\" modifiers=\"alt,shift\" verb=\"SelectionInsetScreen\" />\n"
-"  <secondary keyval=\"9\" modifiers=\"alt,shift\" verb=\"SelectionInsetScreen\" />\n"
-"  <primary keyval=\"j\" modifiers=\"control\" verb=\"SelectionDynOffset\" />\n"
-"  <secondary keyval=\"J\" modifiers=\"control\" verb=\"SelectionDynOffset\" />\n"
-"  <primary keyval=\"j\" modifiers=\"control,alt\" verb=\"SelectionLinkedOffset\" />\n"
-"  <secondary keyval=\"J\" modifiers=\"control,alt\" verb=\"SelectionLinkedOffset\" />\n"
-"  <primary keyval=\"c\" modifiers=\"control,alt\" verb=\"SelectionOutline\" />\n"
-"  <secondary keyval=\"C\" modifiers=\"control,alt\" verb=\"SelectionOutline\" />\n"
-"  <primary keyval=\"l\" modifiers=\"control\" verb=\"SelectionSimplify\" />\n"
-"  <secondary keyval=\"L\" modifiers=\"control\" verb=\"SelectionSimplify\" />\n"
-"  <primary keyval=\"b\" modifiers=\"alt\" verb=\"SelectionCreateBitmap\" />\n"
-"  <secondary keyval=\"B\" modifiers=\"alt\" verb=\"SelectionCreateBitmap\" />\n"
-"  <primary keyval=\"b\" modifiers=\"alt,shift\" verb=\"SelectionTrace\" />\n"
-"  <secondary keyval=\"B\" modifiers=\"alt,shift\" verb=\"SelectionTrace\" />\n"
-"  <primary keyval=\"k\" modifiers=\"control\" verb=\"SelectionCombine\" />\n"
-"  <secondary keyval=\"K\" modifiers=\"control\" verb=\"SelectionCombine\" />\n"
-"  <primary keyval=\"k\" modifiers=\"control,shift\" verb=\"SelectionBreakApart\" />\n"
-"  <secondary keyval=\"K\" modifiers=\"control,shift\" verb=\"SelectionBreakApart\" />\n"
-"  <primary keyval=\"x\" modifiers=\"control,shift\" verb=\"DialogXMLEditor\" />\n"
-"  <secondary keyval=\"X\" modifiers=\"control,shift\" verb=\"DialogXMLEditor\" />\n"
-"  <primary keyval=\"d\" modifiers=\"control,shift\" verb=\"DialogNamedview\" />\n"
-"  <secondary keyval=\"D\" modifiers=\"control,shift\" verb=\"DialogNamedview\" />\n"
-"  <primary keyval=\"a\" modifiers=\"control,shift\" verb=\"DialogAlignDistribute\" />\n"
-"  <secondary keyval=\"A\" modifiers=\"control,shift\" verb=\"DialogAlignDistribute\" />\n"
-"  <primary keyval=\"t\" modifiers=\"control,shift\" verb=\"Dialogtext\" />\n"
-"  <secondary keyval=\"T\" modifiers=\"control,shift\" verb=\"Dialogtext\" />\n"
-"  <primary keyval=\"p\" modifiers=\"control,shift\" verb=\"DialogDisplay\" />\n"
-"  <secondary keyval=\"P\" modifiers=\"control,shift\" verb=\"DialogDisplay\" />\n"
-"  <primary keyval=\"f\" modifiers=\"control,shift\" verb=\"DialogFillStroke\" />\n"
-"  <secondary keyval=\"F\" modifiers=\"control,shift\" verb=\"DialogFillStroke\" />\n"
-"  <primary keyval=\"f\" modifiers=\"control\" verb=\"DialogFind\" />\n"
-"  <secondary keyval=\"F\" modifiers=\"control\" verb=\"DialogFind\" />\n"
-"  <primary keyval=\"m\" modifiers=\"control,shift\" verb=\"DialogTransform\" />\n"
-"  <secondary keyval=\"M\" modifiers=\"control,shift\" verb=\"DialogTransform\" />\n"
-"  <primary keyval=\"o\" modifiers=\"control,shift\" verb=\"DialogItem\" />\n"
-"  <secondary keyval=\"O\" modifiers=\"control,shift\" verb=\"DialogItem\" />\n"
-"  <primary keyval=\"w\" modifiers=\"control,shift\" verb=\"DialogSwatches\" />\n"
-"  <secondary keyval=\"W\" modifiers=\"control,shift\" verb=\"DialogSwatches\" />\n"
-"  <primary keyval=\"F12\" verb=\"DialogsToggle\" />\n"
-"</keybindings>";

diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 047928071d5d3e8812ae758f2502aade3d97bc5a..7061df77a4d5ec241b9a7fec1467f37682d96f1c 100644 (file)
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -22,10 +22,14 @@
 # include "config.h"
 #endif
 
+#include <vector>
+
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "helper/action.h"
+#include "io/sys.h"
+#include "io/resource.h"
 #include "shortcuts.h"
 #include "verbs.h"
 #include "xml/node-iterators.h"
@@ -34,8 +38,8 @@
 using namespace Inkscape;
 
 static void sp_shortcut_set(unsigned int const shortcut, Inkscape::Verb *const verb, bool const is_primary);
-
-static void set_shortcuts_xml(XML::Document const *doc);
+static void try_shortcuts_file(char const *filename);
+static void read_shortcuts_file(char const *filename);
 
 /* Returns true if action was performed */
 
@@ -56,24 +60,37 @@ sp_shortcut_invoke(unsigned int shortcut, Inkscape::UI::View::View *view)
 static GHashTable *verbs = NULL;
 static GHashTable *primary_shortcuts = NULL;
 
-extern char const shortcuts_default_xml[];
-
 static void
 sp_shortcut_init()
 {
+    using Inkscape::IO::Resource::get_path;
+    using Inkscape::IO::Resource::SYSTEM;
+    using Inkscape::IO::Resource::USER;
+    using Inkscape::IO::Resource::KEYS;
+
     verbs = g_hash_table_new(NULL, NULL);
     primary_shortcuts = g_hash_table_new(NULL, NULL);
 
-    XML::Document *shortcuts=sp_repr_read_mem(shortcuts_default_xml, strlen(shortcuts_default_xml), NULL);
-    if (shortcuts) {
-        set_shortcuts_xml(shortcuts);
-        GC::release(shortcuts);
-    } else {
-        g_error("Unable to parse default shortcuts");
+    read_shortcuts_file(get_path(SYSTEM, KEYS, "default.xml"));
+    try_shortcuts_file(get_path(USER, KEYS, "default.xml"));
+}
+
+static void try_shortcuts_file(char const *filename) {
+    using Inkscape::IO::file_test;
+
+    /* ah, if only we had an exception to catch... (permission, forgiveness) */
+    if (file_test(filename, G_FILE_TEST_EXISTS)) {
+        read_shortcuts_file(filename);
     }
 }
 
-static void set_shortcuts_xml(XML::Document const *doc) {
+static void read_shortcuts_file(char const *filename) {
+    XML::Document *doc=sp_repr_read_file(filename, NULL);
+    if (!doc) {
+        g_warning("Unable to read keys file %s", filename);
+        return;
+    }
+
     XML::Node const *root=doc->root();
     g_return_if_fail(!strcmp(root->name(), "keybindings"));
     XML::NodeConstSiblingIterator iter=root->firstChild();
@@ -133,6 +150,8 @@ static void set_shortcuts_xml(XML::Document const *doc) {
                         Inkscape::Verb::getbyid(verb_name),
                         is_primary);
     }
+
+    GC::release(doc);
 }
 
 /**