From e58ffa958be2c23b9931b82fa5587bc8f0fdd5b3 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 12 Dec 2011 01:13:17 +0100
Subject: bugfix: Default font size was set to 0 - will now be 12


diff --git a/src/Preferences.cc b/src/Preferences.cc
index aefbd12..59f8d23 100644
--- a/src/Preferences.cc
+++ b/src/Preferences.cc
@@ -36,6 +36,15 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
 {
 	setupUi(this);
 
+	// Editor pane
+	QFontDatabase db;
+	foreach(int size, db.standardSizes()) {
+		this->fontSize->addItem(QString::number(size));
+		if (size == 12) {
+			this->fontSize->setCurrentIndex(this->fontSize->count()-1);
+		}
+	}
+
 	// Setup default settings
 	this->defaultmap["3dview/colorscheme"] = this->colorSchemeChooser->currentItem()->text();
 	this->defaultmap["editor/fontfamily"] = this->fontChooser->currentText();
@@ -87,12 +96,6 @@ Preferences::Preferences(QWidget *parent) : QMainWindow(parent)
 	this->colorschemes["Sunset"][RenderSettings::CGAL_EDGE_2D_COLOR] = QColor(0xff, 0x00, 0x00);
 	this->colorschemes["Sunset"][RenderSettings::CROSSHAIR_COLOR] = QColor(0x80, 0x00, 0x00);
 
-	// Editor pane
-	QFontDatabase db;
-	foreach(int size, db.standardSizes()) {
-		this->fontSize->addItem(QString::number(size));
-	}
-
 	connect(this->colorSchemeChooser, SIGNAL(itemSelectionChanged()),
 					this, SLOT(colorSchemeChanged()));
 	connect(this->fontChooser, SIGNAL(activated(const QString &)),
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 228e981..3243847 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -177,7 +177,7 @@ MainWindow::MainWindow(const QString &filename)
 	editor->setTabStopWidth(30);
 #endif
 	editor->setLineWrapping(true); // Not designable
-	setFont("", 0); // Init default font
+	setFont("", 12); // Init default font
 
 	this->glview->statusLabel = new QLabel(this);
 	statusBar()->addWidget(this->glview->statusLabel);
-- 
cgit v0.10.1