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

Display cmd. arguments if SHIFT is pressed

Browse Source
This commit is contained in:
Klaus Basan
2019-01-25 20:20:16 +01:00
committed by Mat Sutcliffe
parent 998f0344fa
commit a32eadee6a
2 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -22,6 +22,7 @@
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/loghandler.h"
#include <QMessageBox>
#include <QPixmap>
#include <QBitmap>
#include <QTimer>
@@ -235,9 +236,9 @@ void CSwiftLauncher::setHeaderInfo(const CArtifact &latestArtifact)
}
}
void CSwiftLauncher::startSwiftCore()
bool CSwiftLauncher::setSwiftCoreExecutable()
{
if (!sGui || sGui->isShuttingDown()) { return; }
if (!sGui || sGui->isShuttingDown()) { return false; }
this->saveSetup();
QStringList args = ui->comp_DBusSelector->getDBusCmdLineArgs();
if (ui->rb_SwiftCoreAudioOnCore->isChecked())
@@ -247,13 +248,14 @@ void CSwiftLauncher::startSwiftCore()
m_executableArgs = sGui->argumentsJoined(args);
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftCoreExecutableName());
this->startDetached();
return true;
}
void CSwiftLauncher::setSwiftDataExecutable()
bool CSwiftLauncher::setSwiftDataExecutable()
{
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftDataExecutableName());
m_executableArgs = sGui->argumentsJoined({}, CNetworkVatlib::vatlibArguments());
return true;
}
bool CSwiftLauncher::setSwiftGuiExecutable()
@@ -277,8 +279,8 @@ bool CSwiftLauncher::setSwiftGuiExecutable()
if (!CSwiftLauncher::canConnectSwiftOnDBusServer(dBus, msg))
{
const CStatusMessage m(this, CStatusMessage::SeverityError,
"DBus server for '" + dBus + "' can not be connected.\n\n" +
"Likely the core is not running or is not reachable.\n\n" +
"DBus server for '" + dBus + "' can not be connected.\n" +
"Likely the core is not running or is not reachable.\n" +
"Details: " + msg, true);
this->showStatusMessage(m);
return false;
@@ -368,26 +370,55 @@ void CSwiftLauncher::startButtonPressed()
const qreal scaleFactor = ui->comp_Scale->getScaleFactor();
CGuiApplication::highDpiScreenSupport(scaleFactor);
const Qt::KeyboardModifiers km = QGuiApplication::queryKeyboardModifiers();
const bool shift = km.testFlag(Qt::ShiftModifier);
if (sender == ui->tb_SwiftGui)
{
if (this->setSwiftGuiExecutable())
{
this->accept();
if (shift)
{
this->popupExecutableArgs();
}
else
{
this->accept();
}
}
}
else if (sender == ui->tb_SwiftMappingTool)
{
ui->tb_SwiftMappingTool->setEnabled(false);
m_startMappingToolWaitCycles = 2;
this->setSwiftDataExecutable();
this->accept();
if (this->setSwiftDataExecutable())
{
if (shift)
{
this->popupExecutableArgs();
}
else
{
this->accept();
}
}
}
else if (sender == ui->tb_SwiftCore)
{
if (this->isStandaloneGuiSelected()) { ui->rb_SwiftCoreAudioOnGui->setChecked(true); }
ui->tb_SwiftCore->setEnabled(false);
m_startCoreWaitCycles = 2;
this->startSwiftCore();
if (this->setSwiftCoreExecutable())
{
if (shift)
{
this->popupExecutableArgs();
}
else
{
this->startDetached();
}
}
}
else if (sender == ui->tb_Database)
{
@@ -408,6 +439,11 @@ void CSwiftLauncher::showStatusMessage(const CStatusMessage &msg)
ui->fr_SwiftLauncherMain->showOverlayMessage(msg, 5000);
}
void CSwiftLauncher::showStatusMessage(const QString &htmlMsg)
{
ui->fr_SwiftLauncherMain->showOverlayMessage(htmlMsg, 5000);
}
void CSwiftLauncher::appendLogMessage(const CStatusMessage &message)
{
ui->comp_SwiftLauncherLog->appendStatusMessageToList(message);
@@ -486,3 +522,8 @@ void CSwiftLauncher::onCoreModeReleased()
{
ui->comp_DBusSelector->setEnabled(!ui->rb_SwiftStandalone->isChecked());
}
void CSwiftLauncher::popupExecutableArgs()
{
QMessageBox::information(this, "Command line", this->getCmdLine());
}