Commit 7b75919c authored by Hans-Christian Ebke's avatar Hans-Christian Ebke

Displaying "Ready." in splash screen after startup is completed.


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17066 383ad7c9-94d9-4d36-a494-682f7c89f535
parent c4f39601
......@@ -245,7 +245,7 @@ Core::init() {
if ( OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
QPixmap splashPixmap(OpenFlipper::Options::iconDirStr() + OpenFlipper::Options::dirSeparator() + "splash.png");
splash_ = new QSplashScreen(splashPixmap, Qt::WindowStaysOnTopHint);
splash_ = new QSplashScreen(splashPixmap, Qt::SplashScreen | Qt::WindowStaysOnTopHint);
splash_->show();
splash_->showMessage(tr("Initializing mainwindow") ,
......@@ -617,7 +617,7 @@ Core::init() {
for ( int i = 0 ; i < (int)optionFiles.size(); ++i) {
if ( OpenFlipper::Options::gui() && OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
splash_->showMessage(tr("Loading Configuration File ") + QString::number(i) + "/" + QString::number(optionFiles.size()) ,
splash_->showMessage(tr("Loading Configuration File %1/%2").arg(i+1).arg(optionFiles.size()),
Qt::AlignBottom | Qt::AlignLeft , Qt::white);
}
......@@ -629,6 +629,8 @@ Core::init() {
openIniFile( optionFiles[i] ,false,true,false);
}
splash_->clearMessage();
// ===============================================================================================
// Load Settings from configuration files
// ===============================================================================================
......@@ -676,6 +678,7 @@ Core::init() {
if ( OpenFlipperSettings().value("Core/Gui/splash",true).toBool() ) {
splash_->raise();
splash_->showMessage(tr("Ready."), Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QTimer::singleShot(2000, this, SLOT(finishSplash()));
}
......
......@@ -921,7 +921,7 @@ private slots:
/// Slot for saving objects to a new location
void saveAllObjectsTo();
/// Save current status to a settings file
/// Save current status to a settings file. Solicit file name through dialog.
void saveSettings();
/// Open Load Widget
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment