Preparation of v.3.0.1

diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 129503b0d782dd4fba4316da5b0b35a7591bede6..a660a57d762860607f6a1f12c68544be83fdc7ef 100755 (executable)
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.cxx
@@ -456,6 +456,12 @@ void OB_Browser::setColumnShown( const int id, const bool on )
   myView->setShown( myColumnIds[id], on );
 }
 
+void OB_Browser::setWidthMode( QListView::WidthMode mode )
+{
+  for ( int i = 0, n = myView->columns(); i < n; i++ )
+    myView->setColumnWidthMode( i, mode );
+}
+
 QValueList<int> OB_Browser::columns() const
 {
   QValueList<int> lst;

diff --git a/src/ObjBrowser/OB_Browser.h b/src/ObjBrowser/OB_Browser.h
index 3d2ebb1c314810857656d5690d8a76e9ea930a32..944a8ccf3780383661271685a378e0f2391d1219 100755 (executable)
--- a/src/ObjBrowser/OB_Browser.h
+++ b/src/ObjBrowser/OB_Browser.h
@@ -86,6 +86,8 @@ public:
   bool              isColumnVisible( const int ) const;
   virtual void      setColumnShown( const int, const bool );
 
+  virtual void      setWidthMode( QListView::WidthMode );
+
   QValueList<int>   columns() const;
 
   bool              appropriateColumn( const int ) const;

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 3d89aae00b06bed2da2e30bf2f9aba5fcfaa9151..beeb25897d4ca25883e361ffe46a3bcb7411c9de 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -1261,8 +1261,8 @@ QWidget* SalomeApp_Application::createWindow( const int flag )
       ob->addColumn( tr( QString().sprintf( "OBJ_BROWSER_COLUMN_%d", i ) ), i );
       ob->setColumnShown( i, resMgr->booleanValue( "ObjectBrowser",
                                                    QString().sprintf( "visibility_column_%d", i ), true ) );
-      ob->listView()->setColumnWidthMode( i, autoSize ? QListView::Maximum : QListView::Manual );
     }
+    ob->setWidthMode( autoSize ? QListView::Maximum : QListView::Manual );
 
     // Create OBSelector
     new SalomeApp_OBSelector( ob, mySelMgr );
@@ -1527,8 +1527,7 @@ void SalomeApp_Application::preferencesChanged( const QString& sec, const QStrin
        return;
 
       bool autoSize = resMgr->booleanValue( "ObjectBrowser", "auto_size", false );
-      for ( int i = SalomeApp_DataObject::CT_Value; i <= SalomeApp_DataObject::CT_RefEntry; i++ )
-        ob->listView()->setColumnWidthMode( i, autoSize ? QListView::Maximum : QListView::Manual );
+      ob->setWidthMode( autoSize ? QListView::Maximum : QListView::Manual );
 
       updateObjectBrowser( false );
     }

diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml
index ff3970cb34749a57eb9285807f6f10bb37e890d2..4471ba9890ff5db6036893a00227908600435cc6 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp.xml
+++ b/src/SalomeApp/resources/SalomeApp.xml
@@ -74,7 +74,7 @@
     <!-- Here go other common user preferences -->
   </section>
   <section name="ObjectBrowser" >
-    <parameter value="true" name="auto_size" />
+    <parameter value="false" name="auto_size" />
   </section>
   <section name="Geometry" >
     <parameter value="10" name="SettingsGeomStep" />