X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLightApp%2FLightApp_PreferencesDlg.cxx;h=2c2458f70d0a83b5141ee861b47fb234f88102f2;hb=aff8765b1aa57fbe9b0163341cde44799807b054;hp=b691eb459d2246572520efbf658791aec1624e15;hpb=f830c97c748d8f8a6a7eccc8e3a58e19066a1181;p=modules%2Fgui.git

diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index b691eb459..2c2458f70 100644
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.cxx
@@ -1,52 +1,57 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
+// License as published by the Free Software Foundation; either
 // version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:      LightApp_PreferencesDlg.cxx
 // Author:    Sergey TELKOV
-
+//
 #include "LightApp_PreferencesDlg.h"
 #include "LightApp_Preferences.h"
 
 #include "QtxResourceMgr.h"
 
-#include <qbutton.h>
-#include <qlayout.h>
-#include <qmessagebox.h>
-#include <qvbox.h>
-#include <qfiledialog.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_FileDlg.h>
+
+#include <QAbstractButton>
+#include <QVBoxLayout>
+#include <QFileDialog>
 
 /*!
   Constructor.
 */
 LightApp_PreferencesDlg::LightApp_PreferencesDlg( LightApp_Preferences* prefs, QWidget* parent )
-: QtxDialog( parent, 0, true, true, OK | Close | Apply ),
+: QtxDialog( parent, true, true, OK | Close | Apply ),
 myPrefs( prefs ), mySaved ( false )
 {
-  setCaption( tr( "CAPTION" ) );
-
-  QVBoxLayout* main = new QVBoxLayout( mainFrame(), 5 );
+  setWindowTitle( tr( "CAPTION" ) );
 
-  QVBox* base = new QVBox( mainFrame() );
-  main->addWidget( base );
-
-  myPrefs->reparent( base, QPoint( 0, 0 ), true );
+  QVBoxLayout* main = new QVBoxLayout( mainFrame() );
+  main->setMargin( 0 );
+  main->setSpacing( 5 );
+  main->addWidget( myPrefs );
 
   setFocusProxy( myPrefs );
+  myPrefs->setFrameStyle( QFrame::Box | QFrame::Sunken );
+  myPrefs->show();
 
   setButtonPosition( Right, Close );
 
@@ -55,12 +60,14 @@ myPrefs( prefs ), mySaved ( false )
   connect( this, SIGNAL( dlgHelp() ),  this, SLOT( onHelp() ) );
   connect( this, SIGNAL( dlgApply() ), this, SLOT( onApply() ) );
 
-  QButton* defBtn = userButton( insertButton( tr( "DEFAULT_BTN_TEXT" ) ) );
+  QAbstractButton* defBtn = userButton( insertButton( tr( "DEFAULT_BTN_TEXT" ) ) );
   if ( defBtn )
     connect( defBtn, SIGNAL( clicked() ), this, SLOT( onDefault() ) );
-  QButton* impBtn = userButton( insertButton( tr( "IMPORT_BTN_TEXT" ) ) );
+  QAbstractButton* impBtn = userButton( insertButton( tr( "IMPORT_BTN_TEXT" ) ) );
   if( impBtn )
     connect( impBtn, SIGNAL( clicked() ), this, SLOT( onImportPref() ) );
+
+  setMinimumSize( 800, 600 );
 }
 
 /*!
@@ -71,17 +78,21 @@ LightApp_PreferencesDlg::~LightApp_PreferencesDlg()
   if ( !myPrefs )
     return;
 
-  myPrefs->reparent( 0, QPoint( 0, 0 ), false );
+  mainFrame()->layout()->removeWidget( myPrefs );
+  myPrefs->setParent( 0 );
+  myPrefs->hide();
   myPrefs = 0;
 }
 
-/*!Show dialog.*/
-void LightApp_PreferencesDlg::show()
+/*!Show/hide dialog.*/
+void LightApp_PreferencesDlg::setVisible(bool visible)
 {
-  myPrefs->retrieve();
-  myPrefs->toBackup();
+  if ( visible ) {
+    myPrefs->retrieve();
+    myPrefs->toBackup();
+  }
 
-  QtxDialog::show();
+  QtxDialog::setVisible(visible);
 }
 
 /*!Store preferences on accept.*/
@@ -110,13 +121,13 @@ void LightApp_PreferencesDlg::onHelp()
 void LightApp_PreferencesDlg::onApply()
 {
   myPrefs->store();
-  
+
   // Fix for Bug PAL11197: Restoring the corrected values from resource manager.
   // (Correcting in VisuGUI.cxx and SMESHGUI.cxx in methods
   // ::preferencesChanged( const QString& sect, const QString& name ))
   myPrefs->retrieve();
   //
-  
+
   myPrefs->toBackup();
   mySaved = true;
 }
@@ -124,15 +135,17 @@ void LightApp_PreferencesDlg::onApply()
 /*! Restore default preferences*/
 void LightApp_PreferencesDlg::onDefault()
 {
-  if( QMessageBox::Ok == QMessageBox::information( this, tr( "WARNING" ), tr( "DEFAULT_QUESTION" ), QMessageBox::Ok, QMessageBox::Cancel ) )
+  if( SUIT_MessageBox::Ok == SUIT_MessageBox::question( this, tr( "WARNING" ), tr( "DEFAULT_QUESTION" ),
+                                                        SUIT_MessageBox::Ok | SUIT_MessageBox::Cancel,
+                                                        SUIT_MessageBox::Ok ) )
     {
       if ( myPrefs && myPrefs->resourceMgr() )
-	{
-          bool prev = myPrefs->resourceMgr()->ignoreUserValues();
-	  myPrefs->resourceMgr()->setIgnoreUserValues( true ); 
-	  myPrefs->retrieve();
-          myPrefs->resourceMgr()->setIgnoreUserValues( prev );
-	}      
+        {
+          QtxResourceMgr::WorkingMode prev = myPrefs->resourceMgr()->workingMode();
+          myPrefs->resourceMgr()->setWorkingMode( QtxResourceMgr::IgnoreUserValues );
+          myPrefs->retrieve();
+          myPrefs->resourceMgr()->setWorkingMode( prev );
+        }
     }
 }
 
@@ -140,18 +153,15 @@ void LightApp_PreferencesDlg::onDefault()
 void LightApp_PreferencesDlg::onImportPref()
 {
   QtxResourceMgr* mgr = myPrefs->resourceMgr();
-  if( !mgr )
-    return;
+  QStringList filtersList;
+  filtersList.append(tr("XML_FILES_FILTER"));
+  QString anInitialPath = "";
+  if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+    anInitialPath = QDir::currentPath();
 
-  QFileDialog dlg( ".", "*", this, "" );
-  dlg.setCaption( tr("IMPORT_PREFERENCES") );
-  dlg.setShowHiddenFiles( true );
-  dlg.exec();
-  QString fname = dlg.selectedFile();
-  if( fname.isEmpty() )
-    return;
+  QString aName = SUIT_FileDlg::getFileName( this, anInitialPath, filtersList, tr("IMPORT_PREFERENCES"), true, true );
 
-  if( mgr->import( fname ) )
+  if( mgr->import( aName ) )
   {
     myPrefs->retrieve();
     myPrefs->toBackup();