Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

GUI edit boxes labeled now

Browse Source
This commit is contained in:
Simon Rozman 2016-04-23 22:16:03 +02:00
parent 7807e8a918
commit a1a1852552
3 changed files with 461 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
ZRCola/ZRCola.fbp
View File

@ -26,7 +26,7 @@
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Frame" expanded="1"> <object class="Frame" expanded="0">
<property name="aui_managed">0</property> <property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property> <property name="bg"></property>
@ -88,7 +88,7 @@
<event name="OnSetFocus"></event> <event name="OnSetFocus"></event>
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxMenuBar" expanded="1"> <object class="wxMenuBar" expanded="0">
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
@ -133,11 +133,11 @@
<event name="OnSetFocus"></event> <event name="OnSetFocus"></event>
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxMenu" expanded="1"> <object class="wxMenu" expanded="0">
<property name="label">&amp;Program</property> <property name="label">&amp;Program</property>
<property name="name">m_menuProgram</property> <property name="name">m_menuProgram</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -153,11 +153,11 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="wxMenu" expanded="1"> <object class="wxMenu" expanded="0">
<property name="label">&amp;Edit</property> <property name="label">&amp;Edit</property>
<property name="name">m_menuEdit</property> <property name="name">m_menuEdit</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap">Load From Icon Resource; edit_cut.ico; [16; 16]</property> <property name="bitmap">Load From Icon Resource; edit_cut.ico; [16; 16]</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -172,7 +172,7 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap">Load From Icon Resource; edit_copy.ico; [16; 16]</property> <property name="bitmap">Load From Icon Resource; edit_copy.ico; [16; 16]</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -187,7 +187,7 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap">Load From Icon Resource; edit_paste.ico; [16; 16]</property> <property name="bitmap">Load From Icon Resource; edit_paste.ico; [16; 16]</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -202,11 +202,11 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="separator" expanded="1"> <object class="separator" expanded="0">
<property name="name">m_separatorEdit1</property> <property name="name">m_separatorEdit1</property>
<property name="permission">none</property> <property name="permission">none</property>
</object> </object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -221,11 +221,11 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="separator" expanded="1"> <object class="separator" expanded="0">
<property name="name">m_separatorEdit2</property> <property name="name">m_separatorEdit2</property>
<property name="permission">none</property> <property name="permission">none</property>
</object> </object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap">Load From Icon Resource; send_composed.ico; [16; 16]</property> <property name="bitmap">Load From Icon Resource; send_composed.ico; [16; 16]</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -240,7 +240,7 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap">Load From Icon Resource; send_decomposed.ico; [16; 16]</property> <property name="bitmap">Load From Icon Resource; send_decomposed.ico; [16; 16]</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -255,7 +255,7 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap">Load From Icon Resource; send_abort.ico; [16; 16]</property> <property name="bitmap">Load From Icon Resource; send_abort.ico; [16; 16]</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -270,18 +270,18 @@
<event name="OnMenuSelection"></event> <event name="OnMenuSelection"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="submenu" expanded="1"> <object class="submenu" expanded="0">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">&amp;Language</property> <property name="label">&amp;Language</property>
<property name="name">m_menuDecompLanguage</property> <property name="name">m_menuDecompLanguage</property>
<property name="permission">protected</property> <property name="permission">protected</property>
</object> </object>
</object> </object>
<object class="wxMenu" expanded="1"> <object class="wxMenu" expanded="0">
<property name="label">&amp;Help</property> <property name="label">&amp;Help</property>
<property name="name">m_menuHelp</property> <property name="name">m_menuHelp</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<object class="wxMenuItem" expanded="1"> <object class="wxMenuItem" expanded="0">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="enabled">1</property> <property name="enabled">1</property>
@ -298,7 +298,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="wxToolBar" expanded="1"> <object class="wxToolBar" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -377,7 +377,7 @@
<event name="OnSetFocus"></event> <event name="OnSetFocus"></event>
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="tool" expanded="1"> <object class="tool" expanded="0">
<property name="bitmap">Load From Icon Resource; edit_cut.ico; [24; 24]</property> <property name="bitmap">Load From Icon Resource; edit_cut.ico; [24; 24]</property>
<property name="context_menu">0</property> <property name="context_menu">0</property>
<property name="id">wxID_CUT</property> <property name="id">wxID_CUT</property>
@ -398,7 +398,7 @@
<event name="OnToolRClicked"></event> <event name="OnToolRClicked"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="tool" expanded="1"> <object class="tool" expanded="0">
<property name="bitmap">Load From Icon Resource; edit_copy.ico; [24; 24]</property> <property name="bitmap">Load From Icon Resource; edit_copy.ico; [24; 24]</property>
<property name="context_menu">0</property> <property name="context_menu">0</property>
<property name="id">wxID_COPY</property> <property name="id">wxID_COPY</property>
@ -419,7 +419,7 @@
<event name="OnToolRClicked"></event> <event name="OnToolRClicked"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="tool" expanded="1"> <object class="tool" expanded="0">
<property name="bitmap">Load From Icon Resource; edit_paste.ico; [24; 24]</property> <property name="bitmap">Load From Icon Resource; edit_paste.ico; [24; 24]</property>
<property name="context_menu">0</property> <property name="context_menu">0</property>
<property name="id">wxID_PASTE</property> <property name="id">wxID_PASTE</property>
@ -440,10 +440,10 @@
<event name="OnToolRClicked"></event> <event name="OnToolRClicked"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="toolSeparator" expanded="1"> <object class="toolSeparator" expanded="0">
<property name="permission">protected</property> <property name="permission">protected</property>
</object> </object>
<object class="tool" expanded="1"> <object class="tool" expanded="0">
<property name="bitmap">Load From Icon Resource; send_composed.ico; [24; 24]</property> <property name="bitmap">Load From Icon Resource; send_composed.ico; [24; 24]</property>
<property name="context_menu">0</property> <property name="context_menu">0</property>
<property name="id">wxID_SEND_COMPOSED</property> <property name="id">wxID_SEND_COMPOSED</property>
@ -464,7 +464,7 @@
<event name="OnToolRClicked"></event> <event name="OnToolRClicked"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="tool" expanded="1"> <object class="tool" expanded="0">
<property name="bitmap">Load From Icon Resource; send_decomposed.ico; [24; 24]</property> <property name="bitmap">Load From Icon Resource; send_decomposed.ico; [24; 24]</property>
<property name="context_menu">0</property> <property name="context_menu">0</property>
<property name="id">wxID_SEND_DECOMPOSED</property> <property name="id">wxID_SEND_DECOMPOSED</property>
@ -485,7 +485,7 @@
<event name="OnToolRClicked"></event> <event name="OnToolRClicked"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -563,7 +563,7 @@
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
<object class="wxChoice" expanded="1"> <object class="wxChoice" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -652,11 +652,11 @@
<property name="name">bSizerMain</property> <property name="name">bSizerMain</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">100</property> <property name="proportion">100</property>
<object class="CustomControl" expanded="1"> <object class="CustomControl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -738,7 +738,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="wxStatusBar" expanded="1"> <object class="wxStatusBar" expanded="0">
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
@ -785,7 +785,7 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="Panel" expanded="1"> <object class="Panel" expanded="0">
<property name="aui_managed">0</property> <property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property> <property name="bg"></property>
@ -842,11 +842,11 @@
<property name="name">bSizerMain</property> <property name="name">bSizerMain</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">50</property> <property name="proportion">50</property>
<object class="wxSplitterWindow" expanded="1"> <object class="wxSplitterWindow" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -1012,8 +1012,20 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">50</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
<property name="label">Decomposed Text</property>
<property name="minimum_size"></property>
<property name="name">bSizerDecomposedEdit2</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0"> <object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
@ -1104,6 +1116,8 @@
</object> </object>
</object> </object>
</object> </object>
</object>
</object>
<object class="splitteritem" expanded="0"> <object class="splitteritem" expanded="0">
<object class="wxPanel" expanded="0"> <object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1186,8 +1200,20 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">50</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
<property name="label">Decomposed Unicode Dump</property>
<property name="minimum_size"></property>
<property name="name">bSizerDecomposedHex2</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0"> <object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
@ -1280,11 +1306,13 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> </object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">50</property> <property name="proportion">50</property>
<object class="wxSplitterWindow" expanded="1"> <object class="wxSplitterWindow" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -1450,8 +1478,20 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">50</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
<property name="label">Composed Text</property>
<property name="minimum_size"></property>
<property name="name">bSizerComposedEdit2</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0"> <object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
@ -1542,6 +1582,8 @@
</object> </object>
</object> </object>
</object> </object>
</object>
</object>
<object class="splitteritem" expanded="0"> <object class="splitteritem" expanded="0">
<object class="wxPanel" expanded="0"> <object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1624,8 +1666,20 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">50</property> <property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
<property name="label">Composed Unicode Dump</property>
<property name="minimum_size"></property>
<property name="name">bSizerComposedHex2</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0"> <object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
@ -1721,4 +1775,6 @@
</object> </object>
</object> </object>
</object> </object>
</object>
</object>
</wxFormBuilder_Project> </wxFormBuilder_Project>

