From 9f128a96d1bb8a1c3082a89f91404189cf5c7322 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 1 Apr 2021 11:10:42 +0200 Subject: [PATCH] UI: Update ZRCola.fbp Signed-off-by: Simon Rozman --- ZRCola/res/ZRCola.fbp | 3101 +------------------------------------- ZRCola/res/zrcolagui.cpp | 750 ++++----- ZRCola/res/zrcolagui.h | 168 +-- ZRCola/zrcolagui.cpp | 756 +++++----- ZRCola/zrcolagui.h | 168 +-- 5 files changed, 960 insertions(+), 3983 deletions(-) diff --git a/ZRCola/res/ZRCola.fbp b/ZRCola/res/ZRCola.fbp index 874b22a..d06f755 100644 --- a/ZRCola/res/ZRCola.fbp +++ b/ZRCola/res/ZRCola.fbp @@ -1,6 +1,6 @@ - + C++ @@ -27,7 +27,7 @@ UI 1 1 - + 1 wxAUI_MGR_DEFAULT @@ -54,54 +54,9 @@ ZRCola wxTAB_TRAVERSAL 1 - - - - - - - - - - - - - - - - OnClose - - - OnIconize OnIdle - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -124,36 +79,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &Program m_menuProgram @@ -170,8 +95,6 @@ none Alt+F4 - - @@ -190,8 +113,6 @@ none - - Load From Icon Resource; edit_copy.ico; [16; 16] @@ -205,8 +126,6 @@ none - - Load From Icon Resource; edit_paste.ico; [16; 16] @@ -220,8 +139,6 @@ none - - separator1 @@ -239,8 +156,6 @@ none Ctrl+A - - separator2 @@ -258,8 +173,6 @@ none F8 - - separator3 @@ -277,8 +190,6 @@ none F5 - - Load From Icon Resource; copy_destination_and_return.ico; [16; 16] @@ -292,8 +203,6 @@ none Ctrl+F5 - - Load From Icon Resource; send_source.ico; [16; 16] @@ -307,8 +216,6 @@ none F6 - - Load From Icon Resource; copy_source_and_return.ico; [16; 16] @@ -322,8 +229,6 @@ none Ctrl+F6 - - Load From Icon Resource; send_abort.ico; [16; 16] @@ -337,8 +242,6 @@ none Esc - - separator4 @@ -356,8 +259,6 @@ protected - - @@ -381,8 +282,6 @@ none - - @@ -401,8 +300,6 @@ none - - @@ -416,8 +313,6 @@ none - - separator @@ -435,8 +330,6 @@ none - - @@ -455,8 +348,6 @@ none F1 - - @@ -470,8 +361,6 @@ none - - separator @@ -489,8 +378,6 @@ none - - @@ -504,8 +391,6 @@ none - - separator @@ -523,8 +408,6 @@ none - - @@ -587,36 +470,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Load From Icon Resource; edit_cut.ico; [24; 24] 0 @@ -627,16 +480,6 @@ protected Cut selection Cut - - - - - - - - - - Load From Icon Resource; edit_copy.ico; [24; 24] @@ -648,16 +491,6 @@ protected Copy selection Copy - - - - - - - - - - Load From Icon Resource; edit_paste.ico; [24; 24] @@ -669,19 +502,9 @@ protected Paste selection Paste - - - - - - - - - - - + 1 0 0 @@ -740,36 +563,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Load From Icon Resource; char_select.ico; [24; 24] 0 @@ -780,16 +573,6 @@ protected Toggle character search to select character to insert into text Find Character - - - - - - - - - - Load From Icon Resource; send_destination.ico; [24; 24] @@ -801,16 +584,6 @@ protected Send composed text to source window Send Composed - - - - - - - - - - Load From Icon Resource; send_source.ico; [24; 24] @@ -822,16 +595,9 @@ protected Send decomposed text to source window Send Decomposed - - - - - - - - - - + + + protected Load From Icon Resource; composition.ico; [24; 24] @@ -843,16 +609,6 @@ protected Toggle ZRCola character (De)composition ZRCola (De)composition - - - - - - - - - - 1 @@ -912,37 +668,7 @@ - - - - - - - - OnTranslationSeqChoice - - - - - - - - - - - - - - - - - - - - - - @@ -1001,36 +727,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 @@ -1088,36 +784,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1141,36 +807,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1195,43 +831,6 @@ ZRColaComposerPanel wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerMain @@ -1298,40 +897,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 @@ -1384,36 +949,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerSourceEdit @@ -1431,7 +966,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -1494,40 +1028,8 @@ - - - - - - - - - - - - - - - - - - - - - - - OnSourcePaint - - - - - OnSourceText - - - - @@ -1587,36 +1089,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerSourceHex @@ -1634,7 +1106,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -1697,40 +1168,7 @@ - - - - - - - - - - - - - - - - - - - - - - - OnSourceHexPaint - - - - - - - - - - @@ -1801,40 +1239,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 @@ -1887,36 +1291,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerDestinationEdit @@ -1934,7 +1308,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -1997,40 +1370,8 @@ - - - - - - - - - - - - - - - - - - - - - - - OnDestinationPaint - - - - - OnDestinationText - - - - @@ -2090,36 +1431,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerDestinationHex @@ -2137,7 +1448,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -2200,40 +1510,7 @@ - - - - - - - - - - - - - - - - - - - - - - - OnDestinationHexPaint - - - - - - - - - - @@ -2276,43 +1553,6 @@ ZRColaCharacterCatalog wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer @@ -2380,37 +1620,7 @@ - - - - - - - - OnChoice - - - - - - - - - - - - - - - - - - - - - - @@ -2434,15 +1644,15 @@ 1 wxSYS_COLOUR_BTNFACE ZRCola,90,90,20,70,0 - wxALIGN_CENTRE + wxALIGN_CENTER - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 @@ -2485,10 +1695,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 @@ -2499,68 +1709,8 @@ - - - - - - - - - - - OnGridClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnGridKeyDown - - - - - - - - - - - - - - - - - - - @@ -2625,37 +1775,7 @@ - - - - - - - - OnShowAll - - - - - - - - - - - - - - - - - - - - - - @@ -2686,55 +1806,7 @@ ZRColaCharSelect - - - - - - - - - - - - - - - - - - - - - OnIdle - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerContent @@ -2770,7 +1842,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -2834,40 +1905,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnSearchText - - @@ -2931,37 +1969,7 @@ - - - - - - - - - - OnSearchMore - - - - - - - - - - - - - - - - - - - - @@ -3019,36 +2027,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sbSizerSearch @@ -3115,39 +2093,7 @@ - - - - - - - - - - OnCategoriesToggle - - - - - - - - - - - - - - - - - - - - - - @@ -3220,37 +2166,7 @@ - - - - - - - - - - OnCategoriesAll - - - - - - - - - - - - - - - - - - - - @@ -3314,37 +2230,7 @@ - - - - - - - - - - OnCategoriesNone - - - - - - - - - - - - - - - - - - - - @@ -3408,37 +2294,7 @@ - - - - - - - - - - OnCategoriesInvert - - - - - - - - - - - - - - - - - - - - @@ -3467,15 +2323,15 @@ 1 ZRCola,90,90,20,70,0 - wxALIGN_CENTRE + wxALIGN_CENTER - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 @@ -3518,10 +2374,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 @@ -3532,68 +2388,9 @@ wxBORDER_STATIC - - - - - - - - - - - - OnResultCellDClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnResultSelectCell OnResultsKeyDown - - - - - - - - - - - - - - - - - - - @@ -3610,7 +2407,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -3632,15 +2428,15 @@ 1 ZRCola,90,90,20,70,0 - wxALIGN_CENTRE + wxALIGN_CENTER - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 @@ -3683,10 +2479,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 @@ -3697,68 +2493,9 @@ wxBORDER_STATIC - - - - - - - - - - - - OnRecentCellDClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnRecentSelectCell OnRecentKeyDown - - - - - - - - - - - - - - - - - - - @@ -3786,7 +2523,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -3855,36 +2591,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3949,40 +2655,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUnicodeText - - - - @@ -4035,7 +2708,7 @@ Resizable 1 - wxTE_CENTRE|wxTE_READONLY + wxTE_READONLY|wxTE_CENTER 0 Keyboard shortcut in Composer window @@ -4047,40 +2720,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4106,15 +2745,15 @@ 1 ZRCola,90,90,96,70,0 - wxALIGN_CENTRE + wxALIGN_CENTER - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 1 200 @@ -4157,10 +2796,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 200 1 1 @@ -4171,68 +2810,7 @@ wxBORDER_STATIC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPreviewKeyDown - - - - - - - - - - - - - - - - - - - @@ -4285,7 +2863,7 @@ Resizable 1 - wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY + wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTER 0 Unicode character description @@ -4297,40 +2875,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4383,7 +2927,7 @@ Resizable 1 - wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY + wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTER 0 Character tags @@ -4395,40 +2939,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4481,7 +2991,7 @@ Resizable 1 - wxTE_CENTRE|wxTE_READONLY + wxTE_READONLY|wxTE_CENTER 0 Unicode character category @@ -4493,40 +3003,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4599,37 +3075,7 @@ - - - - - - - - - - OnNavigateBack - - - - - - - - - - - - - - - - - - - - @@ -4693,37 +3139,7 @@ - - - - - - - - - - OnNavigateForward - - - - - - - - - - - - - - - - - - - - @@ -4742,7 +3158,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -4764,15 +3179,15 @@ 1 ZRCola,90,90,20,70,0 - wxALIGN_CENTRE + wxALIGN_CENTER - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 @@ -4815,10 +3230,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - wxALIGN_CENTRE + wxALIGN_CENTER 0 1 @@ -4829,68 +3244,7 @@ wxBORDER_STATIC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnRelatedSelectCell - - - - - - - - - - - - - - - - - - - - @@ -4988,36 +3342,7 @@ - - - - - - OnInsert - - - - - - - - - - - - - - - - - - - - - - - OnInsertUpdateUI @@ -5051,55 +3376,7 @@ ZRColaSettings - - - - - - - - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerContent @@ -5162,38 +3439,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Text Language @@ -5249,35 +3494,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnLanguageUpdate @@ -5343,36 +3559,6 @@ 490 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5437,37 +3623,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5532,37 +3687,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5626,38 +3750,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5718,36 +3810,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerAutoStart @@ -5812,36 +3874,6 @@ 490 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5906,37 +3938,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5971,13 +3972,7 @@ m_sdbSizerButtons protected OnApplyButtonClick - - - - OnOKButtonClick - - @@ -6008,55 +4003,6 @@ ZRColaAbout - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerContent @@ -6127,36 +4073,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6227,36 +4143,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6318,36 +4204,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6409,36 +4265,6 @@ 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6500,36 +4326,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6593,37 +4389,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6695,36 +4460,6 @@ 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6789,40 +4524,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6855,14 +4556,6 @@ m_sdbSizerButtons protected - - - - - - - - @@ -6893,55 +4586,7 @@ ZRColaUpdater - - - - - - - - - - - - - - - - - - - - - OnIdle - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerContent @@ -6959,7 +4604,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -7022,40 +4666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7149,37 +4759,7 @@ - - - - - - OnUpdate - - - - - - - - - - - - - - - - - - - - - - - - @@ -7252,37 +4832,7 @@ - - - - - - OnClose - - - - - - - - - - - - - - - - - - - - - - - - @@ -7315,55 +4865,6 @@ ZRColaCharRequest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerContent @@ -7381,7 +4882,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -7441,36 +4941,6 @@ 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7535,40 +5005,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7630,36 +5066,6 @@ 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7676,7 +5082,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -7736,36 +5141,6 @@ 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7830,40 +5205,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7927,36 +5268,6 @@ 400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7985,14 +5296,7 @@ m_sdbSizerButtons protected - - - - - OnOKButtonClick - - @@ -8023,54 +5327,7 @@ ZRColaTranslationSeq - - - - - - - - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdate @@ -8089,7 +5346,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -8149,36 +5405,6 @@ 452 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8258,36 +5484,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8351,38 +5547,8 @@ - - - - - - OnAvailableChar - - - - - - - - - - - OnAvailableDClick - - - - - - - - - - - - - @@ -8466,37 +5632,7 @@ - - - - - - OnAdd - - - - - - - - - - - - - - - - - - - - - - - - @@ -8569,37 +5705,7 @@ - - - - - - OnRemove - - - - - - - - - - - - - - - - - - - - - - - - @@ -8672,36 +5778,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8765,38 +5841,8 @@ - - - - - - OnSelectedChar - - - - - - - - - - - OnSelectedDClick - - - - - - - - - - - - - @@ -8882,37 +5928,7 @@ - - - - - - OnSelectedUp - - - - - - - - - - - - - - - - - - - - - - - - @@ -8985,37 +6001,7 @@ - - - - - - OnSelectedDown - - - - - - - - - - - - - - - - - - - - - - - - @@ -9048,14 +6034,7 @@ m_sdbSizerButtons protected - - - - - OnOKButtonClick - - diff --git a/ZRCola/res/zrcolagui.cpp b/ZRCola/res/zrcolagui.cpp index d9a2a82..980cd07 100644 --- a/ZRCola/res/zrcolagui.cpp +++ b/ZRCola/res/zrcolagui.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -35,15 +35,15 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS this->SetSizeHints( wxSize( 150,150 ), wxDefaultSize ); m_mgr.SetManagedWindow(this); m_mgr.SetFlags(wxAUI_MGR_DEFAULT); - + 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"), _("Quit this program"), wxITEM_NORMAL ); m_menuProgram->Append( m_menuItemExit ); - - m_menubar->Append( m_menuProgram, _("&Program") ); - + + m_menubar->Append( m_menuProgram, _("&Program") ); + m_menuEdit = new wxMenu(); wxMenuItem* m_menuItemEditCut; m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL ); @@ -53,7 +53,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemEditCut->SetBitmap( wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemEditCut ); - + wxMenuItem* m_menuItemEditCopy; m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -62,7 +62,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemEditCopy->SetBitmap( wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemEditCopy ); - + wxMenuItem* m_menuItemEditPaste; m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -71,21 +71,21 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemEditPaste->SetBitmap( wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemEditPaste ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuItemSelectAll; m_menuItemSelectAll = new wxMenuItem( m_menuEdit, wxID_SELECTALL, wxString( _("Select &All") ) + wxT('\t') + wxT("Ctrl+A"), _("Select all text"), wxITEM_NORMAL ); m_menuEdit->Append( m_menuItemSelectAll ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuItemCharSelect; m_menuItemCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Toggle character search to select character to insert into text"), wxITEM_CHECK ); m_menuEdit->Append( m_menuItemCharSelect ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuItemSendDestination; m_menuItemSendDestination = new wxMenuItem( m_menuEdit, wxID_SEND_DESTINATION, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Send composed text to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -94,7 +94,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemSendDestination->SetBitmap( wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemSendDestination ); - + wxMenuItem* m_menuItemCopyDestinationAndReturn; m_menuItemCopyDestinationAndReturn = new wxMenuItem( m_menuEdit, wxID_COPY_DESTINATION_AND_RETURN, wxString( _("Copy Composed and &Return") ) + wxT('\t') + wxT("Ctrl+F5"), _("Copy composed text to clipboard and return focus to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -103,7 +103,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemCopyDestinationAndReturn->SetBitmap( wxIcon( wxT("copy_destination_and_return.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemCopyDestinationAndReturn ); - + wxMenuItem* m_menuItemSendSource; m_menuItemSendSource = new wxMenuItem( m_menuEdit, wxID_SEND_SOURCE, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Send decomposed text to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -112,7 +112,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemSendSource->SetBitmap( wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemSendSource ); - + wxMenuItem* m_menuItemCopySourceAndReturn; m_menuItemCopySourceAndReturn = new wxMenuItem( m_menuEdit, wxID_COPY_SOURCE_AND_RETURN, wxString( _("Copy Decomposed and Re&turn") ) + wxT('\t') + wxT("Ctrl+F6"), _("Copy decomposed text to clipboard and return focus to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -121,7 +121,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemCopySourceAndReturn->SetBitmap( wxIcon( wxT("copy_source_and_return.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemCopySourceAndReturn ); - + wxMenuItem* m_menuItemSendAbort; 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__ @@ -130,109 +130,111 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemSendAbort->SetBitmap( wxIcon( wxT("send_abort.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) ); #endif m_menuEdit->Append( m_menuItemSendAbort ); - + m_menuEdit->AppendSeparator(); - + m_menuItemComposition = new wxMenuItem( m_menuEdit, wxID_COMPOSITION_MENU, wxString( _("&ZRCola (De)composition") ) , _("Toggle ZRCola character (De)composition"), wxITEM_CHECK ); m_menuEdit->Append( m_menuItemComposition ); - + m_menuTranslationSeq = new wxMenu(); wxMenuItem* m_menuTranslationSeqItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("Tra&nslation"), wxEmptyString, wxITEM_NORMAL, m_menuTranslationSeq ); m_menuEdit->Append( m_menuTranslationSeqItem ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuSettings; m_menuSettings = new wxMenuItem( m_menuEdit, wxID_SETTINGS, wxString( _("&Settings...") ) , _("Open program configuration dialog"), wxITEM_NORMAL ); m_menuEdit->Append( m_menuSettings ); - - m_menubar->Append( m_menuEdit, _("&Edit") ); - + + m_menubar->Append( m_menuEdit, _("&Edit") ); + m_menuView = new wxMenu(); wxMenuItem* m_menuItemToolbarEdit; m_menuItemToolbarEdit = new wxMenuItem( m_menuView, wxID_TOOLBAR_EDIT, wxString( _("&Edit Toolbar") ) , _("Toggle edit toolbar"), wxITEM_CHECK ); m_menuView->Append( m_menuItemToolbarEdit ); - + wxMenuItem* m_menuItemToolbarCompose; m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK ); m_menuView->Append( m_menuItemToolbarCompose ); - + m_menuView->AppendSeparator(); - + wxMenuItem* m_menuItemPanelChrGrps; m_menuItemPanelChrGrps = new wxMenuItem( m_menuView, wxID_PANEL_CHRGRPS, wxString( _("Character Catalo&g") ) , _("Toggle character catalog panel"), wxITEM_CHECK ); m_menuView->Append( m_menuItemPanelChrGrps ); - - m_menubar->Append( m_menuView, _("&View") ); - + + m_menubar->Append( m_menuView, _("&View") ); + m_menuHelp = new wxMenu(); wxMenuItem* m_menuHelpInstructions; m_menuHelpInstructions = new wxMenuItem( m_menuHelp, wxID_HELP_INSTRUCTIONS, wxString( _("&Instructions...") ) + wxT('\t') + wxT("F1"), _("Open a web site with product instructions"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpInstructions ); - + wxMenuItem* m_menuHelpShortcuts; m_menuHelpShortcuts = new wxMenuItem( m_menuHelp, wxID_HELP_SHORTCUTS, wxString( _("Keyboard &Shortcuts...") ) , _("Open a list of keyboard shortcuts"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpShortcuts ); - + m_menuHelp->AppendSeparator(); - + wxMenuItem* m_menuHelpReqChar; m_menuHelpReqChar = new wxMenuItem( m_menuHelp, wxID_HELP_REQCHAR, wxString( _("&Request a new character...") ) , _("Submit a request to ZRC to add a new character"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpReqChar ); - + wxMenuItem* m_menuHelpUpdate; m_menuHelpUpdate = new wxMenuItem( m_menuHelp, wxID_HELP_UPDATE, wxString( _("Check for &Updates...") ) , _("Check online for product update"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpUpdate ); - + m_menuHelp->AppendSeparator(); - + wxMenuItem* m_menuHelpAbout; m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) , wxEmptyString, wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpAbout ); - - m_menubar->Append( m_menuHelp, _("&Help") ); - + + m_menubar->Append( m_menuHelp, _("&Help") ); + this->SetMenuBar( m_menubar ); - - m_toolbarEdit = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); - m_toolEditCut = m_toolbarEdit->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_toolbarEdit->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_toolbarEdit->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Paste selection"), NULL ); - + + m_toolbarEdit = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); + m_toolEditCut = m_toolbarEdit->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_toolbarEdit->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_toolbarEdit->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Paste selection"), NULL ); + m_toolbarEdit->Realize(); m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() ); - - m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); - m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Find Character"), _("Toggle character search to select character to insert into text"), NULL ); - - m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); - - 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 ); - - m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION_TOOLBAR, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL ); - + + m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); + m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Find Character"), _("Toggle character search to select character to insert into text"), NULL ); + + m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); + + 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 ); + + m_toolbarTranslate->AddSeparator(); + + m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION_TOOLBAR, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL ); + wxArrayString m_toolTranslationSeqChoices; 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(); m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() ); - + m_panelChrCat = new wxZRColaCharacterCatalogPanel( this ); - + m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize( wxSize( 150,200 ) ).MinSize( wxSize( 100,100 ) ).Layer( 1 ) ); - + m_panel = new wxZRColaComposerPanel( this ); - + m_mgr.AddPane( m_panel, wxAuiPaneInfo() .Name( wxT("composerPanel") ).Center() .Caption( _("(De)Composer") ).CaptionVisible( false ).CloseButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).Floatable( false ) ); - + m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY ); - + m_mgr.Update(); this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) ); this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) ); @@ -247,116 +249,116 @@ wxZRColaFrameBase::~wxZRColaFrameBase() this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) ); this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) ); m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this ); - + m_mgr.UnInit(); - + } wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + m_splitterSource = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE ); m_splitterSource->SetSashGravity( 1 ); m_splitterSource->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, this ); m_splitterSource->SetMinimumPaneSize( 5 ); - + m_panelSourceEdit = new wxPanel( m_splitterSource, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerSourceEdit; bSizerSourceEdit = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerSourceEdit2; 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, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); m_source->SetMinSize( wxSize( 100,25 ) ); - + bSizerSourceEdit2->Add( m_source, 1, wxEXPAND, 5 ); - - + + bSizerSourceEdit->Add( bSizerSourceEdit2, 1, wxEXPAND, 5 ); - - + + m_panelSourceEdit->SetSizer( bSizerSourceEdit ); m_panelSourceEdit->Layout(); bSizerSourceEdit->Fit( m_panelSourceEdit ); m_panelSourceHex = new wxPanel( m_splitterSource, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerSourceHex; bSizerSourceHex = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerSourceHex2; 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(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerSourceHex2->Add( m_sourceHex, 1, wxEXPAND, 5 ); - - + + bSizerSourceHex->Add( bSizerSourceHex2, 1, wxEXPAND, 5 ); - - + + m_panelSourceHex->SetSizer( bSizerSourceHex ); m_panelSourceHex->Layout(); bSizerSourceHex->Fit( m_panelSourceHex ); m_splitterSource->SplitVertically( m_panelSourceEdit, m_panelSourceHex, -5 ); bSizerMain->Add( m_splitterSource, 50, wxALL|wxEXPAND, 5 ); - + m_splitterDestination = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE ); m_splitterDestination->SetSashGravity( 1 ); m_splitterDestination->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, this ); m_splitterDestination->SetMinimumPaneSize( 5 ); - + m_panelDestinationEdit = new wxPanel( m_splitterDestination, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerDestinationEdit; bSizerDestinationEdit = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerDestinationEdit2; 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, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); m_destination->SetMinSize( wxSize( 100,25 ) ); - + bSizerDestinationEdit2->Add( m_destination, 1, wxEXPAND, 5 ); - - + + bSizerDestinationEdit->Add( bSizerDestinationEdit2, 1, wxEXPAND, 5 ); - - + + m_panelDestinationEdit->SetSizer( bSizerDestinationEdit ); m_panelDestinationEdit->Layout(); bSizerDestinationEdit->Fit( m_panelDestinationEdit ); m_panelDestinationHex = new wxPanel( m_splitterDestination, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerDestinationHex; bSizerDestinationHex = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerDestinationHex2; 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(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerDestinationHex2->Add( m_destinationHex, 1, wxEXPAND, 5 ); - - + + bSizerDestinationHex->Add( bSizerDestinationHex2, 1, wxEXPAND, 5 ); - - + + m_panelDestinationHex->SetSizer( bSizerDestinationHex ); m_panelDestinationHex->Layout(); bSizerDestinationHex->Fit( m_panelDestinationHex ); m_splitterDestination->SplitVertically( m_panelDestinationEdit, m_panelDestinationHex, -5 ); bSizerMain->Add( m_splitterDestination, 50, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bSizerMain ); this->Layout(); bSizerMain->Fit( this ); m_timerSave.SetOwner( this, wxID_TIMER_SAVE ); - + // Connect Events m_source->Connect( wxEVT_PAINT, wxPaintEventHandler( wxZRColaComposerPanelBase::OnSourcePaint ), NULL, this ); m_source->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaComposerPanelBase::OnSourceText ), NULL, this ); @@ -377,61 +379,61 @@ wxZRColaComposerPanelBase::~wxZRColaComposerPanelBase() m_destination->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaComposerPanelBase::OnDestinationText ), NULL, this ); m_destinationHex->Disconnect( wxEVT_PAINT, wxPaintEventHandler( wxZRColaComposerPanelBase::OnDestinationHexPaint ), NULL, this ); this->Disconnect( wxID_TIMER_SAVE, wxEVT_TIMER, wxTimerEventHandler( wxZRColaComposerPanelBase::OnSaveTimer ) ); - + } wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizer; bSizer = new wxBoxSizer( wxVERTICAL ); - + wxArrayString m_choiceChoices; m_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceChoices, 0 ); m_choice->SetSelection( 0 ); m_choice->SetToolTip( _("Select category to display") ); - + bSizer->Add( m_choice, 0, wxALL|wxEXPAND, 5 ); - + m_grid = new wxZRColaCharGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_grid->CreateGrid( 0, 0 ); m_grid->EnableEditing( false ); m_grid->EnableGridLines( false ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); - + // Columns m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( false ); m_grid->SetColLabelSize( 0 ); - m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_grid->EnableDragRowSize( false ); m_grid->SetRowLabelSize( 0 ); - m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_grid->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_grid->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_grid->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_grid->SetMinSize( wxSize( 35,35 ) ); - + bSizer->Add( m_grid, 1, wxALL|wxEXPAND, 5 ); - + m_show_all = new wxCheckBox( this, wxID_ANY, _("Show &All"), wxDefaultPosition, wxDefaultSize, 0 ); m_show_all->SetToolTip( _("Toggle display of less frequent characters") ); - + bSizer->Add( m_show_all, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bSizer ); this->Layout(); bSizer->Fit( this ); - + // Connect Events m_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnChoice ), NULL, this ); m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this ); @@ -446,309 +448,309 @@ wxZRColaCharacterCatalogPanelBase::~wxZRColaCharacterCatalogPanelBase() m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this ); m_grid->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridKeyDown ), NULL, this ); m_show_all->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnShowAll ), NULL, this ); - + } wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerColumns; bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerLeft; bSizerLeft = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerBrowse; sbSizerBrowse = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("&Browse") ), wxVERTICAL ); - + m_search = new wxSearchCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); #ifndef __WXMAC__ m_search->ShowSearchButton( true ); #endif m_search->ShowCancelButton( true ); m_search->SetToolTip( _("Full or partial terms from Unicode character description (in English) to search for") ); - + sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 ); - + m_search_more = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Search Options"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_search_more->SetToolTip( _("Shows/hides additional search options") ); - + sbSizerBrowse->Add( m_search_more, 0, wxALL|wxEXPAND, 5 ); - + m_search_panel = new wxPanel( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_search_panel->Hide(); - + wxBoxSizer* sbSizerSearch; sbSizerSearch = new wxBoxSizer( wxVERTICAL ); - + wxArrayString m_categoriesChoices; m_categories = new wxCheckListBox( m_search_panel, wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 ); m_categories->SetToolTip( _("List of Unicode character categories to search in") ); - + sbSizerSearch->Add( m_categories, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizerCategoriesCtrl; bSizerCategoriesCtrl = new wxBoxSizer( wxHORIZONTAL ); - + m_categoriesAll = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesAll->SetToolTip( _("Select all categories") ); - + bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, 5 ); - + m_categoriesNone = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesNone->SetToolTip( _("Clear category selection") ); - + bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, 5 ); - + m_categoriesInvert = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesInvert->SetToolTip( _("Invert category selection") ); - + bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, 5 ); - - + + sbSizerSearch->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 ); - - + + m_search_panel->SetSizer( sbSizerSearch ); m_search_panel->Layout(); sbSizerSearch->Fit( m_search_panel ); sbSizerBrowse->Add( m_search_panel, 0, wxEXPAND, 5 ); - + m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_STATIC ); - + // Grid m_gridResults->CreateGrid( 0, 0 ); m_gridResults->EnableEditing( false ); m_gridResults->EnableGridLines( false ); m_gridResults->EnableDragGridSize( false ); m_gridResults->SetMargins( 0, 0 ); - + // Columns m_gridResults->EnableDragColMove( false ); m_gridResults->EnableDragColSize( false ); m_gridResults->SetColLabelSize( 0 ); - m_gridResults->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridResults->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridResults->EnableDragRowSize( false ); m_gridResults->SetRowLabelSize( 0 ); - m_gridResults->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridResults->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridResults->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); 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 ) ); - + sbSizerBrowse->Add( m_gridResults, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerLeft->Add( sbSizerBrowse, 1, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizerRecent; sbSizerRecent = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Re¢ly Used") ), wxVERTICAL ); - + m_gridRecent = new wxZRColaCharGrid( sbSizerRecent->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,35 ), wxBORDER_STATIC ); - + // Grid m_gridRecent->CreateGrid( 0, 0 ); m_gridRecent->EnableEditing( false ); m_gridRecent->EnableGridLines( false ); m_gridRecent->EnableDragGridSize( false ); m_gridRecent->SetMargins( 0, 0 ); - + // Columns m_gridRecent->EnableDragColMove( false ); m_gridRecent->EnableDragColSize( false ); m_gridRecent->SetColLabelSize( 0 ); - m_gridRecent->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRecent->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridRecent->EnableDragRowSize( false ); m_gridRecent->SetRowLabelSize( 0 ); - m_gridRecent->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRecent->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridRecent->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); 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 ); - - + + bSizerLeft->Add( sbSizerRecent, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerColumns->Add( bSizerLeft, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerRight; bSizerRight = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerPreview; sbSizerPreview = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Preview") ), wxVERTICAL ); - + wxBoxSizer* bSizerUnicode; bSizerUnicode = new wxBoxSizer( wxHORIZONTAL ); - + m_labelUnicode = new wxStaticText( sbSizerPreview->GetStaticBox(), wxID_ANY, _("U+"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelUnicode->Wrap( -1 ); bSizerUnicode->Add( m_labelUnicode, 0, wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxTOP, 5 ); - + m_unicode = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), 0 ); m_unicode->SetToolTip( _("Unicode hexadecimal code") ); - + bSizerUnicode->Add( m_unicode, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxTOP, 5 ); - - m_shortcut = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY ); + + m_shortcut = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_CENTER ); m_shortcut->SetToolTip( _("Keyboard shortcut in Composer window") ); - + bSizerUnicode->Add( m_shortcut, 1, wxALL|wxEXPAND, 5 ); - - + + sbSizerPreview->Add( bSizerUnicode, 0, wxEXPAND, 5 ); - + m_gridPreview = new wxGrid( sbSizerPreview->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC ); - + // Grid m_gridPreview->CreateGrid( 1, 1 ); m_gridPreview->EnableEditing( false ); m_gridPreview->EnableGridLines( false ); m_gridPreview->EnableDragGridSize( false ); m_gridPreview->SetMargins( 0, 0 ); - + // Columns m_gridPreview->SetColSize( 0, 200 ); m_gridPreview->EnableDragColMove( false ); m_gridPreview->EnableDragColSize( false ); m_gridPreview->SetColLabelSize( 0 ); - m_gridPreview->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridPreview->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridPreview->SetRowSize( 0, 200 ); m_gridPreview->EnableDragRowSize( false ); m_gridPreview->SetRowLabelSize( 0 ); - m_gridPreview->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridPreview->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridPreview->SetDefaultCellFont( wxFont( 96, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_gridPreview->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_gridPreview->SetToolTip( _("Character preview") ); - + sbSizerPreview->Add( m_gridPreview, 0, wxALL|wxEXPAND, 5 ); - - m_description = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY ); + + m_description = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTER ); m_description->SetToolTip( _("Unicode character description") ); - + sbSizerPreview->Add( m_description, 1, wxALL|wxEXPAND, 5 ); - - m_tags = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY ); + + m_tags = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTER ); m_tags->SetToolTip( _("Character tags") ); - + sbSizerPreview->Add( m_tags, 1, wxALL|wxEXPAND, 5 ); - - m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY ); + + m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_CENTER ); m_category->SetToolTip( _("Unicode character category") ); - + sbSizerPreview->Add( m_category, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizerNavigateButtons; bSizerNavigateButtons = new wxBoxSizer( wxHORIZONTAL ); - + m_navigateBack = new wxHyperlinkCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, _("« Back"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_navigateBack->Enable( false ); m_navigateBack->SetToolTip( _("To previously viewed character") ); - + bSizerNavigateButtons->Add( m_navigateBack, 0, wxALL, 5 ); - + m_navigateForward = new wxHyperlinkCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, _("Forward »"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_navigateForward->Enable( false ); m_navigateForward->SetToolTip( _("To following viewed character") ); - + bSizerNavigateButtons->Add( m_navigateForward, 0, wxALL, 5 ); - - + + sbSizerPreview->Add( bSizerNavigateButtons, 0, wxALIGN_RIGHT, 5 ); - - + + bSizerRight->Add( sbSizerPreview, 70, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizerRelated; sbSizerRelated = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Re&lated") ), wxVERTICAL ); - + m_gridRelated = new wxZRColaCharGrid( sbSizerRelated->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_STATIC ); - + // Grid m_gridRelated->CreateGrid( 0, 0 ); m_gridRelated->EnableEditing( false ); m_gridRelated->EnableGridLines( false ); m_gridRelated->EnableDragGridSize( false ); m_gridRelated->SetMargins( 0, 0 ); - + // Columns m_gridRelated->EnableDragColMove( false ); m_gridRelated->EnableDragColSize( false ); m_gridRelated->SetColLabelSize( 0 ); - m_gridRelated->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRelated->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridRelated->EnableDragRowSize( false ); m_gridRelated->SetRowLabelSize( 0 ); - m_gridRelated->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRelated->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridRelated->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_gridRelated->SetToolTip( _("List of related characters") ); - + sbSizerRelated->Add( m_gridRelated, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerRight->Add( sbSizerRelated, 30, wxALL|wxEXPAND, 5 ); - - + + bSizerColumns->Add( bSizerRight, 0, wxEXPAND, 5 ); - - + + bSizerContent->Add( bSizerColumns, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerContent->Add( 5, 5, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonInsert = new wxButton( this, wxID_ANY, _("&Insert"), wxDefaultPosition, wxDefaultSize, 0 ); - + m_buttonInsert->SetDefault(); m_buttonInsert->Enable( false ); m_buttonInsert->SetToolTip( _("Insert character into decomposed text") ); - + bSizerButtons->Add( m_buttonInsert, 0, wxALL, 5 ); - - + + bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxALL, 5 ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + // Connect Events this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) ); m_search->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this ); @@ -795,52 +797,52 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase() m_gridRelated->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this ); m_buttonInsert->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnInsert ), NULL, this ); m_buttonInsert->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaCharSelectBase::OnInsertUpdateUI ), NULL, this ); - + } wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxSize( -1,-1 ) ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + m_listbook = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_DEFAULT ); m_panelLanguage = new wxPanel( m_listbook, wxID_ANY, wxDefaultPosition, wxSize( 500,-1 ), wxTAB_TRAVERSAL ); wxBoxSizer* bSizerLanguage; bSizerLanguage = new wxBoxSizer( wxVERTICAL ); - + m_langLabel = new wxStaticText( m_panelLanguage, wxID_ANY, _("Some character native to specific language you are working with should not decompose to primitives.\nFor optimal decomposition you should set the language correctly."), wxDefaultPosition, wxDefaultSize, 0 ); m_langLabel->Wrap( 490 ); bSizerLanguage->Add( m_langLabel, 0, wxALL|wxEXPAND, 5 ); - + m_langAuto = new wxRadioButton( m_panelLanguage, wxID_ANY, _("Select language &automatically according to selected keyboard"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); bSizerLanguage->Add( m_langAuto, 0, wxALL|wxEXPAND, 5 ); - + m_langManual = new wxRadioButton( m_panelLanguage, wxID_ANY, _("&Manually select the language from the list below:"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerLanguage->Add( m_langManual, 0, wxALL|wxEXPAND, 5 ); - - m_languages = new wxListBox( m_panelLanguage, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_languages = new wxListBox( m_panelLanguage, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_languages->SetMinSize( wxSize( -1,150 ) ); - + bSizerLanguage->Add( m_languages, 1, wxALL|wxEXPAND, 5 ); - - + + m_panelLanguage->SetSizer( bSizerLanguage ); m_panelLanguage->Layout(); m_listbook->AddPage( m_panelLanguage, _("Text Language"), true ); m_panelAutoStart = new wxPanel( m_listbook, wxID_ANY, wxDefaultPosition, wxSize( 500,-1 ), wxTAB_TRAVERSAL ); wxBoxSizer* bSizerAutoStart; bSizerAutoStart = new wxBoxSizer( wxVERTICAL ); - + m_autoStartLabel = new wxStaticText( m_panelAutoStart, wxID_ANY, _("ZRCola can be launched every time you log in to your computer.\nIt will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."), wxDefaultPosition, wxDefaultSize, 0 ); m_autoStartLabel->Wrap( 490 ); bSizerAutoStart->Add( m_autoStartLabel, 0, wxALL|wxEXPAND, 5 ); - + m_autoStart = new wxCheckBox( m_panelAutoStart, wxID_ANY, _("Start ZRCola &automatically on logon"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerAutoStart->Add( m_autoStart, 0, wxALL|wxEXPAND, 5 ); - - + + m_panelAutoStart->SetSizer( bSizerAutoStart ); m_panelAutoStart->Layout(); m_listbook->AddPage( m_panelAutoStart, _("Startup"), false ); @@ -853,12 +855,12 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con } m_listbookListView->SetWindowStyleFlag( m_listbookFlags ); #endif - + bSizerContent->Add( m_listbook, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, 5 ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); @@ -867,16 +869,16 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaSettingsBase::OnInitDialog ) ); m_panelLanguage->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnLanguageUpdate ), NULL, this ); @@ -891,80 +893,80 @@ wxZRColaSettingsBase::~wxZRColaSettingsBase() m_panelLanguage->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnLanguageUpdate ), NULL, this ); m_sdbSizerButtonsApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnApplyButtonClick ), NULL, this ); m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnOKButtonClick ), NULL, this ); - + } wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxSize( -1,-1 ) ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerColumns; bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); - + m_bitmapIcon = new wxStaticBitmap( this, wxID_ANY, wxIcon( wxT("00_zrcola.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32 ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerColumns->Add( m_bitmapIcon, 0, wxALL, 5 ); - + wxBoxSizer* bSizerText; bSizerText = new wxBoxSizer( wxVERTICAL ); - + m_staticTextZRCola = new wxStaticText( this, wxID_ANY, _("ZRCola"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextZRCola->Wrap( -1 ); 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 ); - + m_staticTextVersion = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextVersion->Wrap( -1 ); bSizerText->Add( m_staticTextVersion, 0, wxALL|wxEXPAND, 5 ); - + m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Program and Website Editor: Janoš Ježovnik\nDevelopment: Amebis, d. o. o., Kamnik\nTranslation into English: Janoš Ježovnik\nTranslation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\nDevelopment and maintenance of the original program (2004–2015): Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextColophone->Wrap( 400 ); bSizerText->Add( m_staticTextColophone, 0, wxALL|wxEXPAND, 5 ); - + m_staticTextCopyright = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCopyright->Wrap( -1 ); bSizerText->Add( m_staticTextCopyright, 0, wxALL|wxEXPAND, 5 ); - + m_hyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("zrcola.zrc-sazu.si"), wxT("http://zrcola.zrc-sazu.si/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); bSizerText->Add( m_hyperlink, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerText->Add( 0, 0, 0, wxALL|wxEXPAND, 5 ); - + m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDeclaration->Wrap( 400 ); 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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerText->Add( m_declaration, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerColumns->Add( bSizerText, 1, wxEXPAND, 5 ); - - + + bSizerContent->Add( bSizerColumns, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, 5 ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); } @@ -975,48 +977,48 @@ wxZRColaAboutBase::~wxZRColaAboutBase() wxZRColaUpdaterBase::wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerLog; sbSizerLog = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Log") ), wxVERTICAL ); - + m_log = new wxTextCtrl( sbSizerLog->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_log->SetMinSize( wxSize( 450,150 ) ); - + sbSizerLog->Add( m_log, 1, wxEXPAND, 5 ); - - + + bSizerContent->Add( sbSizerLog, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerContent->Add( 0, 0, 0, wxEXPAND, 5 ); - + wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonUpdate = new wxButton( this, wxID_ANY, _("Quit and &Update..."), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonUpdate->Enable( false ); m_buttonUpdate->SetToolTip( _("Exit this program and launch product update") ); - + bSizerButtons->Add( m_buttonUpdate, 0, wxALL, 5 ); - + m_buttonClose = new wxButton( this, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonClose->SetToolTip( _("Close this window") ); - + bSizerButtons->Add( m_buttonClose, 0, wxALL, 5 ); - - + + bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT, 5 ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaUpdaterBase::OnIdle ) ); m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this ); @@ -1029,23 +1031,23 @@ wxZRColaUpdaterBase::~wxZRColaUpdaterBase() this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaUpdaterBase::OnIdle ) ); m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this ); m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnClose ), NULL, this ); - + } wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerCharacter; sbSizerCharacter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Character") ), wxVERTICAL ); - + m_characterLbl = new wxStaticText( sbSizerCharacter->GetStaticBox(), wxID_ANY, _("Enter the &character you would like to request:"), wxDefaultPosition, wxDefaultSize, 0 ); m_characterLbl->Wrap( 400 ); sbSizerCharacter->Add( m_characterLbl, 0, wxALL|wxEXPAND, 5 ); - + m_character = new wxTextCtrl( sbSizerCharacter->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_character->HasFlag( wxTE_MULTILINE ) ) @@ -1057,55 +1059,55 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i #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 ); - + m_characterNote = new wxStaticText( sbSizerCharacter->GetStaticBox(), wxID_ANY, _("Please, use the decomposed form.\nYou can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."), wxDefaultPosition, wxDefaultSize, 0 ); m_characterNote->Wrap( 400 ); sbSizerCharacter->Add( m_characterNote, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerContent->Add( sbSizerCharacter, 40, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizerContext; sbSizerContext = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Context") ), wxVERTICAL ); - + m_contextLbl = new wxStaticText( sbSizerContext->GetStaticBox(), wxID_ANY, _("The &context, examples or description why and where the character is required:"), wxDefaultPosition, wxDefaultSize, 0 ); m_contextLbl->Wrap( 400 ); 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, 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 ); - - + + bSizerContent->Add( sbSizerContext, 60, wxALL|wxEXPAND, 5 ); - + m_note = new wxStaticText( this, wxID_ANY, _("After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\nYour e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."), wxDefaultPosition, wxDefaultSize, 0 ); m_note->Wrap( 400 ); bSizerContent->Add( m_note, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, 5 ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this ); } @@ -1114,105 +1116,105 @@ wxZRColaCharRequestBase::~wxZRColaCharRequestBase() { // Disconnect Events m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this ); - + } wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerTranslationSet; sbSizerTranslationSet = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Translation") ), wxVERTICAL ); - + m_transLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("ZRCola offers multiple text translations that can be arranged in a sequence.\nPlease select desired translations and the order they are applied."), wxDefaultPosition, wxDefaultSize, 0 ); m_transLbl->Wrap( 452 ); sbSizerTranslationSet->Add( m_transLbl, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizerTranslation; bSizerTranslation = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerTransAvailable; bSizerTransAvailable = new wxBoxSizer( wxVERTICAL ); - + m_availableLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("A&vailable:"), wxDefaultPosition, wxDefaultSize, 0 ); m_availableLbl->Wrap( -1 ); bSizerTransAvailable->Add( m_availableLbl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_available = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), 0, NULL, wxLB_SINGLE|wxLB_SORT ); + + m_available = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), 0, NULL, wxLB_SINGLE|wxLB_SORT ); m_available->SetMinSize( wxSize( 200,150 ) ); - + bSizerTransAvailable->Add( m_available, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerTranslation->Add( bSizerTransAvailable, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerTransSelect; bSizerTransSelect = new wxBoxSizer( wxVERTICAL ); - + m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _(">"), wxDefaultPosition, wxSize( 32,32 ), 0 ); bSizerTransSelect->Add( m_add, 0, wxALL, 5 ); - + m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("<"), wxDefaultPosition, wxSize( 32,32 ), 0 ); bSizerTransSelect->Add( m_remove, 0, wxALL, 5 ); - - + + bSizerTranslation->Add( bSizerTransSelect, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + wxBoxSizer* bSizerTransSelected; bSizerTransSelected = new wxBoxSizer( wxVERTICAL ); - + m_selectedLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("&Selected:"), wxDefaultPosition, wxDefaultSize, 0 ); m_selectedLbl->Wrap( -1 ); bSizerTransSelected->Add( m_selectedLbl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_selected = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), 0, NULL, wxLB_SINGLE ); + + m_selected = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), 0, NULL, wxLB_SINGLE ); m_selected->SetMinSize( wxSize( 200,150 ) ); - + bSizerTransSelected->Add( m_selected, 1, wxALL|wxEXPAND, 5 ); - - + + bSizerTranslation->Add( bSizerTransSelected, 1, wxEXPAND, 5 ); - - + + sbSizerTranslationSet->Add( bSizerTranslation, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerTransActiveReorder; bSizerTransActiveReorder = new wxBoxSizer( wxHORIZONTAL ); - + m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Up"), wxDefaultPosition, wxSize( 70,-1 ), 0 ); bSizerTransActiveReorder->Add( m_selectedUp, 0, wxALL, 5 ); - + m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Down"), wxDefaultPosition, wxSize( 70,-1 ), 0 ); bSizerTransActiveReorder->Add( m_selectedDown, 0, wxALL, 5 ); - - + + sbSizerTranslationSet->Add( bSizerTransActiveReorder, 0, wxALIGN_RIGHT, 5 ); - - + + bSizerContent->Add( sbSizerTranslationSet, 1, wxEXPAND|wxALL, 5 ); - - + + bSizerContent->Add( 0, 0, 0, wxEXPAND|wxALL, 5 ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, 5 ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaTranslationSeqBase::OnInitDialog ) ); this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaTranslationSeqBase::OnUpdate ) ); @@ -1241,5 +1243,5 @@ wxZRColaTranslationSeqBase::~wxZRColaTranslationSeqBase() m_selectedUp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedUp ), NULL, this ); m_selectedDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedDown ), NULL, this ); m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnOKButtonClick ), NULL, this ); - + } diff --git a/ZRCola/res/zrcolagui.h b/ZRCola/res/zrcolagui.h index 3d64b5d..8ceb50d 100644 --- a/ZRCola/res/zrcolagui.h +++ b/ZRCola/res/zrcolagui.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __ZRCOLAGUI_H__ -#define __ZRCOLAGUI_H__ +#pragma once #include #include @@ -55,10 +54,10 @@ class wxZRColaComposerPanel; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaFrameBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaFrameBase : public wxFrame +class wxZRColaFrameBase : public wxFrame { private: - + protected: enum { @@ -79,7 +78,7 @@ class wxZRColaFrameBase : public wxFrame wxID_HELP_UPDATE, wxID_COMPOSITION_TOOLBAR }; - + wxMenuBar* m_menubar; wxMenu* m_menuProgram; wxMenu* m_menuEdit; @@ -88,48 +87,48 @@ class wxZRColaFrameBase : public wxFrame wxMenu* m_menuView; wxMenu* m_menuHelp; wxAuiToolBar* m_toolbarEdit; - wxAuiToolBarItem* m_toolEditCut; - wxAuiToolBarItem* m_toolEditCopy; - wxAuiToolBarItem* m_toolEditPaste; + wxAuiToolBarItem* m_toolEditCut; + wxAuiToolBarItem* m_toolEditCopy; + wxAuiToolBarItem* m_toolEditPaste; wxAuiToolBar* m_toolbarTranslate; - wxAuiToolBarItem* m_toolCharSelect; - wxAuiToolBarItem* m_toolSendDestination; - wxAuiToolBarItem* m_toolSendSource; - wxAuiToolBarItem* m_toolComposition; + wxAuiToolBarItem* m_toolCharSelect; + wxAuiToolBarItem* m_toolSendDestination; + wxAuiToolBarItem* m_toolSendSource; + wxAuiToolBarItem* m_toolComposition; wxChoice* m_toolTranslationSeq; wxZRColaCharacterCatalogPanel* m_panelChrCat; wxStatusBar* m_statusBar; - + // Virtual event handlers, overide them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); } virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); } - - + + public: wxZRColaComposerPanel* m_panel; - + wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") ); wxAuiManager m_mgr; - + ~wxZRColaFrameBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaComposerPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaComposerPanelBase : public wxPanel +class wxZRColaComposerPanelBase : public wxPanel { private: - + protected: enum { wxID_TIMER_SAVE = 1000 }; - + wxSplitterWindow* m_splitterSource; wxPanel* m_panelSourceEdit; wxPanel* m_panelSourceHex; @@ -139,7 +138,7 @@ class wxZRColaComposerPanelBase : public wxPanel wxPanel* m_panelDestinationHex; wxTextCtrl* m_destinationHex; wxTimer m_timerSave; - + // Virtual event handlers, overide them in your derived class virtual void OnSourcePaint( wxPaintEvent& event ) { event.Skip(); } virtual void OnSourceText( wxCommandEvent& event ) { event.Skip(); } @@ -148,62 +147,62 @@ class wxZRColaComposerPanelBase : public wxPanel virtual void OnDestinationText( wxCommandEvent& event ) { event.Skip(); } virtual void OnDestinationHexPaint( wxPaintEvent& event ) { event.Skip(); } virtual void OnSaveTimer( wxTimerEvent& event ) { event.Skip(); } - - + + public: wxTextCtrl* m_source; wxTextCtrl* m_destination; - - wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") ); + + wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") ); ~wxZRColaComposerPanelBase(); - + void m_splitterSourceOnIdle( wxIdleEvent& ) { m_splitterSource->SetSashPosition( -5 ); m_splitterSource->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, this ); } - + void m_splitterDestinationOnIdle( wxIdleEvent& ) { m_splitterDestination->SetSashPosition( -5 ); m_splitterDestination->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, this ); } - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaCharacterCatalogPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaCharacterCatalogPanelBase : public wxPanel +class wxZRColaCharacterCatalogPanelBase : public wxPanel { private: - + protected: wxChoice* m_choice; wxZRColaCharGrid* m_grid; wxCheckBox* m_show_all; - + // Virtual event handlers, overide them in your derived class virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); } virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); } virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") ); + + wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") ); ~wxZRColaCharacterCatalogPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaCharSelectBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaCharSelectBase : public wxDialog +class wxZRColaCharSelectBase : public wxDialog { private: - + protected: wxSearchCtrl* m_search; wxHyperlinkCtrl* m_search_more; @@ -225,7 +224,7 @@ class wxZRColaCharSelectBase : public wxDialog wxHyperlinkCtrl* m_navigateForward; wxZRColaCharGrid* m_gridRelated; wxButton* m_buttonInsert; - + // Virtual event handlers, overide them in your derived class virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); } @@ -247,22 +246,22 @@ class wxZRColaCharSelectBase : public wxDialog virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); } virtual void OnInsert( wxCommandEvent& event ) { event.Skip(); } virtual void OnInsertUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") ); + + wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") ); ~wxZRColaCharSelectBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaSettingsBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaSettingsBase : public wxDialog +class wxZRColaSettingsBase : public wxDialog { private: - + protected: wxListbook* m_listbook; wxPanel* m_panelLanguage; @@ -277,28 +276,28 @@ class wxZRColaSettingsBase : public wxDialog wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsApply; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnLanguageUpdate( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnApplyButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") ); + + wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") ); ~wxZRColaSettingsBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaAboutBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaAboutBase : public wxDialog +class wxZRColaAboutBase : public wxDialog { private: - + protected: wxStaticBitmap* m_bitmapIcon; wxStaticText* m_staticTextZRCola; @@ -310,46 +309,46 @@ class wxZRColaAboutBase : public wxDialog wxTextCtrl* m_declaration; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; - + public: - - wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") ); + + wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") ); ~wxZRColaAboutBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaUpdaterBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaUpdaterBase : public wxDialog +class wxZRColaUpdaterBase : public wxDialog { private: - + protected: wxTextCtrl* m_log; wxButton* m_buttonUpdate; wxButton* m_buttonClose; - + // Virtual event handlers, overide them in your derived class virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); } virtual void OnClose( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") ); + + wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") ); ~wxZRColaUpdaterBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaCharRequestBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaCharRequestBase : public wxDialog +class wxZRColaCharRequestBase : public wxDialog { private: - + protected: wxStaticText* m_characterLbl; wxTextCtrl* m_character; @@ -360,25 +359,25 @@ class wxZRColaCharRequestBase : public wxDialog wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") ); + + wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") ); ~wxZRColaCharRequestBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaTranslationSeqBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaTranslationSeqBase : public wxDialog +class wxZRColaTranslationSeqBase : public wxDialog { private: - + protected: wxStaticText* m_transLbl; wxStaticText* m_availableLbl; @@ -392,7 +391,7 @@ class wxZRColaTranslationSeqBase : public wxDialog wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnUpdate( wxUpdateUIEvent& event ) { event.Skip(); } @@ -405,13 +404,12 @@ class wxZRColaTranslationSeqBase : public wxDialog virtual void OnSelectedUp( wxCommandEvent& event ) { event.Skip(); } virtual void OnSelectedDown( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaTranslationSeq") ); + + wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaTranslationSeq") ); ~wxZRColaTranslationSeqBase(); - + }; -#endif //__ZRCOLAGUI_H__ diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index e08428b..d0d4595 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -35,15 +35,15 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS this->SetSizeHints( FromDIP(wxSize( 150,150 )), wxDefaultSize ); m_mgr.SetManagedWindow(this); m_mgr.SetFlags(wxAUI_MGR_DEFAULT); - + 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"), _("Quit this program"), wxITEM_NORMAL ); m_menuProgram->Append( m_menuItemExit ); - - m_menubar->Append( m_menuProgram, _("&Program") ); - + + m_menubar->Append( m_menuProgram, _("&Program") ); + m_menuEdit = new wxMenu(); wxMenuItem* m_menuItemEditCut; m_menuItemEditCut = new wxMenuItem( m_menuEdit, wxID_CUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL ); @@ -53,7 +53,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemEditCut->SetBitmap( wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemEditCut ); - + wxMenuItem* m_menuItemEditCopy; m_menuItemEditCopy = new wxMenuItem( m_menuEdit, wxID_COPY, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -62,7 +62,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemEditCopy->SetBitmap( wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemEditCopy ); - + wxMenuItem* m_menuItemEditPaste; m_menuItemEditPaste = new wxMenuItem( m_menuEdit, wxID_PASTE, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -71,21 +71,21 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemEditPaste->SetBitmap( wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemEditPaste ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuItemSelectAll; m_menuItemSelectAll = new wxMenuItem( m_menuEdit, wxID_SELECTALL, wxString( _("Select &All") ) + wxT('\t') + wxT("Ctrl+A"), _("Select all text"), wxITEM_NORMAL ); m_menuEdit->Append( m_menuItemSelectAll ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuItemCharSelect; m_menuItemCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Toggle character search to select character to insert into text"), wxITEM_CHECK ); m_menuEdit->Append( m_menuItemCharSelect ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuItemSendDestination; m_menuItemSendDestination = new wxMenuItem( m_menuEdit, wxID_SEND_DESTINATION, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Send composed text to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -94,7 +94,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemSendDestination->SetBitmap( wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemSendDestination ); - + wxMenuItem* m_menuItemCopyDestinationAndReturn; m_menuItemCopyDestinationAndReturn = new wxMenuItem( m_menuEdit, wxID_COPY_DESTINATION_AND_RETURN, wxString( _("Copy Composed and &Return") ) + wxT('\t') + wxT("Ctrl+F5"), _("Copy composed text to clipboard and return focus to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -103,7 +103,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemCopyDestinationAndReturn->SetBitmap( wxIcon( wxT("copy_destination_and_return.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemCopyDestinationAndReturn ); - + wxMenuItem* m_menuItemSendSource; m_menuItemSendSource = new wxMenuItem( m_menuEdit, wxID_SEND_SOURCE, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Send decomposed text to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -112,7 +112,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemSendSource->SetBitmap( wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemSendSource ); - + wxMenuItem* m_menuItemCopySourceAndReturn; m_menuItemCopySourceAndReturn = new wxMenuItem( m_menuEdit, wxID_COPY_SOURCE_AND_RETURN, wxString( _("Copy Decomposed and Re&turn") ) + wxT('\t') + wxT("Ctrl+F6"), _("Copy decomposed text to clipboard and return focus to source window"), wxITEM_NORMAL ); #ifdef __WXMSW__ @@ -121,7 +121,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemCopySourceAndReturn->SetBitmap( wxIcon( wxT("copy_source_and_return.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemCopySourceAndReturn ); - + wxMenuItem* m_menuItemSendAbort; 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__ @@ -130,111 +130,111 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS m_menuItemSendAbort->SetBitmap( wxIcon( wxT("send_abort.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) ); #endif m_menuEdit->Append( m_menuItemSendAbort ); - + m_menuEdit->AppendSeparator(); - + m_menuItemComposition = new wxMenuItem( m_menuEdit, wxID_COMPOSITION_MENU, wxString( _("&ZRCola (De)composition") ) , _("Toggle ZRCola character (De)composition"), wxITEM_CHECK ); m_menuEdit->Append( m_menuItemComposition ); - + m_menuTranslationSeq = new wxMenu(); wxMenuItem* m_menuTranslationSeqItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("Tra&nslation"), wxEmptyString, wxITEM_NORMAL, m_menuTranslationSeq ); m_menuEdit->Append( m_menuTranslationSeqItem ); - + m_menuEdit->AppendSeparator(); - + wxMenuItem* m_menuSettings; m_menuSettings = new wxMenuItem( m_menuEdit, wxID_SETTINGS, wxString( _("&Settings...") ) , _("Open program configuration dialog"), wxITEM_NORMAL ); m_menuEdit->Append( m_menuSettings ); - - m_menubar->Append( m_menuEdit, _("&Edit") ); - + + m_menubar->Append( m_menuEdit, _("&Edit") ); + m_menuView = new wxMenu(); wxMenuItem* m_menuItemToolbarEdit; m_menuItemToolbarEdit = new wxMenuItem( m_menuView, wxID_TOOLBAR_EDIT, wxString( _("&Edit Toolbar") ) , _("Toggle edit toolbar"), wxITEM_CHECK ); m_menuView->Append( m_menuItemToolbarEdit ); - + wxMenuItem* m_menuItemToolbarCompose; m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK ); m_menuView->Append( m_menuItemToolbarCompose ); - + m_menuView->AppendSeparator(); - + wxMenuItem* m_menuItemPanelChrGrps; m_menuItemPanelChrGrps = new wxMenuItem( m_menuView, wxID_PANEL_CHRGRPS, wxString( _("Character Catalo&g") ) , _("Toggle character catalog panel"), wxITEM_CHECK ); m_menuView->Append( m_menuItemPanelChrGrps ); - - m_menubar->Append( m_menuView, _("&View") ); - + + m_menubar->Append( m_menuView, _("&View") ); + m_menuHelp = new wxMenu(); wxMenuItem* m_menuHelpInstructions; m_menuHelpInstructions = new wxMenuItem( m_menuHelp, wxID_HELP_INSTRUCTIONS, wxString( _("&Instructions...") ) + wxT('\t') + wxT("F1"), _("Open a web site with product instructions"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpInstructions ); - + wxMenuItem* m_menuHelpShortcuts; m_menuHelpShortcuts = new wxMenuItem( m_menuHelp, wxID_HELP_SHORTCUTS, wxString( _("Keyboard &Shortcuts...") ) , _("Open a list of keyboard shortcuts"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpShortcuts ); - + m_menuHelp->AppendSeparator(); - + wxMenuItem* m_menuHelpReqChar; m_menuHelpReqChar = new wxMenuItem( m_menuHelp, wxID_HELP_REQCHAR, wxString( _("&Request a new character...") ) , _("Submit a request to ZRC to add a new character"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpReqChar ); - + wxMenuItem* m_menuHelpUpdate; m_menuHelpUpdate = new wxMenuItem( m_menuHelp, wxID_HELP_UPDATE, wxString( _("Check for &Updates...") ) , _("Check online for product update"), wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpUpdate ); - + m_menuHelp->AppendSeparator(); - + wxMenuItem* m_menuHelpAbout; m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) , wxEmptyString, wxITEM_NORMAL ); m_menuHelp->Append( m_menuHelpAbout ); - - m_menubar->Append( m_menuHelp, _("&Help") ); - + + m_menubar->Append( m_menuHelp, _("&Help") ); + this->SetMenuBar( m_menubar ); - - m_toolbarEdit = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); - m_toolEditCut = m_toolbarEdit->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cut selection"), NULL ); - - m_toolEditCopy = m_toolbarEdit->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copy selection"), NULL ); - - m_toolEditPaste = m_toolbarEdit->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Paste selection"), NULL ); - + + m_toolbarEdit = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); + m_toolEditCut = m_toolbarEdit->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cut selection"), NULL ); + + m_toolEditCopy = m_toolbarEdit->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copy selection"), NULL ); + + m_toolEditPaste = m_toolbarEdit->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Paste selection"), NULL ); + m_toolbarEdit->Realize(); - m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() ); - - m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); - m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Find Character"), _("Toggle character search to select character to insert into text"), NULL ); - - m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); - - m_toolSendSource = m_toolbarTranslate->AddTool( wxID_SEND_SOURCE, _("Send Decomposed"), wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); - + m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() ); + + m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); + m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Find Character"), _("Toggle character search to select character to insert into text"), NULL ); + + m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); + + m_toolSendSource = m_toolbarTranslate->AddTool( wxID_SEND_SOURCE, _("Send Decomposed"), wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); + m_toolbarTranslate->AddSeparator(); - m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION_TOOLBAR, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL ); - + m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION_TOOLBAR, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL ); + wxArrayString m_toolTranslationSeqChoices; m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 250,-1 )), m_toolTranslationSeqChoices, 0 ); m_toolTranslationSeq->SetSelection( 0 ); m_toolbarTranslate->AddControl( m_toolTranslationSeq ); m_toolbarTranslate->Realize(); - m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() ); - + m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() ); + m_panelChrCat = new wxZRColaCharacterCatalogPanel( this ); - + m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize(FromDIP(wxSize( 150,200 )) ).MinSize( FromDIP(wxSize( 100,100 )) ).Layer( 1 ) ); - + m_panel = new wxZRColaComposerPanel( this ); - + m_mgr.AddPane( m_panel, wxAuiPaneInfo() .Name( wxT("composerPanel") ).Center() .Caption( _("(De)Composer") ).CaptionVisible( false ).CloseButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).Floatable( false ) ); - + m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY ); - + m_mgr.Update(); this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) ); this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) ); @@ -249,116 +249,116 @@ wxZRColaFrameBase::~wxZRColaFrameBase() this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) ); this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) ); m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this ); - + m_mgr.UnInit(); - + } wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + m_splitterSource = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE ); m_splitterSource->SetSashGravity( 1 ); m_splitterSource->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, this ); m_splitterSource->SetMinimumPaneSize( FromDIP(5) ); - + m_panelSourceEdit = new wxPanel( m_splitterSource, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerSourceEdit; bSizerSourceEdit = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerSourceEdit2; 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, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); m_source->SetMinSize( FromDIP(wxSize( 100,25 )) ); - + bSizerSourceEdit2->Add( m_source, 1, wxEXPAND, FromDIP(5) ); - - + + bSizerSourceEdit->Add( bSizerSourceEdit2, 1, wxEXPAND, FromDIP(5) ); - - + + m_panelSourceEdit->SetSizer( bSizerSourceEdit ); m_panelSourceEdit->Layout(); bSizerSourceEdit->Fit( m_panelSourceEdit ); m_panelSourceHex = new wxPanel( m_splitterSource, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerSourceHex; bSizerSourceHex = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerSourceHex2; 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(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerSourceHex2->Add( m_sourceHex, 1, wxEXPAND, FromDIP(5) ); - - + + bSizerSourceHex->Add( bSizerSourceHex2, 1, wxEXPAND, FromDIP(5) ); - - + + m_panelSourceHex->SetSizer( bSizerSourceHex ); m_panelSourceHex->Layout(); bSizerSourceHex->Fit( m_panelSourceHex ); m_splitterSource->SplitVertically( m_panelSourceEdit, m_panelSourceHex, FromDIP(-5) ); bSizerMain->Add( m_splitterSource, 50, wxALL|wxEXPAND, FromDIP(5) ); - + m_splitterDestination = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D|wxSP_LIVE_UPDATE ); m_splitterDestination->SetSashGravity( 1 ); m_splitterDestination->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, this ); m_splitterDestination->SetMinimumPaneSize( FromDIP(5) ); - + m_panelDestinationEdit = new wxPanel( m_splitterDestination, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerDestinationEdit; bSizerDestinationEdit = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerDestinationEdit2; 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, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); m_destination->SetMinSize( FromDIP(wxSize( 100,25 )) ); - + bSizerDestinationEdit2->Add( m_destination, 1, wxEXPAND, FromDIP(5) ); - - + + bSizerDestinationEdit->Add( bSizerDestinationEdit2, 1, wxEXPAND, FromDIP(5) ); - - + + m_panelDestinationEdit->SetSizer( bSizerDestinationEdit ); m_panelDestinationEdit->Layout(); bSizerDestinationEdit->Fit( m_panelDestinationEdit ); m_panelDestinationHex = new wxPanel( m_splitterDestination, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerDestinationHex; bSizerDestinationHex = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* bSizerDestinationHex2; 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(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerDestinationHex2->Add( m_destinationHex, 1, wxEXPAND, FromDIP(5) ); - - + + bSizerDestinationHex->Add( bSizerDestinationHex2, 1, wxEXPAND, FromDIP(5) ); - - + + m_panelDestinationHex->SetSizer( bSizerDestinationHex ); m_panelDestinationHex->Layout(); bSizerDestinationHex->Fit( m_panelDestinationHex ); m_splitterDestination->SplitVertically( m_panelDestinationEdit, m_panelDestinationHex, FromDIP(-5) ); bSizerMain->Add( m_splitterDestination, 50, wxALL|wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( bSizerMain ); this->Layout(); bSizerMain->Fit( this ); m_timerSave.SetOwner( this, wxID_TIMER_SAVE ); - + // Connect Events m_source->Connect( wxEVT_PAINT, wxPaintEventHandler( wxZRColaComposerPanelBase::OnSourcePaint ), NULL, this ); m_source->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaComposerPanelBase::OnSourceText ), NULL, this ); @@ -379,61 +379,61 @@ wxZRColaComposerPanelBase::~wxZRColaComposerPanelBase() m_destination->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaComposerPanelBase::OnDestinationText ), NULL, this ); m_destinationHex->Disconnect( wxEVT_PAINT, wxPaintEventHandler( wxZRColaComposerPanelBase::OnDestinationHexPaint ), NULL, this ); this->Disconnect( wxID_TIMER_SAVE, wxEVT_TIMER, wxTimerEventHandler( wxZRColaComposerPanelBase::OnSaveTimer ) ); - + } wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizer; bSizer = new wxBoxSizer( wxVERTICAL ); - + wxArrayString m_choiceChoices; m_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceChoices, 0 ); m_choice->SetSelection( 0 ); m_choice->SetToolTip( _("Select category to display") ); - + bSizer->Add( m_choice, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_grid = new wxZRColaCharGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_grid->CreateGrid( 0, 0 ); m_grid->EnableEditing( false ); m_grid->EnableGridLines( false ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); - + // Columns m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( false ); m_grid->SetColLabelSize( 0 ); - m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_grid->EnableDragRowSize( false ); m_grid->SetRowLabelSize( 0 ); - m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_grid->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_grid->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_grid->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_grid->SetMinSize( FromDIP(wxSize( 35,35 )) ); - + bSizer->Add( m_grid, 1, wxALL|wxEXPAND, FromDIP(5) ); - + m_show_all = new wxCheckBox( this, wxID_ANY, _("Show &All"), wxDefaultPosition, wxDefaultSize, 0 ); m_show_all->SetToolTip( _("Toggle display of less frequent characters") ); - + bSizer->Add( m_show_all, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( bSizer ); this->Layout(); bSizer->Fit( this ); - + // Connect Events m_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnChoice ), NULL, this ); m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this ); @@ -448,309 +448,309 @@ wxZRColaCharacterCatalogPanelBase::~wxZRColaCharacterCatalogPanelBase() m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this ); m_grid->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridKeyDown ), NULL, this ); m_show_all->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnShowAll ), NULL, this ); - + } wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerColumns; bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerLeft; bSizerLeft = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerBrowse; sbSizerBrowse = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("&Browse") ), wxVERTICAL ); - + m_search = new wxSearchCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); #ifndef __WXMAC__ m_search->ShowSearchButton( true ); #endif m_search->ShowCancelButton( true ); m_search->SetToolTip( _("Full or partial terms from Unicode character description (in English) to search for") ); - + sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_search_more = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Search Options"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_search_more->SetToolTip( _("Shows/hides additional search options") ); - + sbSizerBrowse->Add( m_search_more, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_search_panel = new wxPanel( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_search_panel->Hide(); - + wxBoxSizer* sbSizerSearch; sbSizerSearch = new wxBoxSizer( wxVERTICAL ); - + wxArrayString m_categoriesChoices; m_categories = new wxCheckListBox( m_search_panel, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( -1,60 )), m_categoriesChoices, 0 ); m_categories->SetToolTip( _("List of Unicode character categories to search in") ); - + sbSizerSearch->Add( m_categories, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerCategoriesCtrl; bSizerCategoriesCtrl = new wxBoxSizer( wxHORIZONTAL ); - + m_categoriesAll = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesAll->SetToolTip( _("Select all categories") ); - + bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, FromDIP(5) ); - + m_categoriesNone = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesNone->SetToolTip( _("Clear category selection") ); - + bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, FromDIP(5) ); - + m_categoriesInvert = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesInvert->SetToolTip( _("Invert category selection") ); - + bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, FromDIP(5) ); - - + + sbSizerSearch->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, FromDIP(5) ); - - + + m_search_panel->SetSizer( sbSizerSearch ); m_search_panel->Layout(); sbSizerSearch->Fit( m_search_panel ); sbSizerBrowse->Add( m_search_panel, 0, wxEXPAND, FromDIP(5) ); - - m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC ); - + + m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_STATIC ); + // Grid m_gridResults->CreateGrid( 0, 0 ); m_gridResults->EnableEditing( false ); m_gridResults->EnableGridLines( false ); m_gridResults->EnableDragGridSize( false ); m_gridResults->SetMargins( 0, 0 ); - + // Columns m_gridResults->EnableDragColMove( false ); m_gridResults->EnableDragColSize( false ); m_gridResults->SetColLabelSize( 0 ); - m_gridResults->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridResults->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridResults->EnableDragRowSize( false ); m_gridResults->SetRowLabelSize( 0 ); - m_gridResults->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridResults->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridResults->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridResults->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_gridResults->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_gridResults->SetToolTip( _("Character search results") ); m_gridResults->SetMinSize( FromDIP(wxSize( 560,35 )) ); m_gridResults->SetMaxSize( FromDIP(wxSize( 560,-1 )) ); - + sbSizerBrowse->Add( m_gridResults, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerLeft->Add( sbSizerBrowse, 1, wxALL|wxEXPAND, FromDIP(5) ); - + wxStaticBoxSizer* sbSizerRecent; sbSizerRecent = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Re¢ly Used") ), wxVERTICAL ); - + m_gridRecent = new wxZRColaCharGrid( sbSizerRecent->GetStaticBox(), wxID_ANY, wxDefaultPosition, FromDIP(wxSize( -1,35 )), wxBORDER_STATIC ); - + // Grid m_gridRecent->CreateGrid( 0, 0 ); m_gridRecent->EnableEditing( false ); m_gridRecent->EnableGridLines( false ); m_gridRecent->EnableDragGridSize( false ); m_gridRecent->SetMargins( 0, 0 ); - + // Columns m_gridRecent->EnableDragColMove( false ); m_gridRecent->EnableDragColSize( false ); m_gridRecent->SetColLabelSize( 0 ); - m_gridRecent->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRecent->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridRecent->EnableDragRowSize( false ); m_gridRecent->SetRowLabelSize( 0 ); - m_gridRecent->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRecent->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridRecent->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridRecent->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); 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, FromDIP(5) ); - - + + bSizerLeft->Add( sbSizerRecent, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerColumns->Add( bSizerLeft, 1, wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerRight; bSizerRight = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerPreview; sbSizerPreview = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Preview") ), wxVERTICAL ); - + wxBoxSizer* bSizerUnicode; bSizerUnicode = new wxBoxSizer( wxHORIZONTAL ); - + m_labelUnicode = new wxStaticText( sbSizerPreview->GetStaticBox(), wxID_ANY, _("U+"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelUnicode->Wrap( -1 ); bSizerUnicode->Add( m_labelUnicode, 0, wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxTOP, FromDIP(5) ); - + m_unicode = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, FromDIP(wxSize( 50,-1 )), 0 ); m_unicode->SetToolTip( _("Unicode hexadecimal code") ); - + bSizerUnicode->Add( m_unicode, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxTOP, FromDIP(5) ); - - m_shortcut = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY ); + + m_shortcut = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_CENTER ); m_shortcut->SetToolTip( _("Keyboard shortcut in Composer window") ); - + bSizerUnicode->Add( m_shortcut, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + sbSizerPreview->Add( bSizerUnicode, 0, wxEXPAND, FromDIP(5) ); - + m_gridPreview = new wxGrid( sbSizerPreview->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC ); - + // Grid m_gridPreview->CreateGrid( 1, 1 ); m_gridPreview->EnableEditing( false ); m_gridPreview->EnableGridLines( false ); m_gridPreview->EnableDragGridSize( false ); m_gridPreview->SetMargins( 0, 0 ); - + // Columns m_gridPreview->SetColSize( 0, FromDIP(200) ); m_gridPreview->EnableDragColMove( false ); m_gridPreview->EnableDragColSize( false ); m_gridPreview->SetColLabelSize( 0 ); - m_gridPreview->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridPreview->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridPreview->SetRowSize( 0, FromDIP(200) ); m_gridPreview->EnableDragRowSize( false ); m_gridPreview->SetRowLabelSize( 0 ); - m_gridPreview->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridPreview->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridPreview->SetDefaultCellFont( wxFont( 96, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridPreview->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_gridPreview->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_gridPreview->SetToolTip( _("Character preview") ); - + sbSizerPreview->Add( m_gridPreview, 0, wxALL|wxEXPAND, FromDIP(5) ); - - m_description = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY ); + + m_description = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTER ); m_description->SetToolTip( _("Unicode character description") ); - + sbSizerPreview->Add( m_description, 1, wxALL|wxEXPAND, FromDIP(5) ); - - m_tags = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY ); + + m_tags = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTER ); m_tags->SetToolTip( _("Character tags") ); - + sbSizerPreview->Add( m_tags, 1, wxALL|wxEXPAND, FromDIP(5) ); - - m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY ); + + m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_CENTER ); m_category->SetToolTip( _("Unicode character category") ); - + sbSizerPreview->Add( m_category, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerNavigateButtons; bSizerNavigateButtons = new wxBoxSizer( wxHORIZONTAL ); - + m_navigateBack = new wxHyperlinkCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, _("« Back"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_navigateBack->Enable( false ); m_navigateBack->SetToolTip( _("To previously viewed character") ); - + bSizerNavigateButtons->Add( m_navigateBack, 0, wxALL, FromDIP(5) ); - + m_navigateForward = new wxHyperlinkCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, _("Forward »"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_navigateForward->Enable( false ); m_navigateForward->SetToolTip( _("To following viewed character") ); - + bSizerNavigateButtons->Add( m_navigateForward, 0, wxALL, FromDIP(5) ); - - + + sbSizerPreview->Add( bSizerNavigateButtons, 0, wxALIGN_RIGHT, FromDIP(5) ); - - + + bSizerRight->Add( sbSizerPreview, 70, wxALL|wxEXPAND, FromDIP(5) ); - + wxStaticBoxSizer* sbSizerRelated; sbSizerRelated = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Re&lated") ), wxVERTICAL ); - - m_gridRelated = new wxZRColaCharGrid( sbSizerRelated->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_STATIC ); - + + m_gridRelated = new wxZRColaCharGrid( sbSizerRelated->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_STATIC ); + // Grid m_gridRelated->CreateGrid( 0, 0 ); m_gridRelated->EnableEditing( false ); m_gridRelated->EnableGridLines( false ); m_gridRelated->EnableDragGridSize( false ); m_gridRelated->SetMargins( 0, 0 ); - + // Columns m_gridRelated->EnableDragColMove( false ); m_gridRelated->EnableDragColSize( false ); m_gridRelated->SetColLabelSize( 0 ); - m_gridRelated->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRelated->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridRelated->EnableDragRowSize( false ); m_gridRelated->SetRowLabelSize( 0 ); - m_gridRelated->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridRelated->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridRelated->SetDefaultCellFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); - m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_gridRelated->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); m_gridRelated->SetToolTip( _("List of related characters") ); - + sbSizerRelated->Add( m_gridRelated, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerRight->Add( sbSizerRelated, 30, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerColumns->Add( bSizerRight, 0, wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( bSizerColumns, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( FromDIP(5), FromDIP(5), 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonInsert = new wxButton( this, wxID_ANY, _("&Insert"), wxDefaultPosition, wxDefaultSize, 0 ); - + m_buttonInsert->SetDefault(); m_buttonInsert->Enable( false ); m_buttonInsert->SetToolTip( _("Insert character into decomposed text") ); - + bSizerButtons->Add( m_buttonInsert, 0, wxALL, FromDIP(5) ); - - + + bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxALL, FromDIP(5) ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + // Connect Events this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) ); m_search->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this ); @@ -797,16 +797,16 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase() m_gridRelated->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this ); m_buttonInsert->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnInsert ), NULL, this ); m_buttonInsert->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaCharSelectBase::OnInsertUpdateUI ), NULL, this ); - + } wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + this->SetSizeHints( wxDefaultSize, wxSize( -1,-1 ) ); + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + m_listbook = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_DEFAULT ); wxListView *list = m_listbook->GetListView(); list->SetColumnWidth(0, FromDIP(120)); @@ -814,38 +814,38 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con m_panelLanguage = new wxPanel( m_listbook, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 500,-1 )), wxTAB_TRAVERSAL ); wxBoxSizer* bSizerLanguage; bSizerLanguage = new wxBoxSizer( wxVERTICAL ); - + m_langLabel = new wxStaticText( m_panelLanguage, wxID_ANY, _("Some character native to specific language you are working with should not decompose to primitives.\nFor optimal decomposition you should set the language correctly."), wxDefaultPosition, wxDefaultSize, 0 ); m_langLabel->Wrap( FromDIP(490) ); bSizerLanguage->Add( m_langLabel, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_langAuto = new wxRadioButton( m_panelLanguage, wxID_ANY, _("Select language &automatically according to selected keyboard"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); bSizerLanguage->Add( m_langAuto, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_langManual = new wxRadioButton( m_panelLanguage, wxID_ANY, _("&Manually select the language from the list below:"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerLanguage->Add( m_langManual, 0, wxALL|wxEXPAND, FromDIP(5) ); - - m_languages = new wxListBox( m_panelLanguage, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_languages = new wxListBox( m_panelLanguage, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_languages->SetMinSize( FromDIP(wxSize( -1,150 )) ); - + bSizerLanguage->Add( m_languages, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + m_panelLanguage->SetSizer( bSizerLanguage ); m_panelLanguage->Layout(); m_listbook->AddPage( m_panelLanguage, _("Text Language"), true ); m_panelAutoStart = new wxPanel( m_listbook, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 500,-1 )), wxTAB_TRAVERSAL ); wxBoxSizer* bSizerAutoStart; bSizerAutoStart = new wxBoxSizer( wxVERTICAL ); - + m_autoStartLabel = new wxStaticText( m_panelAutoStart, wxID_ANY, _("ZRCola can be launched every time you log in to your computer.\nIt will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."), wxDefaultPosition, wxDefaultSize, 0 ); m_autoStartLabel->Wrap( FromDIP(490) ); bSizerAutoStart->Add( m_autoStartLabel, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_autoStart = new wxCheckBox( m_panelAutoStart, wxID_ANY, _("Start ZRCola &automatically on logon"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerAutoStart->Add( m_autoStart, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + m_panelAutoStart->SetSizer( bSizerAutoStart ); m_panelAutoStart->Layout(); m_listbook->AddPage( m_panelAutoStart, _("Startup"), false ); @@ -858,12 +858,12 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con } m_listbookListView->SetWindowStyleFlag( m_listbookFlags ); #endif - + bSizerContent->Add( m_listbook, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); @@ -872,16 +872,16 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaSettingsBase::OnInitDialog ) ); m_panelLanguage->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnLanguageUpdate ), NULL, this ); @@ -896,80 +896,80 @@ wxZRColaSettingsBase::~wxZRColaSettingsBase() m_panelLanguage->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnLanguageUpdate ), NULL, this ); m_sdbSizerButtonsApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnApplyButtonClick ), NULL, this ); m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnOKButtonClick ), NULL, this ); - + } wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + this->SetSizeHints( wxDefaultSize, wxSize( -1,-1 ) ); + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerColumns; bSizerColumns = new wxBoxSizer( wxHORIZONTAL ); - + m_bitmapIcon = new wxStaticBitmap( this, wxID_ANY, wxIcon( wxT("00_zrcola.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(32), FromDIP(32) ), wxDefaultPosition, wxDefaultSize, 0 ); bSizerColumns->Add( m_bitmapIcon, 0, wxALL, FromDIP(5) ); - + wxBoxSizer* bSizerText; bSizerText = new wxBoxSizer( wxVERTICAL ); - + m_staticTextZRCola = new wxStaticText( this, wxID_ANY, _("ZRCola"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextZRCola->Wrap( -1 ); m_staticTextZRCola->SetFont( wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ) ); m_staticTextZRCola->SetMaxSize( FromDIP(wxSize( 400,-1 )) ); - + bSizerText->Add( m_staticTextZRCola, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_staticTextVersion = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextVersion->Wrap( -1 ); bSizerText->Add( m_staticTextVersion, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Program and Website Editor: Janoš Ježovnik\nDevelopment: Amebis, d. o. o., Kamnik\nTranslation into English: Janoš Ježovnik\nTranslation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\nDevelopment and maintenance of the original program (2004–2015): Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextColophone->Wrap( FromDIP(400) ); bSizerText->Add( m_staticTextColophone, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_staticTextCopyright = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCopyright->Wrap( -1 ); bSizerText->Add( m_staticTextCopyright, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_hyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("zrcola.zrc-sazu.si"), wxT("http://zrcola.zrc-sazu.si/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); bSizerText->Add( m_hyperlink, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerText->Add( 0, 0, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDeclaration->Wrap( FromDIP(400) ); bSizerText->Add( m_staticTextDeclaration, 0, wxALL|wxEXPAND, FromDIP(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, FromDIP(wxSize( -1,80 )), wxTE_MULTILINE|wxTE_READONLY ); m_declaration->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerText->Add( m_declaration, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerColumns->Add( bSizerText, 1, wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( bSizerColumns, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); } @@ -980,48 +980,48 @@ wxZRColaAboutBase::~wxZRColaAboutBase() wxZRColaUpdaterBase::wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerLog; sbSizerLog = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Log") ), wxVERTICAL ); - + m_log = new wxTextCtrl( sbSizerLog->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_log->SetMinSize( FromDIP(wxSize( 450,150 )) ); - + sbSizerLog->Add( m_log, 1, wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( sbSizerLog, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( 0, 0, 0, wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonUpdate = new wxButton( this, wxID_ANY, _("Quit and &Update..."), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonUpdate->Enable( false ); m_buttonUpdate->SetToolTip( _("Exit this program and launch product update") ); - + bSizerButtons->Add( m_buttonUpdate, 0, wxALL, FromDIP(5) ); - + m_buttonClose = new wxButton( this, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonClose->SetToolTip( _("Close this window") ); - + bSizerButtons->Add( m_buttonClose, 0, wxALL, FromDIP(5) ); - - + + bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT, FromDIP(5) ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaUpdaterBase::OnIdle ) ); m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this ); @@ -1034,23 +1034,23 @@ wxZRColaUpdaterBase::~wxZRColaUpdaterBase() this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaUpdaterBase::OnIdle ) ); m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnUpdate ), NULL, this ); m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaUpdaterBase::OnClose ), NULL, this ); - + } wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerCharacter; sbSizerCharacter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Character") ), wxVERTICAL ); - + m_characterLbl = new wxStaticText( sbSizerCharacter->GetStaticBox(), wxID_ANY, _("Enter the &character you would like to request:"), wxDefaultPosition, wxDefaultSize, 0 ); m_characterLbl->Wrap( FromDIP(400) ); sbSizerCharacter->Add( m_characterLbl, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_character = new wxTextCtrl( sbSizerCharacter->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_character->HasFlag( wxTE_MULTILINE ) ) @@ -1062,55 +1062,55 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i #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, FromDIP(5) ); - + m_characterNote = new wxStaticText( sbSizerCharacter->GetStaticBox(), wxID_ANY, _("Please, use the decomposed form.\nYou can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."), wxDefaultPosition, wxDefaultSize, 0 ); m_characterNote->Wrap( FromDIP(400) ); sbSizerCharacter->Add( m_characterNote, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( sbSizerCharacter, 40, wxALL|wxEXPAND, FromDIP(5) ); - + wxStaticBoxSizer* sbSizerContext; sbSizerContext = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Context") ), wxVERTICAL ); - + m_contextLbl = new wxStaticText( sbSizerContext->GetStaticBox(), wxID_ANY, _("The &context, examples or description why and where the character is required:"), wxDefaultPosition, wxDefaultSize, 0 ); m_contextLbl->Wrap( FromDIP(400) ); sbSizerContext->Add( m_contextLbl, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_context = new wxTextCtrl( sbSizerContext->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); 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, FromDIP(5) ); - - + + bSizerContent->Add( sbSizerContext, 60, wxALL|wxEXPAND, FromDIP(5) ); - + m_note = new wxStaticText( this, wxID_ANY, _("After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\nYour e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."), wxDefaultPosition, wxDefaultSize, 0 ); m_note->Wrap( FromDIP(400) ); bSizerContent->Add( m_note, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerContent->Add( 0, 0, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this ); } @@ -1119,105 +1119,105 @@ wxZRColaCharRequestBase::~wxZRColaCharRequestBase() { // Disconnect Events m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this ); - + } wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxDialog( parent, id, title, pos, size, style, name ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerContent; bSizerContent = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizerTranslationSet; sbSizerTranslationSet = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Translation") ), wxVERTICAL ); - + m_transLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("ZRCola offers multiple text translations that can be arranged in a sequence.\nPlease select desired translations and the order they are applied."), wxDefaultPosition, wxDefaultSize, 0 ); m_transLbl->Wrap( FromDIP(452) ); sbSizerTranslationSet->Add( m_transLbl, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerTranslation; bSizerTranslation = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerTransAvailable; bSizerTransAvailable = new wxBoxSizer( wxVERTICAL ); - + m_availableLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("A&vailable:"), wxDefaultPosition, wxDefaultSize, 0 ); m_availableLbl->Wrap( -1 ); bSizerTransAvailable->Add( m_availableLbl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, FromDIP(5) ); - + m_available = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 200,-1 )), 0, NULL, wxLB_SINGLE|wxLB_SORT ); m_available->SetMinSize( FromDIP(wxSize( 200,150 )) ); - + bSizerTransAvailable->Add( m_available, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerTranslation->Add( bSizerTransAvailable, 1, wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerTransSelect; bSizerTransSelect = new wxBoxSizer( wxVERTICAL ); - + m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _(">"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 ); bSizerTransSelect->Add( m_add, 0, wxALL, FromDIP(5) ); - + m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("<"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 ); bSizerTransSelect->Add( m_remove, 0, wxALL, FromDIP(5) ); - - + + bSizerTranslation->Add( bSizerTransSelect, 0, wxALIGN_CENTER_VERTICAL, FromDIP(5) ); - + wxBoxSizer* bSizerTransSelected; bSizerTransSelected = new wxBoxSizer( wxVERTICAL ); - + m_selectedLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("&Selected:"), wxDefaultPosition, wxDefaultSize, 0 ); m_selectedLbl->Wrap( -1 ); bSizerTransSelected->Add( m_selectedLbl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, FromDIP(5) ); - + m_selected = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 200,-1 )), 0, NULL, wxLB_SINGLE ); m_selected->SetMinSize( FromDIP(wxSize( 200,150 )) ); - + bSizerTransSelected->Add( m_selected, 1, wxALL|wxEXPAND, FromDIP(5) ); - - + + bSizerTranslation->Add( bSizerTransSelected, 1, wxEXPAND, FromDIP(5) ); - - + + sbSizerTranslationSet->Add( bSizerTranslation, 1, wxEXPAND, FromDIP(5) ); - + wxBoxSizer* bSizerTransActiveReorder; bSizerTransActiveReorder = new wxBoxSizer( wxHORIZONTAL ); - + m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Up"), wxDefaultPosition, FromDIP(wxSize( 70,-1 )), 0 ); bSizerTransActiveReorder->Add( m_selectedUp, 0, wxALL, FromDIP(5) ); - + m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Down"), wxDefaultPosition, FromDIP(wxSize( 70,-1 )), 0 ); bSizerTransActiveReorder->Add( m_selectedDown, 0, wxALL, FromDIP(5) ); - - + + sbSizerTranslationSet->Add( bSizerTransActiveReorder, 0, wxALIGN_RIGHT, FromDIP(5) ); - - + + bSizerContent->Add( sbSizerTranslationSet, 1, wxEXPAND|wxALL, FromDIP(5) ); - - + + bSizerContent->Add( 0, 0, 0, wxEXPAND|wxALL, FromDIP(5) ); - + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bSizerContent->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + this->SetSizer( bSizerContent ); this->Layout(); bSizerContent->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaTranslationSeqBase::OnInitDialog ) ); this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaTranslationSeqBase::OnUpdate ) ); @@ -1246,5 +1246,5 @@ wxZRColaTranslationSeqBase::~wxZRColaTranslationSeqBase() m_selectedUp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedUp ), NULL, this ); m_selectedDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedDown ), NULL, this ); m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnOKButtonClick ), NULL, this ); - + } diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h index 8a84d84..83c096d 100644 --- a/ZRCola/zrcolagui.h +++ b/ZRCola/zrcolagui.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __ZRCOLAGUI_H__ -#define __ZRCOLAGUI_H__ +#pragma once #include #include @@ -55,10 +54,10 @@ class wxZRColaComposerPanel; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaFrameBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaFrameBase : public wxFrame +class wxZRColaFrameBase : public wxFrame { private: - + protected: enum { @@ -79,7 +78,7 @@ class wxZRColaFrameBase : public wxFrame wxID_HELP_UPDATE, wxID_COMPOSITION_TOOLBAR }; - + wxMenuBar* m_menubar; wxMenu* m_menuProgram; wxMenu* m_menuEdit; @@ -88,48 +87,48 @@ class wxZRColaFrameBase : public wxFrame wxMenu* m_menuView; wxMenu* m_menuHelp; wxAuiToolBar* m_toolbarEdit; - wxAuiToolBarItem* m_toolEditCut; - wxAuiToolBarItem* m_toolEditCopy; - wxAuiToolBarItem* m_toolEditPaste; + wxAuiToolBarItem* m_toolEditCut; + wxAuiToolBarItem* m_toolEditCopy; + wxAuiToolBarItem* m_toolEditPaste; wxAuiToolBar* m_toolbarTranslate; - wxAuiToolBarItem* m_toolCharSelect; - wxAuiToolBarItem* m_toolSendDestination; - wxAuiToolBarItem* m_toolSendSource; - wxAuiToolBarItem* m_toolComposition; + wxAuiToolBarItem* m_toolCharSelect; + wxAuiToolBarItem* m_toolSendDestination; + wxAuiToolBarItem* m_toolSendSource; + wxAuiToolBarItem* m_toolComposition; wxChoice* m_toolTranslationSeq; wxZRColaCharacterCatalogPanel* m_panelChrCat; wxStatusBar* m_statusBar; - + // Virtual event handlers, overide them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); } virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); } - - + + public: wxZRColaComposerPanel* m_panel; - + wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") ); wxAuiManager m_mgr; - + ~wxZRColaFrameBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaComposerPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaComposerPanelBase : public wxPanel +class wxZRColaComposerPanelBase : public wxPanel { private: - + protected: enum { wxID_TIMER_SAVE = 1000 }; - + wxSplitterWindow* m_splitterSource; wxPanel* m_panelSourceEdit; wxPanel* m_panelSourceHex; @@ -139,7 +138,7 @@ class wxZRColaComposerPanelBase : public wxPanel wxPanel* m_panelDestinationHex; wxTextCtrl* m_destinationHex; wxTimer m_timerSave; - + // Virtual event handlers, overide them in your derived class virtual void OnSourcePaint( wxPaintEvent& event ) { event.Skip(); } virtual void OnSourceText( wxCommandEvent& event ) { event.Skip(); } @@ -148,62 +147,62 @@ class wxZRColaComposerPanelBase : public wxPanel virtual void OnDestinationText( wxCommandEvent& event ) { event.Skip(); } virtual void OnDestinationHexPaint( wxPaintEvent& event ) { event.Skip(); } virtual void OnSaveTimer( wxTimerEvent& event ) { event.Skip(); } - - + + public: wxTextCtrl* m_source; wxTextCtrl* m_destination; - - wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") ); + + wxZRColaComposerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaComposerPanel") ); ~wxZRColaComposerPanelBase(); - + void m_splitterSourceOnIdle( wxIdleEvent& ) { m_splitterSource->SetSashPosition( FromDIP(-5) ); m_splitterSource->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterSourceOnIdle ), NULL, this ); } - + void m_splitterDestinationOnIdle( wxIdleEvent& ) { m_splitterDestination->SetSashPosition( FromDIP(-5) ); m_splitterDestination->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaComposerPanelBase::m_splitterDestinationOnIdle ), NULL, this ); } - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaCharacterCatalogPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaCharacterCatalogPanelBase : public wxPanel +class wxZRColaCharacterCatalogPanelBase : public wxPanel { private: - + protected: wxChoice* m_choice; wxZRColaCharGrid* m_grid; wxCheckBox* m_show_all; - + // Virtual event handlers, overide them in your derived class virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); } virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); } virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") ); + + wxZRColaCharacterCatalogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("ZRColaCharacterCatalog") ); ~wxZRColaCharacterCatalogPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaCharSelectBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaCharSelectBase : public wxDialog +class wxZRColaCharSelectBase : public wxDialog { private: - + protected: wxSearchCtrl* m_search; wxHyperlinkCtrl* m_search_more; @@ -225,7 +224,7 @@ class wxZRColaCharSelectBase : public wxDialog wxHyperlinkCtrl* m_navigateForward; wxZRColaCharGrid* m_gridRelated; wxButton* m_buttonInsert; - + // Virtual event handlers, overide them in your derived class virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); } @@ -247,22 +246,22 @@ class wxZRColaCharSelectBase : public wxDialog virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); } virtual void OnInsert( wxCommandEvent& event ) { event.Skip(); } virtual void OnInsertUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") ); + + wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Character Search"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharSelect") ); ~wxZRColaCharSelectBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaSettingsBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaSettingsBase : public wxDialog +class wxZRColaSettingsBase : public wxDialog { private: - + protected: wxListbook* m_listbook; wxPanel* m_panelLanguage; @@ -277,28 +276,28 @@ class wxZRColaSettingsBase : public wxDialog wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsApply; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnLanguageUpdate( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnApplyButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") ); + + wxZRColaSettingsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaSettings") ); ~wxZRColaSettingsBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaAboutBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaAboutBase : public wxDialog +class wxZRColaAboutBase : public wxDialog { private: - + protected: wxStaticBitmap* m_bitmapIcon; wxStaticText* m_staticTextZRCola; @@ -310,46 +309,46 @@ class wxZRColaAboutBase : public wxDialog wxTextCtrl* m_declaration; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; - + public: - - wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") ); + + wxZRColaAboutBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaAbout") ); ~wxZRColaAboutBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaUpdaterBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaUpdaterBase : public wxDialog +class wxZRColaUpdaterBase : public wxDialog { private: - + protected: wxTextCtrl* m_log; wxButton* m_buttonUpdate; wxButton* m_buttonClose; - + // Virtual event handlers, overide them in your derived class virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnUpdate( wxCommandEvent& event ) { event.Skip(); } virtual void OnClose( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") ); + + wxZRColaUpdaterBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Product Update"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaUpdater") ); ~wxZRColaUpdaterBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaCharRequestBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaCharRequestBase : public wxDialog +class wxZRColaCharRequestBase : public wxDialog { private: - + protected: wxStaticText* m_characterLbl; wxTextCtrl* m_character; @@ -360,25 +359,25 @@ class wxZRColaCharRequestBase : public wxDialog wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") ); + + wxZRColaCharRequestBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Request a New Character"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaCharRequest") ); ~wxZRColaCharRequestBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxZRColaTranslationSeqBase /////////////////////////////////////////////////////////////////////////////// -class wxZRColaTranslationSeqBase : public wxDialog +class wxZRColaTranslationSeqBase : public wxDialog { private: - + protected: wxStaticText* m_transLbl; wxStaticText* m_availableLbl; @@ -392,7 +391,7 @@ class wxZRColaTranslationSeqBase : public wxDialog wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnUpdate( wxUpdateUIEvent& event ) { event.Skip(); } @@ -405,13 +404,12 @@ class wxZRColaTranslationSeqBase : public wxDialog virtual void OnSelectedUp( wxCommandEvent& event ) { event.Skip(); } virtual void OnSelectedDown( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaTranslationSeq") ); + + wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxT("ZRColaTranslationSeq") ); ~wxZRColaTranslationSeqBase(); - + }; -#endif //__ZRCOLAGUI_H__