vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

fix build errors

zoompeace
Don Bright 2014-03-18 18:59:47 -05:00
parent 3022a83148
commit 0d8c9359b5
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Preferences.cc
View File

@ -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;

1
src/Preferences.h
View File

@ -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();

2
src/editor.cc
View File

@ -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
}