40
ZRCola/zrcolagui.cpp
View File

@ -174,11 +174,17 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
wxBoxSizer* bSizerDecomposedEdit; wxBoxSizer* bSizerDecomposedEdit;
bSizerDecomposedEdit = new wxBoxSizer( wxVERTICAL ); 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->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
m_decomposed->SetMinSize( wxSize( 100,25 ) ); 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 ); m_panelDecomposedEdit->SetSizer( bSizerDecomposedEdit );
@ -188,10 +194,16 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
wxBoxSizer* bSizerDecomposedHex; wxBoxSizer* bSizerDecomposedHex;
bSizerDecomposedHex = new wxBoxSizer( wxVERTICAL ); 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 ) ); 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 ); m_panelDecomposedHex->SetSizer( bSizerDecomposedHex );
@ -209,11 +221,17 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
wxBoxSizer* bSizerComposedEdit; wxBoxSizer* bSizerComposedEdit;
bSizerComposedEdit = new wxBoxSizer( wxVERTICAL ); 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->SetFont( wxFont( 20, 70, 90, 90, false, wxT("00 ZRCola") ) );
m_composed->SetMinSize( wxSize( 100,25 ) ); 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 ); m_panelComposedEdit->SetSizer( bSizerComposedEdit );
@ -223,10 +241,16 @@ wxZRColaComposerPanelBase::wxZRColaComposerPanelBase( wxWindow* parent, wxWindow
wxBoxSizer* bSizerComposedHex; wxBoxSizer* bSizerComposedHex;
bSizerComposedHex = new wxBoxSizer( wxVERTICAL ); 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 ) ); 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 ); m_panelComposedHex->SetSizer( bSizerComposedHex );

1
ZRCola/zrcolagui.h
View File

@ -29,6 +29,7 @@
#include <wx/statusbr.h> #include <wx/statusbr.h>
#include <wx/frame.h> #include <wx/frame.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/statbox.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/splitter.h> #include <wx/splitter.h>