Attachment #5320 for bug #26934

View | Details | Raw Unified | Return to bug 26934
Collapse All | Expand All

Lines 1-5 Link Here

(-)a/data/layouts/fullscale/Makefile.am (+1 lines)
1	fullscalelayoutsdir = $(datadir)/caribou/layouts/fullscale	1	fullscalelayoutsdir = $(datadir)/caribou/layouts/fullscale
2	fullscalelayouts_in_files =\	2	fullscalelayouts_in_files =\
		3	ru.xml.in \
3	us.xml.in	4	us.xml.in
4	fullscalelayouts_DATA = $(fullscalelayouts_in_files:.xml.in=.xml)	5	fullscalelayouts_DATA = $(fullscalelayouts_in_files:.xml.in=.xml)
5		6




<?xml version="1.0" ?>
<layout xmlns:xi="http://www.w3.org/2001/XInclude">
  <level mode="default" name="level1">
    <row>
      <key name="Esc"/>
      <key name="Cyrillic_io"/>
      <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"/>
    </row>
    <row align="right">
      <key name="Tab" width="1.5"/>
      <key name="Cyrillic_shorti"/>
      <key name="Cyrillic_tse"/>
      <key name="Cyrillic_u"/>
      <key name="Cyrillic_ka"/>
      <key name="Cyrillic_ie"/>
      <key name="Cyrillic_en"/>
      <key name="Cyrillic_ghe"/>
      <key name="Cyrillic_sha"/>
      <key name="Cyrillic_shcha"/>
      <key name="Cyrillic_ze"/>
      <key name="Cyrillic_ha"/>
      <key name="Cyrillic_hardsign"/>
      <key name="BackSpace"/>
    </row>
    <row align="right">
      <key name="Cyrillic_ef"/>
      <key name="Cyrillic_yeru"/>
      <key name="Cyrillic_ve"/>
      <key name="Cyrillic_a"/>
      <key name="Cyrillic_pe"/>
      <key name="Cyrillic_er"/>
      <key name="Cyrillic_o"/>
      <key name="Cyrillic_el"/>
      <key name="Cyrillic_de"/>
      <key name="Cyrillic_zhe"/>
      <key name="Cyrillic_e"/>
      <key name="Return" width="2.0"/>
    </row>
    <row>
      <key name="Caribou_ShiftUp" width="2.5" toggle="level2"/>
      <key name="Cyrillic_ya"/>
      <key name="Cyrillic_che"/>
      <key name="Cyrillic_es"/>
      <key name="Cyrillic_em"/>
      <key name="Cyrillic_i"/>
      <key name="Cyrillic_te"/>
      <key name="Cyrillic_softsign"/>
      <key name="Cyrillic_be"/>
      <key name="Cyrillic_yu"/>
    </row>
    <row>
      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
      <key align="left" name="Control_L" width="1.5"/>
      <key align="left" name="Alt_L" width="1.5"/>
      <key align="left" name="space" width="8.0"/>
      <key align="right" name="Caribou_Prefs"/>
    </row>
  </level>
  <level mode="latched" name="level2">
    <row>
      <key name="Esc"/>
      <key name="Cyrillic_IO"/>
      <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"/>
    </row>
    <row align="right">
      <key name="Tab" width="1.5"/>
      <key name="Cyrillic_SHORTI"/>
      <key name="Cyrillic_TSE"/>
      <key name="Cyrillic_U"/>
      <key name="Cyrillic_KA"/>
      <key name="Cyrillic_IE"/>
      <key name="Cyrillic_EN"/>
      <key name="Cyrillic_GHE"/>
      <key name="Cyrillic_SHA"/>
      <key name="Cyrillic_SHCHA"/>
      <key name="Cyrillic_ZE"/>
      <key name="Cyrillic_HA"/>
      <key name="Cyrillic_HARDSIGN"/>
      <key name="BackSpace"/>
    </row>
    <row align="right">
      <key name="Cyrillic_EF"/>
      <key name="Cyrillic_YERU"/>
      <key name="Cyrillic_VE"/>
      <key name="Cyrillic_A"/>
      <key name="Cyrillic_PE"/>
      <key name="Cyrillic_ER"/>
      <key name="Cyrillic_O"/>
      <key name="Cyrillic_EL"/>
      <key name="Cyrillic_DE"/>
      <key name="Cyrillic_ZHE"/>
      <key name="Cyrillic_E"/>
      <key name="Return" width="2.0"/>
    </row>
    <row>
      <key name="Caribou_ShiftUp" width="2.5" toggle="level2"/>
      <key name="Cyrillic_YA"/>
      <key name="Cyrillic_CHE"/>
      <key name="Cyrillic_ES"/>
      <key name="Cyrillic_EM"/>
      <key name="Cyrillic_I"/>
      <key name="Cyrillic_TE"/>
      <key name="Cyrillic_SOFTSIGN"/>
      <key name="Cyrillic_BE"/>
      <key name="Cyrillic_YU"/>
    </row>
    <row>
      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
      <key align="left" name="Control_L" width="1.5"/>
      <key align="left" name="Alt_L" width="1.5"/>
      <key align="left" name="space" width="8.0"/>
      <key align="right" name="Caribou_Prefs"/>
    </row>
  </level>
  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/>
  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/>
