X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18f42b94df62068a19258b96ac7f569d4d3ba400..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/ribbon/ribbondemo.cpp?ds=inline diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp index 976544ee40..30bbdd7da2 100644 --- a/samples/ribbon/ribbondemo.cpp +++ b/samples/ribbon/ribbondemo.cpp @@ -24,10 +24,12 @@ #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" #include "wx/combobox.h" +#include "wx/tglbtn.h" #include "wx/wrapsizer.h" // -- application -- @@ -71,8 +73,27 @@ public: ID_POSITION_LEFT, ID_POSITION_LEFT_LABELS, ID_POSITION_LEFT_BOTH, + 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, + ID_REMOVE_PAGE }; + 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); @@ -89,6 +110,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); @@ -105,6 +128,10 @@ public: void OnPositionLeftIcons(wxCommandEvent& evt); void OnPositionLeftBoth(wxCommandEvent& evt); void OnPositionLeftDropdown(wxRibbonToolBarEvent& evt); + void OnRemovePage(wxRibbonButtonBarEvent& evt); + void OnTogglePanels(wxCommandEvent& evt); + + void OnExtButton(wxRibbonPanelEvent& evt); protected: wxRibbonGallery* PopulateColoursPanel(wxWindow* panel, wxColour def, @@ -122,11 +149,16 @@ protected: wxRibbonGallery* m_primary_gallery; wxRibbonGallery* m_secondary_gallery; wxTextCtrl* m_logwindow; + wxToggleButton* m_togglePanels; + wxColourData m_colour_data; wxColour m_default_primary; 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() }; @@ -145,6 +177,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) @@ -161,6 +201,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) @@ -179,6 +225,9 @@ EVT_MENU(ID_POSITION_LEFT_BOTH, MyFrame::OnPositionLeftBoth) 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) END_EVENT_TABLE() #include "align_center.xpm" @@ -207,22 +256,29 @@ 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, wxID_ANY, + wxDefaultPosition, wxDefaultSize, + wxRIBBON_BAR_DEFAULT_STYLE | + wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS); { 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->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))); @@ -308,8 +364,36 @@ 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); + { + 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))); + } m_ribbon->Realize(); @@ -317,10 +401,14 @@ MyFrame::MyFrame() wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_LEFT | wxTE_BESTWRAP | wxBORDER_NONE); + m_togglePanels = new wxToggleButton(this, ID_TOGGLE_PANELS, "&Toggle panels"); + m_togglePanels->SetValue(true); + wxSizer *s = new wxBoxSizer(wxVERTICAL); s->Add(m_ribbon, 0, wxEXPAND); s->Add(m_logwindow, 1, wxEXPAND); + s->Add(m_togglePanels, wxSizerFlags().Border()); SetSizer(s); } @@ -496,6 +584,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.")); @@ -554,6 +686,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.")); @@ -665,6 +831,16 @@ void MyFrame::OnPositionLeftDropdown(wxRibbonToolBarEvent& evt) evt.PopupMenu(&menu); } +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); @@ -798,3 +974,13 @@ 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(); + } +}