X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCAM%2FCAM_Application.h;h=1477238122df128d774e7a31e65e0e2f5845c113;hb=bb8609caf7881d966fbb88dec0a7822736da93f5;hp=0ec5fd187e94f59709206bcdfe98185788bde082;hpb=bce1a59f1c16f8cfe9d076a0df5b4fef43f5ce34;p=modules%2Fgui.git

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 0ec5fd187..147723812 100755
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -1,13 +1,35 @@
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #ifndef CAM_APPLICATION_H
 #define CAM_APPLICATION_H
 
-#include "STD_Application.h"
-
-#include "CAM_Module.h"
+#include "CAM.h"
 
-#include <qptrlist.h>
+#include <STD_Application.h>
+#include <QList>
 
-class QPopupMenu;
+class QMenu;
+class CAM_Module;
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
@@ -18,8 +40,9 @@ class CAM_EXPORT CAM_Application : public STD_Application
   Q_OBJECT
 
 public:
-  typedef QPtrList<CAM_Module>         ModuleList;
-  typedef QPtrListIterator<CAM_Module> ModuleListIterator;
+  typedef QList<CAM_Module*> ModuleList;
+  typedef struct { QString name;  QString version; } ModuleShortInfo;
+  typedef QList<ModuleShortInfo> ModuleShortInfoList;
 
 public:
   CAM_Application( const bool = true );
@@ -28,50 +51,56 @@ public:
   virtual void        start();
 
   CAM_Module*         activeModule() const;
-  CAM_Module*         module(  const QString& ) const;
+  CAM_Module*         module( const QString& ) const;
 
-  ModuleListIterator  modules() const;
+  ModuleList          modules() const;
   void                modules( ModuleList& ) const;
   void                modules( QStringList&, const bool loaded = true ) const;
 
   virtual void        addModule( CAM_Module* );
 
   virtual void        loadModules();
-  virtual CAM_Module* loadModule( const QString& );
+  virtual CAM_Module* loadModule( const QString&, const bool = true );
 
   virtual bool        activateModule( const QString& );
 
-  virtual void        contextMenuPopup( const QString&, QPopupMenu*, QString& );
+  virtual void        contextMenuPopup( const QString&, QMenu*, QString& );
 
-  QString             moduleName( const QString& ) const;
-  QString             moduleTitle( const QString& ) const;
+  static QString      moduleName( const QString& );
+  static QString      moduleTitle( const QString& );
+  static QString      moduleIcon( const QString& );
+  static bool         isModuleAccessible( const QString& );
 
   virtual void        createEmptyStudy();
 
+  static ModuleShortInfoList getVersionInfo();
+
 protected:
   virtual SUIT_Study* createNewStudy();
   virtual void        updateCommandsStatus();
 
   virtual void        moduleAdded( CAM_Module* );
   virtual void        beforeCloseDoc( SUIT_Study* );
+  virtual void        afterCloseDoc();
   virtual bool        activateModule( CAM_Module* = 0 );
 
   virtual void        setActiveStudy( SUIT_Study* );
 
-  QString             moduleLibrary( const QString&, const bool = true ) const;
+  static QString      moduleLibrary( const QString&, const bool = true );
 
 private:
   void                readModuleList();
 
 private:
-  typedef struct { QString name, title, internal; } ModuleInfo;
-  typedef QValueList<ModuleInfo>                    ModuleInfoList;
+  typedef struct { QString name, title, internal, icon; bool isSingleton; QString version; } ModuleInfo;
+  typedef QList<ModuleInfo> ModuleInfoList;
 
 private:
-  CAM_Module*         myModule;
-  ModuleList          myModules;
-  ModuleInfoList      myInfoList;
-  bool			          myAutoLoad;
+  CAM_Module*           myModule;        //!< active module
+  ModuleList            myModules;       //!< loaded modules list
+  static ModuleInfoList myInfoList;      //!< modules info list
+  bool                  myAutoLoad;      //!< auto loading flag
+  bool                  myBlocked;       //!< "blocked" flag, internal usage
 };
 
 #ifdef WIN32