</layout>


Lines 2-7 touchlayoutsdir = $(datadir)/caribou/layouts/touch Link Here

(-)a/data/layouts/touch/Makefile.am (-1 / +2 lines)
2	touchlayouts_in_files =\	2	touchlayouts_in_files =\
3	ara.xml.in \	3	ara.xml.in \
4	il.xml.in \	4	il.xml.in \
		5	ru.xml.in \
5	us.xml.in	6	us.xml.in
6	touchlayouts_DATA = $(touchlayouts_in_files:.xml.in=.xml)	7	touchlayouts_DATA = $(touchlayouts_in_files:.xml.in=.xml)
7		8
Lines 17-20 common_files = \ Link Here
17		18
18	EXTRA_DIST = $(touchlayouts_in_files) $(common_files)	19	EXTRA_DIST = $(touchlayouts_in_files) $(common_files)
19		20
20	CLEANFILES = $(touchlayouts_DATA) $(touchlayouts_in_files:.xml.in=.xsl)	21	CLEANFILES = $(touchlayouts_DATA) $(touchlayouts_in_files:.xml.in=.xsl)




<?xml version="1.0" ?>
<layout xmlns:xi="http://www.w3.org/2001/XInclude">
  <level mode="default" name="level1">
    <row align="right">
      <key name="Cyrillic_io"/>
      <key name="Cyrillic_shorti"/>
      <key name="Cyrillic_tse"/>
      <key name="Cyrillic_u"/>
      <key name="Cyrillic_ka"/>
      <key name="Cyrillic_ie"/>
      <key name="Cyrillic_en"/>
      <key name="Cyrillic_ghe"/>
      <key name="Cyrillic_sha"/>
      <key name="Cyrillic_shcha"/>
      <key name="Cyrillic_ze"/>
      <key name="Cyrillic_ha"/>
      <key name="Cyrillic_hardsign"/>
      <key name="BackSpace"/>
    </row>
    <row align="right">
      <key name="Cyrillic_ef"/>
      <key name="Cyrillic_yeru"/>
      <key name="Cyrillic_ve"/>
      <key name="Cyrillic_a"/>
      <key name="Cyrillic_pe"/>
      <key name="Cyrillic_er"/>
      <key name="Cyrillic_o"/>
      <key name="Cyrillic_el"/>
      <key name="Cyrillic_de"/>
      <key name="Cyrillic_zhe"/>
      <key name="Cyrillic_e"/>
      <key name="Return" width="2.0"/>
    </row>
    <row>
      <key name="Caribou_ShiftUp" width="2.0" toggle="level2"/>
      <key name="Cyrillic_ya"/>
      <key name="Cyrillic_che"/>
      <key name="Cyrillic_es"/>
      <key name="Cyrillic_em"/>
      <key name="Cyrillic_i"/>
      <key name="Cyrillic_te"/>
      <key name="Cyrillic_softsign"/>
      <key name="Cyrillic_be"/>
      <key name="Cyrillic_yu"/>
    </row>
    <row>
      <key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
      <key name="space" width="8.0" align="center"/>
      <key name="Caribou_Prefs" align="right"/>
    </row>
  </level>
  <level mode="latched" name="level2">
    <row align="right">
      <key name="Cyrillic_IO"/>
      <key name="Cyrillic_SHORTI"/>
      <key name="Cyrillic_TSE"/>
      <key name="Cyrillic_U"/>
      <key name="Cyrillic_KA"/>
      <key name="Cyrillic_IE"/>
      <key name="Cyrillic_EN"/>
      <key name="Cyrillic_GHE"/>
      <key name="Cyrillic_SHA"/>
      <key name="Cyrillic_SHCHA"/>
      <key name="Cyrillic_ZE"/>
      <key name="Cyrillic_HA"/>
      <key name="Cyrillic_HARDSIGN"/>
      <key name="BackSpace"/>
    </row>
    <row align="right">
      <key name="Cyrillic_EF"/>
      <key name="Cyrillic_YERU"/>
      <key name="Cyrillic_VE"/>
      <key name="Cyrillic_A"/>
      <key name="Cyrillic_PE"/>
      <key name="Cyrillic_ER"/>
      <key name="Cyrillic_O"/>
      <key name="Cyrillic_EL"/>
      <key name="Cyrillic_DE"/>
      <key name="Cyrillic_ZHE"/>
      <key name="Cyrillic_E"/>
      <key name="Return" width="2.0"/>
    </row>
    <row>
      <key name="Caribou_ShiftUp" width="2.0" toggle="level2"/>
      <key name="Cyrillic_YA"/>
      <key name="Cyrillic_CHE"/>
      <key name="Cyrillic_ES"/>
      <key name="Cyrillic_EM"/>
      <key name="Cyrillic_I"/>
      <key name="Cyrillic_TE"/>
      <key name="Cyrillic_SOFTSIGN"/>
      <key name="Cyrillic_BE"/>
      <key name="Cyrillic_YU"/>
    </row>
    <row>
      <key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
      <key name="space" width="8.0" align="center"/>
      <key name="Caribou_Prefs" align="right"/>
    </row>
  </level>
  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/>
  <xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/>
