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

refs #392 XBus copy feature fine tuning

Browse Source 
* New method: CFileUtils::copyRecursively()
* Copy the XBus directory to X-Plane plugins
This commit is contained in:
Michał Garapich
2015-10-29 22:56:17 +01:00
committed by Mathew Sutcliffe
parent 3781cf2095
commit 3dd86d4984
7 changed files with 85 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp
View File

@@ -2,6 +2,7 @@
#include "ui_simulatorxplaneconfigwindow.h"
#include "blackcore/dbus_server.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/fileutilities.h"
#include <QStringBuilder>
#include <QFileDialog>
#include <QMessageBox>
@@ -10,6 +11,14 @@
using namespace BlackGui;
namespace
{
QString xBusOriginDir()
{
return QCoreApplication::applicationDirPath() % QStringLiteral("/../xbus");
}
}
namespace BlackSimPlugin
{
namespace XPlane
@@ -30,7 +39,10 @@ namespace BlackSimPlugin
ui->cp_XBusServer->setCurrentText(m_xbusServerSetting.get());
connect(ui->pb_InstallXBus, &QPushButton::clicked, this, &CSimulatorXPlaneConfigWindow::ps_installXBus);
if (xBusAvailable())
connect(ui->pb_InstallXBus, &QPushButton::clicked, this, &CSimulatorXPlaneConfigWindow::ps_installXBus);
else
ui->pb_InstallXBus->setEnabled(false);
}
CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow()
@@ -38,6 +50,11 @@ namespace BlackSimPlugin
}
bool CSimulatorXPlaneConfigWindow::xBusAvailable()
{
return QDir(xBusOriginDir()).exists();
}
void CSimulatorXPlaneConfigWindow::ps_storeSettings()
{
if (ui->cp_XBusServer->currentText() != m_xbusServerSetting.get())
@@ -55,23 +72,30 @@ namespace BlackSimPlugin
QString path = QFileDialog::getExistingDirectory(parentWidget(),
tr("Choose your X-Plane install directory"),
xPlaneLocation,
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog);
path.append("/Resources/plugins/xbus/64/");
QDir xbusDir(path);
if (!xbusDir.exists())
if (path.isEmpty()) // canceled
return;
path.append("/Resources/plugins");
if (!QDir(path).exists())
{
if (!xbusDir.mkpath("."))
{
return;
}
QMessageBox::warning(this, tr("Invalid X-Plane directory"), tr("%1 is not a valid X-Plane installation.").arg(path));
return;
}
QString origin = QCoreApplication::applicationDirPath() % QStringLiteral("/../xbus/64/lin.xpl");
QString destination = path % "/lin.xpl";
QFile::copy(origin, destination);
path.append("/xbus");
QMessageBox::information(this, tr("XBus installed"), tr("You may now launch your X-Plane and start using XBus!"));
// TODO Use QtConcurrent here, maybe?
bool result = BlackMisc::CFileUtils::copyRecursively(xBusOriginDir(), path);
if (result)
{
QMessageBox::information(this, tr("XBus installed"), tr("You may now launch your X-Plane and start using XBus!"));
}
else
{
QMessageBox::warning(this, tr("Failed installing XBus"), tr("Failed installing the XBus plugin in your X-Plane installation directory; try installing it manually."));
}
}
}
}