Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Remove Object Viewer menus when unloading the plugin.

Browse source
This commit is contained in:
dfighter1985 2014-06-08 19:39:58 +02:00
parent 686e1f2013
commit bbfd0e15cb
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/studio/src/plugins/object_viewer/main_window.cpp
View file

@ -71,6 +71,7 @@ CMainWindow::CMainWindow(QWidget *parent)
_lastDir("."), _lastDir("."),
_mouseMode(NL3D::U3dMouseListener::edit3d) _mouseMode(NL3D::U3dMouseListener::edit3d)
{ {
menu = NULL;
nldebug("CMainWindow::CMainWindow:"); nldebug("CMainWindow::CMainWindow:");
setObjectName("CMainWindow"); setObjectName("CMainWindow");
@ -134,6 +135,8 @@ CMainWindow::~CMainWindow()
settings->endGroup(); settings->endGroup();
settings->sync(); settings->sync();
removeMenus();
delete _AnimationDialog; delete _AnimationDialog;
delete _AnimationSetDialog; delete _AnimationSetDialog;
delete _SlotManagerDialog; delete _SlotManagerDialog;
@ -323,6 +326,14 @@ void CMainWindow::createMenus()
connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)), connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)),
_ParticleWorkspaceDialog->_PropertyDialog, SLOT(setVisible(bool))); _ParticleWorkspaceDialog->_PropertyDialog, SLOT(setVisible(bool)));
menu = ovMenu;
}
void CMainWindow::removeMenus()
{
delete menu;
menu = NULL;
} }
void CMainWindow::createToolBars() void CMainWindow::createToolBars()

3
code/studio/src/plugins/object_viewer/main_window.h
View file

@ -95,6 +95,7 @@ protected:
private: private:
void createActions(); void createActions();
void createMenus(); void createMenus();
void removeMenus();
void createToolBars(); void createToolBars();
void createDialogs(); void createDialogs();
@ -144,6 +145,8 @@ private:
uint _numTri; uint _numTri;
float _texMem; float _texMem;
sint _mouseMode; sint _mouseMode;
QMenu *menu;
};/* class CMainWindow */ };/* class CMainWindow */
} /* namespace NLQT */ } /* namespace NLQT */