Implemented MainWindow singleton pattern.

This commit is contained in:
Tats
2015-07-03 17:20:42 -06:00
parent e22075d6ad
commit 36c2c2b539
3 changed files with 20 additions and 7 deletions
+10 -7
View File
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
I::sleep(1);
// Create window.
MainWindow win;
MainWindow* win = MainWindow::instance();
QFontDatabase db;
Q_ASSERT( QFontDatabase::addApplicationFont(":/base-font") != -1);
@@ -130,34 +130,37 @@ int main(int argc, char *argv[])
QString projectFileValue = parser.value("file");
if (projectFileValue != "")
{
win.loadFile(projectFileValue);
win->loadFile(projectFileValue);
}
QString oscPortNumberValue = parser.value("osc-port");
if (oscPortNumberValue != "")
{
win.setOscPort(oscPortNumberValue);
win->setOscPort(oscPortNumberValue);
}
#endif
// Terminate splash.
splash.showMessage(" " + QObject::tr("Done."),
Qt::AlignLeft | Qt::AlignTop, MM::WHITE);
splash.finish(&win);
splash.finish(win);
splash.raise();
// Launch program.
win.show();
win->show();
#if USING_QT_5
if (parser.isSet(fullscreenOption))
{
qDebug() << "TODO: Running in fullscreen mode";
win.startFullScreen();
win->startFullScreen();
}
#endif
// Start app.
return app.exec();
int result = app.exec();
delete win;
return result;
}