Set version to 2.1-beta5

README.md

@@ -16,6 +16,7 @@ https://www.amebis.si/prenos/ZRCola/
 - _sed.exe_ and _grep.exe_
 - Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
 - Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
+- wxWidgets 3.0 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.
 
 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:

ZRCola/ZRCola.fbp

@@ -13,7 +13,7 @@
         <property name="event_generation">connect</property>
         <property name="file">zrcolagui</property>
         <property name="first_id">1000</property>
-        <property name="help_provider">wxHelpControllerHelpProvider</property>
+        <property name="help_provider">wxSimpleHelpProvider</property>
         <property name="internationalize">1</property>
         <property name="name">ZRCola</property>
         <property name="namespace"></property>
@@ -819,7 +819,7 @@
                     <property name="resize">Resizable</property>
                     <property name="selection">0</property>
                     <property name="show">1</property>
-                    <property name="size">170,-1</property>
+                    <property name="size">250,-1</property>
                     <property name="style"></property>
                     <property name="subclass"></property>
                     <property name="toolbar_pane">0</property>
@@ -1299,6 +1299,7 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">bSizerSourceEdit2</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1487,6 +1488,7 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">bSizerSourceHex2</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1765,6 +1767,7 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">bSizerDestinationEdit2</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -1953,6 +1956,7 @@
                                             <property name="minimum_size"></property>
                                             <property name="name">bSizerDestinationHex2</property>
                                             <property name="orient">wxVERTICAL</property>
+                                            <property name="parent">1</property>
                                             <property name="permission">none</property>
                                             <event name="OnUpdateUI"></event>
                                             <object class="sizeritem" expanded="0">
@@ -2537,6 +2541,7 @@
                                         <property name="minimum_size"></property>
                                         <property name="name">sbSizerBrowse</property>
                                         <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
                                         <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
                                         <object class="sizeritem" expanded="0">
@@ -3320,6 +3325,7 @@
                                         <property name="minimum_size"></property>
                                         <property name="name">sbSizerRecent</property>
                                         <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
                                         <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
                                         <object class="sizeritem" expanded="0">
@@ -3488,6 +3494,7 @@
                                         <property name="minimum_size"></property>
                                         <property name="name">sbSizerPreview</property>
                                         <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
                                         <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
                                         <object class="sizeritem" expanded="0">
@@ -4379,6 +4386,7 @@
                                         <property name="minimum_size"></property>
                                         <property name="name">sbSizerRelated</property>
                                         <property name="orient">wxVERTICAL</property>
+                                        <property name="parent">1</property>
                                         <property name="permission">none</property>
                                         <event name="OnUpdateUI"></event>
                                         <object class="sizeritem" expanded="0">
@@ -6335,6 +6343,7 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizerLog</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
                         <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
@@ -6706,6 +6715,7 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizerCharacter</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
                         <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
@@ -6977,6 +6987,7 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizerContext</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
                         <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">
@@ -7353,6 +7364,7 @@
                         <property name="minimum_size"></property>
                         <property name="name">sbSizerTranslationSet</property>
                         <property name="orient">wxVERTICAL</property>
+                        <property name="parent">1</property>
                         <property name="permission">none</property>
                         <event name="OnUpdateUI"></event>
                         <object class="sizeritem" expanded="0">

ZRCola/locale/ru_RU.po

@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
 "POT-Creation-Date: 2017-06-01 18:04+0200\n"
-"PO-Revision-Date: 2017-06-01 18:05+0200\n"
+"PO-Revision-Date: 2017-08-02 08:28+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 2.0\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -42,16 +42,16 @@ msgstr "Запрос нового знака"
 
 #: zrcolachrslct.cpp:89
 msgid "Too many digits in Unicode."
-msgstr ""
+msgstr "Слишком много цифр в записи Unicode."
 
 #: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
 msgid "Validation conflict"
-msgstr ""
+msgstr "Конфликт проверки"
 
 #: zrcolachrslct.cpp:107
 #, c-format
 msgid "Invalid character in Unicode found: %c"
-msgstr ""
+msgstr "Недействительный знак в записи Unicode: %c"
 
 #: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
