lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed useless sub-menu nesting in "view" menu (submenu with just 1-2 voices)

Browse Source
This commit is contained in:
Marco Callieri mcallieri 2015-11-12 16:42:18 +00:00
parent 2fb2fbc441
commit 710f010e56
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meshlab/mainwindow.h
View File

@ -402,8 +402,6 @@ private:
//View Menu and SubMenu //////
QMenu *viewMenu;
QMenu *trackBallMenu;
QMenu *logMenu;
QMenu *toolBarMenu;
//////////////////////////////
QMenu *windowsMenu;

19
src/meshlab/mainwindow_Init.cpp
View File

@ -636,22 +636,20 @@ void MainWindow::createMenus()
// Shaders SUBmenu
shadersMenu = renderMenu->addMenu(tr("&Shaders"));
renderMenu->addSeparator();
//////////////////// Menu View ////////////////////////////////////////////////////////////////////////////
viewMenu = menuBar()->addMenu(tr("&View"));
viewMenu = menuBar()->addMenu(tr("&View"));
viewMenu->addAction(fullScreenAct);
viewMenu->addSeparator();
viewMenu->addAction(showLayerDlgAct);
viewMenu->addAction(showRasterAct);
trackBallMenu = viewMenu->addMenu(tr("&Trackball"));
trackBallMenu->addAction(showTrackBallAct);
trackBallMenu->addAction(resetTrackBallAct);
logMenu = viewMenu->addMenu(tr("&Info"));
logMenu->addAction(showInfoPaneAct);
viewMenu->addSeparator();
viewMenu->addAction(showTrackBallAct);
viewMenu->addAction(resetTrackBallAct);
viewMenu->addSeparator();
viewMenu->addAction(showInfoPaneAct);
viewMenu->addSeparator();
toolBarMenu = viewMenu->addMenu(tr("&ToolBars"));
toolBarMenu->addAction(showToolbarStandardAct);
toolBarMenu->addAction(showToolbarRenderAct);
@ -668,7 +666,6 @@ void MainWindow::createMenus()
preferencesMenu->addSeparator();*/
preferencesMenu->addAction(setCustomizeAct);
//////////////////// Menu Help ////////////////////////////////////////////////////////////////
helpMenu = menuBar()->addMenu(tr("&Help"));
helpMenu->addAction(aboutAct);

10
src/meshlab/mainwindow_RunTime.cpp
View File

@ -378,8 +378,10 @@ void MainWindow::updateMenus()
renderMenu->setEnabled(!editMenu->actions().isEmpty());
updateMenuItems(renderMenu,activeDoc);
fullScreenAct->setEnabled(activeDoc);
trackBallMenu->setEnabled(activeDoc);
logMenu->setEnabled(activeDoc);
showLayerDlgAct->setEnabled(activeDoc);
showTrackBallAct->setEnabled(activeDoc);
resetTrackBallAct->setEnabled(activeDoc);
showInfoPaneAct->setEnabled(activeDoc);
windowsMenu->setEnabled(activeDoc);
preferencesMenu->setEnabled(activeDoc);
@ -515,8 +517,8 @@ void MainWindow::updateMenus()
if(GLA())
{
showLayerDlgAct->setChecked(layerDialog->isVisible());
showRasterAct->setChecked(GLA()->isRaster());
showRasterAct->setEnabled(meshDoc()->rm() != 0);
showRasterAct->setEnabled(meshDoc()->rm() != 0);
showRasterAct->setChecked(GLA()->isRaster());
//if(GLA()->layerDialog->isVisible())
layerDialog->updateTable();
layerDialog->updateLog(meshDoc()->Log);