diff --git a/images/style-mission.css b/images/style-mission.css index c911b67613bb96e243b0383f55126f68d2b20cb4..ceacf759608263b76ecb79a732be8246eb9dd51e 100644 --- a/images/style-mission.css +++ b/images/style-mission.css @@ -1,3 +1,4 @@ +* { font-family: "Bitstream Vera Sans"; font: "Roman"; font-size: 12px; } QWidget#colorIcon {} QWidget { diff --git a/src/Core.cc b/src/Core.cc index bdd612dcbb1eeb5ac282f10d6ae1cc329c08b9f0..54e7632fc038709694cdc00f0f92c5d182d24437 100644 --- a/src/Core.cc +++ b/src/Core.cc @@ -72,6 +72,8 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) // Show splash screen QPixmap splashImage(":images/splash.png"); QSplashScreen* splashScreen = new QSplashScreen(splashImage, Qt::WindowStaysOnTopHint); + // Delete splash screen after mainWindow was displayed + splashScreen->setAttribute(Qt::WA_DeleteOnClose); splashScreen->show(); splashScreen->showMessage(tr("Loading application fonts"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141)); @@ -79,13 +81,15 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) // Exit main application when last window is closed connect(this, SIGNAL(lastWindowClosed()), this, SLOT(quit())); - // Set application font + // Load application font QFontDatabase fontDatabase = QFontDatabase(); const QString fontFileName = ":/general/vera.ttf"; ///< Font file is part of the QRC file and compiled into the app const QString fontFamilyName = "Bitstream Vera Sans"; if(!QFile::exists(fontFileName)) printf("ERROR! font file: %s DOES NOT EXIST!\n", fontFileName.toStdString().c_str()); fontDatabase.addApplicationFont(fontFileName); - setFont(fontDatabase.font(fontFamilyName, "Roman", 12)); + // Avoid Using setFont(). In the Qt docu you can read the following: + // "Warning: Do not use this function in conjunction with Qt Style Sheets." + // setFont(fontDatabase.font(fontFamilyName, "Roman", 12)); // Start the comm link manager splashScreen->showMessage(tr("Starting Communication Links"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));