Skip to content
Snippets Groups Projects
Commit 5edea687 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

load example: now in SampleView

parent 3c0c7cbb
No related branches found
No related tags found
1 merge request!2387unify code for list views
...@@ -38,16 +38,6 @@ SamplesQListView::SamplesQListView(SamplesQModel* model) ...@@ -38,16 +38,6 @@ SamplesQListView::SamplesQListView(SamplesQModel* model)
&SamplesQListView::onCurrentChanged); &SamplesQListView::onCurrentChanged);
} }
void SamplesQListView::createSampleFromLibrary(const QString& classname, const QString& title,
const QString& description)
{
const QModelIndex newIndex = m_model->createSampleFromExamples(classname, title, description);
if (newIndex.isValid()) {
setCurrentIndex(newIndex);
gDoc->setModified();
}
}
void SamplesQListView::onCurrentChanged(const QModelIndex& index) void SamplesQListView::onCurrentChanged(const QModelIndex& index)
{ {
gDoc->samplesModifier()->setCurrentIndex(index.row()); gDoc->samplesModifier()->setCurrentIndex(index.row());
......
...@@ -26,8 +26,6 @@ class SamplesQListView : public QListView { ...@@ -26,8 +26,6 @@ class SamplesQListView : public QListView {
public: public:
SamplesQListView(SamplesQModel*); SamplesQListView(SamplesQModel*);
void createSampleFromLibrary(const QString& classname, const QString& title,
const QString& description);
void onCurrentChanged(const QModelIndex& index); void onCurrentChanged(const QModelIndex& index);
signals: signals:
void currentSampleChanged(SampleItem* current); void currentSampleChanged(SampleItem* current);
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
#include "GUI/View/List/SamplesQModel.h" #include "GUI/View/List/SamplesQModel.h"
#include "Base/Util/Assert.h" #include "Base/Util/Assert.h"
#include "GUI/Model/FromCore/GUIExamplesFactory.h"
#include "GUI/Model/FromCore/ItemizeSample.h"
#include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SampleItem.h" #include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Model/Sample/SamplesSet.h" #include "GUI/Model/Sample/SamplesSet.h"
...@@ -117,21 +115,3 @@ QModelIndex SamplesQModel::pushSample(SampleItem* t) ...@@ -117,21 +115,3 @@ QModelIndex SamplesQModel::pushSample(SampleItem* t)
return createIndex(row, 0); return createIndex(row, 0);
} }
QModelIndex SamplesQModel::createSampleFromExamples(const QString& className, const QString& title,
const QString& description)
{
auto* t = dynamic_cast<SampleItem*>(GUI::ExamplesFactory::itemizeSample(className));
if (!t)
return {};
t->setName(title);
t->setDescription(description);
const int row = set()->size();
beginInsertRows(QModelIndex(), row, row);
set()->push_back(t);
endInsertRows();
return indexForItem(t);
}
...@@ -38,12 +38,6 @@ public: ...@@ -38,12 +38,6 @@ public:
QModelIndex copySample(); QModelIndex copySample();
QModelIndex pushSample(SampleItem*); QModelIndex pushSample(SampleItem*);
//! Create sample from list of built-in examples.
//!
//! Returns invalid index if anything went wrong.
QModelIndex createSampleFromExamples(const QString& className, const QString& title,
const QString& description);
private: private:
SamplesSet* set(); SamplesSet* set();
const SamplesSet* set() const; const SamplesSet* set() const;
......
...@@ -178,7 +178,12 @@ void SampleView::setToolbarActions(QToolBar* toolbar) ...@@ -178,7 +178,12 @@ void SampleView::setToolbarActions(QToolBar* toolbar)
auto* action = import_menu->addAction(icon, title); auto* action = import_menu->addAction(icon, title);
action->setToolTip(description); action->setToolTip(description);
connect(action, &QAction::triggered, [this, exampleName, title, description] { connect(action, &QAction::triggered, [this, exampleName, title, description] {
m_qlistview->createSampleFromLibrary(exampleName, title, description); SampleItem* t = GUI::ExamplesFactory::itemizeSample(exampleName);
if (!t)
return;
t->setName(title);
t->setDescription(description);
m_qlistmodel->pushSample(t);
}); });
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment