diff --git a/GUI/View/Main/CentralWidget.cpp b/GUI/View/Main/CentralWidget.cpp index 84ea830b4c917202cb1a43a8e07187270159343d..c7e3b40611f6d44d76561f3d2d4d2b2d2adb83ce 100644 --- a/GUI/View/Main/CentralWidget.cpp +++ b/GUI/View/Main/CentralWidget.cpp @@ -138,11 +138,11 @@ void CentralWidget::initViews() m_simulation_view = new SimulationView; m_job_view = new JobView(progressBar()); - resetView(GUI::ID::ViewId::Datafile, m_data_view); - resetView(GUI::ID::ViewId::Instrument, m_instrument_view); - resetView(GUI::ID::ViewId::Sample, m_sample_view); - resetView(GUI::ID::ViewId::Simulation, m_simulation_view); - resetView(GUI::ID::ViewId::Job, m_job_view); + m_views_stack->insertWidget(GUI::ID::ViewId::Datafile, m_data_view); + m_views_stack->insertWidget(GUI::ID::ViewId::Instrument, m_instrument_view); + m_views_stack->insertWidget(GUI::ID::ViewId::Sample, m_sample_view); + m_views_stack->insertWidget(GUI::ID::ViewId::Simulation, m_simulation_view); + m_views_stack->insertWidget(GUI::ID::ViewId::Job, m_job_view); connect(m_job_view, &JobView::jobSelected, [this](int index) { m_view_selection_buttons->button(index)->click(); }); @@ -164,11 +164,6 @@ void CentralWidget::addButton(GUI::ID::ViewId id, const QIcon& icon, const QStri updateViewSelectionButtonsGeometry(); } -void CentralWidget::resetView(GUI::ID::ViewId id, QWidget* view) -{ - m_views_stack->insertWidget(id, view); -} - void CentralWidget::updateViewSelectionButtonsGeometry() const { if (m_view_selection_buttons->buttons().isEmpty()) diff --git a/GUI/View/Main/CentralWidget.h b/GUI/View/Main/CentralWidget.h index 8fd198eff42892e4dedef803530497a088d9ac07..cfd71b61956d06654728743877479df2336b4638 100644 --- a/GUI/View/Main/CentralWidget.h +++ b/GUI/View/Main/CentralWidget.h @@ -55,7 +55,6 @@ private: void addButton(GUI::ID::ViewId id, const QIcon& icon, const QString& title, const QString& tooltip); - void resetView(GUI::ID::ViewId id, QWidget* view); QToolButton* createViewSelectionButton() const; //! Recalculate the size of the view selection buttons to show complete button text diff --git a/GUI/View/View/DatafilesSelector.cpp b/GUI/View/View/DatafilesSelector.cpp index ce986dec42edb6eb799220520e095c425acba496..f16550fe9c9a36b8d12da4d7f23102ab0c48d4ee 100644 --- a/GUI/View/View/DatafilesSelector.cpp +++ b/GUI/View/View/DatafilesSelector.cpp @@ -40,7 +40,7 @@ DatafilesSelector::DatafilesSelector() auto* toolbar = new StyledToolbar; layout->addWidget(toolbar); toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - setToolbarActions(toolbar); + createActions(toolbar); layout->addWidget(m_qlistview); @@ -48,7 +48,7 @@ DatafilesSelector::DatafilesSelector() updateActions(); } -void DatafilesSelector::setToolbarActions(QToolBar* toolbar) +void DatafilesSelector::createActions(QToolBar* toolbar) { auto* import1dData_action = new QAction(this); toolbar->addAction(import1dData_action); diff --git a/GUI/View/View/DatafilesSelector.h b/GUI/View/View/DatafilesSelector.h index bbb309d051eacb06b8660cf11e2ac6187e424dde..e56bb9b7a7efd4e219a7c2d94241a8a26adc476a 100644 --- a/GUI/View/View/DatafilesSelector.h +++ b/GUI/View/View/DatafilesSelector.h @@ -29,7 +29,7 @@ public: DatafilesSelector(); private: - void setToolbarActions(QToolBar* toolbar); + void createActions(QToolBar* toolbar); void updateActions(); DatafilesSet* m_set; diff --git a/GUI/View/View/InstrumentView.cpp b/GUI/View/View/InstrumentView.cpp index adbed4bf519e600f2a000581d62573d05337f802..e3dc36d4aed7ae1cf535f2d2c2a742ed9903d7f9 100644 --- a/GUI/View/View/InstrumentView.cpp +++ b/GUI/View/View/InstrumentView.cpp @@ -45,7 +45,7 @@ InstrumentView::InstrumentView() auto* toolbar = new StyledToolbar; layout->addWidget(toolbar); toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - setToolbarActions(toolbar); + createActions(toolbar); //... Everything below top toolbar @@ -75,7 +75,7 @@ InstrumentView::InstrumentView() updateActions(); } -void InstrumentView::setToolbarActions(QToolBar* toolbar) +void InstrumentView::createActions(QToolBar* toolbar) { //... New-instrument actions diff --git a/GUI/View/View/InstrumentView.h b/GUI/View/View/InstrumentView.h index ffcf41ba2eff99582eeca122afef2f5104bddc0a..a70f10c3e1d17733f32f9b67ab3a5987ba146ecf 100644 --- a/GUI/View/View/InstrumentView.h +++ b/GUI/View/View/InstrumentView.h @@ -30,7 +30,7 @@ public: InstrumentView(); private: - void setToolbarActions(QToolBar* toolbar); + void createActions(QToolBar* toolbar); void updateActions(); void updateEditor(); QWidget* createEditor(InstrumentItem*); diff --git a/GUI/View/View/SampleView.cpp b/GUI/View/View/SampleView.cpp index dfa21a31cd85f180f97c13ec0fc86fea83f7c475..e0542113974f37f93ee933ffe6ceaf76a1e20743 100644 --- a/GUI/View/View/SampleView.cpp +++ b/GUI/View/View/SampleView.cpp @@ -46,7 +46,7 @@ SampleView::SampleView() auto* toolbar = new StyledToolbar; layout->addWidget(toolbar); toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - setToolbarActions(toolbar); + createActions(toolbar); //... Everything below top toolbar auto* hLayout = new QHBoxLayout; @@ -120,7 +120,7 @@ SampleView::~SampleView() saveSplitterPos(); } -void SampleView::setToolbarActions(QToolBar* toolbar) +void SampleView::createActions(QToolBar* toolbar) { //... New sample action diff --git a/GUI/View/View/SampleView.h b/GUI/View/View/SampleView.h index a13635219db9467aa82481ee8dc6f3b2a04fd934..3490655fff98dce924217dcf03851eecc2958ac1 100644 --- a/GUI/View/View/SampleView.h +++ b/GUI/View/View/SampleView.h @@ -31,7 +31,7 @@ public: ~SampleView(); private: - void setToolbarActions(QToolBar* toolbar); + void createActions(QToolBar* toolbar); void updateActions(); void onRequestViewInRealspace(Item3D* item);