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

refs #883, added new "directories"

Browse Source 
* directories for in buildconfig/globalsetup
* renamed to CBuildConfig::getSwiftShareDir
This commit is contained in:
Klaus Basan
2017-02-15 23:40:04 +01:00
committed by Mathew Sutcliffe
parent a0b5258346
commit dd37945625
5 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/blackconfig/buildconfig.cpp
View File

@@ -149,7 +149,7 @@ namespace BlackConfig
return isBundled;
}
QString getSwiftResourceDirImpl()
QString getSwiftShareDirImpl()
{
QDir dir(CBuildConfig::getApplicationDir());
bool success = true;
@@ -170,15 +170,15 @@ namespace BlackConfig
return "";
}
const QString &CBuildConfig::getSwiftResourceDir()
const QString &CBuildConfig::getSwiftShareDir()
{
static const QString s(getSwiftResourceDirImpl());
static const QString s(getSwiftShareDirImpl());
return s;
}
const QString getBootstrapResourceFileImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
if (d.isEmpty()) { return ""; }
const QFile file(QDir::cleanPath(d + QDir::separator() + "shared/boostrap/boostrap.json"));
Q_ASSERT_X(file.exists(), Q_FUNC_INFO, "missing dir");
@@ -193,7 +193,7 @@ namespace BlackConfig
QString getSwiftStaticDbFilesDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
if (d.isEmpty()) { return ""; }
const QDir dir(QDir::cleanPath(d + QDir::separator() + "shared/dbdata"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
@@ -208,7 +208,7 @@ namespace BlackConfig
QString getSoundFilesDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
if (d.isEmpty()) { return ""; }
const QDir dir(QDir::cleanPath(d + QDir::separator() + "sounds"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
@@ -223,7 +223,7 @@ namespace BlackConfig
QString getStylesheetsDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
if (d.isEmpty()) { return ""; }
const QDir dir(QDir::cleanPath(d + QDir::separator() + "qss"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
@@ -238,7 +238,7 @@ namespace BlackConfig
QString getImagesDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
const QDir dir(QDir::cleanPath(d + QDir::separator() + "images"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
@@ -252,7 +252,7 @@ namespace BlackConfig
QString getHtmlDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
const QDir dir(QDir::cleanPath(d + QDir::separator() + "html"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
@@ -264,9 +264,29 @@ namespace BlackConfig
return s;
}
QString getLegalDirImpl()
{
const QString d(CBuildConfig::getSwiftShareDir());
const QDir dir(QDir::cleanPath(d + QDir::separator() + "legal"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
const QString &CBuildConfig::getLegalDir()
{
static const QString s(getLegalDirImpl());
return s;
}
const QString &CBuildConfig::getAboutFileLocation()
{
static const QString about = QDir::cleanPath(CBuildConfig::getLegalDir() + QDir::separator() + "about.html");
return about;
}
QString getTestFilesDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
const QString d(CBuildConfig::getSwiftShareDir());
if (d.isEmpty()) { return ""; }
const QDir dir(QDir::cleanPath(d + QDir::separator() + "test"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
@@ -370,7 +390,7 @@ namespace BlackConfig
QList<int> CVersion::getVersionParts(const QString &versionString)
{
QStringList parts = versionString.split('.');
const QStringList parts = versionString.split('.');
QList<int> partsInt;
for (const QString &p : parts)
{

9
src/blackconfig/buildconfig.h
View File

@@ -91,7 +91,8 @@ namespace BlackConfig
static const QString &getApplicationDir();
//! Where resource files (static DB files, ...) etc are located
static const QString &getSwiftResourceDir();
//! \remark share not shared (do no mix)
static const QString &getSwiftShareDir();
//! Bootstrap resource directory
static const QString &getBootstrapResourceFile();
@@ -111,6 +112,12 @@ namespace BlackConfig
//! Where HTML files are located
static const QString &getHtmlDir();
//! Where Legal files are located
static const QString &getLegalDir();
//! The about document file location
static const QString &getAboutFileLocation();
//! Where test files are located
static const QString &getTestFilesDir();

5
src/blackcore/data/globalsetup.cpp
View File

@@ -67,6 +67,11 @@ namespace BlackCore
return getDbRootDirectoryUrl().withAppendedPath("/page/index.php");
}
CUrl CGlobalSetup::getLegalDirectoryUrl() const
{
return getDbRootDirectoryUrl().withAppendedPath("/legal/");
}
CUrl CGlobalSetup::getDbLoginServiceUrl() const
{
return getDbRootDirectoryUrl().

3
src/blackcore/data/globalsetup.h
View File

@@ -92,6 +92,9 @@ namespace BlackCore
//! Help page URL
BlackMisc::Network::CUrl getHelpPageUrl() const;
//! Legal directory URL
BlackMisc::Network::CUrl getLegalDirectoryUrl() const;
//! Login service
BlackMisc::Network::CUrl getDbLoginServiceUrl() const;

2
src/swiftdata/swiftdatamenus.cpp
View File

@@ -56,7 +56,7 @@ void CSwiftData::initDynamicMenus()
Q_ASSERT_X(ui->comp_MainInfoArea, Q_FUNC_INFO, "missing main area");
ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(ui->menu_InfoAreas));
QString resourceDir(CBuildConfig::getSwiftResourceDir());
QString resourceDir(CBuildConfig::getSwiftShareDir());
if (!resourceDir.isEmpty() && QDir(resourceDir).exists())
{
Q_ASSERT_X(ui->comp_MainInfoArea, Q_FUNC_INFO, "Missing main info area");