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

AUI initial organization fixed

Browse Source
This commit is contained in:
Simon Rozman 2016-05-05 08:15:54 +02:00
parent 3b6eff0b44
commit 1a6dc8b723
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ZRCola/ZRCola.fbp
View File

@ -376,10 +376,10 @@
<property name="LeftDockable">0</property> <property name="LeftDockable">0</property>
<property name="RightDockable">0</property> <property name="RightDockable">0</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_layer">0</property> <property name="aui_layer">1</property>
<property name="aui_name">toolbarEdit</property> <property name="aui_name">toolbarEdit</property>
<property name="aui_position"></property> <property name="aui_position"></property>
<property name="aui_row">1</property> <property name="aui_row">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmapsize">-1,-1</property> <property name="bitmapsize">-1,-1</property>
@ -522,10 +522,10 @@
<property name="LeftDockable">0</property> <property name="LeftDockable">0</property>
<property name="RightDockable">0</property> <property name="RightDockable">0</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_layer">0</property> <property name="aui_layer">1</property>
<property name="aui_name">toolbarCompose</property> <property name="aui_name">toolbarCompose</property>
<property name="aui_position"></property> <property name="aui_position"></property>
<property name="aui_row">1</property> <property name="aui_row">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmapsize">-1,-1</property> <property name="bitmapsize">-1,-1</property>

4
ZRCola/zrcolagui.cpp
View File

@ -145,7 +145,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
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_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_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( 1 ).Layer( 0 ).ToolbarPane() ); 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_toolbarCompose = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); m_toolbarCompose = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
m_toolSendComposed = m_toolbarCompose->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); m_toolSendComposed = m_toolbarCompose->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL );
@ -159,7 +159,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
m_toolDecompLanguage->SetSelection( 0 ); m_toolDecompLanguage->SetSelection( 0 );
m_toolbarCompose->AddControl( m_toolDecompLanguage ); m_toolbarCompose->AddControl( m_toolDecompLanguage );
m_toolbarCompose->Realize(); m_toolbarCompose->Realize();
m_mgr.AddPane( m_toolbarCompose, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 1 ).Layer( 0 ).ToolbarPane() ); m_mgr.AddPane( m_toolbarCompose, 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_panel = new wxZRColaComposerPanel( this ); m_panel = new wxZRColaComposerPanel( this );