Add dagger (also double dagger) as an extra key in QWERTY-like layouts

Julow · Jul 27, 2023 · ce88dd6 · ce88dd6
1 parent 9fc861e
commit ce88dd6
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 18 deletions.
diff --git a/res/xml/latn_azerty_fr.xml b/res/xml/latn_azerty_fr.xml
@@ -29,7 +29,7 @@
   <row>
     <key width="2.0" key0="shift" key2="loc capslock"/>
     <key key0="w" key3="&lt;" key4="&gt;"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
     <key key0="v" key3=";" key4="."/>
     <key key0="b" key3=":" key4="/"/>

diff --git a/res/xml/latn_qwerty_br.xml b/res/xml/latn_qwerty_br.xml
@@ -28,7 +28,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b"/>

diff --git a/res/xml/latn_qwerty_es.xml b/res/xml/latn_qwerty_es.xml
@@ -27,7 +27,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/" key4="¿"/>

diff --git a/res/xml/latn_qwerty_hu.xml b/res/xml/latn_qwerty_hu.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z" key3="&lt;" key4="&gt;"/>
-    <key key0="x" key4="\#"/>
+    <key key0="x" key1="loc †" key4="\#"/>
     <key key0="c" key4="&amp;"/>
     <key key0="v" key4="\@"/>
     <key key0="b" key1="\?" key3="," key4=";"/>

diff --git a/res/xml/latn_qwerty_lv.xml b/res/xml/latn_qwerty_lv.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z" key1="ž"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="č"/>
     <key key0="v"/>
     <key key0="b" key2="\?" key3="&lt;" key4="&gt;"/>

diff --git a/res/xml/latn_qwerty_no.xml b/res/xml/latn_qwerty_no.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>

diff --git a/res/xml/latn_qwerty_pl.xml b/res/xml/latn_qwerty_pl.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z" key4="ż"/>
-    <key key0="x" key4="ź"/>
+    <key key0="x" key2="loc †" key4="ź"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="." key4="ć"/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>

diff --git a/res/xml/latn_qwerty_ro.xml b/res/xml/latn_qwerty_ro.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>

diff --git a/res/xml/latn_qwerty_se.xml b/res/xml/latn_qwerty_se.xml
@@ -29,7 +29,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b" key2=";" key4=","/>

diff --git a/res/xml/latn_qwerty_tr.xml b/res/xml/latn_qwerty_tr.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="ç" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>

diff --git a/res/xml/latn_qwerty_us.xml b/res/xml/latn_qwerty_us.xml
@@ -47,7 +47,7 @@ See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x"/>
+    <key key0="x" key2="loc †"/>
     <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>

diff --git a/res/xml/latn_qwerty_vi.xml b/res/xml/latn_qwerty_vi.xml
@@ -27,7 +27,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="z"/>
-    <key key0="x" key1="accent_tilde"/>
+    <key key0="x" key1="accent_tilde" key2="loc †"/>
     <key key0="c" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>

diff --git a/res/xml/latn_qwertz.xml b/res/xml/latn_qwertz.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key1="&gt;" key2="|" key3="&lt;"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c"/>
     <key key0="v" />
     <key key0="b" key1=";" key3=","/>

diff --git a/res/xml/latn_qwertz_cz.xml b/res/xml/latn_qwertz_cz.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key2="ý"/>
-    <key key0="x" key3="\#"/>
+    <key key0="x" key1="loc †" key3="\#"/>
     <key key0="c" key3="&amp;" key4="č"/>
     <key key0="v" key3="\@"/>
     <key key0="b" key1="&lt;" key2="&gt;" key3="{" key4="}"/>

diff --git a/res/xml/latn_qwertz_cz_multifunctional.xml b/res/xml/latn_qwertz_cz_multifunctional.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key1="÷" key2="ý"/>
-    <key key0="x" key1="∙" key3="×"/>
+    <key key0="x" key1="∙" key3="×" key4="loc †"/>
     <key key0="c" key1="\#" key2="γ" key3="&amp;" key4="č"/>
     <key key0="v" key1="|" key3="\@"/>
     <key key0="b" key1=";" key2="♭" key3=":" key4="β"/>

diff --git a/res/xml/latn_qwertz_de.xml b/res/xml/latn_qwertz_de.xml
@@ -30,7 +30,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key shift="0.5" key0="y" key1="&gt;" key2="|" key3="&lt;"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c"/>
     <key key0="v"/>
     <key key0="b" key1=";" key3=","/>

diff --git a/res/xml/latn_qwertz_hu.xml b/res/xml/latn_qwertz_hu.xml
@@ -26,7 +26,7 @@
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
     <key key0="y" key3="&lt;" key4="&gt;"/>
-    <key key0="x" key4="\#"/>
+    <key key0="x" key1="loc †" key4="\#"/>
     <key key0="c" key4="&amp;"/>
     <key key0="v" key4="\@"/>
     <key key0="b" key1="\?" key3="," key4=";"/>

diff --git a/res/xml/latn_qwertz_sk.xml b/res/xml/latn_qwertz_sk.xml
@@ -27,7 +27,7 @@
   <row>
     <key key0="shift" key2="loc capslock"/>
     <key key0="y" key1="$" key3="ý"/>
-    <key key0="x"/>
+    <key key0="x" key1="loc †"/>
     <key key0="c" key4="č"/>
     <key key0="v" key4="\@"/>
     <key key0="b" key1="\#" key2="&amp;" key3="-" key4="_"/>

diff --git a/srcs/juloo.keyboard2/ExtraKeysPreference.java b/srcs/juloo.keyboard2/ExtraKeysPreference.java
@@ -42,6 +42,7 @@ public class ExtraKeysPreference extends PreferenceCategory
     "ß",
     "£",
     "§",
+    "†",
     "switch_greekmath",
     "capslock",
     "copy",

diff --git a/srcs/juloo.keyboard2/KeyModifier.java b/srcs/juloo.keyboard2/KeyModifier.java
@@ -238,6 +238,7 @@ private static String apply_fn_char(char c)
       case '?': return "¿";
       case '|': return "¦";
       case '§': return "¶";
+      case '†': return "‡";
       case '×': return "∙";
       // arrows
       case '↖': return "⇖";