Revert "Make composed text font customizable"

ZRCola composed text depends on the ZRCola font a lot. With the recent
introduction of ZRCola >> Unicode transposition, a non-ZRCola font for
composed text does make sense, but the GUI should change back to ZRCola
font when ZRCola >> Unicode transposition is not in use. This could make
a cumbersome experience for end users, so removed for the time being.

Reverts: 3bda60b3407cc8a1a1e68349b21aa54da0bd4ac8
Signed-off-by: Simon Rozman <simon@rozman.si>

ZRCola/locale/ZRCola.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-11-26 16:48+0100\n"
+"POT-Creation-Date: 2021-12-10 14:57+0100\n"
 "PO-Revision-Date: 2019-04-01 19:38+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -47,8 +47,8 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:221 zrcolagui.cpp:84
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:221
+#: zrcolagui.cpp:213
 #, fuzzy
 msgid "Toggle character search to select character to insert into text"
 msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
@@ -58,8 +58,8 @@ msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:223 zrcolagui.cpp:90
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:223
+#: zrcolagui.cpp:215
 #, fuzzy
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@@ -79,8 +79,8 @@ msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvorne
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:225 zrcolagui.cpp:108
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:225
+#: zrcolagui.cpp:217
 #, fuzzy
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@@ -110,8 +110,8 @@ msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 msgid "&ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje &ZRCola"
 
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:229 zrcolagui.cpp:136
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:229
+#: zrcolagui.cpp:221
 #, fuzzy
 msgid "Toggle ZRCola character (De)composition"
 msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
@@ -121,397 +121,378 @@ msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
-#, fuzzy
-msgid "Composed Text &Font..."
-msgstr "&Pisava sestavljenega besedila ..."
-
-#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
-#, fuzzy
-msgid "Select font for composed text"
-msgstr "Izberi pisavo za sestavljeno besedilo"
-
-#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
 #, fuzzy
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"
 
-#: res/zrcolagui.cpp:149 res/zrcolagui.cpp:245 zrcolagui.cpp:149
+#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:245
+#: zrcolagui.cpp:229
 #, fuzzy
 msgid "Highlight Private Use Area Characters"
 msgstr "Obarvaj znake iz območja zasebne uporabe"
 
-#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 #, fuzzy
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 #, fuzzy
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
 #, fuzzy
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
 #, fuzzy
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
 #, fuzzy
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 #, fuzzy
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 #, fuzzy
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
+#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
-msgid "Composed &Text Toolbar"
-msgstr ""
-
-#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
-msgid "Toggle composed text toolbar"
-msgstr ""
-
-#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
 #, fuzzy
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
+#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
 #, fuzzy
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
 #, fuzzy
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
+#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
 #, fuzzy
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
+#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
 #, fuzzy
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 #, fuzzy
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 #, fuzzy
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
 #, fuzzy
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
 #, fuzzy
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
+#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
 #, fuzzy
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
+#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
 #, fuzzy
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
 #, fuzzy
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
 #, fuzzy
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
+#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
 #, fuzzy
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
+#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
 #, fuzzy
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
 #, fuzzy
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
 #, fuzzy
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
 #, fuzzy
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
 #, fuzzy
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
+#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
 #, fuzzy
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
 #, fuzzy
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:223 zrcolagui.cpp:223
+#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
 #, fuzzy
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:225 zrcolagui.cpp:225
+#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
 #, fuzzy
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 #, fuzzy
 msgid "ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:236 res/zrcolagui.cpp:248 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-#: zrcolagui.cpp:248
-#, fuzzy
-msgid "Compose"
-msgstr "Sestavljanje"
-
-#: res/zrcolagui.cpp:245 zrcolagui.cpp:245
 #, fuzzy
 msgid "PUA Warning"
 msgstr "Opozorilo OZU"
 
-#: res/zrcolagui.cpp:252 zrcolagui.cpp:252
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+#, fuzzy
+msgid "Compose"
+msgstr "Sestavljanje"
+
+#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
 #, fuzzy
 msgid "Character Catalog"
 msgstr "Katalog znakov"
 
-#: res/zrcolagui.cpp:256 zrcolagui.cpp:256
+#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
 #, fuzzy
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"
 
-#: res/zrcolagui.cpp:299 zrcolagui.cpp:299
+#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
 #, fuzzy
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:319 zrcolagui.cpp:319
+#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
 #, fuzzy
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"
 
-#: res/zrcolagui.cpp:346 zrcolagui.cpp:346
+#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
 #, fuzzy
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"
 
-#: res/zrcolagui.cpp:366 zrcolagui.cpp:366
+#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
 #, fuzzy
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: res/zrcolagui.cpp:420 zrcolagui.cpp:420
+#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
 #, fuzzy
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"
 
-#: res/zrcolagui.cpp:454 zrcolagui.cpp:454
+#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
 #, fuzzy
 msgid "Show &All"
 msgstr "Prik&aži vse"
 
-#: res/zrcolagui.cpp:455 zrcolagui.cpp:455
+#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
 #, fuzzy
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"
 
-#: res/zrcolagui.cpp:495 zrcolagui.cpp:495
+#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
 #, fuzzy
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: res/zrcolagui.cpp:502 zrcolagui.cpp:502
+#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
 #, fuzzy
 msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
 
-#: res/zrcolagui.cpp:506 zrcolagui.cpp:506
+#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
 #, fuzzy
 msgid "Search Options"
 msgstr "Možnosti iskanja"
 
-#: res/zrcolagui.cpp:507 zrcolagui.cpp:507
+#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
 #, fuzzy
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"
 
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
+#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
 #, fuzzy
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: res/zrcolagui.cpp:526 zrcolagui.cpp:526
+#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
 #, fuzzy
 msgid "All"
 msgstr "Vse"
 
-#: res/zrcolagui.cpp:527 zrcolagui.cpp:527
+#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
 #, fuzzy
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: res/zrcolagui.cpp:531 zrcolagui.cpp:531
+#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
 #, fuzzy
 msgid "None"
 msgstr "Nič"
 
-#: res/zrcolagui.cpp:532 zrcolagui.cpp:532
+#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: res/zrcolagui.cpp:536 zrcolagui.cpp:536
+#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
 #, fuzzy
 msgid "Invert"
 msgstr "Obrni"
 
-#: res/zrcolagui.cpp:537 zrcolagui.cpp:537
+#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: res/zrcolagui.cpp:576 zrcolagui.cpp:576
+#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
 #, fuzzy
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: res/zrcolagui.cpp:586 zrcolagui.cpp:586
+#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
 #, fuzzy
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: res/zrcolagui.cpp:614 zrcolagui.cpp:614
+#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
 #, fuzzy
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: res/zrcolagui.cpp:628 zrcolagui.cpp:628
+#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
 #, fuzzy
 msgid "Preview"
 msgstr "Predogled"
 
-#: res/zrcolagui.cpp:633 zrcolagui.cpp:633
+#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
 #, fuzzy
 msgid "U+"
 msgstr "U+"
 
