Skip to content
Snippets Groups Projects
Commit 2cef0952 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Merge remote-tracking branch 'upstream/develop' into develop

parents 3dbcb9fa 8189d9d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp
+ 3
− 2
View file @ 2cef0952
...@@ -201,8 +201,9 @@ void InstrumentViewActions::initAddInstrumentMenu() ...@@ -201,8 +201,9 @@ void InstrumentViewActions::initAddInstrumentMenu()
action->setToolTip("Add OffSpec instrument with default settings"); action->setToolTip("Add OffSpec instrument with default settings");
connect(action, &QAction::triggered, this, &InstrumentViewActions::onAddInstrument); connect(action, &QAction::triggered, this, &InstrumentViewActions::onAddInstrument);
action = m_addInstrumentMenu->addAction("Specular"); // TODO: enable after specular instrument is ready
/*action = m_addInstrumentMenu->addAction("Specular");
action->setData(QVariant::fromValue(Constants::SpecularInstrumentType)); action->setData(QVariant::fromValue(Constants::SpecularInstrumentType));
action->setToolTip("Add Specular instrument with default settings"); action->setToolTip("Add Specular instrument with default settings");
connect(action, &QAction::triggered, this, &InstrumentViewActions::onAddInstrument); connect(action, &QAction::triggered, this, &InstrumentViewActions::onAddInstrument);*/
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment