Version set to 2.0-alpha4

(resolves #7)

ZRCola/ZRCola.fbp

@@ -141,7 +141,7 @@
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
+                        <property name="help">Quit this program</property>
                         <property name="id">wxID_EXIT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">E&amp;xit</property>
@@ -161,13 +161,13 @@
                         <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">Cuts selected text and puts it on the clipboard</property>
+                        <property name="help"></property>
                         <property name="id">wxID_CUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Cut</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemEditCut</property>
                         <property name="permission">none</property>
-                        <property name="shortcut">Ctrl+X</property>
+                        <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -176,13 +176,13 @@
                         <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">Copies selected text to the clipboard</property>
+                        <property name="help"></property>
                         <property name="id">wxID_COPY</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">&amp;Copy</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemEditCopy</property>
                         <property name="permission">none</property>
-                        <property name="shortcut">Ctrl+C</property>
+                        <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -191,13 +191,13 @@
                         <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">Inserts text from the clipboard</property>
+                        <property name="help"></property>
                         <property name="id">wxID_PASTE</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">&amp;Paste</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemEditPaste</property>
                         <property name="permission">none</property>
-                        <property name="shortcut">Ctrl+V</property>
+                        <property name="shortcut"></property>
                         <property name="unchecked_bitmap"></property>
                         <event name="OnMenuSelection"></event>
                         <event name="OnUpdateUI"></event>
@@ -206,11 +206,30 @@
                         <property name="name">m_separatorEdit1</property>
                         <property name="permission">none</property>
                     </object>
+                    <object class="wxMenuItem" expanded="1">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help">Select all text</property>
+                        <property name="id">wxID_SELECTALL</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">Select &amp;All</property>
+                        <property name="name">m_menuSelectAll</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut">Ctrl+A</property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                    <object class="separator" expanded="1">
+                        <property name="name">m_separatorEdit2</property>
+                        <property name="permission">none</property>
+                    </object>
                     <object class="wxMenuItem" expanded="1">
                         <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">Sends composed text to source window</property>
+                        <property name="help">Send composed text to source window</property>
                         <property name="id">wxID_SEND_COMPOSED</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">&amp;Send Composed</property>
@@ -225,7 +244,7 @@
                         <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="help">Send 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>
@@ -240,7 +259,7 @@
                         <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="help">Abort composition and return 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>
@@ -263,7 +282,7 @@
                         <property name="help"></property>
                         <property name="id">wxID_ABOUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">&amp;About</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemAbout</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
@@ -284,7 +303,7 @@
                 <property name="aui_row"></property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
-                <property name="bitmapsize"></property>
+                <property name="bitmapsize">16,16</property>
                 <property name="caption"></property>
                 <property name="caption_visible">1</property>
                 <property name="center_pane">0</property>
@@ -360,7 +379,7 @@
                     <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="statusbar">Cut selection</property>
                     <property name="tooltip">Cut</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -381,7 +400,7 @@
                     <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="statusbar">Copy selection</property>
                     <property name="tooltip">Copy</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -402,7 +421,7 @@
                     <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="statusbar">Paste selection</property>
                     <property name="tooltip">Paste</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -426,7 +445,7 @@
                     <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="statusbar">Send composed text to source window</property>
                     <property name="tooltip">Send Composed</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -447,7 +466,7 @@
                     <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="statusbar">Send decomposed text to source window</property>
                     <property name="tooltip">Send Decomposed</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>

ZRCola/locale/sl_SI.po

@@ -1,8 +1,8 @@
 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"
+"POT-Creation-Date: 2016-04-08 13:13+0200\n"
+"PO-Revision-Date: 2016-04-08 13:13+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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: zrcolafrm.cpp:56
+#: zrcolafrm.cpp:61
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
@@ -25,11 +25,11 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:56 zrcolafrm.cpp:58
+#: zrcolafrm.cpp:61 zrcolafrm.cpp:63
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:58
+#: zrcolafrm.cpp:63
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -37,7 +37,7 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:119
+#: zrcolafrm.cpp:144
 #, c-format
 msgid ""
 "ZRCola v%s\n"
@@ -46,7 +46,7 @@ msgstr ""
 "ZRCola v%s\n"
 "Vse pravice pridržane 2015-%s Amebis"
 
-#: zrcolafrm.cpp:119
+#: zrcolafrm.cpp:144
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
@@ -54,83 +54,83 @@ msgstr "O ZRColi"
 msgid "E&xit"
 msgstr "I&zhod"
 
+#: zrcolagui.cpp:32
+msgid "Quit this program"
+msgstr "Zapri ta program"
+
 #: 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 "Select &All"
+msgstr "Izberi &vse"
 
 #: zrcolagui.cpp:68
+msgid "Select all text"
+msgstr "Izberi celotno besedilo"
+
+#: zrcolagui.cpp:74
 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:74 zrcolagui.cpp:121
+msgid "Send composed text to source window"
+msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
-#: zrcolagui.cpp:77
+#: zrcolagui.cpp:83
 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:83 zrcolagui.cpp:123
+msgid "Send decomposed text to source window"
+msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
-#: zrcolagui.cpp:86
+#: zrcolagui.cpp:92
 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:92
+msgid "Abort composition and return focus to source window"
+msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 
-#: zrcolagui.cpp:94
+#: zrcolagui.cpp:100
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: zrcolagui.cpp:98
-msgid "&About"
-msgstr "O progr&amu"
-
-#: zrcolagui.cpp:101
+#: zrcolagui.cpp:107
 msgid "&Help"
 msgstr "&Pomoč"
 
-#: zrcolagui.cpp:108
+#: zrcolagui.cpp:113
+msgid "Cut"
+msgstr "Izreži"
+
+#: zrcolagui.cpp:113
+msgid "Cut selection"
+msgstr "Izreži izbor"
+
+#: zrcolagui.cpp:115
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: zrcolagui.cpp:110
+#: zrcolagui.cpp:115
+msgid "Copy selection"
+msgstr "Kopiraj izbor"
+
+#: zrcolagui.cpp:117
 msgid "Paste"
 msgstr "Prilepi"
 
-#: zrcolagui.cpp:114
+#: zrcolagui.cpp:117
+msgid "Paste selection"
+msgstr "Prilepi izbor"
+
+#: zrcolagui.cpp:121
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: zrcolagui.cpp:116
+#: zrcolagui.cpp:123
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
@@ -156,6 +156,24 @@ msgstr "1250"
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
 
+#~ msgid "&About"
+#~ msgstr "O progr&amu"
+
+#~ msgid "Cuts selected text and puts it on the clipboard"
+#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#~ msgid "Copies selected text to the clipboard"
+#~ msgstr "Kopira izbrano besedilo na odložišče"
+
+#~ msgid "Inserts text from the clipboard"
+#~ msgstr "Vstavi besedilo z odložišča"
+
+#~ msgid "&Copy"
+#~ msgstr "&Kopiraj"
+
+#~ msgid "&Paste"
+#~ msgstr "&Prilepi"
+
 #~ msgid "&File"
 #~ msgstr "&Datoteka"
 

ZRCola/zrcolafrm.cpp

@@ -25,13 +25,18 @@
 //////////////////////////////////////////////////////////////////////////
 
 wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
-    EVT_UPDATE_UI_RANGE(wxID_SEND_COMPOSED, wxID_SEND_ABORT, wxZRColaFrame::OnSendUpdate)
+    EVT_UPDATE_UI_RANGE(wxID_CUT, wxID_CLEAR, wxZRColaFrame::OnForwardEventUpdate)
+    EVT_MENU_RANGE(wxID_CUT, wxID_CLEAR, wxZRColaFrame::OnForwardEvent)
+    EVT_UPDATE_UI(wxID_SELECTALL, wxZRColaFrame::OnForwardEventUpdate)
+    EVT_MENU(wxID_SELECTALL, wxZRColaFrame::OnForwardEvent)
 
+    EVT_UPDATE_UI_RANGE(wxID_SEND_COMPOSED, wxID_SEND_ABORT, wxZRColaFrame::OnSendUpdate)
     EVT_MENU(wxID_SEND_COMPOSED  , wxZRColaFrame::OnSendComposed            )
     EVT_MENU(wxID_SEND_DECOMPOSED, wxZRColaFrame::OnSendDecomposed          )
     EVT_MENU(wxID_SEND_ABORT     , wxZRColaFrame::OnSendAbort               )
-    EVT_MENU(wxID_EXIT           , wxZRColaFrame::OnExit                    )
-    EVT_MENU(wxID_ABOUT          , wxZRColaFrame::OnAbout                   )
+
+    EVT_MENU(wxID_EXIT , wxZRColaFrame::OnExit )
+    EVT_MENU(wxID_ABOUT, wxZRColaFrame::OnAbout)
 wxEND_EVENT_TABLE()
 
 
@@ -67,6 +72,26 @@ wxZRColaFrame::~wxZRColaFrame()
 }
 
 
+void wxZRColaFrame::OnForwardEventUpdate(wxUpdateUIEvent& event)
+{
+    wxControl *focusWnd = wxDynamicCast(FindFocus(), wxControl);
+    if (focusWnd)
+        focusWnd->GetEventHandler()->ProcessEvent(event);
+    else
+        event.Enable(false);
+}
+
+
+void wxZRColaFrame::OnForwardEvent(wxCommandEvent& event)
+{
+    wxControl *focusWnd = wxDynamicCast(FindFocus(), wxControl);
+    if (focusWnd)
+        focusWnd->GetEventHandler()->ProcessEvent(event);
+    else
+        event.Skip();
+}
+
+
 void wxZRColaFrame::OnSendUpdate(wxUpdateUIEvent& event)
 {
     event.Enable(m_hWndSource ? true : false);

ZRCola/zrcolafrm.h

@@ -46,6 +46,8 @@ public:
     virtual ~wxZRColaFrame();
 
 protected:
+    void OnForwardEventUpdate(wxUpdateUIEvent& event);
+    void OnForwardEvent(wxCommandEvent& event);
     void OnSendUpdate(wxUpdateUIEvent& event);
     void OnSendComposed(wxCommandEvent& event);
     void OnSendDecomposed(wxCommandEvent& event);

ZRCola/zrcolagui.cpp

@@ -29,14 +29,14 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menubar = new wxMenuBar( 0 );
 	m_menuProgram = new wxMenu();
 	wxMenuItem* m_menuItemExit;
-	m_menuItemExit = new wxMenuItem( m_menuProgram, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), wxEmptyString, wxITEM_NORMAL );
+	m_menuItemExit = new wxMenuItem( m_menuProgram, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), _("Quit this program"), wxITEM_NORMAL );
 	m_menuProgram->Append( m_menuItemExit );
 	
 	m_menubar->Append( m_menuProgram, _("&Program") ); 
 	
 	m_menuEdit = new wxMenu();
 	wxMenuItem* m_menuItemEditCut;