-#: res/zrcolagui.cpp:638 zrcolagui.cpp:638
+#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
 #, fuzzy
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: res/zrcolagui.cpp:643 zrcolagui.cpp:643
+#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
 #, fuzzy
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: res/zrcolagui.cpp:678 zrcolagui.cpp:678
+#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
 #, fuzzy
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: res/zrcolagui.cpp:683 zrcolagui.cpp:683
+#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
 #, fuzzy
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
+#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
 #, fuzzy
 msgid "Character tags"
 msgstr "Oznake znaka"
 
-#: res/zrcolagui.cpp:693 zrcolagui.cpp:693
+#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
 #, fuzzy
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
+#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
 #, fuzzy
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: res/zrcolagui.cpp:702 zrcolagui.cpp:702
+#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
 #, fuzzy
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
+#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
 #, fuzzy
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: res/zrcolagui.cpp:708 zrcolagui.cpp:708
+#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
 #, fuzzy
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: res/zrcolagui.cpp:719 zrcolagui.cpp:719
+#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
 #, fuzzy
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: res/zrcolagui.cpp:746 zrcolagui.cpp:746
+#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
 #, fuzzy
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: res/zrcolagui.cpp:765 zrcolagui.cpp:765
+#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
 #, fuzzy
 msgid "&Insert"
 msgstr "Vstav&i"
 
-#: res/zrcolagui.cpp:769 zrcolagui.cpp:769
+#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
 #, fuzzy
 msgid "Insert character into decomposed text"
 msgstr "Vstavi znak v razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
+#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
 #, fuzzy
 msgid ""
 "Some character native to specific language you are working with should not decompose to primitives.\n"
@@ -520,22 +501,22 @@ msgstr ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: res/zrcolagui.cpp:846 zrcolagui.cpp:849
+#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
 #, fuzzy
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: res/zrcolagui.cpp:849 zrcolagui.cpp:852
+#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
 #, fuzzy
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: res/zrcolagui.cpp:860 zrcolagui.cpp:863
+#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
 #, fuzzy
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: res/zrcolagui.cpp:865 zrcolagui.cpp:868
+#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
 #, fuzzy
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
@@ -544,18 +525,18 @@ msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
 "Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
 
-#: res/zrcolagui.cpp:869 zrcolagui.cpp:872
+#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
 #, fuzzy
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: res/zrcolagui.cpp:875 zrcolagui.cpp:878
+#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
 #, fuzzy
 msgid "Startup"
 msgstr "Zagon"
 
-#: res/zrcolagui.cpp:942 res/zrcolagui.h:120 zrcolaapp.cpp:74 zrcolafrm.cpp:133
+#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:60 zrcolafrm.cpp:115
-#: zrcolagui.cpp:945 zrcolagui.h:120
+#: zrcolagui.cpp:927 zrcolagui.h:114
 #: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -566,7 +547,7 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
 #, fuzzy
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
@@ -581,62 +562,62 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: res/zrcolagui.cpp:961 zrcolagui.cpp:964
+#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
 #, fuzzy
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:967 zrcolagui.cpp:970
+#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
 #, fuzzy
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: res/zrcolagui.cpp:971 zrcolagui.cpp:974
+#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
 #, fuzzy
 msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
 msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
 #, fuzzy
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:1030 zrcolagui.cpp:1033
+#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
 #, fuzzy
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1034 zrcolagui.cpp:1037
+#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
 #, fuzzy
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1035 zrcolagui.cpp:1038
+#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
 #, fuzzy
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1072 zrcolachrreq.cpp:49 zrcolagui.cpp:1075
+#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:35 zrcolagui.cpp:1057
 #, fuzzy
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
 #, fuzzy
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1088 zrcolagui.cpp:1091
+#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
 #, fuzzy
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1092 zrcolagui.cpp:1095
+#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
 #, fuzzy
 msgid ""
 "Please, use the decomposed form.\n"
@@ -645,22 +626,22 @@ msgstr ""
 "Uporabite razstavljeno obliko.\n"
 "Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: res/zrcolagui.cpp:1100 zrcolachrreq.cpp:58 zrcolagui.cpp:1103
+#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:44 zrcolagui.cpp:1085
 #, fuzzy
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1102 zrcolagui.cpp:1105
+#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
 #, fuzzy
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: res/zrcolagui.cpp:1108 zrcolagui.cpp:1111
+#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
 #, fuzzy
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1115 zrcolagui.cpp:1118
+#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
 #, fuzzy
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
@@ -669,12 +650,12 @@ msgstr ""
 "Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
 "Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
 
-#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
+#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
 #, fuzzy
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1159 zrcolagui.cpp:1162
+#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
 #, fuzzy
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
@@ -683,147 +664,147 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
 #, fuzzy
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1184 zrcolagui.cpp:1187
+#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
 msgid "→"
 msgstr ""
 
-#: res/zrcolagui.cpp:1187 zrcolagui.cpp:1190
+#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
 msgid "←"
 msgstr ""
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
 #, fuzzy
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1214 zrcolagui.cpp:1217
+#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
 msgid "↑"
 msgstr ""
 
-#: res/zrcolagui.cpp:1217 zrcolagui.cpp:1220
+#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
 msgid "↓"
 msgstr ""
 
-#: res/zrcolagui.h:261 zrcolagui.h:261
+#: res/zrcolagui.h:255 zrcolagui.h:255
 #, fuzzy
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:297 zrcolagui.h:297
+#: res/zrcolagui.h:291 zrcolagui.h:291
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:323 zrcolagui.h:323
+#: res/zrcolagui.h:317 zrcolagui.h:317
 #, fuzzy
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:348 zrcolagui.h:348 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:81
 #, fuzzy
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:377 zrcolachrreq.cpp:64 zrcolagui.h:377
+#: res/zrcolagui.h:371 zrcolachrreq.cpp:50 zrcolagui.h:371
 #, fuzzy
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:419 zrcolagui.h:419
+#: res/zrcolagui.h:413 zrcolagui.h:413
 #, fuzzy
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
 
-#: zrcolaabout.cpp:31
+#: zrcolaabout.cpp:17
 #, fuzzy, c-format
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolachrslct.cpp:89
+#: zrcolachrslct.cpp:75
 #, fuzzy
 msgid "Too many digits in Unicode."
 msgstr "Preveč števk v zapisu Unicode."
 
-#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:75 zrcolachrslct.cpp:93
 #, fuzzy
 msgid "Validation conflict"
 msgstr "Nesoglasje pri preverjanju"
 
-#: zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:93
 #, fuzzy, c-format
 msgid "Invalid character in Unicode found: %c"
 msgstr "Napačen znak v zapisu Unicode: %c"
 
-#: zrcolachrslct.cpp:215 zrcolachrslct.cpp:391 zrcolachrslct.cpp:888
+#: zrcolachrslct.cpp:201 zrcolachrslct.cpp:377 zrcolachrslct.cpp:874
 #, fuzzy
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"
 
