Skip to content

Commit 31a9254

Browse files
committed
Use some constants for search box highlighting styles
1 parent 5efa7bb commit 31a9254

File tree

2 files changed

+37
-6
lines changed

2 files changed

+37
-6
lines changed

src/gui/qgsoptionsdialoghighlightwidgetsimpl.cpp

+33-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,24 @@
3030

3131
#include <functional>
3232

33+
const int HIGHLIGHT_BACKGROUND_RED = 255;
34+
const int HIGHLIGHT_BACKGROUND_GREEN = 251;
35+
const int HIGHLIGHT_BACKGROUND_BLUE = 190;
36+
const int HIGHLIGHT_TEXT_RED = 0;
37+
const int HIGHLIGHT_TEXT_GREEN = 0;
38+
const int HIGHLIGHT_TEXT_BLUE = 0;
39+
3340
// ****************
3441
// QLabel
3542
QgsOptionsDialogHighlightLabel::QgsOptionsDialogHighlightLabel( QLabel *label )
3643
: QgsOptionsDialogHighlightWidget( label )
3744
, mLabel( label )
45+
, mStyleSheet( QStringLiteral( /*!search!*/"QLabel { background-color: rgb(%1, %2, %3); color: rgb(%4, %5, %6 );}/*!search!*/" ).arg( HIGHLIGHT_BACKGROUND_RED )
46+
.arg( HIGHLIGHT_BACKGROUND_GREEN )
47+
.arg( HIGHLIGHT_BACKGROUND_BLUE )
48+
.arg( HIGHLIGHT_TEXT_RED )
49+
.arg( HIGHLIGHT_TEXT_GREEN )
50+
.arg( HIGHLIGHT_TEXT_BLUE ) )
3851
{}
3952

4053
bool QgsOptionsDialogHighlightLabel::searchText( const QString &text )
@@ -68,6 +81,12 @@ void QgsOptionsDialogHighlightLabel::reset()
6881
QgsOptionsDialogHighlightCheckBox::QgsOptionsDialogHighlightCheckBox( QCheckBox *checkBox )
6982
: QgsOptionsDialogHighlightWidget( checkBox )
7083
, mCheckBox( checkBox )
84+
, mStyleSheet( QStringLiteral( "/*!search!*/QCheckBox { background-color: rgb(%1, %2, %3); color: rgb( %4, %5, %6);}/*!search!*/" ).arg( HIGHLIGHT_BACKGROUND_RED )
85+
.arg( HIGHLIGHT_BACKGROUND_GREEN )
86+
.arg( HIGHLIGHT_BACKGROUND_BLUE )
87+
.arg( HIGHLIGHT_TEXT_RED )
88+
.arg( HIGHLIGHT_TEXT_GREEN )
89+
.arg( HIGHLIGHT_TEXT_BLUE ) )
7190
{
7291
}
7392

@@ -103,6 +122,12 @@ void QgsOptionsDialogHighlightCheckBox::reset()
103122
QgsOptionsDialogHighlightButton::QgsOptionsDialogHighlightButton( QAbstractButton *button )
104123
: QgsOptionsDialogHighlightWidget( button )
105124
, mButton( button )
125+
, mStyleSheet( QStringLiteral( "/*!search!*/QAbstractButton { background-color: rgb(%1, %2, %3); color: rgb(%4, %5, %6);}/*!search!*/" ).arg( HIGHLIGHT_BACKGROUND_RED )
126+
.arg( HIGHLIGHT_BACKGROUND_GREEN )
127+
.arg( HIGHLIGHT_BACKGROUND_BLUE )
128+
.arg( HIGHLIGHT_TEXT_RED )
129+
.arg( HIGHLIGHT_TEXT_GREEN )
130+
.arg( HIGHLIGHT_TEXT_BLUE ) )
106131
{
107132
}
108133

