Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Toolbar management enhanced

Browse Source
This commit is contained in:
Simon Rozman 2016-08-27 09:20:06 +02:00
parent 1bdf4a2b8a
commit 65c87bcbc0
3 changed files with 124 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
EventMonitor/Frame.cpp
View File

@ -136,6 +136,16 @@ wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const
//m_menuViewLevelError->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2861), size_menu)); //m_menuViewLevelError->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2861), size_menu));
m_menuView->Append(m_menuViewLevelError); 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")); m_menubar->Append(m_menuView, _("&View"));
this->SetMenuBar(m_menubar); 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_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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate ));
this->Connect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel )); 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() wxEventMonitorFrame::~wxEventMonitorFrame()
{ {
// Disconnect Events // Disconnect Events
this->Disconnect(wxID_EXIT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnExit )); this->Disconnect(wxID_EXIT , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnExit ));
this->Disconnect(wxID_COPY , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyUpdate )); this->Disconnect(wxID_COPY , wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyUpdate ));
this->Disconnect(wxID_COPY , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopy )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyAllUpdate ));
this->Disconnect(wxID_COPY_ALL , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopyAll )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditClearUpdate ));
this->Disconnect(wxID_CLEAR , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditClear )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectAllUpdate ));
this->Disconnect(wxID_SELECT_ALL , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectAll )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectNoneUpdate ));
this->Disconnect(wxID_SELECT_NONE , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate ));
this->Disconnect(wxID_VIEW_SCROLL_AUTO , wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceEapHostUpdate ));
this->Disconnect(wxID_VIEW_SOURCE_EAPHOST, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceEapHost )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceSchannelUpdate));
this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceSchannel )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceProductUpdate ));
this->Disconnect(wxID_VIEW_SOURCE_PRODUCT, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewSourceProduct )); 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_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate ));
this->Disconnect(wxID_VIEW_LEVEL_VERBOSE , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel )); 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(); 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 // wxPersistentEventMonitorFrame
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

8
EventMonitor/Frame.h
View File

@ -58,7 +58,9 @@ protected:
wxID_VIEW_LEVEL_VERBOSE, wxID_VIEW_LEVEL_VERBOSE,
wxID_VIEW_LEVEL_INFORMATION, wxID_VIEW_LEVEL_INFORMATION,
wxID_VIEW_LEVEL_WARNING, wxID_VIEW_LEVEL_WARNING,
wxID_VIEW_LEVEL_ERROR wxID_VIEW_LEVEL_ERROR,
wxID_VIEW_TOOLBAR_EDIT,
wxID_VIEW_TOOLBAR_VIEW,
}; };
public: public:
@ -89,6 +91,10 @@ protected:
void OnViewSourceProduct(wxCommandEvent& event); void OnViewSourceProduct(wxCommandEvent& event);
void OnViewLevelUpdate(wxUpdateUIEvent& event); void OnViewLevelUpdate(wxUpdateUIEvent& event);
void OnViewLevel(wxCommandEvent& event); void OnViewLevel(wxCommandEvent& event);
void OnViewToolbarEditUpdate(wxUpdateUIEvent& event);
void OnViewToolbarEdit(wxCommandEvent& event);
void OnViewToolbarViewUpdate(wxUpdateUIEvent& event);
void OnViewToolbarView(wxCommandEvent& event);
protected: protected:
wxMenuBar* m_menubar; wxMenuBar* m_menubar;

74
EventMonitor/locale/EventMonitor.pot
View File

