Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3765/src/toolbars

Modified Files:
        MixerToolBar.cpp TranscriptionToolBar.cpp 
Log Message:
If no input sources exist, don't even show the choice control.
Add a little extra spacing here and there.

Index: TranscriptionToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/TranscriptionToolBar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TranscriptionToolBar.cpp    1 Oct 2006 15:43:48 -0000       1.3
+++ TranscriptionToolBar.cpp    13 Oct 2006 03:45:40 -0000      1.4
@@ -253,6 +253,8 @@
    Add( mKeyTypeChoice, 0, wxALIGN_CENTER );
 #endif
 
+   // Add a little space
+   Add(2, -1);
 }
 
 //This handles key-stroke events????

Index: MixerToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/MixerToolBar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MixerToolBar.cpp    24 Sep 2006 18:09:48 -0000      1.2
+++ MixerToolBar.cpp    13 Oct 2006 03:45:40 -0000      1.3
@@ -117,10 +117,7 @@
                                      wxDefaultSize,
                                      inputSources);
    mInputSourceChoice->SetName(_("Input Source"));
-   Add(mInputSourceChoice, 0, wxALIGN_CENTER);
-
-   if (inputSources.GetCount() == 0)
-      mInputSourceChoice->Enable(false);
+   Add(mInputSourceChoice, 0, wxALIGN_CENTER | wxLEFT, 2);
 
    // Set choice control to default value
    float inputVolume;
@@ -129,9 +126,15 @@
    gAudioIO->GetMixer(&inputSource, &inputVolume, &playbackVolume);
    mInputSourceChoice->SetSelection(inputSource);
 
+   // Show or hide the control based on input sources
+   mInputSourceChoice->Show( inputSources.GetCount() != 0 );
+
    UpdateControls();
 
 #endif
+
+   // Add a little space
+   Add(2, -1);
 }
 
 void MixerToolBar::UpdatePrefs()
@@ -154,6 +157,9 @@
    // Resize the control
    mInputSourceChoice->SetSize(mInputSourceChoice->GetBestFittingSize());
 
+   // Show or hide the control based on input sources
+   mInputSourceChoice->Show( inputSources.GetCount() != 0 );
+
    // Layout the toolbar
    Layout();
 


-------------------------------------------------------------------------
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

Reply via email to