X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOME_HelpWindow.cxx;h=23397f2e33fde353c60d1364c003b05f752d8353;hb=92df39a06314044acf5f62e87fcf4057c64a9c2d;hp=a8d80fa90f293e8707079cf2d3bbd005db656bf1;hpb=15d500ad3ebc31eec8b286677cf4cee0e9899307;p=tools%2Finstall.git

diff --git a/src/SALOME_HelpWindow.cxx b/src/SALOME_HelpWindow.cxx
index a8d80fa..23397f2 100644
--- a/src/SALOME_HelpWindow.cxx
+++ b/src/SALOME_HelpWindow.cxx
@@ -1,9 +1,9 @@
 //  File      : SALOME_HelpWindow.cxx
 //  Created   : Thu Dec 18 12:01:00 2002
-//  Author    : Vadim SANDLER
+//  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 //  Project   : SALOME
 //  Module    : Installation Wizard
-//  Copyright : 2004-2005 CEA
+//  Copyright : 2002-2012 CEA
 
 #include "SALOME_HelpWindow.hxx"
 #include "SALOME_InstallWizard.hxx"
@@ -31,12 +31,12 @@
 // ================================================================
 HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "SalomeProHelpWindow", WDestructiveClose )
 {
-  QString hlpFile = QDir::currentDirPath() + "/doc/readme.html";
+  QString hlpFile = QDir( SALOME_InstallWizard::rootDirPath() ).filePath( "doc/readme.html" );
   QString hlpDir = ".";
   // caption
   setCaption( wizard->getCaption() + " " + wizard->getIWName() + " " + tr( "Help" ) );
   // icon
-  setIcon( QPixmap( (const char**)image_icon ) );
+  setIcon( pixmap( pxIcon ) );
   // create browser
   browser = new QTextBrowser( this );
   browser->mimeSourceFactory()->setFilePath( hlpDir );
@@ -50,7 +50,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   addToolBar( toolbar, "Toolbar" );
   QToolButton* button;
   // --> back
-  button = new QToolButton( QIconSet( (const char**)image_back ), 
+  button = new QToolButton( QIconSet( pixmap( pxBack ) ), 
                             tr( "Backward" ), 
                             "", 
                             browser, 
@@ -59,7 +59,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   button->setEnabled( FALSE );
   connect( browser, SIGNAL( backwardAvailable( bool ) ), button, SLOT( setEnabled( bool ) ) );
   // --> forward
-  button = new QToolButton( QIconSet( (const char**)image_next ), 
+  button = new QToolButton( QIconSet( pixmap( pxNext ) ), 
                             tr( "Forward" ), 
                             "", 
                             browser, 
@@ -68,27 +68,27 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   button->setEnabled( FALSE );
   connect( browser, SIGNAL( forwardAvailable( bool ) ),  button, SLOT( setEnabled( bool ) ) );
   // --> home
-  button = new QToolButton( QIconSet( (const char**)image_home ), 
+  button = new QToolButton( QIconSet( pixmap( pxHome ) ), 
                             tr( "Home" ), 
                             "", 
                             browser, 
                             SLOT( home() ), 
                             toolbar );
   toolbar->addSeparator();
-  button = new QToolButton( QIconSet( (const char**)image_zoom_in ), 
+  button = new QToolButton( QIconSet( pixmap( pxZoomIn ) ), 
                             tr( "Increaze font size" ), 
                             "", 
                             browser, 
                             SLOT( zoomIn() ), 
                             toolbar );
-  button = new QToolButton( QIconSet( (const char**)image_zoom_out ), 
+  button = new QToolButton( QIconSet( pixmap( pxZoomOut ) ), 
                             tr( "Decreaze font size" ), 
                             "", 
                             browser, 
                             SLOT( zoomOut() ), 
                             toolbar );
   toolbar->addSeparator();
-  button = new QToolButton( QIconSet( (const char**)image_close ), 
+  button = new QToolButton( QIconSet( pixmap( pxClose ) ), 
                             tr( "Close" ), 
                             "", 
                             this, 
@@ -97,7 +97,7 @@ HelpWindow::HelpWindow( SALOME_InstallWizard* wizard ) : QMainWindow( 0, "Salome
   toolbar->addSeparator();
   // --> logo
   QLabel* logo = new QLabel( toolbar, "logo" );
-  logo->setPixmap( QPixmap( (const char**)image_logo ) );
+  logo->setPixmap( pixmap( pxLogo ) );
   logo->setAlignment( AlignRight | AlignVCenter );
   logo->setScaledContents( false );
   toolbar->setStretchableWidget( logo );
@@ -149,7 +149,7 @@ void HelpWindow::keyPressEvent( QKeyEvent* e )
 // ================================================================
 HelpWindow* HelpWindow::openHelp( SALOME_InstallWizard* wizard )
 {
-  if ( QFile::exists( QDir::currentDirPath() + "/doc/readme.html" ) )
+  if ( QFile::exists( QDir( SALOME_InstallWizard::rootDirPath() ).filePath( "doc/readme.html" ) ) )
     return new HelpWindow( wizard );
   else
     return 0;