</layout>


Return to bug 26934

Line 0 Link Here

(-)a/data/layouts/fullscale/ru.xml.in (+140 lines)
		1	<?xml version="1.0" ?>
		2	<layout xmlns:xi="http://www.w3.org/2001/XInclude">
		3	<level mode="default" name="level1">
		4	<row>
		5	<key name="Esc"/>
		6	<key name="Cyrillic_io"/>
		7	<key name="F1"/>
		8	<key name="F2"/>
		9	<key name="F3"/>
		10	<key name="F4"/>
		11	<key name="F5"/>
		12	<key name="F6"/>
		13	<key name="F7"/>
		14	<key name="F8"/>
		15	<key name="F9"/>
		16	<key name="F10"/>
		17	<key name="F11"/>
		18	<key name="F12"/>
		19	</row>
		20	<row align="right">
		21	<key name="Tab" width="1.5"/>
		22	<key name="Cyrillic_shorti"/>
		23	<key name="Cyrillic_tse"/>
		24	<key name="Cyrillic_u"/>
		25	<key name="Cyrillic_ka"/>
		26	<key name="Cyrillic_ie"/>
		27	<key name="Cyrillic_en"/>
		28	<key name="Cyrillic_ghe"/>
		29	<key name="Cyrillic_sha"/>
		30	<key name="Cyrillic_shcha"/>
		31	<key name="Cyrillic_ze"/>
		32	<key name="Cyrillic_ha"/>
		33	<key name="Cyrillic_hardsign"/>
		34	<key name="BackSpace"/>
		35	</row>
		36	<row align="right">
		37	<key name="Cyrillic_ef"/>
		38	<key name="Cyrillic_yeru"/>
		39	<key name="Cyrillic_ve"/>
		40	<key name="Cyrillic_a"/>
		41	<key name="Cyrillic_pe"/>
		42	<key name="Cyrillic_er"/>
		43	<key name="Cyrillic_o"/>
		44	<key name="Cyrillic_el"/>
		45	<key name="Cyrillic_de"/>
		46	<key name="Cyrillic_zhe"/>
		47	<key name="Cyrillic_e"/>
		48	<key name="Return" width="2.0"/>
		49	</row>
		50	<row>
		51	<key name="Caribou_ShiftUp" width="2.5" toggle="level2"/>
		52	<key name="Cyrillic_ya"/>
		53	<key name="Cyrillic_che"/>
		54	<key name="Cyrillic_es"/>
		55	<key name="Cyrillic_em"/>
		56	<key name="Cyrillic_i"/>
		57	<key name="Cyrillic_te"/>
		58	<key name="Cyrillic_softsign"/>
		59	<key name="Cyrillic_be"/>
		60	<key name="Cyrillic_yu"/>
		61	</row>
		62	<row>
		63	<key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
		64	<key align="left" name="Control_L" width="1.5"/>
