Connect to correct slots

[fstl] / src / window.cpp

diff --git a/src/window.cpp b/src/window.cpp
index 338ddd04d3cd1061116dbbba1ac0ba0f7adf7d7c..13d3583b3a58121133ce625cd526282991c3e4e9 100644 (file)
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -30,11 +30,11 @@ Window::Window(QWidget *parent) :
     quit_action = new QAction("Quit", this);
     quit_action->setShortcut(QKeySequence::Quit);
     QObject::connect(quit_action, &QAction::triggered,
-                     this, &Window::on_open);
+                     this, &Window::close);
 
     about_action = new QAction("About", this);
     QObject::connect(about_action, &QAction::triggered,
-                     this, &Window::on_open);
+                     this, &Window::on_about);
 
     auto file_menu = menuBar()->addMenu("File");
     file_menu->addAction(open_action);
@@ -70,16 +70,24 @@ void Window::on_about()
 
 void Window::load_stl(const QString &filename)
 {
+    canvas->set_status("Loading " + filename);
+
     Loader* loader = new Loader(this, filename);
     connect(loader, &Loader::started,
             [=](){ open_action->setEnabled(false); });
+
     connect(loader, &Loader::got_mesh,
             canvas, &Canvas::load_mesh);
+
     connect(loader, &Loader::finished,
             loader, &Loader::deleteLater);
     connect(loader, &Loader::finished,
             [=](){ open_action->setEnabled(true); });
+    connect(loader, &Loader::finished,
+            [=](){ canvas->set_status(""); });
+
     connect(loader, &Loader::loaded_file,
             this, &Window::setWindowTitle);
+
     loader->start();
 }