mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
fix/refactor backlight stuff (#394)
* fix/refactor backlight stuff: - fix colors dont turn of when backlight 0 and black is set - add option to use not colored backlight - fix colored backlight not colored on very low color values - various code style tunings * apply needed change to wizard * backlight disabled on static color and efects * fix warnings * try fix udp compiler warnings
This commit is contained in:
@@ -6,32 +6,36 @@ using namespace commandline;
|
||||
|
||||
bool ColorsOption::validate(Parser & parser, QString & value)
|
||||
{
|
||||
// Clear any old results
|
||||
_colors.clear();
|
||||
// Clear any old results
|
||||
_colors.clear();
|
||||
|
||||
// Check if we can create the color by name
|
||||
QColor color(value);
|
||||
if (color.isValid()) {
|
||||
_colors.push_back(color);
|
||||
return true;
|
||||
}
|
||||
// Check if we can create the color by name
|
||||
QColor color(value);
|
||||
if (color.isValid())
|
||||
{
|
||||
_colors.push_back(color);
|
||||
return true;
|
||||
}
|
||||
|
||||
// check if we can create the color by hex RRGGBB getColors
|
||||
QRegularExpression hexRe("^([0-9A-F]{6})+$", QRegularExpression::CaseInsensitiveOption);
|
||||
QRegularExpressionMatch match = hexRe.match(value);
|
||||
if(match.hasMatch()) {
|
||||
Q_FOREACH(const QString m, match.capturedTexts()){
|
||||
_colors.push_back(QColor(QString("#%1").arg(m)));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// check if we can create the color by hex RRGGBB getColors
|
||||
QRegularExpression hexRe("^([0-9A-F]{6})+$", QRegularExpression::CaseInsensitiveOption);
|
||||
QRegularExpressionMatch match = hexRe.match(value);
|
||||
if(match.hasMatch())
|
||||
{
|
||||
Q_FOREACH(const QString m, match.capturedTexts())
|
||||
{
|
||||
_colors.push_back(QColor(QString("#%1").arg(m)));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if(!parser.isSet(*this)){
|
||||
if(!parser.isSet(*this))
|
||||
{
|
||||
// Return true if no value is available
|
||||
return true;
|
||||
}
|
||||
|
||||
_error = QString("Invalid color. A color is specified by a six lettered RRGGBB hex getColors or one of the following names:\n\t- %1").arg(QColor::colorNames().join("\n\t- "));
|
||||
_error = QString("Invalid color. A color is specified by a six lettered RRGGBB hex getColors or one of the following names:\n\t- %1").arg(QColor::colorNames().join("\n\t- "));
|
||||
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user