X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_Application.h;h=ff332ab1d85efe71b942865177b025635dd95d57;hb=cdce4bc659c9b5fe82e643f0cc2da4063c7c9371;hp=94ed79b40cb78adb0b8fde5aae74177045b511ad;hpb=765ec41de79da279a808efa0756582b52b3a89c2;p=modules%2Fgui.git diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h index 94ed79b40..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(); @@ -103,6 +106,8 @@ public: virtual void createEmptyStudy(); + SUIT_Accel* accel() const; + static CORBA::ORB_var orb(); static SALOMEDSClient_StudyManager* studyMgr(); static SALOME_NamingService* namingService(); @@ -118,6 +123,7 @@ 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& ); @@ -127,6 +133,8 @@ public slots: private slots: void onSelection(); void onRefresh(); + void onDeleteReferences(); + void onDblClick( QListViewItem* ); protected: virtual void createActions(); @@ -154,7 +162,7 @@ protected: virtual void updateDesktopTitle(); protected slots: - virtual void onDesktopActivated(); + virtual void onDesktopActivated(); private slots: void onNewWindow(); @@ -173,6 +181,9 @@ private slots: void onPreferences(); void onMRUActivated( QString ); + void onCatalogGen(); + void onRegDisplay(); + void onPreferenceChanged( QString&, QString&, QString& ); void onOpenWith(); @@ -204,6 +215,8 @@ private: ActionMap myActions; WindowMap myWindows; + SUIT_Accel* myAccel; + static SalomeApp_Preferences* _prefs_; };