Cunston control element button implementation

1 files changed, 45 insertions, 32 deletions

diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp
index f576467..e0f7d8b 100644
--- a/Project/ControlEditorBase.cpp
+++ b/Project/ControlEditorBase.cpp
@@ -23,54 +23,64 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt
         bBitmapLoaded = true;
     }
     
-    wxBoxSizer* boxSizer3 = new wxBoxSizer(wxHORIZONTAL);
-    this->SetSizer(boxSizer3);
+    m_toolbarMain = this->CreateToolBar(wxTB_TEXT|wxTB_FLAT, wxID_ANY);
+    m_toolbarMain->SetToolBitmapSize(wxSize(32,32));
     
-    m_splitter157 = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxSP_3D);
-    m_splitter157->SetSashGravity(0.2);
-    m_splitter157->SetMinimumPaneSize(10);
+    m_toolbarMain->AddTool(wxID_ANY, _("New"), wxXmlResource::Get()->LoadBitmap(wxT("new32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    boxSizer3->Add(m_splitter157, 1, wxEXPAND, WXC_FROM_DIP(5));
+    m_toolbarMain->AddTool(wxID_ANY, _("Import"), wxXmlResource::Get()->LoadBitmap(wxT("imp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    m_splitterPage163 = new wxPanel(m_splitter157, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitter157, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+    m_toolbarMain->AddTool(wxID_ANY, _("Export"), wxXmlResource::Get()->LoadBitmap(wxT("exp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    wxBoxSizer* boxSizer169 = new wxBoxSizer(wxHORIZONTAL);
-    m_splitterPage163->SetSizer(boxSizer169);
+    m_toolbarMain->AddSeparator();
     
-    m_scrollWin201 = new wxScrolledWindow(m_splitterPage163, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitterPage163, wxSize(-1,-1)), wxBORDER_SIMPLE|wxHSCROLL|wxVSCROLL);
-    m_scrollWin201->SetScrollRate(5, 5);
+    m_toolbarMain->AddTool(wxID_ANY, _("Copy"), wxXmlResource::Get()->LoadBitmap(wxT("copy32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    boxSizer169->Add(m_scrollWin201, 1, wxEXPAND, WXC_FROM_DIP(5));
+    m_toolbarMain->AddTool(wxID_ANY, _("Paste"), wxXmlResource::Get()->LoadBitmap(wxT("paste32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    wxBoxSizer* boxSizer203 = new wxBoxSizer(wxHORIZONTAL);
-    m_scrollWin201->SetSizer(boxSizer203);
+    m_toolbarMain->AddTool(wxID_ANY, _("Undo"), wxXmlResource::Get()->LoadBitmap(wxT("undo32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    m_bmpButton19934 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW);
-    m_bmpButton19934->SetDefault();
-    boxSizer203->Add(m_bmpButton19934, 0, wxALL, WXC_FROM_DIP(5));
+    m_toolbarMain->AddTool(wxID_ANY, _("Redo"), wxXmlResource::Get()->LoadBitmap(wxT("redo32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    m_bmpButton1993 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW);
-    m_bmpButton1993->SetDefault();
-    boxSizer203->Add(m_bmpButton1993, 0, wxALL, WXC_FROM_DIP(5));
+    m_toolbarMain->AddSeparator();
     
-    m_bmpButton199 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW);
-    m_bmpButton199->SetDefault();
-    boxSizer203->Add(m_bmpButton199, 0, wxALL, WXC_FROM_DIP(5));
+    m_toolbarMain->AddTool(wxID_ANY, _("Drag"), wxXmlResource::Get()->LoadBitmap(wxT("drag32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    m_splitterPage175 = new wxPanel(m_splitter157, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitter157, wxSize(-1,-1)), wxTAB_TRAVERSAL);
-    m_splitter157->SplitVertically(m_splitterPage163, m_splitterPage175, 0);
+    m_toolbarMain->AddTool(wxID_ANY, _("Move"), wxXmlResource::Get()->LoadBitmap(wxT("move32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
     
-    wxBoxSizer* boxSizer177 = new wxBoxSizer(wxVERTICAL);
-    m_splitterPage175->SetSizer(boxSizer177);
+    m_toolbarMain->AddTool(wxID_ANY, _("Delete"), wxXmlResource::Get()->LoadBitmap(wxT("delete32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL);
+    m_toolbarMain->Realize();
     
-    int *m_glCanvas147Attr = NULL;
-    m_glCanvas147 = new wxGLCanvas(m_splitterPage175, wxID_ANY, m_glCanvas147Attr, wxDefaultPosition, wxDLG_UNIT(m_splitterPage175, wxSize(-1,-1)), wxBORDER_SIMPLE);
-    wxDELETEA( m_glCanvas147Attr );
+    m_auimgr = new wxAuiManager;
+    m_auimgr->SetManagedWindow( this );
+    m_auimgr->SetFlags( wxAUI_MGR_LIVE_RESIZE|wxAUI_MGR_TRANSPARENT_HINT|wxAUI_MGR_TRANSPARENT_DRAG|wxAUI_MGR_ALLOW_ACTIVE_PANE|wxAUI_MGR_ALLOW_FLOATING);
+    m_auimgr->GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, wxAUI_GRADIENT_NONE);
     
-    boxSizer177->Add(m_glCanvas147, 1, wxEXPAND, WXC_FROM_DIP(5));
+    m_panelControlElements = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+    m_panelControlElements->SetBackgroundColour(wxColour(wxT("rgb(255,255,255)")));
+    
+    m_auimgr->AddPane(m_panelControlElements, wxAuiPaneInfo().Caption(_("Control elements")).Direction(wxAUI_DOCK_LEFT).Layer(0).Row(0).Position(0).BestSize(200,200).MinSize(200,200).MaxSize(200,200).CaptionVisible(true).MaximizeButton(false).CloseButton(false).MinimizeButton(false).PinButton(false));
+    
+    m_panelWorkspace = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL);
+    
+    m_auimgr->AddPane(m_panelWorkspace, wxAuiPaneInfo().Direction(wxAUI_DOCK_CENTER).Layer(0).Row(0).Position(0).BestSize(100,100).MinSize(100,100).MaxSize(100,100).Fixed().CaptionVisible(false).MaximizeButton(false).CloseButton(false).MinimizeButton(false).PinButton(false));
+    m_auimgr->Update();
+    
+    wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxVERTICAL);
+    m_panelWorkspace->SetSizer(boxSizerLvl2_1);
+    
+    int *m_glCanvasAttr = NULL;
+    m_glCanvas = new wxGLCanvas(m_panelWorkspace, wxID_ANY, m_glCanvasAttr, wxDefaultPosition, wxDLG_UNIT(m_panelWorkspace, wxSize(-1,-1)), 0);
+    wxDELETEA( m_glCanvasAttr );
+    
+    boxSizerLvl2_1->Add(m_glCanvas, 1, wxEXPAND, WXC_FROM_DIP(5));
+    
+    m_statusBarMain = new wxStatusBar(this, wxID_ANY, wxSTB_DEFAULT_STYLE);
+    m_statusBarMain->SetFieldsCount(1);
+    this->SetStatusBar(m_statusBarMain);
     
     SetName(wxT("ControlEditorBase"));
-    SetSize(500,300);
+    SetSize(800,600);
     if (GetSizer()) {
          GetSizer()->Fit(this);
     }
@@ -90,4 +100,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt
 
 ControlEditorBase::~ControlEditorBase()
 {
+    m_auimgr->UnInit();
+    delete m_auimgr;
+
 }