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

Issue #77 Break cyclic dependency swiftdirectories <-> applicationinfolist

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-30 00:25:56 +01:00
parent ab44c068ab
commit f421bb90c3
6 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/configurationwizard.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackGui
// no other versions, skip copy pages
// disabled afetr discussion with RP as it is confusing
// if (!CDirectoryUtils::hasOtherSwiftDataDirectories()) { this->setStartId(ConfigSimulator); }
// if (!CApplicationInfoList::hasOtherSwiftDataDirectories()) { this->setStartId(ConfigSimulator); }
ui->tb_SimulatorSpecific->setCurrentWidget(ui->comp_InstallXSwiftBus);

4
src/blackgui/components/copyconfigurationcomponent.cpp
View File

@@ -51,7 +51,7 @@ namespace BlackGui
ui->setupUi(this);
this->initOtherSwiftVersions();
this->setWidths();
m_hasOtherSwiftVersions = CSwiftDirectories::hasOtherSwiftDataDirectories();
m_hasOtherSwiftVersions = CApplicationInfoList::hasOtherSwiftDataDirectories();
ui->cb_ShowAll->setChecked(m_nameFilterDisables);
connect(ui->rb_Cache, &QRadioButton::toggled, [ = ](bool) { this->initCurrentDirectories(true); });
@@ -419,7 +419,7 @@ namespace BlackGui
void CCopyConfigurationComponent::initOtherSwiftVersions()
{
ui->cb_OtherVersions->clear();
const QMap<QString, CApplicationInfo> otherVersions = CSwiftDirectories::currentApplicationDataDirectoryMapWithoutCurrentVersion();
const QMap<QString, CApplicationInfo> otherVersions = CApplicationInfoList::currentApplicationDataDirectoryMapWithoutCurrentVersion();
for (const auto &pair : makePairsRange(otherVersions))
{
const CApplicationInfo &info(pair.second);