X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..c6aabd1ca9a5590d5dd8e89d83a5fba74c69c931:/samples/dataview/dataview.cpp diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 692d94eb2d..8bba91a876 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -28,6 +28,7 @@ #include "wx/datetime.h" #include "wx/splitter.h" #include "wx/aboutdlg.h" +#include "wx/colordlg.h" #include "wx/choicdlg.h" #include "wx/numdlg.h" #include "wx/spinctrl.h" @@ -73,6 +74,8 @@ public: public: // event handlers void OnStyleChange(wxCommandEvent& event); + void OnSetBackgroundColour(wxCommandEvent& event); + void OnSetForegroundColour(wxCommandEvent& event); void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); @@ -88,6 +91,11 @@ public: // event handlers void OnPrependList(wxCommandEvent& event); void OnDeleteList(wxCommandEvent& event); + // Fourth page. + void OnDeleteTreeItem(wxCommandEvent& event); + void OnDeleteAllTreeItems(wxCommandEvent& event); + void OnAddTreeItem(wxCommandEvent& event); + void OnAddTreeContainerItem(wxCommandEvent& event); void OnValueChanged( wxDataViewEvent &event ); @@ -103,6 +111,7 @@ public: // event handlers void OnEditingDone( wxDataViewEvent &event ); void OnHeaderClick( wxDataViewEvent &event ); + void OnAttrHeaderClick( wxDataViewEvent &event ); void OnHeaderRightClick( wxDataViewEvent &event ); void OnSorted( wxDataViewEvent &event ); @@ -111,6 +120,8 @@ public: // event handlers void OnRightClick( wxMouseEvent &event ); void OnGoto( wxCommandEvent &event); void OnAddMany( wxCommandEvent &event); + void OnHideAttributes( wxCommandEvent &event); + void OnShowAttributes( wxCommandEvent &event); void OnBeginDrag( wxDataViewEvent &event ); void OnDropPossible( wxDataViewEvent &event ); @@ -131,6 +142,7 @@ private: // other data: wxDataViewColumn* m_col; + wxDataViewColumn* m_attributes; wxTextCtrl* m_log; wxLog *m_logOld; @@ -147,15 +159,25 @@ private: class MyCustomRenderer: public wxDataViewCustomRenderer { public: - MyCustomRenderer( wxDataViewCellMode mode, int alignment ) : - wxDataViewCustomRenderer( wxString("long"), mode, alignment ) - { m_height = 25; } + MyCustomRenderer() + : wxDataViewCustomRenderer("string", + wxDATAVIEW_CELL_ACTIVATABLE, + wxALIGN_CENTER) + { } - virtual bool Render( wxRect rect, wxDC *dc, int WXUNUSED(state) ) + virtual bool Render( wxRect rect, wxDC *dc, int state ) { - dc->SetBrush( *wxRED_BRUSH ); + dc->SetBrush( *wxLIGHT_GREY_BRUSH ); dc->SetPen( *wxTRANSPARENT_PEN ); - dc->DrawRectangle( rect.Deflate(2) ); + + rect.Deflate(2); + dc->DrawRoundedRectangle( rect, 5 ); + + RenderText(m_value, + 0, // no offset + wxRect(dc->GetTextExtent(m_value)).CentreIn(rect), + dc, + state); return true; } @@ -179,20 +201,19 @@ public: virtual wxSize GetSize() const { - //return wxSize(60,m_height); return wxSize(60,20); } virtual bool SetValue( const wxVariant &value ) { - m_height = value; + m_value = value.GetString(); return true; } virtual bool GetValue( wxVariant &WXUNUSED(value) ) const { return true; } private: - long m_height; + wxString m_value; }; @@ -227,6 +248,8 @@ bool MyApp::OnInit() enum { ID_CLEARLOG = wxID_HIGHEST+1, + ID_BACKGROUND_COLOUR, + ID_FOREGROUND_COLOUR, ID_STYLE_MENU, // file menu @@ -245,6 +268,7 @@ enum // control IDs ID_MUSIC_CTRL = 50, + ID_ATTR_CTRL = 51, ID_ADD_MOZART = 100, ID_DELETE_MUSIC = 101, @@ -256,7 +280,15 @@ enum ID_PREPEND_LIST = 200, ID_DELETE_LIST = 201, ID_GOTO = 202, - ID_ADD_MANY = 203 + ID_ADD_MANY = 203, + ID_HIDE_ATTRIBUTES = 204, + ID_SHOW_ATTRIBUTES = 205, + + // Fourth page. + ID_DELETE_TREE_ITEM = 400, + ID_DELETE_ALL_TREE_ITEMS = 401, + ID_ADD_TREE_ITEM = 402, + ID_ADD_TREE_CONTAINER_ITEM = 403 }; BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -265,6 +297,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU( ID_ABOUT, MyFrame::OnAbout ) EVT_MENU( ID_CLEARLOG, MyFrame::OnClearLog ) + EVT_MENU( ID_FOREGROUND_COLOUR, MyFrame::OnSetForegroundColour ) + EVT_MENU( ID_BACKGROUND_COLOUR, MyFrame::OnSetBackgroundColour ) + EVT_NOTEBOOK_PAGE_CHANGED( wxID_ANY, MyFrame::OnPageChanged ) EVT_BUTTON( ID_ADD_MOZART, MyFrame::OnAddMozart ) @@ -278,6 +313,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList ) EVT_BUTTON( ID_GOTO, MyFrame::OnGoto) EVT_BUTTON( ID_ADD_MANY, MyFrame::OnAddMany) + EVT_BUTTON( ID_HIDE_ATTRIBUTES, MyFrame::OnHideAttributes) + EVT_BUTTON( ID_SHOW_ATTRIBUTES, MyFrame::OnShowAttributes) + // Fourth page. + EVT_BUTTON( ID_DELETE_TREE_ITEM, MyFrame::OnDeleteTreeItem ) + EVT_BUTTON( ID_DELETE_ALL_TREE_ITEMS, MyFrame::OnDeleteAllTreeItems ) + EVT_BUTTON( ID_ADD_TREE_ITEM, MyFrame::OnAddTreeItem ) + EVT_BUTTON( ID_ADD_TREE_CONTAINER_ITEM, MyFrame::OnAddTreeContainerItem ) EVT_DATAVIEW_ITEM_VALUE_CHANGED( ID_MUSIC_CTRL, MyFrame::OnValueChanged ) @@ -303,6 +345,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_DATAVIEW_ITEM_DROP( ID_MUSIC_CTRL, MyFrame::OnDrop ) EVT_RIGHT_UP(MyFrame::OnRightClick) + + EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick) + END_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h): @@ -330,7 +375,9 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int style_menu->AppendCheckItem(ID_VERT_RULES, "Display vertical rules"); wxMenu *file_menu = new wxMenu; - file_menu->Append(ID_CLEARLOG, "Clear log"); + file_menu->Append(ID_CLEARLOG, "&Clear log\tCtrl-L"); + file_menu->Append(ID_FOREGROUND_COLOUR, "Set &foreground colour...\tCtrl-S"); + file_menu->Append(ID_BACKGROUND_COLOUR, "Set &background colour...\tCtrl-B"); file_menu->Append(ID_STYLE_MENU, "&Style", style_menu); file_menu->AppendSeparator(); file_menu->Append(ID_EXIT, "E&xit"); @@ -381,10 +428,12 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int BuildDataViewCtrl(secondPanel, 1); // sets m_ctrl[1] wxBoxSizer *button_sizer2 = new wxBoxSizer( wxHORIZONTAL ); - button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,"Prepend"), 0, wxALL, 10 ); - button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 ); - button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, "Goto 50"), 0, wxALL, 10 ); - button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, "Add 1000"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_PREPEND_LIST,"Prepend"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_DELETE_LIST, "Delete selected"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_GOTO, "Goto 50"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY, "Add 1000"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_HIDE_ATTRIBUTES, "Hide attributes"), 0, wxALL, 10 ); + button_sizer2->Add( new wxButton( secondPanel, ID_SHOW_ATTRIBUTES, "Show attributes"), 0, wxALL, 10 ); wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL ); secondPanelSz->Add(m_ctrl[1], 1, wxGROW|wxALL, 5); @@ -410,9 +459,16 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int wxPanel *fourthPanel = new wxPanel( m_notebook, wxID_ANY ); BuildDataViewCtrl(fourthPanel, 3); // sets m_ctrl[3] + // Buttons + wxBoxSizer *button_sizer4 = new wxBoxSizer( wxHORIZONTAL ); + button_sizer4->Add( new wxButton( fourthPanel, ID_DELETE_TREE_ITEM, "Delete Selected"), 0, wxALL, 10 ); + button_sizer4->Add( new wxButton( fourthPanel, ID_DELETE_ALL_TREE_ITEMS, "Delete All"), 0, wxALL, 10 ); + button_sizer4->Add( new wxButton( fourthPanel, ID_ADD_TREE_ITEM, "Add Item"), 0, wxALL, 10 ); + button_sizer4->Add( new wxButton( fourthPanel, ID_ADD_TREE_CONTAINER_ITEM, "Add Container"), 0, wxALL, 10 ); wxSizer *fourthPanelSz = new wxBoxSizer( wxVERTICAL ); fourthPanelSz->Add(m_ctrl[3], 1, wxGROW|wxALL, 5); + fourthPanelSz->Add(button_sizer4); fourthPanel->SetSizerAndFit(fourthPanelSz); @@ -513,7 +569,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l // column 5 of the view control: - MyCustomRenderer *cr = new MyCustomRenderer( wxDATAVIEW_CELL_ACTIVATABLE, wxALIGN_RIGHT ); + MyCustomRenderer *cr = new MyCustomRenderer; wxDataViewColumn *column5 = new wxDataViewColumn( "custom", cr, 5, -1, wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE ); @@ -528,22 +584,34 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l case 1: { wxASSERT(!m_ctrl[1] && !m_list_model); - m_ctrl[1] = new wxDataViewCtrl( parent, wxID_ANY, wxDefaultPosition, + m_ctrl[1] = new wxDataViewCtrl( parent, ID_ATTR_CTRL, wxDefaultPosition, wxDefaultSize, style ); m_list_model = new MyListModel; m_ctrl[1]->AssociateModel( m_list_model.get() ); // the various columns -#if 1 - m_ctrl[1]->AppendTextColumn("editable string", 0, wxDATAVIEW_CELL_EDITABLE, 120); - m_ctrl[1]->AppendIconTextColumn(wxIcon(wx_small_xpm), 1, wxDATAVIEW_CELL_INERT )->SetTitle( "icon"); -#else - m_ctrl[1]->AppendTextColumn("editable string", 0, wxDATAVIEW_CELL_EDITABLE); - m_ctrl[1]->AppendIconTextColumn("icon", 1, wxDATAVIEW_CELL_INERT); -#endif + m_ctrl[1]->AppendTextColumn("editable string", + MyListModel::Col_EditableText, + wxDATAVIEW_CELL_EDITABLE); + m_ctrl[1]->AppendIconTextColumn("icon", + MyListModel::Col_IconText, + wxDATAVIEW_CELL_EDITABLE); + + m_attributes = + new wxDataViewColumn("attributes", + new wxDataViewTextRenderer, + MyListModel::Col_TextWithAttr, + 80, + wxALIGN_RIGHT, + wxDATAVIEW_COL_REORDERABLE | wxDATAVIEW_COL_RESIZABLE ); + m_ctrl[1]->AppendColumn( m_attributes ); + m_ctrl[1]->AppendColumn( - new wxDataViewColumn("attributes", new wxDataViewTextRendererAttr, 2 )); + new wxDataViewColumn("custom renderer", + new MyCustomRenderer, + MyListModel::Col_Custom) + ); } break; @@ -577,7 +645,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l wxASSERT(!m_ctrl[3]); wxDataViewTreeCtrl* tc = new wxDataViewTreeCtrl( parent, wxID_ANY, wxDefaultPosition, - wxDefaultSize, style ); + wxDefaultSize, style | wxDV_NO_HEADER ); m_ctrl[3] = tc; wxImageList *ilist = new wxImageList( 16, 16 ); @@ -611,6 +679,28 @@ void MyFrame::OnClearLog( wxCommandEvent& WXUNUSED(event) ) m_log->Clear(); } +void MyFrame::OnSetForegroundColour(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewCtrl * const dvc = m_ctrl[m_notebook->GetSelection()]; + wxColour col = wxGetColourFromUser(this, dvc->GetForegroundColour()); + if ( col.IsOk() ) + { + dvc->SetForegroundColour(col); + Refresh(); + } +} + +void MyFrame::OnSetBackgroundColour(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewCtrl * const dvc = m_ctrl[m_notebook->GetSelection()]; + wxColour col = wxGetColourFromUser(this, dvc->GetBackgroundColour()); + if ( col.IsOk() ) + { + dvc->SetBackgroundColour(col); + Refresh(); + } +} + void MyFrame::OnPageChanged( wxBookCtrlEvent& WXUNUSED(event) ) { unsigned int nPanel = m_notebook->GetSelection(); @@ -806,8 +896,9 @@ void MyFrame::OnValueChanged( wxDataViewEvent &event ) if (!m_log) return; - wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %d; Column: %d", - event.GetItem().GetID(), event.GetColumn() ); + wxString title = m_music_model->GetTitle( event.GetItem() ); + wxLogMessage( "wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, Item Id: %s; Column: %d", + title, event.GetColumn() ); } void MyFrame::OnActivated( wxDataViewEvent &event ) @@ -924,6 +1015,21 @@ void MyFrame::OnContextMenu( wxDataViewEvent &event ) m_ctrl[0]->PopupMenu(&menu); } +void MyFrame::OnAttrHeaderClick( wxDataViewEvent &event ) +{ + // we need to skip the event to let the default behaviour of sorting by + // this column when it is clicked to take place + event.Skip(); + + if (!m_log) + return; + + int pos = m_ctrl[1]->GetColumnPosition( event.GetDataViewColumn() ); + + wxLogMessage( "wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, Column position: %d", pos ); + wxLogMessage( "Column title: %s Column width: %d", event.GetDataViewColumn()->GetTitle(), event.GetDataViewColumn()->GetWidth() ); +} + void MyFrame::OnHeaderClick( wxDataViewEvent &event ) { // we need to skip the event to let the default behaviour of sorting by @@ -997,3 +1103,49 @@ void MyFrame::OnAddMany(wxCommandEvent& WXUNUSED(event)) m_list_model->AddMany(); } +void MyFrame::OnHideAttributes(wxCommandEvent& WXUNUSED(event)) +{ + m_attributes->SetHidden(true); +} + +void MyFrame::OnShowAttributes(wxCommandEvent& WXUNUSED(event)) +{ + m_attributes->SetHidden(false); +} + +// ---------------------------------------------------------------------------- +// MyFrame - event handlers for the fourth page +// ---------------------------------------------------------------------------- + +void MyFrame::OnDeleteTreeItem(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; + wxDataViewItem selected = ctrl->GetSelection(); + if (!selected.IsOk()) + return; + + ctrl->DeleteItem(selected); +} + +void MyFrame::OnDeleteAllTreeItems(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; + ctrl->DeleteAllItems(); +} + +void MyFrame::OnAddTreeItem(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; + wxDataViewItem selected = ctrl->GetSelection(); + if (ctrl->IsContainer(selected)) + ctrl->AppendItem( selected, "Item", 0 ); +} + +void MyFrame::OnAddTreeContainerItem(wxCommandEvent& WXUNUSED(event)) +{ + wxDataViewTreeCtrl* ctrl = (wxDataViewTreeCtrl*) m_ctrl[3]; + wxDataViewItem selected = ctrl->GetSelection(); + if (ctrl->IsContainer(selected)) + ctrl->AppendContainer(selected, "Container", 0 ); +} +