--- qsampler/trunk/src/main.cpp	2008/07/02 13:19:09	1749
+++ qsampler/trunk/src/main.cpp	2008/10/26 15:44:42	1788
@@ -32,12 +32,18 @@
 #include <QDir>
 #endif
 
-#if defined(Q_WS_X11)
+#if QT_VERSION < 0x040300
+#define lighter(x)	light(x)
+#define darker(x)	dark(x)
+#endif
+
 
 //-------------------------------------------------------------------------
-// Single application instance stuff (Qt/X11 only atm.)
+// Singleton application instance stuff (Qt/X11 only atm.)
 //
 
+#if defined(Q_WS_X11)
+
 #include <QX11Info>
 
 #include <X11/Xatom.h>
@@ -267,9 +273,27 @@
 		return 2;
 	}
 
+	// Dark themes grayed/disabled color group fix...
+	QPalette pal(app.palette());
+	if (pal.base().color().value() < 0x7f) {
+		pal.setColorGroup(QPalette::Disabled,
+			pal.windowText().color().darker(),
+			pal.button(),
+			pal.light(),
+			pal.dark(),
+			pal.mid(),
+			pal.text().color().darker(),
+			pal.text().color().lighter(),
+			pal.base(),
+			pal.window());
+		app.setPalette(pal);
+	}
+
 	// Set default base font...
+	int iBaseFontSize = app.font().pointSize();
 	if (options.iBaseFontSize > 0)
-		app.setFont(QFont(app.font().family(), options.iBaseFontSize));
+		iBaseFontSize = options.iBaseFontSize;
+	app.setFont(QFont(app.font().family(), iBaseFontSize));
 
 	// Construct, setup and show the main form.
 	QSampler::MainForm w;