Fix for bug 10438: Crash during Explode on Blocks operation (Global selection on...

[modules/gui.git] / src / SUIT / SUIT_Application.cxx

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index a107e6b33fd7f936ee2ff8861ab3acd5de618fd0..38082005581f8c940770b37fbf0aa0c73e2d7d2e 100755 (executable)
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -4,6 +4,8 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_ResourceMgr.h"
 
+#include <qlabel.h>
+#include <qtimer.h>
 #include <qstatusbar.h>
 
 #include <QtxAction.h>
@@ -13,7 +15,8 @@
 SUIT_Application::SUIT_Application()
 : QObject( 0 ),
 myStudy( 0 ),
-myDesktop( 0 )
+myDesktop( 0 ),
+myStatusLabel( 0 )
 { 
 }
 
@@ -54,11 +57,17 @@ void SUIT_Application::start()
     desktop()->show();
 }
 
-void SUIT_Application::useFile( const QString& theFileName )
+bool SUIT_Application::useFile( const QString& theFileName )
 {
   createEmptyStudy();
   if ( activeStudy() )
-    activeStudy()->openDocument( theFileName );
+    return activeStudy()->openDocument( theFileName );
+  return false;
+}
+
+bool SUIT_Application::useStudy( const QString& theName )
+{
+  return false;
 }
 
 void SUIT_Application::createEmptyStudy()
@@ -83,8 +92,16 @@ SUIT_ResourceMgr* SUIT_Application::resourceMgr() const
 #define DEFAULT_MESSAGE_DELAY 3000
 void SUIT_Application::putInfo ( const QString& msg, const int msec )
 {
-  if ( desktop() )
-    desktop()->statusBar()->message( msg, msec <= 0 ? DEFAULT_MESSAGE_DELAY : msec );
+  if ( desktop() ) {
+    //desktop()->statusBar()->message( msg, msec <= 0 ? DEFAULT_MESSAGE_DELAY : msec );
+    if ( !myStatusLabel ) {
+      myStatusLabel = new QLabel (desktop()->statusBar());
+      desktop()->statusBar()->addWidget(myStatusLabel, /*int stretch = */1);
+    }
+    myStatusLabel->setText(msg);
+    if( msec != -1 )
+      QTimer::singleShot(msec <= 0 ? DEFAULT_MESSAGE_DELAY : msec, myStatusLabel, SLOT(clear()));
+  }
 }
 
 SUIT_Application* SUIT_Application::startApplication( int argc, char** argv ) const
@@ -108,8 +125,8 @@ void SUIT_Application::setDesktop( SUIT_Desktop* desk )
 
   delete myDesktop;
   myDesktop = desk;
-  connect( myDesktop, SIGNAL( activated() ), 
-          this, SLOT( onDesktopActivated() ) );
+  if ( myDesktop )
+    connect( myDesktop, SIGNAL( activated() ), this, SLOT( onDesktopActivated() ) );
 }
 
 SUIT_Study* SUIT_Application::createNewStudy()