Merge branch 'master' into abn/qtesting

[modules/med.git] / src / MEDCalc / gui / PresentationController.cxx

diff --git a/src/MEDCalc/gui/PresentationController.cxx b/src/MEDCalc/gui/PresentationController.cxx
index b6cbe19c191845f3d93b35d4c651b6ddc1d75ff9..ceaf424bb527c281bd1337b1967ad7898b1184d8 100644 (file)
--- a/src/MEDCalc/gui/PresentationController.cxx
+++ b/src/MEDCalc/gui/PresentationController.cxx
@@ -18,7 +18,7 @@
 //
 
 #include "PresentationController.hxx"
-#include "DatasourceConstants.hxx"
+#include <MEDCalcConstants.hxx>
 #include "MEDModule.hxx"
 #include "Basics_Utils.hxx"
 #include "QtxActionGroup.h"
@@ -36,7 +36,6 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 #include <QMessageBox>
-#include <QDockWidget>
 
 PresentationController::PresentationController(MEDModule* salomeModule)
 {
@@ -47,15 +46,15 @@ PresentationController::PresentationController(MEDModule* salomeModule)
   _widgetPresentationParameters = new WidgetPresentationParameters();
 
   QMainWindow* parent = salomeModule->getApp()->desktop();
-  QDockWidget *dockWidget = new QDockWidget(parent);
-  dockWidget->setVisible(false);
-  dockWidget->setWindowTitle(tr("TITLE_PRESENTATION_PARAMETERS"));
-  dockWidget->setObjectName(tr("TITLE_PRESENTATION_PARAMETERS"));
-  dockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures);
-  dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-  dockWidget->setWidget(_widgetPresentationParameters);
-  parent->addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
-  dockWidget->show();
+  _dockWidget = new QDockWidget(parent);
+  _dockWidget->setVisible(false);
+  _dockWidget->setWindowTitle(tr("TITLE_PRESENTATION_PARAMETERS"));
+  _dockWidget->setObjectName(tr("TITLE_PRESENTATION_PARAMETERS"));
+  _dockWidget->setFeatures(QDockWidget::AllDockWidgetFeatures);
+  _dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+  _dockWidget->setWidget(_widgetPresentationParameters);
+  parent->addDockWidget(Qt::LeftDockWidgetArea, _dockWidget);
+  //_dockWidget->show();
 }
 
 PresentationController::~PresentationController()
@@ -85,7 +84,7 @@ PresentationController::createActions()
 {
   STDLOG("Creating PresentationController actions");
 
-  int presentationToolbarId = _salomeModule->createTool("View Mode", "PresentationToolbar");
+  int presentationToolbarId = _salomeModule->createTool("Presentations", "PresentationToolbar");
   int presentationMenuId = _salomeModule->createMenu(tr("MENU_PRESENTATIONS"), -1, 1);
 
   // Presentations
@@ -254,3 +253,10 @@ PresentationController::processWorkspaceEvent(const MEDCALC::MedEvent* event)
     this->updateTreeViewWithNewPresentation(event->dataId, event->presentationId);
   }
 }
+
+void
+PresentationController::showDockWidgets(bool isVisible)
+{
+  STDLOG("Switching PresentationController visibility to: " << isVisible);
+  _dockWidget->setVisible(isVisible);
+}