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 #485, moved stylesheet utility into CGuiApplication

Browse Source
This commit is contained in:
Klaus Basan
2016-03-13 19:25:31 +00:00
committed by Mathew Sutcliffe
parent b73562b33c
commit 18a907086d
19 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackgui/stylesheetutility.cpp
View File

@@ -82,13 +82,13 @@ namespace BlackGui
return w.append(" ").append(s);
}
QString CStyleSheetUtility::fontColor()
QString CStyleSheetUtility::fontColor() const
{
QString s = this->style(fileNameFonts()).toLower();
const QString s = this->style(fileNameFonts()).toLower();
if (!s.contains("color:")) return "red";
QRegExp rx("color:\\s*(#*\\w+);");
rx.indexIn(s);
QString c = rx.cap(1);
const QString c = rx.cap(1);
return c.isEmpty() ? "red" : c;
}
@@ -197,7 +197,7 @@ namespace BlackGui
{
static const QString n("normal");
QString c = combinedStyleAndWeight.toLower();
foreach(QString s, fontStyles())
foreach (QString s, fontStyles())
{
if (c.contains(s))
{
@@ -211,7 +211,7 @@ namespace BlackGui
{
static const QString n("normal");
QString c = combinedStyleAndWeight.toLower();
foreach(QString w, fontWeights())
foreach (QString w, fontWeights())
{
if (c.contains(w))
{
@@ -221,12 +221,6 @@ namespace BlackGui
return n;
}
CStyleSheetUtility &CStyleSheetUtility::instance()
{
static CStyleSheetUtility r;
return r;
}
const QString &CStyleSheetUtility::fileNameFonts()
{
static const QString f("fonts.qss");
@@ -301,13 +295,13 @@ namespace BlackGui
const QStringList &CStyleSheetUtility::fontWeights()
{
static const QStringList w( {"bold", "semibold", "light", "black", "normal"});
static const QStringList w({"bold", "semibold", "light", "black", "normal"});
return w;
}
const QStringList &CStyleSheetUtility::fontStyles()
{
static const QStringList s( {"italic", "oblique", "normal"});
static const QStringList s({"italic", "oblique", "normal"});
return s;
}