summaryrefslogtreecommitdiff
path: root/src/Preferences.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-07-24 02:43:43 (GMT)
committerMarius Kintel <marius@kintel.net>2012-07-24 02:43:43 (GMT)
commitf1634d545dafecb745f32fa786d351e95b545280 (patch)
tree36342df7c93328f4db71988466e21c10b429a0ef /src/Preferences.cc
parentec01e7f492cb750221464dc09d8d3e3d18607d18 (diff)
parentdcb8c201199d45c082992377bcabda92574abd83 (diff)
Merge branch 'master' of github.com:openscad/openscad
Conflicts: scripts/linux-build-dependencies.sh
Diffstat (limited to 'src/Preferences.cc')
-rw-r--r--src/Preferences.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Preferences.cc b/src/Preferences.cc
index 802c50c..e70a2a1 100644
--- a/src/Preferences.cc
+++ b/src/Preferences.cc
@@ -67,6 +67,9 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
connect(this->fontSize, SIGNAL(currentIndexChanged(const QString&)),
this, SLOT(on_fontSize_editTextChanged(const QString &)));
+ // reset GUI fontsize if fontSize->addItem emitted signals that changed it.
+ this->fontSize->setEditText( QString("%1").arg( savedsize ) );
+
// Setup default settings
this->defaultmap["3dview/colorscheme"] = this->colorSchemeChooser->currentItem()->text();
this->defaultmap["advanced/opencsg_show_warning"] = true;
contact: Jan Huwald // Impressum