Splash screen was implemented. Changes in packages SUIT and Session are integrated.

[modules/gui.git] / src / ObjBrowser / OB_Browser.cxx

diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 06e3e42a850a158d798e12cb310fde1ddca5ca5e..2208b59c4099b39b52cf25e2d40a1a6a14857fdf 100755 (executable)
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.cxx
@@ -479,14 +479,9 @@ void OB_Browser::setAppropriateColumn( const int id, const bool on )
   myView->setAppropriate( myColumnIds[id], on );
 }
 
-void OB_Browser::updateTree( SUIT_DataObject* o )
+void OB_Browser::updateTree( SUIT_DataObject* obj )
 {
-  updateTree( o ? o : getRootObject(), false );
-}
-
-void OB_Browser::updateTree( SUIT_DataObject* obj, const bool notify )
-{
-  if ( !obj )
+  if ( !obj && !(obj = getRootObject()) )
     return;
 
   DataObjectKey curKey;
@@ -497,14 +492,6 @@ void OB_Browser::updateTree( SUIT_DataObject* obj, const bool notify )
 
   SUIT_DataObject* curObj = storeState( selObjs, openObjs, selKeys, openKeys, curKey );
 
-  if ( notify )
-  {
-    bool upd = isAutoUpdate();
-    setAutoUpdate( false );
-    emit aboutRefresh();
-    setAutoUpdate( upd );
-  }
-
   createConnections( obj );
   updateView( obj );
 
@@ -875,11 +862,6 @@ void OB_Browser::onExpand()
     expand( listViewItem( itr.current() ) );
 }
 
-void OB_Browser::onRefresh()
-{
-  updateTree( 0, true );
-}
-
 void OB_Browser::onColumnVisible( int id )
 {
   setColumnShown( id, !isColumnVisible( id ) );
@@ -963,7 +945,7 @@ bool OB_Browser::eventFilter( QObject* o, QEvent* e )
 
 void OB_Browser::contextMenuPopup( QPopupMenu* menu )
 {
-  QValueList<int> cols;
+/*  QValueList<int> cols;
   for ( QMap<int, int>::ConstIterator it = myColumnIds.begin(); it != myColumnIds.end(); ++it )
   {
     if ( appropriateColumn( it.key() ) )
@@ -983,7 +965,7 @@ void OB_Browser::contextMenuPopup( QPopupMenu* menu )
     menu->setItemParameter( id, *iter );
   }
   if ( menu->count() != num )
-    menu->insertSeparator();
+    menu->insertSeparator();*/
 
   DataObjectList selected;
   getSelected( selected );
@@ -997,7 +979,6 @@ void OB_Browser::contextMenuPopup( QPopupMenu* menu )
     menu->insertItem( tr( "MEN_EXPAND_ALL" ), this, SLOT( onExpand() ) );
     menu->insertSeparator();
   }
-  menu->insertItem( tr( "MEN_REFRESH" ), this, SLOT( onRefresh() ) );
 }
 
 void OB_Browser::expand( QListViewItem* item )