Version set to 2.0-alpha3.

resolves #5

.gitignore

@@ -1,13 +1,6 @@
-/ipch
-/output/Win32.Debug
-/output/Win32.Release
-/output/x64.Debug
-/output/x64.Release
+/*.opensdf
 /*.sdf
 /*.suo
+/ipch
 *.user
 temp
-/*.opensdf
-/ZRCola/locale/*.mo
-/output/locale/sl/ZRCola.mo
-/output/locale/sl/wxExtend.mo

.gitmodules

@@ -1,3 +1,21 @@
 [submodule "lib/wxExtend"]
 	path = lib/wxExtend
 	url = https://github.com/Amebis/wxExtend.git
+[submodule "lib/stdex"]
+	path = lib/stdex
+	url = https://github.com/Amebis/stdex.git
+[submodule "MSI/MSIBuild"]
+	path = MSI/MSIBuild
+	url = https://github.com/Amebis/MSIBuild.git
+[submodule "MSI/MSICA"]
+	path = MSI/MSICA
+	url = https://github.com/Amebis/MSICA.git
+[submodule "lib/atlex"]
+	path = lib/atlex
+	url = https://github.com/Amebis/atlex.git
+[submodule "lib/MSICALib"]
+	path = lib/MSICALib
+	url = https://github.com/Amebis/MSICALib.git
+[submodule "Updater"]
+	path = Updater
+	url = https://github.com/Amebis/Updater.git

MSI/MSM/.gitignore

@@ -0,0 +1,5 @@
+/*.log
+/Microsoft_VC100_CRT_x64.msm
+/Microsoft_VC100_CRT_x86.msm
+/Microsoft_VC100_DebugCRT_x64.msm
+/Microsoft_VC100_DebugCRT_x86.msm

MSI/MSM/Microsoft_VC100_CRT_x64.lst

@@ -0,0 +1,2 @@
+Win\System64\msvcp100.dll
+Win\System64\msvcr100.dll

MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/Microsoft_VC100_CRT_x86.lst

@@ -0,0 +1,2 @@
+Win\System\msvcp100.dll
+Win\System\msvcr100.dll

MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst

@@ -0,0 +1,2 @@
+Win\System64\msvcp100d.dll
+Win\System64\msvcr100d.dll

MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst

@@ -0,0 +1,2 @@
+Win\System\msvcp100d.dll
+Win\System\msvcr100d.dll

MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30u_net_vc100.dll

MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30u_net_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30u_vc100.dll

MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30u_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30u_xml_vc100.dll

MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30u_xml_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30ud_net_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30ud_net_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30ud_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30ud_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30ud_xml_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30ud_xml_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30u_core_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30u_core_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30ud_core_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30ud_core_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/ZRCola/Main/.gitignore

@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm

MSI/ZRCola/Makefile

@@ -0,0 +1,21 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+!INCLUDE "..\..\include\MSIBuildCfg.mak"
+!INCLUDE "..\MSIBuild\Makefile"

MSI/ZRCola/locale/.gitignore

@@ -0,0 +1 @@
+/*.mo

Makefile

@@ -0,0 +1,388 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+OUTPUT_DIR=output
+PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
+
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+PLAT=x64
+REG_FLAGS=/f /reg:64
+REG_FLAGS32=/f /reg:32
+!ELSE
+PLAT=Win32
+REG_FLAGS=/f
+!ENDIF
+
+
+All ::
+
+Clean ::
+	cd "MSI\MSIBuild\Version"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
+	cd "$(MAKEDIR)"
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Debug
+	cd "$(MAKEDIR)"
+	devenv.com "ZRCola.sln"          /clean "Release|Win32"
+	devenv.com "ZRCola.sln"          /clean "Debug|Win32"
+	devenv.com "ZRCola.sln"          /clean "Release|x64"
+	devenv.com "ZRCola.sln"          /clean "Debug|x64"
+	devenv.com "ZRColaUtils.sln"     /clean "Release|Win32"
+	devenv.com "ZRColaUtils.sln"     /clean "Debug|Win32"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|Win32"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|x64"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
+	devenv.com "Updater\Updater.sln" /clean "Release|Win32"
+	devenv.com "Updater\Updater.sln" /clean "Debug|Win32"
+	devenv.com "Updater\Updater.sln" /clean "Release|x64"
+	devenv.com "Updater\Updater.sln" /clean "Debug|x64"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
+	-if exist "$(OUTPUT_DIR)\catalog.xml"           del /f /q "$(OUTPUT_DIR)\catalog.xml"
+
+!IFNDEF HAS_VERSION
+
+######################################################################
+# 1st Phase
+# - Version info parsing
+######################################################################
+
+All \
+Setup \
+SetupDebug \
+Register \
+Unregister \
+PublishPre \
+Publish :: "MSI\MSIBuild\Version\Version.mak"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
+
+"MSI\MSIBuild\Version\Version.mak" ::
+	cd "MSI\MSIBuild\Version"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Version
+	cd "$(MAKEDIR)"
+
+!ELSE
+
+######################################################################
+# 2nd Phase
+# - The version is known, do the rest.
+######################################################################
+
+!INCLUDE "MSI\MSIBuild\Version\Version.mak"
+!INCLUDE "include\MSIBuildCfg.mak"
+
+PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
+PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
+
+REDIST_EN_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi"
+REDIST_EN_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi"
+REDIST_SL_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi"
+REDIST_SL_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi"
+
+
+######################################################################
+# Main targets
+######################################################################
+
+All :: \
+	Setup
+
+Setup :: \
+	"$(OUTPUT_DIR)\Setup" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+
+SetupDebug :: \
+	"$(OUTPUT_DIR)\Setup" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
+
+Register :: \
+	RegisterSettings \
+	InstallFonts \
+	RegisterShortcuts
+
+Unregister :: \
+	UnregisterShortcuts \
+	UninstallFonts \
+	UnregisterSettings
+
+RegisterSettings ::
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS) > NUL
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS32) > NUL
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS32) > NUL
+!ENDIF
+
+UnregisterSettings ::
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS) > NUL
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS32) > NUL
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS32) > NUL
+!ENDIF
+
+InstallFonts :: \
+	"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" \
+	"$(WINDIR)\Fonts\00_ZRCola_It.ttf" \
+	"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" \
+	"$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             /t REG_SZ /d "00_ZRCola_Re.ttf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      /t REG_SZ /d "00_ZRCola_It.ttf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        /t REG_SZ /d "00_ZRCola_Bd.ttf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" /t REG_SZ /d "00_ZRCola_BI.ttf" $(REG_FLAGS) > NUL
+
+UninstallFonts::
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_Re.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.ttf"
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_It.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.ttf"
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf"
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_BI.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
+
+RegisterShortcuts :: \
+	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
+	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola\ZRCola.lnk"
+
+UnregisterShortcuts ::
+	-if exist "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" rd /s /q "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola"
+
+PublishPre :: \
+	"$(PUBLISH_PACKAGE_DIR)" \
+	$(REDIST_EN_WIN32) \
+	$(REDIST_EN_X64) \
+	$(REDIST_SL_WIN32) \
+	$(REDIST_SL_X64)
+
+Publish :: \
+	PublishPre \
+	"$(PUBLISH_DIR)\catalog-0000.xml"
+
+
+######################################################################
+# Folder creation
+######################################################################
+
+"$(OUTPUT_DIR)" \
+"$(OUTPUT_DIR)\Keys" \
+"$(OUTPUT_DIR)\Setup" \
+"$(PUBLISH_DIR)" \
+"$(PUBLISH_PACKAGE_DIR)" \
+"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
+	if not exist $@ md $@
+
+"$(OUTPUT_DIR)\Keys" \
+"$(OUTPUT_DIR)\Setup" : "$(OUTPUT_DIR)"
+
+"$(PUBLISH_PACKAGE_DIR)" : "$(PUBLISH_DIR)"
+
+
+######################################################################
+# File copy
+######################################################################
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
+$(REDIST_EN_WIN32) : "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" : "$(OUTPUT_DIR)\ZRColaEn32D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
+$(REDIST_EN_X64) : "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" : "$(OUTPUT_DIR)\ZRColaEn64D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
+$(REDIST_SL_WIN32) : "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" : "$(OUTPUT_DIR)\ZRColaSl32D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi" \
+$(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Re.ttf"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_It.ttf" : "$(OUTPUT_DIR)\00_ZRCola_It.ttf"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.ttf"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_BI.ttf" : "$(OUTPUT_DIR)\00_ZRCola_BI.ttf"
+	copy /y $** $@ > NUL
+
+
+######################################################################
+# Shortcut creation
+######################################################################
+
+"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola\ZRCola.lnk" : "$(OUTPUT_DIR)\$(PLAT).Debug\ZRCola.exe"
+	cscript.exe "bin\MkLnk.wsf" //Nologo $@ "$(MAKEDIR)\$(OUTPUT_DIR)\$(PLAT).Debug\ZRCola.exe"
+
+
+######################################################################
+# Building
+######################################################################
+
+"$(OUTPUT_DIR)\Win32.Release\libZRCola10u_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+	devenv.com "ZRCola.sln" /build "Release|Win32"
+
+"$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
+"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+	devenv.com "ZRCola.sln" /build "Debug|Win32"
+
+"$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+	devenv.com "ZRCola.sln" /build "Release|x64"
+
+"$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
+"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" \
+"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+	devenv.com "ZRCola.sln" /build "Debug|x64"
+
+"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32"
+	devenv.com "Updater\Updater.sln" /build "Release|Win32"
+
+"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32"
+	devenv.com "Updater\Updater.sln" /build "Debug|Win32"
+
+"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64"
+	devenv.com "Updater\Updater.sln" /build "Release|x64"
+
+"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64"
+	devenv.com "Updater\Updater.sln" /build "Debug|x64"
+
+"$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaEn64.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
+	if exist $@  del /f /q $@
+	output\$(PLAT).Release\UpdSignXML.exe $** $@
+
+"$(OUTPUT_DIR)\catalog.xml" : \
+	"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl32.3.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+	-if exist $@ del /f /q $@
+	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
+	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+	move /y "$(@:"=).tmp" $@ > NUL
+
+!ENDIF

ZRCola.sln

@@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -46,6 +50,22 @@ Global
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.Build.0 = Release|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.ActiveCfg = Release|x64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.Build.0 = Release|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.ActiveCfg = Debug|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.Build.0 = Debug|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.ActiveCfg = Release|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.Build.0 = Release|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.ActiveCfg = Debug|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.Build.0 = Debug|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -53,5 +73,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+		{518777CC-0A59-4415-A12A-82751ED75343} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 	EndGlobalSection
 EndGlobal

ZRCola/MSIBuild/.gitignore

@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm

ZRCola/MSIBuild/Makefile

@@ -0,0 +1,222 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+!INCLUDE "..\..\include\MSIBuildCfg.mak"
+
+MSIBUILD_IS_LOCALIZEABLE=1
+
+
+######################################################################
+# AppSearch
+
+All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Property	Signature_
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
+AppSearch	Property	Signature_
+OLDZRCOLADIR	clZRCola.exe.$(PLAT)
+<<NOKEEP
+
+
+######################################################################
+# CompLocator
+
+All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Signature_	ComponentId	Type
+s$(MSIBUILD_LENGTH_ID)	s38	I2
+CompLocator	Signature_
+!IF "$(PLAT)" == "Win32"
+clZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	1
+!ENDIF
+!IF "$(PLAT)" == "x64"
+clZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	1
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Component
+
+All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Component	ComponentId	Directory_	Attributes	Condition	KeyPath
+s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
+Component	Component
+!IF "$(PLAT)" == "Win32"
+compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		fileZRCola.exe.Win32
+!ENDIF
+!IF "$(PLAT)" == "x64"
+compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
+!ENDIF
+!IF "$(LANG)" == "Sl"
+compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Feature
+
+All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt"
+
+"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Feature	Feature_Parent	Title	Description	Display	Level	Directory_	Attributes
+s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	L64	L255	I2	i2	S$(MSIBUILD_LENGTH_ID)	i2
+1252	Feature	Feature
+featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
+######################################################################
+# FeatureComponents
+
+All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Feature_	Component_
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
+FeatureComponents	Feature_	Component_
+featZRCola	compZRCola.exe.$(PLAT)
+featZRCola	complibZRCola.dll.$(PLAT)
+featZRCola	complibZRColaUI.dll.$(PLAT)
+featZRCola	compwxExtend.dll.$(PLAT)
+featZRCola	compLocalizationRepositoryPath
+featZRCola	compLanguage
+featZRCola	compDatabasePath
+featZRCola	compZRCola.zrcdb
+featZRCola	comp00_ZRCola_Re.ttf
+!IF "$(LANG)" == "Sl"
+featZRCola	compZRCola.mo.sl_SI
+featZRCola	compwxExtend.mo.sl_SI
+featZRCola	compwxstd.mo.sl_SI
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# File
+
+All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
+File	File
+fileZRCola.exe.$(PLAT)	compZRCola.exe.$(PLAT)	ZRCola.exe	0		0	1536	1
+!IF "$(LANG)" == "Sl"
+fileZRCola.mo.sl_SI	compZRCola.mo.sl_SI	ZRCola.mo	0		1060	0	1
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Icon
+
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Icon-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico"
+
+"$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Name	Data
+s$(MSIBUILD_LENGTH_ID)	v0
+Icon	Name
+iconZRCola.ico	ZRCola.ico
+<<NOKEEP
+
+"$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico" : "..\res\zrcola.ico"
+	copy /y $** $@ > NUL
+
+
+######################################################################
+# RemoveFile
+
+All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+FileKey	Component_	FileName	DirProperty	InstallMode
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	L255	s$(MSIBUILD_LENGTH_ID)	i2
+RemoveFile	FileKey
+rmfiZRCola	compZRCola.exe.$(PLAT)		ZRColaShortcutDir	2
+<<NOKEEP
+
+
+######################################################################
+# Shortcut
+
+All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt"
+
+"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Shortcut	Directory_	Name	Component_	Target	Arguments	Description	Hotkey	Icon_	IconIndex	ShowCmd	WkDir
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l128	s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	S255	L255	I2	S$(MSIBUILD_LENGTH_ID)	I2	I2	S$(MSIBUILD_LENGTH_ID)
+1252	Shortcut	Shortcut
+shctZRCola	ZRColaShortcutDir	ZRCola	compZRCola.exe.$(PLAT)	featZRCola		Input system for linguistic use		iconZRCola.ico			ZRCOLABINDIR
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
+######################################################################
+# Build MSM module!
+######################################################################
+
+!INCLUDE "..\..\MSI\MSIBuild\MSM.mak"

ZRCola/ZRCola.fbp

@@ -50,7 +50,7 @@
             <property name="title">ZRCola</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
-            <property name="window_name"></property>
+            <property name="window_name">ZRCola</property>
             <property name="window_style">wxTAB_TRAVERSAL</property>
             <property name="xrc_skip_sizer">1</property>
             <event name="OnActivate"></event>
@@ -134,8 +134,8 @@
                 <event name="OnSize"></event>
                 <event name="OnUpdateUI"></event>
                 <object class="wxMenu" expanded="1">
-                    <property name="label">&amp;File</property>
-                    <property name="name">m_menuFile</property>
+                    <property name="label">&amp;Program</property>
+                    <property name="name">m_menuProgram</property>
                     <property name="permission">protected</property>
                     <object class="wxMenuItem" expanded="1">
                         <property name="bitmap"></property>
@@ -154,69 +154,99 @@
                     </object>
                 </object>
                 <object class="wxMenu" expanded="1">
-                    <property name="label">&amp;Accents</property>
-                    <property name="name">m_menuAccents</property>
+                    <property name="label">&amp;Edit</property>
+                    <property name="name">m_menuEdit</property>
                     <property name="permission">protected</property>
                     <object class="wxMenuItem" expanded="1">
-                        <property name="bitmap"></property>
+                        <property name="bitmap">Load From Icon Resource; edit_cut.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
-                        <property name="id">wxID_INSERT_GRAVE</property>
+                        <property name="help">Cuts selected text and puts it on the clipboard</property>
+                        <property name="id">wxID_CUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Grave&#x09;&amp;7</property>
-                        <property name="name">m_menuItemGrave</property>
+                        <property name="label">Cut</property>
+                        <property name="name">m_menuItemEditCut</property>
                         <property name="permission">none</property>
-                        <property name="shortcut"></property>
+                        <property name="shortcut">Ctrl+X</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="1">
-                        <property name="bitmap"></property>
+                        <property name="bitmap">Load From Icon Resource; edit_copy.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
-                        <property name="id">wxID_INSERT_ACUTE</property>
+                        <property name="help">Copies selected text to the clipboard</property>
+                        <property name="id">wxID_COPY</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Acute&#x09;&amp;9</property>
-                        <property name="name">m_menuItemAcute</property>
+                        <property name="label">&amp;Copy</property>
+                        <property name="name">m_menuItemEditCopy</property>
                         <property name="permission">none</property>
-                        <property name="shortcut"></property>
+                        <property name="shortcut">Ctrl+C</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="wxMenuItem" expanded="1">
-                        <property name="bitmap"></property>
+                        <property name="bitmap">Load From Icon Resource; edit_paste.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
-                        <property name="id">wxID_INSERT_CIRCUMFLEX</property>
+                        <property name="help">Inserts text from the clipboard</property>
+                        <property name="id">wxID_PASTE</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Circumflex&#x09;&amp;3</property>
-                        <property name="name">m_menuItemCircumflex</property>
+                        <property name="label">&amp;Paste</property>
+                        <property name="name">m_menuItemEditPaste</property>
                         <property name="permission">none</property>
-                        <property name="shortcut"></property>
+                        <property name="shortcut">Ctrl+V</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
                     <object class="separator" expanded="1">
-                        <property name="name">m_separator2</property>
+                        <property name="name">m_separatorEdit1</property>
                         <property name="permission">none</property>
                     </object>
                     <object class="wxMenuItem" expanded="1">
-                        <property name="bitmap"></property>
+                        <property name="bitmap">Load From Icon Resource; send_composed.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
-                        <property name="id">wxID_INSERT_INV_BREVE_BELOW</property>
+                        <property name="help">Sends composed text to source window</property>
+                        <property name="id">wxID_SEND_COMPOSED</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Inverted &amp;breve</property>
-                        <property name="name">m_menuItemInvBreveBelow</property>
+                        <property name="label">&amp;Send Composed</property>
+                        <property name="name">m_menuItemSendComposed</property>
                         <property name="permission">none</property>
-                        <property name="shortcut"></property>
+                        <property name="shortcut">F5</property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap">Load From Icon Resource; send_decomposed.ico; [16; 16]</property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help">Sends decomposed text to source window</property>
+                        <property name="id">wxID_SEND_DECOMPOSED</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Send &amp;Decomposed</property>
+                        <property name="name">m_menuItemSendDecomposed</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut">F6</property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap">Load From Icon Resource; send_abort.ico; [16; 16]</property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help">Aborts composition and returns focus to source window</property>
+                        <property name="id">wxID_SEND_ABORT</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Abort (De)composition</property>
+                        <property name="name">m_menuItemSendAbort</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut">Esc</property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -243,7 +273,195 @@
                     </object>
                 </object>
             </object>
-            <object class="wxBoxSizer" expanded="1">
+            <object class="wxToolBar" expanded="1">
+                <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="bitmapsize"></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_ANY</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"></property>
+                <property name="minimize_button">0</property>
+                <property name="minimum_size"></property>
+                <property name="moveable">1</property>
+                <property name="name">m_toolbar</property>
+                <property name="packing">1</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="separation">5</property>
+                <property name="show">1</property>
+                <property name="size"></property>
+                <property name="style">wxTB_HORIZONTAL</property>
+                <property name="subclass"></property>
+                <property name="toolbar_pane">0</property>
+                <property name="tooltip"></property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <event name="OnChar"></event>
+                <event name="OnEnterWindow"></event>
+                <event name="OnEraseBackground"></event>
+                <event name="OnKeyDown"></event>
+                <event name="OnKeyUp"></event>
+                <event name="OnKillFocus"></event>
+                <event name="OnLeaveWindow"></event>
+                <event name="OnLeftDClick"></event>
+                <event name="OnLeftDown"></event>
+                <event name="OnLeftUp"></event>
+                <event name="OnMiddleDClick"></event>
+                <event name="OnMiddleDown"></event>
+                <event name="OnMiddleUp"></event>
+                <event name="OnMotion"></event>
+                <event name="OnMouseEvents"></event>
+                <event name="OnMouseWheel"></event>
+                <event name="OnPaint"></event>
+                <event name="OnRightDClick"></event>
+                <event name="OnRightDown"></event>
+                <event name="OnRightUp"></event>
+                <event name="OnSetFocus"></event>
+                <event name="OnSize"></event>
+                <event name="OnUpdateUI"></event>
+                <object class="tool" expanded="1">
+                    <property name="bitmap">Load From Icon Resource; edit_cut.ico; [24; 24]</property>
+                    <property name="context_menu">0</property>
+                    <property name="id">wxID_CUT</property>
+                    <property name="kind">wxITEM_NORMAL</property>
+                    <property name="label">Cut</property>
+                    <property name="name">m_toolEditCut</property>
+                    <property name="permission">protected</property>
+                    <property name="statusbar">Cuts selected text and puts it on the clipboard</property>
+                    <property name="tooltip">Cut</property>
+                    <event name="OnAuiToolBarBeginDrag"></event>
+                    <event name="OnAuiToolBarMiddleClick"></event>
+                    <event name="OnAuiToolBarOverflowClick"></event>
+                    <event name="OnAuiToolBarRightClick"></event>
+                    <event name="OnAuiToolBarToolDropDown"></event>
+                    <event name="OnMenuSelection"></event>
+                    <event name="OnToolClicked"></event>
+                    <event name="OnToolEnter"></event>
+                    <event name="OnToolRClicked"></event>
+                    <event name="OnUpdateUI"></event>
+                </object>
+                <object class="tool" expanded="1">
+                    <property name="bitmap">Load From Icon Resource; edit_copy.ico; [24; 24]</property>
+                    <property name="context_menu">0</property>
+                    <property name="id">wxID_COPY</property>
+                    <property name="kind">wxITEM_NORMAL</property>
+                    <property name="label">Copy</property>
+                    <property name="name">m_toolEditCopy</property>
+                    <property name="permission">protected</property>
+                    <property name="statusbar">Copies selected text to the clipboard</property>
+                    <property name="tooltip">Copy</property>
+                    <event name="OnAuiToolBarBeginDrag"></event>
+                    <event name="OnAuiToolBarMiddleClick"></event>
+                    <event name="OnAuiToolBarOverflowClick"></event>
+                    <event name="OnAuiToolBarRightClick"></event>
+                    <event name="OnAuiToolBarToolDropDown"></event>
+                    <event name="OnMenuSelection"></event>
+                    <event name="OnToolClicked"></event>
+                    <event name="OnToolEnter"></event>
+                    <event name="OnToolRClicked"></event>
+                    <event name="OnUpdateUI"></event>
+                </object>
+                <object class="tool" expanded="1">
+                    <property name="bitmap">Load From Icon Resource; edit_paste.ico; [24; 24]</property>
+                    <property name="context_menu">0</property>
+                    <property name="id">wxID_PASTE</property>
+                    <property name="kind">wxITEM_NORMAL</property>
+                    <property name="label">Paste</property>
+                    <property name="name">m_toolEditPaste</property>
+                    <property name="permission">protected</property>
+                    <property name="statusbar">Inserts text from the clipboard</property>
+                    <property name="tooltip">Paste</property>
+                    <event name="OnAuiToolBarBeginDrag"></event>
+                    <event name="OnAuiToolBarMiddleClick"></event>
+                    <event name="OnAuiToolBarOverflowClick"></event>
+                    <event name="OnAuiToolBarRightClick"></event>
+                    <event name="OnAuiToolBarToolDropDown"></event>
+                    <event name="OnMenuSelection"></event>
+                    <event name="OnToolClicked"></event>
+                    <event name="OnToolEnter"></event>
+                    <event name="OnToolRClicked"></event>
+                    <event name="OnUpdateUI"></event>
+                </object>
+                <object class="toolSeparator" expanded="1">
+                    <property name="permission">protected</property>
+                </object>
+                <object class="tool" expanded="1">
+                    <property name="bitmap">Load From Icon Resource; send_composed.ico; [24; 24]</property>
+                    <property name="context_menu">0</property>
+                    <property name="id">wxID_SEND_COMPOSED</property>
+                    <property name="kind">wxITEM_NORMAL</property>
+                    <property name="label">Send Composed</property>
+                    <property name="name">m_toolSendComposed</property>
+                    <property name="permission">protected</property>
+                    <property name="statusbar">Sends composed text to source window</property>
+                    <property name="tooltip">Send Composed</property>
+                    <event name="OnAuiToolBarBeginDrag"></event>
+                    <event name="OnAuiToolBarMiddleClick"></event>
+                    <event name="OnAuiToolBarOverflowClick"></event>
+                    <event name="OnAuiToolBarRightClick"></event>
+                    <event name="OnAuiToolBarToolDropDown"></event>
+                    <event name="OnMenuSelection"></event>
+                    <event name="OnToolClicked"></event>
+                    <event name="OnToolEnter"></event>
+                    <event name="OnToolRClicked"></event>
+                    <event name="OnUpdateUI"></event>
+                </object>
+                <object class="tool" expanded="1">
+                    <property name="bitmap">Load From Icon Resource; send_decomposed.ico; [24; 24]</property>
+                    <property name="context_menu">0</property>
+                    <property name="id">wxID_SEND_DECOMPOSED</property>
+                    <property name="kind">wxITEM_NORMAL</property>
+                    <property name="label">Send Decomposed</property>
+                    <property name="name">m_toolSendDecomposed</property>
+                    <property name="permission">protected</property>
+                    <property name="statusbar">Sends decomposed text to source window</property>
+                    <property name="tooltip">Send Decomposed</property>
+                    <event name="OnAuiToolBarBeginDrag"></event>
+                    <event name="OnAuiToolBarMiddleClick"></event>
+                    <event name="OnAuiToolBarOverflowClick"></event>
+                    <event name="OnAuiToolBarRightClick"></event>
+                    <event name="OnAuiToolBarToolDropDown"></event>
+                    <event name="OnMenuSelection"></event>
+                    <event name="OnToolClicked"></event>
+                    <event name="OnToolEnter"></event>
+                    <event name="OnToolRClicked"></event>
+                    <event name="OnUpdateUI"></event>
+                </object>
+            </object>
+            <object class="wxBoxSizer" expanded="0">
                 <property name="minimum_size"></property>
                 <property name="name">bSizerMain</property>
                 <property name="orient">wxVERTICAL</property>
@@ -334,6 +552,52 @@
                     </object>
                 </object>
             </object>
+            <object class="wxStatusBar" expanded="1">
+                <property name="bg"></property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="fields">1</property>
+                <property name="font"></property>
+                <property name="hidden">0</property>
+                <property name="id">wxID_ANY</property>
+                <property name="maximum_size"></property>
+                <property name="minimum_size"></property>
+                <property name="name">m_statusBar</property>
+                <property name="permission">protected</property>
+                <property name="pos"></property>
+                <property name="size"></property>
+                <property name="style">wxST_SIZEGRIP</property>
+                <property name="subclass"></property>
+                <property name="tooltip"></property>
+                <property name="window_extra_style"></property>
+                <property name="window_name"></property>
+                <property name="window_style"></property>
+                <event name="OnChar"></event>
+                <event name="OnEnterWindow"></event>
+                <event name="OnEraseBackground"></event>
+                <event name="OnKeyDown"></event>
+                <event name="OnKeyUp"></event>
+                <event name="OnKillFocus"></event>
+                <event name="OnLeaveWindow"></event>
+                <event name="OnLeftDClick"></event>
+                <event name="OnLeftDown"></event>
+                <event name="OnLeftUp"></event>
+                <event name="OnMiddleDClick"></event>
+                <event name="OnMiddleDown"></event>
+                <event name="OnMiddleUp"></event>
+                <event name="OnMotion"></event>
+                <event name="OnMouseEvents"></event>
+                <event name="OnMouseWheel"></event>
+                <event name="OnPaint"></event>
+                <event name="OnRightDClick"></event>
+                <event name="OnRightDown"></event>
+                <event name="OnRightUp"></event>
+                <event name="OnSetFocus"></event>
+                <event name="OnSize"></event>
+                <event name="OnUpdateUI"></event>
+            </object>
         </object>
         <object class="Panel" expanded="1">
             <property name="aui_managed">0</property>
@@ -423,7 +687,7 @@
                         <property name="font">00 ZRCola,90,90,20,70,0</property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
-                        <property name="id">wxID_DECOMPOSED</property>
+                        <property name="id">wxID_ANY</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>
@@ -514,7 +778,7 @@
                         <property name="font">00 ZRCola,90,90,20,70,0</property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
-                        <property name="id">wxID_COMPOSED</property>
+                        <property name="id">wxID_ANY</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>

ZRCola/ZRCola.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\libZRCola\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

ZRCola/ZRCola.vcxproj

@@ -84,6 +84,7 @@
     <ClCompile Include="zrcolacomppnl.cpp" />
     <ClCompile Include="zrcolafrm.cpp" />
     <ClCompile Include="zrcolagui.cpp" />
+    <ClCompile Include="zrcolakeyhndlr.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
@@ -91,8 +92,12 @@
     <ClInclude Include="zrcolacomppnl.h" />
     <ClInclude Include="zrcolafrm.h" />
     <ClInclude Include="zrcolagui.h" />
+    <ClInclude Include="zrcolakeyhndlr.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\lib\libZRColaUI\build\libZRColaUI.vcxproj">
+      <Project>{c0a84bd2-3870-4cd6-b281-0ab322e3c579}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
@@ -101,14 +106,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\send.ico" />
+    <None Include="res\edit_copy.ico" />
+    <None Include="res\edit_cut.ico" />
+    <None Include="res\edit_paste.ico" />
+    <None Include="res\send_abort.ico" />
+    <None Include="res\send_composed.ico" />
+    <None Include="res\send_decomposed.ico" />
     <None Include="res\zrcola.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRCola.rc" />
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl.po" />
+    <POCompile Include="locale\sl_SI.po" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

ZRCola/ZRCola.vcxproj.filters

@@ -34,6 +34,9 @@
     <ClCompile Include="zrcolafrm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="zrcolakeyhndlr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -51,12 +54,30 @@
     <ClInclude Include="zrcolafrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="zrcolakeyhndlr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="res\send.ico">
+    <None Include="res\zrcola.ico">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="res\zrcola.ico">
+    <None Include="res\send_abort.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\send_composed.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\send_decomposed.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\edit_copy.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\edit_cut.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\edit_paste.ico">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
@@ -66,7 +87,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl.po">
+    <POCompile Include="locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
   </ItemGroup>

ZRCola/locale/.gitignore

@@ -0,0 +1 @@
+/*.mo

ZRCola/locale/sl.po

@@ -1,121 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-02-09 18:56+0100\n"
-"PO-Revision-Date: 2016-02-09 18:56+0100\n"
-"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
-"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
-"Language: sl_SI\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: zrcolafrm.cpp:62
-msgid ""
-"ZRCola keyboard shortcut Ctrl+Alt+Z could not be registered. Some "
-"functionality will not be available."
-msgstr ""
-"ZRColine bližnjice na tipkovnici Ctrl+Alt+Z ni mogoče registrirati. Nekaj "
-"funkcionalnosti ne bo na voljo."
-
-#: zrcolafrm.cpp:62 zrcolafrm.cpp:64
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: zrcolafrm.cpp:64
-msgid ""
-"ZRCola keyboard shortcut Ctrl+Alt+Shift+Z could not be registered. Some "
-"functionality will not be available."
-msgstr ""
-"ZRColine bližnjice na tipkovnici Ctrl+Alt+Shift+Z ni mogoče registrirati. "
-"Nekaj funkcionalnosti ne bo na voljo."
-
-#: zrcolafrm.cpp:222
-#, c-format
-msgid ""
-"ZRCola v%s\n"
-"Copyright 2015-%s Amebis"
-msgstr ""
-"ZRCola v%s\n"
-"Vse pravice pridržane 2015-%s Amebis"
-
-#: zrcolafrm.cpp:222
-msgid "About ZRCola"
-msgstr "O ZRColi"
-
-#: zrcolagui.cpp:32
-msgid "E&xit"
-msgstr "I&zhod"
-
-#: zrcolagui.cpp:35
-msgid "&File"
-msgstr "&Datoteka"
-
-#: zrcolagui.cpp:39
-msgid "Grave\t&7"
-msgstr "Krativec\t&7"
-
-#: zrcolagui.cpp:43
-msgid "Acute\t&9"
-msgstr "Ostrivec\t&9"
-
-#: zrcolagui.cpp:47
-msgid "Circumflex\t&3"
-msgstr "Cirkumfleks\t&3"
-
-#: zrcolagui.cpp:53
-msgid "Inverted &breve"
-msgstr "O&brnjen polkrog"
-
-#: zrcolagui.cpp:56
-msgid "&Accents"
-msgstr "N&aglasi"
-
-#: zrcolagui.cpp:60
-msgid "&About"
-msgstr "O progr&amu"
-
-#: zrcolagui.cpp:63
-msgid "&Help"
-msgstr "&Pomoč"
-
-#: zrcolagui.h:56
-msgid "ZRCola"
-msgstr "ZRCola"
-
-#~ msgid ""
-#~ "There is already an auto hidden bar on this edge.\n"
-#~ "Only one auto hidden bar is allowed on each edge.\n"
-#~ "Auto-hide feature is now off."
-#~ msgstr ""
-#~ "Ob tem robu je že samodejno skrita pasica.\n"
-#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n"
-#~ "Samodejno skrivanje je zdaj izklopljeno."
-
-#~ msgid "Hello World"
-#~ msgstr "Zdravo svet"
-
-#~ msgid "&Hello...\tCtrl+H"
-#~ msgstr "&Pozdrav ...\tCtrl+H"
-
-#~ msgid "Help string shown in status bar for this menu item"
-#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija"
-
-#~ msgid "This is a wxWidgets' Hello world sample"
-#~ msgstr "To je primer Zdravo svet v wxWidgets"
-
-#~ msgid "About Hello World"
-#~ msgstr "O Zdravo svet"
-
-#~ msgid "Hello world from wxWidgets!"
-#~ msgstr "Zdravo svet iz wxWidgets!"
-
-#~ msgid "Welcome to wxWidgets!"
-#~ msgstr "Dobrodošli v wxWidgets!"

ZRCola/locale/sl_SI.po

@@ -0,0 +1,222 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: ZRCola\n"
+"POT-Creation-Date: 2016-04-06 12:31+0200\n"
+"PO-Revision-Date: 2016-04-06 12:31+0200\n"
+"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
+"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
+"Language: sl_SI\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7\n"
+"X-Poedit-Basepath: ..\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: zrcolafrm.cpp:56
+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:56 zrcolafrm.cpp:58
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: zrcolafrm.cpp:58
+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:119
+#, c-format
+msgid ""
+"ZRCola v%s\n"
+"Copyright 2015-%s Amebis"
+msgstr ""
+"ZRCola v%s\n"
+"Vse pravice pridržane 2015-%s Amebis"
+
+#: zrcolafrm.cpp:119
+msgid "About ZRCola"
+msgstr "O ZRColi"
+
+#: zrcolagui.cpp:32
+msgid "E&xit"
+msgstr "I&zhod"
+
+#: zrcolagui.cpp:35
+msgid "&Program"
+msgstr "&Program"
+
+#: zrcolagui.cpp:39 zrcolagui.cpp:106
+msgid "Cut"
+msgstr "Izreži"
+
+#: zrcolagui.cpp:39 zrcolagui.cpp:106
+msgid "Cuts selected text and puts it on the clipboard"
+msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#: zrcolagui.cpp:48
+msgid "&Copy"
+msgstr "&Kopiraj"
+
+#: zrcolagui.cpp:48 zrcolagui.cpp:108
+msgid "Copies selected text to the clipboard"
+msgstr "Kopira izbrano besedilo na odložišče"
+
+#: zrcolagui.cpp:57
+msgid "&Paste"
+msgstr "&Prilepi"
+
+#: zrcolagui.cpp:57 zrcolagui.cpp:110
+msgid "Inserts text from the clipboard"
+msgstr "Vstavi besedilo z odložišča"
+
+#: zrcolagui.cpp:68
+msgid "&Send Composed"
+msgstr "Pošlji &sestavljeno"
+
+#: zrcolagui.cpp:68 zrcolagui.cpp:114
+msgid "Sends composed text to source window"
+msgstr "Pošlje sestavljeno besedilo izvornemu oknu"
+
+#: zrcolagui.cpp:77
+msgid "Send &Decomposed"
+msgstr "Pošlji &razstavljeno"
+
+#: zrcolagui.cpp:77 zrcolagui.cpp:116
+msgid "Sends decomposed text to source window"
+msgstr "Pošlje razstavljeno besedilo izvornemu oknu"
+
+#: zrcolagui.cpp:86
+msgid "Abort (De)composition"
+msgstr "Prekini raz/sestavljanje"
+
+#: zrcolagui.cpp:86
+msgid "Aborts composition and returns focus to source window"
+msgstr "Prekine sestavljanje in vrne fokus nazaj izvornemu oknu"
+
+#: zrcolagui.cpp:94
+msgid "&Edit"
+msgstr "Ur&edi"
+
+#: zrcolagui.cpp:98
+msgid "&About"
+msgstr "O progr&amu"
+
+#: zrcolagui.cpp:101
+msgid "&Help"
+msgstr "&Pomoč"
+
+#: zrcolagui.cpp:108
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: zrcolagui.cpp:110
+msgid "Paste"
+msgstr "Prilepi"
+
+#: zrcolagui.cpp:114
+msgid "Send Composed"
+msgstr "Pošlji sestavljeno"
+
+#: zrcolagui.cpp:116
+msgid "Send Decomposed"
+msgstr "Pošlji razstavljeno"
+
+#: zrcolagui.h:64 MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Release.Feature-2.idtx:4
+#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
+msgid "ZRCola"
+msgstr "ZRCola"
+
+# Windows charset for this language (decimal)
+#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
+#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
+#: MSIBuild/En.x64.Release.Feature-2.idtx:3
+#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
+msgid "1252"
+msgstr "1250"
+
+#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/En.x64.Release.Feature-2.idtx:4
+#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
+msgid "Input system for linguistic use"
+msgstr "Vnašalni sistem za jezikoslovno rabo"
+
+#~ msgid "&File"
+#~ msgstr "&Datoteka"
+
+#~ msgid "Send Decomposed (F6)"
+#~ msgstr "Pošlji razstavljeno (F6)"
+
+#~ msgid "Send Composed (F5)"
+#~ msgstr "Pošlji sestavljeno (F5)"
+
+#~ msgid ""
+#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
+#~ "functionality will not be available."
+#~ msgstr ""
+#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
+#~ "Nekaj funkcionalnosti ne bo na voljo."
+
+#, fuzzy
+#~ msgid "Authentication progress real time monitor"
+#~ msgstr "Nadzira postopek overovljanja v realnem času"
+
+#~ msgid "Grave\t&7"
+#~ msgstr "Krativec\t&7"
+
+#~ msgid "Acute\t&9"
+#~ msgstr "Ostrivec\t&9"
+
+#~ msgid "Circumflex\t&3"
+#~ msgstr "Cirkumfleks\t&3"
+
+#~ msgid "Inverted &breve"
+#~ msgstr "O&brnjen polkrog"
+
+#~ msgid "&Accents"
+#~ msgstr "N&aglasi"
+
+#~ msgid ""
+#~ "There is already an auto hidden bar on this edge.\n"
+#~ "Only one auto hidden bar is allowed on each edge.\n"
+#~ "Auto-hide feature is now off."
+#~ msgstr ""
+#~ "Ob tem robu je že samodejno skrita pasica.\n"
+#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n"
+#~ "Samodejno skrivanje je zdaj izklopljeno."
+
+#~ msgid "Hello World"
+#~ msgstr "Zdravo svet"
+
+#~ msgid "&Hello...\tCtrl+H"
+#~ msgstr "&Pozdrav ...\tCtrl+H"
+
+#~ msgid "Help string shown in status bar for this menu item"
+#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija"
+
+#~ msgid "This is a wxWidgets' Hello world sample"
+#~ msgstr "To je primer Zdravo svet v wxWidgets"
+
+#~ msgid "About Hello World"
+#~ msgstr "O Zdravo svet"
+
+#~ msgid "Hello world from wxWidgets!"
+#~ msgstr "Zdravo svet iz wxWidgets!"
+
+#~ msgid "Welcome to wxWidgets!"
+#~ msgstr "Dobrodošli v wxWidgets!"

ZRCola/stdafx.h

@@ -23,12 +23,19 @@
 #include "zrcolaapp.h"
 #include "zrcolacomppnl.h"
 #include "zrcolafrm.h"
-
-#include <zrcola/compose.h>
-#include <zrcola/decompose.h>
+#include "zrcolakeyhndlr.h"
 
 #include <wx/msgdlg.h>
+#include <wx/persist.h>
+#include <wx/persist/toplevel.h>
 #include <wxex/common.h>
 
+#include <fstream>
 #include <string>
 #include <vector>
+
+#include <stdex/idrec.h>
+
+#if defined(__WXMSW__)
+#include <Msi.h>
+#endif

ZRCola/zrcolaapp.cpp

@@ -18,6 +18,9 @@
 */
 
 #include "stdafx.h"
