From bfe73e3ad7162830c222a5b0d73433a72324baa5 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Tue, 15 Dec 2015 19:47:02 +0100 Subject: Qt: save custom colors in recent_common file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows to save colors across sessions for systems other than OSX that do not provide a system wide color picker While we are at it, let's stop reading the recent file twice at startup Bug: 11888 Change-Id: I69ff14d699d8111fe6a8bdac0157fcd115a60c2b Reviewed-on: https://code.wireshark.org/review/12659 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke --- ui/qt/wireshark_application.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ui/qt/wireshark_application.h') diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index e4f74b86ef..6ed971e227 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -111,6 +111,7 @@ public: const QString &windowTitleSeparator() const { return window_title_separator_; } const QString windowTitleString(QStringList title_parts); const QString windowTitleString(QString title_part) { return windowTitleString(QStringList() << title_part); } + void applyCustomColorsFromRecent(); QTranslator translator; QTranslator translatorQt; @@ -130,6 +131,7 @@ private: static QString window_title_separator_; QList app_signals_; int active_captures_; + void storeCustomColorsInRecent(); protected: bool event(QEvent *event); -- cgit v1.2.1