From: asv Date: Fri, 17 Jun 2005 12:27:31 +0000 (+0000) Subject: menu item "refresh", slot onRefresh(), signal aboutRefresh(), and updateTree( 2 param... X-Git-Tag: T3_0_0_a4~83 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b714e7847536d2267b27c73c603549f3acf4381b;p=modules%2Fgui.git menu item "refresh", slot onRefresh(), signal aboutRefresh(), and updateTree( 2 params) were removed. --- diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx index bc429a7d0..2208b59c4 100755 --- 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( getRootObject(), true ); -} - void OB_Browser::onColumnVisible( int id ) { setColumnShown( id, !isColumnVisible( id ) ); @@ -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 ) diff --git a/src/ObjBrowser/OB_Browser.h b/src/ObjBrowser/OB_Browser.h index c62cb2181..5e5adeccd 100755 --- a/src/ObjBrowser/OB_Browser.h +++ b/src/ObjBrowser/OB_Browser.h @@ -98,13 +98,11 @@ public: virtual void contextMenuPopup( QPopupMenu* ); signals: - void aboutRefresh(); void selectionChanged(); void dropped( DataObjectList, SUIT_DataObject*, int ); private slots: void onExpand(); - void onRefresh(); void onColumnVisible( int ); void onDestroyed( SUIT_DataObject* ); void onDropped( QPtrList, QListViewItem*, int ); @@ -137,7 +135,6 @@ private: void removeObject( SUIT_DataObject*, const bool = true ); void updateText( QListViewItem* ); - void updateTree( SUIT_DataObject*, const bool ); DataObjectKey objectKey( QListViewItem* ) const; DataObjectKey objectKey( SUIT_DataObject* ) const; diff --git a/src/ObjBrowser/resources/OB_msg_en.po b/src/ObjBrowser/resources/OB_msg_en.po index 914fab95d..b570f058e 100755 --- a/src/ObjBrowser/resources/OB_msg_en.po +++ b/src/ObjBrowser/resources/OB_msg_en.po @@ -12,5 +12,3 @@ msgstr "" msgid "MEN_EXPAND_ALL" msgstr "Expand All" -msgid "MEN_REFRESH" -msgstr "Refresh"