diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-11 22:45:14 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-11 22:45:14 (GMT) |
| commit | 9ed8d9a6732e1eea0265ff84917278a82d81e2dd (patch) | |
| tree | 6322830c95d70b2310b45c7008cfd4dac6d4bf31 /src/Preferences.h | |
| parent | 647fdf5f98f6337955972375a17837aede922988 (diff) | |
Some small refactoring of color handling to support using the color() module to change only alpha
Diffstat (limited to 'src/Preferences.h')
| -rw-r--r-- | src/Preferences.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/Preferences.h b/src/Preferences.h index add1a11..7e22e63 100644 --- a/src/Preferences.h +++ b/src/Preferences.h @@ -4,6 +4,7 @@ #include <QMainWindow> #include <QSettings> #include "ui_Preferences.h" +#include "rendersettings.h" class Preferences : public QMainWindow, public Ui::Preferences { @@ -13,19 +14,6 @@ public: ~Preferences(); static Preferences *inst() { if (!instance) instance = new Preferences(); return instance; } - enum RenderColor { - BACKGROUND_COLOR, - OPENCSG_FACE_FRONT_COLOR, - OPENCSG_FACE_BACK_COLOR, - CGAL_FACE_FRONT_COLOR, - CGAL_FACE_2D_COLOR, - CGAL_FACE_BACK_COLOR, - CGAL_EDGE_FRONT_COLOR, - CGAL_EDGE_BACK_COLOR, - CGAL_EDGE_2D_COLOR, - CROSSHAIR_COLOR - }; - const QColor &color(RenderColor idx); QVariant getValue(const QString &key) const; void apply() const; @@ -48,7 +36,7 @@ private: void removeDefaultSettings(); QSettings::SettingsMap defaultmap; - QHash<QString, QMap<RenderColor, QColor> > colorschemes; + QHash<QString, QMap<RenderSettings::RenderColor, QColor> > colorschemes; static Preferences *instance; }; |