From 710f010e56e7a1ec11ef1c66a45eb3de20edf8ab Mon Sep 17 00:00:00 2001
From: Marco Callieri mcallieri <marco.callieri@isti.cnr.it>
Date: Thu, 12 Nov 2015 16:42:18 +0000
Subject: [PATCH] removed useless sub-menu nesting in "view" menu (submenu with
 just 1-2 voices)

---
 src/meshlab/mainwindow.h           |  2 --
 src/meshlab/mainwindow_Init.cpp    | 19 ++++++++-----------
 src/meshlab/mainwindow_RunTime.cpp | 10 ++++++----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h
index c2d7aa6e6..2c80f6338 100644
--- a/src/meshlab/mainwindow.h
+++ b/src/meshlab/mainwindow.h
@@ -402,8 +402,6 @@ private:
 
     //View Menu and SubMenu //////
     QMenu *viewMenu;
-    QMenu *trackBallMenu;
-    QMenu *logMenu;
     QMenu *toolBarMenu;
     //////////////////////////////
     QMenu *windowsMenu;
diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp
index b97c85bba..a5937e13a 100644
--- a/src/meshlab/mainwindow_Init.cpp
+++ b/src/meshlab/mainwindow_Init.cpp
@@ -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);
diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp
index b2fce7d42..e05b32a7a 100644
--- a/src/meshlab/mainwindow_RunTime.cpp
+++ b/src/meshlab/mainwindow_RunTime.cpp
@@ -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);