Merge pull request #126 from scratchcpp/abort_question

Fix #92: Hide aborted questions

Author: adazem009

libscratchcpp

@@ -91,6 +91,8 @@ ProjectScene {
  questionLoader.item.clear();
  questionLoader.item.question = question;
  }
+
+ onQuestionAborted: questionLoader.active = false
  }
 
  function start() {

src/ProjectPlayer.qml

@@ -256,6 +256,7 @@ void ProjectLoader::load()
  m_engine->monitorRemoved().connect(&ProjectLoader::removeMonitor, this);
 
  m_engine->questionAsked().connect([this](const std::string &question) { emit questionAsked(QString::fromStdString(question)); });
+ m_engine->questionAborted().connect([this]() { emit questionAborted(); });
 
  // Load targets
  const auto &targets = m_engine->targets();

src/projectloader.cpp

@@ -110,6 +110,7 @@ class ProjectLoader : public QObject
  void monitorAdded(MonitorModel *model);
  void monitorRemoved(MonitorModel *model);
  void questionAsked(QString question);
+ void questionAborted();
 
  protected:
  void timerEvent(QTimerEvent *event) override;

src/projectloader.h

@@ -188,6 +188,19 @@ TEST_F(ProjectLoaderTest, QuestionAsked)
  ASSERT_EQ(args.first().toString(), "test");
 }
 
+TEST_F(ProjectLoaderTest, QuestionAborted)
+{
+ ProjectLoader loader;
+ QSignalSpy spy(&loader, &ProjectLoader::questionAborted);
+
+ load(&loader, "load_test.sb3");
+
+ auto engine = loader.engine();
+ ASSERT_TRUE(spy.isEmpty());
+ engine->questionAborted()();
+ ASSERT_EQ(spy.count(), 1);
+}
+
 TEST_F(ProjectLoaderTest, AnswerQuestion)
 {
  ProjectLoader loader;