Add filter color preferences to the Qt UI similar to r50203. Fixes bug

5413.

svn path=/trunk/; revision=50706

3 files changed, 108 insertions, 4 deletions

diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp
index eab7568d76..d5a31932bc 100644
--- a/ui/qt/font_color_preferences_frame.cpp
+++ b/ui/qt/font_color_preferences_frame.cpp
@@ -52,6 +52,9 @@ FontColorPreferencesFrame::FontColorPreferencesFrame(QWidget *parent) :
     pref_client_bg_ = prefFromPrefPtr(&prefs.st_client_bg);
     pref_server_fg_ = prefFromPrefPtr(&prefs.st_server_fg);
     pref_server_bg_ = prefFromPrefPtr(&prefs.st_server_bg);
+    pref_valid_bg_ = prefFromPrefPtr(&prefs.gui_text_valid);
+    pref_invalid_bg_ = prefFromPrefPtr(&prefs.gui_text_invalid);
+    pref_deprecated_bg_ = prefFromPrefPtr(&prefs.gui_text_deprecated);
 
     cur_font_.fromString(pref_qt_gui_font_name_->stashed_val.string);
 
@@ -143,6 +146,25 @@ void FontColorPreferencesFrame::updateWidgets()
                                                 ColorUtils::fromColorT(&pref_server_fg_->stashed_val.color).name(),
                                                 ColorUtils::fromColorT(&pref_server_bg_->stashed_val.color).name()));
     ui->serverSampleLineEdit->setFont(cur_font_);
+
+    ui->validFilterBGPushButton->setStyleSheet(color_button_ss.arg(
+                                                   ColorUtils::fromColorT(&pref_valid_bg_->stashed_val.color).name())
+                                               .arg(0));
+    ui->validFilterSampleLineEdit->setStyleSheet(sample_text_ss.arg(
+                                                     "palette(text)",
+                                                     ColorUtils::fromColorT(&pref_valid_bg_->stashed_val.color).name()));
+    ui->invalidFilterBGPushButton->setStyleSheet(color_button_ss.arg(
+                                                     ColorUtils::fromColorT(&pref_invalid_bg_->stashed_val.color).name())
+                                                 .arg(0));
+    ui->invalidFilterSampleLineEdit->setStyleSheet(sample_text_ss.arg(
+                                                       "palette(text)",
+                                                       ColorUtils::fromColorT(&pref_invalid_bg_->stashed_val.color).name()));
+    ui->deprecatedFilterBGPushButton->setStyleSheet(color_button_ss.arg(
+                                                        ColorUtils::fromColorT(&pref_deprecated_bg_->stashed_val.color).name())
+                                                    .arg(0));
+    ui->deprecatedFilterSampleLineEdit->setStyleSheet(sample_text_ss.arg(
+                                                          "palette(text)",
+                                                          ColorUtils::fromColorT(&pref_deprecated_bg_->stashed_val.color).name()));
 }
 
 void FontColorPreferencesFrame::changeColor(pref_t *pref)
@@ -216,6 +238,21 @@ void FontColorPreferencesFrame::on_serverBGPushButton_clicked()
     changeColor(pref_server_bg_);
 }
 
+void FontColorPreferencesFrame::on_validFilterBGPushButton_clicked()
+{
+    changeColor(pref_valid_bg_);
+}
+
+void FontColorPreferencesFrame::on_invalidFilterBGPushButton_clicked()
+{
+    changeColor(pref_invalid_bg_);
+}
+
+void FontColorPreferencesFrame::on_deprecatedFilterBGPushButton_clicked()
+{
+    changeColor(pref_deprecated_bg_);
+}
+
 /*
  * Editor modelines
  *
diff --git a/ui/qt/font_color_preferences_frame.h b/ui/qt/font_color_preferences_frame.h
index 1b1a4e82d2..f7630a0e5a 100644
--- a/ui/qt/font_color_preferences_frame.h
+++ b/ui/qt/font_color_preferences_frame.h
@@ -56,6 +56,12 @@ private:
     pref_t *pref_client_bg_;
     pref_t *pref_server_fg_;
     pref_t *pref_server_bg_;
+    pref_t *pref_valid_fg_;
+    pref_t *pref_valid_bg_;
+    pref_t *pref_invalid_fg_;
+    pref_t *pref_invalid_bg_;
+    pref_t *pref_deprecated_fg_;
+    pref_t *pref_deprecated_bg_;
     QFont cur_font_;
 
     void updateWidgets();
@@ -72,8 +78,9 @@ private slots:
     void on_clientBGPushButton_clicked();
     void on_serverFGPushButton_clicked();
     void on_serverBGPushButton_clicked();
-
-
+    void on_validFilterBGPushButton_clicked();
+    void on_invalidFilterBGPushButton_clicked();
+    void on_deprecatedFilterBGPushButton_clicked();
 };
 
 #endif // FONT_COLOR_PREFERENCES_FRAME_H
diff --git a/ui/qt/font_color_preferences_frame.ui b/ui/qt/font_color_preferences_frame.ui
index 93b6ba6f5f..d61a991be2 100644
--- a/ui/qt/font_color_preferences_frame.ui
+++ b/ui/qt/font_color_preferences_frame.ui
@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>540</width>
-    <height>280</height>
+    <height>390</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>540</width>
-    <height>280</height>
+    <height>390</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -193,6 +193,66 @@
        </property>
       </widget>
      </item>
+     <item row="4" column="2">
+      <widget class="QLineEdit" name="validFilterSampleLineEdit">
+       <property name="text">
+        <string>Sample valid filter</string>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="2">
+      <widget class="QLineEdit" name="invalidFilterSampleLineEdit">
+       <property name="text">
+        <string>Sample invalid filter</string>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="2">
+      <widget class="QLineEdit" name="deprecatedFilterSampleLineEdit">
+       <property name="text">
+        <string>Sample deprecated filter</string>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QPushButton" name="validFilterBGPushButton">
+       <property name="styleSheet">
+        <string notr="true">QPushButton { border: 1px solid palette(Dark); }</string>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QPushButton" name="invalidFilterBGPushButton">
+       <property name="styleSheet">
+        <string notr="true">QPushButton { border: 1px solid palette(Dark); }</string>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QPushButton" name="deprecatedFilterBGPushButton">
+       <property name="styleSheet">
+        <string notr="true">QPushButton { border: 1px solid palette(Dark); }</string>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>