Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 16:37:12 +01:00
Code Issues Releases Wiki Activity

Fixed bugs with MultiDialog. Fixed Bug with prompting about modules.

Browse Source 
Previously MultiDialog attempted to centre on parent dialog, but there was a NULL parent.  Now the application top window is used. Dialog shows centred, for example when there are missing block files.  If the top window is a WX_STAY_ON_TOP, we move our dialog to the left, as otherwise it would be partially hidden.

Previously Audacity would ask about enabling a module whilst the splash screen was showing.  For some as yet undetermined reason the MultiDialog and Splash Screen are incompatible.  Possibly it's related to doing a ShowModal before a full application exists.  The not ideal workaround is to now delay showing the splash screen until after the modules have been loaded.
This commit is contained in:
james.k.crook@gmail.com
2014-10-10 15:36:51 +00:00
parent 66b3eb3d71
commit 221474e37a
4 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/AudacityApp.cpp
View File

@@ -1167,10 +1167,24 @@ bool AudacityApp::OnInit()
mLocale = NULL;
InitLang( lang );
//JKC We'd like to initialise the module manager WHILE showing the splash screen.
//Can't as MultiDialog interacts poorly with the splash screen. So we do it before.
//TODO: Find out why opening a multidialog wrecks the splash screen.
//best current guess is that it's something to do with doing a DoModal this early
//in the program.
// Initialize the CommandHandler
InitCommandHandler();
// Initialize the ModuleManager, including loading found modules
ModuleManager::Initialize(*mCmdHandler);
// BG: Create a temporary window to set as the top window
wxImage logoimage((const char **) AudacityLogoWithName_xpm);
logoimage.Rescale(logoimage.GetWidth() / 2, logoimage.GetHeight() / 2);
wxBitmap logo(logoimage);
wxSplashScreen *temporarywindow =
new wxSplashScreen(logo,
wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT,
@@ -1183,11 +1197,8 @@ bool AudacityApp::OnInit()
temporarywindow->SetTitle(_("Audacity is starting up..."));
SetTopWindow(temporarywindow);
// Initialize the CommandHandler
InitCommandHandler();
// Initialize the ModuleManager, including loading found modules
ModuleManager::Initialize(*mCmdHandler);
// Init DirManager, which initializes the temp directory
// If this fails, we must exit the program.
@@ -1234,9 +1245,9 @@ bool AudacityApp::OnInit()
SetExitOnFrameDelete(true);
AudacityProject *project = CreateNewAudacityProject();
mCmdHandler->SetProject(project);
wxWindow * pWnd = MakeHijackPanel() ;
if( pWnd )
{
@@ -1246,9 +1257,11 @@ bool AudacityApp::OnInit()
pWnd->Show( true );
}
temporarywindow->Show( false );
temporarywindow->Show(false);
delete temporarywindow;
if( project->mShowSplashScreen )
project->OnHelpWelcome();