Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-08 20:52:09 +01:00
Code Issues Releases Wiki Activity

Device and Mixer toolbar switched to LeftToRight order, record then play, for consistency with MeterToolbar.

Browse Source
This commit is contained in:
james.k.crook@gmail.com
2014-10-21 10:02:05 +00:00
parent c47a140bcb
commit bdbdf68248
2 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/toolbars/DeviceToolBar.cpp
View File

@@ -110,20 +110,6 @@ void DeviceToolBar::Populate()
Add(mHost, 0, wxALIGN_CENTER);
// Output device
mPlayBitmap = new wxBitmap(theTheme.Bitmap(bmpSpeaker));
Add(new wxStaticBitmap(this,
wxID_ANY,
*mPlayBitmap), 0, wxALIGN_CENTER);
mOutput = new wxChoice(this,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize);
/* i18n-hint: (noun) It's the device used for playback.*/
mOutput->SetName(_("Playback Device"));
Add(mOutput, 0, wxALIGN_CENTER);
// Input device
mRecordBitmap = new wxBitmap(theTheme.Bitmap(bmpMic));
@@ -146,6 +132,23 @@ void DeviceToolBar::Populate()
mInputChannels->SetName(_("Recording Channels"));
Add(mInputChannels, 0, wxALIGN_CENTER);
// Output device
mPlayBitmap = new wxBitmap(theTheme.Bitmap(bmpSpeaker));
Add(new wxStaticBitmap(this,
wxID_ANY,
*mPlayBitmap), 0, wxALIGN_CENTER);
mOutput = new wxChoice(this,
wxID_ANY,
wxDefaultPosition,
wxDefaultSize);
/* i18n-hint: (noun) It's the device used for playback.*/
mOutput->SetName(_("Playback Device"));
Add(mOutput, 0, wxALIGN_CENTER);
mHost->Connect(wxEVT_SET_FOCUS,
wxFocusEventHandler(DeviceToolBar::OnFocus),
NULL,
@@ -212,15 +215,15 @@ void DeviceToolBar::OnCaptureKey(wxCommandEvent &event)
int keyCode = kevent->GetKeyCode();
// Pass UP/DOWN/LEFT/RIGHT through for input/output choice
if (FindFocus() == mOutput && (keyCode == WXK_LEFT || keyCode == WXK_RIGHT
|| keyCode == WXK_UP || keyCode == WXK_DOWN)) {
return;
}
if (FindFocus() == mInput && (keyCode == WXK_LEFT || keyCode == WXK_RIGHT
|| keyCode == WXK_UP || keyCode == WXK_DOWN)) {
return;
}
if (FindFocus() == mOutput && (keyCode == WXK_LEFT || keyCode == WXK_RIGHT
|| keyCode == WXK_UP || keyCode == WXK_DOWN)) {
return;
}
event.Skip();
return;