]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'Dev_0.7.1' of newgeom:newgeom.git into Dev_0.7.1
authorsbh <sergey.belash@opencascade.com>
Wed, 28 Jan 2015 12:34:36 +0000 (15:34 +0300)
committersbh <sergey.belash@opencascade.com>
Wed, 28 Jan 2015 12:34:36 +0000 (15:34 +0300)
1  2 
src/XGUI/XGUI_Workshop.cpp

index 742b0adc063ab6537b1b3d521ff3280921a0c8e1,7b234a365de7ce5416e7f0a0d24af7a410d6e226..d11c8043a05db60aa90bd3e2c426defc5789f426
@@@ -1095,7 -1095,7 +1095,7 @@@ void XGUI_Workshop::createDockWidgets(
    connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets()));
  
    aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel);
 -  hidePropertyPanel();  //<! Invisible by default
 +  hidePropertyPanel();  ///<! Invisible by default
    hideObjectBrowser();
    aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel);
    myPropertyPanel->installEventFilter(myOperationMgr);
    connect(aCancelBtn, SIGNAL(clicked()), myOperationMgr, SLOT(onAbortOperation()));
    connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)), myOperationMgr,
            SLOT(onKeyReleased(QKeyEvent*)));
-   connect(myOperationMgr, SIGNAL(operationValidated(bool)), myPropertyPanel,
+   connect(myOperationMgr, SIGNAL(applyEnableChanged(bool)), myPropertyPanel,
            SLOT(setAcceptEnabled(bool)));
  
  }
  void XGUI_Workshop::showPropertyPanel()
  {
    QAction* aViewAct = myPropertyPanel->toggleViewAction();
 -  //<! Restore ability to close panel from the window's menu
 +  ///<! Restore ability to close panel from the window's menu
    aViewAct->setEnabled(true);
    myPropertyPanel->show();
    myPropertyPanel->raise();
  void XGUI_Workshop::hidePropertyPanel()
  {
    QAction* aViewAct = myPropertyPanel->toggleViewAction();
 -  //<! Do not allow to show empty property panel
 +  ///<! Do not allow to show empty property panel
    aViewAct->setEnabled(false);
    myPropertyPanel->hide();
  }