X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_Application.h;h=ff332ab1d85efe71b942865177b025635dd95d57;hb=cdce4bc659c9b5fe82e643f0cc2da4063c7c9371;hp=8f45b3854f49bbc5db68b3f06b452a80ce31e342;hpb=3e4e6857305d7f5b3cb723c7875d280bb2bcb115;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index 8f45b3854..ff332ab1d 100644
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -32,15 +32,17 @@ class SalomeApp_Module;
 class SalomeApp_Preferences;
 class SalomeApp_SelectionMgr;
 class SalomeApp_WidgetContainer;
+class SUIT_Accel;
 
 class SALOME_LifeCycleCORBA;
 
+class QListViewItem;
+
 #ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
-/*
-  Class       : SalomeApp_Application
+/*!
   Description : Application containing SalomeApp module
 */
 
@@ -53,7 +55,8 @@ public:
 
   enum { ModulesListId = STD_Application::UserID, NewGLViewId,
          NewPlot2dId, NewOCCViewId, NewVTKViewId, DumpStudyId,
-	 LoadScriptId,PropertiesId, PreferencesId, MRUId, UserID };
+	 LoadScriptId, PropertiesId, PreferencesId, MRUId, 
+	 CatalogGenId, RegDisplayId, UserID };
 
 public:
   SalomeApp_Application();
@@ -101,6 +104,10 @@ public:
 
   virtual void                        contextMenuPopup( const QString&, QPopupMenu*, QString& );
 
+  virtual void                        createEmptyStudy();
+
+  SUIT_Accel*                         accel() const;
+
   static CORBA::ORB_var               orb();
   static SALOMEDSClient_StudyManager* studyMgr();
   static SALOME_NamingService*        namingService();
@@ -116,14 +123,18 @@ public slots:
   virtual void                        onNewDoc();
   virtual void                        onOpenDoc();
   virtual void                        onHelpAbout();
+  virtual void                        onHelpContentsModule();
   virtual bool                        onOpenDoc( const QString& );
+  virtual void                        onLoadDoc();
   virtual bool                        onLoadDoc( const QString& );
   virtual void                        onCopy();
   virtual void                        onPaste();  
-
+  
 private slots:
   void                                onSelection();
   void                                onRefresh();
+  void                                onDeleteReferences();
+  void                                onDblClick( QListViewItem* );
 
 protected:
   virtual void                        createActions();
@@ -142,6 +153,7 @@ protected:
   virtual void                        afterCloseDoc();
 
   virtual void                        moduleAdded( CAM_Module* );
+  virtual bool                        activateModule( CAM_Module* = 0 );
 
   SalomeApp_Preferences*              preferences( const bool ) const;
 
@@ -150,7 +162,7 @@ protected:
   virtual void                        updateDesktopTitle();
 
 protected slots:
-  virtual void          onDesktopActivated();
+  virtual void                        onDesktopActivated();
 
 private slots:
   void                                onNewWindow();
@@ -169,6 +181,9 @@ private slots:
   void                                onPreferences();
   void                                onMRUActivated( QString );
 
+  void                                onCatalogGen();
+  void                                onRegDisplay();
+
   void                                onPreferenceChanged( QString&, QString&, QString& );
   void                                onOpenWith();
 
@@ -200,6 +215,8 @@ private:
   ActionMap                           myActions;
   WindowMap                           myWindows;
 
+  SUIT_Accel*                         myAccel;
+
   static SalomeApp_Preferences*       _prefs_;
 };