feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FancyLineEdit: Allow to set the ok color

Browse Source 
... and not just the error color.

Change-Id: I7fabd85404193ca3ee54d27025ca952995a0840f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-10-12 15:25:37 +02:00
parent 1f8b9077ab
commit b0bb2d3422
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/utils/fancylineedit.cpp
View File

@@ -105,7 +105,7 @@ public:
QString m_lastFilterText; QString m_lastFilterText;
const QColor m_okTextColor; QColor m_okTextColor;
QColor m_errorTextColor = Qt::red; QColor m_errorTextColor = Qt::red;
QString m_errorMessage; QString m_errorMessage;
QString m_initialText; QString m_initialText;
@@ -113,9 +113,10 @@ public:
FancyLineEditPrivate::FancyLineEditPrivate(FancyLineEdit *parent) : FancyLineEditPrivate::FancyLineEditPrivate(FancyLineEdit *parent) :
QObject(parent), QObject(parent),
m_lineEdit(parent), m_lineEdit(parent)
m_okTextColor(FancyLineEdit::textColor(parent))
{ {
m_okTextColor = parent->palette().color(QPalette::Active, QPalette::Text);
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
m_iconbutton[i] = new IconButton(parent); m_iconbutton[i] = new IconButton(parent);
m_iconbutton[i]->installEventFilter(this); m_iconbutton[i]->installEventFilter(this);
@@ -395,12 +396,19 @@ QColor FancyLineEdit::errorColor() const
void FancyLineEdit::setErrorColor(const QColor &c) void FancyLineEdit::setErrorColor(const QColor &c)
{ {
d->m_errorTextColor = c; d->m_errorTextColor = c;
validate();
} }
QColor FancyLineEdit::textColor(const QWidget *w) QColor FancyLineEdit::okColor() const
{ {
return w->palette().color(QPalette::Active, QPalette::Text); return d->m_okTextColor;
}
void FancyLineEdit::setOkColor(const QColor &c)
{
d->m_okTextColor = c;
validate();
} }
void FancyLineEdit::setTextColor(QWidget *w, const QColor &c) void FancyLineEdit::setTextColor(QWidget *w, const QColor &c)

7
src/libs/utils/fancylineedit.h
View File

@@ -84,6 +84,7 @@ class QTCREATOR_UTILS_EXPORT FancyLineEdit : public CompletingLineEdit
// Validation. // Validation.
Q_PROPERTY(QString initialText READ initialText WRITE setInitialText DESIGNABLE true) Q_PROPERTY(QString initialText READ initialText WRITE setInitialText DESIGNABLE true)
Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor DESIGNABLE true) Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor DESIGNABLE true)
Q_PROPERTY(QColor okColor READ okColor WRITE setOkColor DESIGNABLE true)
public: public:
enum Side {Left = 0, Right = 1}; enum Side {Left = 0, Right = 1};
@@ -141,9 +142,11 @@ public:
void setInitialText(const QString &); void setInitialText(const QString &);
QColor errorColor() const; QColor errorColor() const;
void setErrorColor(const QColor &); void setErrorColor(const QColor &c);
QColor okColor() const;
void setOkColor(const QColor &c);
static QColor textColor(const QWidget *w);
static void setTextColor(QWidget *w, const QColor &c); static void setTextColor(QWidget *w, const QColor &c);
void setValidationFunction(const ValidationFunction &fn); void setValidationFunction(const ValidationFunction &fn);