chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parent Machine::Load()'s ProgressDialog and open it properly so it shows up where expected during profile load

Browse Source
This commit is contained in:
Mark Watkins 2018-05-31 10:35:27 +10:00
parent b8475ac970
commit 9313f47396
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleepyhead/SleepLib/machine.cpp
View File

@ -33,7 +33,9 @@
#include <algorithm> #include <algorithm>
#include "SleepLib/schema.h" #include "SleepLib/schema.h"
#include "SleepLib/day.h" #include "SleepLib/day.h"
#include "mainwindow.h"
extern MainWindow * mainwin;
extern QProgressBar *qprogress; extern QProgressBar *qprogress;
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
@ -604,12 +606,12 @@ bool Machine::Load()
return false; return false;
} }
ProgressDialog * popup = new ProgressDialog(nullptr); ProgressDialog * popup = new ProgressDialog(mainwin);
QPixmap image = getPixmap().scaled(64,64); QPixmap image = getPixmap().scaled(64,64);
popup->setPixmap(image); popup->setPixmap(image);
popup->setMessage(QObject::tr("Loading %1 data for %2...").arg(info.brand).arg(p_profile->user->userName())); popup->setMessage(QObject::tr("Loading %1 data for %2...").arg(info.brand).arg(p_profile->user->userName()));
popup->show(); popup->open();
QProgressBar * saveQProgress = qprogress; QProgressBar * saveQProgress = qprogress;