Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Ctrl+Tab and Ctrl+Shift+Tab shortcuts #4146

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add Ctrl+Tab and Ctrl+Shift+Tab shortcuts #4146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0737682
boincmgr: add CTRL+TAB shortcut
winkies Oct 3, 2020
cbd87af
boincmgr: add CTRL+Shift+TAB shortcut
winkies Jan 12, 2021
746d58f
boincmgr: use wxACCEL_RAW_CTRL instead of wxACCEL_CTRL to fit with re…
winkies Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions clientgui/AdvancedFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame)
EVT_TIMER(ID_FRAMERENDERTIMER, CAdvancedFrame::OnFrameRender)
EVT_NOTEBOOK_PAGE_CHANGED(ID_FRAMENOTEBOOK, CAdvancedFrame::OnNotebookSelectionChanged)
EVT_MENU(ID_SELECTALL, CAdvancedFrame::OnSelectAll)
EVT_MENU(ID_NEXTPAGE, CAdvancedFrame::OnNextPage)
EVT_MENU(ID_PREVPAGE, CAdvancedFrame::OnPrevPage)
EVT_SIZE(CAdvancedFrame::OnSize)
EVT_MOVE(CAdvancedFrame::OnMove)
#ifdef __WXMAC__
Expand Down Expand Up @@ -753,14 +755,17 @@ bool CAdvancedFrame::CreateMenus() {
delete m_pOldMenubar;
}

m_Shortcuts[0].Set(wxACCEL_CTRL, (int)'A', ID_SELECTALL);
m_Shortcuts[0].Set(wxACCEL_RAW_CTRL, (int)'A', ID_SELECTALL);
m_Shortcuts[1].Set(wxACCEL_RAW_CTRL, WXK_TAB, ID_NEXTPAGE);
m_Shortcuts[2].Set(wxACCEL_RAW_CTRL|wxACCEL_SHIFT, WXK_TAB, ID_PREVPAGE);


#ifdef __WXMAC__
// Set HELP key as keyboard shortcut
m_Shortcuts[1].Set(wxACCEL_NORMAL, WXK_HELP, ID_HELPBOINCMANAGER);
m_Shortcuts[3].Set(wxACCEL_NORMAL, WXK_HELP, ID_HELPBOINCMANAGER);
#endif

m_pAccelTable = new wxAcceleratorTable(2, m_Shortcuts);
m_pAccelTable = new wxAcceleratorTable(4, m_Shortcuts);
SetAcceleratorTable(*m_pAccelTable);

wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CreateMenu - Function End"));
Expand Down Expand Up @@ -1979,6 +1984,38 @@ void CAdvancedFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event)) {
}


void CAdvancedFrame::OnNextPage(wxCommandEvent& WXUNUSED(event)) {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnNextPage - Function Begin"));

wxWindow* pwndNotebookPage = m_pNotebook->GetPage(m_pNotebook->GetSelection());

if (pwndNotebookPage != NULL) {
m_pNotebook->AdvanceSelection();
}

wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnNextPage - Function End"));
}


void CAdvancedFrame::OnPrevPage(wxCommandEvent& WXUNUSED(event)) {
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnPrevPage - Function Begin"));

wxWindow* pwndNotebookPage = NULL;
int currentPage = m_pNotebook->GetSelection();
int pageCount = m_pNotebook->GetPageCount();
int selection = currentPage;

if (currentPage == 0) selection = pageCount;

pwndNotebookPage = m_pNotebook->GetPage(currentPage);
if (pwndNotebookPage != NULL) {
m_pNotebook->SetSelection(selection - 1);
}

wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnPrevPage - Function End"));
}


void CAdvancedFrame::UpdateActivityModeControls( CC_STATUS& status ) {
wxMenuBar* pMenuBar = GetMenuBar();
wxASSERT(pMenuBar);
Expand Down
4 changes: 3 additions & 1 deletion clientgui/AdvancedFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ class CAdvancedFrame : public CBOINCBaseFrame
void OnActivitySelection( wxCommandEvent& event );
void OnGPUSelection( wxCommandEvent& event );
void OnNetworkSelection( wxCommandEvent& event );
void OnNextPage( wxCommandEvent &event );
void OnPrevPage( wxCommandEvent &event );

void OnSelectAll( wxCommandEvent& event );

Expand Down Expand Up @@ -112,7 +114,7 @@ class CAdvancedFrame : public CBOINCBaseFrame
protected:
virtual int _GetCurrentViewPage();

wxAcceleratorEntry m_Shortcuts[2]; // For keyboard shortcut
wxAcceleratorEntry m_Shortcuts[4]; // For keyboard shortcut
wxAcceleratorTable* m_pAccelTable;

private:
Expand Down
2 changes: 2 additions & 0 deletions clientgui/Events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@

// Shortcuts
#define ID_SELECTALL 9800
#define ID_NEXTPAGE 9801
#define ID_PREVPAGE 9802

//
// Simple GUI
Expand Down