Fix dependence of ObjectBrowser and signal for ButtonGroup (buttonClicked() instead...

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 7968682ffdd25114ba88580361d001712a1f4ccc..29651cfbae175981a556fdb9e2977d871b0e21dc 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -68,8 +68,7 @@
 #include "Plot2d_ViewManager.h"
 
 #include "QtxPagePrefMgr.h"
-//TODO
-//#include "OB_Browser.h"
+#include "OB_Browser.h"
 
 #include "SALOME_ListIteratorOfListIO.hxx"
 
@@ -81,6 +80,7 @@
 #include "LightApp_SelectionMgr.h"
 #include "LightApp_Selection.h"
 #include "LightApp_Preferences.h"
+#include <LightApp_Browser.h>
 
 #include "QtxAction.h"
 #include "QtxFontEdit.h"
@@ -2690,10 +2690,10 @@ void VisuGUI::contextMenuPopup( const QString& theClient, QMenu* theMenu, QStrin
 {
   SalomeApp_Module::contextMenuPopup(theClient, theMenu, theTitle);
 
-  //TODO: object Browser
-  //OB_Browser* ob = getApp()->objectBrowser();
-  //bool isOBClient = (ob && theClient == ob->popupClientType());
-  bool isOBClient = false;
+  //TODO: object Browser DONE
+  OB_Browser* ob = getApp()->objectBrowser();
+  bool isOBClient = (ob && theClient == ob->popupClientType());
+  //bool isOBClient = false;
 
   LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
   SALOME_ListIO aListIO;

diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
index 50a5a19be3cde4177e209305f31fbcbc19779801..91e97f4dd36464d9e5dfb718c780d32a0a839383 100644 (file)
--- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
@@ -364,7 +364,7 @@ VisuGUI_ClippingDlg::VisuGUI_ClippingDlg (VisuGUI* theModule,
   connect(SpinBoxDistance        , SIGNAL(valueChanged(double))     , this, SLOT(SetCurrentPlaneParam()));
   connect(SpinBoxRot1            , SIGNAL(valueChanged(double))     , this, SLOT(SetCurrentPlaneParam()));
   connect(SpinBoxRot2            , SIGNAL(valueChanged(double))     , this, SLOT(SetCurrentPlaneParam()));
-  connect(ButtonGroupIJKAxis     , SIGNAL(clicked(int))             , this, SLOT(onIJKAxisChanged(int)));
+  connect(ButtonGroupIJKAxis     , SIGNAL(buttonClicked(int))             , this, SLOT(onIJKAxisChanged(int)));
   connect(SpinBoxIJKIndex        , SIGNAL(valueChanged(int))        , this, SLOT(SetCurrentPlaneIJKParam()));
   connect(CheckBoxIJKPlaneReverse, SIGNAL(toggled(bool))            , this, SLOT(SetCurrentPlaneIJKParam()));
   connect(TabPane                , SIGNAL(currentChanged (QWidget*)), this, SLOT(onTabChanged(QWidget*)));

diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
index e00c6593dd9569b32efda1508ddbab33d4dd9514..8c1017e8a38dd0d20ca15f313ae61732aa3119a6 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
@@ -311,7 +311,7 @@ VisuGUI_GaussScalarBarPane::VisuGUI_GaussScalarBarPane (QWidget * parent, bool S
   connect( RainbowButton, SIGNAL( toggled( bool ) ), ColorSpin, SLOT( setEnabled( bool ) ) );
   connect( RainbowButton, SIGNAL( toggled( bool ) ), LabelLabel, SLOT( setEnabled( bool ) ) );
   connect( RainbowButton, SIGNAL( toggled( bool ) ), LabelSpin, SLOT( setEnabled( bool ) ) );
-  connect( OrientGroup,   SIGNAL( clicked( int ) ), this, SLOT( changeDefaults( int ) ) );
+  connect( OrientGroup,   SIGNAL( buttonClicked( int ) ), this, SLOT( changeDefaults( int ) ) );
   connect( XSpin,         SIGNAL( valueChanged( double ) ), this, SLOT( XYChanged( double ) ) );
   connect( YSpin,         SIGNAL( valueChanged( double ) ), this, SLOT( XYChanged( double ) ) );
   connect( myTextBtn,     SIGNAL( clicked() ), this, SLOT( onTextPref() ) );

diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
index f84910aebb4a2086c94b061bc8895adc6d9f1c65..adcf12826a3d470d4a8ef27a9598eaab991e33c0 100644 (file)
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
@@ -269,12 +269,12 @@ VisuGUI_Plot3DPane::VisuGUI_Plot3DPane (QWidget* parent)
   bottomLayout->addWidget(PreviewChkB,   3, 0);
 
   // signals and slots connections
-  connect(GBOrientation, SIGNAL(clicked(int)),         this, SLOT(orientationChanged(int)));
+  connect(GBOrientation, SIGNAL(buttonClicked(int)),         this, SLOT(orientationChanged(int)));
   connect(Rot1,          SIGNAL(valueChanged(double)), this, SLOT(updatePreview()));
   connect(Rot2,          SIGNAL(valueChanged(double)), this, SLOT(updatePreview()));
   connect(PositionSpn,   SIGNAL(valueChanged(double)), this, SLOT(onPositionSpn()));
   connect(RelativeChkB,  SIGNAL(toggled(bool)),        this, SLOT(onRelativePos(bool)));
-  connect(GBPrsType,     SIGNAL(clicked(int)),         this, SLOT(onPrsType(int)));
+  connect(GBPrsType,     SIGNAL(buttonClicked(int)),         this, SLOT(onPrsType(int)));
   connect(PreviewChkB,   SIGNAL(toggled(bool)),        this, SLOT(updatePreview()));
 }
 

diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
index 89878cbfcf4b7d08fcfdb13af9f84ee49b5433d8..be085527e8507961dbd6ec1dffb2ab71ec868ce7 100644 (file)
--- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
@@ -254,7 +254,7 @@ void ArrangeDlg::init()
 
   myStackWgt->setCurrentIndex(AutoMode);
 
-  connect(aBtnGrp, SIGNAL(clicked(int)), myStackWgt, SLOT(raiseWidget(int)) );
+  connect(aBtnGrp, SIGNAL(buttonClicked(int)), myStackWgt, SLOT(raiseWidget(int)) );
 
   SUIT_Study* aSUITStudy = myViewWindow->getViewManager()->study();
   SalomeApp_Study* anAppStudy = dynamic_cast<SalomeApp_Study*>(aSUITStudy);