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

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index 6a7170acc..ff332ab1d 100644
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -28,20 +28,21 @@ class QDockWindow;
 class LogWindow;
 class OB_Browser;
 class PythonConsole;
-class QtxResourceEdit;
 class SalomeApp_Module;
+class SalomeApp_Preferences;
 class SalomeApp_SelectionMgr;
-class SalomeApp_PreferencesDlg;
 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 +54,9 @@ public:
   typedef enum { WT_ObjectBrowser, WT_PyConsole, WT_LogWindow, WT_User } WindowTypes;
 
   enum { ModulesListId = STD_Application::UserID, NewGLViewId,
-         NewPlot2dId, NewOCCViewId, NewVTKViewId, LoadScriptId, UserID };
+         NewPlot2dId, NewOCCViewId, NewVTKViewId, DumpStudyId,
+	 LoadScriptId, PropertiesId, PreferencesId, MRUId, 
+	 CatalogGenId, RegDisplayId, UserID };
 
 public:
   SalomeApp_Application();
@@ -65,15 +68,25 @@ public:
   virtual CAM_Module*                 loadModule( const QString& );
   virtual bool                        activateModule( const QString& );
   
+  virtual bool                        useStudy( const QString& );
+
   SalomeApp_SelectionMgr*             selectionMgr() const;
 
   LogWindow*                          logWindow();
   OB_Browser*                         objectBrowser();
   PythonConsole*                      pythonConsole();   
 
-  QtxResourceEdit*                    resourceEdit() const;
+  virtual void                        updateObjectBrowser( const bool = true );
+
+  SalomeApp_Preferences*              preferences() const;
 
   virtual QString                     getFileFilter() const;
+  virtual QString                     getFileName( bool open, const QString& initial, const QString& filters, 
+						   const QString& caption, QWidget* parent );
+  virtual QString                     getDirectory( const QString& initial, const QString& caption, QWidget* parent );
+  virtual QStringList                 getOpenFileNames( const QString& initial, const QString& filters, 
+							const QString& caption, QWidget* parent );
+
   SUIT_ViewManager*                   getViewManager( const QString&, const bool );
 
   void                                updateActions();
@@ -89,6 +102,12 @@ public:
 
   virtual void                        start();
 
+  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();
@@ -104,10 +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                                onAboutRefresh();
+  void                                onRefresh();
+  void                                onDeleteReferences();
+  void                                onDblClick( QListViewItem* );
 
 protected:
   virtual void                        createActions();
@@ -125,6 +152,18 @@ protected:
   virtual void                        beforeCloseDoc( SUIT_Study* );
   virtual void                        afterCloseDoc();
 
+  virtual void                        moduleAdded( CAM_Module* );
+  virtual bool                        activateModule( CAM_Module* = 0 );
+
+  SalomeApp_Preferences*              preferences( const bool ) const;
+
+  virtual void                        createPreferences( SalomeApp_Preferences* );
+  virtual void                        preferencesChanged( const QString&, const QString& );
+  virtual void                        updateDesktopTitle();
+
+protected slots:
+  virtual void                        onDesktopActivated();
+
 private slots:
   void                                onNewWindow();
   void                                onModuleActivation( QAction* );
@@ -135,8 +174,19 @@ private slots:
   void                                onStudySaved( SUIT_Study* );
   void                                onStudyClosed( SUIT_Study* );
   
+  void                                onProperties();
+  void                                onDumpStudy();
   void                                onLoadScript(); 
 
+  void                                onPreferences();
+  void                                onMRUActivated( QString );
+
+  void                                onCatalogGen();
+  void                                onRegDisplay();
+
+  void                                onPreferenceChanged( QString&, QString&, QString& );
+  void                                onOpenWith();
+
 private:
   void                                updateWindows();
   void                                updateViewManagers();
@@ -145,6 +195,8 @@ private:
   void                                loadWindowsGeometry();
   void                                saveWindowsGeometry();
 
+  void                                updatePreference( const QString&, const QString&, const QString& );
+
   QString                             defaultModule() const;
   void                                currentWindows( QMap<int, int>& ) const;
   void                                currentViewManagers( QStringList& ) const;
@@ -158,10 +210,14 @@ private:
   typedef QMap<int, SalomeApp_WidgetContainer*> WindowMap;
 
 private:
+  SalomeApp_Preferences*              myPrefs;
   SalomeApp_SelectionMgr*             mySelMgr;
-  SalomeApp_PreferencesDlg*           myPrefDlg;
   ActionMap                           myActions;
   WindowMap                           myWindows;
+
+  SUIT_Accel*                         myAccel;
+
+  static SalomeApp_Preferences*       _prefs_;
 };
 
 #ifdef WIN32