Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-19 17:40:15 +02:00
Code Issues Releases Wiki Activity

Bring Macros dialog to front after various actions

Browse Source
This commit is contained in:
James Crook 2018-03-14 16:57:33 +00:00
parent b1862d2b11
commit 5cc1dbc872
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BatchProcessDialog.cpp
View File

@ -275,12 +275,16 @@ void ApplyMacroDialog::ApplyMacroToProject( int iMacro, bool bHasGui )
if (!success) { if (!success) {
Show(); Show();
Raise();
return; return;
} }
if( mbExpanded ) if( mbExpanded )
Hide(); Hide();
else else
{
Show(); Show();
Raise();
}
} }
void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event)) void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
@ -354,8 +358,10 @@ void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
dlog.SetFilterIndex(index); dlog.SetFilterIndex(index);
if (dlog.ShowModal() != wxID_OK) { if (dlog.ShowModal() != wxID_OK) {
Raise();
return; return;
} }
Raise();
wxArrayString files; wxArrayString files;
dlog.GetPaths(files); dlog.GetPaths(files);
@ -454,7 +460,10 @@ void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
if( mbExpanded ) if( mbExpanded )
Hide(); Hide();
else else
{
Show(); Show();
Raise();
}
} }
void ApplyMacroDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) void ApplyMacroDialog::OnCancel(wxCommandEvent & WXUNUSED(event))
@ -894,8 +903,10 @@ void MacrosWindow::OnAdd(wxCommandEvent & WXUNUSED(event))
wxString name; wxString name;
if (d.ShowModal() == wxID_CANCEL) { if (d.ShowModal() == wxID_CANCEL) {
Raise();
return; return;
} }
Raise();
name = d.GetValue().Strip(wxString::both); name = d.GetValue().Strip(wxString::both);
@ -946,8 +957,10 @@ void MacrosWindow::OnRemove(wxCommandEvent & WXUNUSED(event))
GetTitle(), GetTitle(),
wxYES_NO | wxICON_QUESTION); wxYES_NO | wxICON_QUESTION);
if (m.ShowModal() == wxID_NO) { if (m.ShowModal() == wxID_NO) {
Raise();
return; return;
} }
Raise();
mMacroCommands.DeleteMacro(name); mMacroCommands.DeleteMacro(name);
@ -1004,8 +1017,10 @@ void MacrosWindow::InsertCommandAt(int item)
MacroCommandDialog d(this, wxID_ANY); MacroCommandDialog d(this, wxID_ANY);
if (!d.ShowModal()) { if (!d.ShowModal()) {
Raise();
return; return;
} }
Raise();
if(d.mSelectedCommand != wxT("")) if(d.mSelectedCommand != wxT(""))
{ {
@ -1016,6 +1031,7 @@ void MacrosWindow::InsertCommandAt(int item)
mSelectedCommand = item + 1; mSelectedCommand = item + 1;
PopulateList(); PopulateList();
} }
} }
void MacrosWindow::OnEditCommandParams(wxCommandEvent & WXUNUSED(event)) void MacrosWindow::OnEditCommandParams(wxCommandEvent & WXUNUSED(event))
@ -1039,6 +1055,7 @@ void MacrosWindow::OnEditCommandParams(wxCommandEvent & WXUNUSED(event))
wxString params = mMacroCommands.GetParams(item); wxString params = mMacroCommands.GetParams(item);
params = MacroCommands::PromptForParamsFor(command, params, this).Trim(); params = MacroCommands::PromptForParamsFor(command, params, this).Trim();
Raise();
mMacroCommands.DeleteFromMacro(item); mMacroCommands.DeleteFromMacro(item);
mMacroCommands.AddToMacro(command, mMacroCommands.AddToMacro(command,