Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22733
Modified Files:
Tag: Audacity_1_3_5-Camp_Jam
ChangePitch.cpp ChangeTempo.cpp ChangeTempo.h
Log Message:
simplified interfaces for Camp Jam (now called Jamling)
Index: ChangeTempo.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- ChangeTempo.h 15 Apr 2007 02:23:26 -0000 1.12
+++ ChangeTempo.h 20 Nov 2008 22:48:43 -0000 1.12.2.1
@@ -16,6 +16,7 @@
#ifndef __AUDACITY_EFFECT_CHANGETEMPO__
#define __AUDACITY_EFFECT_CHANGETEMPO__
+#include "../AudacityBranding.h"
#include "SoundTouchEffect.h"
#include <wx/intl.h>
@@ -87,6 +88,11 @@
void OnText_FromBPM(wxCommandEvent & event);
void OnText_ToBPM(wxCommandEvent & event);
void OnText_ToLength(wxCommandEvent & event);
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ void OnRadioButton_50pct(wxCommandEvent & event);
+ void OnRadioButton_75pct(wxCommandEvent & event);
+ void OnRadioButton_90pct(wxCommandEvent & event);
+ #endif
void OnPreview( wxCommandEvent &event );
void OnOk(wxCommandEvent & event);
@@ -109,6 +115,11 @@
wxTextCtrl * m_pTextCtrl_ToBPM;
wxTextCtrl * m_pTextCtrl_FromLength;
wxTextCtrl * m_pTextCtrl_ToLength;
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ wxRadioButton* m_pRadioButton_50pct;
+ wxRadioButton* m_pRadioButton_75pct;
+ wxRadioButton* m_pRadioButton_90pct;
+ #endif
public:
// effect parameters
Index: ChangeTempo.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.cpp,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- ChangeTempo.cpp 5 May 2008 19:35:25 -0000 1.37
+++ ChangeTempo.cpp 20 Nov 2008 22:48:43 -0000 1.37.2.1
@@ -43,7 +43,7 @@
EffectChangeTempo::EffectChangeTempo()
{
- m_PercentChange = 0.0;
+ m_PercentChange = -50.0; // Default to something useful, half tempo.
m_FromBPM = 0; // indicates not yet set
m_ToBPM = 0; // indicates not yet set
m_FromLength = 0.0;
@@ -121,20 +121,31 @@
#define ID_TEXT_TOBPM 10004
#define ID_TEXT_FROMLENGTH 10005
#define ID_TEXT_TOLENGTH 10006
+#if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ #define ID_RADIOBUTTON_50PCT 10007
+ #define ID_RADIOBUTTON_75PCT 10008
+ #define ID_RADIOBUTTON_90PCT 10009
+#endif
// event table for ChangeTempoDialog
BEGIN_EVENT_TABLE(ChangeTempoDialog, wxDialog)
- EVT_BUTTON(wxID_OK, ChangeTempoDialog::OnOk)
- EVT_BUTTON(wxID_CANCEL, ChangeTempoDialog::OnCancel)
+ EVT_BUTTON(wxID_OK, ChangeTempoDialog::OnOk)
+ EVT_BUTTON(wxID_CANCEL, ChangeTempoDialog::OnCancel)
- EVT_TEXT(ID_TEXT_PERCENTCHANGE, ChangeTempoDialog::OnText_PercentChange)
- EVT_SLIDER(ID_SLIDER_PERCENTCHANGE,
ChangeTempoDialog::OnSlider_PercentChange)
- EVT_TEXT(ID_TEXT_FROMBPM, ChangeTempoDialog::OnText_FromBPM)
- EVT_TEXT(ID_TEXT_TOBPM, ChangeTempoDialog::OnText_ToBPM)
- EVT_TEXT(ID_TEXT_TOLENGTH, ChangeTempoDialog::OnText_ToLength)
+ EVT_TEXT(ID_TEXT_PERCENTCHANGE, ChangeTempoDialog::OnText_PercentChange)
+ EVT_SLIDER(ID_SLIDER_PERCENTCHANGE,
ChangeTempoDialog::OnSlider_PercentChange)
+ EVT_TEXT(ID_TEXT_FROMBPM, ChangeTempoDialog::OnText_FromBPM)
+ EVT_TEXT(ID_TEXT_TOBPM, ChangeTempoDialog::OnText_ToBPM)
+ EVT_TEXT(ID_TEXT_TOLENGTH, ChangeTempoDialog::OnText_ToLength)
- EVT_BUTTON(ID_EFFECT_PREVIEW, ChangeTempoDialog::OnPreview)
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ EVT_RADIOBUTTON(ID_RADIOBUTTON_50PCT,
ChangeTempoDialog::OnRadioButton_50pct)
+ EVT_RADIOBUTTON(ID_RADIOBUTTON_75PCT,
ChangeTempoDialog::OnRadioButton_75pct)
+ EVT_RADIOBUTTON(ID_RADIOBUTTON_90PCT,
ChangeTempoDialog::OnRadioButton_90pct)
+ #endif
+
+ EVT_BUTTON(ID_EFFECT_PREVIEW, ChangeTempoDialog::OnPreview)
END_EVENT_TABLE()
ChangeTempoDialog::ChangeTempoDialog(EffectChangeTempo * effect,
@@ -156,7 +167,12 @@
m_pTextCtrl_ToBPM = NULL;
m_pTextCtrl_FromLength = NULL;
m_pTextCtrl_ToLength = NULL;
-
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ m_pRadioButton_50pct = NULL;
+ m_pRadioButton_75pct = NULL;
+ m_pRadioButton_90pct = NULL;
+ #endif
+
// effect parameters
m_PercentChange = 0.0;
m_FromBPM = 0; // indicates not yet set
@@ -186,100 +202,135 @@
wxDefaultPosition, wxDefaultSize, 0);
pBoxSizer_Dialog->Add(pStaticText, 0, wxALIGN_CENTER | wxBOTTOM | wxLEFT |
wxRIGHT, 8);
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ pBoxSizer_Dialog->AddSpacer(8);
+
+ wxBoxSizer * pBoxSizer_RadioButtons = new wxBoxSizer(wxHORIZONTAL);
+ wxRadioButton* pRadioButton_50pct =
+ new wxRadioButton(this, ID_RADIOBUTTON_50PCT, _("Half Tempo"),
+ wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+ pBoxSizer_RadioButtons->Add(pRadioButton_50pct);
+ // Default is -50%.
+ pRadioButton_50pct->SetValue(true);
+
+ pBoxSizer_RadioButtons->AddSpacer(8);
+ wxRadioButton* pRadioButton_75pct =
+ new wxRadioButton(this, ID_RADIOBUTTON_75PCT, _("75% Tempo"),
+ wxDefaultPosition, wxDefaultSize);
+ pBoxSizer_RadioButtons->Add(pRadioButton_75pct);
+
+ pBoxSizer_RadioButtons->AddSpacer(8);
+ wxRadioButton* pRadioButton_90pct =
+ new wxRadioButton(this, ID_RADIOBUTTON_90PCT, _("90% Tempo"),
+ wxDefaultPosition, wxDefaultSize);
+ pBoxSizer_RadioButtons->Add(pRadioButton_90pct);
+
+ #if defined(__WXMAC__)
+ wxColour face =
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ pRadioButton_50pct->SetBackgroundColour(face);
+ pRadioButton_75pct->SetBackgroundColour(face);
+ pRadioButton_90pct->SetBackgroundColour(face);
+ #endif
+
+ pBoxSizer_Dialog->Add(pBoxSizer_RadioButtons, 0, wxALIGN_CENTER | wxALL,
4);
+ pBoxSizer_Dialog->AddSpacer(8);
+
+ #else // !(AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
- // percent change controls
-
- // Group percent controls with spacers,
- // rather than static box, so they don't look isolated.
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
+ // percent change controls
+
+ // Group percent controls with spacers,
+ // rather than static box, so they don't look isolated.
+ pBoxSizer_Dialog->AddSpacer(8);
- wxBoxSizer * pBoxSizer_PercentChange = new wxBoxSizer(wxHORIZONTAL);
-
- pStaticText = new wxStaticText(this, -1, _("Percent Change:"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_PercentChange->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ wxBoxSizer * pBoxSizer_PercentChange = new wxBoxSizer(wxHORIZONTAL);
+
+ pStaticText = new wxStaticText(this, -1, _("Percent Change:"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_PercentChange->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- //v Override wxTextValidator to disallow negative values <= -100.0?
- m_pTextCtrl_PercentChange =
- new wxTextCtrl(this, ID_TEXT_PERCENTCHANGE, wxT("0.0"),
- wxDefaultPosition,
wxSize(60, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_PercentChange->Add(m_pTextCtrl_PercentChange, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ //v Override wxTextValidator to disallow negative values <= -100.0?
+ m_pTextCtrl_PercentChange =
+ new wxTextCtrl(this, ID_TEXT_PERCENTCHANGE, wxT("0.0"),
+ wxDefaultPosition,
wxSize(60, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_PercentChange->Add(m_pTextCtrl_PercentChange, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pBoxSizer_Dialog->Add(pBoxSizer_PercentChange, 0, wxALIGN_CENTER | wxALL,
4);
+ pBoxSizer_Dialog->Add(pBoxSizer_PercentChange, 0, wxALIGN_CENTER |
wxALL, 4);
- m_pSlider_PercentChange =
- new wxSlider(this, ID_SLIDER_PERCENTCHANGE, 0,
- (int)PERCENTCHANGE_MIN,
(int)PERCENTCHANGE_MAX,
- wxDefaultPosition,
wxSize(100, -1),
- wxSL_HORIZONTAL);
- pBoxSizer_Dialog->Add(m_pSlider_PercentChange, 1,
- wxGROW
| wxALIGN_CENTER | wxLEFT | wxRIGHT, 4);
+ m_pSlider_PercentChange =
+ new wxSlider(this, ID_SLIDER_PERCENTCHANGE, 0,
+
(int)PERCENTCHANGE_MIN, (int)PERCENTCHANGE_MAX,
+ wxDefaultPosition,
wxSize(100, -1),
+ wxSL_HORIZONTAL);
+ pBoxSizer_Dialog->Add(m_pSlider_PercentChange, 1,
+
wxGROW | wxALIGN_CENTER | wxLEFT | wxRIGHT, 4);
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
+ pBoxSizer_Dialog->AddSpacer(8);
- // from/to beats-per-minute controls
- wxBoxSizer * pBoxSizer_BPM = new wxBoxSizer(wxHORIZONTAL);
-
- pStaticText = new wxStaticText(this, -1, _("Beats per Minute (BPM):
from"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_BPM->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ // from/to beats-per-minute controls
+ wxBoxSizer * pBoxSizer_BPM = new wxBoxSizer(wxHORIZONTAL);
+
+ pStaticText = new wxStaticText(this, -1, _("Beats per Minute (BPM):
from"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_BPM->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- m_pTextCtrl_FromBPM =
- new wxTextCtrl(this, ID_TEXT_FROMBPM, wxT(""),
- wxDefaultPosition,
wxSize(40, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_BPM->Add(m_pTextCtrl_FromBPM, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_FromBPM =
+ new wxTextCtrl(this, ID_TEXT_FROMBPM, wxT(""),
+ wxDefaultPosition,
wxSize(40, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_BPM->Add(m_pTextCtrl_FromBPM, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pStaticText = new wxStaticText(this, -1, _("to"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_BPM->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ pStaticText = new wxStaticText(this, -1, _("to"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_BPM->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- m_pTextCtrl_ToBPM =
- new wxTextCtrl(this, ID_TEXT_TOBPM, wxT(""),
- wxDefaultPosition,
wxSize(40, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_BPM->Add(m_pTextCtrl_ToBPM, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_ToBPM =
+ new wxTextCtrl(this, ID_TEXT_TOBPM, wxT(""),
+ wxDefaultPosition,
wxSize(40, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_BPM->Add(m_pTextCtrl_ToBPM, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pBoxSizer_Dialog->Add(pBoxSizer_BPM, 0, wxALIGN_CENTER | wxALL, 4);
+ pBoxSizer_Dialog->Add(pBoxSizer_BPM, 0, wxALIGN_CENTER | wxALL, 4);
- // from/to length controls
- wxBoxSizer * pBoxSizer_Length = new wxBoxSizer(wxHORIZONTAL);
-
- pStaticText = new wxStaticText(this, -1, _("Length (seconds): from"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_Length->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ // from/to length controls
+ wxBoxSizer * pBoxSizer_Length = new wxBoxSizer(wxHORIZONTAL);
+
+ pStaticText = new wxStaticText(this, -1, _("Length (seconds): from"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_Length->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- m_pTextCtrl_FromLength =
- new wxTextCtrl(this, ID_TEXT_FROMLENGTH, wxT(""),
- wxDefaultPosition,
wxSize(48, -1),
- wxTE_READONLY); // Read
only because it's from the selection.
- // No validator because
it's read only.
- pBoxSizer_Length->Add(m_pTextCtrl_FromLength, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_FromLength =
+ new wxTextCtrl(this, ID_TEXT_FROMLENGTH, wxT(""),
+ wxDefaultPosition,
wxSize(48, -1),
+ wxTE_READONLY); //
Read only because it's from the selection.
+ // No validator
because it's read only.
+ pBoxSizer_Length->Add(m_pTextCtrl_FromLength, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pStaticText = new wxStaticText(this, -1, _("to"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_Length->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ pStaticText = new wxStaticText(this, -1, _("to"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_Length->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- m_pTextCtrl_ToLength =
- new wxTextCtrl(this, ID_TEXT_TOLENGTH, wxT(""),
-
wxDefaultPosition, wxSize(48, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_Length->Add(m_pTextCtrl_ToLength, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_ToLength =
+ new wxTextCtrl(this, ID_TEXT_TOLENGTH, wxT(""),
+
wxDefaultPosition, wxSize(48, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_Length->Add(m_pTextCtrl_ToLength, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pBoxSizer_Dialog->Add(pBoxSizer_Length, 0, wxALIGN_CENTER | wxALL, 4);
+ pBoxSizer_Dialog->Add(pBoxSizer_Length, 0, wxALIGN_CENTER | wxALL, 4);
+ #endif // (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
// Preview, OK, & Cancel buttons
pBoxSizer_Dialog->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
@@ -489,6 +540,50 @@
}
}
+#if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ void ChangeTempoDialog::OnRadioButton_50pct(wxCommandEvent &evt)
+ {
+ if (m_bLoopDetect)
+ return;
+
+ m_PercentChange = -50.0;
+ m_bLoopDetect = true;
+ this->Update_Text_PercentChange();
+ this->Update_Slider_PercentChange();
+ this->Update_Text_ToBPM();
+ this->Update_Text_ToLength();
+ m_bLoopDetect = false;
+ }
+
+ void ChangeTempoDialog::OnRadioButton_75pct(wxCommandEvent &evt)
+ {
+ if (m_bLoopDetect)
+ return;
+
+ m_PercentChange = -25.0;
+ m_bLoopDetect = true;
+ this->Update_Text_PercentChange();
+ this->Update_Slider_PercentChange();
+ this->Update_Text_ToBPM();
+ this->Update_Text_ToLength();
+ m_bLoopDetect = false;
+ }
+
+ void ChangeTempoDialog::OnRadioButton_90pct(wxCommandEvent &evt)
+ {
+ if (m_bLoopDetect)
+ return;
+
+ m_PercentChange = -10.0;
+ m_bLoopDetect = true;
+ this->Update_Text_PercentChange();
+ this->Update_Slider_PercentChange();
+ this->Update_Text_ToBPM();
+ this->Update_Text_ToLength();
+ m_bLoopDetect = false;
+ }
+#endif // (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+
void ChangeTempoDialog::OnPreview(wxCommandEvent &event)
{
@@ -506,7 +601,12 @@
TransferDataFromWindow();
if (Validate())
+ {
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ wxMessageBox(_("To return to previous tempo: Edit menu > Undo."));
+ #endif
EndModal(true);
+ }
else
event.Skip();
}
Index: ChangePitch.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -d -r1.44 -r1.44.2.1
--- ChangePitch.cpp 5 May 2008 19:35:24 -0000 1.44
+++ ChangePitch.cpp 20 Nov 2008 22:48:43 -0000 1.44.2.1
@@ -17,6 +17,7 @@
#include "ChangePitch.h"
+#include "../AudacityBranding.h"
#include "../ShuttleGui.h"
#include "../PitchName.h"
#include "../Spectrum.h"
@@ -300,84 +301,85 @@
pBoxSizer_Dialog->Add(pBoxSizer_Pitch, 0, wxALIGN_CENTER | wxALL, 4);
+ #if (AUDACITY_BRANDING != BRAND_CAMP_JAM__EASY)
+ // semitones change controls
+ wxBoxSizer * pBoxSizer_SemitonesChange = new wxBoxSizer(wxHORIZONTAL);
+ pStaticText = new wxStaticText(this, -1, _("Semitones (half-steps):"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_SemitonesChange->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- // semitones change controls
- wxBoxSizer * pBoxSizer_SemitonesChange = new wxBoxSizer(wxHORIZONTAL);
- pStaticText = new wxStaticText(this, -1, _("Semitones (half-steps):"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_SemitonesChange->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
-
- m_pTextCtrl_SemitonesChange =
- new wxTextCtrl(this, ID_TEXT_SEMITONESCHANGE, wxT("0.0"),
- wxDefaultPosition,
wxSize(40, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_SemitonesChange->Add(m_pTextCtrl_SemitonesChange, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_SemitonesChange =
+ new wxTextCtrl(this, ID_TEXT_SEMITONESCHANGE, wxT("0.0"),
+ wxDefaultPosition,
wxSize(40, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_SemitonesChange->Add(m_pTextCtrl_SemitonesChange, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pBoxSizer_Dialog->Add(pBoxSizer_SemitonesChange, 0, wxALIGN_CENTER | wxALL,
4);
+ pBoxSizer_Dialog->Add(pBoxSizer_SemitonesChange, 0, wxALIGN_CENTER |
wxALL, 4);
-
- // from/to frequency controls
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
- wxBoxSizer * pBoxSizer_Frequency = new wxBoxSizer(wxHORIZONTAL);
-
- pStaticText = new wxStaticText(this, -1, _("Frequency (Hz): from"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_Frequency->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+
+ // from/to frequency controls
+ pBoxSizer_Dialog->Add(0, 8, 0); // spacer
+ wxBoxSizer * pBoxSizer_Frequency = new wxBoxSizer(wxHORIZONTAL);
+
+ pStaticText = new wxStaticText(this, -1, _("Frequency (Hz): from"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_Frequency->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- m_pTextCtrl_FromFrequency =
- new wxTextCtrl(this, ID_TEXT_FROMFREQUENCY, wxT(""),
- wxDefaultPosition,
wxSize(64, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_Frequency->Add(m_pTextCtrl_FromFrequency, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_FromFrequency =
+ new wxTextCtrl(this, ID_TEXT_FROMFREQUENCY, wxT(""),
+ wxDefaultPosition,
wxSize(64, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_Frequency->Add(m_pTextCtrl_FromFrequency, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pStaticText = new wxStaticText(this, -1, _("to"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_Frequency->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ pStaticText = new wxStaticText(this, -1, _("to"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_Frequency->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- m_pTextCtrl_ToFrequency =
- new wxTextCtrl(this, ID_TEXT_TOFREQUENCY, wxT(""),
- wxDefaultPosition,
wxSize(64, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_Frequency->Add(m_pTextCtrl_ToFrequency, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
+ m_pTextCtrl_ToFrequency =
+ new wxTextCtrl(this, ID_TEXT_TOFREQUENCY, wxT(""),
+ wxDefaultPosition,
wxSize(64, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_Frequency->Add(m_pTextCtrl_ToFrequency, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, 4);
- pBoxSizer_Dialog->Add(pBoxSizer_Frequency, 0, wxALIGN_CENTER | wxALL, 4);
+ pBoxSizer_Dialog->Add(pBoxSizer_Frequency, 0, wxALIGN_CENTER | wxALL, 4);
- // percent change control
-
- // Group percent controls with spacers,
- // rather than static box, so they don't look isolated.
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
+ // percent change control
+
+ // Group percent controls with spacers,
+ // rather than static box, so they don't look isolated.
+ pBoxSizer_Dialog->Add(0, 8, 0); // spacer
- wxBoxSizer * pBoxSizer_PercentChange = new wxBoxSizer(wxHORIZONTAL);
-
- pStaticText = new wxStaticText(this, -1, _("Percent Change:"),
-
wxDefaultPosition, wxDefaultSize, 0);
- pBoxSizer_PercentChange->Add(pStaticText, 0,
-
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
+ wxBoxSizer * pBoxSizer_PercentChange = new wxBoxSizer(wxHORIZONTAL);
+
+ pStaticText = new wxStaticText(this, -1, _("Percent Change:"),
+
wxDefaultPosition, wxDefaultSize, 0);
+ pBoxSizer_PercentChange->Add(pStaticText, 0,
+
wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, 4);
- //v Override wxTextValidator to disallow negative values < -100.0?
- m_pTextCtrl_PercentChange =
- new wxTextCtrl(this, ID_TEXT_PERCENTCHANGE, wxT("0.0"),
- wxDefaultPosition,
wxSize(60, -1), 0,
-
wxTextValidator(wxFILTER_NUMERIC));
- pBoxSizer_PercentChange->Add(m_pTextCtrl_PercentChange, 0,
-
wxALIGN_CENTER_VERTICAL | wxALL, 4);
+ //v Override wxTextValidator to disallow negative values < -100.0?
+ m_pTextCtrl_PercentChange =
+ new wxTextCtrl(this, ID_TEXT_PERCENTCHANGE, wxT("0.0"),
+ wxDefaultPosition,
wxSize(60, -1), 0,
+
wxTextValidator(wxFILTER_NUMERIC));
+ pBoxSizer_PercentChange->Add(m_pTextCtrl_PercentChange, 0,
+
wxALIGN_CENTER_VERTICAL | wxALL, 4);
- pBoxSizer_Dialog->Add(pBoxSizer_PercentChange, 0, wxALIGN_CENTER | wxALL,
4);
+ pBoxSizer_Dialog->Add(pBoxSizer_PercentChange, 0, wxALIGN_CENTER |
wxALL, 4);
- m_pSlider_PercentChange =
- new wxSlider(this, ID_SLIDER_PERCENTCHANGE,
- 0, PERCENTCHANGE_MIN,
PERCENTCHANGE_MAX,
- wxDefaultPosition,
wxSize(100, -1), wxSL_HORIZONTAL);
- pBoxSizer_Dialog->Add(m_pSlider_PercentChange, 1,
- wxGROW
| wxALIGN_CENTER | wxLEFT | wxRIGHT, 4);
+ m_pSlider_PercentChange =
+ new wxSlider(this, ID_SLIDER_PERCENTCHANGE,
+ 0,
PERCENTCHANGE_MIN, PERCENTCHANGE_MAX,
+ wxDefaultPosition,
wxSize(100, -1), wxSL_HORIZONTAL);
+ pBoxSizer_Dialog->Add(m_pSlider_PercentChange, 1,
+
wxGROW | wxALIGN_CENTER | wxLEFT | wxRIGHT, 4);
+ #endif // (AUDACITY_BRANDING != BRAND_CAMP_JAM__EASY)
pBoxSizer_Dialog->Add(0, 8, 0); // spacer
@@ -748,7 +750,12 @@
TransferDataFromWindow();
if (Validate())
+ {
+ #if (AUDACITY_BRANDING == BRAND_CAMP_JAM__EASY)
+ wxMessageBox(_("To return to previous key: Edit menu > Undo."));
+ #endif
EndModal(true);
+ }
else
event.Skip();
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
