From: vsr <vsr@opencascade.com>
Date: Wed, 22 Aug 2007 07:34:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: qt4_porting_delivery_220807~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7078cf4b95b6f5db1f937ca31ea664bbd099d0fd;p=modules%2Fgui.git

*** empty log message ***
---

diff --git a/configure.ac b/configure.ac
index 244ede585..3ae9693f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # Modified by : Mikhail PONIKAROV (OCN) - autotools usage
 #
 
-AC_INIT([Salome2 Project GUI module], [4.0.0], [webmaster.salome@opencascade.com], [salome])
+AC_INIT([Salome2 Project GUI module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 615c2d497..bef1e5759 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -533,7 +533,7 @@ void LightApp_Application::createActions()
 
   if( modList.count() > 1 )
   {
-    int modTBar = createTool( tr( "INF_TOOLBAR_MODULES" ) );
+    QtxToolBar* modTBar = new QtxToolBar( true, tr( "INF_TOOLBAR_MODULES" ), desk );
 
     LightApp_ModuleAction* moduleAction = 
       new LightApp_ModuleAction( tr( "APP_NAME" ), defIcon, desk );
@@ -569,7 +569,8 @@ void LightApp_Application::createActions()
     }
 
     connect( moduleAction, SIGNAL( moduleActivated( const QString& ) ), this, SLOT( onModuleActivation( const QString& ) ) );
-    createTool( registerAction( ModulesListId, moduleAction ), modTBar );
+    registerAction( ModulesListId, moduleAction );
+    modTBar->addAction( moduleAction );
   }
 
   // New window
diff --git a/src/LightApp/resources/icon_applogo.png b/src/LightApp/resources/icon_applogo.png
index 4859fd6a8..9c6470b1b 100755
Binary files a/src/LightApp/resources/icon_applogo.png and b/src/LightApp/resources/icon_applogo.png differ