Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 2528:84ddd274fcc0
Further older-Qt bits
author | Chris Cannam |
---|---|
date | Wed, 29 Apr 2020 16:52:26 +0100 |
parents | 27dc177e114f |
children | 62b1a3a242ee |
comparison
equal
deleted
inserted
replaced
2527:e499ec4a32c9 | 2528:84ddd274fcc0 |
---|---|
5064 MainWindow::panePropertiesRightButtonMenuRequested(Pane *pane, QPoint position) | 5064 MainWindow::panePropertiesRightButtonMenuRequested(Pane *pane, QPoint position) |
5065 { | 5065 { |
5066 if (m_lastRightButtonPropertyMenu) { | 5066 if (m_lastRightButtonPropertyMenu) { |
5067 delete m_lastRightButtonPropertyMenu; | 5067 delete m_lastRightButtonPropertyMenu; |
5068 } | 5068 } |
5069 | |
5070 m_paneStack->setCurrentLayer(pane, nullptr); | |
5071 | 5069 |
5072 QMenu *m = new QMenu; | 5070 QMenu *m = new QMenu; |
5073 IconLoader il; | 5071 IconLoader il; |
5074 | 5072 |
5075 MenuTitle::addTitle(m, tr("Pane")); | 5073 MenuTitle::addTitle(m, tr("Pane")); |
5076 | 5074 |
5077 // We repeat the setCurrentLayer call here just in case some | 5075 m_paneStack->setCurrentLayer(pane, nullptr); |
5078 // unexpected UI interaction (scripting?) changes it while the | 5076 |
5079 // menu is visible | 5077 m->addAction(il.load("editdelete"), tr("&Delete Pane"), |
5080 | 5078 this, SLOT(deleteCurrentPane())); |
5081 m->addAction(il.load("editdelete"), | |
5082 tr("&Delete Pane"), | |
5083 [=]() { | |
5084 m_paneStack->setCurrentLayer(pane, nullptr); | |
5085 deleteCurrentPane(); | |
5086 }); | |
5087 | 5079 |
5088 m->popup(position); | 5080 m->popup(position); |
5089 m_lastRightButtonPropertyMenu = m; | 5081 m_lastRightButtonPropertyMenu = m; |
5090 } | 5082 } |
5091 | 5083 |
5093 MainWindow::layerPropertiesRightButtonMenuRequested(Pane *pane, Layer *layer, QPoint position) | 5085 MainWindow::layerPropertiesRightButtonMenuRequested(Pane *pane, Layer *layer, QPoint position) |
5094 { | 5086 { |
5095 if (m_lastRightButtonPropertyMenu) { | 5087 if (m_lastRightButtonPropertyMenu) { |
5096 delete m_lastRightButtonPropertyMenu; | 5088 delete m_lastRightButtonPropertyMenu; |
5097 } | 5089 } |
5098 | |
5099 m_paneStack->setCurrentLayer(pane, layer); | |
5100 | 5090 |
5101 QMenu *m = new QMenu; | 5091 QMenu *m = new QMenu; |
5102 IconLoader il; | 5092 IconLoader il; |
5103 | 5093 |
5104 MenuTitle::addTitle(m, layer->getLayerPresentationName()); | 5094 MenuTitle::addTitle(m, layer->getLayerPresentationName()); |
5105 | 5095 |
5106 // We repeat the setCurrentLayer calls here just in case some | 5096 m_paneStack->setCurrentLayer(pane, layer); |
5107 // unexpected UI interaction (scripting?) changes it while the | 5097 |
5108 // menu is visible | |
5109 | |
5110 m->addAction(tr("&Rename Layer..."), | 5098 m->addAction(tr("&Rename Layer..."), |
5111 [=]() { | 5099 this, SLOT(renameCurrentLayer())); |
5112 m_paneStack->setCurrentLayer(pane, layer); | |
5113 renameCurrentLayer(); | |
5114 }); | |
5115 | 5100 |
5116 m->addAction(tr("Edit Layer Data"), | 5101 m->addAction(tr("Edit Layer Data"), |
5117 [=]() { | 5102 this, SLOT(editCurrentLayer())) |
5118 m_paneStack->setCurrentLayer(pane, layer); | |
5119 editCurrentLayer(); | |
5120 }) | |
5121 ->setEnabled(layer->isLayerEditable()); | 5103 ->setEnabled(layer->isLayerEditable()); |
5122 | 5104 |
5123 m->addAction(il.load("editdelete"), | 5105 m->addAction(il.load("editdelete"), tr("&Delete Layer"), |
5124 tr("&Delete Layer"), | 5106 this, SLOT(deleteCurrentLayer())); |
5125 [=]() { | |
5126 m_paneStack->setCurrentLayer(pane, layer); | |
5127 deleteCurrentLayer(); | |
5128 }); | |
5129 | 5107 |
5130 m->popup(position); | 5108 m->popup(position); |
5131 m_lastRightButtonPropertyMenu = m; | 5109 m_lastRightButtonPropertyMenu = m; |
5132 } | 5110 } |
5133 | 5111 |