diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
| commit | 8e85f09b29ff8c56c26fa69e369080f1d7e09203 (patch) | |
| tree | f1645b2af10067f316039b720033bef141a80ad6 /src/Preferences.cc | |
| parent | bcc6120f9b7ce4187c56e0f83dd021674ccdec80 (diff) | |
| parent | 24d7edd8cab9cf359ccd89bf88bf7a55e2cfc21b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/Preferences.cc')
| -rw-r--r-- | src/Preferences.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Preferences.cc b/src/Preferences.cc index eb6af61..d240a9f 100644 --- a/src/Preferences.cc +++ b/src/Preferences.cc @@ -98,8 +98,8 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent) this, SLOT(fontFamilyChanged(const QString &))); connect(this->fontSize, SIGNAL(editTextChanged(const QString &)), this, SLOT(fontSizeChanged(const QString &))); - connect(this->OpenGL20WarningCheckbox, SIGNAL(clicked(bool)), - this, SLOT(OpenGL20WarningChanged(bool))); + connect(this->openCSGWarningBox, SIGNAL(clicked(bool)), + this, SLOT(openCSGWarningChanged(bool))); updateGUI(); } @@ -151,7 +151,7 @@ void Preferences::fontSizeChanged(const QString &size) } void -Preferences::OpenGL20WarningChanged(bool state) +Preferences::openCSGWarningChanged(bool state) { QSettings settings; settings.setValue("editor/opengl20_warning_show",state); @@ -215,8 +215,7 @@ void Preferences::updateGUI() this->fontSize->setEditText(fontsize); } - bool opengl20_warning_show = getValue("editor/opengl20_warning_show").toBool(); - this->OpenGL20WarningCheckbox->setChecked(opengl20_warning_show); + this->openCSGWarningBox->setChecked(getValue("editor/opengl20_warning_show").toBool()); } void Preferences::apply() const |