-#: zrcolachrslct.cpp:329
+#: zrcolachrslct.cpp:315
 msgid ", "
 msgstr ""
 
-#: zrcolachrslct.cpp:394 zrcolachrslct.cpp:885
+#: zrcolachrslct.cpp:380 zrcolachrslct.cpp:871
 #, fuzzy
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:99
+#: zrcolafrm.cpp:81
 #, fuzzy
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:112
+#: zrcolafrm.cpp:94
 #, fuzzy
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:231
+#: zrcolafrm.cpp:211
 #, fuzzy
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:231 zrcolafrm.cpp:233
+#: zrcolafrm.cpp:211 zrcolafrm.cpp:213
 #, fuzzy
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:233
+#: zrcolafrm.cpp:213
 #, fuzzy
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:544
+#: zrcolafrm.cpp:485
 #, fuzzy
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:569
+#: zrcolafrm.cpp:510
 #, fuzzy
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
-#: zrcolakeyhndlr.cpp:44
+#: zrcolakeyhndlr.cpp:30
 #, fuzzy
 msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
 msgstr "Pritisnili ste tipko INS. Vtipkajte kodo Unicode želenega znaka (do štiri šestnajstiške števke: 0–9, A–F), nato izpustite INS."
 
-#: zrcolasettings.cpp:87
+#: zrcolasettings.cpp:73
 #, fuzzy
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"
 
-#: zrcolatranseq.cpp:63
+#: zrcolatranseq.cpp:49
 #, fuzzy, c-format
 msgid "Unknown translation (%u)"
 msgstr "Neznana pretvorba (%u)"
 
-#: zrcolaupdater.cpp:95
+#: zrcolaupdater.cpp:81
 #, fuzzy
 msgid ""
 "This program will now close and the upgrade will be launched.\n"

ZRCola/locale/sl_SI.po

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-11-26 16:48+0100\n"
+"POT-Creation-Date: 2021-12-10 14:58+0100\n"
-"PO-Revision-Date: 2021-11-26 16:49+0100\n"
+"PO-Revision-Date: 2021-12-10 14:58+0100\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91592/sl_SI/)\n"
 "Language: sl_SI\n"
@@ -43,8 +43,8 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:221 zrcolagui.cpp:84
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:221
+#: zrcolagui.cpp:213
 msgid "Toggle character search to select character to insert into text"
 msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 
@@ -52,8 +52,8 @@ msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:223 zrcolagui.cpp:90
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:223
+#: zrcolagui.cpp:215
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
@@ -69,8 +69,8 @@ msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvorne
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:225 zrcolagui.cpp:108
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:225
+#: zrcolagui.cpp:217
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
@@ -94,8 +94,8 @@ msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 msgid "&ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje &ZRCola"
 
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:229 zrcolagui.cpp:136
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:229
+#: zrcolagui.cpp:221
 msgid "Toggle ZRCola character (De)composition"
 msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 
@@ -103,321 +103,304 @@ msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
-msgid "Composed Text &Font..."
-msgstr "&Pisava sestavljenega besedila ..."
-
-#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
-msgid "Select font for composed text"
-msgstr "Izberi pisavo za sestavljeno besedilo"
-
-#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"
 
-#: res/zrcolagui.cpp:149 res/zrcolagui.cpp:245 zrcolagui.cpp:149
+#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:245
+#: zrcolagui.cpp:229
 msgid "Highlight Private Use Area Characters"
 msgstr "Obarvaj znake iz območja zasebne uporabe"
 
-#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
+#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
-msgid "Composed &Text Toolbar"
-msgstr "Orodna vrs&tica sestavljenega besedila"
-
-#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
-msgid "Toggle composed text toolbar"
-msgstr "Prikaži/skrij orodno vrstico sestavljenega besedila"
-
-#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
+#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
+#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
+#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
+#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
+#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
+#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
+#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
+#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:223 zrcolagui.cpp:223
+#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:225 zrcolagui.cpp:225
+#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 msgid "ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:236 res/zrcolagui.cpp:248 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-#: zrcolagui.cpp:248
-msgid "Compose"
-msgstr "Sestavljanje"
-
-#: res/zrcolagui.cpp:245 zrcolagui.cpp:245
 msgid "PUA Warning"
 msgstr "Opozorilo OZU"
 
-#: res/zrcolagui.cpp:252 zrcolagui.cpp:252
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+msgid "Compose"
+msgstr "Sestavljanje"
+
+#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
 msgid "Character Catalog"
 msgstr "Katalog znakov"
 
-#: res/zrcolagui.cpp:256 zrcolagui.cpp:256
+#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"
 
-#: res/zrcolagui.cpp:299 zrcolagui.cpp:299
+#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:319 zrcolagui.cpp:319
+#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"
 
-#: res/zrcolagui.cpp:346 zrcolagui.cpp:346
+#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"
 
-#: res/zrcolagui.cpp:366 zrcolagui.cpp:366
+#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: res/zrcolagui.cpp:420 zrcolagui.cpp:420
+#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"
 
-#: res/zrcolagui.cpp:454 zrcolagui.cpp:454
+#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
 msgid "Show &All"
 msgstr "Prik&aži vse"
 
-#: res/zrcolagui.cpp:455 zrcolagui.cpp:455
+#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"
 
-#: res/zrcolagui.cpp:495 zrcolagui.cpp:495
+#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: res/zrcolagui.cpp:502 zrcolagui.cpp:502
+#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
 msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
 
-#: res/zrcolagui.cpp:506 zrcolagui.cpp:506
+#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
 msgid "Search Options"
 msgstr "Možnosti iskanja"
 
-#: res/zrcolagui.cpp:507 zrcolagui.cpp:507
+#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"
 
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
+#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: res/zrcolagui.cpp:526 zrcolagui.cpp:526
+#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
 msgid "All"
 msgstr "Vse"
 
-#: res/zrcolagui.cpp:527 zrcolagui.cpp:527
+#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: res/zrcolagui.cpp:531 zrcolagui.cpp:531
+#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
 msgid "None"
 msgstr "Nič"
 
-#: res/zrcolagui.cpp:532 zrcolagui.cpp:532
+#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: res/zrcolagui.cpp:536 zrcolagui.cpp:536
+#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
 msgid "Invert"
 msgstr "Obrni"
 
-#: res/zrcolagui.cpp:537 zrcolagui.cpp:537
+#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: res/zrcolagui.cpp:576 zrcolagui.cpp:576
+#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: res/zrcolagui.cpp:586 zrcolagui.cpp:586
+#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: res/zrcolagui.cpp:614 zrcolagui.cpp:614
+#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: res/zrcolagui.cpp:628 zrcolagui.cpp:628
+#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
 msgid "Preview"
 msgstr "Predogled"
 
-#: res/zrcolagui.cpp:633 zrcolagui.cpp:633
+#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
 msgid "U+"
 msgstr "U+"
 
