X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1bf0be0bcb74c67c35556138b891fd907b1d59f..14619f10b0bdb630206607abd0ce0319d45e095a:/samples/ribbon/ribbondemo.cpp?ds=inline diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp index 546838ebf0..7a326c8598 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -24,6 +24,7 @@ #include "wx/ribbon/toolbar.h" #include "wx/sizer.h" #include "wx/menu.h" +#include "wx/msgdlg.h" #include "wx/dcbuffer.h" #include "wx/colordlg.h" #include "wx/artprov.h" @@ -81,7 +82,10 @@ public: ID_UI_CHECK_UPDATED, ID_CHANGE_TEXT1, ID_CHANGE_TEXT2, - ID_UI_CHANGE_TEXT_UPDATED + ID_UI_CHANGE_TEXT_UPDATED, + ID_REMOVE_PAGE, + ID_HIDE_PAGES, + ID_SHOW_PAGES }; void OnEnableUpdateUI(wxUpdateUIEvent& evt); @@ -90,6 +94,8 @@ public: void OnCheck(wxRibbonButtonBarEvent& evt); void OnEnable(wxRibbonButtonBarEvent& evt); void OnDisable(wxRibbonButtonBarEvent& evt); + void OnDisabled(wxRibbonButtonBarEvent& evt); + void OnEnableUpdated(wxRibbonButtonBarEvent& evt); void OnChangeText1(wxRibbonButtonBarEvent& evt); void OnChangeText2(wxRibbonButtonBarEvent& evt); void OnCircleButton(wxRibbonButtonBarEvent& evt); @@ -126,8 +132,16 @@ public: void OnPositionLeftIcons(wxCommandEvent& evt); void OnPositionLeftBoth(wxCommandEvent& evt); void OnPositionLeftDropdown(wxRibbonToolBarEvent& evt); - + void OnRemovePage(wxRibbonButtonBarEvent& evt); + void OnHidePages(wxRibbonButtonBarEvent& evt); + void OnShowPages(wxRibbonButtonBarEvent& evt); void OnTogglePanels(wxCommandEvent& evt); + void OnRibbonBarToggled(wxRibbonBarEvent& evt); + void OnRibbonBarHelpClicked(wxRibbonBarEvent& evt); + + void OnSizeEvent(wxSizeEvent& evt); + + void OnExtButton(wxRibbonPanelEvent& evt); protected: wxRibbonGallery* PopulateColoursPanel(wxWindow* panel, wxColour def, @@ -175,6 +189,8 @@ bool MyApp::OnInit() BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_RIBBONBUTTONBAR_CLICKED(ID_ENABLE, MyFrame::OnEnable) EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLE, MyFrame::OnDisable) +EVT_RIBBONBUTTONBAR_CLICKED(ID_DISABLED, MyFrame::OnDisabled) +EVT_RIBBONBUTTONBAR_CLICKED(ID_UI_ENABLE_UPDATED, MyFrame::OnEnableUpdated) 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) @@ -222,6 +238,13 @@ EVT_MENU(ID_POSITION_TOP, MyFrame::OnPositionTopLabels) EVT_MENU(ID_POSITION_TOP_ICONS, MyFrame::OnPositionTopIcons) EVT_MENU(ID_POSITION_TOP_BOTH, MyFrame::OnPositionTopBoth) EVT_TOGGLEBUTTON(ID_TOGGLE_PANELS, MyFrame::OnTogglePanels) +EVT_RIBBONPANEL_EXTBUTTON_ACTIVATED(wxID_ANY, MyFrame::OnExtButton) +EVT_RIBBONBUTTONBAR_CLICKED(ID_REMOVE_PAGE, MyFrame::OnRemovePage) +EVT_RIBBONBUTTONBAR_CLICKED(ID_HIDE_PAGES, MyFrame::OnHidePages) +EVT_RIBBONBUTTONBAR_CLICKED(ID_SHOW_PAGES, MyFrame::OnShowPages) +EVT_RIBBONBAR_TOGGLED(wxID_ANY, MyFrame::OnRibbonBarToggled) +EVT_RIBBONBAR_HELP_CLICK(wxID_ANY, MyFrame::OnRibbonBarHelpClicked) +EVT_SIZE(MyFrame::OnSizeEvent) END_EVENT_TABLE() #include "align_center.xpm" @@ -250,13 +273,19 @@ END_EVENT_TABLE() MyFrame::MyFrame() : wxFrame(NULL, wxID_ANY, wxT("wxRibbon Sample Application"), wxDefaultPosition, wxSize(800, 600), wxDEFAULT_FRAME_STYLE) { - m_ribbon = new wxRibbonBar(this, wxID_ANY); + m_ribbon = new wxRibbonBar(this,-1,wxDefaultPosition, wxDefaultSize, wxRIBBON_BAR_FLOW_HORIZONTAL + | wxRIBBON_BAR_SHOW_PAGE_LABELS + | wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS + | wxRIBBON_BAR_SHOW_TOGGLE_BUTTON + | wxRIBBON_BAR_SHOW_HELP_BUTTON + ); { wxRibbonPage* home = new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Examples"), ribbon_xpm); wxRibbonPanel *toolbar_panel = new wxRibbonPanel(home, wxID_ANY, wxT("Toolbar"), wxNullBitmap, wxDefaultPosition, wxDefaultSize, - wxRIBBON_PANEL_NO_AUTO_MINIMISE); + wxRIBBON_PANEL_NO_AUTO_MINIMISE | + wxRIBBON_PANEL_EXT_BUTTON); wxRibbonToolBar *toolbar = new wxRibbonToolBar(toolbar_panel, ID_MAIN_TOOLBAR); toolbar->AddToggleTool(wxID_JUSTIFY_LEFT, align_left_xpm); toolbar->AddToggleTool(wxID_JUSTIFY_CENTER , align_center_xpm); @@ -376,9 +405,23 @@ MyFrame::MyFrame() 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); + + //Also set the general disabled text colour: + wxRibbonArtProvider* artProvider = m_ribbon->GetArtProvider(); + wxColour tColour = artProvider->GetColor(wxRIBBON_ART_BUTTON_BAR_LABEL_COLOUR); + artProvider->SetColor(wxRIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR, tColour.MakeDisabled()); } new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Empty Page"), empty_xpm); - new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Another Page"), empty_xpm); + { + wxRibbonPage* page = new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Another Page"), empty_xpm); + wxRibbonPanel *panel = new wxRibbonPanel(page, wxID_ANY, wxT("Page manipulation"), ribbon_xpm); + wxRibbonButtonBar *bar = new wxRibbonButtonBar(panel, wxID_ANY); + bar->AddButton(ID_REMOVE_PAGE, wxT("Remove"), wxArtProvider::GetBitmap(wxART_DELETE, wxART_OTHER, wxSize(24, 24))); + bar->AddButton(ID_HIDE_PAGES, wxT("Hide Pages"), ribbon_xpm); + bar->AddButton(ID_SHOW_PAGES, wxT("Show Pages"), ribbon_xpm); + } + new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Highlight Page"), empty_xpm); + m_ribbon->AddPageHighlight(m_ribbon->GetPageCount()-1); m_ribbon->Realize(); @@ -589,6 +632,16 @@ void MyFrame::OnDisable(wxRibbonButtonBarEvent& WXUNUSED(evt)) m_bEnabled = false; } +void MyFrame::OnDisabled(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + AddText("ERROR: Disabled button activated (not supposed to happen)"); +} + +void MyFrame::OnEnableUpdated(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + AddText("Button activated"); +} + void MyFrame::OnCheck(wxRibbonButtonBarEvent& WXUNUSED(evt)) { m_bChecked = !m_bChecked; @@ -821,6 +874,11 @@ void MyFrame::OnTogglePanels(wxCommandEvent& WXUNUSED(evt)) m_ribbon->ShowPanels(m_togglePanels->GetValue()); } +void MyFrame::OnExtButton(wxRibbonPanelEvent& WXUNUSED(evt)) +{ + wxMessageBox("Extension button clicked"); +} + void MyFrame::AddText(wxString msg) { m_logwindow->AppendText(msg); @@ -912,7 +970,7 @@ void MyFrame::OnColourGalleryButton(wxCommandEvent& evt) gallery->SetSelection(item); // Send an event to respond to the selection change - wxRibbonGalleryEvent dummy(wxEVT_COMMAND_RIBBONGALLERY_SELECTED, gallery->GetId()); + wxRibbonGalleryEvent dummy(wxEVT_RIBBONGALLERY_SELECTED, gallery->GetId()); dummy.SetEventObject(gallery); dummy.SetGallery(gallery); dummy.SetGalleryItem(item); @@ -954,3 +1012,53 @@ void MyFrame::SetArtProvider(wxRibbonArtProvider *prov) m_ribbon->Thaw(); GetSizer()->Layout(); } + +void MyFrame::OnRemovePage(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + size_t n = m_ribbon->GetPageCount(); + if(n > 0) + { + m_ribbon->DeletePage(n-1); + m_ribbon->Realize(); + } +} + +void MyFrame::OnHidePages(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_ribbon->HidePage(1); + m_ribbon->HidePage(2); + m_ribbon->HidePage(3); + m_ribbon->Realize(); +} + +void MyFrame::OnShowPages(wxRibbonButtonBarEvent& WXUNUSED(evt)) +{ + m_ribbon->ShowPage(1); + m_ribbon->ShowPage(2); + m_ribbon->ShowPage(3); + m_ribbon->Realize(); +} + +void MyFrame::OnRibbonBarToggled(wxRibbonBarEvent& WXUNUSED(evt)) +{ + AddText(wxString::Format("Ribbon bar %s.", + m_ribbon->ArePanelsShown() + ? "expanded" + : "collapsed")); +} + +void MyFrame::OnRibbonBarHelpClicked(wxRibbonBarEvent& WXUNUSED(evt)) +{ + AddText("Ribbon bar help clicked"); +} + +// This shows how to hide ribbon dynamically if there is not enough space. +void MyFrame::OnSizeEvent(wxSizeEvent& evt) +{ + if ( evt.GetSize().GetWidth() < 200 ) + m_ribbon->Hide(); + else + m_ribbon->Show(); + + evt.Skip(); +}