mv action to SampleView

GUI/View/List/SamplesQListView.cpp

@@ -27,7 +27,6 @@
 
 SamplesQListView::SamplesQListView()
     : m_model(new SamplesQModel(this))
-    , m_new_sample_action(new QAction(this))
     , m_import_sample_action(new QAction(this))
     , m_choose_from_library_action(new QAction(this))
 {
@@ -46,11 +45,6 @@ SamplesQListView::SamplesQListView()
 
     connect(this, &QWidget::customContextMenuRequested, this, &SamplesQListView::showContextMenu);
 
-    m_new_sample_action->setText("Create new sample");
-    m_new_sample_action->setIcon(QIcon(":/images/shape-square-plus.svg"));
-    m_new_sample_action->setIconText("New");
-    m_new_sample_action->setToolTip("Create new sample");
-    connect(m_new_sample_action, &QAction::triggered, this, &SamplesQListView::createNewSample);
 
     m_import_sample_action->setText("Import sample from python script (experimental)");
     m_import_sample_action->setIcon(QIcon(":/images/import.svg"));

GUI/View/List/SamplesQListView.h

@@ -26,14 +26,9 @@ class SamplesQListView : public QListView {
 public:
     SamplesQListView();
 
-    QAction* newSampleAction() { return m_new_sample_action; }
     QAction* importSampleAction() { return m_import_sample_action; }
     QAction* chooseFromLibraryAction() { return m_choose_from_library_action; }
 
-signals:
-    void currentSampleChanged(SampleItem* current);
-
-private:
     void createNewSample();
     void createSampleFromLibrary(const QString& classname, const QString& title,
                                  const QString& description);
@@ -42,13 +37,17 @@ private:
     void removeSample(SampleItem* item);
     void copySample(SampleItem* item);
 
+signals:
+    void currentSampleChanged(SampleItem* current);
+
+private:
+
     QAction* createRemoveAction(QObject* parent, SampleItem* item);
     QAction* createCopyAction(QObject* parent, SampleItem* item);
 
     void showContextMenu(const QPoint& pos);
 
     SamplesQModel* m_model;
-    QAction* m_new_sample_action;
     QAction* m_import_sample_action;
     QAction* m_choose_from_library_action;
 };

GUI/View/Sample/SampleEditor.h

@@ -34,7 +34,6 @@ public:
 
 signals:
     void requestViewInRealspace(Item3D* itemToShow);
-    void requestCreateNewSample();
     void aboutToRemoveItem(Item3D* item);
     void modified();
 

GUI/View/Views/SampleView.cpp

@@ -90,9 +90,18 @@ SampleView::SampleView()
         m_realspace_panel->setMaximumHeight(QWIDGETSIZE_MAX);
     });
 
+    //... Toolbar actions
+
+    auto* new_sample_action = new QAction("New", this);
+    new_sample_action->setIcon(QIcon(":/images/shape-square-plus.svg"));
+    new_sample_action->setToolTip("Create new sample");
+    toolbar->addAction(new_sample_action);
+
+    connect(new_sample_action, &QAction::triggered,
+	    m_listing, &SamplesQListView::createNewSample);
+
     //... Finish
 
-    toolbar->addAction(m_listing->newSampleAction());
 #ifdef BORNAGAIN_PYTHON
     toolbar->addAction(m_listing->importSampleAction());
 #endif
@@ -117,9 +126,6 @@ SampleView::SampleView()
 
     connect(editor, &SampleEditor::aboutToRemoveItem, this, &SampleView::onAboutToRemoveItem);
 
-    connect(editor, &SampleEditor::requestCreateNewSample, m_listing->newSampleAction(),
-            &QAction::trigger, Qt::QueuedConnection);
-
     connect(editor, &SampleEditor::modified, m_realspace_panel->widget(),
             &RealspaceWidget::updateScene);