-#: res/zrcolagui.cpp:638 zrcolagui.cpp:638
+#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: res/zrcolagui.cpp:643 zrcolagui.cpp:643
+#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: res/zrcolagui.cpp:678 zrcolagui.cpp:678
+#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: res/zrcolagui.cpp:683 zrcolagui.cpp:683
+#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
+#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
 msgid "Character tags"
 msgstr "Oznake znaka"
 
-#: res/zrcolagui.cpp:693 zrcolagui.cpp:693
+#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
+#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: res/zrcolagui.cpp:702 zrcolagui.cpp:702
+#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
+#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: res/zrcolagui.cpp:708 zrcolagui.cpp:708
+#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: res/zrcolagui.cpp:719 zrcolagui.cpp:719
+#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: res/zrcolagui.cpp:746 zrcolagui.cpp:746
+#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: res/zrcolagui.cpp:765 zrcolagui.cpp:765
+#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
 msgid "&Insert"
 msgstr "Vstav&i"
 
-#: res/zrcolagui.cpp:769 zrcolagui.cpp:769
+#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
 msgid "Insert character into decomposed text"
 msgstr "Vstavi znak v razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
+#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
 msgid ""
 "Some character native to specific language you are working with should not decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
@@ -425,19 +408,19 @@ msgstr ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: res/zrcolagui.cpp:846 zrcolagui.cpp:849
+#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: res/zrcolagui.cpp:849 zrcolagui.cpp:852
+#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: res/zrcolagui.cpp:860 zrcolagui.cpp:863
+#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: res/zrcolagui.cpp:865 zrcolagui.cpp:868
+#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
 "It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
@@ -445,16 +428,16 @@ msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
 "Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
 
-#: res/zrcolagui.cpp:869 zrcolagui.cpp:872
+#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: res/zrcolagui.cpp:875 zrcolagui.cpp:878
+#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
 msgid "Startup"
 msgstr "Zagon"
 
-#: res/zrcolagui.cpp:942 res/zrcolagui.h:120 zrcolaapp.cpp:74 zrcolafrm.cpp:133
+#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:60 zrcolafrm.cpp:115
-#: zrcolagui.cpp:945 zrcolagui.h:120
+#: zrcolagui.cpp:927 zrcolagui.h:114
 #: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -464,7 +447,7 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -478,51 +461,51 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: res/zrcolagui.cpp:961 zrcolagui.cpp:964
+#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:967 zrcolagui.cpp:970
+#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: res/zrcolagui.cpp:971 zrcolagui.cpp:974
+#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
 msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
 msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:1030 zrcolagui.cpp:1033
+#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1034 zrcolagui.cpp:1037
+#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1035 zrcolagui.cpp:1038
+#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1072 zrcolachrreq.cpp:49 zrcolagui.cpp:1075
+#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:35 zrcolagui.cpp:1057
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1088 zrcolagui.cpp:1091
+#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1092 zrcolagui.cpp:1095
+#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
@@ -530,19 +513,19 @@ msgstr ""
 "Uporabite razstavljeno obliko.\n"
 "Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: res/zrcolagui.cpp:1100 zrcolachrreq.cpp:58 zrcolagui.cpp:1103
+#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:44 zrcolagui.cpp:1085
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1102 zrcolagui.cpp:1105
+#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: res/zrcolagui.cpp:1108 zrcolagui.cpp:1111
+#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1115 zrcolagui.cpp:1118
+#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
 "Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
@@ -550,11 +533,11 @@ msgstr ""
 "Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
 "Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
 
-#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
+#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1159 zrcolagui.cpp:1162
+#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
@@ -562,126 +545,126 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1184 zrcolagui.cpp:1187
+#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
 msgid "→"
 msgstr "→"
 
-#: res/zrcolagui.cpp:1187 zrcolagui.cpp:1190
+#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
 msgid "←"
 msgstr "←"
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1214 zrcolagui.cpp:1217
+#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
 msgid "↑"
 msgstr "↑"
 
-#: res/zrcolagui.cpp:1217 zrcolagui.cpp:1220
+#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
 msgid "↓"
 msgstr "↓"
 
-#: res/zrcolagui.h:261 zrcolagui.h:261
+#: res/zrcolagui.h:255 zrcolagui.h:255
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:297 zrcolagui.h:297
+#: res/zrcolagui.h:291 zrcolagui.h:291
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:323 zrcolagui.h:323
+#: res/zrcolagui.h:317 zrcolagui.h:317
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:348 zrcolagui.h:348 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:81
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:377 zrcolachrreq.cpp:64 zrcolagui.h:377
+#: res/zrcolagui.h:371 zrcolachrreq.cpp:50 zrcolagui.h:371
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:419 zrcolagui.h:419
+#: res/zrcolagui.h:413 zrcolagui.h:413
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
 
-#: zrcolaabout.cpp:31
+#: zrcolaabout.cpp:17
 #, c-format
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolachrslct.cpp:89
+#: zrcolachrslct.cpp:75
 msgid "Too many digits in Unicode."
 msgstr "Preveč števk v zapisu Unicode."
 
-#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:75 zrcolachrslct.cpp:93
 msgid "Validation conflict"
 msgstr "Nesoglasje pri preverjanju"
 
-#: zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:93
 #, c-format
 msgid "Invalid character in Unicode found: %c"
 msgstr "Napačen znak v zapisu Unicode: %c"
 
-#: zrcolachrslct.cpp:215 zrcolachrslct.cpp:391 zrcolachrslct.cpp:888
+#: zrcolachrslct.cpp:201 zrcolachrslct.cpp:377 zrcolachrslct.cpp:874
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"
 
-#: zrcolachrslct.cpp:329
+#: zrcolachrslct.cpp:315
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:394 zrcolachrslct.cpp:885
+#: zrcolachrslct.cpp:380 zrcolachrslct.cpp:871
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:99
+#: zrcolafrm.cpp:81
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:112
+#: zrcolafrm.cpp:94
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:231
+#: zrcolafrm.cpp:211
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:231 zrcolafrm.cpp:233
+#: zrcolafrm.cpp:211 zrcolafrm.cpp:213
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:233
+#: zrcolafrm.cpp:213
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:544
+#: zrcolafrm.cpp:485
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:569
+#: zrcolafrm.cpp:510
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
-#: zrcolakeyhndlr.cpp:44
+#: zrcolakeyhndlr.cpp:30
 msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
 msgstr "Pritisnili ste tipko INS. Vtipkajte kodo Unicode želenega znaka (do štiri šestnajstiške števke: 0–9, A–F), nato izpustite INS."
 
-#: zrcolasettings.cpp:87
+#: zrcolasettings.cpp:73
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"
 
-#: zrcolatranseq.cpp:63
+#: zrcolatranseq.cpp:49
 #, c-format
 msgid "Unknown translation (%u)"
 msgstr "Neznana pretvorba (%u)"
 
-#: zrcolaupdater.cpp:95
+#: zrcolaupdater.cpp:81
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
@@ -782,6 +765,18 @@ msgstr "Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovni
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
 
