Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1825/src/effects
Modified Files:
Equalization.cpp Equalization.h
Log Message:
Remove 'interpolation' choice box when not needed. Improve layout.
Index: Equalization.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Equalization.cpp 25 Jan 2007 03:01:11 -0000 1.49
+++ Equalization.cpp 6 Feb 2007 23:25:12 -0000 1.50
@@ -786,7 +786,7 @@
dBMin = -30.;
dBMax = 30;
-#if wxUSE_TOOLTOPS
+#if wxUSE_TOOLTIPS
wxToolTip::Enable(true);
#endif
@@ -951,7 +951,7 @@
//
void EqualizationDialog::MakeEqualizationDialog()
{
- wxBoxSizer *szrH;
+ wxBoxSizer *szrJ;
wxStaticText *txt;
wxButton *btn;
@@ -1117,7 +1117,11 @@
3, interpChoiceStrings);
mInterpChoice->SetSelection(0);
- szrH->Add( mInterpChoice, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 80 );
+ szrI = new wxBoxSizer( wxHORIZONTAL );
+ szrI->Add( mInterpChoice, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 40
);
+ szrH->Add( szrI );
+ szrL = new wxBoxSizer( wxHORIZONTAL );
+ szrH->Add(szrL); // either szrI or szrL are visible, not both.
// -------------------------------------------------------------------
// ROW 5b: Filter length grouping
@@ -1143,21 +1147,21 @@
// -------------------------------------------------------------------
// ROW 6: Preview, OK, & Cancel buttons
// -------------------------------------------------------------------
- szrH = new wxBoxSizer(wxHORIZONTAL);
+ szrJ = new wxBoxSizer(wxHORIZONTAL);
btn = new wxButton(this, ID_PREVIEW, m_pEffect->GetPreviewName());
- szrH->Add( btn, 0, wxALIGN_LEFT | wxALL, 4 );
+ szrJ->Add( btn, 0, wxALIGN_LEFT | wxALL, 4 );
- szrH->Add(80, 4); // horizontal spacer
+ szrJ->Add(80, 4); // horizontal spacer
btn = new wxButton(this, wxID_CANCEL, _("&Cancel"));
- szrH->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
+ szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
btn = new wxButton(this, wxID_OK, _("&OK"));
btn->SetDefault();
- szrH->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
+ szrJ->Add( btn, 0, wxALIGN_RIGHT | wxALL, 4 );
- szrV->Add( szrH, 0, wxALIGN_CENTER );
+ szrV->Add( szrJ, 0, wxALIGN_CENTER );
// -------------------------------------------------------------------
// Display now
@@ -1166,12 +1170,17 @@
szrV->Show(szrC,false);
szrV->Show(szrG,true);
+ szrH->Show(szrI,true);
+ szrH->Show(szrL,false);
SetSizerAndFit( szrV );
SetSizeHints(GetSize());
+ szrL->SetMinSize( szrI->GetSize() );
szrV->Show(szrC,true);
szrV->Show(szrG,false);
+ szrH->Show(szrI,false);
+ szrH->Show(szrL,true);
return;
}
@@ -1941,6 +1950,8 @@
Select( (int) mCurves.GetCount()-1 );
szrV->Show(szrC,true);
szrV->Show(szrG,false);
+ szrH->Show(szrI,false);
+ szrH->Show(szrL,true);
Layout();
mPanel->RecalcRequired = true; // it may have changed slightly due to the
deletion of points
mPanel->Refresh( false );
@@ -1987,6 +1998,8 @@
}
szrV->Show(szrC,false);
szrV->Show(szrG,true);
+ szrH->Show(szrI,true);
+ szrH->Show(szrL,false);
Layout(); // Make all sizers get resized first
LayoutEQSliders(); // Then layout sliders
Layout(); // And layout again to resize dialog
Index: Equalization.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Equalization.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Equalization.h 23 Sep 2006 02:26:25 -0000 1.20
+++ Equalization.h 6 Feb 2007 23:25:12 -0000 1.21
@@ -307,6 +307,9 @@
wxBoxSizer *szrC;
wxBoxSizer *szrG;
wxBoxSizer *szrV;
+ wxBoxSizer *szrH;
+ wxBoxSizer *szrI;
+ wxBoxSizer *szrL;
wxBoxSizer *szr3;
wxBoxSizer *szr4;
wxBoxSizer *szr2;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
