Provide logo support for SALOME desktop;

Improve version number handling.

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 742ecab766d682827e33d10b0f4be24d7fa3a1b1..16b7ab9398e0ea579ae6277758225892ec0291f5 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -145,6 +145,11 @@ myPrefs( 0 )
   desktop()->setDockableMenuBar( true );
   desktop()->setDockableStatusBar( false );
 
+  // base logo (salome itself)
+  desktop()->addLogo( "_app_base",  aResMgr->loadPixmap( "SalomeApp", tr( "APP_BASE_LOGO" ), false ) );
+  // extra logo (salome-based application)
+  desktop()->addLogo( "_app_extra", aResMgr->loadPixmap( "SalomeApp", tr( "APP_EXTRA_LOGO" ), false ) );
+
   clearViewManagers();
 
   mySelMgr = new SalomeApp_SelectionMgr( this );
@@ -235,30 +240,37 @@ QString SalomeApp_Application::applicationVersion() const
 
   if ( _app_version.isEmpty() )
   {
-    QString path( ::getenv( "GUI_ROOT_DIR" ) );
-    if ( !path.isEmpty() )
-      path += QDir::separator();
-    path += QString( "bin/salome/VERSION" );
-
-    QFile vf( path );
-    if ( vf.open( IO_ReadOnly ) )
+    QString resVersion = tr( "APP_VERSION" );
+    if ( resVersion != "APP_VERSION" ) 
+    {
+      _app_version = resVersion;
+    }
+    else 
     {
-      QString line;
-      vf.readLine( line, 1024 );
-      vf.close();
+      QString path( ::getenv( "GUI_ROOT_DIR" ) );
+      if ( !path.isEmpty() )
+        path += QDir::separator();
+      path += QString( "bin/salome/VERSION" );
 
-      if ( !line.isEmpty() )
+      QFile vf( path );
+      if ( vf.open( IO_ReadOnly ) )
       {
-       while ( !line.isEmpty() && line.at( line.length() - 1 ) == QChar( '\n' ) )
-         line.remove( line.length() - 1, 1 );
-
-       int idx = line.findRev( ":" );
-       if ( idx != -1 )
-         _app_version = line.mid( idx + 1 ).stripWhiteSpace();
+        QString line;
+       vf.readLine( line, 1024 );
+       vf.close();
+       
+       if ( !line.isEmpty() )
+        {
+         while ( !line.isEmpty() && line.at( line.length() - 1 ) == QChar( '\n' ) )
+           line.remove( line.length() - 1, 1 );
+         
+         int idx = line.findRev( ":" );
+         if ( idx != -1 )
+           _app_version = line.mid( idx + 1 ).stripWhiteSpace(); 
+        }
       }
     }
   }
-
   return _app_version;
 }