diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
| commit | 2dff8d760594661114615366c7cb51133fec0c10 (patch) | |
| tree | d71608abb24be34d21cac0900d64a6ed01142af1 /ui/qt/color_utils.h | |
| parent | 70755ffa17fc454b4e32c5c586ebbddda0e482e4 (diff) | |
| download | wireshark-2dff8d760594661114615366c7cb51133fec0c10.tar.gz | |
Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.
Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.
svn path=/trunk/; revision=47240
Diffstat (limited to 'ui/qt/color_utils.h')
| -rw-r--r-- | ui/qt/color_utils.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ui/qt/color_utils.h b/ui/qt/color_utils.h index e8372a1ad0..d1d7b09cb4 100644 --- a/ui/qt/color_utils.h +++ b/ui/qt/color_utils.h @@ -24,13 +24,22 @@ #ifndef COLOR_UTILS_H #define COLOR_UTILS_H -#include <QWidget> +#include "config.h" -class ColorUtils : public QWidget +#include <glib.h> + +#include "color.h" + +#include <QObject> +#include <QColor> + +class ColorUtils : public QObject { Q_OBJECT public: - explicit ColorUtils(QWidget *parent = 0); + explicit ColorUtils(QObject *parent = 0); + + static QColor fromColorT(color_t *color); signals: |