diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-03 18:58:13 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-03 18:58:13 (GMT) |
| commit | 064247ae5e3975c3e9f529f4a4c4a0546892d96f (patch) | |
| tree | b2a11e24e73a26fc4f6551982a1677d261dea9e5 /src/Preferences.h | |
| parent | 8dca991045a9f0563e6b654b1b946e5d778e8fd2 (diff) | |
| parent | c4a1d855f11d076d30e98f799315446da021514a (diff) | |
Merge branch 'master' of github.com:openscad/openscad
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 |