diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
| commit | bee5233a916055d41bb4ee425f5df25b80f50f16 (patch) | |
| tree | 7bfac9716f778ed685e62e2d0830d1905bc08fd2 /src/Preferences.h | |
| parent | f093b53c3edb08ee0d64c5d6c2a1df723acfca2d (diff) | |
| parent | c5223417e3ffe965d09d971865797206080eb0ae (diff) | |
Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
Conflicts:
src/Preferences.ui
Diffstat (limited to 'src/Preferences.h')
| -rw-r--r-- | src/Preferences.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Preferences.h b/src/Preferences.h index 1230c8a..d74ada9 100644 --- a/src/Preferences.h +++ b/src/Preferences.h @@ -21,6 +21,7 @@ public: public slots: void actionTriggered(class QAction *); + void featuresCheckBoxToggled(bool); void on_colorSchemeChooser_itemSelectionChanged(); void on_fontChooser_activated(const QString &); void on_fontSize_editTextChanged(const QString &); @@ -46,11 +47,15 @@ private: void keyPressEvent(QKeyEvent *e); void updateGUI(); void removeDefaultSettings(); + void setupFeaturesPage(); + void addPrefPage(QActionGroup *group, QAction *action, QWidget *widget); QSettings::SettingsMap defaultmap; QHash<QString, std::map<RenderSettings::RenderColor, Color4f> > colorschemes; + QHash<const QAction *, QWidget *> prefPages; static Preferences *instance; + static const char *featurePropertyName; }; #endif |