65	<key align="left" name="Alt_L" width="1.5"/>
66	<key align="left" name="space" width="8.0"/>
67	<key align="right" name="Caribou_Prefs"/>
68	</row>
69	</level>
70	<level mode="latched" name="level2">
71	<row>
72	<key name="Esc"/>
73	<key name="Cyrillic_IO"/>
74	<key name="F1"/>
75	<key name="F2"/>
76	<key name="F3"/>
77	<key name="F4"/>
78	<key name="F5"/>
79	<key name="F6"/>
80	<key name="F7"/>
81	<key name="F8"/>
82	<key name="F9"/>
83	<key name="F10"/>
84	<key name="F11"/>
85	<key name="F12"/>
86	</row>
87	<row align="right">
88	<key name="Tab" width="1.5"/>
89	<key name="Cyrillic_SHORTI"/>
90	<key name="Cyrillic_TSE"/>
91	<key name="Cyrillic_U"/>
92	<key name="Cyrillic_KA"/>
93	<key name="Cyrillic_IE"/>
94	<key name="Cyrillic_EN"/>
95	<key name="Cyrillic_GHE"/>
96	<key name="Cyrillic_SHA"/>
97	<key name="Cyrillic_SHCHA"/>
98	<key name="Cyrillic_ZE"/>
99	<key name="Cyrillic_HA"/>
100	<key name="Cyrillic_HARDSIGN"/>
101	<key name="BackSpace"/>
102	</row>
103	<row align="right">
104	<key name="Cyrillic_EF"/>
105	<key name="Cyrillic_YERU"/>
106	<key name="Cyrillic_VE"/>
107	<key name="Cyrillic_A"/>
108	<key name="Cyrillic_PE"/>
109	<key name="Cyrillic_ER"/>
110	<key name="Cyrillic_O"/>
111	<key name="Cyrillic_EL"/>
112	<key name="Cyrillic_DE"/>
113	<key name="Cyrillic_ZHE"/>
114	<key name="Cyrillic_E"/>
115	<key name="Return" width="2.0"/>
116	</row>
117	<row>
118	<key name="Caribou_ShiftUp" width="2.5" toggle="level2"/>
119	<key name="Cyrillic_YA"/>
120	<key name="Cyrillic_CHE"/>
121	<key name="Cyrillic_ES"/>
122	<key name="Cyrillic_EM"/>
123	<key name="Cyrillic_I"/>
124	<key name="Cyrillic_TE"/>
125	<key name="Cyrillic_SOFTSIGN"/>
126	<key name="Cyrillic_BE"/>
127	<key name="Cyrillic_YU"/>
128	</row>
129	<row>
130	<key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
131	<key align="left" name="Control_L" width="1.5"/>
132	<key align="left" name="Alt_L" width="1.5"/>
133	<key align="left" name="space" width="8.0"/>
134	<key align="right" name="Caribou_Prefs"/>
135	</row>
136	</level>
137	<xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/>
138	<xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/>
139	</layout>
140

Line 0 Link Here

