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

Ref T125, X-Plane config now only XSwiftBus settings, no longer installation

Browse Source
This commit is contained in:
Klaus Basan
2017-08-15 02:18:44 +02:00
committed by Mathew Sutcliffe
parent 329b0512eb
commit d4b027b6bd
4 changed files with 25 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -9,35 +9,14 @@
#include "simulatorxplaneconfigwindow.h"
#include "blackcore/application.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "ui_simulatorxplaneconfigwindow.h"
#include <QComboBox>
#include <QDialogButtonBox>
#include <QDir>
#include <QFileDialog>
#include <QFlags>
#include <QMessageBox>
#include <QPushButton>
#include <QString>
#include <QStringBuilder>
class QWidget;
using namespace BlackGui;
using namespace BlackMisc;
namespace
{
QString xSwiftBusOriginDir()
{
return CDirectoryUtils::binDirectory() % QStringLiteral("/../xswiftbus");
}
}
namespace BlackSimPlugin
{
namespace XPlane
@@ -48,69 +27,11 @@ namespace BlackSimPlugin
{
ui->setupUi(this);
ui->cp_XSwiftBusServer->addItem(BlackMisc::CDBusServer::sessionBusAddress());
ui->cp_XSwiftBusServer->addItem(BlackMisc::CDBusServer::systemBusAddress());
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::ps_storeSettings);
connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CSimulatorXPlaneConfigWindow::close);
connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorXPlaneConfigWindow::close);
ui->cp_XSwiftBusServer->setCurrentText(m_xswiftbusServerSetting.getThreadLocal());
if (xSwiftBusAvailable())
connect(ui->pb_InstallXSwiftBus, &QPushButton::clicked, this, &CSimulatorXPlaneConfigWindow::ps_installXSwiftBus);
else
ui->pb_InstallXSwiftBus->setEnabled(false);
}
CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow()
{
}
bool CSimulatorXPlaneConfigWindow::xSwiftBusAvailable()
{
return QDir(xSwiftBusOriginDir()).exists();
}
void CSimulatorXPlaneConfigWindow::ps_storeSettings()
{
if (ui->cp_XSwiftBusServer->currentText() != m_xswiftbusServerSetting.getThreadLocal())
{
m_xswiftbusServerSetting.set(ui->cp_XSwiftBusServer->currentText());
}
}
void CSimulatorXPlaneConfigWindow::ps_installXSwiftBus()
{
const QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplaneRootDir();
QString path = QFileDialog::getExistingDirectory(parentWidget(),
tr("Choose your X-Plane install directory"),
xPlaneLocation,
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog);
if (path.isEmpty()) // canceled
return;
path.append("/Resources/plugins");
if (!QDir(path).exists())
{
QMessageBox::warning(this, tr("Invalid X-Plane directory"), tr("%1 is not a valid X-Plane installation.").arg(path));
return;
}
path.append("/xswiftbus");
// TODO Use QtConcurrent here, maybe?
const bool result = BlackMisc::CFileUtils::copyRecursively(xSwiftBusOriginDir(), path);
if (result)
{
QMessageBox::information(this, tr("XSwiftBus installed"), tr("You may now launch your X-Plane and start using XSwiftBus!"));
}
else
{
QMessageBox::warning(this, tr("Failed installing XSwiftBus"), tr("Failed installing the XSwiftBus plugin in your X-Plane installation directory; try installing it manually."));
}
}
}
}
{ }
} // ns
} // ns