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

Ref T229, do not display a directory if same as default

Browse Source 
* component: made overlay compliant
* sim.dir can be empty on a machine where no simulator is installed
* formatting
* utility functions
This commit is contained in:
Klaus Basan
2018-01-20 04:01:29 +01:00
parent 9a9abbe382
commit 50eb93cf40
5 changed files with 150 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/blackmisc/simulation/settings/simulatorsettings.cpp
View File

@@ -12,6 +12,7 @@
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/stringutils.h"
#include <QStringBuilder>
using namespace BlackMisc;
using namespace BlackMisc::PhysicalQuantities;
@@ -82,12 +83,11 @@ namespace BlackMisc
QString CSimulatorSettings::convertToQString(const QString &separator, bool i18n) const
{
Q_UNUSED(i18n);
QString s("model directories: ");
s.append(m_modelDirectories.join(','));
s.append(separator);
s.append("exclude directories: ");
s.append(m_excludeDirectoryPatterns.join(','));
return s;
return QStringLiteral("model directories: ") %
m_modelDirectories.join(',') %
separator %
QStringLiteral("exclude directories: ") %
m_excludeDirectoryPatterns.join(',');
}
CVariant CSimulatorSettings::propertyByIndex(const CPropertyIndex &index) const
@@ -185,30 +185,36 @@ namespace BlackMisc
return CStatusMessage({ CLogCategory::settings() }, CStatusMessage::SeverityError, "wrong simulator");
}
QString CMultiSimulatorSettings::getSimulatorDirectoryIfNotDefault(const CSimulatorInfo &simulator) const
{
const CSimulatorSettings s = this->getSettings(simulator);
const QString dir = s.getSimulatorDirectory();
if (dir.isEmpty() || dir == CMultiSimulatorSettings::getDefaultSimulatorDirectory(simulator))
{
return QStringLiteral("");
}
return s.getSimulatorDirectory();
}
QString CMultiSimulatorSettings::getSimulatorDirectoryOrDefault(const CSimulatorInfo &simulator) const
{
const CSimulatorSettings s = this->getSettings(simulator);
if (s.getSimulatorDirectory().isEmpty())
{
return this->getDefaultSimulatorDirectory(simulator);
return CMultiSimulatorSettings::getDefaultSimulatorDirectory(simulator);
}
return s.getSimulatorDirectory();
}
QString CMultiSimulatorSettings::getDefaultSimulatorDirectory(const CSimulatorInfo &simulator) const
QStringList CMultiSimulatorSettings::getModelDirectoriesIfNotDefault(const CSimulatorInfo &simulator) const
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator())
const CSimulatorSettings s = this->getSettings(simulator);
const QStringList dirs = s.getModelDirectories();
if (dirs.isEmpty() || dirs == CMultiSimulatorSettings::getDefaultModelDirectories(simulator))
{
case CSimulatorInfo::FS9: return CFsCommonUtil::fs9Dir();
case CSimulatorInfo::FSX: return CFsCommonUtil::fsxDir();
case CSimulatorInfo::P3D: return CFsCommonUtil::p3dDir();
case CSimulatorInfo::XPLANE: return CXPlaneUtil::xplaneRootDir(); //! check XP
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
break;
return QStringList();
}
return "";
return dirs;
}
QStringList CMultiSimulatorSettings::getModelDirectoriesOrDefault(const CSimulatorInfo &simulator) const
@@ -245,6 +251,17 @@ namespace BlackMisc
return QStringList();
}
QStringList CMultiSimulatorSettings::getModelExcludeDirectoryPatternsIfNotDefault(const CSimulatorInfo &simulator) const
{
const CSimulatorSettings s = this->getSettings(simulator);
const QStringList patterns = s.getModelExcludeDirectoryPatterns();
if (patterns.isEmpty() || patterns == CMultiSimulatorSettings::getDefaultModelExcludeDirectoryPatterns(simulator))
{
return QStringList();
}
return patterns;
}
QStringList CMultiSimulatorSettings::getModelExcludeDirectoryPatternsOrDefault(const CSimulatorInfo &simulator) const
{
const CSimulatorSettings s = this->getSettings(simulator);
@@ -277,6 +294,23 @@ namespace BlackMisc
this->setAndSaveSettings(s, simulator);
}
QString CMultiSimulatorSettings::getDefaultSimulatorDirectory(const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
switch (simulator.getSimulator())
{
case CSimulatorInfo::FS9: return CFsCommonUtil::fs9Dir();
case CSimulatorInfo::FSX: return CFsCommonUtil::fsxDir();
case CSimulatorInfo::P3D: return CFsCommonUtil::p3dDir();
case CSimulatorInfo::XPLANE: return CXPlaneUtil::xplaneRootDir(); //! check XPlane
default:
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "No single simulator");
break;
}
static const QString empty;
return empty;
}
CSimulatorMessagesSettings::CSimulatorMessagesSettings()
{
// void
@@ -392,7 +426,7 @@ namespace BlackMisc
QString severity;
if (this->isRelayedTechnicalMessages())
{
severity = "No tech. msgs";
severity = QStringLiteral("No tech. msgs");
}
else
{