Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15328/src/toolbars
Modified Files:
MixerToolBar.cpp MixerToolBar.h
Log Message:
Grey-out input volume slider instead of hiding it.
The new graphics are not very pretty, and perhaps someone that's good at
drawing icons should change them.
Index: MixerToolBar.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/MixerToolBar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MixerToolBar.h 24 Nov 2009 03:03:25 -0000 1.4
+++ MixerToolBar.h 24 Nov 2009 20:08:21 -0000 1.5
@@ -57,7 +57,6 @@
wxBitmap *mPlayBitmap;
wxBitmap *mRecordBitmap;
- wxStaticBitmap *mRecordSB;
ASlider *mInputSlider;
ASlider *mOutputSlider;
Index: MixerToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/MixerToolBar.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- MixerToolBar.cpp 24 Nov 2009 03:03:25 -0000 1.16
+++ MixerToolBar.cpp 24 Nov 2009 20:08:21 -0000 1.17
@@ -94,10 +94,9 @@
mRecordBitmap = new wxBitmap(theTheme.Bitmap(bmpMic));
- mRecordSB = new wxStaticBitmap(this,
+ Add(new wxStaticBitmap(this,
wxID_ANY,
- *mRecordBitmap);
- Add(mRecordSB, 0, wxALIGN_CENTER);
+ *mRecordBitmap), 0, wxALIGN_CENTER);
mInputSlider = new ASlider(this, wxID_ANY, _("Input Volume"),
wxDefaultPosition, wxSize(130, 25));
@@ -150,8 +149,7 @@
mInputSourceChoice->Show( inputSources.GetCount() != 0 );
// Show or hide the input slider based on whether it works
- mInputSlider->Show(gAudioIO->InputMixerWorks());
- mRecordSB->Show(gAudioIO->InputMixerWorks());
+ mInputSlider->Enable(gAudioIO->InputMixerWorks());
UpdateControls();
@@ -228,8 +226,7 @@
mInputSourceChoice->Show( inputSources.GetCount() != 0 );
// Show or hide the input slider based on whether it works
- mInputSlider->Show(gAudioIO->InputMixerWorks());
- mRecordSB->Show(gAudioIO->InputMixerWorks());
+ mInputSlider->Enable(gAudioIO->InputMixerWorks());
// Layout the toolbar
Layout();
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
