Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / XGUI / XGUI_MainWindow.cpp

diff --git a/src/XGUI/XGUI_MainWindow.cpp b/src/XGUI/XGUI_MainWindow.cpp
index 9619f1cd6d416b7642b80126a9d5fc850ea537e0..99d2422e9c32dced0a0ce88ac985f384998ed7f5 100644 (file)
--- a/src/XGUI/XGUI_MainWindow.cpp
+++ b/src/XGUI/XGUI_MainWindow.cpp
@@ -1,4 +1,5 @@
 #include "XGUI_MainWindow.h"
+#include "XGUI_Constants.h"
 #include "XGUI_MainMenu.h"
 #include "XGUI_ViewWindow.h"
 #include "XGUI_Viewer.h"
@@ -95,6 +96,7 @@ void XGUI_MainWindow::hidePythonConsole()
 void XGUI_MainWindow::showPropertyPanel()
 {
   QAction* aViewAct = myPropertyPanelDock->toggleViewAction();
+  //<! Restore ability to close panel from the window's menu
   aViewAct->setEnabled(true);
   myPropertyPanelDock->show();
   myPropertyPanelDock->raise();
@@ -103,6 +105,7 @@ void XGUI_MainWindow::showPropertyPanel()
 void XGUI_MainWindow::hidePropertyPanel()
 {
   QAction* aViewAct = myPropertyPanelDock->toggleViewAction();
+  //<! Do not allow to show empty property panel
   aViewAct->setEnabled(false);
   myPropertyPanelDock->hide();
 }
@@ -127,6 +130,7 @@ QDockWidget* XGUI_MainWindow::createPropertyPanel()
 {
   QDockWidget* aPropPanel = new QDockWidget(this);
   aPropPanel->setWindowTitle(tr("Property Panel"));
+  aPropPanel->setObjectName(XGUI::PROP_PANEL);
 
   QWidget* aContent = new QWidget(aPropPanel);
   QVBoxLayout* aMainLay = new QVBoxLayout(aContent);
@@ -134,7 +138,7 @@ QDockWidget* XGUI_MainWindow::createPropertyPanel()
   aPropPanel->setWidget(aContent);
 
   QWidget* aCustomWidget = new QWidget(aContent);
-  aCustomWidget->setObjectName("property_panel_widget");
+  aCustomWidget->setObjectName(XGUI::PROP_PANEL_WDG);
   aMainLay->addWidget(aCustomWidget);
   aMainLay->addStretch(1);
 
@@ -150,11 +154,11 @@ QDockWidget* XGUI_MainWindow::createPropertyPanel()
   aBtnLay->addWidget(aBtn);
   aBtnLay->addStretch(1);
   aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
-  aBtn->setObjectName("property_panel_ok");
+  aBtn->setObjectName(XGUI::PROP_PANEL_OK);
   aBtn->setFlat(true);
   aBtnLay->addWidget(aBtn);
   aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
-  aBtn->setObjectName("property_panel_cancel");
+  aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
   aBtn->setFlat(true);
   aBtnLay->addWidget(aBtn);