(-)a/data/layouts/touch/ru.xml.in (-1 / +104 lines)
0	-	1	<?xml version="1.0" ?>
		2	<layout xmlns:xi="http://www.w3.org/2001/XInclude">
		3	<level mode="default" name="level1">
		4	<row align="right">
		5	<key name="Cyrillic_io"/>
		6	<key name="Cyrillic_shorti"/>
		7	<key name="Cyrillic_tse"/>
		8	<key name="Cyrillic_u"/>
		9	<key name="Cyrillic_ka"/>
		10	<key name="Cyrillic_ie"/>
		11	<key name="Cyrillic_en"/>
		12	<key name="Cyrillic_ghe"/>
		13	<key name="Cyrillic_sha"/>
		14	<key name="Cyrillic_shcha"/>
		15	<key name="Cyrillic_ze"/>
		16	<key name="Cyrillic_ha"/>
		17	<key name="Cyrillic_hardsign"/>
		18	<key name="BackSpace"/>
		19	</row>
		20	<row align="right">
		21	<key name="Cyrillic_ef"/>
		22	<key name="Cyrillic_yeru"/>
		23	<key name="Cyrillic_ve"/>
		24	<key name="Cyrillic_a"/>
		25	<key name="Cyrillic_pe"/>
		26	<key name="Cyrillic_er"/>
		27	<key name="Cyrillic_o"/>
		28	<key name="Cyrillic_el"/>
		29	<key name="Cyrillic_de"/>
		30	<key name="Cyrillic_zhe"/>
		31	<key name="Cyrillic_e"/>
		32	<key name="Return" width="2.0"/>
		33	</row>
		34	<row>
		35	<key name="Caribou_ShiftUp" width="2.0" toggle="level2"/>
		36	<key name="Cyrillic_ya"/>
		37	<key name="Cyrillic_che"/>
		38	<key name="Cyrillic_es"/>
		39	<key name="Cyrillic_em"/>
		40	<key name="Cyrillic_i"/>
		41	<key name="Cyrillic_te"/>
		42	<key name="Cyrillic_softsign"/>
		43	<key name="Cyrillic_be"/>
		44	<key name="Cyrillic_yu"/>
		45	</row>
		46	<row>
		47	<key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
		48	<key name="space" width="8.0" align="center"/>
		49	<key name="Caribou_Prefs" align="right"/>
		50	</row>
		51	</level>
		52	<level mode="latched" name="level2">
		53	<row align="right">
		54	<key name="Cyrillic_IO"/>
		55	<key name="Cyrillic_SHORTI"/>
		56	<key name="Cyrillic_TSE"/>
		57	<key name="Cyrillic_U"/>
		58	<key name="Cyrillic_KA"/>
		59	<key name="Cyrillic_IE"/>
		60	<key name="Cyrillic_EN"/>
		61	<key name="Cyrillic_GHE"/>
		62	<key name="Cyrillic_SHA"/>
		63	<key name="Cyrillic_SHCHA"/>
		64	<key name="Cyrillic_ZE"/>
		65	<key name="Cyrillic_HA"/>
66	<key name="Cyrillic_HARDSIGN"/>
67	<key name="BackSpace"/>
68	</row>
69	<row align="right">
70	<key name="Cyrillic_EF"/>
71	<key name="Cyrillic_YERU"/>
72	<key name="Cyrillic_VE"/>
73	<key name="Cyrillic_A"/>
74	<key name="Cyrillic_PE"/>
75	<key name="Cyrillic_ER"/>
76	<key name="Cyrillic_O"/>
77	<key name="Cyrillic_EL"/>
78	<key name="Cyrillic_DE"/>
79	<key name="Cyrillic_ZHE"/>
80	<key name="Cyrillic_E"/>
81	<key name="Return" width="2.0"/>
82	</row>
83	<row>
84	<key name="Caribou_ShiftUp" width="2.0" toggle="level2"/>
85	<key name="Cyrillic_YA"/>
86	<key name="Cyrillic_CHE"/>
87	<key name="Cyrillic_ES"/>
88	<key name="Cyrillic_EM"/>
89	<key name="Cyrillic_I"/>
90	<key name="Cyrillic_TE"/>
91	<key name="Cyrillic_SOFTSIGN"/>
92	<key name="Cyrillic_BE"/>
93	<key name="Cyrillic_YU"/>
94	</row>
95	<row>
96	<key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
97	<key name="space" width="8.0" align="center"/>
98	<key name="Caribou_Prefs" align="right"/>
99	</row>
100	</level>
101	<xi:include href="common/symbols.xml#xpointer(//level[@name='symbols1'])"/>
102	<xi:include href="common/symbols.xml#xpointer(//level[@name='symbols2'])"/>
103	</layout>
104