From aa28c1936f5fdc42667c80b80d0fb1acd5f7275e Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Wed, 13 Jul 2016 18:17:40 +0200
Subject: [PATCH] splashscreen is not shown anymore since it takes a long time
to disappear on some machines
---
.../ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
index ee8d2b64..c9470de0 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
@@ -114,7 +114,7 @@ ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfa
splashscreenPrefix = "v" + QString::fromStdString(Application::GetVersion()) + " - ";
QPixmap pm(QString("://icons/ArmarX-Splashscreen.png"));
splashSceen = new QSplashScreen(pm);
- splashSceen->show();
+ // splashSceen->show();
ui = new ::Ui::ArmarXMainWindow();
mutex3d.reset(new boost::recursive_mutex);
@@ -163,12 +163,14 @@ ArmarXMainWindow::ArmarXMainWindow(const armarx::ManagedIceObjectRegistryInterfa
connectionStatusTimer->start(300);
//changeLayout(2);
QStringList recentlyFiles = mainSettings.value("RecentlyFiles").toStringList();
- splashSceen->finish(this);
+ // splashSceen->finish(this);
+
guiUseCaseSelector = new GuiUseCaseSelector(this, mainSettings.value("DoNotShowUseCaseDialog").toBool(), this);
+
if (!mainSettings.value("DoNotShowUseCaseDialog").toBool() && guiUseCaseSelector->exec() == QDialog::Accepted)
{
QString path = guiUseCaseSelector->getSelectedConfigFilePath();
--
GitLab