+#if defined(__WXMSW__)
+#pragma comment(lib, "msi.lib")
+#endif
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -27,16 +30,40 @@
 wxIMPLEMENT_APP(ZRColaApp);
 
 
+ZRColaApp::ZRColaApp() : wxApp()
+{
+}
+
+
 bool ZRColaApp::OnInit()
 {
-    if (!wxAppEx::OnInit())
+#if defined(__WXMSW__)
+    // To compensate migration to non-advertised shortcut, do the Microsoft Installer's feature completeness check manually.
+    // If execution got this far in the first place (EXE and dependent DLLs are present and loadable).
+    // Furthermore, this increments program usage counter.
+    if (::MsiQueryFeatureState(_T(ZRCOLA_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN)
+        ::MsiUseFeature(_T(ZRCOLA_VERSION_GUID), _T("featZRCola"));
+#endif
+
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR)));
+    if (cfgPrev) wxDELETE(cfgPrev);
+
+    if (!wxApp::OnInit())
         return false;
 
-    if (wxLocale::IsAvailable(wxLANGUAGE_SLOVENIAN))
+    // Set desired locale.
+    wxLanguage language = (wxLanguage)wxConfigBase::Get()->Read(wxT("Language"), wxLANGUAGE_DEFAULT);
+    if (wxLocale::IsAvailable(language)) {
+        wxString sPath;
+        if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath))
+            m_locale.AddCatalogLookupPathPrefix(sPath);
+        wxVERIFY(m_locale.Init(language));
+        wxVERIFY(m_locale.AddCatalog(wxT("wxExtend")));
         wxVERIFY(m_locale.AddCatalog(wxT("ZRCola")));
