X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3603e5658fbd0693f71bbe62ed0239b4f96fd4e0..4ff56dd15287c27a545a3da710cdb890288ddcce:/samples/ribbon/ribbondemo.cpp diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp index 95b7a9dd2b..546838ebf0 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -72,9 +72,26 @@ public: ID_POSITION_LEFT, ID_POSITION_LEFT_LABELS, ID_POSITION_LEFT_BOTH, - ID_TOGGLE_PANELS + ID_TOGGLE_PANELS, + ID_ENABLE, + ID_DISABLE, + ID_DISABLED, + ID_UI_ENABLE_UPDATED, + ID_CHECK, + ID_UI_CHECK_UPDATED, + ID_CHANGE_TEXT1, + ID_CHANGE_TEXT2, + ID_UI_CHANGE_TEXT_UPDATED }; + void OnEnableUpdateUI(wxUpdateUIEvent& evt); + void OnCheckUpdateUI(wxUpdateUIEvent& evt); + void OnChangeTextUpdateUI(wxUpdateUIEvent& evt); + void OnCheck(wxRibbonButtonBarEvent& evt); + void OnEnable(wxRibbonButtonBarEvent& evt); + void OnDisable(wxRibbonButtonBarEvent& evt); + void OnChangeText1(wxRibbonButtonBarEvent& evt); + void OnChangeText2(wxRibbonButtonBarEvent& evt); void OnCircleButton(wxRibbonButtonBarEvent& evt); void OnCrossButton(wxRibbonButtonBarEvent& evt); void OnTriangleButton(wxRibbonButtonBarEvent& evt); @@ -91,6 +108,8 @@ public: void OnDefaultProvider(wxRibbonButtonBarEvent& evt); void OnAUIProvider(wxRibbonButtonBarEvent& evt); void OnMSWProvider(wxRibbonButtonBarEvent& evt); + void OnJustify(wxRibbonToolBarEvent& evt); + void OnJustifyUpdateUI(wxUpdateUIEvent& evt); void OnNew(wxRibbonToolBarEvent& evt); void OnNewDropdown(wxRibbonToolBarEvent& evt); void OnPrint(wxRibbonToolBarEvent& evt); @@ -133,6 +152,9 @@ protected: wxColour m_default_secondary; wxColour m_default_tertiary; wxMemoryDC m_bitmap_creation_dc; + bool m_bEnabled; + bool m_bChecked; + wxString m_new_text; DECLARE_EVENT_TABLE() }; @@ -151,6 +173,14 @@ bool MyApp::OnInit() } BEGIN_EVENT_TABLE(MyFrame, wxFrame) +EVT_RIBBONBUTTONBAR_CLICKED(ID_ENABLE, MyFrame::OnEnable) +EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLE, MyFrame::OnDisable) +EVT_UPDATE_UI(ID_UI_ENABLE_UPDATED, MyFrame::OnEnableUpdateUI) +EVT_RIBBONBUTTONBAR_CLICKED(ID_CHECK, MyFrame::OnCheck) +EVT_UPDATE_UI(ID_UI_CHECK_UPDATED, MyFrame::OnCheckUpdateUI) +EVT_RIBBONBUTTONBAR_CLICKED(ID_CHANGE_TEXT1, MyFrame::OnChangeText1) +EVT_RIBBONBUTTONBAR_CLICKED(ID_CHANGE_TEXT2, MyFrame::OnChangeText2) +EVT_UPDATE_UI(ID_UI_CHANGE_TEXT_UPDATED, MyFrame::OnChangeTextUpdateUI) EVT_RIBBONBUTTONBAR_CLICKED(ID_DEFAULT_PROVIDER, MyFrame::OnDefaultProvider) EVT_RIBBONBUTTONBAR_CLICKED(ID_AUI_PROVIDER, MyFrame::OnAUIProvider) EVT_RIBBONBUTTONBAR_CLICKED(ID_MSW_PROVIDER, MyFrame::OnMSWProvider) @@ -167,6 +197,12 @@ EVT_RIBBONGALLERY_HOVER_CHANGED(ID_PRIMARY_COLOUR, MyFrame::OnHoveredColourChang EVT_RIBBONGALLERY_HOVER_CHANGED(ID_SECONDARY_COLOUR, MyFrame::OnHoveredColourChange) EVT_RIBBONGALLERY_SELECTED(ID_PRIMARY_COLOUR, MyFrame::OnPrimaryColourSelect) EVT_RIBBONGALLERY_SELECTED(ID_SECONDARY_COLOUR, MyFrame::OnSecondaryColourSelect) +EVT_RIBBONTOOLBAR_CLICKED(wxID_JUSTIFY_LEFT, MyFrame::OnJustify) +EVT_RIBBONTOOLBAR_CLICKED(wxID_JUSTIFY_CENTER, MyFrame::OnJustify) +EVT_RIBBONTOOLBAR_CLICKED(wxID_JUSTIFY_RIGHT, MyFrame::OnJustify) +EVT_UPDATE_UI(wxID_JUSTIFY_LEFT, MyFrame::OnJustifyUpdateUI) +EVT_UPDATE_UI(wxID_JUSTIFY_CENTER, MyFrame::OnJustifyUpdateUI) +EVT_UPDATE_UI(wxID_JUSTIFY_RIGHT, MyFrame::OnJustifyUpdateUI) EVT_RIBBONTOOLBAR_CLICKED(wxID_NEW, MyFrame::OnNew) EVT_RIBBONTOOLBAR_DROPDOWN_CLICKED(wxID_NEW, MyFrame::OnNewDropdown) EVT_RIBBONTOOLBAR_CLICKED(wxID_PRINT, MyFrame::OnPrint) @@ -222,14 +258,17 @@ MyFrame::MyFrame() wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxRIBBON_PANEL_NO_AUTO_MINIMISE); wxRibbonToolBar *toolbar = new wxRibbonToolBar(toolbar_panel, ID_MAIN_TOOLBAR); - toolbar->AddTool(wxID_ANY, align_left_xpm); - toolbar->AddTool(wxID_ANY, align_center_xpm); - toolbar->AddTool(wxID_ANY, align_right_xpm); + toolbar->AddToggleTool(wxID_JUSTIFY_LEFT, align_left_xpm); + toolbar->AddToggleTool(wxID_JUSTIFY_CENTER , align_center_xpm); + toolbar->AddToggleTool(wxID_JUSTIFY_RIGHT, align_right_xpm); toolbar->AddSeparator(); toolbar->AddHybridTool(wxID_NEW, wxArtProvider::GetBitmap(wxART_NEW, wxART_OTHER, wxSize(16, 15))); - toolbar->AddTool(wxID_ANY, wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_OTHER, wxSize(16, 15))); - toolbar->AddTool(wxID_ANY, wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_OTHER, wxSize(16, 15))); - toolbar->AddTool(wxID_ANY, wxArtProvider::GetBitmap(wxART_FILE_SAVE_AS, wxART_OTHER, wxSize(16, 15))); + toolbar->AddTool(wxID_OPEN, wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_OTHER, wxSize(16, 15)), "Open something"); + toolbar->AddTool(wxID_SAVE, wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_OTHER, wxSize(16, 15)), "Save something"); + toolbar->AddTool(wxID_SAVEAS, wxArtProvider::GetBitmap(wxART_FILE_SAVE_AS, wxART_OTHER, wxSize(16, 15)), "Save something as ..."); + toolbar->EnableTool(wxID_OPEN, false); + toolbar->EnableTool(wxID_SAVE, false); + toolbar->EnableTool(wxID_SAVEAS, false); toolbar->AddSeparator(); toolbar->AddDropdownTool(wxID_UNDO, wxArtProvider::GetBitmap(wxART_UNDO, wxART_OTHER, wxSize(16, 15))); toolbar->AddDropdownTool(wxID_REDO, wxArtProvider::GetBitmap(wxART_REDO, wxART_OTHER, wxSize(16, 15))); @@ -315,6 +354,29 @@ MyFrame::MyFrame() m_secondary_gallery = PopulateColoursPanel(secondary_panel, m_default_secondary, ID_SECONDARY_COLOUR); } + { + wxRibbonPage* page = new wxRibbonPage(m_ribbon, wxID_ANY, wxT("UI Updated"), ribbon_xpm); + wxRibbonPanel *panel = new wxRibbonPanel(page, wxID_ANY, wxT("Enable/Disable"), ribbon_xpm); + wxRibbonButtonBar *bar = new wxRibbonButtonBar(panel, wxID_ANY); + bar->AddButton(ID_DISABLED, wxT("Disabled"), ribbon_xpm); + bar->AddButton(ID_ENABLE, wxT("Enable"), ribbon_xpm); + bar->AddButton(ID_DISABLE, wxT("Disable"), ribbon_xpm); + bar->AddButton(ID_UI_ENABLE_UPDATED, wxT("Enable UI updated"), ribbon_xpm); + bar->EnableButton(ID_DISABLED, false); + m_bEnabled = true; + + panel = new wxRibbonPanel(page, wxID_ANY, wxT("Toggle"), ribbon_xpm); + bar = new wxRibbonButtonBar(panel, wxID_ANY); + bar->AddButton(ID_CHECK, wxT("Toggle"), ribbon_xpm); + bar->AddToggleButton(ID_UI_CHECK_UPDATED, wxT("Toggled UI updated"), ribbon_xpm); + m_bChecked = true; + + panel = new wxRibbonPanel(page, wxID_ANY, wxT("Change text"), ribbon_xpm); + bar = new wxRibbonButtonBar(panel, wxID_ANY); + bar->AddButton(ID_CHANGE_TEXT1, wxT("One"), ribbon_xpm); + bar->AddButton(ID_CHANGE_TEXT2, wxT("Two"), ribbon_xpm); + bar->AddButton(ID_UI_CHANGE_TEXT_UPDATED, wxT("Zero"), ribbon_xpm); + } new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Empty Page"), empty_xpm); new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Another Page"), empty_xpm); @@ -507,6 +569,50 @@ void MyFrame::ResetGalleryArtProviders() } } +void MyFrame::OnChangeText1(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_new_text = wxT("One"); +} + +void MyFrame::OnChangeText2(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_new_text = wxT("Two"); +} + +void MyFrame::OnEnable(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_bEnabled = true; +} + +void MyFrame::OnDisable(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_bEnabled = false; +} + +void MyFrame::OnCheck(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_bChecked = !m_bChecked; +} + +void MyFrame::OnEnableUpdateUI(wxUpdateUIEvent& evt) +{ + evt.Enable(m_bEnabled); +} + +void MyFrame::OnCheckUpdateUI(wxUpdateUIEvent& evt) +{ + evt.Check(m_bChecked); +} + +void MyFrame::OnChangeTextUpdateUI(wxUpdateUIEvent& evt) +{ + if ( !m_new_text.IsEmpty() ) + { + evt.SetText(m_new_text); + m_new_text = wxT(""); + } +} + void MyFrame::OnSelectionExpandHButton(wxRibbonButtonBarEvent& WXUNUSED(evt)) { AddText(wxT("Expand selection horizontally button clicked.")); @@ -565,6 +671,40 @@ void MyFrame::OnPolygonDropdown(wxRibbonButtonBarEvent& evt) evt.PopupMenu(&menu); } +void MyFrame::OnJustify(wxRibbonToolBarEvent& evt) +{ + long style = m_logwindow->GetWindowStyle() & + ~(wxTE_LEFT | wxTE_CENTER | wxTE_RIGHT); + switch(evt.GetId()) + { + case wxID_JUSTIFY_LEFT: + m_logwindow->SetWindowStyle(style | wxTE_LEFT); + break; + case wxID_JUSTIFY_CENTER: + m_logwindow->SetWindowStyle(style | wxTE_CENTER); + break; + case wxID_JUSTIFY_RIGHT: + m_logwindow->SetWindowStyle(style | wxTE_RIGHT); + break; + } +} + +void MyFrame::OnJustifyUpdateUI(wxUpdateUIEvent& evt) +{ + switch(evt.GetId()) + { + case wxID_JUSTIFY_LEFT: + evt.Check(!m_logwindow->HasFlag(wxTE_CENTER | wxTE_RIGHT)); + break; + case wxID_JUSTIFY_CENTER: + evt.Check(m_logwindow->HasFlag(wxTE_CENTER)); + break; + case wxID_JUSTIFY_RIGHT: + evt.Check(m_logwindow->HasFlag(wxTE_RIGHT)); + break; + } +} + void MyFrame::OnNew(wxRibbonToolBarEvent& WXUNUSED(evt)) { AddText(wxT("New button clicked."));