@@ -138,6 +163,12 @@ void QgsOptionsDialogHighlightButton::reset()
138163
QgsOptionsDialogHighlightGroupBox::QgsOptionsDialogHighlightGroupBox( QGroupBox *groupBox )
139164
: QgsOptionsDialogHighlightWidget( groupBox )
140165
, mGroupBox( groupBox )
166+
, mStyleSheet( QStringLiteral( "/*!search!*/QGroupBox::title { background-color: rgb(%1, %2, %3); color: rgb(%4, %5, %6);}/*!search!*/" ).arg( HIGHLIGHT_BACKGROUND_RED )
167+
.arg( HIGHLIGHT_BACKGROUND_GREEN )
168+
.arg( HIGHLIGHT_BACKGROUND_BLUE )
169+
.arg( HIGHLIGHT_TEXT_RED )
170+
.arg( HIGHLIGHT_TEXT_GREEN )
171+
.arg( HIGHLIGHT_TEXT_BLUE ) )
141172
{
142173
}
143174

@@ -209,8 +240,8 @@ bool QgsOptionsDialogHighlightTree::highlightText( const QString &text )
209240
for ( QTreeWidgetItem *item : items )
210241
{
211242
mTreeInitialStyle.insert( item, qMakePair( item->background( 0 ), item->foreground( 0 ) ) );
212-
item->setBackground( 0, QBrush( QColor( Qt::yellow ) ) );
213-
item->setForeground( 0, QBrush( QColor( Qt::blue ) ) );
243+
item->setBackground( 0, QBrush( QColor( HIGHLIGHT_BACKGROUND_RED, HIGHLIGHT_BACKGROUND_GREEN, HIGHLIGHT_BACKGROUND_BLUE ) ) );
244+
item->setForeground( 0, QBrush( QColor( HIGHLIGHT_TEXT_RED, HIGHLIGHT_TEXT_GREEN, HIGHLIGHT_TEXT_BLUE ) ) );
214245
setChildrenVisible( item, true );
215246

216247
QTreeWidgetItem *parent = item;

src/gui/qgsoptionsdialoghighlightwidgetsimpl.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class GUI_EXPORT QgsOptionsDialogHighlightLabel : public QgsOptionsDialogHighlig
5151
virtual bool highlightText( const QString &text ) override;
5252
virtual void reset() override;
5353
QPointer<QLabel> mLabel;
54-
QString mStyleSheet = QStringLiteral( /*!search!*/"QLabel { background-color: rgb(255, 251, 190); color: black;}/*!search!*/" );
54+
QString mStyleSheet;
5555
};
5656

5757
/**
@@ -72,7 +72,7 @@ class GUI_EXPORT QgsOptionsDialogHighlightCheckBox : public QgsOptionsDialogHigh
7272
virtual bool highlightText( const QString &text ) override;
7373
virtual void reset() override;
7474
QPointer<QCheckBox> mCheckBox;
75-
QString mStyleSheet = QStringLiteral( "/*!search!*/QCheckBox { background-color: rgb(255, 251, 190); color: black;}/*!search!*/" );
75+
QString mStyleSheet;
7676
};
7777

7878
/**
@@ -93,7 +93,7 @@ class GUI_EXPORT QgsOptionsDialogHighlightButton : public QgsOptionsDialogHighli
9393
virtual bool highlightText( const QString &text ) override;
9494
virtual void reset() override;
9595
QPointer<QAbstractButton> mButton;
96-
QString mStyleSheet = QStringLiteral( "/*!search!*/QAbstractButton { background-color: rgb(255, 251, 190); color: black;}/*!search!*/" );
96+
QString mStyleSheet;
9797
};
9898

9999
/**
@@ -114,7 +114,7 @@ class GUI_EXPORT QgsOptionsDialogHighlightGroupBox : public QgsOptionsDialogHigh
114114
virtual bool highlightText( const QString &text ) override;
115115
virtual void reset() override;
116116
QPointer<QGroupBox> mGroupBox;
117-
QString mStyleSheet = QStringLiteral( "/*!search!*/QGroupBox::title { background-color: rgb(255, 251, 190); color: black;}/*!search!*/" );
117+
QString mStyleSheet;
118118
};
119119

120120
/**

0 commit comments

Comments
 (0)