+    }
 
     wxZRColaFrame* mainFrame = new wxZRColaFrame();
-
+    wxPersistentRegisterAndRestore<wxTopLevelWindow>(mainFrame);
     mainFrame->Show();
 
     return true;

ZRCola/zrcolaapp.h

@@ -25,20 +25,54 @@ class ZRColaApp;
 
 #pragma once
 
-#include <wxex/appex.h>
+#include <wx/app.h>
+#include <wx/config.h>
+#include <wx/intl.h>
 
 
 ///
 /// ZRCola application
 ///
-class ZRColaApp : public wxAppEx
+class ZRColaApp : public wxApp
 {
 public:
+    ZRColaApp();
+
     ///
     /// Called when application initializes.
     ///
     /// \returns
     /// - true if initialization succeeded
     /// - false otherwise
+    ///
     virtual bool OnInit();
+
+
+    ///
+    /// \returns Path to ZRCola.zrcdb file
+    ///
+    inline wxString GetDatabasePath() const;
+
+
+protected:
+    wxLocale m_locale;  ///< Current locale
 };
+
+
+wxDECLARE_APP(ZRColaApp);
+
+
+inline wxString ZRColaApp::GetDatabasePath() const
+{
+    wxString sPath;
+    if (wxConfigBase::Get()->Read(wxT("DatabasePath"), &sPath)) {
+        if (!wxEndsWithPathSeparator(sPath))
+            sPath << wxFILE_SEP_PATH;
+    } else {
+        sPath = wxPathOnly(argv[0]);
+        sPath << wxT("\\..\\data\\");
+    }
+    sPath << wxT("ZRCola.zrcdb");
+
+    return sPath;
+}

