Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-07 20:22:13 +01:00
Code Issues Releases Wiki Activity

Adding the ability to load 'non-recognised' modules, with a warning to the user (the main point).

Browse Source 
Removing duplicate code from LoadModules, at the expense of making  ModuleManager::Initialize more monolithic.

Make MultiDialog a bit more general.

Remove a few warnings.

Some logging has been turned back on when loading libs, we could turn it off again.

To test you could compile mod-nyq-bench and make sure it is available on the bottom of the 'View' menu, then unselect it in the Prefs -> Modules an retry.
This commit is contained in:
martynshaw99
2013-06-05 00:35:10 +00:00
parent 44c03e7de8
commit 37f74e27bb
5 changed files with 78 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/widgets/MultiDialog.cpp
View File

@@ -38,7 +38,7 @@ class MultiDialog : public wxDialog
public:
MultiDialog(wxString message,
wxString title,
const wxChar **buttons);
const wxChar **buttons, wxString boxMsg, bool log);
~MultiDialog() {};
private:
@@ -59,7 +59,7 @@ END_EVENT_TABLE()
MultiDialog::MultiDialog(wxString message,
wxString title,
const wxChar **buttons)
const wxChar **buttons, wxString boxMsg, bool log)
: wxDialog(NULL, (wxWindowID)-1, title,
wxDefaultPosition, wxDefaultSize,
wxCAPTION) // not wxDEFAULT_DIALOG_STYLE because we don't want wxCLOSE_BOX and wxSYSTEM_MENU
@@ -91,24 +91,30 @@ MultiDialog::MultiDialog(wxString message,
}
mRadioBox = new wxRadioBox(this,-1,
_(" Please select an action "),
boxMsg,
wxDefaultPosition, wxDefaultSize,
count, buttonLabels,
1, wxRA_SPECIFY_COLS);
mRadioBox->SetName(_("Please select an action"));
mRadioBox->SetName(boxMsg);
mRadioBox->SetSelection(0);
vSizer->Add(mRadioBox, 1, wxEXPAND | wxALIGN_CENTER | wxALL, 5);
wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL);
wxButton* pButton = new wxButton(this, ID_SHOW_LOG_BUTTON, _("Show Log for Details"));
buttonSizer->Add(pButton, 0, wxALIGN_LEFT | wxALL, 5);
pButton->SetDefault(); // Encourage user to look at files.
wxButton* pButton;
if(log)
{
pButton = new wxButton(this, ID_SHOW_LOG_BUTTON, _("Show Log for Details"));
buttonSizer->Add(pButton, 0, wxALIGN_LEFT | wxALL, 5);
pButton->SetDefault(); // Encourage user to look at files.
buttonSizer->AddSpacer(40);
buttonSizer->AddSpacer(40);
}
pButton = new wxButton(this, wxID_OK, _("OK"));
pButton = new wxButton(this, wxID_OK, _("OK"));
if(!log)
pButton->SetDefault();
buttonSizer->Add(pButton, 0, wxALIGN_RIGHT | wxALL, 5);
vSizer->Add(buttonSizer, 0, wxALIGN_CENTER | wxALL, 5);
@@ -122,12 +128,12 @@ MultiDialog::MultiDialog(wxString message,
delete[] buttonLabels;
}
void MultiDialog::OnOK(wxCommandEvent &event)
void MultiDialog::OnOK(wxCommandEvent & WXUNUSED(event))
{
EndModal(mRadioBox->GetSelection());
}
void MultiDialog::OnShowLog(wxCommandEvent &event)
void MultiDialog::OnShowLog(wxCommandEvent & WXUNUSED(event))
{
GetActiveProject()->OnShowLog();
}
@@ -135,9 +141,9 @@ void MultiDialog::OnShowLog(wxCommandEvent &event)
int ShowMultiDialog(wxString message,
wxString title,
const wxChar **buttons)
const wxChar **buttons, wxString boxMsg, bool log)
{
MultiDialog dlog(message, title, buttons);
MultiDialog dlog(message, title, buttons, boxMsg, log);
dlog.CentreOnParent();
return dlog.ShowModal();
}