From 65c87bcbc0e700fc0df75976849a1c0fd1e56cba Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Sat, 27 Aug 2016 09:20:06 +0200 Subject: [PATCH] Toolbar management enhanced --- EventMonitor/Frame.cpp | 88 +++++++++++++++++++++------- EventMonitor/Frame.h | 8 ++- EventMonitor/locale/EventMonitor.pot | 74 +++++++++++++++-------- 3 files changed, 124 insertions(+), 46 deletions(-) diff --git a/EventMonitor/Frame.cpp b/EventMonitor/Frame.cpp index 1f17476..9db6bf3 100644 --- a/EventMonitor/Frame.cpp +++ b/EventMonitor/Frame.cpp @@ -136,6 +136,16 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const //m_menuViewLevelError->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2861), size_menu)); m_menuView->Append(m_menuViewLevelError); + m_menuView->AppendSeparator(); + + wxMenuItem* m_menuViewToolbarEdit; + m_menuViewToolbarEdit = new wxMenuItem(m_menuView, wxID_VIEW_TOOLBAR_EDIT, _("&Edit toolbar"), _("Toggles display of Edit toolbar"), wxITEM_CHECK); + m_menuView->Append(m_menuViewToolbarEdit); + + wxMenuItem* m_menuViewToolbarView; + m_menuViewToolbarView = new wxMenuItem(m_menuView, wxID_VIEW_TOOLBAR_VIEW, _("&View toolbar"), _("Toggles display of View toolbar"), wxITEM_CHECK); + m_menuView->Append(m_menuViewToolbarView); + m_menubar->Append(m_menuView, _("&View")); this->SetMenuBar(m_menubar); @@ -208,36 +218,46 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const this->Connect(wxID_VIEW_SOURCE_PRODUCT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceProduct )); this->Connect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate )); this->Connect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel )); + this->Connect(wxID_VIEW_TOOLBAR_EDIT , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarEditUpdate )); + this->Connect(wxID_VIEW_TOOLBAR_EDIT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbarEdit )); + this->Connect(wxID_VIEW_TOOLBAR_VIEW , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarViewUpdate )); + this->Connect(wxID_VIEW_TOOLBAR_VIEW , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbarView )); } wxEventMonitorFrame::~wxEventMonitorFrame() { // Disconnect Events - this->Disconnect(wxID_EXIT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnExit )); - this->Disconnect(wxID_COPY , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyUpdate )); - this->Disconnect(wxID_COPY , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopy )); - this->Disconnect(wxID_COPY_ALL , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyAllUpdate )); - this->Disconnect(wxID_COPY_ALL , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopyAll )); - this->Disconnect(wxID_CLEAR , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditClearUpdate )); - this->Disconnect(wxID_CLEAR , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditClear )); - this->Disconnect(wxID_SELECT_ALL , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectAllUpdate )); - this->Disconnect(wxID_SELECT_ALL , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectAll )); - this->Disconnect(wxID_SELECT_NONE , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectNoneUpdate )); - this->Disconnect(wxID_SELECT_NONE , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone )); - this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate )); - this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll )); - this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEapHostUpdate)); - this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEapHost )); + this->Disconnect(wxID_EXIT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnExit )); + this->Disconnect(wxID_COPY , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyUpdate )); + this->Disconnect(wxID_COPY , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopy )); + this->Disconnect(wxID_COPY_ALL , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyAllUpdate )); + this->Disconnect(wxID_COPY_ALL , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopyAll )); + this->Disconnect(wxID_CLEAR , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditClearUpdate )); + this->Disconnect(wxID_CLEAR , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditClear )); + this->Disconnect(wxID_SELECT_ALL , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectAllUpdate )); + this->Disconnect(wxID_SELECT_ALL , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectAll )); + this->Disconnect(wxID_SELECT_NONE , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectNoneUpdate )); + this->Disconnect(wxID_SELECT_NONE , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone )); + this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate )); + this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll )); + this->Disconnect(wxID_VIEW_SOURCE_EAPHOST , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEapHostUpdate )); + this->Disconnect(wxID_VIEW_SOURCE_EAPHOST , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEapHost )); this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceSchannelUpdate)); this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceSchannel )); - this->Disconnect(wxID_VIEW_SOURCE_PRODUCT, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceProductUpdate)); - this->Disconnect(wxID_VIEW_SOURCE_PRODUCT, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceProduct )); - this->Disconnect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate )); - this->Disconnect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel )); + this->Disconnect(wxID_VIEW_SOURCE_PRODUCT , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceProductUpdate )); + this->Disconnect(wxID_VIEW_SOURCE_PRODUCT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceProduct )); + this->Disconnect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate )); + this->Disconnect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel )); + this->Disconnect(wxID_VIEW_TOOLBAR_EDIT , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarEditUpdate )); + this->Disconnect(wxID_VIEW_TOOLBAR_EDIT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbarEdit )); + this->Disconnect(wxID_VIEW_TOOLBAR_VIEW , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarViewUpdate )); + this->Disconnect(wxID_VIEW_TOOLBAR_VIEW , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbarView )); + + // Save wxAuiManager's state. + wxPersistentAuiManager(&m_mgr).Save(); m_mgr.UnInit(); - } @@ -388,6 +408,34 @@ void wxEventMonitorFrame::OnViewLevel(wxCommandEvent& event) } +void wxEventMonitorFrame::OnViewToolbarEditUpdate(wxUpdateUIEvent& event) +{ + event.Check(m_mgr.GetPane(m_toolbarEdit).IsShown()); +} + + +void wxEventMonitorFrame::OnViewToolbarEdit(wxCommandEvent& /*event*/) +{ + wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarEdit); + paneInfo.Show(!paneInfo.IsShown()); + m_mgr.Update(); +} + + +void wxEventMonitorFrame::OnViewToolbarViewUpdate(wxUpdateUIEvent& event) +{ + event.Check(m_mgr.GetPane(m_toolbarView).IsShown()); +} + + +void wxEventMonitorFrame::OnViewToolbarView(wxCommandEvent& /*event*/) +{ + wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarView); + paneInfo.Show(!paneInfo.IsShown()); + m_mgr.Update(); +} + + ////////////////////////////////////////////////////////////////////////// // wxPersistentEventMonitorFrame ////////////////////////////////////////////////////////////////////////// diff --git a/EventMonitor/Frame.h b/EventMonitor/Frame.h index 0490535..f4c1aef 100644 --- a/EventMonitor/Frame.h +++ b/EventMonitor/Frame.h @@ -58,7 +58,9 @@ protected: wxID_VIEW_LEVEL_VERBOSE, wxID_VIEW_LEVEL_INFORMATION, wxID_VIEW_LEVEL_WARNING, - wxID_VIEW_LEVEL_ERROR + wxID_VIEW_LEVEL_ERROR, + wxID_VIEW_TOOLBAR_EDIT, + wxID_VIEW_TOOLBAR_VIEW, }; public: @@ -89,6 +91,10 @@ protected: void OnViewSourceProduct(wxCommandEvent& event); void OnViewLevelUpdate(wxUpdateUIEvent& event); void OnViewLevel(wxCommandEvent& event); + void OnViewToolbarEditUpdate(wxUpdateUIEvent& event); + void OnViewToolbarEdit(wxCommandEvent& event); + void OnViewToolbarViewUpdate(wxUpdateUIEvent& event); + void OnViewToolbarView(wxCommandEvent& event); protected: wxMenuBar* m_menubar; diff --git a/EventMonitor/locale/EventMonitor.pot b/EventMonitor/locale/EventMonitor.pot index a51c752..4b2d0b6 100644 --- a/EventMonitor/locale/EventMonitor.pot +++ b/EventMonitor/locale/EventMonitor.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: EventMonitor\n" -"POT-Creation-Date: 2016-08-27 07:29+0200\n" +"POT-Creation-Date: 2016-08-27 07:52+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -17,7 +17,7 @@ msgstr "" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" -#: App.cpp:69 Frame.h:65 MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: App.cpp:69 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 msgid "Event Monitor" msgstr "" @@ -66,7 +66,7 @@ msgstr "" msgid "Error enabling %s event provider (error %u)." msgstr "" -#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:158 Frame.cpp:160 +#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170 #, c-format msgid "Toggles display of %s records" msgstr "" @@ -84,19 +84,19 @@ msgstr "" msgid "&Program" msgstr "You don't have %s subscription yet." -#: Frame.cpp:78 Frame.cpp:146 -msgid "Copy All" +#: Frame.cpp:78 +msgid "Copy A&ll" msgstr "" -#: Frame.cpp:78 Frame.cpp:146 +#: Frame.cpp:78 Frame.cpp:156 msgid "Copies all records to clipboard (including hidden)" msgstr "" -#: Frame.cpp:83 Frame.cpp:148 +#: Frame.cpp:83 Frame.cpp:158 msgid "Clear" msgstr "" -#: Frame.cpp:83 Frame.cpp:148 +#: Frame.cpp:83 Frame.cpp:158 msgid "Clears all records from the log" msgstr "" @@ -120,68 +120,92 @@ msgstr "" msgid "&Edit" msgstr "" -#: Frame.cpp:101 Frame.cpp:154 -msgid "Auto Scroll" +#: Frame.cpp:101 +msgid "Auto &Scroll" msgstr "" -#: Frame.cpp:101 Frame.cpp:154 +#: Frame.cpp:101 Frame.cpp:164 msgid "Automatically scrolls to the most recent records as they come-in" msgstr "" -#: Frame.cpp:123 Frame.cpp:166 +#: Frame.cpp:123 Frame.cpp:176 msgid "Verbose" msgstr "" -#: Frame.cpp:123 Frame.cpp:166 +#: Frame.cpp:123 Frame.cpp:176 msgid "Displays all levels of records" msgstr "" -#: Frame.cpp:127 Frame.cpp:168 +#: Frame.cpp:127 Frame.cpp:178 msgid "Informational" msgstr "" -#: Frame.cpp:127 Frame.cpp:168 +#: Frame.cpp:127 Frame.cpp:178 msgid "Displays all records up to informational level" msgstr "" -#: Frame.cpp:131 Frame.cpp:170 +#: Frame.cpp:131 Frame.cpp:180 msgid "Warning" msgstr "" -#: Frame.cpp:131 Frame.cpp:170 +#: Frame.cpp:131 Frame.cpp:180 msgid "Displays all records up to warning level" msgstr "" -#: Frame.cpp:135 Frame.cpp:172 +#: Frame.cpp:135 Frame.cpp:182 #, fuzzy msgid "Error" msgstr "Napaka pri nalaganju knjižnice MSI.DLL (%1!ld!)." -#: Frame.cpp:135 Frame.cpp:172 +#: Frame.cpp:135 Frame.cpp:182 msgid "Displays error level records only" msgstr "" -#: Frame.cpp:139 +#: Frame.cpp:142 +msgid "&Edit toolbar" +msgstr "" + +#: Frame.cpp:142 +msgid "Toggles display of Edit toolbar" +msgstr "" + +#: Frame.cpp:146 +msgid "&View toolbar" +msgstr "" + +#: Frame.cpp:146 +msgid "Toggles display of View toolbar" +msgstr "" + +#: Frame.cpp:149 msgid "&View" msgstr "" -#: Frame.cpp:144 +#: Frame.cpp:154 msgid "Copy" msgstr "" -#: Frame.cpp:144 +#: Frame.cpp:154 msgid "Copies selected records to clipboard" msgstr "" -#: Frame.cpp:151 +#: Frame.cpp:156 +msgid "Copy All" +msgstr "" + +#: Frame.cpp:161 msgid "Edit" msgstr "" -#: Frame.cpp:175 +#: Frame.cpp:164 +msgid "Auto Scroll" +msgstr "" + +#: Frame.cpp:185 msgid "View" msgstr "" -#: Frame.cpp:179 +#: Frame.cpp:189 msgid "Log Trace" msgstr ""