From 55542ca6fc42776f8a730455a983aefc0e64c033 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Fri, 25 Nov 2005 17:41:52 +0000
Subject: [PATCH] Added categorization to render menu

---
 src/meshlab/mainwindow.cpp | 27 ++++++++++++++++++++++++---
 src/meshlab/mainwindow.h   |  9 +++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/meshlab/mainwindow.cpp b/src/meshlab/mainwindow.cpp
index 6209c2d8d..38fb9df5b 100644
--- a/src/meshlab/mainwindow.cpp
+++ b/src/meshlab/mainwindow.cpp
@@ -24,6 +24,9 @@
 History
 
 $Log$
+Revision 1.35  2005/11/25 17:41:52  alemochi
+Added categorization to render menu
+
 Revision 1.34  2005/11/25 16:23:02  ggangemi
 Added MeshColorizeInterface plugins support code
 
@@ -259,6 +262,8 @@ void MainWindow::createActions()
 	//////////////Render Actions for Toolbar and Menu /////////////////////////////////////////
 	renderModeGroup = new QActionGroup(this);
 	
+	
+
 	renderBboxAct	  = new QAction(QIcon(":/images/bbox.png"),tr("&Bounding box"), renderModeGroup);
 	renderBboxAct->setCheckable(true);
 	renderBboxAct->setChecked(true);
@@ -363,14 +368,30 @@ void MainWindow::createMenus()
 	
 	//////////////////// Menu Render //////////////////////////////////////////////////////////////
 	renderMenu		= menuBar()->addMenu(tr("&Render"));
-  renderMenu->addActions(renderModeGroup->actions());
-	renderMenu->addAction(setLightAct);
- 
+  //renderMenu->addActions(renderModeGroup->actions());
+	//renderMenu->addAction(setLightAct);
+//  renderMenu->addAction(renderModeAct);
+//  renderMenu->addAction(lightingModeAct);
+//	lightingModeAct->addAction(setLightAct);
+	renderModeMenu=renderMenu->addMenu(tr("Render Mode"));
+	renderModeMenu->addActions(renderModeGroup->actions());
+	
+	lightingModeMenu=renderMenu->addMenu(tr("Lighting"));
+	lightingModeMenu->addAction(setLightAct);
+
+	textureModeMenu=renderMenu->addMenu(tr("Texture"));
+	colorModeMenu=renderMenu->addMenu(tr("Color"));
+	
+
 	//////////////////// Menu View ////////////////////////////////////////////////////////////////
 	viewMenu		= menuBar()->addMenu(tr("&View"));
 	toolBarMenu	= viewMenu->addMenu(tr("&ToolBars"));
 	toolBarMenu->addAction(viewToolbarStandardAct);
 	toolBarMenu->addAction(viewToolbarRenderAct);
+	
+
+	
+
 
 	//////////////////// Menu Windows /////////////////////////////////////////////////////////////
 	windowsMenu = menuBar()->addMenu(tr("&Windows"));
diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h
index 650f362e5..8d035b608 100644
--- a/src/meshlab/mainwindow.h
+++ b/src/meshlab/mainwindow.h
@@ -97,6 +97,12 @@ private:
 	QMenu *fileMenu;
 	QMenu *filterMenu;
 	QMenu *renderMenu;
+	QMenu *renderModeMenu;
+	QMenu *lightingModeMenu;
+	QMenu *textureModeMenu;
+	QMenu *colorModeMenu;
+
+
 	QMenu *viewMenu;
 	QMenu *toolBarMenu;
 	QMenu *windowsMenu;
@@ -106,6 +112,9 @@ private:
 	QAction *saveAsAct;
 	
 	QActionGroup *renderModeGroup;
+	
+	
+
 	QAction *renderBboxAct;
 	QAction *renderModePointsAct;
 	QAction *renderModeWireAct;