diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp index e97fcfed54db4d3f9803860f717dfeb86c8bc806..62e42cb78dc853613c417a70d1a4254d8f8fcc65 100644 --- a/GUI/Model/Project/ProjectDocument.cpp +++ b/GUI/Model/Project/ProjectDocument.cpp @@ -51,9 +51,7 @@ const QString ActiveView("ActiveView"); ProjectDocument::ProjectDocument() : m_modified(false) - , m_singleInstrumentMode(false) , m_singleSampleMode(false) - , m_functionalities(All) , m_instrumentEditController(&m_instrumentModel) , m_realModel(&m_instrumentModel) , m_lastViewActive(GUI::ID::ViewId::Instrument) @@ -234,19 +232,6 @@ QString ProjectDocument::documentVersion() const return result; } -bool ProjectDocument::singleInstrumentMode() const -{ - return m_singleInstrumentMode; -} - -void ProjectDocument::setSingleInstrumentMode(bool b) -{ - if (b != m_singleInstrumentMode) { - m_singleInstrumentMode = b; - emit singleInstrumentModeChanged(); - } -} - bool ProjectDocument::singleSampleMode() const { return m_singleSampleMode; @@ -260,19 +245,6 @@ void ProjectDocument::setSingleSampleMode(bool b) } } -ProjectDocument::Functionalities ProjectDocument::functionalities() const -{ - return m_functionalities; -} - -void ProjectDocument::setFunctionalities(const Functionalities& f) -{ - if (m_functionalities != f) { - m_functionalities = f; - emit functionalitiesChanged(); - } -} - void ProjectDocument::onModelChanged() { setModified(); diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h index 70471a34db02a6718229b689a46e1c6af1c74970..58ba80ff6cadc77b4dbe92d4f98348b8d4d7b4f6 100644 --- a/GUI/Model/Project/ProjectDocument.h +++ b/GUI/Model/Project/ProjectDocument.h @@ -42,17 +42,6 @@ class ProjectDocument : public QObject { public: enum class ReadResult { ok, warning, error }; - enum Functionality { - None = 0x0, - Gisas = 0x1, - Offspec = 0x2, - Specular = 0x4, - Depthprobe = 0x8, - All = Gisas | Offspec | Specular | Depthprobe - }; - Q_DECLARE_FLAGS(Functionalities, Functionality) - Q_FLAG(Functionalities) - ProjectDocument(); QString projectName() const; @@ -94,23 +83,15 @@ public: QString documentVersion() const; - bool singleInstrumentMode() const; - void setSingleInstrumentMode(bool b); - bool singleSampleMode() const; void setSingleSampleMode(bool b); int viewId() const; void setViewId(int viewId); - Functionalities functionalities() const; - void setFunctionalities(const Functionalities& f); - signals: void projectSaved(); void modifiedStateChanged(); - void functionalitiesChanged(); - void singleInstrumentModeChanged(); void singleSampleModeChanged(); private: @@ -124,9 +105,7 @@ private: bool m_modified; QString m_currentVersion; std::unique_ptr<LinkInstrumentManager> m_linkManager; - bool m_singleInstrumentMode; bool m_singleSampleMode; - Functionalities m_functionalities; SimulationOptionsItem m_simulationOptionsItem; MultiInstrumentNotifier m_instrumentEditController; InstrumentModel m_instrumentModel; @@ -136,17 +115,4 @@ private: int m_lastViewActive; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(ProjectDocument::Functionalities) - -inline QVariant toVariant(const ProjectDocument::Functionalities& f) -{ - return QVariant(static_cast<ProjectDocument::Functionalities::Int>(f)); -} - -inline ProjectDocument::Functionalities toFunctionalities(const QVariant& v) -{ - return static_cast<ProjectDocument::Functionalities>( - v.value<ProjectDocument::Functionalities::Int>()); -} - #endif // BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H diff --git a/GUI/View/Data/DataView.cpp b/GUI/View/Data/DataView.cpp index eab3575ae0b285fe9e3dcf8eff271e709c8456dd..7b2fc52842c0572ca9ea1efca61f3dabb9bc4b67 100644 --- a/GUI/View/Data/DataView.cpp +++ b/GUI/View/Data/DataView.cpp @@ -49,22 +49,6 @@ DataView::DataView(QWidget* parent, ProjectDocument* document) splitter->setSizes(QList<int>() << GUI::Style::ITEM_SELECTOR_WIDGET_WIDTH << GUI::Style::ITEM_SELECTOR_WIDGET_WIDTH * 7); - updateFunctionalityNarrowing(); - - connect(m_document, &ProjectDocument::modifiedStateChanged, this, - &DataView::updateFunctionalityNarrowing); - if (m_selectorWidget->currentItem()) stackedWidget->setItem(m_selectorWidget->currentItem()); } - -void DataView::updateFunctionalityNarrowing() -{ - m_selectorWidget->m_import1dDataAction->setVisible( - m_document->functionalities().testFlag(ProjectDocument::Specular)); - - m_selectorWidget->m_import2dDataAction->setVisible( - m_document->functionalities().testFlag(ProjectDocument::Gisas) - || m_document->functionalities().testFlag(ProjectDocument::Offspec) - || m_document->functionalities().testFlag(ProjectDocument::Depthprobe)); -} diff --git a/GUI/View/Data/DataView.h b/GUI/View/Data/DataView.h index 5d1c181d729bd8055808accd3d36fa5226fd7976..8344f4f064672f27e03a97a4199dfffd61b1fa9f 100644 --- a/GUI/View/Data/DataView.h +++ b/GUI/View/Data/DataView.h @@ -30,9 +30,6 @@ public: DataView(QWidget* parent, ProjectDocument* document); private: - //! Show/hide UI elements according to settings in current project - void updateFunctionalityNarrowing(); - DatafilesSelector* m_selectorWidget; ProjectDocument* m_document; }; diff --git a/GUI/View/Data/DatafilesSelector.cpp b/GUI/View/Data/DatafilesSelector.cpp index d82749993427ac872095ba577abc195f4a614bde..90d13a38459238f9bee879c24b8bb9263028e63a 100644 --- a/GUI/View/Data/DatafilesSelector.cpp +++ b/GUI/View/Data/DatafilesSelector.cpp @@ -124,9 +124,6 @@ DatafilesSelector::DatafilesSelector(QWidget* parent, ProjectDocument* document) connect(m_treeView, &QTreeView::customContextMenuRequested, this, &DatafilesSelector::onContextMenuRequest); - connect(m_document, &ProjectDocument::modifiedStateChanged, this, - &DatafilesSelector::updateFunctionalities); - connect(m_treeModel, &QAbstractItemModel::modelReset, [this]() { m_treeView->expandAll(); }); connect(m_treeModel, &QAbstractItemModel::rowsInserted, [this]() { m_treeView->expandAll(); }); @@ -136,7 +133,6 @@ DatafilesSelector::DatafilesSelector(QWidget* parent, ProjectDocument* document) m_treeView->expandAll(); updateActionEnabling(); - updateFunctionalities(); restoreSelection(); @@ -403,16 +399,3 @@ void DatafilesSelector::updateActionEnabling(const RealItem* item) const m_removeDataAction->setEnabled(item != nullptr); m_renameDataAction->setEnabled(item != nullptr); } - -void DatafilesSelector::updateFunctionalities() -{ - QSet<int> visibleRanks; - if (m_document->functionalities().testFlag(ProjectDocument::Specular)) - visibleRanks << 1; - if (m_document->functionalities().testFlag(ProjectDocument::Gisas) - || m_document->functionalities().testFlag(ProjectDocument::Offspec) - || m_document->functionalities().testFlag(ProjectDocument::Depthprobe)) - visibleRanks << 2; - - m_treeModel->setVisibleRanks(visibleRanks); -} diff --git a/GUI/View/Instrument/InstrumentListing.cpp b/GUI/View/Instrument/InstrumentListing.cpp index 5a649760784e8d05dccbec3d13e05abf6b9a248c..a819dd2c24ca605a6819ea6d2a666a8398c3e5bc 100644 --- a/GUI/View/Instrument/InstrumentListing.cpp +++ b/GUI/View/Instrument/InstrumentListing.cpp @@ -96,11 +96,6 @@ InstrumentListing::InstrumentListing(ProjectDocument* document) setContextMenuPolicy(Qt::ActionsContextMenu); - connect(m_document, &ProjectDocument::functionalitiesChanged, this, - &InstrumentListing::updateFunctionalityNarrowing); - - updateFunctionalityNarrowing(); - updateActions(); restoreSelection(); @@ -206,10 +201,10 @@ void InstrumentListing::onStoreInLibrary() InstrumentItem* instrument = m_model->instrumentItemForIndex(idx); InstrumentLibraryEditor dlg(GUI::Global::mainWindow, &m_instrumentLibrary); - dlg.setGisasEnabled(m_document->functionalities().testFlag(ProjectDocument::Gisas)); - dlg.setOffspecEnabled(m_document->functionalities().testFlag(ProjectDocument::Offspec)); - dlg.setSpecularEnabled(m_document->functionalities().testFlag(ProjectDocument::Specular)); - dlg.setDepthprobeEnabled(m_document->functionalities().testFlag(ProjectDocument::Depthprobe)); + dlg.setGisasEnabled(true); + dlg.setOffspecEnabled(true); + dlg.setSpecularEnabled(true); + dlg.setDepthprobeEnabled(true); dlg.execAdd(*instrument); } @@ -222,10 +217,10 @@ void InstrumentListing::onLoadFromLibrary() } InstrumentLibraryEditor dlg(GUI::Global::mainWindow, &m_instrumentLibrary); - dlg.setGisasEnabled(m_document->functionalities().testFlag(ProjectDocument::Gisas)); - dlg.setOffspecEnabled(m_document->functionalities().testFlag(ProjectDocument::Offspec)); - dlg.setSpecularEnabled(m_document->functionalities().testFlag(ProjectDocument::Specular)); - dlg.setDepthprobeEnabled(m_document->functionalities().testFlag(ProjectDocument::Depthprobe)); + dlg.setGisasEnabled(true); + dlg.setOffspecEnabled(true); + dlg.setSpecularEnabled(true); + dlg.setDepthprobeEnabled(true); auto* instrumentToCopy = dlg.execChoose(); if (instrumentToCopy == nullptr) @@ -235,17 +230,6 @@ void InstrumentListing::onLoadFromLibrary() selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect); } -void InstrumentListing::updateFunctionalityNarrowing() -{ - const auto f = m_document->functionalities(); - - m_newGisasAction->setVisible(f.testFlag(ProjectDocument::Gisas)); - m_newOffspecAction->setVisible(f.testFlag(ProjectDocument::Offspec)); - m_newSpecularAction->setVisible(f.testFlag(ProjectDocument::Specular)); - m_newDepthprobeAction->setVisible(f.testFlag(ProjectDocument::Depthprobe)); - m_copyAction->setVisible(!m_document->singleInstrumentMode()); -} - void InstrumentListing::updateActions() { bool enabled = selectionModel()->hasSelection(); diff --git a/GUI/View/Instrument/InstrumentListing.h b/GUI/View/Instrument/InstrumentListing.h index 5eaf0ff6cd6202d4689057607720ee423167a8fb..8e9af7cd2c55848c7a94a90396b49f88fb6b81be 100644 --- a/GUI/View/Instrument/InstrumentListing.h +++ b/GUI/View/Instrument/InstrumentListing.h @@ -54,9 +54,6 @@ private slots: void onLoadFromLibrary(); private: - //! Show/hide UI elements according to settings in current project - void updateFunctionalityNarrowing(); - void updateActions(); void ensureItemSelected(); void restoreSelection(); diff --git a/GUI/View/Instrument/InstrumentView.cpp b/GUI/View/Instrument/InstrumentView.cpp index b4bf53cbca29ebd4dd21d8495fa936c92ac5c333..c71773222d8e438ea65cde650b72b0502c09c46e 100644 --- a/GUI/View/Instrument/InstrumentView.cpp +++ b/GUI/View/Instrument/InstrumentView.cpp @@ -49,7 +49,6 @@ InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document) // Left margin: instrument list m_listing = new InstrumentListing(document); hLayout->addWidget(m_listing); - m_listing->setVisible(!document->singleInstrumentMode()); // Large widget: current instrument m_scrollArea = new QScrollArea; @@ -64,8 +63,6 @@ InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document) toolbar->addActions(m_listing->toolbarActions()); - connect(m_document, &ProjectDocument::singleInstrumentModeChanged, - [this]() { m_listing->setVisible(!m_document->singleInstrumentMode()); }); connect(m_listing, &InstrumentListing::instrumentSelected, this, &InstrumentView::createWidgetsForCurrentInstrument); @@ -188,97 +185,3 @@ void InstrumentView::onInstrumentChangedFromExternal(const InstrumentItem* instr if (instrument == m_listing->currentInstrumentItem()) createWidgetsForCurrentInstrument(); } - -void InstrumentView::fillViewMenu(QMenu* menu) -{ - auto* action = new QWidgetAction(menu); - auto* checkBox = new QCheckBox("Use single instrument", menu); - action->setDefaultWidget(checkBox); - action->setText("Use single instrument"); - action->setCheckable(true); - checkBox->setChecked(m_document->singleInstrumentMode()); - connect(checkBox, &QCheckBox::stateChanged, this, - &InstrumentView::onSingleInstrumentModeChanged); - menu->addAction(action); - menu->addSeparator(); - - const auto f = m_document->functionalities(); - gisasCheck = new QCheckBox("GISAS instrument", menu); - gisasCheck->setChecked(f.testFlag(ProjectDocument::Gisas)); - connect(gisasCheck, &QCheckBox::stateChanged, this, &InstrumentView::onFunctionalityChanged); - action = new QWidgetAction(menu); - action->setToolTip("GISAS instrument"); - action->setDefaultWidget(gisasCheck); - menu->addAction(action); - offspecCheck = new QCheckBox("Off-specular instrument", menu); - offspecCheck->setChecked(f.testFlag(ProjectDocument::Offspec)); - connect(offspecCheck, &QCheckBox::stateChanged, this, &InstrumentView::onFunctionalityChanged); - action = new QWidgetAction(menu); - action->setToolTip("Off-specular instrument"); - action->setDefaultWidget(offspecCheck); - menu->addAction(action); - specularCheck = new QCheckBox("Specular instrument", menu); - specularCheck->setChecked(f.testFlag(ProjectDocument::Specular)); - connect(specularCheck, &QCheckBox::stateChanged, this, &InstrumentView::onFunctionalityChanged); - action = new QWidgetAction(menu); - action->setToolTip("Specular instrument"); - action->setDefaultWidget(specularCheck); - menu->addAction(action); - depthProbeCheck = new QCheckBox("Depth probe instrument", menu); - depthProbeCheck->setChecked(f.testFlag(ProjectDocument::Depthprobe)); - connect(depthProbeCheck, &QCheckBox::stateChanged, this, - &InstrumentView::onFunctionalityChanged); - action = new QWidgetAction(menu); - action->setToolTip("Depth probe instrument"); - action->setDefaultWidget(depthProbeCheck); - menu->addAction(action); -} - -void InstrumentView::onSingleInstrumentModeChanged(bool newState) -{ - if (newState) { - if (m_document->instrumentModel()->instrumentItems().size() > 1) { - QMessageBox::warning(this, "Select single instrument mode", - "This project already contains more than one instrument. Changing " - "this setting is not possible."); - return; - } - - m_document->setSingleInstrumentMode(true); - } else - m_document->setSingleInstrumentMode(false); - if (gProjectDocument.has_value()) { - appSettings->setDefaultIsSingleInstrumentMode( - gProjectDocument.value()->singleInstrumentMode()); - } -} - -ProjectDocument::Functionalities InstrumentView::functionalities() const -{ - ProjectDocument::Functionalities f; - f.setFlag(ProjectDocument::Gisas, gisasCheck->isChecked()); - f.setFlag(ProjectDocument::Offspec, offspecCheck->isChecked()); - f.setFlag(ProjectDocument::Specular, specularCheck->isChecked()); - f.setFlag(ProjectDocument::Depthprobe, depthProbeCheck->isChecked()); - return f; -} - -void InstrumentView::onFunctionalityChanged() -{ - const auto f = functionalities(); - - if (f == ProjectDocument::None) { - QMessageBox::warning(this, "Select functionality", - "You have to select at least one functionality. Changing " - "this setting is not possible."); - const auto ff = m_document->functionalities(); - gisasCheck->setChecked(ff.testFlag(ProjectDocument::Gisas)); - offspecCheck->setChecked(ff.testFlag(ProjectDocument::Offspec)); - specularCheck->setChecked(ff.testFlag(ProjectDocument::Specular)); - depthProbeCheck->setChecked(ff.testFlag(ProjectDocument::Depthprobe)); - return; - } - m_document->setFunctionalities(f); - if (gProjectDocument.has_value()) - appSettings->setDefaultFunctionalities(toVariant(f)); -} diff --git a/GUI/View/Instrument/InstrumentView.h b/GUI/View/Instrument/InstrumentView.h index 03c21f043b230517b1bf0f8e6208ef6327673f29..c420504d6e1c29ebf86960f805138cfe121bfd21 100644 --- a/GUI/View/Instrument/InstrumentView.h +++ b/GUI/View/Instrument/InstrumentView.h @@ -29,8 +29,6 @@ class InstrumentView : public QWidget { Q_OBJECT public: InstrumentView(QWidget* parent, ProjectDocument* document); - void fillViewMenu(QMenu* menu); - ProjectDocument::Functionalities functionalities() const; private: void showEvent(QShowEvent*) override; @@ -42,7 +40,6 @@ private: void onInstrumentChangedByEditor(); void onInstrumentChangedFromExternal(const InstrumentItem* instrument); void onSingleInstrumentModeChanged(bool newState); - void onFunctionalityChanged(); InstrumentListing* m_listing; ProjectDocument* m_document; diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp index 97fd37f1402c581c7cc122eb2847b2d7d5547cf6..b2b79a3e5f8a8fd0f7120261f499dc896129cab5 100644 --- a/GUI/View/Main/ActionManager.cpp +++ b/GUI/View/Main/ActionManager.cpp @@ -267,8 +267,6 @@ void ActionManager::onAboutToShowViewMenu() auto* view = m_mainWindow->currentView(); if (auto* sampleView = dynamic_cast<SampleView*>(view); sampleView != nullptr) sampleView->fillViewMenu(m_viewMenu); - if (auto intrumentView = dynamic_cast<InstrumentView*>(view); intrumentView != nullptr) - intrumentView->fillViewMenu(m_viewMenu); if (auto* jobView = dynamic_cast<JobView*>(view); jobView != nullptr) jobView->fillViewMenu(m_viewMenu); } diff --git a/GUI/View/Project/ProjectManager.cpp b/GUI/View/Project/ProjectManager.cpp index f2dfa29898a23f5cfec14efb539ff8190c27cecb..fd294a9abe3166b31170758aaa5e33a19a79c539 100644 --- a/GUI/View/Project/ProjectManager.cpp +++ b/GUI/View/Project/ProjectManager.cpp @@ -341,10 +341,6 @@ void ProjectManager::createNewProject() gProjectDocument = new ProjectDocument(); - const QVariant defFunctionalities = - appSettings->defaultFunctionalities(toVariant(ProjectDocument::All)); - gProjectDocument.value()->setFunctionalities(toFunctionalities(defFunctionalities)); - gProjectDocument.value()->setSingleInstrumentMode(appSettings->defaultIsSingleInstrumentMode()); gProjectDocument.value()->setSingleSampleMode(appSettings->defaultIsSingleSampleMode()); if (m_autosave) diff --git a/GUI/View/Project/SimulationView.cpp b/GUI/View/Project/SimulationView.cpp index 67676d79d8785814636ef6aa6ba13c67fe97c001..5ec92cdd8e485adb78b2a9c4d2858925a53695c2 100644 --- a/GUI/View/Project/SimulationView.cpp +++ b/GUI/View/Project/SimulationView.cpp @@ -135,8 +135,6 @@ SimulationView::SimulationView(QWidget* parent, ProjectDocument* document) m_numberOfThreadsCombo->addItem(QString("%1 threads").arg(i), i); m_numberOfThreadsCombo->addItem("1 thread", 1); - updateFunctionalityNarrowing(); - //... Connect connect(m_instrumentCombo, &QComboBox::currentTextChanged, [this] { updateStateFromUI(); }); @@ -161,9 +159,6 @@ SimulationView::SimulationView(QWidget* parent, ProjectDocument* document) [this]() { updateStateFromUI(); }); connect(m_includeSpecularCheck, &QCheckBox::toggled, [this]() { updateStateFromUI(); }); - - connect(m_document, &ProjectDocument::modifiedStateChanged, this, - &SimulationView::updateFunctionalityNarrowing); } void SimulationView::showEvent(QShowEvent*) @@ -321,12 +316,6 @@ QString SimulationView::validateSimulationSetup(bool validateRealData) const return messages; } -void SimulationView::updateFunctionalityNarrowing() -{ - m_instrumentCombo->setVisible(!m_document->singleInstrumentMode()); - m_instrumentLabel->setVisible(!m_document->singleInstrumentMode()); -} - SimulationOptionsItem* SimulationView::optionsItem() const { return m_document->simulationOptionsItem(); diff --git a/GUI/View/Project/SimulationView.h b/GUI/View/Project/SimulationView.h index fc5da28c769bbd539c9b7b92e3dae03c4bd0c7af..8a9945f2e42c587d94a0b421cafa24b0fa34cbb6 100644 --- a/GUI/View/Project/SimulationView.h +++ b/GUI/View/Project/SimulationView.h @@ -79,9 +79,6 @@ private: //! Returns empty string if valid, otherwise the error text. QString validateSimulationSetup(bool validateRealData) const; - //! Show/hide UI elements according to settings in current project - void updateFunctionalityNarrowing(); - ProjectDocument* m_document; QLabel* m_instrumentLabel; diff --git a/GUI/View/Widget/ApplicationSettings.cpp b/GUI/View/Widget/ApplicationSettings.cpp index abc205d6669411c914f0893041324751fe9607bc..ab3ecfbb4cebd95bf5a47ca1811f6d88f531a28d 100644 --- a/GUI/View/Widget/ApplicationSettings.cpp +++ b/GUI/View/Widget/ApplicationSettings.cpp @@ -26,8 +26,6 @@ const QString S_CREATE_NEW_PROJECT_ON_STARTUP = "CreateNewProjectOnStartup"; const QString S_STYLE = "UiStyle"; const QString S_SIZE = "Size"; const QString S_POS = "Pos"; -const QString S_DEFAULT_FUNCTIONALITIES = "DefaultFunctionalities"; -const QString S_SINGLE_INSTRUMENT_MODE = "SingleInstrumentMode"; const QString S_SINGLE_SAMPLE_MODE = "SingleSampleMode"; const QString S_DEFAULT_UNIT_IS_ANGSTROM = "DefaultUnitIsAngstrom"; @@ -70,26 +68,6 @@ void ApplicationSettings::setStyleToUse(Style style) QSettings().setValue(S_STYLE, static_cast<int>(style)); } -QVariant ApplicationSettings::defaultFunctionalities(const QVariant& absenceValue) const -{ - return QSettings().value(S_DEFAULT_FUNCTIONALITIES, absenceValue); -} - -void ApplicationSettings::setDefaultFunctionalities(const QVariant& functionalities) -{ - QSettings().setValue(S_DEFAULT_FUNCTIONALITIES, functionalities); -} - -bool ApplicationSettings::defaultIsSingleInstrumentMode() const -{ - return QSettings().value(S_SINGLE_INSTRUMENT_MODE, false).toBool(); -} - -void ApplicationSettings::setDefaultIsSingleInstrumentMode(bool b) -{ - QSettings().setValue(S_SINGLE_INSTRUMENT_MODE, b); -} - bool ApplicationSettings::defaultIsSingleSampleMode() const { return QSettings().value(S_SINGLE_SAMPLE_MODE, false).toBool(); diff --git a/GUI/View/Widget/ApplicationSettings.h b/GUI/View/Widget/ApplicationSettings.h index 4f5cb693fd7bade74a8ec38a5d02bf7c95df041a..92ffc8fc9c74c2c3eb0b0a2aae0eacb67778d70b 100644 --- a/GUI/View/Widget/ApplicationSettings.h +++ b/GUI/View/Widget/ApplicationSettings.h @@ -37,12 +37,6 @@ public: Style styleToUse() const; void setStyleToUse(Style style); - QVariant defaultFunctionalities(const QVariant& absenceValue) const; - void setDefaultFunctionalities(const QVariant& functionalities); - - bool defaultIsSingleInstrumentMode() const; - void setDefaultIsSingleInstrumentMode(bool b); - bool defaultIsSingleSampleMode() const; void setDefaultIsSingleSampleMode(bool b);