Added keybind support.
This commit is contained in:
apoorv569
parent
db238e6958
commit
78841294d3
19
README.md
19
README.md
|
|
@ -1,10 +1,10 @@
|
|||
<p align="center">
|
||||
<img src="assets/icons/icon-hive_200x200.png" alt="Sample Hive" width="200" height="200">
|
||||
<img src="assets/icons/icon-hive_200x200.png" alt="sample-hive-icon" width="200" height="200">
|
||||
</p>
|
||||
<h2 align="center">Sample Hive</h2>
|
||||
<h1 align="center">SampleHive</h1>
|
||||
<p align="center">
|
||||
A simple, modern audio sample browser/manager for GNU/Linux.
|
||||
<img src="assets/logo/logo-hive_1920x1080.png" alt="Sample Hive">
|
||||
<img src="assets/logo/logo-hive_1920x1080.png" alt="sample-hive-logo">
|
||||
<hr>
|
||||
</p>
|
||||
|
||||
|
|
@ -49,8 +49,17 @@ cd build
|
|||
./SampleHive
|
||||
```
|
||||
|
||||
## Some keybindings
|
||||
// TODO
|
||||
## Are there any keybindings for SampleHive?
|
||||
|
||||
There are few pre-defined keybindings for SampleHive that you can use, such as
|
||||
|
||||
| KEYBIND | ACTION |
|
||||
|---------+--------------------------|
|
||||
| P | Play the selected sample |
|
||||
| L | Toggle loop on/off |
|
||||
| M | Toggle mute on/off |
|
||||
| S | Stop the playing sample |
|
||||
| O | Open the settings dialog |
|
||||
|
||||
## Can I configure SampleHive?
|
||||
|
||||
|
|
|
|||
164
src/App.cpp
164
src/App.cpp
|
|
@ -1,7 +1,14 @@
|
|||
#include "App.hpp"
|
||||
#include "ControlID_Enums.hpp"
|
||||
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/defs.h>
|
||||
#include <wx/eventfilter.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/gtk/window.h>
|
||||
#include <wx/log.h>
|
||||
#include <wx/object.h>
|
||||
#include <wx/rtti.h>
|
||||
#include <wx/splash.h>
|
||||
|
||||
wxIMPLEMENT_APP(App);
|
||||
|
|
@ -39,3 +46,160 @@ bool App::OnInit()
|
|||
m_Frame->Show(true);
|
||||
return true;
|
||||
}
|
||||
|
||||
int App::FilterEvent(wxEvent& event)
|
||||
{
|
||||
if(event.GetEventType() == wxEVT_KEY_DOWN)
|
||||
{
|
||||
wxWindow* focusedWindow = wxWindow::FindFocus();
|
||||
if(focusedWindow != NULL)
|
||||
{
|
||||
const wxString& className = focusedWindow->GetClassInfo()->GetClassName();
|
||||
|
||||
wxLogDebug("Focused window: %s", className);
|
||||
|
||||
// if SearchCtrl or TreeCtrl has focus, let all keys through
|
||||
if(className == wxT("wxSearchCtrl"))
|
||||
{
|
||||
wxLogDebug("SearchCtrl focused skipping key filtering");
|
||||
return wxEventFilter::Event_Skip;
|
||||
}
|
||||
else if(className == wxT("wxTreeCtrl"))
|
||||
{
|
||||
wxLogDebug("TreeCtrl focused skipping key filtering");
|
||||
return wxEventFilter::Event_Skip;
|
||||
}
|
||||
}
|
||||
|
||||
wxKeyEvent* keyEvent = wxDynamicCast(&event, wxKeyEvent);
|
||||
|
||||
if(keyEvent != NULL)
|
||||
{
|
||||
switch (keyEvent->GetKeyCode())
|
||||
{
|
||||
case WXK_SPACE:
|
||||
{
|
||||
wxCommandEvent playEvent(wxEVT_BUTTON);
|
||||
|
||||
playEvent.SetId(BC_Play);
|
||||
playEvent.SetEventObject(m_Frame->m_PlayButton);
|
||||
|
||||
m_Frame->OnClickPlay(playEvent);
|
||||
|
||||
wxLogDebug("Space pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
case 'A':
|
||||
{
|
||||
wxCommandEvent autoplayEvent(wxEVT_CHECKBOX);
|
||||
autoplayEvent.SetId(BC_Autoplay);
|
||||
|
||||
autoplayEvent.SetEventObject(m_Frame->m_AutoPlayCheck);
|
||||
|
||||
if (m_Frame->m_AutoPlayCheck->GetValue())
|
||||
m_Frame->m_AutoPlayCheck->SetValue(false);
|
||||
else
|
||||
m_Frame->m_AutoPlayCheck->SetValue(true);
|
||||
|
||||
m_Frame->OnCheckAutoplay(autoplayEvent);
|
||||
|
||||
wxLogDebug("A pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
case 'L':
|
||||
{
|
||||
wxCommandEvent loopEvent(wxEVT_TOGGLEBUTTON);
|
||||
|
||||
loopEvent.SetId(BC_Loop);
|
||||
loopEvent.SetEventObject(m_Frame->m_LoopButton);
|
||||
|
||||
if (m_Frame->m_LoopButton->GetValue())
|
||||
m_Frame->m_LoopButton->SetValue(false);
|
||||
else
|
||||
m_Frame->m_LoopButton->SetValue(true);
|
||||
|
||||
m_Frame->OnClickLoop(loopEvent);
|
||||
|
||||
wxLogDebug("L pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
case 'M':
|
||||
{
|
||||
wxCommandEvent muteEvent(wxEVT_TOGGLEBUTTON);
|
||||
|
||||
muteEvent.SetId(BC_Mute);
|
||||
muteEvent.SetEventObject(m_Frame->m_MuteButton);
|
||||
|
||||
if (m_Frame->m_MuteButton->GetValue())
|
||||
m_Frame->m_MuteButton->SetValue(false);
|
||||
else
|
||||
m_Frame->m_MuteButton->SetValue(true);
|
||||
|
||||
m_Frame->OnClickMute(muteEvent);
|
||||
|
||||
wxLogDebug("M pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
case 'O':
|
||||
{
|
||||
wxCommandEvent settingsEvent(wxEVT_BUTTON);
|
||||
|
||||
settingsEvent.SetId(BC_Settings);
|
||||
settingsEvent.SetEventObject(m_Frame->m_SettingsButton);
|
||||
|
||||
m_Frame->OnClickSettings(settingsEvent);
|
||||
|
||||
wxLogDebug("O pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
case 'P':
|
||||
{
|
||||
wxCommandEvent playEvent(wxEVT_BUTTON);
|
||||
|
||||
playEvent.SetId(BC_Play);
|
||||
playEvent.SetEventObject(m_Frame->m_PlayButton);
|
||||
|
||||
m_Frame->OnClickPlay(playEvent);
|
||||
|
||||
wxLogDebug("P pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
case 'S':
|
||||
{
|
||||
wxCommandEvent stopEvent(wxEVT_BUTTON);
|
||||
|
||||
stopEvent.SetId(BC_Stop);
|
||||
stopEvent.SetEventObject(m_Frame->m_StopButton);
|
||||
|
||||
m_Frame->OnClickStop(stopEvent);
|
||||
|
||||
wxLogDebug("S pressed");
|
||||
|
||||
return wxEventFilter::Event_Processed;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <wx/app.h>
|
||||
#include <wx/event.h>
|
||||
|
||||
#include "MainFrame.hpp"
|
||||
|
||||
|
|
@ -13,6 +14,9 @@ class App : public wxApp
|
|||
private:
|
||||
MainFrame* m_Frame = nullptr;
|
||||
|
||||
public:
|
||||
private:
|
||||
virtual bool OnInit();
|
||||
|
||||
private:
|
||||
int FilterEvent(wxEvent& event);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -224,16 +224,16 @@ MainFrame::MainFrame()
|
|||
Bind(wxEVT_BUTTON, &MainFrame::OnClickCollectionAdd, this, BC_CollectionViewAdd);
|
||||
Bind(wxEVT_BUTTON, &MainFrame::OnClickCollectionRemove, this, BC_CollectionViewRemove);
|
||||
|
||||
// Setting up keybindings
|
||||
wxAcceleratorEntry entries[5];
|
||||
entries[0].Set(wxACCEL_NORMAL, (int) 'P', BC_Play);
|
||||
entries[1].Set(wxACCEL_NORMAL, (int) 'L', BC_Loop);
|
||||
entries[2].Set(wxACCEL_NORMAL, (int) 'S', BC_Stop);
|
||||
entries[3].Set(wxACCEL_NORMAL, (int) 'M', BC_Mute);
|
||||
entries[4].Set(wxACCEL_NORMAL, (int) 'O', BC_Settings);
|
||||
// // Setting up keybindings
|
||||
// wxAcceleratorEntry entries[5];
|
||||
// entries[0].Set(wxACCEL_NORMAL, (int) 'P', BC_Play);
|
||||
// entries[1].Set(wxACCEL_NORMAL, (int) 'L', BC_Loop);
|
||||
// entries[2].Set(wxACCEL_NORMAL, (int) 'S', BC_Stop);
|
||||
// entries[3].Set(wxACCEL_NORMAL, (int) 'M', BC_Mute);
|
||||
// entries[4].Set(wxACCEL_NORMAL, (int) 'O', BC_Settings);
|
||||
|
||||
wxAcceleratorTable accel(5, entries);
|
||||
this->SetAcceleratorTable(accel);
|
||||
// wxAcceleratorTable accel(5, entries);
|
||||
// this->SetAcceleratorTable(accel);
|
||||
|
||||
// Adding widgets to their sizers
|
||||
m_MainSizer->Add(m_MainPanel, 1, wxALL | wxEXPAND, 0);
|
||||
|
|
|
|||
|
|
@ -202,4 +202,6 @@ class MainFrame : public wxFrame
|
|||
void CreateWatcher();
|
||||
|
||||
// wxString TagLibTowx(const TagLib::String& in);
|
||||
|
||||
friend class App;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue