From a1a1852552cc119d1d8ff6d576237caa5f0a26b8 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Sat, 23 Apr 2016 22:16:03 +0200 Subject: [PATCH] GUI edit boxes labeled now --- ZRCola/ZRCola.fbp | 800 +++++++++++++++++++++++-------------------- ZRCola/zrcolagui.cpp | 40 ++- ZRCola/zrcolagui.h | 1 + 3 files changed, 461 insertions(+), 380 deletions(-) diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp index 421997c..e714be4 100644 --- a/ZRCola/ZRCola.fbp +++ b/ZRCola/ZRCola.fbp @@ -26,7 +26,7 @@ UI 1 0 - + 0 wxAUI_MGR_DEFAULT @@ -88,7 +88,7 @@ - + 1 @@ -133,11 +133,11 @@ - + &Program m_menuProgram protected - + 0 1 @@ -153,11 +153,11 @@ - + &Edit m_menuEdit protected - + Load From Icon Resource; edit_cut.ico; [16; 16] 0 1 @@ -172,7 +172,7 @@ - + Load From Icon Resource; edit_copy.ico; [16; 16] 0 1 @@ -187,7 +187,7 @@ - + Load From Icon Resource; edit_paste.ico; [16; 16] 0 1 @@ -202,11 +202,11 @@ - + m_separatorEdit1 none - + 0 1 @@ -221,11 +221,11 @@ - + m_separatorEdit2 none - + Load From Icon Resource; send_composed.ico; [16; 16] 0 1 @@ -240,7 +240,7 @@ - + Load From Icon Resource; send_decomposed.ico; [16; 16] 0 1 @@ -255,7 +255,7 @@ - + Load From Icon Resource; send_abort.ico; [16; 16] 0 1 @@ -270,18 +270,18 @@ - + &Language m_menuDecompLanguage protected - + &Help m_menuHelp protected - + 0 1 @@ -298,7 +298,7 @@ - + 1 1 1 @@ -377,7 +377,7 @@ - + Load From Icon Resource; edit_cut.ico; [24; 24] 0 wxID_CUT @@ -398,7 +398,7 @@ - + Load From Icon Resource; edit_copy.ico; [24; 24] 0 wxID_COPY @@ -419,7 +419,7 @@ - + Load From Icon Resource; edit_paste.ico; [24; 24] 0 wxID_PASTE @@ -440,10 +440,10 @@ - + protected - + Load From Icon Resource; send_composed.ico; [24; 24] 0 wxID_SEND_COMPOSED @@ -464,7 +464,7 @@ - + Load From Icon Resource; send_decomposed.ico; [24; 24] 0 wxID_SEND_DECOMPOSED @@ -485,7 +485,7 @@ - + 1 1 1 @@ -563,7 +563,7 @@ - + 1 1 1 @@ -652,11 +652,11 @@ bSizerMain wxVERTICAL none - + 5 wxEXPAND 100 - + 1 1 1 @@ -738,7 +738,7 @@ - + 1 @@ -785,7 +785,7 @@ - + 0 wxAUI_MGR_DEFAULT @@ -842,11 +842,11 @@ bSizerMain wxVERTICAL none - + 5 wxALL|wxEXPAND 50 - + 1 1 1 @@ -1012,93 +1012,107 @@ none 5 - wxALL|wxEXPAND - 50 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - 00 ZRCola,90,90,20,70,0 - 0 - 0 + wxEXPAND + 1 + wxID_ANY - - 0 - - - - 0 - 100,25 - 1 - m_decomposed - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_MULTILINE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - OnDecomposedPaint - - - - - - OnDecomposedText - - - + Decomposed Text + + bSizerDecomposedEdit2 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + 00 ZRCola,90,90,20,70,0 + 0 + 0 + wxID_ANY + + 0 + + + + 0 + 100,25 + 1 + m_decomposed + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + OnDecomposedPaint + + + + + + OnDecomposedText + + + + + + @@ -1186,93 +1200,107 @@ none 5 - wxALL|wxEXPAND - 50 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,-1,76,0 - 0 - 0 + wxEXPAND + 1 + wxID_ANY - - 0 - - - - 0 + Decomposed Unicode Dump - 1 - m_decomposedHex - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_MULTILINE|wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - OnDecomposedHexPaint - - - - - - - - - + bSizerDecomposedHex2 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,-1,76,0 + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_decomposedHex + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE|wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + OnDecomposedHexPaint + + + + + + + + + + + + @@ -1280,11 +1308,11 @@ - + 5 wxALL|wxEXPAND 50 - + 1 1 1 @@ -1450,93 +1478,107 @@ none 5 - wxALL|wxEXPAND - 50 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - 00 ZRCola,90,90,20,70,0 - 0 - 0 + wxEXPAND + 1 + wxID_ANY - - 0 - - - - 0 - 100,25 - 1 - m_composed - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_MULTILINE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - OnComposedPaint - - - - - - OnComposedText - - - + Composed Text + + bSizerComposedEdit2 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + 00 ZRCola,90,90,20,70,0 + 0 + 0 + wxID_ANY + + 0 + + + + 0 + 100,25 + 1 + m_composed + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + OnComposedPaint + + + + + + OnComposedText + + + + + + @@ -1624,93 +1666,107 @@ none 5 - wxALL|wxEXPAND - 50 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,-1,76,0 - 0 - 0 + wxEXPAND + 1 + wxID_ANY - - 0 - - - - 0 + Composed Unicode Dump - 1 - m_composedHex - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_MULTILINE|wxTE_READONLY - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - OnComposedHexPaint - - - - - - - - - + bSizerComposedHex2 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,-1,76,0 + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_composedHex + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_MULTILINE|wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + OnComposedHexPaint + + + + + + + + + + + + diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index d19b575..af7196e 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -174,11 +174,17 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow wxBoxSizer* bSizerDecomposedEdit; bSizerDecomposedEdit = new wxBoxSizer( wxVERTICAL ); - m_decomposed = new wxTextCtrl( m_panelDecomposedEdit, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); + wxStaticBoxSizer* bSizerDecomposedEdit2; + bSizerDecomposedEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDecomposedEdit, wxID_ANY, _("Decomposed Text") ), wxVERTICAL ); + + m_decomposed = new wxTextCtrl( bSizerDecomposedEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_decomposed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); m_decomposed->SetMinSize( wxSize( 100,25 ) ); - bSizerDecomposedEdit->Add( m_decomposed, 50, wxALL|wxEXPAND, 5 ); + bSizerDecomposedEdit2->Add( m_decomposed, 1, wxEXPAND, 5 ); + + + bSizerDecomposedEdit->Add( bSizerDecomposedEdit2, 1, wxEXPAND, 5 ); m_panelDecomposedEdit->SetSizer( bSizerDecomposedEdit ); @@ -188,10 +194,16 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow wxBoxSizer* bSizerDecomposedHex; bSizerDecomposedHex = new wxBoxSizer( wxVERTICAL ); - m_decomposedHex = new wxTextCtrl( m_panelDecomposedHex, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); + wxStaticBoxSizer* bSizerDecomposedHex2; + bSizerDecomposedHex2 = new wxStaticBoxSizer( new wxStaticBox( m_panelDecomposedHex, wxID_ANY, _("Decomposed Unicode Dump") ), wxVERTICAL ); + + m_decomposedHex = new wxTextCtrl( bSizerDecomposedHex2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_decomposedHex->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) ); - bSizerDecomposedHex->Add( m_decomposedHex, 50, wxALL|wxEXPAND, 5 ); + bSizerDecomposedHex2->Add( m_decomposedHex, 1, wxEXPAND, 5 ); + + + bSizerDecomposedHex->Add( bSizerDecomposedHex2, 1, wxEXPAND, 5 ); m_panelDecomposedHex->SetSizer( bSizerDecomposedHex ); @@ -209,11 +221,17 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow wxBoxSizer* bSizerComposedEdit; bSizerComposedEdit = new wxBoxSizer( wxVERTICAL ); - m_composed = new wxTextCtrl( m_panelComposedEdit, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); + wxStaticBoxSizer* bSizerComposedEdit2; + bSizerComposedEdit2 = new wxStaticBoxSizer( new wxStaticBox( m_panelComposedEdit, wxID_ANY, _("Composed Text") ), wxVERTICAL ); + + m_composed = new wxTextCtrl( bSizerComposedEdit2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_composed->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) ); m_composed->SetMinSize( wxSize( 100,25 ) ); - bSizerComposedEdit->Add( m_composed, 50, wxALL|wxEXPAND, 5 ); + bSizerComposedEdit2->Add( m_composed, 1, wxEXPAND, 5 ); + + + bSizerComposedEdit->Add( bSizerComposedEdit2, 1, wxEXPAND, 5 ); m_panelComposedEdit->SetSizer( bSizerComposedEdit ); @@ -223,10 +241,16 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow wxBoxSizer* bSizerComposedHex; bSizerComposedHex = new wxBoxSizer( wxVERTICAL ); - m_composedHex = new wxTextCtrl( m_panelComposedHex, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); + wxStaticBoxSizer* bSizerComposedHex2; + bSizerComposedHex2 = new wxStaticBoxSizer( new wxStaticBox( m_panelComposedHex, wxID_ANY, _("Composed Unicode Dump") ), wxVERTICAL ); + + m_composedHex = new wxTextCtrl( bSizerComposedHex2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_composedHex->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) ); - bSizerComposedHex->Add( m_composedHex, 50, wxALL|wxEXPAND, 5 ); + bSizerComposedHex2->Add( m_composedHex, 1, wxEXPAND, 5 ); + + + bSizerComposedHex->Add( bSizerComposedHex2, 1, wxEXPAND, 5 ); m_panelComposedHex->SetSizer( bSizerComposedHex ); diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h index 343cb18..7f583e3 100644 --- a/ZRCola/zrcolagui.h +++ b/ZRCola/zrcolagui.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include