From c8cad99515eeac25faf6ea84795ce6b5fa4afebb Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 4 Feb 2015 16:36:19 -0800 Subject: Qt: Add the Coloring Rules dialog. Merge in the old ColorDialog which was a placeholder for color_filter_add_cb. Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10 Reviewed-on: https://code.wireshark.org/review/6996 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- ui/qt/color_utils.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ui/qt/color_utils.cpp') diff --git a/ui/qt/color_utils.cpp b/ui/qt/color_utils.cpp index 4210d29734..e6d7f31082 100644 --- a/ui/qt/color_utils.cpp +++ b/ui/qt/color_utils.cpp @@ -60,6 +60,16 @@ QColor ColorUtils::fromColorT(color_t color) return fromColorT(&color); } +const color_t ColorUtils::toColorT(const QColor color) +{ + color_t colort; + colort.red = (color.red() << 8) | color.red(); + colort.green = (color.green() << 8) | color.green(); + colort.blue = (color.blue() << 8) | color.blue(); + + return colort; +} + QRgb ColorUtils::alphaBlend(const QColor &color1, const QColor &color2, qreal alpha) { alpha = qBound(0.0, alpha, 1.0); -- cgit v1.2.1