diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 6d1b7cf12..6dcff33f3 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.38 2006/01/15 03:54:50 glvertex +Solved an annoyng old consistency bug between toolbars and toolbar menu's + Revision 1.37 2006/01/14 00:51:06 davide_portelli A little change @@ -334,8 +337,7 @@ MainWindow::MainWindow() createMenus(); createToolBars(); updateMenus(); - addToolBar(mainToolBar); - addToolBar(renderToolBar); + setWindowTitle(appName()); loadPlugins(); if(QCoreApplication::instance ()->argc()>1){ @@ -615,6 +617,7 @@ void MainWindow::createMenus() toolBarMenu = viewMenu->addMenu(tr("&ToolBars")); toolBarMenu->addAction(showToolbarStandardAct); toolBarMenu->addAction(showToolbarRenderAct); + connect(toolBarMenu,SIGNAL(aboutToShow()),this,SLOT(updateMenus())); //////////////////// Menu Windows ///////////////////////////////////////////////////////////////////////// windowsMenu = menuBar()->addMenu(tr("&Windows")); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 3534a0f0f..7ea175581 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.68 2006/01/15 03:54:50 glvertex +Solved an annoyng old consistency bug between toolbars and toolbar menu's + Revision 1.67 2006/01/13 12:10:30 vannini Added logging to mean and gaussian curvautres colorization @@ -471,7 +474,11 @@ void MainWindow::updateMenus() logMenu->setEnabled(active); windowsMenu->setEnabled(active); preferencesMenu->setEnabled(active); + renderToolBar->setEnabled(active); + + showToolbarRenderAct->setChecked(renderToolBar->isVisible()); + showToolbarStandardAct->setChecked(mainToolBar->isVisible()); if(active){ const RenderMode &rm=GLA()->getCurrentRenderMode(); switch (rm.drawMode) {