X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSalomeApp%2FSalomeApp_Application.h;h=0da12339c6046a926c46f167ae720950190a4eb2;hb=8c1a275856402cfefde5ea45cbac277d17b4792e;hp=b6328e688c16e5c6661cfc0bf85ea6aa66125507;hpb=162fc2a41225bd9c090b883664df86294407f860;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index b6328e688..0da12339c 100644
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -28,10 +28,9 @@ 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 SALOME_LifeCycleCORBA;
@@ -53,7 +52,8 @@ public:
   typedef enum { WT_ObjectBrowser, WT_PyConsole, WT_LogWindow, WT_User } WindowTypes;
 
   enum { ModulesListId = STD_Application::UserID, NewGLViewId,
-         NewPlot2dId, NewOCCViewId, NewVTKViewId, LoadScriptId, PropertiesId, UserID };
+         NewPlot2dId, NewOCCViewId, NewVTKViewId, LoadScriptId,
+         PropertiesId, PreferencesId, MRUId, UserID };
 
 public:
   SalomeApp_Application();
@@ -71,9 +71,17 @@ public:
   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 +97,8 @@ public:
 
   virtual void                        start();
 
+  virtual void                        contextMenuPopup( const QString&, QPopupMenu*, QString& );
+
   static CORBA::ORB_var               orb();
   static SALOMEDSClient_StudyManager* studyMgr();
   static SALOME_NamingService*        namingService();
@@ -104,10 +114,11 @@ public slots:
   virtual void                        onNewDoc();
   virtual void                        onOpenDoc();
   virtual void                        onHelpAbout();
+  virtual bool                        onOpenDoc( const QString& );
 
 private slots:
   void                                onSelection();
-  void                                onAboutRefresh();
+  void                                onRefresh();
 
 protected:
   virtual void                        createActions();
@@ -125,7 +136,12 @@ protected:
   virtual void                        beforeCloseDoc( SUIT_Study* );
   virtual void                        afterCloseDoc();
 
-  virtual QString                     getFileName( bool );
+  virtual void                        moduleAdded( CAM_Module* );
+
+  SalomeApp_Preferences*              preferences( const bool ) const;
+
+  virtual void                        createPreferences( SalomeApp_Preferences* );
+  virtual void                        preferencesChanged( const QString&, const QString& );
 
 private slots:
   void                                onNewWindow();
@@ -137,8 +153,13 @@ private slots:
   void                                onStudySaved( SUIT_Study* );
   void                                onStudyClosed( SUIT_Study* );
   
-  void                                onLoadScript(); 
   void                                onProperties();
+  void                                onLoadScript(); 
+
+  void                                onPreferences();
+  void                                onMRUActivated( QString );
+
+  void                                onPreferenceChanged( QString&, QString&, QString& );
 
 private:
   void                                updateWindows();
@@ -148,6 +169,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;
@@ -161,10 +184,12 @@ private:
   typedef QMap<int, SalomeApp_WidgetContainer*> WindowMap;
 
 private:
+  SalomeApp_Preferences*              myPrefs;
   SalomeApp_SelectionMgr*             mySelMgr;
-  SalomeApp_PreferencesDlg*           myPrefDlg;
   ActionMap                           myActions;
   WindowMap                           myWindows;
+
+  static SalomeApp_Preferences*       _prefs_;
 };
 
 #ifdef WIN32