From: sbh <sergey.belash@opencascade.com>
Date: Tue, 29 Apr 2014 07:37:19 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.2~109
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d7ba2128d2350c6cf4af2ac773c7265feac60b1a;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/XGUI/XGUI_Workshop.h
---

d7ba2128d2350c6cf4af2ac773c7265feac60b1a
diff --cc src/XGUI/XGUI_Workshop.cpp
index dd6e1200f,2655b5694..e36e3c269
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -63,10 -60,9 +63,11 @@@ XGUI_Workshop::XGUI_Workshop(XGUI_Salom
    // So, displayer will be created on demand.
  
    mySelector = new XGUI_SelectionMgr(this);
+   connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(changeCurrentDocument()));
    myOperationMgr = new XGUI_OperationMgr(this);
    myActionsMgr = new XGUI_ActionsMgr(this);
 +  myErrorDlg = new XGUI_ErrorDialog(myMainWindow);
 +
    connect(myOperationMgr, SIGNAL(operationStarted()),  this, SLOT(onOperationStarted()));
    connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
            this, SLOT(onOperationStopped(ModuleBase_Operation*)));
diff --cc src/XGUI/XGUI_Workshop.h
index 6406381ed,7d75839cf..3f857ff12
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@@ -90,10 -94,9 +95,11 @@@ public slots
    void hideObjectBrowser();
  
    void onFeatureTriggered();
 -
+   void changeCurrentDocument();
  
 +signals:
 +  void errorOccurred(const QString&);
 +
  protected:
    //Event-loop processing methods:
    void addFeature(const Config_FeatureMessage*);