main.cpp   main.cpp 
skipping to change at line 301 skipping to change at line 301
// This is useful for distribution having already a package for DejaVu font. // This is useful for distribution having already a package for DejaVu font.
// qWarning() << "ERROR while loading font DejaVuSans : " << e.what(); // qWarning() << "ERROR while loading font DejaVuSans : " << e.what();
} }
// Set the default application font and font size. // Set the default application font and font size.
// Note that style sheet will possibly override this setting. // Note that style sheet will possibly override this setting.
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// On windows use Verdana font, to avoid unresolved bug with OpenGL1 Qt paint engine. // On windows use Verdana font, to avoid unresolved bug with OpenGL1 Qt paint engine.
// See Launchpad question #111823 for more info // See Launchpad question #111823 for more info
QFont tmpFont(safeMode ? "Verdana" : "DejaVu Sans"); QFont tmpFont(safeMode ? "Verdana" : "DejaVu Sans");
tmpFont.setStyleStrategy(QFont::OpenGLCompatible);
// Activate verdana by defaut for all win32 builds to see if it impr oves things. // Activate verdana by defaut for all win32 builds to see if it impr oves things.
// -> this seems to bring crippled arabic fonts with OpenGL2 paint e ngine.. // -> this seems to bring crippled arabic fonts with OpenGL2 paint e ngine..
// QFont tmpFont("Verdana"); // QFont tmpFont("Verdana");
#else #else
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QFont tmpFont("Verdana"); QFont tmpFont("Verdana");
#else #else
QFont tmpFont("DejaVu Sans"); QFont tmpFont("DejaVu Sans");
#endif #endif
#endif #endif
tmpFont.setPixelSize(13); tmpFont.setPixelSize(confSettings->value("gui/base_font_size", 13).t oInt());
//tmpFont.setFamily("Verdana"); //tmpFont.setFamily("Verdana");
//tmpFont.setBold(true); //tmpFont.setBold(true);
QApplication::setFont(tmpFont); QApplication::setFont(tmpFont);
#endif #endif
// Initialize translator feature // Initialize translator feature
try try
{ {
StelTranslator::init(StelFileMgr::findFile("data/iso639-1.ut f8")); StelTranslator::init(StelFileMgr::findFile("data/iso639-1.ut f8"));
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/