@@ -68,7 +68,7 @@ msgstr "▾ Опции поиска"
 
 #: zrcolafrm.cpp:90
 msgid "Custom Translation..."
-msgstr ""
+msgstr "Настраиваемое  преобразование ..."
 
 #: zrcolafrm.cpp:175
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
@@ -546,17 +546,19 @@ msgstr ""
 
 #: zrcolagui.cpp:1102
 msgid "Translation"
-msgstr ""
+msgstr "Преобразование"
 
 #: zrcolagui.cpp:1104
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
 msgstr ""
+"ZRCola предоставляет различные преобразования текста, последовательность которых можно свободно изменять.\n"
+"Пожалуйста, выбрать желаемые преобразования и порядок их применения."
 
 #: zrcolagui.cpp:1114
 msgid "A&vailable:"
-msgstr ""
+msgstr "&Доступное:"
 
 #: zrcolagui.cpp:1129
 msgid ">"
@@ -567,9 +569,8 @@ msgid "<"
 msgstr "<"
 
 #: zrcolagui.cpp:1141
-#, fuzzy
 msgid "&Selected:"
-msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+msgstr "&Выбранное:"
 
 #: zrcolagui.cpp:1159
 msgid "Up"
@@ -597,7 +598,7 @@ msgstr "Обновление продукта"
 
 #: zrcolagui.h:408
 msgid "Custom Translation Sequence"
-msgstr ""
+msgstr "Настраиваемая последовательность преобразований"
 
 #: zrcolakeyhndlr.cpp:44
 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."
@@ -610,7 +611,7 @@ msgstr "Автоматически запустить систему ZRCola пр
 #: zrcolatranseq.cpp:63
 #, c-format
 msgid "Unknown translation (%u)"
-msgstr ""
+msgstr "Неизвестное преобразование (%u)"
 
 #: zrcolaupdater.cpp:94
 msgid ""

ZRCola/locale/sl_SI.po

@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
 "POT-Creation-Date: 2017-06-01 18:05+0200\n"
-"PO-Revision-Date: 2017-06-01 18:06+0200\n"
+"PO-Revision-Date: 2017-08-01 15:23+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 2.0.2\n"
+"X-Generator: Poedit 2.0\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"
@@ -555,7 +555,7 @@ msgid ""
 "Please select desired translations and the order they are applied."
 msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
-"Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj jih uporabi."
+"Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
 #: zrcolagui.cpp:1114
 msgid "A&vailable:"
@@ -571,7 +571,7 @@ msgstr "<"
 
 #: zrcolagui.cpp:1141
 msgid "&Selected:"
-msgstr "I&zbrani:"
+msgstr "I&zbrano:"
 
 #: zrcolagui.cpp:1159
 msgid "Up"

ZRCola/zrcolagui.cpp

@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Nov  6 2017)
 // http://www.wxformbuilder.org/
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
@@ -12,12 +12,18 @@
 #include "zrcolagui.h"
 
 // Using the construction of a static object to ensure that the help provider is set
+// wx Manages the most recent HelpProvider passed to ::Set, but not the previous ones
+// If ::Set gets called more than once, the previous one is returned and should be deleted
 class wxFBContextSensitiveHelpSetter
 {
 public:
 wxFBContextSensitiveHelpSetter()
 {
-wxHelpProvider::Set( new wxHelpControllerHelpProvider );
+wxSimpleHelpProvider* help = new wxSimpleHelpProvider();
+wxHelpProvider* old = wxHelpProvider::Set( help );
+if (old != 0){
+delete old;
+}
 }
 };
 
@@ -202,7 +208,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_toolSendSource = m_toolbarTranslate->AddTool( wxID_SEND_SOURCE, _("Send Decomposed"), wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); 
 	
 	wxArrayString m_toolTranslationSeqChoices;
-	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 170,-1 ), m_toolTranslationSeqChoices, 0 );
+	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 250,-1 ), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
 	m_toolbarTranslate->Realize();
