diff options
5 files changed, 44 insertions, 3 deletions
diff --git a/contrib/ayatana-indicator-keyboard-icon-generator-lomiri.py b/contrib/ayatana-indicator-keyboard-icon-generator-lomiri.py index 069dd81d..6d69fa5c 100755 --- a/contrib/ayatana-indicator-keyboard-icon-generator-lomiri.py +++ b/contrib/ayatana-indicator-keyboard-icon-generator-lomiri.py @@ -170,7 +170,8 @@ m_lLanguages = [ 'Ya', #Yakut 'Yo', #Yoruba 'emoji', #Emoji -'00' #Unknown +'custom', #Custom +'00' #Unknown ] def printHelp(): @@ -258,6 +259,10 @@ if __name__ == '__main__': sLanguageText = '😐' + elif sLanguage == 'custom': + + sLanguageText = '#' + with open(sOutPath, 'w') as pFile: pLayout.set_text(sLanguageText, -1) diff --git a/contrib/ayatana-indicator-keyboard-icon-generator.py b/contrib/ayatana-indicator-keyboard-icon-generator.py index 0316d7f4..586c8229 100755 --- a/contrib/ayatana-indicator-keyboard-icon-generator.py +++ b/contrib/ayatana-indicator-keyboard-icon-generator.py @@ -168,7 +168,9 @@ m_lLanguages = [ 'Wo', #Wolof 'Ya', #Yakut 'Yo', #Yoruba -'00' #Unknown +'emoji', #Emoji +'custom', #Custom +'00' #Unknown ] def printHelp(): @@ -253,6 +255,14 @@ if __name__ == '__main__': sLanguage = '?' + elif sLanguage == 'emoji': + + sLanguage = '😐' + + elif sLanguage == 'custom': + + sLanguage = '#' + pLayout.set_text(sLanguage, -1) nLayoutWidth, nLayoutHeight = pLayout.get_size() nBaseline = pLayout.get_baseline() diff --git a/data/icons/scalable/status/ayatana-indicator-keyboard-custom.svg b/data/icons/scalable/status/ayatana-indicator-keyboard-custom.svg new file mode 100644 index 00000000..772f449d --- /dev/null +++ b/data/icons/scalable/status/ayatana-indicator-keyboard-custom.svg @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="24" height="24"><defs><mask id="m"><rect x="0" y="0" width="24" height="24" style="fill:white"/><text x="5.5" y="17.193359375" style="font-family:Sans Regular;font-weight:500;font-size:15;fill:black">#</text></mask></defs><rect x="0.0" y="0.0" width="24" height="24" rx="3" mask="url(#m)" style="fill:#ffffff"/></svg>
\ No newline at end of file diff --git a/data/icons/scalable/status/ayatana-indicator-keyboard-emoji.svg b/data/icons/scalable/status/ayatana-indicator-keyboard-emoji.svg new file mode 100644 index 00000000..b8b6fb46 --- /dev/null +++ b/data/icons/scalable/status/ayatana-indicator-keyboard-emoji.svg @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="24" height="24"><defs><mask id="m"><rect x="0" y="0" width="24" height="24" style="fill:white"/><text x="4.0" y="17.193359375" style="font-family:Sans Regular;font-weight:500;font-size:15;fill:black">😐</text></mask></defs><rect x="0.0" y="0.0" width="24" height="24" rx="3" mask="url(#m)" style="fill:#ffffff"/></svg>
\ No newline at end of file diff --git a/src/languages.h b/src/languages.h index f3c1a7ea..875ee108 100644 --- a/src/languages.h +++ b/src/languages.h @@ -142,6 +142,7 @@ gchar *LANGUAGES[] = "Cs", //Czech (typographic) "Cs", //Czech (with <\\|> key) "Cs", //Czech Slovak and German (US) + "Cs", //Czech, Slovak, Polish, Spanish, Finnish, Swedish and German (US) "Da", //Danish "Da", //Danish (Dvorak) "Da", //Danish (Macintosh) @@ -154,6 +155,7 @@ gchar *LANGUAGES[] = "Nl", //Dutch (Macintosh) "Nl", //Dutch (Sun Type 6/7) "Nl", //Dutch (standard) + "Nl", //Dutch (US) "Dz", //Dzongkha "Ed", //Elfdalian (Swedish, with combining ogonek) "En", //English (3l) @@ -173,6 +175,7 @@ gchar *LANGUAGES[] = "En", //English (Carpalx, intl., with dead keys) "En", //English (Colemak) "En", //English (Colemak-DH) + "En", //English (Colemak-DH ISO) "En", //English (Drix) "En", //English (Dvorak) "En", //English (Dvorak, alt. intl.) @@ -458,6 +461,7 @@ gchar *LANGUAGES[] = "Lv", //Latvian (programmer Dvorak, with Y) "Lv", //Latvian (programmer Dvorak, with minus) "Lv", //Latvian (tilde) + "Lv", //Latvian (apostrophe, dead quotes) "Lt", //Lithuanian "Lt", //Lithuanian (Dvorak) "Lt", //Lithuanian (IBM LST 1205-92) @@ -528,6 +532,8 @@ gchar *LANGUAGES[] = "Hu", //Old Hungarian (for ligatures) "Tr", //Old Turkic "Or", //Oriya + "Or", //Oriya (Bolnagri) + "Or", //Oriya (Wx) "Os", //Ossetian (Georgia) "Os", //Ossetian (Windows) "Os", //Ossetian (legacy) @@ -690,6 +696,8 @@ gchar *LANGUAGES[] = "Tr", //Turkish (Germany) "Tr", //Turkish (Sun Type 6/7) "Tr", //Turkish (intl., with dead keys) + "Tr", //Ottoman + "Tr", //Ottoman (F) "Tk", //Turkmen "Tk", //Turkmen (Alt-Q) "Ud", //Udmurt @@ -705,9 +713,11 @@ gchar *LANGUAGES[] = "Ur", //Urdu (Pakistan) "Ur", //Urdu (Pakistan, CRULP) "Ur", //Urdu (Pakistan, NLA) + "Ur", //Urdu (Navees, Pakistan) "Ur", //Urdu (Windows) "Ur", //Urdu (alt. phonetic) "Ur", //Urdu (phonetic) + "Ur", //Urdu (Navees) "Ug", //Uyghur "Uz", //Uzbek "Uz", //Uzbek (Afghanistan) @@ -721,6 +731,8 @@ gchar *LANGUAGES[] = "Wo", //Wolof "Ya", //Yakut "Yo", //Yoruba + "emoji", //Emoji + "custom", //Custom NULL }; @@ -850,6 +862,7 @@ gchar *IDS[] = "cz+typo", //Czech (typographic) "cz+bksl", //Czech (with <\\|> key) "us+cz_sk_de", //Czech Slovak and German (US) + "us+cz_sk_pl_de_es_fi_sv", //Czech, Slovak, Polish, Spanish, Finnish, Swedish and German (US) "dk", //Danish "dk+dvorak", //Danish (Dvorak) "dk+mac", //Danish (Macintosh) @@ -862,6 +875,7 @@ gchar *IDS[] = "nl+mac", //Dutch (Macintosh) "nl+sun_type6", //Dutch (Sun Type 6/7) "nl+std", //Dutch (standard) + "nl+us", //Dutch (US) "bt", //Dzongkha "se+ovd", //Elfdalian (Swedish, with combining ogonek) "us+3l", //English (3l) @@ -881,6 +895,7 @@ gchar *IDS[] = "us+carpalx-intl", //English (Carpalx, intl., with dead keys) "us+colemak", //English (Colemak) "us+colemak_dh", //English (Colemak-DH) + "us+colemak_dh_iso", //English (Colemak-DH ISO) "us+drix", //English (Drix) "us+dvorak", //English (Dvorak) "us+dvorak-alt-intl", //English (Dvorak, alt. intl.) @@ -1166,6 +1181,7 @@ gchar *IDS[] = "lv+ykeydvorakprogr", //Latvian (programmer Dvorak, with Y) "lv+minuskeydvorakprogr", //Latvian (programmer Dvorak, with minus) "lv+tilde", //Latvian (tilde) + "lv+apostrophe-deadquotes", //Latvian (apostrophe, dead quotes) "lt", //Lithuanian "lt+us_dvorak", //Lithuanian (Dvorak) "lt+ibm", //Lithuanian (IBM LST 1205-92) @@ -1236,6 +1252,8 @@ gchar *IDS[] = "hu+oldhunlig", //Old Hungarian (for ligatures) "tr+otk", //Old Turkic "in+ori", //Oriya + "in+ori-bolnagri", //Oriya (Bolnagri) + "in+ori-wx", //Oriya (Wx) "ge+os", //Ossetian (Georgia) "ru+os_winkeys", //Ossetian (Windows) "ru+os_legacy", //Ossetian (legacy) @@ -1398,6 +1416,8 @@ gchar *IDS[] = "de+tr", //Turkish (Germany) "tr+sun_type6", //Turkish (Sun Type 6/7) "tr+intl", //Turkish (intl., with dead keys) + "tr+ot", //Ottoman + "tr+otf", //Ottoman (F) "tm", //Turkmen "tm+alt", //Turkmen (Alt-Q) "ru+udm", //Udmurt @@ -1413,9 +1433,11 @@ gchar *IDS[] = "pk", //Urdu (Pakistan) "pk+urd-crulp", //Urdu (Pakistan, CRULP) "pk+urd-nla", //Urdu (Pakistan, NLA) + "pk+urd-navees", //Urdu (Navees, Pakistan) "in+urd-winkeys", //Urdu (Windows) "in+urd-phonetic3", //Urdu (alt. phonetic) "in+urd-phonetic", //Urdu (phonetic) + "in+urd-navees", //Urdu (Navees) "cn+ug", //Uyghur "uz", //Uzbek "af+uz", //Uzbek (Afghanistan) @@ -1428,7 +1450,9 @@ gchar *IDS[] = "vn+us", //Vietnamese (US) "sn", //Wolof "ru+sah", //Yakut - "ng+yoruba", //Yoruba + "ng+yoruba", //Yorubaz + "emoji", //Emoji + "custom", //Custom NULL }; |