+#~ msgid "Composed Text &Font..."
+#~ msgstr "&Pisava sestavljenega besedila ..."
+
+#~ msgid "Select font for composed text"
+#~ msgstr "Izberi pisavo za sestavljeno besedilo"
+
+#~ msgid "Composed &Text Toolbar"
+#~ msgstr "Orodna vrs&tica sestavljenega besedila"
+
+#~ msgid "Toggle composed text toolbar"
+#~ msgstr "Prikaži/skrij orodno vrstico sestavljenega besedila"
+
 #~ msgid ">"
 #~ msgstr ">"
 

ZRCola/pch.h

@@ -30,7 +30,6 @@
 #include <wx/clipbrd.h>
 #include <wx/dcclient.h>
 #include <wx/ffile.h>
-#include <wx/fontdlg.h>
 #include <wx/msgdlg.h>
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>

ZRCola/res/ZRCola.fbp

@@ -45,7 +45,7 @@
             <property name="minimum_size">150,150</property>
             <property name="name">wxZRColaFrameBase</property>
             <property name="pos"></property>
-            <property name="size">660,450</property>
+            <property name="size">600,400</property>
             <property name="style">wxDEFAULT_FRAME_STYLE</property>
             <property name="subclass"></property>
             <property name="title">ZRCola</property>
@@ -270,19 +270,6 @@
                         <property name="name">separator5</property>
                         <property name="permission">none</property>
                     </object>
-                    <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help">Select font for composed text</property>
-                        <property name="id">wxID_FONT_DESTINATION</property>
-                        <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Composed Text &amp;Font...</property>
-                        <property name="name">m_menuItemFontDestination</property>
-                        <property name="permission">none</property>
-                        <property name="shortcut"></property>
-                        <property name="unchecked_bitmap"></property>
-                    </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
@@ -344,19 +331,6 @@
                         <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                     </object>
-                    <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help">Toggle composed text toolbar</property>
-                        <property name="id">wxID_TOOLBAR_DESTINATION</property>
-                        <property name="kind">wxITEM_CHECK</property>
-                        <property name="label">Composed &amp;Text Toolbar</property>
-                        <property name="name">m_menuItemToolbarDestination</property>
-                        <property name="permission">none</property>
-                        <property name="shortcut"></property>
-                        <property name="unchecked_bitmap"></property>
-                    </object>
                     <object class="separator" expanded="0">
                         <property name="name">separator</property>
                         <property name="permission">none</property>
@@ -713,125 +687,8 @@
                     <property name="window_style"></property>
                     <event name="OnChoice">OnTranslationSeqChoice</event>
                 </object>
-            </object>
+                <object class="toolSeparator" expanded="0">
-            <object class="wxAuiToolBar" expanded="0">
-                <property name="BottomDockable">1</property>
-                <property name="LeftDockable">0</property>
-                <property name="RightDockable">0</property>
-                <property name="TopDockable">1</property>
-                <property name="aui_layer">1</property>
-                <property name="aui_name">toolbarDestination</property>
-                <property name="aui_position"></property>
-                <property name="aui_row">0</property>
-                <property name="best_size"></property>
-                <property name="bg"></property>
-                <property name="bitmapsize">-1,-1</property>
-                <property name="caption">Compose</property>
-                <property name="caption_visible">1</property>
-                <property name="center_pane">0</property>
-                <property name="close_button">1</property>
-                <property name="context_help"></property>
-                <property name="context_menu">1</property>
-                <property name="default_pane">0</property>
-                <property name="dock">Dock</property>
-                <property name="dock_fixed">0</property>
-                <property name="docking">Top</property>
-                <property name="enabled">1</property>
-                <property name="fg"></property>
-                <property name="floatable">1</property>
-                <property name="font"></property>
-                <property name="gripper">0</property>
-                <property name="hidden">0</property>
-                <property name="id">wxID_ANY</property>
-                <property name="label_visible">0</property>
-                <property name="margins"></property>
-                <property name="max_size"></property>
-                <property name="maximize_button">0</property>
-                <property name="maximum_size"></property>
-                <property name="min_size">-1,-1</property>
-                <property name="minimize_button">0</property>
-                <property name="minimum_size"></property>
-                <property name="moveable">1</property>
-                <property name="name">m_toolbarDestination</property>
-                <property name="packing">1</property>
-                <property name="pane_border">1</property>
-                <property name="pane_position">-1,-1</property>
-                <property name="pane_size">-1,-1</property>
-                <property name="permission">protected</property>
-                <property name="pin_button">1</property>
-                <property name="pos"></property>
-                <property name="resize">Resizable</property>
-                <property name="separation">5</property>
-                <property name="show">1</property>
-                <property name="size"></property>
-                <property name="style">wxAUI_TB_HORZ_LAYOUT</property>
-                <property name="subclass"></property>
-                <property name="toolbar_label"></property>
-                <property name="toolbar_pane">1</property>
-                <property name="tooltip"></property>
-                <property name="use_explicit_ids">0</property>
-                <property name="window_extra_style"></property>
-                <property name="window_name"></property>
-                <property name="window_style"></property>
-                <object class="wxFontPickerCtrl" expanded="0">
-                    <property name="BottomDockable">1</property>
-                    <property name="LeftDockable">1</property>
-                    <property name="RightDockable">1</property>
-                    <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
-                    <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></property>
-                    <property name="best_size"></property>
-                    <property name="bg"></property>
-                    <property name="caption"></property>
-                    <property name="caption_visible">1</property>
-                    <property name="center_pane">0</property>
-                    <property name="close_button">1</property>
-                    <property name="context_help"></property>
-                    <property name="context_menu">1</property>
-                    <property name="default_pane">0</property>
-                    <property name="dock">Dock</property>
-                    <property name="dock_fixed">0</property>
-                    <property name="docking">Left</property>
-                    <property name="enabled">1</property>
-                    <property name="fg"></property>
-                    <property name="floatable">1</property>
-                    <property name="font"></property>
-                    <property name="gripper">0</property>
-                    <property name="hidden">0</property>
-                    <property name="id">wxID_FONT_DESTINATION</property>
-                    <property name="max_point_size">100</property>
-                    <property name="max_size"></property>
-                    <property name="maximize_button">0</property>
-                    <property name="maximum_size">180,-1</property>
-                    <property name="min_size"></property>
-                    <property name="minimize_button">0</property>
-                    <property name="minimum_size">120,-1</property>
-                    <property name="moveable">1</property>
-                    <property name="name">m_fontpickerDestination</property>
-                    <property name="pane_border">1</property>
-                    <property name="pane_position"></property>
-                    <property name="pane_size"></property>
                     <property name="permission">protected</property>
