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

Changed: #1193 moved OV actions in a separatly menu.

Browse source
This commit is contained in:
dnk-88 2011-03-04 23:56:37 +02:00
parent 35a7c3156e
commit f6183823ab
5 changed files with 96 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/main_window.cpp
View file

@ -241,7 +241,7 @@ void CMainWindow::settings()
void CMainWindow::updateStatusBar() void CMainWindow::updateStatusBar()
{ {
/* if (_isGraphicsInitialized) /* if (_isGraphicsInitialized)
{ {
_statusInfo->setText(QString("%1, Nb tri: %2 , Texture used (Mb): %3 , fps: %4 ").arg( _statusInfo->setText(QString("%1, Nb tri: %2 , Texture used (Mb): %3 , fps: %4 ").arg(
Modules::objView().getDriver()->getVideocardInformation()).arg( Modules::objView().getDriver()->getVideocardInformation()).arg(
@ -313,40 +313,44 @@ void CMainWindow::createMenus()
// add actions in tools menu // add actions in tools menu
QMenu *toolsMenu = menuManager->menu(Core::Constants::M_TOOLS); QMenu *toolsMenu = menuManager->menu(Core::Constants::M_TOOLS);
QAction *settingsAction = menuManager->action(Core::Constants::SETTINGS); QAction *settingsAction = menuManager->action(Core::Constants::SETTINGS);
toolsMenu->insertAction(settingsAction ,_AnimationDialog->toggleViewAction()); QMenu *ovMenu = new QMenu("Object Viewer", this);
menuManager->registerMenu(ovMenu, "ObjectViewerQt.ObjectViewer");
toolsMenu->insertMenu(settingsAction, ovMenu);
ovMenu->insertAction(settingsAction ,_AnimationDialog->toggleViewAction());
_AnimationDialog->toggleViewAction()->setIcon(QIcon(":/images/anim.png")); _AnimationDialog->toggleViewAction()->setIcon(QIcon(":/images/anim.png"));
toolsMenu->insertAction(settingsAction ,_AnimationSetDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_AnimationSetDialog->toggleViewAction());
_AnimationSetDialog->toggleViewAction()->setIcon(QIcon(":/images/animset.png")); _AnimationSetDialog->toggleViewAction()->setIcon(QIcon(":/images/animset.png"));
toolsMenu->insertAction(settingsAction ,_SlotManagerDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_SlotManagerDialog->toggleViewAction());
_SlotManagerDialog->toggleViewAction()->setIcon(QIcon(":/images/mixer.png")); _SlotManagerDialog->toggleViewAction()->setIcon(QIcon(":/images/mixer.png"));
toolsMenu->insertAction(settingsAction ,_ParticleControlDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_ParticleControlDialog->toggleViewAction());
_ParticleControlDialog->toggleViewAction()->setIcon(QIcon(":/images/pqrticles.png")); _ParticleControlDialog->toggleViewAction()->setIcon(QIcon(":/images/pqrticles.png"));
toolsMenu->insertAction(settingsAction ,_DayNightDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_DayNightDialog->toggleViewAction());
_DayNightDialog->toggleViewAction()->setIcon(QIcon(":/images/dqynight.png")); _DayNightDialog->toggleViewAction()->setIcon(QIcon(":/images/dqynight.png"));
toolsMenu->insertAction(settingsAction ,_WaterPoolDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_WaterPoolDialog->toggleViewAction());
_WaterPoolDialog->toggleViewAction()->setIcon(QIcon(":/images/water.png")); _WaterPoolDialog->toggleViewAction()->setIcon(QIcon(":/images/water.png"));
_WaterPoolDialog->toggleViewAction()->setEnabled(false); _WaterPoolDialog->toggleViewAction()->setEnabled(false);
toolsMenu->insertAction(settingsAction ,_VegetableDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_VegetableDialog->toggleViewAction());
_VegetableDialog->toggleViewAction()->setIcon(QIcon(":/images/veget.png")); _VegetableDialog->toggleViewAction()->setIcon(QIcon(":/images/veget.png"));
toolsMenu->insertAction(settingsAction ,_GlobalWindDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_GlobalWindDialog->toggleViewAction());
_GlobalWindDialog->toggleViewAction()->setIcon(QIcon(":/images/wind.png")); _GlobalWindDialog->toggleViewAction()->setIcon(QIcon(":/images/wind.png"));
toolsMenu->insertAction(settingsAction ,_SkeletonScaleDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_SkeletonScaleDialog->toggleViewAction());
_SkeletonScaleDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_skelscale.png")); _SkeletonScaleDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_skelscale.png"));
toolsMenu->insertAction(settingsAction ,_TuneTimerDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_TuneTimerDialog->toggleViewAction());
_TuneTimerDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_framedelay.png")); _TuneTimerDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_framedelay.png"));
toolsMenu->insertAction(settingsAction ,_SunColorDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_SunColorDialog->toggleViewAction());
toolsMenu->insertAction(settingsAction ,_TuneMRMDialog->toggleViewAction()); ovMenu->insertAction(settingsAction ,_TuneMRMDialog->toggleViewAction());
_TuneMRMDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_mrm_mesh.png")); _TuneMRMDialog->toggleViewAction()->setIcon(QIcon(":/images/ico_mrm_mesh.png"));
connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)), connect(_ParticleControlDialog->toggleViewAction(), SIGNAL(triggered(bool)),
@ -355,7 +359,7 @@ 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)));
toolsMenu->insertAction(settingsAction ,_settingsAction); ovMenu->insertAction(settingsAction ,_settingsAction);
toolsMenu->insertSeparator(settingsAction); toolsMenu->insertSeparator(settingsAction);
} }