@ -2,7 +2,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: EventMonitor\n" "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" "PO-Revision-Date: 2016-06-02 12:27+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n" "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n" "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@ -17,7 +17,7 @@ msgstr ""
"X-Poedit-KeywordsList: _\n" "X-Poedit-KeywordsList: _\n"
"X-Poedit-SearchPath-0: .\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 #: MSIBuild/En.x64.Release.Feature-2.idtx:4
msgid "Event Monitor" msgid "Event Monitor"
msgstr "" msgstr ""
@ -66,7 +66,7 @@ msgstr ""
msgid "Error enabling %s event provider (error %u)." msgid "Error enabling %s event provider (error %u)."
msgstr "" 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 #, c-format
msgid "Toggles display of %s records" msgid "Toggles display of %s records"
msgstr "" msgstr ""
@ -84,19 +84,19 @@ msgstr ""
msgid "&Program" msgid "&Program"
msgstr "You don't have %s subscription yet." msgstr "You don't have %s subscription yet."
#: Frame.cpp:78 Frame.cpp:146 #: Frame.cpp:78
msgid "Copy All" msgid "Copy A&ll"
msgstr "" msgstr ""
#: Frame.cpp:78 Frame.cpp:146 #: Frame.cpp:78 Frame.cpp:156
msgid "Copies all records to clipboard (including hidden)" msgid "Copies all records to clipboard (including hidden)"
msgstr "" msgstr ""
#: Frame.cpp:83 Frame.cpp:148 #: Frame.cpp:83 Frame.cpp:158
msgid "Clear" msgid "Clear"
msgstr "" msgstr ""
#: Frame.cpp:83 Frame.cpp:148 #: Frame.cpp:83 Frame.cpp:158
msgid "Clears all records from the log" msgid "Clears all records from the log"
msgstr "" msgstr ""
@ -120,68 +120,92 @@ msgstr ""
msgid "&Edit" msgid "&Edit"
msgstr "" msgstr ""
#: Frame.cpp:101 Frame.cpp:154 #: Frame.cpp:101
msgid "Auto Scroll" msgid "Auto &Scroll"
msgstr "" 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" msgid "Automatically scrolls to the most recent records as they come-in"
msgstr "" msgstr ""
#: Frame.cpp:123 Frame.cpp:166 #: Frame.cpp:123 Frame.cpp:176
msgid "Verbose" msgid "Verbose"
msgstr "" msgstr ""
#: Frame.cpp:123 Frame.cpp:166 #: Frame.cpp:123 Frame.cpp:176
msgid "Displays all levels of records" msgid "Displays all levels of records"
msgstr "" msgstr ""
#: Frame.cpp:127 Frame.cpp:168 #: Frame.cpp:127 Frame.cpp:178
msgid "Informational" msgid "Informational"
msgstr "" msgstr ""
#: Frame.cpp:127 Frame.cpp:168 #: Frame.cpp:127 Frame.cpp:178
msgid "Displays all records up to informational level" msgid "Displays all records up to informational level"
msgstr "" msgstr ""
#: Frame.cpp:131 Frame.cpp:170 #: Frame.cpp:131 Frame.cpp:180
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: Frame.cpp:131 Frame.cpp:170 #: Frame.cpp:131 Frame.cpp:180
msgid "Displays all records up to warning level" msgid "Displays all records up to warning level"
msgstr "" msgstr ""
#: Frame.cpp:135 Frame.cpp:172 #: Frame.cpp:135 Frame.cpp:182
#, fuzzy #, fuzzy
msgid "Error" msgid "Error"
msgstr "Napaka pri nalaganju knjižnice MSI.DLL (%1!ld!)." 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" msgid "Displays error level records only"
msgstr "" 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" msgid "&View"
msgstr "" msgstr ""
#: Frame.cpp:144 #: Frame.cpp:154
msgid "Copy" msgid "Copy"
msgstr "" msgstr ""
#: Frame.cpp:144 #: Frame.cpp:154
msgid "Copies selected records to clipboard" msgid "Copies selected records to clipboard"
msgstr "" msgstr ""
#: Frame.cpp:151 #: Frame.cpp:156
msgid "Copy All"
msgstr ""
#: Frame.cpp:161
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: Frame.cpp:175 #: Frame.cpp:164
msgid "Auto Scroll"
msgstr ""
#: Frame.cpp:185
msgid "View" msgid "View"
msgstr "" msgstr ""
#: Frame.cpp:179 #: Frame.cpp:189
msgid "Log Trace" msgid "Log Trace"
msgstr "" msgstr ""