-                    <property name="pin_button">1</property>
-                    <property name="pos"></property>
-                    <property name="resize">Resizable</property>
-                    <property name="show">1</property>
-                    <property name="size"></property>
-                    <property name="style">wxFNTP_FONTDESC_AS_LABEL</property>
-                    <property name="subclass">; ; forward_declare</property>
-                    <property name="toolbar_pane">0</property>
-                    <property name="tooltip"></property>
-                    <property name="validator_data_type"></property>
-                    <property name="validator_style">wxFILTER_NONE</property>
-                    <property name="validator_type">wxDefaultValidator</property>
-                    <property name="validator_variable"></property>
-                    <property name="value">ZRCola,90,90,20,70,0</property>
-                    <property name="window_extra_style"></property>
-                    <property name="window_name"></property>
-                    <property name="window_style"></property>
-                    <event name="OnFontChanged">OnFontDestinationChanged</event>
                 </object>
                 <object class="tool" expanded="0">
                     <property name="bitmap">Load From Icon Resource; warn_pua.ico; [24; 24]</property>

ZRCola/res/zrcolagui.cpp

@@ -142,10 +142,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
-	wxMenuItem* m_menuItemFontDestination;
-	m_menuItemFontDestination = new wxMenuItem( m_menuEdit, wxID_FONT_DESTINATION, wxString( _("Composed Text &Font...") ) , _("Select font for composed text"), wxITEM_NORMAL );
-	m_menuEdit->Append( m_menuItemFontDestination );
-
 	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );
 
@@ -166,10 +162,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );
 
-	wxMenuItem* m_menuItemToolbarDestination;
-	m_menuItemToolbarDestination = new wxMenuItem( m_menuView, wxID_TOOLBAR_DESTINATION, wxString( _("Composed &Text Toolbar") ) , _("Toggle composed text toolbar"), wxITEM_CHECK );
-	m_menuView->Append( m_menuItemToolbarDestination );
-
 	m_menuView->AppendSeparator();
 
 	wxMenuItem* m_menuItemPanelChrGrps;
@@ -232,21 +224,13 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 240,-1 ), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
+	m_toolbarTranslate->AddSeparator();
+
+	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
+
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 
-	m_toolbarDestination = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
-	m_fontpickerDestination = new wxFontPickerCtrl( m_toolbarDestination, wxID_FONT_DESTINATION, wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ), wxDefaultPosition, wxDefaultSize, wxFNTP_FONTDESC_AS_LABEL );
-	m_fontpickerDestination->SetMaxPointSize( 100 );
-	m_fontpickerDestination->SetMinSize( wxSize( 120,-1 ) );
-	m_fontpickerDestination->SetMaxSize( wxSize( 180,-1 ) );
-
-	m_toolbarDestination->AddControl( m_fontpickerDestination );
-	m_toolWarnPUA = m_toolbarDestination->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
-
-	m_toolbarDestination->Realize();
-	m_mgr.AddPane( m_toolbarDestination, wxAuiPaneInfo().Name( wxT("toolbarDestination") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
-
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );
 
 	m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize( wxSize( 150,200 ) ).MinSize( wxSize( 100,100 ) ).Layer( 1 ) );
@@ -265,7 +249,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
-	m_fontpickerDestination->Connect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 }
 
 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -275,7 +258,6 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
-	m_fontpickerDestination->Disconnect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 
 	m_mgr.UnInit();
 

ZRCola/res/zrcolagui.h

@@ -25,7 +25,6 @@ class wxZRColaCharGrid;
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
-#include <wx/fontpicker.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -69,12 +68,10 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
 			wxID_COMPOSITION,
-			wxID_FONT_DESTINATION,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
 			wxID_TOOLBAR_TRANSLATE,
-			wxID_TOOLBAR_DESTINATION,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -100,8 +97,6 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolSendSource;
 		wxAuiToolBarItem* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
-		wxAuiToolBar* m_toolbarDestination;
-		wxFontPickerCtrl* m_fontpickerDestination;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -111,13 +106,12 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnFontDestinationChanged( wxFontPickerEvent& event ) { event.Skip(); }
 
 
 	public:
 		wxZRColaComposerPanel* m_panel;
 
-		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 660,450 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
+		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
 		wxAuiManager m_mgr;
 
 		~wxZRColaFrameBase();

ZRCola/zrcolacomppnl.cpp

@@ -20,9 +20,8 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
     m_destinationChanged(false),
     m_sourceRestyled(false),
     m_destinationRestyled(false),
-    m_styleSource(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleNormal(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
-    m_styleDestination(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_stylePUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
-    m_styleDestinationPUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
     m_selSource(0, 0),
     m_selDestination(0, 0),
     wxZRColaComposerPanelBase(parent)
@@ -184,41 +183,6 @@ void wxZRColaComposerPanel::SynchronizePanels()
 }
 
 
-void wxZRColaComposerPanel::SetDestinationFont(const wxFont& font, int flags)
-{
-    m_styleDestination.SetFont(font, flags);
-    m_styleDestinationPUA.SetFont(font, flags);
-}
-
-
-void wxZRColaComposerPanel::RestyleSource()
-{
-    m_sourceRestyled = true;
-    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleSource);
-    m_sourceRestyled = false;
-}
-
-
-void wxZRColaComposerPanel::RestyleDestination()
-{
-    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-
-    m_destinationRestyled = true;
-    if (app->m_mainWnd->m_warnPUA) {
-        wxString src = m_destination->GetValue();
-        size_t len = src.Length();
-        for (size_t i = 0, j; i < len;) {
-            bool pua_i = is_pua(src[i]);
-            for (j = i + 1; j < len && pua_i == is_pua(src[j]); j++);
-            m_destination->SetStyle((long)i, (long)j, pua_i ? m_styleDestinationPUA : m_styleDestination);
-            i = j;
-        }
-    } else
-        m_destination->SetStyle(0, GetWindowTextLength(m_destination->GetHWND()), m_styleDestination);
-    m_destinationRestyled = false;
-}
-
-
 void wxZRColaComposerPanel::OnSourcePaint(wxPaintEvent& event)
 {
     event.Skip();
@@ -285,7 +249,10 @@ void wxZRColaComposerPanel::OnSourceText(wxCommandEvent& event)
 
     // Set the flag the source text changed to trigger idle-time translation.
     m_sourceChanged = true;
-    RestyleSource();
+
+    m_sourceRestyled = true;
+    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleNormal);
+    m_sourceRestyled = false;
 }
 
 
@@ -355,7 +322,21 @@ void wxZRColaComposerPanel::OnDestinationText(wxCommandEvent& event)
 
     // Set the flag the destination text changed to trigger idle-time inverse translation.
     m_destinationChanged = true;
-    RestyleDestination();
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_destinationRestyled = true;
+    if (app->m_mainWnd->m_warnPUA) {
+        wxString src = m_destination->GetValue();
+        size_t len = src.Length();
+        for (size_t i = 0, j; i < len;) {
+            bool pua_i = is_pua(src[i]);
+            for (j = i + 1; j < len && pua_i == is_pua(src[j]); j++);
+            m_destination->SetStyle((long)i, (long)j, pua_i ? m_stylePUA : m_styleNormal);
+            i = j;
+        }
+    } else
+        m_destination->SetStyle(0, GetWindowTextLength(m_destination->GetHWND()), m_styleNormal);
+    m_destinationRestyled = false;
 }
 
 

