diff options
| author | Brad Pitcher <bradpitcher@gmail.com> | 2012-01-25 16:27:39 (GMT) |
|---|---|---|
| committer | Brad Pitcher <bradpitcher@gmail.com> | 2012-01-25 16:27:39 (GMT) |
| commit | 81f543d4969c99346efbde6f89504a6f4eea6051 (patch) | |
| tree | 3552529dd5a0e9259af2c92526fcf03ce3e0a751 /src | |
| parent | a76129971e2fa7426afe5d1be6b4d0061941d0b4 (diff) | |
| parent | d8ee4bdb2ffea5caf2925582bea901aca2746342 (diff) | |
Merge branch 'master' of http://github.com/openscad/openscad into submodule
Diffstat (limited to 'src')
| -rw-r--r-- | src/Preferences.cc | 6 | ||||
| -rw-r--r-- | src/mainwin.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Preferences.cc b/src/Preferences.cc index 9e1e1f1..10ed44d 100644 --- a/src/Preferences.cc +++ b/src/Preferences.cc @@ -55,14 +55,18 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent) this->defaultmap["editor/fontfamily"] = found_family; this->defaultmap["editor/fontsize"] = 12; + uint savedsize = getValue("editor/fontsize").toUInt(); QFontDatabase db; foreach(int size, db.standardSizes()) { this->fontSize->addItem(QString::number(size)); - if (size == 12) { + if (size == savedsize) { this->fontSize->setCurrentIndex(this->fontSize->count()-1); } } + connect(this->fontSize, SIGNAL(currentIndexChanged(const QString&)), + this, SLOT(on_fontSize_editTextChanged(const QString &))); + // Setup default settings this->defaultmap["3dview/colorscheme"] = this->colorSchemeChooser->currentItem()->text(); this->defaultmap["advanced/opencsg_show_warning"] = true; diff --git a/src/mainwin.cc b/src/mainwin.cc index ff6ce3e..c0a0bff 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -788,7 +788,7 @@ void MainWindow::compileCSG(bool procevents) if (highlight_terms.size() > 0) { - PRINTB("Compiling highlights (%zu CSG Trees)...", highlight_terms.size()); + PRINTB("Compiling highlights (%d CSG Trees)...", highlight_terms.size()); if (procevents) QApplication::processEvents(); @@ -801,7 +801,7 @@ void MainWindow::compileCSG(bool procevents) if (background_terms.size() > 0) { - PRINTB("Compiling background (%zu CSG Trees)...", background_terms.size()); + PRINTB("Compiling background (%d CSG Trees)...", background_terms.size()); if (procevents) QApplication::processEvents(); |