-	m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( _("Cut") ) + wxT('\t') + wxT("Ctrl+X"), _("Cuts selected text and puts it on the clipboard"), wxITEM_NORMAL );
+	m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemEditCut->SetBitmaps( wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -45,7 +45,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemEditCut );
 	
 	wxMenuItem* m_menuItemEditCopy;
-	m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( _("&Copy") ) + wxT('\t') + wxT("Ctrl+C"), _("Copies selected text to the clipboard"), wxITEM_NORMAL );
+	m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemEditCopy->SetBitmaps( wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -54,7 +54,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemEditCopy );
 	
 	wxMenuItem* m_menuItemEditPaste;
-	m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( _("&Paste") ) + wxT('\t') + wxT("Ctrl+V"), _("Inserts text from the clipboard"), wxITEM_NORMAL );
+	m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemEditPaste->SetBitmaps( wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -64,8 +64,14 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_menuEdit->AppendSeparator();
 	
+	wxMenuItem* m_menuSelectAll;
+	m_menuSelectAll = new wxMenuItem( m_menuEdit, wxID_SELECTALL, wxString( _("Select &All") ) + wxT('\t') + wxT("Ctrl+A"), _("Select all text"), wxITEM_NORMAL );
+	m_menuEdit->Append( m_menuSelectAll );
+	
+	m_menuEdit->AppendSeparator();
+	
 	wxMenuItem* m_menuItemSendComposed;
-	m_menuItemSendComposed = new wxMenuItem( m_menuEdit, wxID_SEND_COMPOSED, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Sends composed text to source window"), wxITEM_NORMAL );
+	m_menuItemSendComposed = new wxMenuItem( m_menuEdit, wxID_SEND_COMPOSED, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Send composed text to source window"), wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemSendComposed->SetBitmaps( wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -74,7 +80,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemSendComposed );
 	
 	wxMenuItem* m_menuItemSendDecomposed;
-	m_menuItemSendDecomposed = new wxMenuItem( m_menuEdit, wxID_SEND_DECOMPOSED, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Sends decomposed text to source window"), wxITEM_NORMAL );
+	m_menuItemSendDecomposed = new wxMenuItem( m_menuEdit, wxID_SEND_DECOMPOSED, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Send decomposed text to source window"), wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemSendDecomposed->SetBitmaps( wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -83,7 +89,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemSendDecomposed );
 	
 	wxMenuItem* m_menuItemSendAbort;
-	m_menuItemSendAbort = new wxMenuItem( m_menuEdit, wxID_SEND_ABORT, wxString( _("Abort (De)composition") ) + wxT('\t') + wxT("Esc"), _("Aborts composition and returns focus to source window"), wxITEM_NORMAL );
+	m_menuItemSendAbort = new wxMenuItem( m_menuEdit, wxID_SEND_ABORT, wxString( _("Abort (De)composition") ) + wxT('\t') + wxT("Esc"), _("Abort composition and return focus to source window"), wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemSendAbort->SetBitmaps( wxIcon( wxT("send_abort.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -95,25 +101,26 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_menuHelp = new wxMenu();
 	wxMenuItem* m_menuItemAbout;
-	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuHelp->Append( m_menuItemAbout );
 	
 	m_menubar->Append( m_menuHelp, _("&Help") ); 
 	
 	this->SetMenuBar( m_menubar );
 	
-	m_toolbar = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY ); 
-	m_toolEditCut = m_toolbar->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cuts selected text and puts it on the clipboard"), NULL ); 
+	m_toolbar = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY );
+	m_toolbar->SetToolBitmapSize( wxSize( 16,16 ) );
+	m_toolEditCut = m_toolbar->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cut selection"), NULL ); 
 	
-	m_toolEditCopy = m_toolbar->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copies selected text to the clipboard"), NULL ); 
+	m_toolEditCopy = m_toolbar->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copy selection"), NULL ); 
 	
-	m_toolEditPaste = m_toolbar->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Inserts text from the clipboard"), NULL ); 
+	m_toolEditPaste = m_toolbar->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Paste selection"), NULL ); 
 	
 	m_toolbar->AddSeparator(); 
 	
-	m_toolSendComposed = m_toolbar->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Sends composed text to source window"), NULL ); 
+	m_toolSendComposed = m_toolbar->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); 
 	
-	m_toolSendDecomposed = m_toolbar->AddTool( wxID_SEND_DECOMPOSED, _("Send Decomposed"), wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Sends decomposed text to source window"), NULL ); 
+	m_toolSendDecomposed = m_toolbar->AddTool( wxID_SEND_DECOMPOSED, _("Send Decomposed"), wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); 
 	
 	m_toolbar->Realize(); 
 	

include/zrcola.h

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define ZRCOLA_VERSION          0x01ff0300
+#define ZRCOLA_VERSION          0x01ff0400
 
 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define ZRCOLA_VERSION_MAJ      1
 #define ZRCOLA_VERSION_MIN      255
-#define ZRCOLA_VERSION_REV      3
+#define ZRCOLA_VERSION_REV      4
 #define ZRCOLA_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define ZRCOLA_VERSION_STR      "2.0-alpha3"
+#define ZRCOLA_VERSION_STR      "2.0-alpha4"
 #define ZRCOLA_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define ZRCOLA_VERSION_INST     "1.255.3"
+#define ZRCOLA_VERSION_INST     "1.255.4"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define ZRCOLA_VERSION_GUID     "{8553943A-9CD0-4639-98CC-0A57A84A7765}"
+#define ZRCOLA_VERSION_GUID     "{CD41C45D-02B7-4236-9338-F7A5CC26A666}"
 
 //
 // The product vendor and application name for configuration keeping.

lib/libZRCola/src/translate.cpp

@@ -37,85 +37,67 @@ void ZRCola::translation_db::Compose(_In_z_count_(inputMax) const wchar_t* input
     indexComp::size_type compositionsCount = idxComp.size();
 
     for (size_t i = 0; i < inputMax;) {
-        // Start with the full search area at i-th character.
-        for (size_t l = 0, r = compositionsCount, ii = i, j = 0;; ii++, j++) {
-            if (ii < inputMax) {
-                size_t l_prev = l;
-                wchar_t c = input[ii];
-                while (l < r) {
-                    // Test the composition in the middle of the search area.
-                    size_t m = (l + r) / 2;
+        // Find the longest matching composition at i-th character.
+        size_t l_match = (size_t)-1;
+        for (size_t l = 0, r = compositionsCount, ii = i, j = 0; ii < inputMax && l < r; ii++, j++) {
+            wchar_t c = input[ii];
+            while (l < r) {
+                // Test the composition in the middle of the search area.
+                size_t m = (l + r) / 2;
 
-                    // Get the j-th character of the composition.
-                    // All compositions that get short on characters are lexically ordered before.
-                    // Thus the j-th character is considered 0.
-                    const translation &trans = idxComp[m];
-                    wchar_t s = j < trans.str_len ? trans.str[j] : 0;
+                // Get the j-th character of the composition.
+                // All compositions that get short on characters are lexically ordered before.
+                // Thus the j-th character is considered 0.
+                const translation &trans = idxComp[m];
+                wchar_t s = j < trans.str_len ? trans.str[j] : 0;
 
-                    // Do the bisection test.
-                         if (c < s) r = m;
-                    else if (s < c) l = m + 1;
-                    else {
-                        // Character found.
+                // Do the bisection test.
+                     if (c < s) r = m;
+                else if (s < c) l = m + 1;
+                else {
+                    // Character found.
 
-                        // Narrow the search area on the left to start at the first composition in the run.
-                        for (size_t rr = m; l < rr;) {
-                            size_t m = (l + rr) / 2;
-                            const translation &trans = idxComp[m];
-                            wchar_t s = j < trans.str_len ? trans.str[j] : 0;
-                            if (c <= s) rr = m; else l = m + 1;
-                        }
-
-                        // Narrow the search area on the right to end at the first composition not in the run.
-                        for (size_t ll = m + 1; ll < r;) {
-                            size_t m = (ll + r) / 2;
-                            const translation &trans = idxComp[m];
-                            wchar_t s = j < trans.str_len ? trans.str[j] : 0;
-                            if (s <= c) ll = m + 1; else r = m;
-                        }
-
-                        break;
+                    // Narrow the search area on the left to start at the first composition in the run.
+                    for (size_t rr = m; l < rr;) {
+                        size_t m = (l + rr) / 2;
+                        const translation &trans = idxComp[m];
+                        wchar_t s = j < trans.str_len ? trans.str[j] : 0;
+                        if (c <= s) rr = m; else l = m + 1;
                     }
-                }
 
-                if (l >= r) {
-                    // The search area is empty.
-                    const translation &trans = idxComp[l_prev];
-                    if (j && l_prev < compositionsCount && j == trans.str_len) {
-                        // The first composition of the previous run was a match.
-                        output += trans.chr;
-                        i = ii;
-                        if (j > 1 && map) {
-                            // Mapping changed.
-                            map->push_back(ZRCola::mapping(output.length(), i));
-                        }
-                    } else {
-                        // The exact match was not found.
-                        output += input[i];
-                        i++;
+                    // Narrow the search area on the right to end at the first composition not in the run.
+                    for (size_t ll = m + 1; ll < r;) {
+                        size_t m = (ll + r) / 2;
+                        const translation &trans = idxComp[m];
+                        wchar_t s = j < trans.str_len ? trans.str[j] : 0;
+                        if (s <= c) ll = m + 1; else r = m;
                     }
+
+                    const translation &trans = idxComp[l];
+                    if (j + 1 == trans.str_len) {
+                        // The first composition of the run was a match (thus far). Save it.
+                        l_match = l;
+                    }
+
                     break;
                 }
-            } else {
-                // End of input reached.
-
-                const translation &trans = idxComp[l];
-                if (l < compositionsCount && j == trans.str_len) {
-                    // The first composition of the previous run was a match.
-                    output += trans.chr;
-                    i = ii;
-                    if (j > 1 && map) {
-                        // Mapping changed.
-                        map->push_back(ZRCola::mapping(output.length(), i));
-                    }
-                } else {
-                    output += input[i];
-                    i++;
-                }
-
-                break;
             }
         }
+
+        if (l_match < compositionsCount) {
+            // The saved composition was an exact match.
+            const translation &trans = idxComp[l_match];
+            output += trans.chr;
+            i += trans.str_len;
+            if (trans.str_len > 1 && map) {
+                // Mapping changed.
+                map->push_back(ZRCola::mapping(output.length(), i));
+            }
+        } else {
+            // The match was not found.
+            output += input[i];
+            i++;
+        }
     }
 }
 

output/locale/sl_SI/wxstd.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: wxWidgets 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-02 15:21+0100\n"
-"PO-Revision-Date: 2016-03-14 17:12+0100\n"
+"PO-Revision-Date: 2016-04-08 13:05+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language: sl_SI\n"
@@ -2955,7 +2955,7 @@ msgstr "Izreži"
 # generic/dirdlgg.cpp:191
 #: ../src/common/stockitem.cpp:259
 msgid "Cut selection"
-msgstr "Prilepi izbor"
+msgstr "Izreži izbor"
 
 #: ../src/common/fmapbase.cpp:152
 msgid "Cyrillic (ISO-8859-5)"