ZRCola/zrcolacomppnl.h

@@ -37,9 +37,6 @@ public:
 
     void RestoreFromStateFile();
     void SynchronizePanels();
-    void SetDestinationFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE));
-    void RestyleSource();
-    void RestyleDestination();
 
     friend class wxPersistentZRColaComposerPanel;   // Allow saving/restoring window state.
 
@@ -65,9 +62,8 @@ protected:
         m_sourceRestyled,                           ///< Boolean flag to mark source text is being restyled
         m_destinationRestyled;                      ///< Boolean flag to mark destination text is being restyled
     wxTextAttr
-        m_styleSource,                              ///< Normal source text style
+        m_styleNormal,                              ///< Normal text style
-        m_styleDestination,                         ///< Normal destination text style
+        m_stylePUA;                                 ///< PUA character text style
-        m_styleDestinationPUA;                      ///< PUA character destination text style
     std::vector<ZRCola::mapping_vector> m_mapping;  ///< Character index mapping vector between source and normalized text
     std::pair<long, long>
         m_selSource,                                ///< Character index of selected text in source text control

ZRCola/zrcolafrm.cpp

@@ -29,7 +29,6 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_MENU           (wxID_SEND_ABORT                                       , wxZRColaFrame::OnSendAbort                  )
 
     EVT_MENU           (wxID_COMPOSITION                                      , wxZRColaFrame::OnComposition                )
-    EVT_MENU           (wxID_FONT_DESTINATION                                 , wxZRColaFrame::OnFontDestination            )
     EVT_MENU           (wxID_WARN_PUA                                         , wxZRColaFrame::OnWarnPUA                    )
     EVT_MENU_RANGE     (wxID_TRANSLATION_SEQ_DEFAULT, wxID_TRANSLATION_SEQ_END, wxZRColaFrame::OnTranslationSeqMenu         )
 
@@ -39,8 +38,6 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_MENU           (wxID_TOOLBAR_EDIT                                     , wxZRColaFrame::OnToolbarEdit                )
     EVT_UPDATE_UI      (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslateUpdate     )
     EVT_MENU           (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslate           )
-    EVT_UPDATE_UI      (wxID_TOOLBAR_DESTINATION                              , wxZRColaFrame::OnToolbarDestinationUpdate   )
-    EVT_MENU           (wxID_TOOLBAR_DESTINATION                              , wxZRColaFrame::OnToolbarDestination         )
     EVT_UPDATE_UI      (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalogUpdate)
     EVT_MENU           (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalog      )
     EVT_MENU           (wxID_FOCUS_CHARACTER_CATALOG                          , wxZRColaFrame::OnPanelCharacterCatalogFocus )
@@ -64,7 +61,6 @@ wxZRColaFrame::wxZRColaFrame() :
     m_settings(NULL),
     m_chrReq(NULL),
     m_composition(true),
-    m_fontDestination(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola")),
     m_warnPUA(false),
     m_transeq_id(ZRCOLA_TRANSEQID_DEFAULT),
     m_transeq(NULL),
@@ -186,8 +182,6 @@ wxZRColaFrame::wxZRColaFrame() :
         m_toolComposition->SetState(m_toolComposition->GetState() & ~wxAUI_BUTTON_STATE_CHECKED);
     }
 
-    m_fontpickerDestination->SetSelectedFont(m_fontDestination);
-    m_panel->SetDestinationFont(m_fontDestination);
     if (m_warnPUA) {
         m_menuItemWarnPUA->Check(true);
         m_toolWarnPUA->SetState(m_toolWarnPUA->GetState() | wxAUI_BUTTON_STATE_CHECKED);
@@ -359,41 +353,16 @@ void wxZRColaFrame::OnComposition(wxCommandEvent& event)
 }
 
 
-void wxZRColaFrame::OnFontDestinationChanged(wxFontPickerEvent& event)
-{
-    m_fontDestination = event.GetFont();
-    m_panel->SetDestinationFont(m_fontDestination);
-    m_panel->RestyleDestination();
-
-    event.Skip();
-}
-
-
-void wxZRColaFrame::OnFontDestination(wxCommandEvent& event)
-{
-    wxFontData data;
-    data.SetInitialFont(m_fontDestination);
-    wxFontDialog dlg(this, data);
-    if (dlg.ShowModal() == wxID_OK)
-    {
-        data = dlg.GetFontData();
-        m_fontDestination = data.GetChosenFont();
-        m_fontpickerDestination->SetSelectedFont(m_fontDestination);
-        m_panel->SetDestinationFont(m_fontDestination);
-        m_panel->RestyleDestination();
-    }
-
-    event.Skip();
-}
-
-
 void wxZRColaFrame::OnWarnPUA(wxCommandEvent& event)
 {
     m_warnPUA = !m_warnPUA;
     m_menuItemWarnPUA->Check(m_warnPUA);
     m_toolWarnPUA->SetState((m_toolWarnPUA->GetState() & ~wxAUI_BUTTON_STATE_CHECKED) | (m_warnPUA ? wxAUI_BUTTON_STATE_CHECKED : 0));
-    m_toolbarDestination->Refresh();
+    m_toolbarTranslate->Refresh();
-    m_panel->RestyleDestination();
+
+    // Notify destination text something changed and should re-paint.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_destination->ProcessWindowEvent(event2);
 
     event.Skip();
 }
@@ -460,20 +429,6 @@ void wxZRColaFrame::OnToolbarTranslate(wxCommandEvent& event)
 }
 
 
-void wxZRColaFrame::OnToolbarDestinationUpdate(wxUpdateUIEvent& event)
-{
-    event.Check(m_mgr.GetPane(m_toolbarDestination).IsShown());
-}
-
-
-void wxZRColaFrame::OnToolbarDestination(wxCommandEvent& event)
-{
-    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarDestination);
-    paneInfo.Show(!paneInfo.IsShown());
-    m_mgr.Update();
-}
-
-
 void wxZRColaFrame::OnTranslationSeqMenu(wxCommandEvent& event)
 {
     int idx = event.GetId() - wxID_TRANSLATION_SEQ_DEFAULT;
@@ -789,18 +744,8 @@ void wxPersistentZRColaFrame::Save() const
     auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("composition"), wnd->m_composition);
-    SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
-
-    #pragma warning(push)
-    #pragma warning(disable: 26812) // wxWidgets font enums are unscoped.
-    SaveValue(wxT("fontDestinationSize"        ), wnd->m_fontDestination.GetPointSize());
-    SaveValue(wxT("fontDestinationFamily"      ), wnd->m_fontDestination.GetFamily());
-    SaveValue(wxT("fontDestinationStyle"       ), wnd->m_fontDestination.GetStyle());
-    SaveValue(wxT("fontDestinationWeight"      ), wnd->m_fontDestination.GetWeight());
-    SaveValue(wxT("fontDestinationIsUnderlined"), wnd->m_fontDestination.GetUnderlined());
-    SaveValue(wxT("fontDestinationFace"        ), wnd->m_fontDestination.GetFaceName());
-    #pragma warning(pop)
     SaveValue(wxT("warnPUA"), wnd->m_warnPUA);
