Updated copyright comment

[modules/gui.git] / src / PVViewer / PVViewer_GUIElements.cxx

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 4421a22e887fc27c1f735f2c68a86d6d4bc7074c..e4c0a1fe48c8ea19143d948021073d5b038c9321 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2014-2024  CEA, EDF, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -49,6 +49,8 @@
 #include <vtkSMSessionProxyManager.h>
 #include <vtkSMProxyIterator.h>
 
+#include <vtkPVConfig.h>
+
 #include <QAction>
 #include <QCoreApplication>
 #include <QLayout>
@@ -57,18 +59,38 @@
 #include <QMenu>
 #include <QToolBar>
 
-
 PVViewer_GUIElements * PVViewer_GUIElements::theInstance = 0;
 
-PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desk) :
-  myDesktop(desk),
+PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desktop) :
   propertiesPanel(0),
   pipelineBrowserWidget(0),
   pipelineModel(0),
   sourcesMenu(0),
   filtersMenu(0),
   macrosMenu(0),
-  myPVWidgetsFlag(false)
+  catalystMenu(0),
+  mainToolBar(0),
+  vcrToolbar(0),
+  timeToolbar(0),
+  colorToolbar(0),
+  reprToolbar(0),
+  cameraToolbar(0),
+  axesToolbar(0),
+  macrosToolbar(0),
+  commonToolbar(0),
+  dataToolbar(0),
+  myDesktop(desktop),
+  myPVWidgetsFlag(false),
+  mainAction(0),
+  vcrAction(0),
+  timeAction(0),
+  colorAction(0),
+  reprAction(0),
+  cameraAction(0),
+  axesAction(0),
+  macrosAction(0),
+  commonAction(0),
+  dataAction(0)
 {
 }
 
@@ -118,6 +140,16 @@ void PVViewer_GUIElements::buildPVWidgets()
       pqParaViewMenuBuilders::buildMacrosMenu(*macrosMenu);
     }
 
+    // Catalyst Menu
+    if (!catalystMenu) {
+      catalystMenu = new QMenu(0);
+#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR<9
+      pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu, myDesktop);
+#else
+      pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
+#endif
+    }
+
     mainToolBar = new pqMainControlsToolbar(myDesktop)
       << pqSetName("MainControlsToolbar");
     mainToolBar->layout()->setSpacing(0);
@@ -219,13 +251,13 @@ void PVViewer_GUIElements::buildPVWidgets()
                                 Q_ARG( pqServerManagerModelItem* , NULL ) );
     }
     
-    publishExistingSources();
+    //publishExistingSources();
     myPVWidgetsFlag = true;
   }
 }
 
 void PVViewer_GUIElements::setToolBarVisible(bool show)
-{  
+{
   QCoreApplication::processEvents();
   if (!myPVWidgetsFlag)
     return;
@@ -336,6 +368,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();