@@ -258,7 +264,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
 	bSizerSourceEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelSourceEdit, wxID_ANY, _("Decomposed Text") ), wxVERTICAL );
 	
 	m_source = new wxTextCtrl( bSizerSourceEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_source->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_source->SetFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_source->SetMinSize( wxSize( 100,25 ) );
 	
 	bSizerSourceEdit2->Add( m_source, 1, wxEXPAND, 5 );
@@ -278,7 +284,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
 	bSizerSourceHex2 = new wxStaticBoxSizer( new wxStaticBox( m_panelSourceHex, wxID_ANY, _("Decomposed Unicode Dump") ), wxVERTICAL );
 	
 	m_sourceHex = new wxTextCtrl( bSizerSourceHex2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_sourceHex->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
+	m_sourceHex->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
 	bSizerSourceHex2->Add( m_sourceHex, 1, wxEXPAND, 5 );
 	
@@ -305,7 +311,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
 	bSizerDestinationEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDestinationEdit, wxID_ANY, _("Composed Text") ), wxVERTICAL );
 	
 	m_destination = new wxTextCtrl( bSizerDestinationEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_destination->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_destination->SetFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_destination->SetMinSize( wxSize( 100,25 ) );
 	
 	bSizerDestinationEdit2->Add( m_destination, 1, wxEXPAND, 5 );
@@ -325,7 +331,7 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
 	bSizerDestinationHex2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDestinationHex, wxID_ANY, _("Composed Unicode Dump") ), wxVERTICAL );
 	
 	m_destinationHex = new wxTextCtrl( bSizerDestinationHex2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_destinationHex->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
+	m_destinationHex->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
 	bSizerDestinationHex2->Add( m_destinationHex, 1, wxEXPAND, 5 );
 	
@@ -404,7 +410,7 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
 	
 	// Cell Defaults
 	m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	m_grid->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_grid->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_grid->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_grid->SetMinSize( wxSize( 35,35 ) );
 	
@@ -529,9 +535,9 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridResults->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_gridResults->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	m_gridResults->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+	m_gridResults->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	m_gridResults->SetToolTip( _("Character search results") );
 	m_gridResults->SetMinSize( wxSize( 560,35 ) );
 	m_gridResults->SetMaxSize( wxSize( 560,-1 ) );
@@ -567,9 +573,9 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridRecent->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_gridRecent->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	m_gridRecent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+	m_gridRecent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	m_gridRecent->SetToolTip( _("List of recently inserted characters") );
 	
 	sbSizerRecent->Add( m_gridRecent, 0, wxALL|wxEXPAND, 5 );
@@ -631,7 +637,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridPreview->SetDefaultCellFont( wxFont( 96, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_gridPreview->SetDefaultCellFont( wxFont( 96, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridPreview->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 	m_gridPreview->SetToolTip( _("Character preview") );
@@ -700,7 +706,7 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	// Label Appearance
 	
 	// Cell Defaults
-	m_gridRelated->SetDefaultCellFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_gridRelated->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 	m_gridRelated->SetToolTip( _("List of related characters") );
 	
@@ -893,7 +899,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_staticTextZRCola = new wxStaticText( this, wxID_ANY, _("ZRCola"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextZRCola->Wrap( -1 );
-	m_staticTextZRCola->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_staticTextZRCola->SetFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_staticTextZRCola->SetMaxSize( wxSize( 400,-1 ) );
 	
 	bSizerText->Add( m_staticTextZRCola, 0, wxALL|wxEXPAND, 5 );
@@ -921,7 +927,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	bSizerText->Add( m_staticTextDeclaration, 0, wxALL|wxEXPAND, 5 );
 	
 	m_declaration = new wxTextCtrl( this, wxID_ANY, _("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."), wxDefaultPosition, wxSize( -1,80 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_declaration->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 93, 90, false, wxEmptyString ) );
+	m_declaration->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	
 	bSizerText->Add( m_declaration, 0, wxALL|wxEXPAND, 5 );
 	
@@ -1028,8 +1034,15 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i
 	sbSizerCharacter->Add( m_characterLbl, 0, wxALL|wxEXPAND, 5 );
 	
 	m_character = new wxTextCtrl( sbSizerCharacter->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_character->SetMaxLength( 20 ); 
-	m_character->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	#ifdef __WXGTK__
+	if ( !m_character->HasFlag( wxTE_MULTILINE ) )
+	{
+	m_character->SetMaxLength( 20 );
+	}
+	#else
+	m_character->SetMaxLength( 20 );
+	#endif
+	m_character->SetFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_character->SetToolTip( _("Decomposed character to request") );
 	
 	sbSizerCharacter->Add( m_character, 0, wxALL|wxEXPAND, 5 );
@@ -1049,7 +1062,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i
 	sbSizerContext->Add( m_contextLbl, 0, wxALL|wxEXPAND, 5 );
 	
 	m_context = new wxTextCtrl( sbSizerContext->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	m_context->SetFont( wxFont( 16, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_context->SetFont( wxFont( 16, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) );
 	m_context->SetToolTip( _("Additional notes for character request") );
 	
 	sbSizerContext->Add( m_context, 1, wxALL|wxEXPAND, 5 );

ZRCola/zrcolagui.h

@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Nov  6 2017)
 // http://www.wxformbuilder.org/
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
 #ifndef __ZRCOLAGUI_H__

include/version.h

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02000400
+#define PRODUCT_VERSION          0x02000500
 
 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define PRODUCT_VERSION_MAJ      2
 #define PRODUCT_VERSION_MIN      0
-#define PRODUCT_VERSION_REV      4
+#define PRODUCT_VERSION_REV      5
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.1-beta4"
+#define PRODUCT_VERSION_STR      "2.1-beta5"
 #define PRODUCT_BUILD_YEAR_STR   "2017"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "2.0.4"
+#define PRODUCT_VERSION_INST     "2.0.5"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{A8D9D847-104D-43AF-9AA2-79B486D6A4BB}"
+#define PRODUCT_VERSION_GUID     "{AA8BEAC5-C04B-4011-A765-A5DCDB738BF1}"
 
 //
 // The product vendor and application name for configuration keeping.

output/locale/ZRCola-zrcdb.pot

@@ -64,24 +64,63 @@ msgstr ""
 msgid "Cyrillic (Belarusian)"
 msgstr ""
 
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Bulgarian)"
 msgstr ""
 
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr ""
+
+msgid "Cyrillic (GOST2000)"
+msgstr ""
+
 msgid "Cyrillic (Macedonian)"
 msgstr ""
 
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Russian)"
 msgstr ""
 
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Serbian)"
 msgstr ""
 
+msgid "Cyrillic (Serbian) » Latin"
+msgstr ""
+
 msgid "Cyrillic (Ukrainian)"
 msgstr ""
 
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic BdC"
 msgstr ""
 
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr ""
+
 msgid "Czech"
 msgstr ""
 
@@ -136,6 +175,9 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+msgid "IPA"
+msgstr ""
+
 msgid "Irish Gaelic"
 msgstr ""
 
@@ -241,6 +283,15 @@ msgstr ""
 msgid "Latin"
 msgstr ""
 
+msgid "Latin (English)"
+msgstr ""
+
+msgid "Latin (GOST2000)"
+msgstr ""
+
+msgid "Latin (Slovenian)"
+msgstr ""
+
 msgid "Latin ALE"
 msgstr ""
 
@@ -253,6 +304,9 @@ msgstr ""
 msgid "Latin » Cyrillic (Bulgarian)"
 msgstr ""
 
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr ""
+
 msgid "Latin » Cyrillic (Macedonian)"
 msgstr ""
 
@@ -514,6 +568,12 @@ msgstr ""
 msgid "Quotes"
 msgstr ""
 
+msgid "Rigler transcription"
+msgstr ""
+
+msgid "Rigler transcription » IPA"
+msgstr ""
+
 msgid "Romanian"
 msgstr ""
 

output/locale/ru_RU/ZRCola-zrcdb.po

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 2.0.4\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
@@ -17,10 +17,10 @@ msgid "Albanian"
 msgstr "албанский"
 
 msgid "Apostrophes 1"
-msgstr ""
+msgstr "апострофы 1"
 
 msgid "Apostrophes 2"
-msgstr ""
+msgstr "апострофы 2"
 
 msgid "Arabic"
 msgstr "Арабские знаки"
@@ -38,10 +38,10 @@ msgid "Bosnian – Latinic"
 msgstr "боснийский – латиница"
 
 msgid "CAPITAL Case"
-msgstr ""
+msgstr "ПРОПИСНИЕ буквы"
 
 msgid "CAPITAL Case » small Case"
-msgstr ""
+msgstr "ПРОПИСНИЕ буквы » строчние буквы"
 
 msgid "Combine"
 msgstr "Средние замещающие знаки"
@@ -67,32 +67,65 @@ msgstr "Валюты"
 msgid "Cyrillic"
 msgstr "Кириллические знаки"
 
-#, fuzzy
 msgid "Cyrillic (Belarusian)"
-msgstr "белорусский"
+msgstr "кириллица (белорусский)"
+
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr "кириллица (белорусский) » латиница (английский)"
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr "кириллица (белорусский) » латиница (словенский)"
 
 msgid "Cyrillic (Bulgarian)"
-msgstr ""
+msgstr "кириллица (болгарский)"
+
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr "кириллица (болгарский) » латиница (английский)"
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr "кириллица (болгарский) » латиница (словенский)"
+
+msgid "Cyrillic (GOST2000)"
+msgstr "кириллица (ГОСТ2000)"
 
-#, fuzzy
 msgid "Cyrillic (Macedonian)"
-msgstr "македонский"
+msgstr "кириллица (македонский)"
+
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr "кириллица (македонский) » латиница (английский)"
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr "кириллица (македонский) » латиница (словенский)"
 
-#, fuzzy
 msgid "Cyrillic (Russian)"
-msgstr "Кириллические знаки"
+msgstr "кириллица (русский)"
+
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr "кириллица (русский) » латиница (английский)"
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr "кириллица (русский) » латиница (словенский)"
 
-#, fuzzy
 msgid "Cyrillic (Serbian)"
-msgstr "Кириллические знаки"
+msgstr "кириллица (сербский)"
+
+msgid "Cyrillic (Serbian) » Latin"
+msgstr "кириллица (сербский) » латиница"
 
-#, fuzzy
 msgid "Cyrillic (Ukrainian)"
-msgstr "украинский"
+msgstr "кириллица (украинский)"
+
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr "кириллица (украинский) » латиница (английский)"
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr "кириллица (украинский) » латиница (словенский)"
 
-#, fuzzy
 msgid "Cyrillic BdC"
-msgstr "Кириллические знаки"
+msgstr "кириллица (BdC)"
+
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr "кириллица » латиница (ГОСТ2000)"
 
 msgid "Czech"
 msgstr "чешский"
@@ -134,14 +167,13 @@ msgid "Greek"
 msgstr "Греческие знаки"
 
 msgid "Greek (Modern)"
-msgstr ""
+msgstr "греческий алфавит (новогреческий)"
 
 msgid "Greek (Modern) » Greek (Old)"
-msgstr ""
+msgstr "греческий алфавит (новогреческий) » греческий алфавит (древнегреческий)"
 
-#, fuzzy
 msgid "Greek (Old)"
-msgstr "Греческие знаки"
+msgstr "греческий алфавит (древнегреческий)"
 
 msgid "Hebrew"
 msgstr "Еврейские знаки"
@@ -149,6 +181,9 @@ msgstr "Еврейские знаки"
 msgid "Hungarian"
 msgstr "венгерский"
 
+msgid "IPA"
+msgstr "IPA"
+
 msgid "Irish Gaelic"
 msgstr "ирландский гэльский"
 
@@ -254,44 +289,47 @@ msgstr "кашубский"
 msgid "Latin"
 msgstr "латинский"
 
-#, fuzzy
+msgid "Latin (English)"
+msgstr "латиница (английский)"
+
+msgid "Latin (GOST2000)"
+msgstr "латиница (ГОСТ2000)"
+
+msgid "Latin (Slovenian)"
+msgstr "латиница (словенский)"
+
 msgid "Latin ALE"
-msgstr "латинский"
+msgstr "латиница (ALE)"
 
-#, fuzzy
 msgid "Latin BdC"
-msgstr "латинский"
+msgstr "латиница (BdC)"
 
-#, fuzzy
 msgid "Latin » Cyrillic (Belarusian)"
-msgstr "белорусский"
+msgstr "латиница » кириллица (белорусский)"
 
-#, fuzzy
 msgid "Latin » Cyrillic (Bulgarian)"
-msgstr "белорусский"
+msgstr "латиница » кириллица (болгарский)"
+
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr "латиница » кириллица (ГОСТ2000)"
 
-#, fuzzy
 msgid "Latin » Cyrillic (Macedonian)"
-msgstr "македонский"
+msgstr "латиница » кириллица (македонский)"
 
-#, fuzzy
 msgid "Latin » Cyrillic (Russian)"
-msgstr "Кириллические знаки"
+msgstr "латиница » кириллица (русский)"
 
-#, fuzzy
 msgid "Latin » Cyrillic (Serbian)"
-msgstr "Кириллические знаки"
+msgstr "латиница » кириллица (сербский)"
 
-#, fuzzy
 msgid "Latin » Cyrillic (Ukrainian)"
-msgstr "украинский"
+msgstr "латиница » кириллица (украинский)"
 
 msgid "Latin » Greek (modern)"
-msgstr ""
+msgstr "латиница » греческий алфавит (новогреческий)"
 
-#, fuzzy
 msgid "Latin » Greek (old)"
-msgstr "Греческие знаки"
+msgstr "латиница » греческий алфавит (древнегреческий)"
 
 msgid "Latvian"
 msgstr "латышский"
@@ -536,6 +574,12 @@ msgstr "Пунктуация, остальное"
 msgid "Quotes"
 msgstr "Кавычки"
 
+msgid "Rigler transcription"
+msgstr "транскрипция Риглера"
+
+msgid "Rigler transcription » IPA"
+msgstr "транскрипция Риглера » IPA"
+
 msgid "Romanian"
 msgstr "румынский"
 
@@ -558,10 +602,10 @@ msgid "Serbian – Latinic"
 msgstr "сербский – латиница"
 
 msgid "Sigma Final"
-msgstr ""
+msgstr "сигма (финальная)"
 
 msgid "Sigma Nav"
-msgstr ""
+msgstr "сигма (обычная)"
 
 msgid "Slovak"
 msgstr "словацкий"
@@ -652,7 +696,7 @@ msgid "Technical Characters"
 msgstr "Технические символы"
 
 msgid "Title Case"
-msgstr ""
+msgstr "Начальние буквы"
 
 msgid "Transliterated"
 msgstr "Транслитерированные знаки"
@@ -670,22 +714,22 @@ msgid "Units"
 msgstr "Единицы"
 
 msgid "ZRCola (De)composition"
-msgstr ""
+msgstr "ZRCola составление/разборка"
 
 msgid "ZRCola Composed"
-msgstr ""
+msgstr "ZRCola составленное"
 
 msgid "ZRCola Decomposed"
-msgstr ""
+msgstr "ZRCola разобранное"
 
 msgid "l+j l|j"
-msgstr ""
+msgstr "l+j l|j"
 
 msgid "no + |"
-msgstr ""
+msgstr "без + |"
 
 msgid "small Case"
-msgstr ""
+msgstr "строчние буквы"
 
 #, fuzzy
 #~ msgid "Modified Greek"

output/locale/sl_SI/ZRCola-zrcdb.po

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Poedit 2.0.4\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"
 
@@ -70,23 +70,62 @@ msgstr "Cirilski znaki"
 msgid "Cyrillic (Belarusian)"
 msgstr "cirilica (beloruščina)"
 
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr "cirilica (beloruščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr "cirilica (beloruščina) » latinica (slovenščina)"
+
 msgid "Cyrillic (Bulgarian)"
 msgstr "cirilica (bolgarščina)"
 
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr "cirilica (bolgarščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr "cirilica (bolgarščina) » latinica (slovenščina)"
+
+msgid "Cyrillic (GOST2000)"
+msgstr "cirilica (GOST2000)"
+
 msgid "Cyrillic (Macedonian)"
 msgstr "cirilica (makedonščina)"
 
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr "cirilica (makedonščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr "cirilica (makedonščina) » latinica (slovenščina)"
+
 msgid "Cyrillic (Russian)"
 msgstr "cirilica (ruščina)"
 
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr "cirilica (ruščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr "cirilica (ruščina) » latinica (slovenščina)"
+
 msgid "Cyrillic (Serbian)"
 msgstr "cirilica (srbščina)"
 
+msgid "Cyrillic (Serbian) » Latin"
+msgstr "cirilica (srbščina) » latinica"
+
 msgid "Cyrillic (Ukrainian)"
 msgstr "cirilica (ukrajinščina)"
 
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr "cirilica (ukrajinščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr "cirilica (ukrajinščina) » latinica (slovenščina)"
+
 msgid "Cyrillic BdC"
-msgstr "cirilica BdC"
+msgstr "cirilica (BdC)"
+
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr "cirilica » latinica (GOST2000)"
 
 msgid "Czech"
 msgstr "češčina"
@@ -128,13 +167,13 @@ msgid "Greek"
 msgstr "Grški znaki"
 
 msgid "Greek (Modern)"
-msgstr "grščina (sodobna)"
+msgstr "grški alfabet (nova grščina)"
 
 msgid "Greek (Modern) » Greek (Old)"
-msgstr "grščina (sodobna) » grščina (stara)"
+msgstr "grški alfabet (nova grščina) » grški alfabet (stara grščina)"
 
 msgid "Greek (Old)"
-msgstr "grščina (stara)"
+msgstr "grški alfabet (stara grščina)"
 
 msgid "Hebrew"
 msgstr "Hebrejski znaki"
@@ -142,6 +181,9 @@ msgstr "Hebrejski znaki"
 msgid "Hungarian"
 msgstr "madžarščina"
 
+msgid "IPA"
+msgstr "IPA"
+
 msgid "Irish Gaelic"
 msgstr "irščina"
 
@@ -247,11 +289,20 @@ msgstr "kašubščina"
 msgid "Latin"
 msgstr "latinščina"
 
+msgid "Latin (English)"
+msgstr "latinica (angleščina)"
+
+msgid "Latin (GOST2000)"
+msgstr "latinica (GOST2000)"
+
+msgid "Latin (Slovenian)"
+msgstr "latinica (slovenščina)"
+
 msgid "Latin ALE"
-msgstr "latinščina ALE"
+msgstr "latinščina (ALE)"
 
 msgid "Latin BdC"
-msgstr "latinščina BdC"
+msgstr "latinščina (BdC)"
 
 msgid "Latin » Cyrillic (Belarusian)"
 msgstr "latinica » cirilica (beloruščina)"
@@ -259,6 +310,9 @@ msgstr "latinica » cirilica (beloruščina)"
 msgid "Latin » Cyrillic (Bulgarian)"
 msgstr "latinica » cirilica (bolgarščina)"
 
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr "latinica » cirilica (GOST2000)"
+
 msgid "Latin » Cyrillic (Macedonian)"
 msgstr "latinica » cirilica (makedonščina)"
 
@@ -272,10 +326,10 @@ msgid "Latin » Cyrillic (Ukrainian)"
 msgstr "latinica » cirilica (ukrajinščina)"
 
 msgid "Latin » Greek (modern)"
-msgstr "latinica » grščina (sodobna)"
+msgstr "latinica » grški alfabet (nova grščina)"
 
 msgid "Latin » Greek (old)"
-msgstr "latinica » grščina (stara)"
+msgstr "latinica » grški alfabet (stara grščina)"
 
 msgid "Latvian"
 msgstr "letonščina"
@@ -520,6 +574,12 @@ msgstr "Ločilo, drugo"
 msgid "Quotes"
 msgstr "Narekovaji"
 
+msgid "Rigler transcription"
+msgstr "Riglerjeva transkripcija"
+
+msgid "Rigler transcription » IPA"
+msgstr "Riglerjeva transkripcija » IPA"
+
 msgid "Romanian"
 msgstr "romunščina"
 
@@ -542,10 +602,10 @@ msgid "Serbian – Latinic"
 msgstr "srbščina – latinica"
 
 msgid "Sigma Final"
-msgstr "Sigma končni"
+msgstr "sigma (končna)"
 
 msgid "Sigma Nav"
-msgstr "Sigma nav"
+msgstr "sigma (navadna)"
 
 msgid "Slovak"
 msgstr "slovaščina"