Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This file in LightApp package
[modules/gui.git]
/
src
/
SalomeApp
/
SalomeApp_Application.h
diff --git
a/src/SalomeApp/SalomeApp_Application.h
b/src/SalomeApp/SalomeApp_Application.h
index 1999ef00e248a8fabb39c07f057e4480f02e6a5e..ff332ab1d85efe71b942865177b025635dd95d57 100644
(file)
--- 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 SalomeApp_Preferences;
class SalomeApp_SelectionMgr;
class SalomeApp_WidgetContainer;
+class SUIT_Accel;
class SALOME_LifeCycleCORBA;
class SALOME_LifeCycleCORBA;
+class QListViewItem;
+
#ifdef WIN32
#pragma warning( disable:4251 )
#endif
#ifdef WIN32
#pragma warning( disable:4251 )
#endif
-/*
- Class : SalomeApp_Application
+/*!
Description : Application containing SalomeApp module
*/
Description : Application containing SalomeApp module
*/
@@
-53,7
+55,8
@@
public:
enum { ModulesListId = STD_Application::UserID, NewGLViewId,
NewPlot2dId, NewOCCViewId, NewVTKViewId, DumpStudyId,
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();
public:
SalomeApp_Application();
@@
-101,6
+104,10
@@
public:
virtual void contextMenuPopup( const QString&, QPopupMenu*, QString& );
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();
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 onNewDoc();
virtual void onOpenDoc();
virtual void onHelpAbout();
+ virtual void onHelpContentsModule();
virtual bool onOpenDoc( const QString& );
virtual bool onOpenDoc( const QString& );
+ virtual void onLoadDoc();
virtual bool onLoadDoc( const QString& );
virtual void onCopy();
virtual void onPaste();
virtual bool onLoadDoc( const QString& );
virtual void onCopy();
virtual void onPaste();
-
+
private slots:
void onSelection();
void onRefresh();
private slots:
void onSelection();
void onRefresh();
+ void onDeleteReferences();
+ void onDblClick( QListViewItem* );
protected:
virtual void createActions();
protected:
virtual void createActions();
@@
-142,11
+153,16
@@
protected:
virtual void afterCloseDoc();
virtual void moduleAdded( CAM_Module* );
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& );
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();
private slots:
void onNewWindow();
@@
-165,6
+181,9
@@
private slots:
void onPreferences();
void onMRUActivated( QString );
void onPreferences();
void onMRUActivated( QString );
+ void onCatalogGen();
+ void onRegDisplay();
+
void onPreferenceChanged( QString&, QString&, QString& );
void onOpenWith();
void onPreferenceChanged( QString&, QString&, QString& );
void onOpenWith();
@@
-196,6
+215,8
@@
private:
ActionMap myActions;
WindowMap myWindows;
ActionMap myActions;
WindowMap myWindows;
+ SUIT_Accel* myAccel;
+
static SalomeApp_Preferences* _prefs_;
};
static SalomeApp_Preferences* _prefs_;
};