+    SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
 
     wxPersistentZRColaComposerPanel(wnd->m_panel).Save();
     wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Save();
@@ -823,19 +768,6 @@ bool wxPersistentZRColaFrame::Restore()
         wnd->m_composition = b;
     else
         wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
-
-    int fontSize = 20, fontFamily = wxFONTFAMILY_DEFAULT, fontStyle = wxFONTSTYLE_NORMAL, fontWeight = wxFONTWEIGHT_NORMAL;
-    bool fontIsUnderlined = false;
-    wxString fontFace(wxT("ZRCola"));
-    if (RestoreValue(wxT("fontDestinationSize"        ), &fontSize) &&
-        RestoreValue(wxT("fontDestinationFamily"      ), &fontFamily) &&
-        RestoreValue(wxT("fontDestinationStyle"       ), &fontStyle) &&
-        RestoreValue(wxT("fontDestinationWeight"      ), &fontWeight) &&
-        RestoreValue(wxT("fontDestinationIsUnderlined"), &fontIsUnderlined) &&
-        RestoreValue(wxT("fontDestinationFace"        ), &fontFace))
-        wnd->m_fontDestination = wxFont(fontSize, (wxFontFamily)fontFamily, (wxFontStyle)fontStyle, (wxFontWeight)fontWeight, fontIsUnderlined, fontFace);
-    else
-        wnd->m_fontDestination = wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"));
     if (RestoreValue(wxT("warnPUA"), &b))
         wnd->m_warnPUA = b;
     else

ZRCola/zrcolafrm.h

@@ -77,8 +77,6 @@ protected:
     void OnCopySourceAndReturn(wxCommandEvent& event);
     void OnSendAbort(wxCommandEvent& event);
     void OnComposition(wxCommandEvent& event);
-    virtual void OnFontDestinationChanged(wxFontPickerEvent& event);
-    void OnFontDestination(wxCommandEvent& event);
     void OnWarnPUA(wxCommandEvent& event);
     void OnSettings(wxCommandEvent& event);
     virtual void OnIdle(wxIdleEvent& event);
@@ -88,8 +86,6 @@ protected:
     void OnToolbarEdit(wxCommandEvent& event);
     void OnToolbarTranslateUpdate(wxUpdateUIEvent& event);
     void OnToolbarTranslate(wxCommandEvent& event);
-    void OnToolbarDestinationUpdate(wxUpdateUIEvent& event);
-    void OnToolbarDestination(wxCommandEvent& event);
     void OnTranslationSeqMenu(wxCommandEvent& event);
     virtual void OnTranslationSeqChoice(wxCommandEvent& event);
     void OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event);
@@ -139,7 +135,6 @@ protected:
     wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
     wxZRColaSettings *m_settings;       ///< Configuration dialog
     bool m_composition;                 ///< Is (de)composition enabled?
-    wxFont m_fontDestination;           ///< Destination window font
     bool m_warnPUA;                     ///< Mark Private-Use-Area characters in destination text
     ZRCola::transeqid_t m_transeq_id;   ///< Translation sequence ID
     wxZRColaTranslationSeq *m_transeq;  ///< Custom translation sequence dialog

ZRCola/zrcolagui.cpp

@@ -30,7 +30,7 @@ delete old;
 static wxFBContextSensitiveHelpSetter s_wxFBSetTheHelpProvider;
 ///////////////////////////////////////////////////////////////////////////
 
-wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name ) : wxFrame( parent, id, title, pos, parent->FromDIP(wxSize( 660,450 )), style, name )
+wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name ) : wxFrame( parent, id, title, pos, parent->FromDIP(wxSize(600, 400)), style, name )
 {
 	this->SetSizeHints( FromDIP(wxSize( 150,150 )), wxDefaultSize );
 	m_mgr.SetManagedWindow(this);
@@ -142,10 +142,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
-	wxMenuItem* m_menuItemFontDestination;
-	m_menuItemFontDestination = new wxMenuItem( m_menuEdit, wxID_FONT_DESTINATION, wxString( _("Composed Text &Font...") ) , _("Select font for composed text"), wxITEM_NORMAL );
-	m_menuEdit->Append( m_menuItemFontDestination );
-
 	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );
 
@@ -166,10 +162,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );
 
-	wxMenuItem* m_menuItemToolbarDestination;
-	m_menuItemToolbarDestination = new wxMenuItem( m_menuView, wxID_TOOLBAR_DESTINATION, wxString( _("Composed &Text Toolbar") ) , _("Toggle composed text toolbar"), wxITEM_CHECK );
-	m_menuView->Append( m_menuItemToolbarDestination );
-
 	m_menuView->AppendSeparator();
 
 	wxMenuItem* m_menuItemPanelChrGrps;
@@ -232,21 +224,13 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 240,-1 )), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
+	m_toolbarTranslate->AddSeparator();
+
+	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
+
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 
-	m_toolbarDestination = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
-	m_fontpickerDestination = new wxFontPickerCtrl( m_toolbarDestination, wxID_FONT_DESTINATION, wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ), wxDefaultPosition, wxDefaultSize, wxFNTP_FONTDESC_AS_LABEL );
-	m_fontpickerDestination->SetMaxPointSize( 100 );
-	m_fontpickerDestination->SetMinSize( FromDIP(wxSize( 120,-1 )) );
-	m_fontpickerDestination->SetMaxSize( FromDIP(wxSize( 180,-1 )) );
-
-	m_toolbarDestination->AddControl( m_fontpickerDestination );
-	m_toolWarnPUA = m_toolbarDestination->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
-
-	m_toolbarDestination->Realize();
-	m_mgr.AddPane( m_toolbarDestination, wxAuiPaneInfo().Name( wxT("toolbarDestination") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
-
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );
 
 	m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize(FromDIP(wxSize( 150,200 )) ).MinSize( FromDIP(wxSize( 100,100 )) ).Layer( 1 ) );
@@ -265,7 +249,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
-	m_fontpickerDestination->Connect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 }
 
 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -275,7 +258,6 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
-	m_fontpickerDestination->Disconnect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 
 	m_mgr.UnInit();
 

ZRCola/zrcolagui.h

@@ -25,7 +25,6 @@ class wxZRColaCharGrid;
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
-#include <wx/fontpicker.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -69,12 +68,10 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
 			wxID_COMPOSITION,
-			wxID_FONT_DESTINATION,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
 			wxID_TOOLBAR_TRANSLATE,
-			wxID_TOOLBAR_DESTINATION,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -100,8 +97,6 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolSendSource;
 		wxAuiToolBarItem* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
-		wxAuiToolBar* m_toolbarDestination;
-		wxFontPickerCtrl* m_fontpickerDestination;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -111,7 +106,6 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnFontDestinationChanged( wxFontPickerEvent& event ) { event.Skip(); }
 
 
 	public: