Implementation of the "0023270: [CEA 1822] PARAVIS GUI widgets should be instanciated...

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

diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index add85a7c25340b9a7d7af86726079f63928a7350..41a05831469f70d58daff394e6e7c75d8e34632b 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -46,18 +46,16 @@ class PVVIEWER_EXPORT PVViewer_GUIElements: public QObject
 public:
   static PVViewer_GUIElements * GetInstance(QMainWindow * desk);
 
-  pqPropertiesPanel * getPropertiesPanel() { return propertiesPanel; }
-  pqPipelineBrowserWidget * getPipelineBrowserWidget() { return pipelineBrowserWidget; }
+  pqPropertiesPanel * getPropertiesPanel();
+  pqPipelineBrowserWidget * getPipelineBrowserWidget();
 
-  QMenu* getFiltersMenu() { return filtersMenu; }
-  QMenu* getSourcesMenu() { return sourcesMenu; }
-  QMenu* getMacrosMenu()  { return macrosMenu; }
+  QMenu* getFiltersMenu();
+  QMenu* getSourcesMenu();
+  QMenu* getMacrosMenu();
 
-  pqVCRToolbar* getVCRToolbar() { return vcrToolbar; }
-  pqAnimationTimeToolbar* getTimeToolbar() { return timeToolbar; }
+  pqVCRToolbar* getVCRToolbar();
+  pqAnimationTimeToolbar* getTimeToolbar();
 
-  void myBuildToolbars(QMainWindow* desk);
-  void addToolbars(QMainWindow* desk);
   void setToolBarVisible(bool show);
   void setToolBarEnabled(bool enabled);
   QList<QToolBar*> getToolbars();
@@ -68,6 +66,8 @@ private:
 
   static PVViewer_GUIElements* theInstance;
 
+  void buildPVWidgets();
+
   // Widgets
   pqPropertiesPanel* propertiesPanel;
   pqPipelineBrowserWidget* pipelineBrowserWidget;
@@ -88,6 +88,9 @@ private:
   QToolBar* macrosToolbar;
   QToolBar* commonToolbar;
   QToolBar* dataToolbar;
+  
+  QMainWindow* myDesktop;
+  bool    myPVWidgetsFlag;
 
 public:
   QAction* mainAction;