Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/gui.git] / src / SALOME_PYQT / SalomePyQt / SalomePyQt.sip

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index dcb6501786d0fec147cca9f9aa74aed89d50ccdc..f73f7b0ea0e5db98789cf3b46c528ec5d06b4d24 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@ -46,6 +46,23 @@ enum WindowType {
   WT_User
 };
 
+enum PrefType { 
+  PT_Space,
+  PT_Bool, 
+  PT_Color,
+  PT_String, 
+  PT_Selector, 
+  PT_DblSpin, 
+  PT_IntSpin, 
+  PT_Double, 
+  PT_Integer, 
+  PT_GroupBox, 
+  PT_Font, 
+  PT_DirList, 
+  PT_File, 
+  PT_User
+};
+
 class QtxAction : QAction
 {
 %TypeHeaderCode
@@ -116,19 +133,39 @@ public:
 
   static void              addSetting    ( const QString&, const QString&, const double );
   static void              addSetting    ( const QString&, const QString&, const int /Constrained/ );
+  static void              addSetting    ( const QString&, const QString&, const bool, const int );
   static void              addSetting    ( const QString&, const QString&, const QString& );
   static void              addSetting    ( const QString&, const QString&, const QColor& );
   static int               integerSetting( const QString&, const QString&, int = 0 );
-  static double            doubleSetting ( const QString&, const QString&, int = 0 );
+  static double            doubleSetting ( const QString&, const QString&, double = 0 );
   static bool              boolSetting   ( const QString&, const QString&, bool = false );
   static QString           stringSetting ( const QString&, const QString&, const QString& = QString("") );
   static QColor            colorSetting  ( const QString&, const QString&, const QColor& = QColor() );
   static void              removeSetting ( const QString&, const QString& );
+  static bool              hasSetting    ( const QString&, const QString& );
 
 // obsolete
   static void              addStringSetting( const QString&, const QString&, bool = true );
   static void              addIntSetting   ( const QString&, const int,      bool = true );
   static void              addDoubleSetting( const QString&, const double,   bool = true );
+  static void              addBoolSetting  ( const QString&, const bool,     bool = true );
   static void              removeSettings  ( const QString& );
   static QString           getSetting      ( const QString& );
+
+  static int               addGlobalPreference( const QString& );
+  static int               addPreference( const QString& );
+  static int               addPreference( const QString&, const int, int = -1,
+                                         const QString& = QString::null,
+                                         const QString& = QString::null );
+  static QVariant          preferenceProperty( const int, const QString& );
+  static void              setPreferenceProperty( const int, 
+                                                  const QString&,
+                                                 const QVariant& );
+  static void              addPreferenceProperty( const int, 
+                                                  const QString&,
+                                                 const int, 
+                                                 const QVariant& );
+
+  static void              message( const QString&, bool = true );
+  static void              clearMessages();
 };