ZRCola/zrcolacomppnl.cpp

@@ -30,11 +30,35 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
     m_selComposed(0, 0),
     wxZRColaComposerPanelBase(parent)
 {
+    std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabasePath(), std::ios_base::in | std::ios_base::binary);
+    if (dat.good()) {
+        if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
+            ZRCola::recordsize_t size;
+            dat.read((char*)&size, sizeof(ZRCola::recordsize_t));
+            if (dat.good()) {
+                ZRCola::translation_rec rec(m_t_db);
+                if (rec.find(dat, size)) {
+                    dat >> rec;
+                    if (!dat.good()) {
+                        wxFAIL_MSG(wxT("Error reading translation data from ZRCola.zrcdb."));
+                        m_t_db.idxComp  .clear();
+                        m_t_db.idxDecomp.clear();
+                        m_t_db.data     .clear();
+                    }
+                } else
+                    wxFAIL_MSG(wxT("ZRCola.zrcdb has no translation data."));
+            }
+        } else
+            wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database."));
+    }
+
+    m_decomposed->PushEventHandler(&m_keyhandler);
 }
 
 
 wxZRColaComposerPanel::~wxZRColaComposerPanel()
 {
+    m_decomposed->PopEventHandler();
 }
 
 
@@ -70,7 +94,7 @@ void wxZRColaComposerPanel::OnDecomposedText(wxCommandEvent& event)
 #endif
 
         std::wstring dst;
-        ZRCola::Compose(src.data(), src.size(), dst, &m_mapping);
+        m_t_db.Compose(src.data(), src.size(), dst, &m_mapping);
 
         long from, to;
         m_decomposed->GetSelection(&from, &to);
@@ -117,7 +141,7 @@ void wxZRColaComposerPanel::OnComposedText(wxCommandEvent& event)
 #endif
 
         std::wstring dst;
-        ZRCola::Decompose(src.data(), src.size(), dst, &m_mapping);
+        m_t_db.Decompose(src.data(), src.size(), dst, &m_mapping);
 
         long from, to;
         m_composed->GetSelection(&from, &to);