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

Ref T258, use external 7zip to unzip xswiftbus

Browse Source
This commit is contained in:
Klaus Basan
2018-02-22 01:08:44 +01:00
parent f6854bde86
commit f2efa2981b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackgui/components/installxswiftbuscomponent.cpp
View File

@@ -12,6 +12,7 @@
#include "blackgui/guiapplication.h" #include "blackgui/guiapplication.h"
#include "blackgui/overlaymessagesframe.h" #include "blackgui/overlaymessagesframe.h"
#include "blackmisc/simulation/xplane/xplaneutil.h" #include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/compressutils.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackmisc/directoryutils.h" #include "blackmisc/directoryutils.h"
#include "blackmisc/fileutils.h" #include "blackmisc/fileutils.h"
@@ -157,13 +158,23 @@ namespace BlackGui
{ {
this->hideLoading(); this->hideLoading();
if (sGui && sGui->isShuttingDown()) { return; } if (sGui && sGui->isShuttingDown()) { return; }
if (status.isWarningOrAbove() || !this->existsXSwiftBusPluginDir()) if (status.isWarningOrAbove())
{ {
this->showOverlayMessage(status, CInstallXSwiftBusComponent::OverlayMsgTimeoutMs); this->showOverlayMessage(status);
return; return;
} }
if (!this->existsXSwiftBusPluginDir())
{
const CStatusMessage msg = CStatusMessage(this).warning("No valid install directory, cannot continue.");
this->showOverlayMessage(msg);
return;
}
static const QString confirm("Install in '%1'?"); static const QString confirm("Install in '%1'?");
this->showOverlayMessagesWithConfirmation(status, false, confirm.arg(ui->le_XSwiftBusPluginDir->text()), [ = ] { this->installXSwiftBus(); }); this->showOverlayMessagesWithConfirmation(status, false, confirm.arg(ui->le_XSwiftBusPluginDir->text()), [ = ]
{
QTimer::singleShot(0, this, &CInstallXSwiftBusComponent::installXSwiftBus);
});
} }
CRemoteFile CInstallXSwiftBusComponent::getRemoteFileSelected() const CRemoteFile CInstallXSwiftBusComponent::getRemoteFileSelected() const