mirror of
https://github.com/cookiengineer/audacity
synced 2026-04-24 23:13:42 +02:00
Campbell Barton's further patch to turn many, many tabs to our 3-space convenbtion
This commit is contained in:
@@ -219,14 +219,14 @@ void ToolDock::LayoutToolBars()
|
||||
stack[ stkcnt ].SetHeight( stack[ stkcnt ].GetHeight() - th );
|
||||
|
||||
// Calc the next possible horizontal location.
|
||||
int x = cpos.x + tw;
|
||||
int x = cpos.x + tw;
|
||||
|
||||
// Add a new stack entry
|
||||
stkcnt++;
|
||||
stack[ stkcnt ].SetX( x );
|
||||
stack[ stkcnt ].SetY( cpos.y );
|
||||
stack[ stkcnt ].SetWidth( width - x );
|
||||
stack[ stkcnt ].SetHeight( th );
|
||||
stack[ stkcnt ].SetY( cpos.y );
|
||||
stack[ stkcnt ].SetWidth( width - x );
|
||||
stack[ stkcnt ].SetHeight( th );
|
||||
|
||||
// Position the previous toolbar
|
||||
if( ndx > 0 )
|
||||
@@ -373,14 +373,14 @@ int ToolDock::PositionBar( ToolBar *t, wxPoint & pos, wxRect & rect )
|
||||
stack[ stkcnt ].SetHeight( stack[ stkcnt ].GetHeight() - th );
|
||||
|
||||
// Calc the next possible horizontal location.
|
||||
int x = cpos.x + tw;
|
||||
int x = cpos.x + tw;
|
||||
|
||||
// Add a new stack entry
|
||||
stkcnt++;
|
||||
stack[ stkcnt ].SetX( x );
|
||||
stack[ stkcnt ].SetY( cpos.y );
|
||||
stack[ stkcnt ].SetWidth( width - x );
|
||||
stack[ stkcnt ].SetHeight( th );
|
||||
stack[ stkcnt ].SetY( cpos.y );
|
||||
stack[ stkcnt ].SetWidth( width - x );
|
||||
stack[ stkcnt ].SetHeight( th );
|
||||
|
||||
// Position the previous toolbar
|
||||
if( ndx > 0 )
|
||||
|
||||
@@ -135,12 +135,12 @@ void ToolsToolBar::RegenerateToolsTooltips()
|
||||
// to workaround the problem. The problem is not fully understood though
|
||||
// (as of April 2003).
|
||||
|
||||
// Vaughan, October 2003: Now we're crashing on Win2K if
|
||||
// "Quit when closing last window" is unchecked, when we come back
|
||||
// through here, on either of the wxSafeYield calls.
|
||||
// James confirms that commenting them out does not cause his original problem
|
||||
// to reappear, so they're commented out now.
|
||||
// wxSafeYield(); //Deal with some queued up messages...
|
||||
// Vaughan, October 2003: Now we're crashing on Win2K if
|
||||
// "Quit when closing last window" is unchecked, when we come back
|
||||
// through here, on either of the wxSafeYield calls.
|
||||
// James confirms that commenting them out does not cause his original problem
|
||||
// to reappear, so they're commented out now.
|
||||
// wxSafeYield(); //Deal with some queued up messages...
|
||||
|
||||
#if wxUSE_TOOLTIPS
|
||||
mTool[selectTool]->SetToolTip(_("Selection Tool"));
|
||||
@@ -221,9 +221,9 @@ void ToolsToolBar::SetCurrentTool(int tool, bool show)
|
||||
if (show)
|
||||
mTool[mCurrentTool]->PushDown();
|
||||
}
|
||||
//JKC: ANSWER-ME: Why is this RedrawAllProjects() line required?
|
||||
//msmeyer: I think it isn't, we leave it out for 1.3.1 (beta), and
|
||||
// we'll see if anyone complains.
|
||||
//JKC: ANSWER-ME: Why is this RedrawAllProjects() line required?
|
||||
//msmeyer: I think it isn't, we leave it out for 1.3.1 (beta), and
|
||||
// we'll see if anyone complains.
|
||||
// RedrawAllProjects();
|
||||
|
||||
//msmeyer: But we instruct the projects to handle the cursor shape again
|
||||
|
||||
@@ -450,10 +450,10 @@ void TranscriptionToolBar::OnStartOn(wxCommandEvent &event)
|
||||
SetButton(false,mButtons[TTB_StartOn]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
mVk->AdjustThreshold(GetSensitivity());
|
||||
AudacityProject *p = GetActiveProject();
|
||||
|
||||
|
||||
TrackList *tl = p->GetTracks();
|
||||
TrackListOfKindIterator iter(Track::Wave, tl);
|
||||
|
||||
@@ -511,7 +511,7 @@ void TranscriptionToolBar::OnStartOff(wxCommandEvent &event)
|
||||
|
||||
void TranscriptionToolBar::OnEndOn(wxCommandEvent &event)
|
||||
{
|
||||
|
||||
|
||||
//If IO is busy, abort immediately
|
||||
if (gAudioIO->IsBusy()){
|
||||
SetButton(false,mButtons[TTB_EndOn]);
|
||||
@@ -548,7 +548,7 @@ void TranscriptionToolBar::OnEndOn(wxCommandEvent &event)
|
||||
|
||||
void TranscriptionToolBar::OnEndOff(wxCommandEvent &event)
|
||||
{
|
||||
|
||||
|
||||
//If IO is busy, abort immediately
|
||||
if (gAudioIO->IsBusy()){
|
||||
SetButton(false,mButtons[TTB_EndOff]);
|
||||
@@ -589,7 +589,7 @@ void TranscriptionToolBar::OnSelectSound(wxCommandEvent &event)
|
||||
SetButton(false,mButtons[TTB_SelectSound]);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
mVk->AdjustThreshold(GetSensitivity());
|
||||
AudacityProject *p = GetActiveProject();
|
||||
@@ -686,7 +686,7 @@ void TranscriptionToolBar::OnCalibrate(wxCommandEvent &event)
|
||||
|
||||
mVk->CalibrateNoise(*((WaveTrack*)t),start,len);
|
||||
mVk->AdjustThreshold(3);
|
||||
|
||||
|
||||
mButtons[TTB_StartOn]->Enable();
|
||||
mButtons[TTB_StartOff]->Enable();
|
||||
mButtons[TTB_EndOn]->Enable();
|
||||
@@ -716,13 +716,13 @@ void TranscriptionToolBar::OnCalibrate(wxCommandEvent &event)
|
||||
void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent &event)
|
||||
{
|
||||
|
||||
|
||||
|
||||
//If IO is busy, abort immediately
|
||||
if (gAudioIO->IsBusy())
|
||||
{
|
||||
SetButton(false,mButtons[TTB_EndOff]);
|
||||
return;
|
||||
}
|
||||
{
|
||||
SetButton(false,mButtons[TTB_EndOff]);
|
||||
return;
|
||||
}
|
||||
|
||||
wxBusyCursor busy;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user