suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ improve loading splash screen of branded application

Browse Source
This commit is contained in:
wmayer 2015-07-11 02:59:56 +02:00
parent d6d9264f25
commit 66de19b162
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Gui/MainWindow.cpp
View File

@ -1156,13 +1156,29 @@ void MainWindow::stopSplasher(void)
QPixmap MainWindow::splashImage() const QPixmap MainWindow::splashImage() const
{ {
// search in the UserAppData dir as very first
QPixmap splash_image; QPixmap splash_image;
QDir dir(QString::fromUtf8(App::Application::Config()["UserAppData"].c_str())); QDir dir(QString::fromUtf8(App::Application::Config()["UserAppData"].c_str()));
QFileInfo fi(dir.filePath(QString::fromAscii("pixmaps/splash_image.png"))); QFileInfo fi(dir.filePath(QString::fromAscii("pixmaps/splash_image.png")));
if (fi.isFile() && fi.exists()) if (fi.isFile() && fi.exists())
splash_image.load(fi.filePath(), "PNG"); splash_image.load(fi.filePath(), "PNG");
if (splash_image.isNull())
splash_image = Gui::BitmapFactory().pixmap(App::Application::Config()["SplashScreen"].c_str()); // if no image was found try the config
std::string splash_path = App::Application::Config()["SplashScreen"];
if (splash_image.isNull()) {
QString path = QString::fromUtf8(splash_path.c_str());
if (QDir(path).isRelative()) {
QString home = QString::fromUtf8(App::GetApplication().getHomePath());
path = QFileInfo(QDir(home), path).absoluteFilePath();
}
splash_image.load(path);
}
// now try the icon paths
if (splash_image.isNull()) {
splash_image = Gui::BitmapFactory().pixmap(splash_path.c_str());
}
// include application name and version number // include application name and version number
std::map<std::string,std::string>::const_iterator tc = App::Application::Config().find("SplashInfoColor"); std::map<std::string,std::string>::const_iterator tc = App::Application::Config().find("SplashInfoColor");