diff --git a/src/Preferences.cc b/src/Preferences.cc index 1cd36456..46bf9fa6 100644 --- a/src/Preferences.cc +++ b/src/Preferences.cc @@ -65,7 +65,7 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent) this->defaultmap["editor/fontsize"] = 12; this->defaultmap["editor/syntaxhighlight"] = "For Light Background"; -#elif defined (Q_OS_MAC) +#if defined (Q_OS_MAC) this->defaultmap["editor/ctrlmousewheelzoom"] = false; #else this->defaultmap["editor/ctrlmousewheelzoom"] = true; diff --git a/src/Preferences.h b/src/Preferences.h index d74ada90..62e7ee5e 100644 --- a/src/Preferences.h +++ b/src/Preferences.h @@ -32,6 +32,7 @@ public slots: void on_polysetCacheSizeEdit_textChanged(const QString &); void on_opencsgLimitEdit_textChanged(const QString &); void on_forceGoldfeatherBox_toggled(bool); + void on_mouseWheelZoomBox_toggled(bool); void on_updateCheckBox_toggled(bool); void on_snapshotCheckBox_toggled(bool); void on_checkNowButton_clicked(); diff --git a/src/editor.cc b/src/editor.cc index 0cc4f98d..3c0e0194 100644 --- a/src/editor.cc +++ b/src/editor.cc @@ -105,7 +105,7 @@ void Editor::zoomOut() void Editor::wheelEvent ( QWheelEvent * event ) { QSettings settings; - if (!settings.getValue("editor/ctrlmousewheelzoom").toBool()) { + if (!Preferences::inst()->getValue("editor/ctrlmousewheelzoom").toBool()) { return; // see numerous bug reports on mailing list }