X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_PreferencesDlg.cxx;h=374c451ff5509cdecd407c3057d29419a27ea8d3;hb=c147262d8e6bbb5cc616ada2e51341e9b7767ee1;hp=189fe108295f3554f3bf10e4e3055e270c8723e7;hpb=a494435bb013174828367a5e759ff5afd7365307;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_PreferencesDlg.cxx b/src/SalomeApp/SalomeApp_PreferencesDlg.cxx
index 189fe1082..374c451ff 100755
--- a/src/SalomeApp/SalomeApp_PreferencesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_PreferencesDlg.cxx
@@ -3,48 +3,45 @@
 
 #include "SalomeApp_PreferencesDlg.h"
 
-#include <QtxListResourceEdit.h>
+#include "SalomeApp_Preferences.h"
 
+#include <qvbox.h>
 #include <qlayout.h>
 
-SalomeApp_PreferencesDlg::SalomeApp_PreferencesDlg( QtxResourceMgr* resMgr, QWidget* parent )
-: QtxDialog( parent, 0, true, false, Standard | Apply )
+SalomeApp_PreferencesDlg::SalomeApp_PreferencesDlg( SalomeApp_Preferences* prefs, QWidget* parent )
+: QtxDialog( parent, 0, true, false, Standard | Apply ),
+myPrefs( prefs )
 {
   setCaption( tr( "CAPTION" ) );
 
   QVBoxLayout* main = new QVBoxLayout( mainFrame(), 5 );
 
-  myEdit = new QtxListResourceEdit( resMgr, mainFrame() );
-  main->addWidget( myEdit );
+  QVBox* base = new QVBox( mainFrame() );
+  main->addWidget( base );
 
-  setFocusProxy( myEdit );
+  myPrefs->reparent( base, QPoint( 0, 0 ), true );
+
+  setFocusProxy( myPrefs );
 
   setDialogFlags( AlignOnce );
 
   connect( this, SIGNAL( dlgHelp() ),  this, SLOT( onHelp() ) );
   connect( this, SIGNAL( dlgApply() ), this, SLOT( onApply() ) );
-  connect( myEdit, SIGNAL( resourceChanged( QString&, QString& ) ),
-           this, SIGNAL( resourceChanged( QString&, QString& ) ) );
 }
 
 SalomeApp_PreferencesDlg::~SalomeApp_PreferencesDlg()
 {
-}
+  if ( !myPrefs )
+    return;
 
-void SalomeApp_PreferencesDlg::store()
-{
-  myEdit->store();
-}
-
-void SalomeApp_PreferencesDlg::retrieve()
-{
-  myEdit->retrieve();
+  myPrefs->reparent( 0, QPoint( 0, 0 ), false );
+  myPrefs = 0;
 }
 
 void SalomeApp_PreferencesDlg::show()
 {
-  retrieve();
-  myEdit->toBackup();
+  myPrefs->retrieve();
+  myPrefs->toBackup();
 
   QtxDialog::show();
 }
@@ -53,33 +50,14 @@ void SalomeApp_PreferencesDlg::accept()
 {
   QtxDialog::accept();
 
-  store();
+  myPrefs->store();
 }
 
 void SalomeApp_PreferencesDlg::reject()
 {
   QtxDialog::reject();
 
-  myEdit->fromBackup();
-}
-
-int SalomeApp_PreferencesDlg::addPreference( const QString& label, const int pId, const int type,
-					     const QString& section, const QString& param, SalomeApp_Module* mod )
-{
-  int id = myEdit->addItem( label, pId, type, section, param );
-  if ( id != -1 && mod )
-    myPrefMod.insert( id, mod );
-  return id;
-}
-
-QVariant SalomeApp_PreferencesDlg::property( const int id, const QString& param ) const
-{
-  return myEdit->QtxResourceEdit::property( id, param );
-}
-
-void SalomeApp_PreferencesDlg::setProperty( const int id, const QString& param, const QVariant& prop )
-{
-  myEdit->QtxResourceEdit::setProperty( id, param, prop );
+  myPrefs->fromBackup();
 }
 
 void SalomeApp_PreferencesDlg::onHelp()
@@ -88,13 +66,5 @@ void SalomeApp_PreferencesDlg::onHelp()
 
 void SalomeApp_PreferencesDlg::onApply()
 {
-  myEdit->store();
-}
-
-SalomeApp_Module* SalomeApp_PreferencesDlg::module( const int id ) const
-{
-  SalomeApp_Module* mod = 0;
-  if ( myPrefMod.contains( id ) )
-    mod = myPrefMod[id];
-  return mod;
+  myPrefs->store();
 }