From: rnv <rnv@opencascade.com>
Date: Fri, 4 Aug 2017 14:28:58 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into V9_dev
X-Git-Tag: V9_0_0~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ac1c2244d3c45882de12b9f5bc3457e045d2aa9c;hp=e7ede3527d1022d9df3cc38cd9d00d2eefb9f80f;p=modules%2Fgui.git

Merge remote-tracking branch 'origin/master' into V9_dev
---

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 6c21812f2..1b13be9c3 100644
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -68,6 +68,7 @@ PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desk) :
   sourcesMenu(0),
   filtersMenu(0),
   macrosMenu(0),
+  catalystMenu(0),
   myPVWidgetsFlag(false)
 {
 }
@@ -118,6 +119,12 @@ void PVViewer_GUIElements::buildPVWidgets()
       pqParaViewMenuBuilders::buildMacrosMenu(*macrosMenu);
     }
 
+    // Catalyst Menu
+    if (!catalystMenu) {
+      catalystMenu = new QMenu(0);
+      pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
+    }
+
     mainToolBar = new pqMainControlsToolbar(myDesktop)
       << pqSetName("MainControlsToolbar");
     mainToolBar->layout()->setSpacing(0);
@@ -336,6 +343,11 @@ QMenu* PVViewer_GUIElements::getMacrosMenu()  {
   return macrosMenu;
 }
 
+QMenu* PVViewer_GUIElements::getCatalystMenu()  {
+  buildPVWidgets();
+  return catalystMenu;
+}
+
 void PVViewer_GUIElements::publishExistingSources() {
   vtkSMSessionProxyManager* pxm = pqActiveObjects::instance().proxyManager();
   pqServerManagerModel* smmodel = pqApplicationCore::instance()->getServerManagerModel();
diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index 1d36c612c..57c2e735e 100644
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -53,6 +53,7 @@ public:
   QMenu* getFiltersMenu();
   QMenu* getSourcesMenu();
   QMenu* getMacrosMenu();
+  QMenu* getCatalystMenu();
 
   pqVCRToolbar* getVCRToolbar();
   pqAnimationTimeToolbar* getTimeToolbar();
@@ -82,6 +83,7 @@ private:
   QMenu* sourcesMenu;
   QMenu* filtersMenu;
   QMenu* macrosMenu;
+  QMenu* catalystMenu;
 
   // Toolbars also need to be instanciated early:
   QToolBar* mainToolBar;