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

refs #507, core

Browse Source 
* revised parameter handling
* adjusted to changes in CProject
This commit is contained in:
Klaus Basan
2015-11-11 04:55:32 +01:00
committed by Mathew Sutcliffe
parent 864ca20be3
commit 54cb61db19
3 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/swiftcore/swiftcore.cpp
View File

@@ -31,17 +31,19 @@ CSwiftCore::CSwiftCore(const SetupInfo &info, QWidget *parent) :
ui(new Ui::CSwiftCore)
{
ui->setupUi(this);
const QString name("swiftcore " + CProject::version());
SystemTrayMode mode = MinimizeToTray | QuitOnClose;
setSystemTrayMode(mode);
setToolTip(name);
const QString name(QCoreApplication::instance()->applicationName() + " " + CProject::version());
setSystemTrayMode(MinimizeToTray | QuitOnClose);
setSystemTrayToolTip(name);
setWindowTitle(name);
setWindowIcon(CIcons::swiftNova24());
setWindowIconText(name);
initLogDisplay();
initSlots();
initStyleSheet();
startCore(info);
initDBusMode(info);
if (info.m_start) { startCore(info); }
}
void CSwiftCore::initStyleSheet()
@@ -56,6 +58,23 @@ void CSwiftCore::initStyleSheet()
this->setStyleSheet(s);
}
void CSwiftCore::initDBusMode(const CSwiftCore::SetupInfo &setup)
{
if (setup.m_dbusAddress.startsWith(CDBusServer::sessionDBusServer()))
{
this->ui->rb_SessionBus->setChecked(true);
}
else if (setup.m_dbusAddress.startsWith(CDBusServer::systemDBusServer()))
{
this->ui->rb_SystemBus->setChecked(true);
}
else
{
this->ui->rb_P2PBus->setChecked(true);
this->ui->le_P2PAddress->setText(setup.m_dbusAddress);
}
}
CSwiftCore::~CSwiftCore()
{ }
@@ -123,7 +142,10 @@ void CSwiftCore::startCore(const SetupInfo &setup)
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
// context
createRuntime(CRuntimeConfig::forCoreAllLocalInDBus(setup.m_dbusAddress), this);
this->createRuntime(setup.m_coreAudio ?
CRuntimeConfig::forCoreAllLocalInDBus(setup.m_dbusAddress) :
CRuntimeConfig::forCoreAllLocalInDBusNoAudio(setup.m_dbusAddress),
this);
CEnableForRuntime::setRuntimeForComponents(this->getRuntime(), this);
connect(ui->le_CommandLineInput, &CCommandInput::commandEntered, getRuntime(), &CRuntime::parseCommandLine);
}
@@ -149,6 +171,6 @@ QString CSwiftCore::getDBusAddress() const
if (ui->rb_SystemBus->isChecked()) { return CDBusServer::systemDBusServer(); }
if (ui->rb_P2PBus->isChecked()) { return CDBusServer::fixAddressToDBusAddress(ui->le_P2PAddress->text()); }
Q_ASSERT_X(false, Q_FUNC_INFO, "The impossible happend!");
Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong DBus address");
return "";
}