comparison main/MainWindow.cpp @ 67:0229bec2d2dc

* Tidy up panes menu

 
     std::vector<Model *> models;
     if (m_document) models = m_document->getTransformInputModels(); //!!! not well named for this!
     bool plural = (models.size() > 1);
     if (models.empty()) {
-        if (m_document) {
-            models.push_back(m_document->getMainModel()); // probably 0
-        } else {
-            models.push_back(0);
-        }
+        models.push_back(getMainModel()); // probably 0
     }
 
     for (unsigned int i = 0;
 	 i < sizeof(backgroundTypes)/sizeof(backgroundTypes[0]); ++i) {
 

                 }
                 mono = false;
                 break;
 		
             case LayerFactory::Spectrogram:
+                icon = QIcon(":/icons/spectrogram.png");
                 mainText = tr("Add &Spectrogram");
                 if (menuType == 0) {
                     shortcutText = tr("Alt+S");
                     tipText = tr("Add a new pane showing a dB spectrogram");
                 } else {
                     tipText = tr("Add a new layer showing a dB spectrogram");
                 }
                 break;
 		
             case LayerFactory::MelodicRangeSpectrogram:
+                icon = QIcon(":/icons/spectrogram.png");
                 mainText = tr("Add &Melodic Range Spectrogram");
                 if (menuType == 0) {
                     shortcutText = tr("Alt+M");
                     tipText = tr("Add a new pane showing a spectrogram set up for a pitch overview");
                 } else {
                     tipText = tr("Add a new layer showing a spectrogram set up for a pitch overview");
                 }
                 break;
 		
             case LayerFactory::PeakFrequencySpectrogram:
+                icon = QIcon(":/icons/spectrogram.png");
                 mainText = tr("Add &Peak Frequency Spectrogram");
                 if (menuType == 0) {
                     shortcutText = tr("Alt+P");
                     tipText = tr("Add a new pane showing a spectrogram set up for tracking frequencies");
                 } else {
                     tipText = tr("Add a new layer showing a spectrogram set up for tracking frequencies");
                 }
                 break;
                 
             case LayerFactory::Spectrum:
+                icon = QIcon(":/icons/spectrum.png");
                 mainText = tr("Add Spectr&um");
                 if (menuType == 0) {
                     shortcutText = tr("Alt+U");
                     tipText = tr("Add a new pane showing a frequency spectrum");
                 } else {

                         else continue;
                     }
 
                     if (isOnly && (!plural || menuType == 1)) {
 
-                        action = new QAction(icon, mainText, this);
+                        if (type != LayerFactory::Waveform) {
+                            action = new QAction(mainText, this);
+                        } else {
+                            action = new QAction(icon, mainText, this);
+                        }                            
+
                         action->setShortcut(shortcutText);
                         action->setStatusTip(tipText);
                         if (menuType == 0) {
                             connect(action, SIGNAL(triggered()),
                                     this, SLOT(addPane()));

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

                         if (model) {
                             actionText = tr("%1: %2")
                                 .arg(model->objectName())
                                 .arg(actionText);
                         }
-		 
-                        action = new QAction(icon, actionText, this);
-                        if (isDefault) action->setShortcut(shortcutText);
+
+                        if (isDefault) {
+                            action = new QAction(icon, actionText, this);
+                            if (!model || model == getMainModel()) {
+                                action->setShortcut(shortcutText);
+                            }
+                        } else {
+                            action = new QAction(actionText, this);
+                        }
+
                         action->setStatusTip(tipText);
 
                         if (menuType == 0) {
                             connect(action, SIGNAL(triggered()),
                                     this, SLOT(addPane()));