From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 11 Dec 2014 07:37:18 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/Dev_0.6.1' into Dev_0.6.1
X-Git-Tag: before_slalome_7.5.1~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7494964e67ade5c37d7a344be157381cabf465b9;p=modules%2Fshaper.git

Merge remote-tracking branch 'origin/Dev_0.6.1' into Dev_0.6.1
---

7494964e67ade5c37d7a344be157381cabf465b9
diff --cc src/XGUI/XGUI_Workshop.cpp
index 81389750e,b04468f7d..b77c27bbd
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -185,11 -185,13 +187,13 @@@ void XGUI_Workshop::startApplication(
    aLoop->registerListener(this, Events_Loop::eventByName("CurrentDocumentChanged"));
    aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOSHOW));
    aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOHIDE));
+   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED));
  
    registerValidators();
+ 
    // Calling of  loadCustomProps before activating module is required
    // by Config_PropManger to restore user-defined path to plugins
 -  XGUI_Preferences::loadCustomProps();
 +  ModuleBase_Preferences::loadCustomProps();
    activateModule();
    if (myMainWindow) {
      myMainWindow->show();