From 2e26246aa3482162abddf03cbd09d4d5e15cd2bf Mon Sep 17 00:00:00 2001 From: Thomas Hirschbuechler Date: Thu, 28 Jan 2016 12:31:10 +0100 Subject: [PATCH 1/3] in advanced view: added a shortcut for "connect to computer"-shortcut: crtl-shift-I (as well as file-menu reference) --- clientgui/AdvancedFrame.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index e9b08e8c8f..67d27e4b90 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -341,7 +341,7 @@ bool CAdvancedFrame::CreateMenu() { menuFile->Append( ID_SELECTCOMPUTER, - _("Select computer..."), + _("Select computer...\tCtrl+Shift+I"), _("Connect to a BOINC client on another computer") ); menuFile->Append( @@ -733,11 +733,20 @@ bool CAdvancedFrame::CreateMenu() { delete m_pOldMenubar; } + + #ifdef __WXMAC__ // Set HELP key as keyboard shortcut m_Shortcuts[0].Set(wxACCEL_NORMAL, WXK_HELP, ID_HELPBOINCMANAGER); + m_Shortcuts[1].Set(wxACCEL_CTRL|wxACCEL_SHIFT, (int)'I', ID_SELECTCOMPUTER); + m_pAccelTable = new wxAcceleratorTable(2, m_Shortcuts); + SetAcceleratorTable(*m_pAccelTable); + #else + //only set the connect-to-computer shortcut + m_Shortcuts[0].Set(wxACCEL_CTRL|wxACCEL_SHIFT, (int)'I', ID_SELECTCOMPUTER); m_pAccelTable = new wxAcceleratorTable(1, m_Shortcuts); SetAcceleratorTable(*m_pAccelTable); + #endif wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateMenu - Function End")); From 64ce0f5de9724d285bcc8bc85128cb4cd3231eb1 Mon Sep 17 00:00:00 2001 From: Thomas Hirschbuechler Date: Thu, 28 Jan 2016 13:05:53 +0100 Subject: [PATCH 2/3] added connect-to-computer shortcut --- clientgui/AdvancedFrame.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 67d27e4b90..7641d946a9 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -733,21 +733,18 @@ bool CAdvancedFrame::CreateMenu() { delete m_pOldMenubar; } - - #ifdef __WXMAC__ // Set HELP key as keyboard shortcut m_Shortcuts[0].Set(wxACCEL_NORMAL, WXK_HELP, ID_HELPBOINCMANAGER); m_Shortcuts[1].Set(wxACCEL_CTRL|wxACCEL_SHIFT, (int)'I', ID_SELECTCOMPUTER); m_pAccelTable = new wxAcceleratorTable(2, m_Shortcuts); SetAcceleratorTable(*m_pAccelTable); - #else +#else //only set the connect-to-computer shortcut m_Shortcuts[0].Set(wxACCEL_CTRL|wxACCEL_SHIFT, (int)'I', ID_SELECTCOMPUTER); m_pAccelTable = new wxAcceleratorTable(1, m_Shortcuts); SetAcceleratorTable(*m_pAccelTable); - - #endif +#endif wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateMenu - Function End")); return true; From de3c57cf48a07fa468e7446ba614c3d4e4d5ba92 Mon Sep 17 00:00:00 2001 From: Thomas Hirschbuechler Date: Fri, 29 Jan 2016 22:47:07 +0100 Subject: [PATCH 3/3] add shortcut for select-computer --- clientgui/AdvancedFrame.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 7641d946a9..2d903f5235 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -736,12 +736,6 @@ bool CAdvancedFrame::CreateMenu() { #ifdef __WXMAC__ // Set HELP key as keyboard shortcut m_Shortcuts[0].Set(wxACCEL_NORMAL, WXK_HELP, ID_HELPBOINCMANAGER); - m_Shortcuts[1].Set(wxACCEL_CTRL|wxACCEL_SHIFT, (int)'I', ID_SELECTCOMPUTER); - m_pAccelTable = new wxAcceleratorTable(2, m_Shortcuts); - SetAcceleratorTable(*m_pAccelTable); -#else - //only set the connect-to-computer shortcut - m_Shortcuts[0].Set(wxACCEL_CTRL|wxACCEL_SHIFT, (int)'I', ID_SELECTCOMPUTER); m_pAccelTable = new wxAcceleratorTable(1, m_Shortcuts); SetAcceleratorTable(*m_pAccelTable); #endif