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
Fix for problem: broken reference objects after delete originals.
[modules/gui.git]
/
src
/
SalomeApp
/
SalomeApp_Application.h
diff --git
a/src/SalomeApp/SalomeApp_Application.h
b/src/SalomeApp/SalomeApp_Application.h
index aa394941ee8158a58c87d42c272d2ced07331397..969d5489060e7548837ca7e74b9ac6a6738df955 100644
(file)
--- a/
src/SalomeApp/SalomeApp_Application.h
+++ b/
src/SalomeApp/SalomeApp_Application.h
@@
-32,6
+32,7
@@
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;
@@
-52,7
+53,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();
@@
-102,6
+104,8
@@
public:
virtual void createEmptyStudy();
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();
@@
-126,6
+130,7
@@
public slots:
private slots:
void onSelection();
void onRefresh();
private slots:
void onSelection();
void onRefresh();
+ void onDeleteReferences();
protected:
virtual void createActions();
protected:
virtual void createActions();
@@
-153,7
+158,7
@@
protected:
virtual void updateDesktopTitle();
protected slots:
virtual void updateDesktopTitle();
protected slots:
- virtual void onDesktopActivated();
+ virtual void
onDesktopActivated();
private slots:
void onNewWindow();
private slots:
void onNewWindow();
@@
-172,6
+177,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();
@@
-203,6
+211,8
@@
private:
ActionMap myActions;
WindowMap myWindows;
ActionMap myActions;
WindowMap myWindows;
+ SUIT_Accel* myAccel;
+
static SalomeApp_Preferences* _prefs_;
};
static SalomeApp_Preferences* _prefs_;
};