diff options
author | Simon Schumann <simon.schumann@web.de> | 2016-01-11 15:39:17 +0100 |
---|---|---|
committer | Daiki Ueno <dueno@src.gnome.org> | 2016-02-10 16:14:45 +0900 |
commit | 0858ddfc839d43fd3feb8ba22e08ffa9b2c07e4a (patch) | |
tree | 854f3a48e12726b9d7b870544cbe703065bd51e9 /data/layouts | |
parent | 5448eadedc6a12b38fb55ebe908aa9f99708ba0b (diff) | |
download | caribou-0858ddfc839d43fd3feb8ba22e08ffa9b2c07e4a.tar.gz |
Added new layout "tablet"
"tablet" is a fullscale layout but optimized for touch input
https://bugzilla.gnome.org/show_bug.cgi?id=760470
Diffstat (limited to 'data/layouts')
-rw-r--r-- | data/layouts/Makefile.am | 2 | ||||
-rw-r--r-- | data/layouts/tablet/Makefile.am | 30 | ||||
-rw-r--r-- | data/layouts/tablet/common/qwerty.xml | 217 | ||||
-rw-r--r-- | data/layouts/tablet/common/qwertz.xml | 227 | ||||
-rw-r--r-- | data/layouts/tablet/common/symbols.xml | 108 | ||||
-rw-r--r-- | data/layouts/tablet/common/symbols_ssharp.xml | 109 | ||||
-rw-r--r-- | data/layouts/tablet/de.xml.in | 8 | ||||
-rw-r--r-- | data/layouts/tablet/us.xml.in | 8 |
8 files changed, 708 insertions, 1 deletions
diff --git a/data/layouts/Makefile.am b/data/layouts/Makefile.am index fd73610..b7b45ee 100644 --- a/data/layouts/Makefile.am +++ b/data/layouts/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = scan touch fullscale +SUBDIRS = scan touch fullscale tablet -include $(top_srcdir)/git.mk diff --git a/data/layouts/tablet/Makefile.am b/data/layouts/tablet/Makefile.am new file mode 100644 index 0000000..7abe043 --- /dev/null +++ b/data/layouts/tablet/Makefile.am @@ -0,0 +1,30 @@ +tabletlayoutsdir = $(datadir)/caribou/layouts/tablet +tabletlayouts_in_files =\ + us.xml.in \ + de.xml.in +tabletlayouts_DATA = $(tabletlayouts_in_files:.xml.in=.xml) + +common_files = \ + common/qwerty.xml \ + common/qwertz.xml \ + common/symbols.xml \ + common/symbols_ssharp.xml + +us.xml: $(common_files) +de.xml: $(common_files) + +SUFFIXES = .xml.in .xml + +.xml.in.xml: + $(AM_V_GEN) \ + rm -f $@ $@.xsl; \ + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + xsltproc --xinclude $(top_srcdir)/tools/basic.xsl $${srcdir}$@.in > $@.xsl && \ + xsltproc --xinclude $@.xsl $${srcdir}$@.in > $@ + +EXTRA_DIST = $(tabletlayouts_in_files) $(common_files) + +CLEANFILES = $(tabletlayouts_DATA) $(tabletlayouts_in_files:.xml.in=.xml.xsl) + +-include $(top_srcdir)/git.mk diff --git a/data/layouts/tablet/common/qwerty.xml b/data/layouts/tablet/common/qwerty.xml new file mode 100644 index 0000000..7ee107b --- /dev/null +++ b/data/layouts/tablet/common/qwerty.xml @@ -0,0 +1,217 @@ +<?xml version="1.0" ?> +<external> + <level mode="default" name="level1"> + <row> + <key align="left" name="Escape"/> + <key name="q"> + <key name="1"/> + </key> + <key name="w"> + <key name="2"/> + </key> + <key name="e"> + <key name="3"/> + <key name="egrave"/> + <key name="eacute"/> + <key name="ecircumflex"/> + <key name="ediaeresis"/> + <key name="emacron"/> + </key> + <key name="r"> + <key name="4"/> + </key> + <key name="t"> + <key name="5"/> + </key> + <key name="z"> + <key name="6"/> + </key> + <key name="u"> + <key name="7"/> + <key name="ugrave"/> + <key name="uacute"/> + <key name="ucircumflex"/> + <key name="udiaeresis"/> + <key name="umacron"/> + </key> + <key name="i"> + <key name="8"/> + <key name="igrave"/> + <key name="iacute"/> + <key name="icircumflex"/> + <key name="idiaeresis"/> + <key name="imacron"/> + </key> + <key name="o"> + <key name="9"/> + <key name="ograve"/> + <key name="oacute"/> + <key name="ocircumflex"/> + <key name="odiaeresis"/> + <key name="omacron"/> + </key> + <key name="p"> + <key name="0"/> + </key> + <key align="right" name="BackSpace" repeatable="yes"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row> + <key align="left" name="Tab" width="1.5"/> + <key name="a"> + <key name="agrave"/> + <key name="aacute"/> + <key name="acircumflex"/> + <key name="adiaeresis"/> + <key name="aring"/> + <key name="atilde"/> + <key name="ae"/> + <key name="amacron"/> + </key> + <key name="s"> + <key name="ssharp"/> + </key> + <key name="d"/> + <key name="f"/> + <key name="g"/> + <key name="h"/> + <key name="j"/> + <key name="k"/> + <key name="l"/> + <key name="question"> + <key name="plus"/> + <key name="questiondown"/> + </key> + <key name="exclam"> + <key name="minus"/> + <key name="underscore"/> + <key name="exclamdown"/> + </key> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key align="left" name="Caribou_ShiftUp" toggle="level2" width="1.5"/> + <key name="y"/> + <key name="x"/> + <key name="c"> + <key name="c"/> + <key name="ccedilla"/> + </key> + <key name="v"/> + <key name="b"/> + <key name="n"/> + <key name="m"/> + <key name="comma"/> + <key name="period"/> + <key align="right" name="Caribou_ShiftUp" toggle="level2" width="1.5"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Symbols" toggle="symbols1" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Symbols_More" toggle="symbols2" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> + <level mode="latched" name="level2"> + <row> + <key align="left" name="Escape"/> + <key name="Q"/> + <key name="W"/> + <key name="E"> + <key name="Egrave"/> + <key name="Eacute"/> + <key name="Ecircumflex"/> + <key name="Ediaeresis"/> + <key name="Emacron"/> + </key> + <key name="R"/> + <key name="T"/> + <key name="Z"/> + <key name="U"> + <key name="Ugrave"/> + <key name="Uacute"/> + <key name="Ucircumflex"/> + <key name="Udiaeresis"/> + <key name="Umacron"/> + </key> + <key name="I"> + <key name="Igrave"/> + <key name="Iacute"/> + <key name="Icircumflex"/> + <key name="Idiaeresis"/> + <key name="Imacron"/> + </key> + <key name="O"> + <key name="Ograve"/> + <key name="Oacute"/> + <key name="Ocircumflex"/> + <key name="Odiaeresis"/> + <key name="Omacron"/> + </key> + <key name="P"/> + <key align="right" name="BackSpace" repeatable="yes"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row> + <key align="left" name="Tab" width="1.5"/> + <key name="A"> + <key name="Agrave"/> + <key name="Aacute"/> + <key name="Acircumflex"/> + <key name="Adiaeresis"/> + <key name="Aring"/> + <key name="Atilde"/> + <key name="Ae"/> + <key name="Amacron"/> + </key> + <key name="S"/> + <key name="D"/> + <key name="F"/> + <key name="G"/> + <key name="H"/> + <key name="J"/> + <key name="K"/> + <key name="L"/> + <key name="comma"/> + <key name="period"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key align="left" name="Caribou_ShiftDown" toggle="level1" width="1.5"/> + <key name="Y"/> + <key name="X"/> + <key name="C"> + <key name="Ccedilla"/> + </key> + <key name="V"/> + <key name="B"/> + <key name="N"/> + <key name="M"/> + <key name="question"> + <key name="question"/> + <key name="questiondown"/> + </key> + <key name="exclam"> + <key name="exclam"/> + <key name="exclamdown"/> + </key> + <key align="right" name="Caribou_ShiftDown" toggle="level1" width="1.5"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Symbols" toggle="symbols1" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Symbols_More" toggle="symbols2" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> +</external> diff --git a/data/layouts/tablet/common/qwertz.xml b/data/layouts/tablet/common/qwertz.xml new file mode 100644 index 0000000..0f307de --- /dev/null +++ b/data/layouts/tablet/common/qwertz.xml @@ -0,0 +1,227 @@ +<?xml version="1.0" ?> +<external> + <level mode="default" name="level1"> + <row> + <key align="left" name="Escape"/> + <key name="q"> + <key name="1"/> + </key> + <key name="w"> + <key name="2"/> + </key> + <key name="e"> + <key name="3"/> + <key name="egrave"/> + <key name="eacute"/> + <key name="ecircumflex"/> + <key name="ediaeresis"/> + <key name="emacron"/> + </key> + <key name="r"> + <key name="4"/> + </key> + <key name="t"> + <key name="5"/> + </key> + <key name="z"> + <key name="6"/> + </key> + <key name="u"> + <key name="7"/> + <key name="ugrave"/> + <key name="uacute"/> + <key name="ucircumflex"/> + <key name="udiaeresis"/> + <key name="umacron"/> + </key> + <key name="i"> + <key name="8"/> + <key name="igrave"/> + <key name="iacute"/> + <key name="icircumflex"/> + <key name="idiaeresis"/> + <key name="imacron"/> + </key> + <key name="o"> + <key name="9"/> + <key name="ograve"/> + <key name="oacute"/> + <key name="ocircumflex"/> + <key name="odiaeresis"/> + <key name="omacron"/> + </key> + <key name="p"> + <key name="0"/> + </key> + <key name="udiaeresis"/> + <key align="right" name="BackSpace" repeatable="yes"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row> + <key align="left" name="Tab" width="1.5"/> + <key name="a"> + <key name="agrave"/> + <key name="aacute"/> + <key name="acircumflex"/> + <key name="adiaeresis"/> + <key name="aring"/> + <key name="atilde"/> + <key name="ae"/> + <key name="amacron"/> + </key> + <key name="s"> + <key name="ssharp"/> + </key> + <key name="d"/> + <key name="f"/> + <key name="g"/> + <key name="h"/> + <key name="j"/> + <key name="k"/> + <key name="l"/> + <key name="odiaeresis"/> + <key name="adiaeresis"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key align="left" name="Caribou_ShiftUp" toggle="level2" width="1.5"/> + <key name="y"/> + <key name="x"/> + <key name="c"> + <key name="c"/> + <key name="ccedilla"/> + </key> + <key name="v"/> + <key name="b"/> + <key name="n"/> + <key name="m"/> + <key name="comma"> + <key name="semicolon"/> + </key> + <key name="period"> + <key name="colon"/> + </key> + <key name="question"> + <key name="plus"/> + <key name="questiondown"/> + </key> + <key name="exclam"> + <key name="minus"/> + <key name="underscore"/> + <key name="exclamdown"/> + </key> + <key align="right" name="Caribou_ShiftUp" toggle="level2" width="1.5"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Symbols" toggle="symbols1" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Symbols_More" toggle="symbols2" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> + <level mode="latched" name="level2"> + <row> + <key align="left" name="Escape"/> + <key name="Q"/> + <key name="W"/> + <key name="E"> + <key name="Egrave"/> + <key name="Eacute"/> + <key name="Ecircumflex"/> + <key name="Ediaeresis"/> + <key name="Emacron"/> + </key> + <key name="R"/> + <key name="T"/> + <key name="Z"/> + <key name="U"> + <key name="Ugrave"/> + <key name="Uacute"/> + <key name="Ucircumflex"/> + <key name="Udiaeresis"/> + <key name="Umacron"/> + </key> + <key name="I"> + <key name="Igrave"/> + <key name="Iacute"/> + <key name="Icircumflex"/> + <key name="Idiaeresis"/> + <key name="Imacron"/> + </key> + <key name="O"> + <key name="Ograve"/> + <key name="Oacute"/> + <key name="Ocircumflex"/> + <key name="Odiaeresis"/> + <key name="Omacron"/> + </key> + <key name="P"/> + <key name="Udiaeresis"/> + <key align="right" name="BackSpace" repeatable="yes"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row> + <key align="left" name="Tab" width="1.5"/> + <key name="A"> + <key name="Agrave"/> + <key name="Aacute"/> + <key name="Acircumflex"/> + <key name="Adiaeresis"/> + <key name="Aring"/> + <key name="Atilde"/> + <key name="Ae"/> + <key name="Amacron"/> + </key> + <key name="S"/> + <key name="D"/> + <key name="F"/> + <key name="G"/> + <key name="H"/> + <key name="J"/> + <key name="K"/> + <key name="L"/> + <key name="Odiaeresis"/> + <key name="Adiaeresis"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key align="left" name="Caribou_ShiftDown" toggle="level1" width="1.5"/> + <key name="Y"/> + <key name="X"/> + <key name="C"> + <key name="Ccedilla"/> + </key> + <key name="V"/> + <key name="B"/> + <key name="N"/> + <key name="M"/> + <key name="comma"/> + <key name="period"/> + <key name="question"> + <key name="question"/> + <key name="questiondown"/> + </key> + <key name="exclam"> + <key name="exclam"/> + <key name="exclamdown"/> + </key> + <key align="right" name="Caribou_ShiftDown" toggle="level1" width="1.5"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Symbols" toggle="symbols1" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Symbols_More" toggle="symbols2" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> +</external> diff --git a/data/layouts/tablet/common/symbols.xml b/data/layouts/tablet/common/symbols.xml new file mode 100644 index 0000000..6b5b9ad --- /dev/null +++ b/data/layouts/tablet/common/symbols.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" ?> +<external> + <level mode="locked" name="symbols1"> + <row> + <key align="left" name="Escape"/> + <key name="1"/> + <key name="2"/> + <key name="3"/> + <key name="4"/> + <key name="5"/> + <key name="6"/> + <key name="7"/> + <key name="8"/> + <key name="9"/> + <key name="0"/> + <key align="right" name="BackSpace" repeatable="yes" width="1"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row > + <key align="left" name="Tab" width="1.5"/> + <key name="plus"/> + <key name="minus"/> + <key name="asterisk"/> + <key name="slash"/> + <key name="asciicircum"/> + <key name="equal"/> + <key name="less"/> + <key name="greater"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key name="parenleft"/> + <key name="parenright"/> + <key name="bracketleft"/> + <key name="bracketright"/> + <key name="braceleft"/> + <key name="braceright"/> + <key name="comma"/> + <key name="period"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Alpha" toggle="default" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Symbols_More" toggle="symbols2" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> + <level mode="latched" name="symbols2"> + <row> + <key align="left" name="Escape"/> + <key name="F1"/> + <key name="F2"/> + <key name="F3"/> + <key name="F4"/> + <key name="F5"/> + <key name="F6"/> + <key name="F7"/> + <key name="F8"/> + <key name="F9"/> + <key name="F10"/> + <key name="F11"/> + <key name="F12"/> + <key align="right" name="BackSpace" repeatable="yes"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row> + <key align="left" name="Tab" width="1.5"/> + <key name="backslash"/> + <key name="bar"/> + <key name="slash"/> + <key name="ampersand"/> + <key name="at"/> + <key name="grave"/> + <key name="asciitilde"/> + <key name="dollar"/> + <key name="EuroSign"/> + <key name="sterling"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key name="numbersign"/> + <key name="percent"/> + <key name="apostrophe"/> + <key name="quotedbl"/> + <key name="semicolon"/> + <key name="colon"/> + <key name="plus"/> + <key name="minus"/> + <key name="underscore"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Symbols" toggle="symbols1" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Alpha" toggle="default" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> +</external> diff --git a/data/layouts/tablet/common/symbols_ssharp.xml b/data/layouts/tablet/common/symbols_ssharp.xml new file mode 100644 index 0000000..cade7ea --- /dev/null +++ b/data/layouts/tablet/common/symbols_ssharp.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" ?> +<external> + <level mode="locked" name="symbols1"> + <row> + <key align="left" name="Escape"/> + <key name="1"/> + <key name="2"/> + <key name="3"/> + <key name="4"/> + <key name="5"/> + <key name="6"/> + <key name="7"/> + <key name="8"/> + <key name="9"/> + <key name="0"/> + <key name="ssharp"/> + <key align="right" name="BackSpace" repeatable="yes" width="1"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row > + <key align="left" name="Tab" width="1.5"/> + <key name="plus"/> + <key name="minus"/> + <key name="asterisk"/> + <key name="slash"/> + <key name="asciicircum"/> + <key name="equal"/> + <key name="less"/> + <key name="greater"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key name="parenleft"/> + <key name="parenright"/> + <key name="bracketleft"/> + <key name="bracketright"/> + <key name="braceleft"/> + <key name="braceright"/> + <key name="comma"/> + <key name="period"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Alpha" toggle="default" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Symbols_More" toggle="symbols2" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> + <level mode="latched" name="symbols2"> + <row> + <key align="left" name="Escape"/> + <key name="F1"/> + <key name="F2"/> + <key name="F3"/> + <key name="F4"/> + <key name="F5"/> + <key name="F6"/> + <key name="F7"/> + <key name="F8"/> + <key name="F9"/> + <key name="F10"/> + <key name="F11"/> + <key name="F12"/> + <key align="right" name="BackSpace" repeatable="yes"/> + <key align="right" name="Caribou_Prefs"/> + </row> + <row> + <key align="left" name="Tab" width="1.5"/> + <key name="backslash"/> + <key name="bar"/> + <key name="slash"/> + <key name="ampersand"/> + <key name="at"/> + <key name="grave"/> + <key name="asciitilde"/> + <key name="dollar"/> + <key name="EuroSign"/> + <key name="sterling"/> + <key align="right" name="Return" width="1.5"/> + </row> + <row> + <key name="numbersign"/> + <key name="percent"/> + <key name="apostrophe"/> + <key name="quotedbl"/> + <key name="semicolon"/> + <key name="colon"/> + <key name="plus"/> + <key name="minus"/> + <key name="underscore"/> + </row> + <row> + <key name="Control_L" width="1.5"/> + <key name="Alt_L" width="1.5"/> + <key name="Caribou_Symbols" toggle="symbols1" width="1.5"/> + <key name="space" width="7.0" repeatable="yes"/> + <key name="Caribou_Alpha" toggle="default" width="1.5"/> + <key name="Left" repeatable="yes"/> + <key name="Up" repeatable="yes"/> + <key name="Down" repeatable="yes"/> + <key name="Right" repeatable="yes"/> + </row> + </level> +</external> diff --git a/data/layouts/tablet/de.xml.in b/data/layouts/tablet/de.xml.in new file mode 100644 index 0000000..9884369 --- /dev/null +++ b/data/layouts/tablet/de.xml.in @@ -0,0 +1,8 @@ +<?xml version="1.0" ?> +<layout xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="common/qwertz.xml#xpointer(//level[@name='level1'])"/> + <xi:include href="common/qwertz.xml#xpointer(//level[@name='level2'])"/> + <xi:include href="common/symbols_ssharp.xml#xpointer(//level[@name='symbols1'])"/> + <xi:include href="common/symbols_ssharp.xml#xpointer(//level[@name='symbols2'])"/> +</layout> + diff --git a/data/layouts/tablet/us.xml.in b/data/layouts/tablet/us.xml.in new file mode 100644 index 0000000..d0cda7b --- /dev/null +++ b/data/layouts/tablet/us.xml.in @@ -0,0 +1,8 @@ +<?xml version="1.0" ?> +<layout xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="common/qwerty.xml#xpointer(//level[@name='level1'])"/> + <xi:include href="common/qwerty.xml#xpointer(//level[@name='level2'])"/> + <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/> + <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/> +</layout> + |