flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 21:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #485, removal of CEnableForRuntime

Browse Source
This commit is contained in:
Klaus Basan
2016-02-14 11:28:27 +01:00
committed by Mathew Sutcliffe
parent 158efe819a
commit 3829aaeae8
61 changed files with 490 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/swiftcore/swiftcore.cpp
View File

@@ -14,8 +14,8 @@
#include "blackmisc/project.h"
#include "blackmisc/dbusserver.h"
#include "blackgui/guiapplication.h"
#include "blackgui/guiapplication.h"
#include "blackgui/components/logcomponent.h"
#include "blackgui/components/enableforruntime.h"
#include "blackgui/stylesheetutility.h"
#include <QMenu>
#include <QMessageBox>
@@ -131,7 +131,6 @@ void CSwiftCore::initLogDisplay()
void CSwiftCore::startCore(const QString &dBusAdress)
{
if (getRuntime()) { return; }
if (dBusAdress.isEmpty()) { return; }
ui->pb_StartCore->setEnabled(false);
@@ -140,27 +139,17 @@ void CSwiftCore::startCore(const QString &dBusAdress)
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
// context
this->createRuntime(sGui->isParserOptionSet("coreaudio") ?
CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAdress) :
CCoreFacadeConfig::forCoreAllLocalInDBusNoAudio(dBusAdress),
this);
CEnableForRuntime::setRuntimeForComponents(this->getRuntime(), this);
connect(ui->le_CommandLineInput, &CCommandInput::commandEntered, getRuntime(), &CCoreFacade::parseCommandLine);
connect(ui->le_CommandLineInput, &CCommandInput::commandEntered, sGui->getCoreFacade(), &CCoreFacade::parseCommandLine);
}
void CSwiftCore::stopCore()
{
if (!getRuntime()) { return; }
ui->pb_StartCore->setEnabled(true);
ui->pb_StopCore->setEnabled(false);
ui->gb_DBusMode->setDisabled(false);
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
getRuntime()->gracefulShutdown();
// Force quit, since we cannot close the runtime
qApp->quit();
sGui->exit();
}
QString CSwiftCore::getDBusAddress() const