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

Do not show core button in standalone

Browse Source
This commit is contained in:
Klaus Basan
2019-04-17 02:41:43 +02:00
parent 918559e60f
commit 803e68edd3
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -80,16 +80,14 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) :
m_checkTimer.setInterval(2500); m_checkTimer.setInterval(2500);
m_checkTimer.start(); m_checkTimer.start();
// auto launch wizard // auto launch wizard nd other init parts
if (sGui->isInstallerOptionSet()) const QPointer<CSwiftLauncher> myself(this);
QTimer::singleShot(2500, this, [ = ]
{ {
const QPointer<CSwiftLauncher> myself(this); if (!sGui || sGui->isShuttingDown() || !myself) { return; }
QTimer::singleShot(2500, this, [ = ] this->onCoreModeReleased();
{ if (sGui->isInstallerOptionSet()) { myself->startWizard(); }
if (!sGui || sGui->isShuttingDown() || !myself) { return; } });
myself->startWizard();
});
}
} }
CSwiftLauncher::~CSwiftLauncher() CSwiftLauncher::~CSwiftLauncher()
@@ -491,8 +489,9 @@ void CSwiftLauncher::checkRunningApplicationsAndCore()
const bool foundLocalCore = runningApps.containsApplication(CApplicationInfo::PilotClientCore); const bool foundLocalCore = runningApps.containsApplication(CApplicationInfo::PilotClientCore);
const bool foundLocalMappingTool = runningApps.containsApplication(CApplicationInfo::MappingTool); const bool foundLocalMappingTool = runningApps.containsApplication(CApplicationInfo::MappingTool);
const bool foundLocalPilotClientGui = runningApps.containsApplication(CApplicationInfo::PilotClientGui); const bool foundLocalPilotClientGui = runningApps.containsApplication(CApplicationInfo::PilotClientGui);
const bool standalone = ui->rb_SwiftStandalone->isChecked();
ui->tb_SwiftCore->setEnabled(!foundLocalCore && m_startCoreWaitCycles < 1); ui->tb_SwiftCore->setEnabled(!standalone && !foundLocalCore && m_startCoreWaitCycles < 1);
ui->tb_SwiftMappingTool->setEnabled(!foundLocalMappingTool && m_startMappingToolWaitCycles < 1); ui->tb_SwiftMappingTool->setEnabled(!foundLocalMappingTool && m_startMappingToolWaitCycles < 1);
ui->tb_SwiftGui->setEnabled(!foundLocalPilotClientGui && m_startGuiWaitCycles < 1); ui->tb_SwiftGui->setEnabled(!foundLocalPilotClientGui && m_startGuiWaitCycles < 1);
} }
@@ -521,7 +520,9 @@ void CSwiftLauncher::onDBusEditingFinished()
void CSwiftLauncher::onCoreModeReleased() void CSwiftLauncher::onCoreModeReleased()
{ {
ui->comp_DBusSelector->setEnabled(!ui->rb_SwiftStandalone->isChecked()); const bool sa = ui->rb_SwiftStandalone->isChecked();
ui->comp_DBusSelector->setEnabled(!sa);
ui->tb_SwiftCore->setEnabled(!sa);
this->saveSetup(); this->saveSetup();
} }

22
src/swiftlauncher/swiftlauncher.ui
View File

@@ -88,7 +88,7 @@
<item> <item>
<widget class="QToolBox" name="tb_Launcher"> <widget class="QToolBox" name="tb_Launcher">
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>2</number>
</property> </property>
<property name="tabSpacing"> <property name="tabSpacing">
<number>6</number> <number>6</number>
@@ -99,7 +99,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>275</height> <height>309</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@@ -130,7 +130,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>275</height> <height>309</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@@ -194,8 +194,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>371</width> <width>392</width>
<height>298</height> <height>309</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@@ -297,7 +297,7 @@
<item row="3" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QGroupBox" name="gb_DBusServer"> <widget class="QGroupBox" name="gb_DBusServer">
<property name="title"> <property name="title">
<string>DBus</string> <string>DBus (swift core/GUI, NOT XSwiftBus)</string>
</property> </property>
<layout class="QVBoxLayout" name="vl_DBusGroupBox"> <layout class="QVBoxLayout" name="vl_DBusGroupBox">
<property name="spacing"> <property name="spacing">
@@ -361,7 +361,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>275</height> <height>309</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@@ -442,8 +442,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>380</width> <width>376</width>
<height>94</height> <height>126</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="vl_DataUpdatesScrollArea"> <layout class="QVBoxLayout" name="vl_DataUpdatesScrollArea">
@@ -494,7 +494,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>275</height> <height>309</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@@ -537,7 +537,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>392</width> <width>392</width>
<height>144</height> <height>151</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">