comparison main/MainWindow.cpp @ 97:398889687f3d

* Add separate colour mapping unit; use it in spectrogram (colour 3d plot to follow)
* Add another colour scheme resembling that of a noted commercial application

 void
 MainWindow::setupMenus()
 {
     if (!m_mainMenusCreated) {
         m_rightButtonMenu = new QMenu();
+        m_rightButtonMenu->setTearOffEnabled(true);
     }
 
     if (m_rightButtonLayerMenu) {
         m_rightButtonLayerMenu->clear();
     } else {
         m_rightButtonLayerMenu = m_rightButtonMenu->addMenu(tr("&Layer"));
+        m_rightButtonLayerMenu->setTearOffEnabled(true);
         m_rightButtonMenu->addSeparator();
     }
 
     if (m_rightButtonTransformsMenu) {
         m_rightButtonTransformsMenu->clear();
     } else {
         m_rightButtonTransformsMenu = m_rightButtonMenu->addMenu(tr("&Transform"));
+        m_rightButtonTransformsMenu->setTearOffEnabled(true);
         m_rightButtonMenu->addSeparator();
     }
 
     if (!m_mainMenusCreated) {
         CommandHistory::getInstance()->registerMenu(m_rightButtonMenu);

 MainWindow::setupFileMenu()
 {
     if (m_mainMenusCreated) return;
 
     QMenu *menu = menuBar()->addMenu(tr("&File"));
+    menu->setTearOffEnabled(true);
     QToolBar *toolbar = addToolBar(tr("File Toolbar"));
 
     QIcon icon(":icons/filenew.png");
     icon.addFile(":icons/filenew-22.png");
     QAction *action = new QAction(icon, tr("&New Session"), this);

     menu->addAction(action);
 
     menu->addSeparator();
 
     m_recentFilesMenu = menu->addMenu(tr("&Recent Files"));
+    m_recentFilesMenu->setTearOffEnabled(true);
     setupRecentFilesMenu();
     connect(&m_recentFiles, SIGNAL(recentChanged()),
             this, SLOT(setupRecentFilesMenu()));
 
     menu->addSeparator();

 MainWindow::setupEditMenu()
 {
     if (m_mainMenusCreated) return;
 
     QMenu *menu = menuBar()->addMenu(tr("&Edit"));
+    menu->setTearOffEnabled(true);
     CommandHistory::getInstance()->registerMenu(menu);
 
     menu->addSeparator();
 
     QAction *action = new QAction(QIcon(":/icons/editcut.png"),

     if (m_mainMenusCreated) return;
 
     QAction *action = 0;
 
     QMenu *menu = menuBar()->addMenu(tr("&View"));
+    menu->setTearOffEnabled(true);
     action = new QAction(tr("Scroll &Left"), this);
     action->setShortcut(tr("Left"));
     action->setStatusTip(tr("Scroll the current pane to the left"));
     connect(action, SIGNAL(triggered()), this, SLOT(scrollLeft()));
     connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));

     if (m_paneMenu) {
 	m_paneActions.clear();
 	m_paneMenu->clear();
     } else {
 	m_paneMenu = menuBar()->addMenu(tr("&Pane"));
+        m_paneMenu->setTearOffEnabled(true);
     }
 
     if (m_layerMenu) {
 	m_layerActions.clear();
 	m_layerMenu->clear();
     } else {
 	m_layerMenu = menuBar()->addMenu(tr("&Layer"));
+        m_layerMenu->setTearOffEnabled(true);
     }
 
     QMenu *menu = m_paneMenu;
 
     QAction *action = new QAction(QIcon(":/icons/pane.png"), tr("Add &New Pane"), this);

                         
                     } else {
                         
                         if (!submenu) {
                             submenu = menu->addMenu(mainText);
+                            submenu->setTearOffEnabled(true);
                         } else if (isDefault) {
                             submenu->addSeparator();
                         }
 
                         QString actionText;

     menu->addAction(action);
 
     menu->addSeparator();
 
     m_existingLayersMenu = menu->addMenu(tr("Add &Existing Layer"));
+    m_existingLayersMenu->setTearOffEnabled(true);
     m_rightButtonLayerMenu->addMenu(m_existingLayersMenu);
 
     m_sliceMenu = menu->addMenu(tr("Add S&lice of Layer"));
+    m_sliceMenu->setTearOffEnabled(true);
     m_rightButtonLayerMenu->addMenu(m_sliceMenu);
 
     setupExistingLayersMenus();
 
     m_rightButtonLayerMenu->addSeparator();

     if (m_transformsMenu) {
         m_transformActions.clear();
         m_transformActionsReverse.clear();
         m_transformsMenu->clear();
     } else {
-	m_transformsMenu = menuBar()->addMenu(tr("&Transform"));
-    }
+	m_transformsMenu = menuBar()->addMenu(tr("&Transform")); 
+        m_transformsMenu->setTearOffEnabled(true);
+   }
 
     TransformFactory::TransformList transforms =
 	TransformFactory::getInstance()->getAllTransforms();
 
     vector<QString> types =

     map<QString, map<QString, QMenu *> > pluginNameMenus;
 
     set<SubdividingMenu *> pendingMenus;
 
     m_recentTransformsMenu = m_transformsMenu->addMenu(tr("&Recent Transforms"));
+    m_recentTransformsMenu->setTearOffEnabled(true);
     m_rightButtonTransformsMenu->addMenu(m_recentTransformsMenu);
     connect(&m_recentTransforms, SIGNAL(recentChanged()),
             this, SLOT(setupRecentTransformsMenu()));
 
     m_transformsMenu->addSeparator();

         }
 
         QString byCategoryLabel = tr("%1 by Category").arg(*i);
         SubdividingMenu *byCategoryMenu = new SubdividingMenu(byCategoryLabel,
                                                               20, 40);
+        byCategoryMenu->setTearOffEnabled(true);
         m_transformsMenu->addMenu(byCategoryMenu);
         m_rightButtonTransformsMenu->addMenu(byCategoryMenu);
         pendingMenus.insert(byCategoryMenu);
 
         vector<QString> categories = 

                 if (key != "") key += " > ";
                 key += *k;
 
                 if (categoryMenus[*i].find(key) == categoryMenus[*i].end()) {
                     SubdividingMenu *m = new SubdividingMenu(*k, 20, 40);
+                    m->setTearOffEnabled(true);
                     pendingMenus.insert(m);
                     categoryMenus[*i][key] = m;
                     if (parentKey == "") {
                         byCategoryMenu->addMenu(m);
                     } else {

             }
         }
 
         QString byPluginNameLabel = tr("%1 by Plugin Name").arg(*i);
         byPluginNameMenus[*i] = new SubdividingMenu(byPluginNameLabel);
+        byPluginNameMenus[*i]->setTearOffEnabled(true);
         m_transformsMenu->addMenu(byPluginNameMenus[*i]);
         m_rightButtonTransformsMenu->addMenu(byPluginNameMenus[*i]);
         pendingMenus.insert(byPluginNameMenus[*i]);
 
         QString byMakerLabel = tr("%1 by Maker").arg(*i);
         SubdividingMenu *byMakerMenu = new SubdividingMenu(byMakerLabel, 20, 40);
+        byMakerMenu->setTearOffEnabled(true);
         m_transformsMenu->addMenu(byMakerMenu);
         m_rightButtonTransformsMenu->addMenu(byMakerMenu);
         pendingMenus.insert(byMakerMenu);
 
         vector<QString> makers = 

             QString maker = *j;
             if (maker == "") maker = tr("Unknown");
             maker.replace(QRegExp(tr(" [\\(<].*$")), "");
 
             makerMenus[*i][maker] = new SubdividingMenu(maker, 30, 40);
+            makerMenus[*i][maker]->setTearOffEnabled(true);
             byMakerMenu->addMenu(makerMenus[*i][maker]);
             pendingMenus.insert(makerMenus[*i][maker]);
         }
     }
 

 
         if (pluginNameMenus[type].find(pluginName) ==
             pluginNameMenus[type].end()) {
 
             SubdividingMenu *parentMenu = byPluginNameMenus[type];
+            parentMenu->setTearOffEnabled(true);
 
             if (output == "") {
                 parentMenu->addAction(pluginName, action);
             } else {
                 pluginNameMenus[type][pluginName] = 

 MainWindow::setupHelpMenu()
 {
     if (m_mainMenusCreated) return;
 
     QMenu *menu = menuBar()->addMenu(tr("&Help"));
+    menu->setTearOffEnabled(true);
     
     QAction *action = new QAction(tr("&Help Reference"), this); 
     action->setStatusTip(tr("Open the Sonic Visualiser reference manual")); 
     connect(action, SIGNAL(triggered()), this, SLOT(help()));
     menu->addAction(action);