From cbc4c7c0aaf626906dc0b1af4c7190114c542a57 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 4 May 2009 23:23:06 +0200 Subject: [PATCH] Pass main window as parent for progress dialog when loading project Make progress dialog when loading project a proper sub-window of LMMS by passing main window as parent to constructor of QProgressDialog. Fixes default window icon and additional taskbar item. (cherry picked from commit 6929caa777a0af8f957d78d6c6ce3293ba41c7c5) --- src/core/track_container.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp index 4dc9f1b5a..136c2768e 100644 --- a/src/core/track_container.cpp +++ b/src/core/track_container.cpp @@ -2,7 +2,7 @@ * track_container.cpp - implementation of base-class for all track-containers * like Song-Editor, BB-Editor... * - * Copyright (c) 2004-2008 Tobias Doerffel + * Copyright (c) 2004-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -31,6 +31,7 @@ #include "track_container.h" #include "instrument_track.h" #include "engine.h" +#include "main_window.h" #include "song.h" @@ -81,7 +82,8 @@ void trackContainer::loadSettings( const QDomElement & _this ) { pd = new QProgressDialog( tr( "Loading project..." ), tr( "Cancel" ), 0, - _this.childNodes().count() ); + _this.childNodes().count(), + engine::getMainWindow() ); pd->setWindowModality( Qt::ApplicationModal ); pd->setWindowTitle( tr( "Please wait..." ) ); pd->show();