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

Issue #77 Factor out parts of CDirectoryUtils into CSwiftDirectories

Browse Source 
CDirectoryUtils is utilities for manipulating directories.
CSwiftDirectories is getters that return directories used by swift.
This commit is contained in:
Mat Sutcliffe
2020-08-24 22:04:10 +01:00
parent 802576eda9
commit 8e065a8fef
61 changed files with 880 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackgui/stylesheetutility.cpp
View File

@@ -10,6 +10,7 @@
#include "blackgui/stylesheetutility.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/swiftdirectories.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/restricted.h"
@@ -140,12 +141,12 @@ namespace BlackGui
bool CStyleSheetUtility::read()
{
QDir directory(CDirectoryUtils::stylesheetsDirectory());
QDir directory(CSwiftDirectories::stylesheetsDirectory());
if (!directory.exists()) { return false; }
// qss/css files
const bool needsWatcher = m_fileWatcher.files().isEmpty();
if (needsWatcher) { m_fileWatcher.addPath(CDirectoryUtils::stylesheetsDirectory()); } // directory to deleted file watching
if (needsWatcher) { m_fileWatcher.addPath(CSwiftDirectories::stylesheetsDirectory()); } // directory to deleted file watching
directory.setNameFilters({"*.qss", "*.css"});
directory.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
@@ -167,7 +168,7 @@ namespace BlackGui
// save files for debugging
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::logDirectory(), f);
const QString fn = CFileUtils::appendFilePaths(CSwiftDirectories::logDirectory(), f);
CFileUtils::writeStringToFile(c, fn);
}
@@ -255,7 +256,7 @@ namespace BlackGui
bool CStyleSheetUtility::updateFont(const QString &qss)
{
const QString qssWidget(u"QWidget {\n" % qss % u"}\n");
const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), fileNameFontsModified());
const QString fn = CFileUtils::appendFilePaths(CSwiftDirectories::stylesheetsDirectory(), fileNameFontsModified());
QFile fontFile(fn);
bool ok = fontFile.open(QFile::Text | QFile::WriteOnly);
if (ok)
@@ -274,7 +275,7 @@ namespace BlackGui
bool CStyleSheetUtility::resetFont()
{
QFile fontFile(CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), fileNameFontsModified()));
QFile fontFile(CFileUtils::appendFilePaths(CSwiftDirectories::stylesheetsDirectory(), fileNameFontsModified()));
return fontFile.remove();
}
@@ -317,7 +318,7 @@ namespace BlackGui
bool CStyleSheetUtility::deleteModifiedFontFile()
{
const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), fileNameFontsModified());
const QString fn = CFileUtils::appendFilePaths(CSwiftDirectories::stylesheetsDirectory(), fileNameFontsModified());
QFile file(fn);
if (!file.exists()) { return false; }
bool r = file.remove();
@@ -334,7 +335,7 @@ namespace BlackGui
const QString &CStyleSheetUtility::fileNameAndPathSwiftStandardGui()
{
static const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), CStyleSheetUtility::fileNameSwiftStandardGui());
static const QString fn = CFileUtils::appendFilePaths(CSwiftDirectories::stylesheetsDirectory(), CStyleSheetUtility::fileNameSwiftStandardGui());
return fn;
}
@@ -364,7 +365,7 @@ namespace BlackGui
const QString &CStyleSheetUtility::fileNameAndPathStandardWidget()
{
static const QString fn = CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), CStyleSheetUtility::fileNameStandardWidget());
static const QString fn = CFileUtils::appendFilePaths(CSwiftDirectories::stylesheetsDirectory(), CStyleSheetUtility::fileNameStandardWidget());
return fn;
}
@@ -513,7 +514,7 @@ namespace BlackGui
bool CStyleSheetUtility::qssFileExists(const QString &filename)
{
if (filename.isEmpty()) { return false; }
const QFileInfo f(CFileUtils::appendFilePaths(CDirectoryUtils::stylesheetsDirectory(), filename));
const QFileInfo f(CFileUtils::appendFilePaths(CSwiftDirectories::stylesheetsDirectory(), filename));
return f.exists() && f.isReadable();
}
} // ns