Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22303/effects
Modified Files:
Amplify.cpp AutoDuck.cpp BassBoost.cpp ChangePitch.cpp
ChangeSpeed.cpp ChangeTempo.cpp ClickRemoval.cpp
Compressor.cpp Effect.cpp Effect.h Equalization.cpp
Equalization.h FindClipping.cpp Leveller.cpp Normalize.cpp
Phaser.cpp Phaser.h Repeat.cpp TruncSilence.h Wahwah.cpp
Wahwah.h
Log Message:
Layout 'effects' OK/Cancel buttons consistently on all platforms (I hope!).
ShuttleGUI changes by Leland.
Index: Compressor.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Compressor.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Compressor.cpp 30 Jun 2007 20:50:38 -0000 1.38
+++ Compressor.cpp 29 Jul 2007 11:02:34 -0000 1.39
@@ -41,6 +41,7 @@
#include <wx/dcmemory.h>
#include "Compressor.h"
+#include "../ShuttleGui.h"
#include "../WaveTrack.h"
#include "../widgets/Ruler.h"
#include "../AColor.h"
@@ -440,14 +441,13 @@
enum {
ThresholdID = 7100,
RatioID,
- AttackID,
- PreviewID
+ AttackID
};
BEGIN_EVENT_TABLE(CompressorDialog,wxDialog)
EVT_BUTTON( wxID_OK, CompressorDialog::OnOk )
EVT_BUTTON( wxID_CANCEL, CompressorDialog::OnCancel )
- EVT_BUTTON( PreviewID, CompressorDialog::OnPreview )
+ EVT_BUTTON( ID_EFFECT_PREVIEW, CompressorDialog::OnPreview )
EVT_SIZE( CompressorDialog::OnSize )
EVT_SLIDER( ThresholdID, CompressorDialog::OnSlider )
EVT_SLIDER( RatioID, CompressorDialog::OnSlider )
@@ -507,20 +507,8 @@
mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5);
- hSizer = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton *preview = new wxButton(this, PreviewID,
mEffect->GetPreviewName());
- hSizer->Add(preview, 0, wxALIGN_CENTRE|wxALL, 5);
- hSizer->Add(40, 10);
-
- wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
-
- wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
- ok->SetDefault();
- hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
-
- mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ // Preview, OK, & Cancel buttons
+ mainSizer->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
SetAutoLayout(true);
SetSizer(mainSizer);
Index: Equalization.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- Equalization.cpp 30 Jun 2007 20:50:38 -0000 1.67
+++ Equalization.cpp 29 Jul 2007 11:02:34 -0000 1.68
@@ -61,6 +61,7 @@
#include "../Audacity.h"
#include "Equalization.h"
+#include "../ShuttleGui.h"
#include "../PlatformCompatibility.h"
#include "../FileNames.h"
#include "../Envelope.h"
@@ -848,7 +849,7 @@
EVT_BUTTON( ID_DELETE, EqualizationDialog::OnDelete )
EVT_BUTTON( ID_CLEAR, EqualizationDialog::OnClear )
- EVT_BUTTON( ID_PREVIEW, EqualizationDialog::OnPreview )
+ EVT_BUTTON( ID_EFFECT_PREVIEW, EqualizationDialog::OnPreview )
EVT_BUTTON( wxID_OK, EqualizationDialog::OnOk )
EVT_BUTTON( wxID_CANCEL, EqualizationDialog::OnCancel )
EVT_RADIOBUTTON(drawRadioID, EqualizationDialog::OnDrawRadio)
@@ -1043,7 +1044,6 @@
//
void EqualizationDialog::MakeEqualizationDialog()
{
- wxBoxSizer *szrJ;
wxStaticText *txt;
wxButton *btn;
@@ -1240,21 +1240,7 @@
// -------------------------------------------------------------------
// ROW 6: Preview, OK, & Cancel buttons
// -------------------------------------------------------------------
- szrJ = new wxBoxSizer(wxHORIZONTAL);
-
- btn = new wxButton(this, ID_PREVIEW, m_pEffect->GetPreviewName());
- szrJ->Add( btn, 0, wxALIGN_LEFT | wxALL, 4 );
-
- szrJ->Add(80, 4); // horizontal spacer
-
- btn = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
-
- btn = new wxButton(this, wxID_OK, _("&OK"));
- btn->SetDefault();
- szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
-
- szrV->Add( szrJ, 0, wxALIGN_CENTER );
+ szrV->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
// -------------------------------------------------------------------
// Display now
Index: Phaser.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Phaser.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Phaser.h 15 Apr 2007 02:23:26 -0000 1.12
+++ Phaser.h 29 Jul 2007 11:02:34 -0000 1.13
@@ -102,8 +102,6 @@
#define ID_DEPTHSLIDER 10008
#define ID_FEEDBACKTEXT 10009
#define ID_FEEDBACKSLIDER 10010
-wxSizer *CreatePhaserDialog(wxWindow * parent, bool call_fit =
- TRUE, bool set_sizer = TRUE);
//----------------------------------------------------------------------------
// PhaserDialog
Index: ClickRemoval.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ClickRemoval.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ClickRemoval.cpp 7 May 2007 04:56:11 -0000 1.6
+++ ClickRemoval.cpp 29 Jul 2007 11:02:34 -0000 1.7
@@ -57,6 +57,7 @@
#include <wx/intl.h>
#include "ClickRemoval.h"
+#include "../ShuttleGui.h"
#include "../Envelope.h"
// #include "../FFT.h"
#include "../WaveTrack.h"
Index: Phaser.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Phaser.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Phaser.cpp 30 Jun 2007 20:50:38 -0000 1.31
+++ Phaser.cpp 29 Jul 2007 11:02:34 -0000 1.32
@@ -28,6 +28,7 @@
#include "Phaser.h"
+#include "../ShuttleGui.h"
#include "../WaveTrack.h"
#include "../FFT.h"
@@ -39,8 +40,6 @@
#include <math.h>
-#define ID_BUTTON_PREVIEW 10000
-
//
// EffectPhaser
//
@@ -200,7 +199,7 @@
EVT_SLIDER(ID_PHASESLIDER, PhaserDialog::OnPhaseSlider)
EVT_SLIDER(ID_DEPTHSLIDER, PhaserDialog::OnDepthSlider)
EVT_SLIDER(ID_FEEDBACKSLIDER, PhaserDialog::OnFeedbackSlider)
- EVT_BUTTON(ID_BUTTON_PREVIEW, PhaserDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, PhaserDialog::OnPreview)
END_EVENT_TABLE()
PhaserDialog::PhaserDialog(EffectPhaser * effect,
@@ -209,7 +208,131 @@
wxDialog(parent, id, title, position, size, style)
{
m_pEffect = effect;
- CreatePhaserDialog(this, TRUE);
+
+ wxBoxSizer *item0 = new wxBoxSizer(wxVERTICAL);
+
+ wxStaticText *item1 =
+ new wxStaticText(this, -1, _("Phaser by Nasca Octavian Paul"),
+ wxDefaultPosition, wxDefaultSize, 0);
+ item0->Add(item1, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxBoxSizer *item2 = new wxBoxSizer(wxHORIZONTAL);
+
+ wxStaticText *item3 =
+ new wxStaticText(this, -1, _("Stages:"), wxDefaultPosition,
+ wxDefaultSize, 0);
+ item2->Add(item3, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSpinCtrl *item4 =
+ new wxSpinCtrl(this, ID_STAGES, wxT("2"), wxDefaultPosition,
+ wxSize(80, -1), 0, 2, 24, 2);
+ item2->Add(item4, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxBoxSizer *item5 = new wxBoxSizer(wxVERTICAL);
+
+ wxSlider *item6 =
+ new wxSlider(this, ID_DRYWET, 0, DRYWET_MIN, DRYWET_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item5->Add(item6, 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxTOP,
+ 5);
+
+ wxBoxSizer *item7 = new wxBoxSizer(wxHORIZONTAL);
+
+ wxStaticText *item8 =
+ new wxStaticText(this, -1, _("DRY"), wxDefaultPosition,
+ wxDefaultSize, 0);
+ item7->Add(item8, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ item7->Add(10, 10, 1, wxALIGN_CENTRE | wxLEFT | wxRIGHT | wxTOP, 5);
+
+ wxStaticText *item9 =
+ new wxStaticText(this, -1, _("WET"), wxDefaultPosition,
+ wxDefaultSize, 0);
+ item7->Add(item9, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ item5->Add(item7, 1,
+ wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
+
+ item2->Add(item5, 1, wxALIGN_CENTRE | wxALL, 5);
+
+ item0->Add(item2, 0, wxGROW | wxALIGN_CENTER_VERTICAL | wxALL, 5);
+
+ wxFlexGridSizer *item10 = new wxFlexGridSizer(3, 0, 0);
+
+ wxStaticText *item11 =
+ new wxStaticText(this, -1, _("LFO Frequency (Hz):"),
+ wxDefaultPosition, wxDefaultSize, 0);
+ item10->Add(item11, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item12 =
+ new wxTextCtrl(this, ID_FREQTEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item12, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item13 =
+ new wxSlider(this, ID_FREQSLIDER, 100, FREQ_MIN, FREQ_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item13, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item14 =
+ new wxStaticText(this, -1, _("LFO Start Phase (deg.):"),
+ wxDefaultPosition, wxDefaultSize, 0);
+ item10->Add(item14, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item15 =
+ new wxTextCtrl(this, ID_PHASETEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item15, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item16 =
+ new wxSlider(this, ID_PHASESLIDER, 0, PHASE_MIN, PHASE_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item16, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item17 =
+ new wxStaticText(this, -1, _("Depth:"), wxDefaultPosition,
+ wxDefaultSize, wxALIGN_RIGHT);
+ item10->Add(item17, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item18 =
+ new wxTextCtrl(this, ID_DEPTHTEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item18, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item19 =
+ new wxSlider(this, ID_DEPTHSLIDER, 0, DEPTH_MIN, DEPTH_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item19, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item20 =
+ new wxStaticText(this, -1, _("Feedback (%):"),
+ wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
+ item10->Add(item20, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item21 =
+ new wxTextCtrl(this, ID_FEEDBACKTEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item21, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item22 =
+ new wxSlider(this, ID_FEEDBACKSLIDER, 0, FB_MIN, FB_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item22, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ item0->Add(item10, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ // Preview, OK, & Cancel buttons
+ item0->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
+
+ SetAutoLayout(TRUE);
+ SetSizer(item0);
+ item0->Fit(this);
+ item0->SetSizeHints(this);
}
bool PhaserDialog::Validate()
@@ -466,161 +589,6 @@
EndModal(false);
}
-// Implement window functions
-
-wxSizer *CreatePhaserDialog(wxWindow * parent, bool call_fit,
- bool set_sizer)
-{
- wxBoxSizer *item0 = new wxBoxSizer(wxVERTICAL);
-
- wxStaticText *item1 =
- new wxStaticText(parent, -1, _("Phaser by Nasca Octavian Paul"),
- wxDefaultPosition, wxDefaultSize, 0);
- item0->Add(item1, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxBoxSizer *item2 = new wxBoxSizer(wxHORIZONTAL);
-
- wxStaticText *item3 =
- new wxStaticText(parent, -1, _("Stages:"), wxDefaultPosition,
- wxDefaultSize, 0);
- item2->Add(item3, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSpinCtrl *item4 =
- new wxSpinCtrl(parent, ID_STAGES, wxT("2"), wxDefaultPosition,
- wxSize(80, -1), 0, 2, 24, 2);
- item2->Add(item4, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxBoxSizer *item5 = new wxBoxSizer(wxVERTICAL);
-
- wxSlider *item6 =
- new wxSlider(parent, ID_DRYWET, 0, DRYWET_MIN, DRYWET_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item5->Add(item6, 1,
- wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxTOP,
- 5);
-
- wxBoxSizer *item7 = new wxBoxSizer(wxHORIZONTAL);
-
- wxStaticText *item8 =
- new wxStaticText(parent, -1, _("DRY"), wxDefaultPosition,
- wxDefaultSize, 0);
- item7->Add(item8, 0, wxALIGN_CENTRE | wxALL, 5);
-
- item7->Add(10, 10, 1, wxALIGN_CENTRE | wxLEFT | wxRIGHT | wxTOP, 5);
-
- wxStaticText *item9 =
- new wxStaticText(parent, -1, _("WET"), wxDefaultPosition,
- wxDefaultSize, 0);
- item7->Add(item9, 0, wxALIGN_CENTRE | wxALL, 5);
-
- item5->Add(item7, 1,
- wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
-
- item2->Add(item5, 1, wxALIGN_CENTRE | wxALL, 5);
-
- item0->Add(item2, 0, wxGROW | wxALIGN_CENTER_VERTICAL | wxALL, 5);
-
- wxFlexGridSizer *item10 = new wxFlexGridSizer(3, 0, 0);
-
- wxStaticText *item11 =
- new wxStaticText(parent, -1, _("LFO Frequency (Hz):"),
- wxDefaultPosition, wxDefaultSize, 0);
- item10->Add(item11, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item12 =
- new wxTextCtrl(parent, ID_FREQTEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item12, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item13 =
- new wxSlider(parent, ID_FREQSLIDER, 100, FREQ_MIN, FREQ_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item13, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item14 =
- new wxStaticText(parent, -1, _("LFO Start Phase (deg.):"),
- wxDefaultPosition, wxDefaultSize, 0);
- item10->Add(item14, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item15 =
- new wxTextCtrl(parent, ID_PHASETEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item15, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item16 =
- new wxSlider(parent, ID_PHASESLIDER, 0, PHASE_MIN, PHASE_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item16, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item17 =
- new wxStaticText(parent, -1, _("Depth:"), wxDefaultPosition,
- wxDefaultSize, wxALIGN_RIGHT);
- item10->Add(item17, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item18 =
- new wxTextCtrl(parent, ID_DEPTHTEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item18, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item19 =
- new wxSlider(parent, ID_DEPTHSLIDER, 0, DEPTH_MIN, DEPTH_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item19, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item20 =
- new wxStaticText(parent, -1, _("Feedback (%):"),
- wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
- item10->Add(item20, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item21 =
- new wxTextCtrl(parent, ID_FEEDBACKTEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item21, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item22 =
- new wxSlider(parent, ID_FEEDBACKSLIDER, 0, FB_MIN, FB_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item22, 0, wxALIGN_CENTRE | wxALL, 5);
-
- item0->Add(item10, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxBoxSizer *item23 = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(parent, ID_BUTTON_PREVIEW,
- _("Pre&view")); //v
Should be m_pEffect->GetPreviewName().
- item23->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
- item23->Add(20, 10); // horizontal spacer
-
- wxButton *item25 =
- new wxButton(parent, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
- wxDefaultSize, 0);
- item23->Add(item25, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxButton *item24 =
- new wxButton(parent, wxID_OK, _("&OK"), wxDefaultPosition,
- wxDefaultSize, 0);
- item24->SetDefault();
- item23->Add(item24, 0, wxALIGN_CENTRE | wxALL, 5);
-
- item0->Add(item23, 0, wxALIGN_CENTRE | wxALL, 5);
-
- if (set_sizer) {
- parent->SetAutoLayout(TRUE);
- parent->SetSizer(item0);
- if (call_fit) {
- item0->Fit(parent);
- item0->SetSizeHints(parent);
- }
- }
-
- return item0;
-}
-
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
Index: ChangeSpeed.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeSpeed.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeSpeed.cpp 30 Jun 2007 20:50:38 -0000 1.36
+++ ChangeSpeed.cpp 29 Jul 2007 11:02:34 -0000 1.37
@@ -23,6 +23,7 @@
#include "ChangeSpeed.h"
+#include "../ShuttleGui.h"
#include "../Envelope.h"
#include "../Prefs.h"
@@ -245,8 +246,7 @@
ID_TEXT_PERCENTCHANGE = 10001,
ID_SLIDER_PERCENTCHANGE,
ID_CHOICE_FROMVINYL,
- ID_CHOICE_TOVINYL,
- ID_BUTTON_PREVIEW
+ ID_CHOICE_TOVINYL
};
@@ -261,7 +261,7 @@
EVT_CHOICE(ID_CHOICE_FROMVINYL, ChangeSpeedDialog::OnChoice_FromVinyl)
EVT_CHOICE(ID_CHOICE_TOVINYL, ChangeSpeedDialog::OnChoice_ToVinyl)
- EVT_BUTTON(ID_BUTTON_PREVIEW, ChangeSpeedDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, ChangeSpeedDialog::OnPreview)
END_EVENT_TABLE()
ChangeSpeedDialog::ChangeSpeedDialog(EffectChangeSpeed * effect,
@@ -377,28 +377,8 @@
pBoxSizer_Dialog->Add(pBoxSizer_Vinyl, 0, wxALIGN_CENTER | wxALL, 4);
-
- // Preview, OK, & Cancel buttons
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
-
- wxBoxSizer * pBoxSizer_OK = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(this, ID_BUTTON_PREVIEW,
m_pEffect->GetPreviewName());
- pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 4);
- pBoxSizer_OK->Add(32, 8); // horizontal spacer
-
- wxButton * pButton_Cancel =
- new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
wxDefaultSize, 0);
- pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
-
- wxButton * pButton_OK =
- new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize,
0);
- pButton_OK->SetDefault();
- pBoxSizer_OK->Add(pButton_OK, 0, wxALIGN_CENTER | wxALL, 4);
-
- pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 8);
-
+ // Preview, OK, & Cancel buttons
+ pBoxSizer_Dialog->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
this->SetAutoLayout(true);
this->SetSizer(pBoxSizer_Dialog);
Index: Equalization.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Equalization.h 17 May 2007 22:35:58 -0000 1.28
+++ Equalization.h 29 Jul 2007 11:02:34 -0000 1.29
@@ -266,7 +266,6 @@
ID_SAVEAS,
ID_DELETE,
ID_CLEAR,
- ID_PREVIEW,
drawRadioID,
sliderRadioID,
ID_INTERP,
Index: Effect.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Effect.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Effect.h 12 Mar 2007 09:23:11 -0000 1.29
+++ Effect.h 29 Jul 2007 11:02:34 -0000 1.30
@@ -282,7 +282,7 @@
// Base dialog for generate effect
class wxDialog;
-#define ID_EFFECT_PREVIEW wxID_APPLY
+#define ID_EFFECT_PREVIEW ePreviewID
// Base dialog for regular effect
class EffectDialog:public wxDialog
Index: TruncSilence.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/TruncSilence.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TruncSilence.h 4 Jul 2007 17:50:47 -0000 1.4
+++ TruncSilence.h 29 Jul 2007 11:02:35 -0000 1.5
@@ -25,7 +25,7 @@
EffectTruncSilence();
virtual wxString GetEffectName() {
- return wxString(_("Truncate Silence"));
+ return wxString(_("Truncate Silence..."));
}
virtual wxString GetEffectIdentifier() {
Index: Normalize.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Normalize.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Normalize.cpp 30 Jun 2007 20:50:38 -0000 1.17
+++ Normalize.cpp 29 Jul 2007 11:02:34 -0000 1.18
@@ -25,6 +25,7 @@
#include <math.h>
#include "Normalize.h"
+#include "../ShuttleGui.h"
#include "../Internat.h"
#include "../WaveTrack.h"
#include "../Prefs.h"
@@ -289,7 +290,6 @@
// NormalizeDialog
//----------------------------------------------------------------------------
-#define ID_BUTTON_PREVIEW 10001
#define ID_NORMALIZE_AMPLITUDE 10002
#define ID_LEVEL_STATIC_MINUS 10003
#define ID_LEVEL_STATIC_DB 10004
@@ -298,7 +298,7 @@
BEGIN_EVENT_TABLE(NormalizeDialog,wxDialog)
EVT_BUTTON( wxID_OK, NormalizeDialog::OnOk )
EVT_BUTTON( wxID_CANCEL, NormalizeDialog::OnCancel )
- EVT_BUTTON(ID_BUTTON_PREVIEW, NormalizeDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, NormalizeDialog::OnPreview)
EVT_CHECKBOX(ID_NORMALIZE_AMPLITUDE, NormalizeDialog::OnUpdateUI)
END_EVENT_TABLE()
@@ -343,21 +343,8 @@
wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
mainSizer->Add(levelSizer, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL, 0);
- wxBoxSizer *hSizer = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(this, ID_BUTTON_PREVIEW,
mEffect->GetPreviewName());
- hSizer->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
- hSizer->Add(20, 10); // horizontal spacer
-
- wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
-
- wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
- ok->SetDefault();
- hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
-
- mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ // Preview, OK, & Cancel buttons
+ mainSizer->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
SetAutoLayout(true);
SetSizer(mainSizer);
Index: Wahwah.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Wahwah.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Wahwah.h 15 Apr 2007 02:23:26 -0000 1.12
+++ Wahwah.h 29 Jul 2007 11:02:35 -0000 1.13
@@ -79,7 +79,6 @@
// Declare window functions
-#define ID_BUTTON_PREVIEW 10000
#define ID_FREQTEXT 10003
#define ID_FREQSLIDER 10004
#define ID_PHASETEXT 10005
@@ -91,9 +90,6 @@
#define ID_FREQOFFTEXT 10011
#define ID_FREQOFFSLIDER 10012
-wxSizer *CreateWahwahDialog(wxWindow * parent, bool call_fit =
- TRUE, bool set_sizer = TRUE);
-
// WDR: class declarations
//----------------------------------------------------------------------------
Index: Wahwah.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Wahwah.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Wahwah.cpp 30 Jun 2007 20:50:38 -0000 1.31
+++ Wahwah.cpp 29 Jul 2007 11:02:35 -0000 1.32
@@ -28,6 +28,7 @@
#include "../Audacity.h"
#include "Wahwah.h"
+#include "../ShuttleGui.h"
#include "../WaveTrack.h"
#include "../FFT.h"
@@ -197,7 +198,7 @@
EVT_SLIDER(ID_PHASESLIDER, WahwahDialog::OnPhaseSlider)
EVT_SLIDER(ID_DEPTHSLIDER, WahwahDialog::OnDepthSlider)
EVT_SLIDER(ID_RESONANCESLIDER, WahwahDialog::OnResonanceSlider)
- EVT_BUTTON(ID_BUTTON_PREVIEW, WahwahDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, WahwahDialog::OnPreview)
END_EVENT_TABLE()
WahwahDialog::WahwahDialog(EffectWahwah * effect,
@@ -206,7 +207,105 @@
wxDialog(parent, id, title, position, size, style)
{
m_pEffect = effect;
- CreateWahwahDialog(this, TRUE);
+
+ wxBoxSizer *item0 = new wxBoxSizer(wxVERTICAL);
+
+ wxStaticText *item1 =
+ new wxStaticText(this, -1, _("Wahwah by Nasca Octavian Paul"),
+ wxDefaultPosition, wxDefaultSize, 0);
+ item0->Add(item1, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxFlexGridSizer *item10 = new wxFlexGridSizer(3, 0, 0);
+
+ wxStaticText *item11 =
+ new wxStaticText(this, -1, _("LFO Frequency (Hz):"),
+ wxDefaultPosition, wxDefaultSize, 0);
+ item10->Add(item11, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item12 =
+ new wxTextCtrl(this, ID_FREQTEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item12, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item13 =
+ new wxSlider(this, ID_FREQSLIDER, 100, FREQ_MIN, FREQ_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item13, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item14 =
+ new wxStaticText(this, -1, _("LFO Start Phase (deg.):"),
+ wxDefaultPosition, wxDefaultSize, 0);
+ item10->Add(item14, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item15 =
+ new wxTextCtrl(this, ID_PHASETEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item15, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item16 =
+ new wxSlider(this, ID_PHASESLIDER, 0, PHASE_MIN, PHASE_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item16, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item17 =
+ new wxStaticText(this, -1, _("Depth (%):"), wxDefaultPosition,
+ wxDefaultSize, wxALIGN_RIGHT);
+ item10->Add(item17, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item18 =
+ new wxTextCtrl(this, ID_DEPTHTEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item18, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item19 =
+ new wxSlider(this, ID_DEPTHSLIDER, 0, DEPTH_MIN, DEPTH_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item19, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item20 =
+ new wxStaticText(this, -1, _("Resonance:"), wxDefaultPosition,
+ wxDefaultSize, wxALIGN_RIGHT);
+ item10->Add(item20, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item21 =
+ new wxTextCtrl(this, ID_RESONANCETEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item21, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item22 =
+ new wxSlider(this, ID_RESONANCESLIDER, 0, RES_MIN, RES_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item22, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxStaticText *item30 =
+ new wxStaticText(this, -1, _("Wah Frequency Offset (%):"),
+ wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
+ item10->Add(item30, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
+ 5);
+
+ wxTextCtrl *item31 =
+ new wxTextCtrl(this, ID_FREQOFFTEXT, wxT(""), wxDefaultPosition,
+ wxSize(40, -1), 0);
+ item10->Add(item31, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ wxSlider *item32 =
+ new wxSlider(this, ID_FREQOFFSLIDER, 0, FREQOFF_MIN, FREQOFF_MAX,
+ wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
+ item10->Add(item32, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ item0->Add(item10, 0, wxALIGN_CENTRE | wxALL, 5);
+
+ // Preview, OK, & Cancel buttons
+ item0->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
+
+ SetAutoLayout(TRUE);
+ SetSizer(item0);
+ item0->Fit(this);
+ item0->SetSizeHints(this);
}
bool WahwahDialog::Validate()
@@ -479,135 +578,6 @@
EndModal(false);
}
-// Implement window functions
-
-wxSizer *CreateWahwahDialog(wxWindow * parent, bool call_fit,
- bool set_sizer)
-{
- wxBoxSizer *item0 = new wxBoxSizer(wxVERTICAL);
-
- wxStaticText *item1 =
- new wxStaticText(parent, -1, _("Wahwah by Nasca Octavian Paul"),
- wxDefaultPosition, wxDefaultSize, 0);
- item0->Add(item1, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxFlexGridSizer *item10 = new wxFlexGridSizer(3, 0, 0);
-
- wxStaticText *item11 =
- new wxStaticText(parent, -1, _("LFO Frequency (Hz):"),
- wxDefaultPosition, wxDefaultSize, 0);
- item10->Add(item11, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item12 =
- new wxTextCtrl(parent, ID_FREQTEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item12, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item13 =
- new wxSlider(parent, ID_FREQSLIDER, 100, FREQ_MIN, FREQ_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item13, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item14 =
- new wxStaticText(parent, -1, _("LFO Start Phase (deg.):"),
- wxDefaultPosition, wxDefaultSize, 0);
- item10->Add(item14, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item15 =
- new wxTextCtrl(parent, ID_PHASETEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item15, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item16 =
- new wxSlider(parent, ID_PHASESLIDER, 0, PHASE_MIN, PHASE_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item16, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item17 =
- new wxStaticText(parent, -1, _("Depth (%):"), wxDefaultPosition,
- wxDefaultSize, wxALIGN_RIGHT);
- item10->Add(item17, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item18 =
- new wxTextCtrl(parent, ID_DEPTHTEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item18, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item19 =
- new wxSlider(parent, ID_DEPTHSLIDER, 0, DEPTH_MIN, DEPTH_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item19, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item20 =
- new wxStaticText(parent, -1, _("Resonance:"), wxDefaultPosition,
- wxDefaultSize, wxALIGN_RIGHT);
- item10->Add(item20, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item21 =
- new wxTextCtrl(parent, ID_RESONANCETEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item21, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item22 =
- new wxSlider(parent, ID_RESONANCESLIDER, 0, RES_MIN, RES_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item22, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxStaticText *item30 =
- new wxStaticText(parent, -1, _("Wah Frequency Offset (%):"),
- wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
- item10->Add(item30, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL,
- 5);
-
- wxTextCtrl *item31 =
- new wxTextCtrl(parent, ID_FREQOFFTEXT, wxT(""), wxDefaultPosition,
- wxSize(40, -1), 0);
- item10->Add(item31, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxSlider *item32 =
- new wxSlider(parent, ID_FREQOFFSLIDER, 0, FREQOFF_MIN, FREQOFF_MAX,
- wxDefaultPosition, wxSize(100, -1), wxSL_HORIZONTAL);
- item10->Add(item32, 0, wxALIGN_CENTRE | wxALL, 5);
-
- item0->Add(item10, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxBoxSizer *item23 = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(parent, ID_BUTTON_PREVIEW,
- _("Pre&view")); //v
Should be m_pEffect->GetPreviewName().
- item23->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
- item23->Add(20, 10); // horizontal spacer
-
- wxButton *item25 =
- new wxButton(parent, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
- wxDefaultSize, 0);
- item23->Add(item25, 0, wxALIGN_CENTRE | wxALL, 5);
-
- wxButton *item24 =
- new wxButton(parent, wxID_OK, _("&OK"), wxDefaultPosition,
- wxDefaultSize, 0);
- item24->SetDefault();
- item23->Add(item24, 0, wxALIGN_CENTRE | wxALL, 5);
-
- item0->Add(item23, 0, wxALIGN_CENTRE | wxALL, 5);
-
- if (set_sizer) {
- parent->SetAutoLayout(TRUE);
- parent->SetSizer(item0);
- if (call_fit) {
- item0->Fit(parent);
- item0->SetSizeHints(parent);
- }
- }
-
- return item0;
-}
-
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
Index: Effect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Effect.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Effect.cpp 4 Jul 2007 09:10:03 -0000 1.44
+++ Effect.cpp 29 Jul 2007 11:02:34 -0000 1.45
@@ -372,45 +372,20 @@
{
PopulateOrExchange(S);
- S.SetBorder(5);
- S.StartHorizontalLay(wxALIGN_BOTTOM | wxALIGN_CENTER, false);
+ long buttons = eOkButton;
+
+ if (mType == PROCESS_EFFECT || mType == INSERT_EFFECT)
{
+ buttons |= eCancelButton;
if (mType == PROCESS_EFFECT)
{
- S.StartHorizontalLay(wxALIGN_LEFT, false);
- {
- S.Id(ID_EFFECT_PREVIEW).AddButton(_("Pre&view"));
- }
- S.EndHorizontalLay();
-
- S.SetBorder(10);
- S.StartHorizontalLay(wxALIGN_LEFT, false);
- {
- // Everyone needs a little space sometime
- }
- S.EndHorizontalLay();
- S.SetBorder(5);
- }
-
- S.StartHorizontalLay(wxALIGN_CENTER, false);
- {
-#if defined(__WXGTK20__) || defined(__WXMAC__)
- S.Id(wxID_CANCEL)
- .AddButton(_("&Cancel"))
- ->Show( mType == PROCESS_EFFECT || mType == INSERT_EFFECT);
- S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
-#else
- S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
- S.Id(wxID_CANCEL)
- .AddButton(_("&Cancel"))
- ->Show( mType == PROCESS_EFFECT || mType == INSERT_EFFECT);
-#endif
+ buttons |= ePreviewButton;
}
}
- S.EndHorizontalLay();
+ S.AddStandardButtons(buttons);
}
S.EndVerticalLay();
- GetSizer()->AddSpacer(5);
+
Layout();
Fit();
SetMinSize(GetSize());
Index: BassBoost.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/BassBoost.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- BassBoost.cpp 9 Jul 2006 05:43:29 -0000 1.31
+++ BassBoost.cpp 29 Jul 2007 11:02:33 -0000 1.32
@@ -166,7 +166,7 @@
BassBoostDialog::BassBoostDialog(EffectBassBoost *effect,
wxWindow * parent):
- EffectDialog(parent, _("BassBoost"), PROCESS_EFFECT),
+ EffectDialog(parent, _("Bass Boost"), PROCESS_EFFECT),
mEffect(effect)
{
Init();
Index: Leveller.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Leveller.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Leveller.cpp 30 Jun 2007 20:50:38 -0000 1.16
+++ Leveller.cpp 29 Jul 2007 11:02:34 -0000 1.17
@@ -245,16 +245,8 @@
group->Add(hSizer, 0, wxALIGN_CENTRE|wxALL, 5 );
mainSizer->Add(group, 0, wxALIGN_CENTRE | wxALL, 5);
- hSizer = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
-
- wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
- ok->SetDefault();
- hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
-
- mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ // Preview, OK, & Cancel buttons
+ mainSizer->Add(CreateStdButtonSizer(this, eCancelButton|eOkButton), 0,
wxEXPAND);
SetAutoLayout(true);
SetSizer(mainSizer);
Index: ChangePitch.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangePitch.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangePitch.cpp 30 Jun 2007 20:50:38 -0000 1.40
+++ ChangePitch.cpp 29 Jul 2007 11:02:34 -0000 1.41
@@ -17,6 +17,7 @@
#include "ChangePitch.h"
+#include "../ShuttleGui.h"
#include "../PitchName.h"
#include "../Spectrum.h"
#include "../WaveTrack.h"
@@ -172,8 +173,7 @@
ID_CHOICE_TOPITCH,
ID_TEXT_SEMITONESCHANGE,
ID_TEXT_FROMFREQUENCY,
- ID_TEXT_TOFREQUENCY,
- ID_BUTTON_PREVIEW
+ ID_TEXT_TOFREQUENCY
};
// event table for ChangePitchDialog
@@ -194,7 +194,7 @@
EVT_TEXT(ID_TEXT_PERCENTCHANGE, ChangePitchDialog::OnText_PercentChange)
EVT_SLIDER(ID_SLIDER_PERCENTCHANGE,
ChangePitchDialog::OnSlider_PercentChange)
- EVT_BUTTON(ID_BUTTON_PREVIEW, ChangePitchDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, ChangePitchDialog::OnPreview)
END_EVENT_TABLE()
@@ -379,28 +379,8 @@
pBoxSizer_Dialog->Add(0, 8, 0); // spacer
-
- // Preview, OK, & Cancel buttons
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
-
- wxBoxSizer * pBoxSizer_OK = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(this, ID_BUTTON_PREVIEW,
m_pEffect->GetPreviewName());
- pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 4);
- pBoxSizer_OK->Add(32, 8); // horizontal spacer
-
- wxButton * pButton_Cancel =
- new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
wxDefaultSize, 0);
- pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
-
- wxButton * pButton_OK =
- new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize,
0);
- pButton_OK->SetDefault();
- pBoxSizer_OK->Add(pButton_OK, 0, wxALIGN_CENTER | wxALL, 4);
-
- pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 8);
-
+ // Preview, OK, & Cancel buttons
+ pBoxSizer_Dialog->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
this->SetAutoLayout(true);
this->SetSizer(pBoxSizer_Dialog);
Index: Amplify.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Amplify.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Amplify.cpp 30 Jun 2007 20:50:38 -0000 1.37
+++ Amplify.cpp 29 Jul 2007 11:02:33 -0000 1.38
@@ -27,6 +27,7 @@
#include "Amplify.h"
+#include "../ShuttleGui.h"
#include "../WaveTrack.h"
#include <math.h>
@@ -37,8 +38,6 @@
#include <wx/textctrl.h>
#include <wx/valtext.h>
-#define ID_BUTTON_PREVIEW 10005
-
//
// EffectAmplify
//
@@ -129,7 +128,7 @@
EVT_TEXT(ID_AMP_TEXT, AmplifyDialog::OnAmpText)
EVT_TEXT(ID_PEAK_TEXT, AmplifyDialog::OnPeakText)
EVT_CHECKBOX(ID_CLIP_CHECKBOX, AmplifyDialog::OnClipCheckBox)
- EVT_BUTTON(ID_BUTTON_PREVIEW, AmplifyDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, AmplifyDialog::OnPreview)
END_EVENT_TABLE()
AmplifyDialog::AmplifyDialog(EffectAmplify * effect,
@@ -194,28 +193,8 @@
pBoxSizer_Dialog->Add(item8b, 0, wxALIGN_CENTER | wxALL, 5);
-
// Preview, OK, & Cancel buttons
- pBoxSizer_Dialog->Add(0, 10, 0); // spacer
-
- wxBoxSizer * pBoxSizer_OK = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(this, ID_BUTTON_PREVIEW, m_pEffect->GetPreviewName());
- pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 5);
- pBoxSizer_OK->Add(25, 8); // horizontal spacer
-
- wxButton *item11 =
- new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
- wxDefaultSize, 0);
- pBoxSizer_OK->Add(item11, 0, wxALIGN_CENTER | wxALL, 5);
-
- wxButton *item10 =
- new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize,
0);
- item10->SetDefault();
- pBoxSizer_OK->Add(item10, 0, wxALIGN_CENTER | wxALL, 5);
-
- pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 5);
+ pBoxSizer_Dialog->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
SetAutoLayout(TRUE);
SetSizer(pBoxSizer_Dialog);
Index: ChangeTempo.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ChangeTempo.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeTempo.cpp 30 Jun 2007 20:50:38 -0000 1.34
+++ ChangeTempo.cpp 29 Jul 2007 11:02:34 -0000 1.35
@@ -26,6 +26,8 @@
#include "ChangeTempo.h"
+#include "../ShuttleGui.h"
+
#include <math.h>
#include <wx/button.h>
@@ -119,7 +121,6 @@
#define ID_TEXT_TOBPM 10004
#define ID_TEXT_FROMLENGTH 10005
#define ID_TEXT_TOLENGTH 10006
-#define ID_BUTTON_PREVIEW 10009
// event table for ChangeTempoDialog
@@ -133,7 +134,7 @@
EVT_TEXT(ID_TEXT_TOBPM, ChangeTempoDialog::OnText_ToBPM)
EVT_TEXT(ID_TEXT_TOLENGTH, ChangeTempoDialog::OnText_ToLength)
- EVT_BUTTON(ID_BUTTON_PREVIEW, ChangeTempoDialog::OnPreview)
+ EVT_BUTTON(ID_EFFECT_PREVIEW, ChangeTempoDialog::OnPreview)
END_EVENT_TABLE()
ChangeTempoDialog::ChangeTempoDialog(EffectChangeTempo * effect,
@@ -280,28 +281,8 @@
pBoxSizer_Dialog->Add(pBoxSizer_Length, 0, wxALIGN_CENTER | wxALL, 4);
-
- // Preview, OK, & Cancel buttons
- pBoxSizer_Dialog->Add(0, 8, 0); // spacer
-
- wxBoxSizer * pBoxSizer_OK = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton * pButton_Preview =
- new wxButton(this, ID_BUTTON_PREVIEW,
m_pEffect->GetPreviewName());
- pBoxSizer_OK->Add(pButton_Preview, 0, wxALIGN_CENTER | wxALL, 4);
- pBoxSizer_OK->Add(32, 8); // horizontal spacer
-
- wxButton * pButton_Cancel =
- new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition,
wxDefaultSize, 0);
- pBoxSizer_OK->Add(pButton_Cancel, 0, wxALIGN_CENTER | wxALL, 4);
-
- wxButton * pButton_OK =
- new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize,
0);
- pButton_OK->SetDefault();
- pBoxSizer_OK->Add(pButton_OK, 0, wxALIGN_CENTER | wxALL, 4);
-
- pBoxSizer_Dialog->Add(pBoxSizer_OK, 0, wxALIGN_CENTER | wxALL, 8);
-
+ // Preview, OK, & Cancel buttons
+ pBoxSizer_Dialog->Add(CreateStdButtonSizer(this,
ePreviewButton|eCancelButton|eOkButton), 0, wxEXPAND);
this->SetAutoLayout(true);
this->SetSizer(pBoxSizer_Dialog);
Index: Repeat.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Repeat.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Repeat.cpp 30 Jun 2007 20:50:38 -0000 1.18
+++ Repeat.cpp 29 Jul 2007 11:02:34 -0000 1.19
@@ -23,6 +23,7 @@
#include "../Audacity.h"
#include "Repeat.h"
+#include "../ShuttleGui.h"
#include "../WaveTrack.h"
#include <wx/button.h>
@@ -266,16 +267,8 @@
hSizer->Add(mTotalTime, 1, wxALL | wxEXPAND, 5);
mainSizer->Add(hSizer, 0, wxALIGN_CENTRE | wxALL, 5);
- hSizer = new wxBoxSizer(wxHORIZONTAL);
-
- wxButton *cancel = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- hSizer->Add(cancel, 0, wxALIGN_CENTRE|wxALL, 5);
-
- wxButton *ok = new wxButton(this, wxID_OK, _("&OK"));
- ok->SetDefault();
- hSizer->Add(ok, 0, wxALIGN_CENTRE|wxALL, 5);
-
- mainSizer->Add(hSizer, 0, wxALIGN_CENTRE|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ // OK & Cancel buttons
+ mainSizer->Add(CreateStdButtonSizer(this, eCancelButton|eOkButton), 0,
wxEXPAND);
SetAutoLayout(true);
SetSizer(mainSizer);
Index: FindClipping.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/FindClipping.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FindClipping.cpp 24 Jul 2007 07:15:59 -0000 1.1
+++ FindClipping.cpp 29 Jul 2007 11:02:34 -0000 1.2
@@ -151,7 +151,7 @@
}
float v = fabs(*ptr++);
- if (v >= 1.0) {
+ if (v >= 1.0) { //0.99996948
if (startrun == 0) {
startTime = t->LongSamplesToTime(start + s);
samps = 0;
@@ -195,7 +195,7 @@
//----------------------------------------------------------------------------
FindClippingDialog::FindClippingDialog(EffectFindClipping * effect, wxWindow *
parent)
-: EffectDialog(parent, _("Find Clipping"), ANALYZE_EFFECT)
+: EffectDialog(parent, _("Find Clipping"), INSERT_EFFECT)
{
mEffect = effect;
Index: AutoDuck.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/AutoDuck.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AutoDuck.cpp 12 Mar 2007 09:23:10 -0000 1.5
+++ AutoDuck.cpp 29 Jul 2007 11:02:33 -0000 1.6
@@ -437,7 +437,7 @@
BEGIN_EVENT_TABLE(EffectAutoDuckDialog, wxDialog)
EVT_BUTTON(wxID_OK, EffectAutoDuckDialog::OnOk)
- EVT_BUTTON(wxID_OK, EffectAutoDuckDialog::OnCancel)
+ EVT_BUTTON(wxID_CANCEL, EffectAutoDuckDialog::OnCancel)
EVT_TEXT(ID_DUCK_AMOUNT_DB, EffectAutoDuckDialog::OnValueChanged)
EVT_TEXT(ID_THRESHOLD_DB, EffectAutoDuckDialog::OnValueChanged)
EVT_TEXT(ID_INNER_FADE_DOWN_LEN, EffectAutoDuckDialog::OnValueChanged)
@@ -522,21 +522,11 @@
}
S.EndMultiColumn();
- S.StartHorizontalLay(wxALIGN_CENTER, false);
- {
-#if defined(__WXGTK20__) || defined(__WXMAC__)
- S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
- S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
-#else
- S.Id(wxID_OK).AddButton(_("&OK"))->SetDefault();
- S.Id(wxID_CANCEL).AddButton(_("&Cancel"));
-#endif
- }
- S.EndHorizontalLay();
}
S.EndVerticalLay();
- GetSizer()->AddSpacer(5);
+ S.AddStandardButtons();
+
Layout();
Fit();
SetMinSize(GetSize());
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
